yangzhao/MatchMaster
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
309 Commits 23 Branches 0 Tags
fea5575a64acaa6b2aae015e0633d74e5418fe26
Commit Graph
54 Commits
Author SHA1 Message Date
guanchao 86f4427079 feat: 弹窗及动画管理器 2026-11-04 11:23:46 +08:00
guanchao e6e359d9d3 fix: 数数收集到的报错信息 2026-10-27 14:55:03 +08:00
guanchao 421e35b89c feat: resource_get事件补充、修复异常关卡 2026-10-21 16:33:54 +08:00
COMPUTER\EDY a4bc41d06d 回退到400e0f81，撤销两次三连胜修改 2026-10-19 14:05:49 +08:00
COMPUTER\EDY 60c7c8aa4a 修复3连胜不断连胜 2026-10-16 20:29:54 +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
COMPUTER\EDY 89e1de46d4 更新开关门冻结状态下不开门 2026-10-14 18:06:36 +08:00
guanchao 6a757393f7 fix: 解决代码冲突时的遗留问题 2026-10-14 14:49:42 +08:00
guanchao 4e158f0463 Merge branch 'main' into feat-dailyQuest 2026-10-13 20:30:46 +08:00
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 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 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 2390191014 feat: allow repeat Wucai save selection on external entry 2026-10-10 12:40:34 +08:00
guanchao 903c81b1f1 feat: 前端轮询战令结算接口逻辑调整 2026-10-09 19:07:45 +08:00
COMPUTER\EDY ac8f227f01 修复战令UI 问题 2026-10-09 17:53:38 +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
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
COMPUTER\EDY 4fc9298686 更新商城最新版本支付，并且优化弹窗奖励和部分UI 2026-09-30 10:10:34 +08:00
guanchao 8467cc9324 feat: 体验版改为请求正式服 2026-09-28 20:14:00 +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 4018dbfbfc feat: add per-run reborn gift price tiers 2026-09-21 17:13:35 +08:00
guanchao 67f2306301 feat: 百人赛完成 2026-09-21 12:44:48 +08:00
COMPUTER\EDY 365b224a47 测试AB 前五十更新， 2026-09-11 14:28:21 +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 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 4bf2c7596f Merge remote-tracking branch 'origin/main' into feature/seven_day_gift 2026-09-09 18:08:46 +08:00
COMPUTER\EDY 5292b6562d 更新三期战令相关，涉及到jiazai Map Reward Utils 剩下都是战令内的 2026-09-09 18:01:35 +08:00
guanchao f455953ecc feat: 每日任务改版 2026-09-09 09:53:59 +08:00
keke e1ab800383 feat: 添加七日签到活动 2026-09-04 18:36:07 +08:00
COMPUTER\EDY 88cf4760c9 更新 intercept BUG错误 2026-09-02 14:13:58 +08:00
huanghaipeng 14eb24f493 添加测试服务器请求地址 2026-09-01 20:16:06 +08:00
WIN-GKKD951VVMJ\Administrator 6cf2e385e6 更新UI小鱼干活动 2026-08-28 19:19:27 +08:00
COMPUTER\EDY 094cc24afe 更新 2026-08-26 10:34:57 +08:00
COMPUTER\EDY 0986cfd813 更新转移系统 2026-08-20 19:27:38 +08:00
COMPUTER\EDY c42c67ccce 更新转移系统 2026-08-20 12:36:50 +08:00
COMPUTER\EDY 76c70cd0d2 更新活动礼包活动 2026-08-07 10:59:22 +08:00