yangzhao/MatchMaster
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
262 Commits 23 Branches 0 Tags
b22d243f2c8a7fae6adf24a2d875efe7dcc79f39
Commit Graph
262 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
guanchao b22d243f2c fix: 1961关卡数据回退 2026-10-15 16:31:12 +08:00
guanchao e279afa31d fix: 部分活动未上报yinli_Pay 2026-10-15 15:37:27 +08:00
guanchao af38c6c9ec fix: 调整关卡 2026-10-15 12:30:33 +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 bbd8262fcb fix: 图片资源没压缩导致上传版本失败 2026-10-14 16:11:19 +08:00
guanchao 930d95b55f fix: 战令首页图标 2026-10-14 15:54:43 +08:00
guanchao 6a757393f7 fix: 解决代码冲突时的遗留问题 2026-10-14 14:49:42 +08:00
guanchao 310c418bd2 feat: 调整版本号 2026-10-14 14:40:24 +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 411f44c29f 更新版本 2026-10-13 20:11:49 +08:00
COMPUTER\EDY cf665aac1c 修复一个 体力礼包问题 2026-10-13 20:10:18 +08:00
guanchao cacd57e382 feat: 删除每日任务旧资源 2026-10-13 20:01:38 +08:00
COMPUTER\EDY fe8594604f 更新资源清理以及 战令 介绍恢复 2026-10-13 16:24:32 +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 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
COMPUTER\EDY 8e5c271302 更新体力包弹窗预制体 2026-10-12 16:27:23 +08:00
guanchao 1011ed4b22 feat: 合并金字塔活动 2026-10-12 15:00:49 +08:00
COMPUTER\EDY 7cb749c6fe 增加公共金币图片 2026-10-12 10:43:22 +08:00
COMPUTER\EDY 7302fccb48 更新一个 关卡时间AB方案 2026-10-10 18:35:48 +08:00
dongwenke eb2fe6175a Merge pull request '修改黄金矿工活动面板的倒计时规则' (#7) from codex/coin-madness into main 
Reviewed-on: #7
 2026-10-10 17:20:23 +08:00
keke 1f3c329eb3 修改黄金矿工活动面板的倒计时规则 2026-10-10 17:15:37 +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 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