Commit Graph

7 Commits

Author SHA1 Message Date
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 b028946207 战令修复 2026-09-22 17:00:52 +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 6b921eb978 feat: add new1_50 B onboarding gates 2026-09-10 19:45:03 +08:00
keke 2e0b55b9e7 fix: 修复七日活动依赖加载与战令自动弹窗排队 2026-09-09 19:20:38 +08:00
COMPUTER\EDY 5292b6562d 更新三期战令相关,涉及到jiazai Map Reward Utils 剩下都是战令内的 2026-09-09 18:01:35 +08:00