 guanchao
|
bbe01c3f85
|
fix: 百人赛关闭按钮位置
|
2026-10-19 15:28:40 +08:00 |
|
|
COMPUTER\EDY
|
aa1e079d22
|
三连胜提交
|
2026-10-16 16:24:28 +08:00 |
|
|
guanchao
|
400e0f81b9
|
feat: cdn请求优化
|
2026-10-16 15:02:14 +08:00 |
|
|
guanchao
|
e279afa31d
|
fix: 部分活动未上报yinli_Pay
|
2026-10-15 15:37:27 +08:00 |
|
|
guanchao
|
287f088fec
|
feat: 每日任务兼容
|
2026-10-15 11:56:15 +08:00 |
|
|
guanchao
|
6816600fa1
|
Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster
|
2026-10-14 18:08:15 +08:00 |
|
|
guanchao
|
ba040e553b
|
feat: 每日任务领取时可以同时领多个奖励，不需要等待上一次奖励动画播放完毕
|
2026-10-14 18:08:10 +08:00 |
|
|
COMPUTER\EDY
|
89e1de46d4
|
更新开关门冻结状态下不开门
|
2026-10-14 18:06:36 +08:00 |
|
|
guanchao
|
2c58225818
|
Merge branch 'feat-dailyQuest'
|
2026-10-14 14:39:25 +08:00 |
|
|
guanchao
|
618f94a721
|
feat: 每日任务首次通过关卡逻辑调整
|
2026-10-14 14:39:00 +08:00 |
|
|
guanchao
|
4e158f0463
|
Merge branch 'main' into feat-dailyQuest
|
2026-10-13 20:30:46 +08:00 |
|
|
COMPUTER\EDY
|
cf665aac1c
|
修复一个 体力礼包问题
|
2026-10-13 20:10:18 +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
|
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
|
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 |
|
|
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
|
94cc9e2ad1
|
feat: 每日任务进度添加动画
|
2026-09-29 11:18:17 +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 |
|