COMPUTER\EDY
|
129074123c
|
Merge branch 'main' into newbieGift
# Conflicts:
# assets/Script/module/Pay/Utils.ts
|
2026-09-30 22:35:04 +08:00 |
|
|
COMPUTER\EDY
|
18146a65d4
|
更新新手礼包
|
2026-09-30 22:30:22 +08:00 |
|
|
keke
|
7fb430e512
|
fix: fit activity amounts and show unpaid completion badge
|
2026-09-30 22:05:58 +08:00 |
|
|
COMPUTER\EDY
|
b8e02e08d0
|
fix: keep starter pack rewards client-side
|
2026-09-30 21:49:05 +08:00 |
|
|
keke
|
7e14f66170
|
feat: integrate Gold Miner activity and remove development test panels
|
2026-09-30 19:43:47 +08:00 |
|
|
COMPUTER\EDY
|
60f8fc4047
|
feat: tier starter packs using daily payment factors
|
2026-09-30 18:45:13 +08:00 |
|
|
keke
|
483f73c7a1
|
Merge remote-tracking branch 'origin/main' into codex/coin-madness
# Conflicts:
# assets/Script/JiaZai.ts
|
2026-09-29 20:49:27 +08:00 |
|
|
COMPUTER\EDY
|
50f024c969
|
Merge branch 'main' into new_shop
# Conflicts:
# settings/project.json
|
2026-09-29 19:00:23 +08:00 |
|
|
COMPUTER\EDY
|
271cdb53d2
|
更新AB商城最终版
|
2026-09-29 18:57:56 +08:00 |
|
|
guanchao
|
3d8a7bbdc4
|
feat: 百人赛和小程序福利图标移动到首页右侧
|
2026-09-28 20:08:04 +08:00 |
|
|
COMPUTER\EDY
|
79cd1fa36d
|
更新复活月卡和商城2
|
2026-09-28 19:44:50 +08:00 |
|
|
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
|
bf94bf33e0
|
Merge remote-tracking branch 'origin/main' into codex/coin-madness
|
2026-09-18 15:46:55 +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 |
|
|
keke
|
2fa17cb972
|
fix: count normal main-level wins in Coin Madness mock
|
2026-09-15 18:48:12 +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 |
|
|
keke
|
d4dc79f0b9
|
refactor: keep Coin Madness frontend-only with mock service
|
2026-09-15 16:50:53 +08:00 |
|
|
keke
|
baaf020811
|
feat: add on-demand Coin Madness activity bundle
|
2026-09-15 16:29:13 +08:00 |
|
|
COMPUTER\EDY
|
dafc275bf0
|
修复每日任务和小鱼干入口 显示异常，关卡上限调整为1960
|
2026-09-14 13:33:18 +08:00 |
|