 guanchao
|
c7eb255ca2
|
feat: 测试新版本更新逻辑
|
2026-10-13 14:38:54 +08:00 |
|
|
guanchao
|
94631eb478
|
Merge branch 'main' into feat-newVersion
|
2026-10-13 13:46:16 +08:00 |
|
|
guanchao
|
518a65759e
|
fix: 移除编辑器／浏览器预览
|
2026-10-13 13:45:49 +08:00 |
|
|
COMPUTER\EDY
|
d8d8144e42
|
更新修复金字塔
|
2026-10-13 12:55:12 +08:00 |
|
|
guanchao
|
bc5272de5d
|
feat: 新版本更新逻辑
|
2026-10-13 09:08:25 +08:00 |
|
|
COMPUTER\EDY
|
64d4d11dda
|
Merge branch 'hp_gift'
# Conflicts:
# assets/pyramid/art.meta
|
2026-10-12 18:42:32 +08:00 |
|
|
COMPUTER\EDY
|
16d878c0b4
|
最后更新 无限体力礼包，将两个分包从主包拆出来
|
2026-10-12 18:40:56 +08:00 |
|
|
COMPUTER\EDY
|
5241738241
|
无限体力礼包第一版
|
2026-10-12 17:44:35 +08:00 |
|
|
guanchao
|
52a801f1c4
|
fix: 资源引用问题
|
2026-10-12 17:03:13 +08:00 |
|
|
guanchao
|
1011ed4b22
|
feat: 合并金字塔活动
|
2026-10-12 15:00:49 +08:00 |
|
|
COMPUTER\EDY
|
7302fccb48
|
更新一个 关卡时间AB方案
|
2026-10-10 18:35:48 +08:00 |
|
|
COMPUTER\EDY
|
85daacefe1
|
更新无限转移
|
2026-10-10 14:42:05 +08:00 |
|
|
COMPUTER\EDY
|
2390191014
|
feat: allow repeat Wucai save selection on external entry
|
2026-10-10 12:40:34 +08:00 |
|
|
COMPUTER\EDY
|
1a8ba3b11d
|
更新所有按钮音效
|
2026-10-10 11:54:48 +08:00 |
|
|
COMPUTER\EDY
|
9bf06c7630
|
Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster
|
2026-10-10 11:08:23 +08:00 |
|
|
COMPUTER\EDY
|
74070b2766
|
更新前50关AB 合并
|
2026-10-10 11:07:10 +08:00 |
|
|
guanchao
|
eaadd8f4a6
|
Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster
|
2026-10-09 19:07:51 +08:00 |
|
|
guanchao
|
903c81b1f1
|
feat: 前端轮询战令结算接口逻辑调整
|
2026-10-09 19:07:45 +08:00 |
|
|
COMPUTER\EDY
|
6150206adb
|
商城方案合并采用B 放弃A方案并且删除预制体和独享图片
|
2026-10-09 19:06:38 +08:00 |
|
|
COMPUTER\EDY
|
ac8f227f01
|
修复战令UI 问题
|
2026-10-09 17:53:38 +08:00 |
|
|
COMPUTER\EDY
|
640dc21370
|
更新战令
|
2026-10-09 14:30:01 +08:00 |
|
|
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 |
|
|
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 |
|
|
keke
|
e4973ae845
|
Merge remote-tracking branch 'origin/main' into codex/coin-madness
|
2026-09-30 19:37:24 +08:00 |
|
|
COMPUTER\EDY
|
60f8fc4047
|
feat: tier starter packs using daily payment factors
|
2026-09-30 18:45:13 +08:00 |
|
|
COMPUTER\EDY
|
0d12143572
|
更新修复一个显示异常
|
2026-09-30 17:15:21 +08:00 |
|
|
COMPUTER\EDY
|
36e6adb803
|
关卡上限调整为2000
|
2026-09-30 11:21:23 +08:00 |
|
|
COMPUTER\EDY
|
4fc9298686
|
更新商城最新版本支付，并且优化弹窗奖励和部分UI
|
2026-09-30 10:10:34 +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
|
8467cc9324
|
feat: 体验版改为请求正式服
|
2026-09-28 20:14:00 +08:00 |
|
|
guanchao
|
5237884876
|
Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster
|
2026-09-28 20:08:09 +08:00 |
|
|
guanchao
|
3d8a7bbdc4
|
feat: 百人赛和小程序福利图标移动到首页右侧
|
2026-09-28 20:08:04 +08:00 |
|
|
COMPUTER\EDY
|
9f613c20b1
|
更新复活补丁
|
2026-09-28 19:55:30 +08:00 |
|
|
COMPUTER\EDY
|
79cd1fa36d
|
更新复活月卡和商城2
|
2026-09-28 19:44:50 +08:00 |
|
|
guanchao
|
d6d609f955
|
feat: 新增20关
|
2026-09-28 15:23:30 +08:00 |
|
|
COMPUTER\EDY
|
bef5388952
|
更新了 BC彩虹方案领取提示
|
2026-09-24 20:46:42 +08:00 |
|
|
COMPUTER\EDY
|
bb87d148dc
|
Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster
|
2026-09-24 19:54:05 +08:00 |
|
|
COMPUTER\EDY
|
86ccc75bc5
|
修复64关
|
2026-09-24 19:51:53 +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
|
8b0510e7ef
|
Merge branch 'main' into new_shop
# Conflicts:
# assets/res/shop.meta
|
2026-09-24 16:27:50 +08:00 |
|