Commit Graph

57 Commits

Author SHA1 Message Date
guanchao 2fe6c9fb62 feat: 百人赛 2026-09-24 19:33:11 +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
guanchao 5bbf4e94ee feat: 百人赛提交 2026-09-24 16:50:43 +08:00
COMPUTER\EDY 2e0d1826f1 更新首页homeScene涉及到的按钮,以及涉及到的所有分包或者活动的按钮 增加震动 2026-09-22 17:38:43 +08:00
COMPUTER\EDY b028946207 战令修复 2026-09-22 17:00:52 +08:00
COMPUTER\EDY 13ea6d64ab 修复战令商城的显示,还有无限体力特效调整 2026-09-22 15:32:32 +08:00
COMPUTER\EDY fcb0e7a43d 更新图片素材,修复合并BUG 2026-09-22 13:41:47 +08:00
COMPUTER\EDY 951bf403b5 Merge main into rainbow_old and preserve C rainbow integration 2026-09-21 20:57:42 +08:00
COMPUTER\EDY 1440395025 更新图片十连胜遮罩 2026-09-21 19:48:14 +08:00
COMPUTER\EDY b6ddb8a613 更新最新UI修改,复活礼包修改。 2026-09-21 18:05:43 +08:00
WIN-GKKD951VVMJ\Administrator bd4984c909 老彩虹最新更新 2026-09-21 18:03:23 +08:00
COMPUTER\EDY 4018dbfbfc feat: add per-run reborn gift price tiers 2026-09-21 17:13:35 +08:00
COMPUTER\EDY 736a6bb342 更新各类UI 2026-09-21 15:30:27 +08:00
guanchao 67f2306301 feat: 百人赛完成 2026-09-21 12:44:48 +08:00
COMPUTER\EDY d9a4ad6f5f Merge branch 'main' into newUI
# Conflicts:
#	assets/Scene/HomeScene.fire
#	assets/Script/Map.ts
#	assets/res/public.meta
#	settings/project.json
2026-09-20 18:29:55 +08:00
WIN-GKKD951VVMJ\Administrator 74cf4413b5 增加一版彩虹机制 2026-09-20 17:14:40 +08:00
COMPUTER\EDY c44064852d 更新游戏到1980关,新增添加我的小程序和添加到桌面的埋点 2026-09-20 16:22:02 +08:00
COMPUTER\EDY 85014adc78 更新UI 2026-09-20 12:14:38 +08:00
COMPUTER\EDY ba0bc19949 十连胜调整UI 2026-09-18 18:32:09 +08:00
COMPUTER\EDY feebcb935e Merge branch 'main' into rainbow
# Conflicts:
#	assets/GameplayIntro/script.meta
#	assets/Scene/GameScene.fire
#	assets/resources/texture.meta
#	assets/seven_day_gift/docs.meta
#	assets/seven_day_gift/test.meta
#	settings/project.json
2026-09-18 17:13:36 +08:00
COMPUTER\EDY 9fcdc523a5 Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster 2026-09-18 16:12:27 +08:00
keke f047f63a7b 优化微信小程序福利功能 2026-09-18 11:49:52 +08:00
COMPUTER\EDY fdd3d748f4 更新使用锤子时不 暂停时间 2026-09-18 11:06:25 +08:00
COMPUTER\EDY 9ae6b0e6af 将游戏内 玩法介绍弹窗的释放做了优化,并且下载做了提前下载bundle,优先级放在了 GameScene 最低优先级。 2026-09-17 16:37:30 +08:00
guanchao 2643dd398e feat: 百人赛提交,准备提取公共资源 2026-09-17 16:15:06 +08:00
keke 5fe9f72c17 优化七日显示与动画,优化新玩法提示分页器与图片显示 2026-09-17 10:43:21 +08:00
guanchao 09b8a24da1 feat: 暂存百人赛 2026-09-16 18:19:34 +08:00
WIN-GKKD951VVMJ\Administrator c18d47f4b0 更新配置 2026-09-16 14:55:47 +08:00
guanchao 8cb1ab2ec8 feat: 百人赛暂存 2026-09-16 12:44:01 +08:00
WIN-GKKD951VVMJ\Administrator efdbceb351 更新shader动画,更新不可移动机制 十连胜 2026-09-15 20:14:07 +08:00
WIN-GKKD951VVMJ\Administrator 59bf39cd4e 调整十连胜彩虹功能参数 2026-09-15 18:55:37 +08:00
WIN-GKKD951VVMJ\Administrator 2029441aae 更新迭代动画效果 2026-09-15 18:31:24 +08:00
WIN-GKKD951VVMJ\Administrator 28215af395 时间拉长 2026-09-15 17:23:46 +08:00
WIN-GKKD951VVMJ\Administrator f3a7653f8f 彩虹10连胜初版 2026-09-15 17:16:01 +08:00
COMPUTER\EDY dafc275bf0 修复每日任务和小鱼干入口 显示异常,关卡上限调整为1960 2026-09-14 13:33:18 +08:00
COMPUTER\EDY ca6b7b4b56 更新 新玩法出现模式,以及获胜配置 2026-09-11 21:29:08 +08:00
COMPUTER\EDY ada42385d4 提交 2026-09-11 19:12:58 +08:00
COMPUTER\EDY ff5ed8e4e3 abTest前50关的大版本完结, 涉及 Jiazai,ts Map.ts GameTool 2026-09-11 19:08:58 +08:00
COMPUTER\EDY 5a197ec6b8 1: Avatar头像调整一张特殊的大小 GameTool 修改finishi_stage上传不对问题, Win获胜分包单独加一个cat图片 2026-09-11 17:36:27 +08:00
COMPUTER\EDY c3894186c9 refactor: read onboarding AB assignments within server functions 2026-09-11 15:11:43 +08:00
COMPUTER\EDY 5d0f498f9e fix: keep cleared streaks from triggering delayed B guide 2026-09-10 19:47:04 +08:00
COMPUTER\EDY 6b921eb978 feat: add new1_50 B onboarding gates 2026-09-10 19:45:03 +08:00
COMPUTER\EDY d477dd54c0 更新强制使用引导道具功能。 2026-09-10 17:09:05 +08:00
guanchao 85d3dd6c50 Merge branch 'feat-newbieGift' 2026-09-10 15:20:12 +08:00
guanchao 243ab073b2 feat: 新手礼包修改样式,添加埋点数据 2026-09-10 15:12:06 +08:00
guanchao b189305423 feat: 新手礼包及七日签到更新 2026-09-10 10:43:30 +08:00
guanchao 371f4b02e5 Merge branch 'feat-newbieGift' 2026-09-09 20:06:13 +08:00
guanchao 1b8cd1f557 feat: 新手礼包 2026-09-09 19:27:42 +08:00
keke 2e0b55b9e7 fix: 修复七日活动依赖加载与战令自动弹窗排队 2026-09-09 19:20:38 +08:00
keke 4bf2c7596f Merge remote-tracking branch 'origin/main' into feature/seven_day_gift 2026-09-09 18:08:46 +08:00