COMPUTER\EDY
|
64ed8ad737
|
Merge branch 'feat-newPass'
|
2026-10-09 17:54:01 +08:00 |
|
|
COMPUTER\EDY
|
ac8f227f01
|
修复战令UI 问题
|
2026-10-09 17:53:38 +08:00 |
|
|
COMPUTER\EDY
|
cddca62fb5
|
更新后端战令代码
|
2026-10-09 14:33:52 +08:00 |
|
|
COMPUTER\EDY
|
640dc21370
|
更新战令
|
2026-10-09 14:30:01 +08:00 |
|
|
COMPUTER\EDY
|
28d69d29eb
|
fix: replace null jungle settlement records atomically
|
2026-10-09 14:21:27 +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 |
|
|
COMPUTER\EDY
|
6ce1fe8b2a
|
无异议
|
2026-10-09 10:28:02 +08:00 |
|
|
guanchao
|
112dad4eb2
|
feat: 战令更新
|
2026-10-09 10:03:29 +08:00 |
|
|
guanchao
|
c36447a646
|
feat: 新版商城scrollview y值调整
|
2026-10-08 11:32:50 +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
|
038743f3f2
|
fix: disable starter pack server purchase guard
|
2026-09-30 22:01:37 +08:00 |
|
|
COMPUTER\EDY
|
b8e02e08d0
|
fix: keep starter pack rewards client-side
|
2026-09-30 21:49:05 +08:00 |
|
 dongwenke
|
96a5e1acf9
|
Merge pull request 'codex/coin-madness' (#6) from codex/coin-madness into main
Reviewed-on: #6
|
2026-09-30 20:08:24 +08:00 |
|
|
keke
|
490cc0b1da
|
docs: align Gold Miner documentation with current client and V1.7 gaps
|
2026-09-30 20:05:20 +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
|
44901f1e50
|
更新 1957关BUG
|
2026-09-30 17:59:19 +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 |
|
|
COMPUTER\EDY
|
7886bbfef5
|
refactor(shop): inline B product config in existing payment functions
|
2026-09-29 16:29:17 +08:00 |
|
|
COMPUTER\EDY
|
81dac3b154
|
feat(shop): support layer3 B shop product pricing
|
2026-09-29 16:06:14 +08:00 |
|
|
guanchao
|
00f7beb374
|
Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster
|
2026-09-28 20:14:05 +08:00 |
|
|
guanchao
|
8467cc9324
|
feat: 体验版改为请求正式服
|
2026-09-28 20:14:00 +08:00 |
|
|
guanchao
|
f42371a9e0
|
feat: 体验版改为请求正式服
|
2026-09-28 20:13:04 +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
|
b183bf7e08
|
Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster
|
2026-09-28 18:04:19 +08:00 |
|
|
guanchao
|
d6d609f955
|
feat: 新增20关
|
2026-09-28 15:23:30 +08:00 |
|
|
COMPUTER\EDY
|
832daee12b
|
服务器代码从关超 服务器代码中拉取过来。
|
2026-09-28 14:09:06 +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 |
|
|
COMPUTER\EDY
|
ad047b618a
|
优化更新弹窗奖励窗口数字
|
2026-09-24 16:26:57 +08:00 |
|
|
COMPUTER\EDY
|
7fd60ef294
|
shop 从首场景拆分完毕
|
2026-09-24 15:00:09 +08:00 |
|
|
COMPUTER\EDY
|
6a4990bb35
|
紧急修复一个 墙壁BUG
|
2026-09-24 11:03:21 +08:00 |
|
|
COMPUTER\EDY
|
07169e59f4
|
更新
|
2026-09-23 19:55:20 +08:00 |
|