COMPUTER\EDY
|
b5db0d3920
|
Merge branch 'main' into feat-newPass
# Conflicts:
# assets/GameplayIntro/compressed.meta
# assets/Script/module/Pay/Utils.ts
# assets/gacha_bundle/compressed.meta
# assets/gacha_bundle/img/cat.meta
# assets/libs/dn-sdk-minigame.meta
# assets/passCheck/script.meta
# assets/propWindow/compressed.meta
# assets/res/shop.meta
# assets/win/compressed.meta
# settings/project.json
# tools/test-battle-pass.cjs
|
2026-10-09 11:04:16 +08:00 |
|
|
COMPUTER\EDY
|
91b07bc49d
|
更新战令奖励统一
|
2026-10-09 10:55:43 +08:00 |
|
|
guanchao
|
112dad4eb2
|
feat: 战令更新
|
2026-10-09 10:03:29 +08:00 |
|
|
guanchao
|
8fb2ef1be8
|
Merge branch 'feat-cloudRise'
# Conflicts:
# assets/Script/Map.ts
# assets/UI/UI/start/startUI2.plist
# assets/UI/UI/start/startUI2.plist.meta
# assets/UI/UI/start/startUI2.png
# assets/UI/UI/start/startUI2.png.meta
# settings/project.json
# tools/test-prop-guide.cjs
|
2026-09-24 17:12:25 +08:00 |
|
|
COMPUTER\EDY
|
13ea6d64ab
|
修复战令商城的显示，还有无限体力特效调整
|
2026-09-22 15:32:32 +08:00 |
|
|
guanchao
|
8cb1ab2ec8
|
feat: 百人赛暂存
|
2026-09-16 12:44:01 +08:00 |
|
|
COMPUTER\EDY
|
5292b6562d
|
更新三期战令相关，涉及到jiazai Map Reward Utils 剩下都是战令内的
|
2026-09-09 18:01:35 +08:00 |
|