yangzhao/MatchMaster
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
208 Commits 13 Branches 0 Tags 110 MiB
Commit Graph

183 Commits

Author SHA1 Message Date
COMPUTER\EDY 3600a78b6b 更新战令UI 2026-09-20 17:37:54 +08:00
WIN-GKKD951VVMJ\Administrator 74cf4413b5 增加一版彩虹机制 2026-09-20 17:14:40 +08:00
COMPUTER\EDY c44064852d 更新游戏到1980关，新增添加我的小程序和添加到桌面的埋点 2026-09-20 16:22:02 +08:00
COMPUTER\EDY 480d1af18b 增加埋点 2026-09-20 15:39:50 +08:00
COMPUTER\EDY 85014adc78 更新UI 2026-09-20 12:14:38 +08:00
COMPUTER\EDY ba0bc19949 十连胜调整UI 2026-09-18 18:32:09 +08:00
COMPUTER\EDY feebcb935e Merge branch 'main' into rainbow 
# Conflicts:
#	assets/GameplayIntro/script.meta
#	assets/Scene/GameScene.fire
#	assets/resources/texture.meta
#	assets/seven_day_gift/docs.meta
#	assets/seven_day_gift/test.meta
#	settings/project.json
 2026-09-18 17:13:36 +08:00
COMPUTER\EDY e2802389a7 为十连胜小更新 2026-09-18 16:43:22 +08:00
COMPUTER\EDY 9fcdc523a5 Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster 2026-09-18 16:12:27 +08:00
COMPUTER\EDY c125db45c2 十连胜终结提交 2026-09-18 15:59:32 +08:00
keke bf94bf33e0 Merge remote-tracking branch 'origin/main' into codex/coin-madness 2026-09-18 15:46:55 +08:00
WIN-GKKD951VVMJ\Administrator 7cd1ee331e 更新 获胜里面10连胜图片资源 2026-09-18 14:02:07 +08:00
keke a7aa79bd16 优化微信小程序福利功能 2026-09-18 12:14:57 +08:00
keke f047f63a7b 优化微信小程序福利功能 2026-09-18 11:49:52 +08:00
COMPUTER\EDY fdd3d748f4 更新使用锤子时不 暂停时间 2026-09-18 11:06:25 +08:00
WIN-GKKD951VVMJ\Administrator 320517f94e 最终更新，功能完毕，UI待更新 2026-09-18 10:56:57 +08:00
COMPUTER\EDY b1eb031eaa 继续更新UI 2026-09-18 09:15:55 +08:00
COMPUTER\EDY f69fd8daf7 Merge branch 'main' into newUI 
# Conflicts:
#	assets/gacha_bundle/img/cat.meta
#	assets/libs/dn-sdk-minigame.meta
#	assets/passCheck/script.meta
#	assets/pause/texture.meta
 2026-09-17 17:01:42 +08:00
COMPUTER\EDY 9ae6b0e6af 将游戏内 玩法介绍弹窗的释放做了优化，并且下载做了提前下载bundle,优先级放在了 GameScene 最低优先级。 2026-09-17 16:37:30 +08:00
keke d8e249bcb2 修复玩法介绍道具图尺寸被代码覆盖 2026-09-17 16:30:18 +08:00
guanchao 2643dd398e feat: 百人赛提交，准备提取公共资源 2026-09-17 16:15:06 +08:00
COMPUTER\EDY d9a67264b2 更新UI 2026-09-17 14:54:17 +08:00
keke 5fe9f72c17 优化七日显示与动画，优化新玩法提示分页器与图片显示 2026-09-17 10:43:21 +08:00
guanchao 09b8a24da1 feat: 暂存百人赛 2026-09-16 18:19:34 +08:00
COMPUTER\EDY 606abfbe9b 更新配置 2026-09-16 18:14:25 +08:00
COMPUTER\EDY 60e58dfc46 更新小手，更新难度出现机制 2026-09-16 18:13:28 +08:00
keke 1f25d9725b 修正玩法介绍图片英文命名并更新微信引擎插件至2.4.15 2026-09-16 16:17:12 +08:00
WIN-GKKD951VVMJ\Administrator c18d47f4b0 更新配置 2026-09-16 14:55:47 +08:00
guanchao 8cb1ab2ec8 feat: 百人赛暂存 2026-09-16 12:44:01 +08:00
keke 194323ff2c chore: remove gameplay preview tools and restore production start scene 2026-09-16 12:00:42 +08:00
keke d916c5528a Merge remote-tracking branch 'origin/main' into layout-optimization 2026-09-16 11:55:49 +08:00
keke e1fb37816f fix: correct seven-day gift claimed overlay 2026-09-16 11:47:17 +08:00
COMPUTER\EDY 130e3d6065 忽略， 2026-09-16 10:55:50 +08:00
WIN-GKKD951VVMJ\Administrator efdbceb351 更新shader动画，更新不可移动机制 十连胜 2026-09-15 20:14:07 +08:00
keke ad1ba08bc3 feat: add level gameplay introduction panel and preview tools 2026-09-15 20:06:12 +08:00
WIN-GKKD951VVMJ\Administrator 59bf39cd4e 调整十连胜彩虹功能参数 2026-09-15 18:55:37 +08:00
keke 2fa17cb972 fix: count normal main-level wins in Coin Madness mock 2026-09-15 18:48:12 +08:00
WIN-GKKD951VVMJ\Administrator ba0fdcb74c 更新瓶子动画 2026-09-15 18:41:45 +08:00
WIN-GKKD951VVMJ\Administrator 2029441aae 更新迭代动画效果 2026-09-15 18:31:24 +08:00
COMPUTER\EDY 5d408e3434 更新 2026-09-15 17:32:01 +08:00
WIN-GKKD951VVMJ\Administrator 28215af395 时间拉长 2026-09-15 17:23:46 +08:00
WIN-GKKD951VVMJ\Administrator f3a7653f8f 彩虹10连胜初版 2026-09-15 17:16:01 +08:00
keke d4dc79f0b9 refactor: keep Coin Madness frontend-only with mock service 2026-09-15 16:50:53 +08:00
keke baaf020811 feat: add on-demand Coin Madness activity bundle 2026-09-15 16:29:13 +08:00
COMPUTER\EDY e992a8f226 更新战令图片 2026-09-15 11:53:23 +08:00
COMPUTER\EDY 2b62fda4b0 更新abTest B方案第十五关不返回 首页，线上版本已经更新，涉及 Map.ts和版本 GameConfig.ts 2026-09-15 10:44:19 +08:00
COMPUTER\EDY fe1ca780b5 更新关卡配置1943出新功能，更新GameScene中一个屏蔽浮层没放UI屏蔽下层点击事件 2026-09-14 18:13:21 +08:00
COMPUTER\EDY b447dcf273 1980关卡，提交 2026-09-14 14:00:05 +08:00
COMPUTER\EDY dafc275bf0 修复每日任务和小鱼干入口 显示异常，关卡上限调整为1960 2026-09-14 13:33:18 +08:00
COMPUTER\EDY ca6b7b4b56 更新 新玩法出现模式，以及获胜配置 2026-09-11 21:29:08 +08:00
COMPUTER\EDY 89e7f695b6 abTest 前50关补充。 2026-09-11 20:22:07 +08:00
COMPUTER\EDY ada42385d4 提交 2026-09-11 19:12:58 +08:00
COMPUTER\EDY ff5ed8e4e3 abTest前50关的大版本完结， 涉及 Jiazai,ts Map.ts GameTool 2026-09-11 19:08:58 +08:00
COMPUTER\EDY 5a197ec6b8 1： Avatar头像调整一张特殊的大小 GameTool 修改finishi_stage上传不对问题， Win获胜分包单独加一个cat图片 2026-09-11 17:36:27 +08:00
COMPUTER\EDY 18805043f3 去掉七日签到log 2026-09-11 15:30:30 +08:00
COMPUTER\EDY e7613e9091 更新，取消新手礼包错误码展示 2026-09-11 14:36:13 +08:00
COMPUTER\EDY 365b224a47 测试AB 前五十更新， 2026-09-11 14:28:21 +08:00
COMPUTER\EDY 1909d6561f 1960关卡内容 2026-09-10 20:10:20 +08:00
COMPUTER\EDY 5d0f498f9e fix: keep cleared streaks from triggering delayed B guide 2026-09-10 19:47:04 +08:00
COMPUTER\EDY 6b921eb978 feat: add new1_50 B onboarding gates 2026-09-10 19:45:03 +08:00
guanchao 7cbdb87313 fix: 新手礼包金币数展示错误 2026-09-10 18:01:07 +08:00
guanchao 08c369a2cc Merge branch 'feat-newbieGift' 2026-09-10 17:49:23 +08:00
guanchao 5ba9c563d7 fix: 新手礼包金币数展示错误 2026-09-10 17:46:17 +08:00
COMPUTER\EDY a47ab69331 更改版本号配置 2026-09-10 17:28:05 +08:00
COMPUTER\EDY d477dd54c0 更新强制使用引导道具功能。 2026-09-10 17:09:05 +08:00
COMPUTER\EDY e96d8994b3 修复连胜BUG 主要在setUI 和GameTool 相关GM_INFO.winStreak , 增加ab前50所需关卡配置和新功能出现配置列表 2026-09-10 16:08:34 +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
COMPUTER\EDY 6c37331f73 旧战令换算修复 2026-09-10 11:44:53 +08:00
guanchao b189305423 feat: 新手礼包及七日签到更新 2026-09-10 10:43:30 +08:00
guanchao 371f4b02e5 Merge branch 'feat-newbieGift' 2026-09-09 20:06:13 +08:00
guanchao 6a30a6b953 fix: 游戏结束回到首页时新手礼包弹出了两次 2026-09-09 19:55:18 +08:00
guanchao 1b8cd1f557 feat: 新手礼包 2026-09-09 19:27:42 +08:00
keke 2e0b55b9e7 fix: 修复七日活动依赖加载与战令自动弹窗排队 2026-09-09 19:20:38 +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
keke d9710b055c merge: 同步 main 加载优化并兼容主页活动队列 2026-09-09 10:09:22 +08:00
COMPUTER\EDY 4e0378577d 大版本优化，主要在Map,JiaZai,GameManager, 优化新内存方案进游戏慢的问题，重新调整了所有的分包加载逻辑顺序 2026-09-08 20:40:59 +08:00
keke 9ca9804ad4 merge: 同步最新 main 并保留七日活动主页入口 2026-09-08 20:28:40 +08:00
keke 79e4a25039 feat: 完善七日活动交互、奖励动画与猫形象支持 2026-09-08 20:25:28 +08:00
COMPUTER\EDY af740a5b3c 更新了所有方块和墙壁图片以及墙壁图片的引用，GameScene和homeScene 场景一些UI调动，更新高内存机型的预热机制 2026-09-07 20:01:42 +08:00
keke f2f12d480c feat: 七日活动分包及本地模拟测试，补齐领取动画 2026-09-07 19:03:42 +08:00
keke 3d5dafe71c fix: 修复七日活动道具同步 2026-09-04 19:50:08 +08:00
keke e1ab800383 feat: 添加七日签到活动 2026-09-04 18:36:07 +08:00
COMPUTER\EDY 122b5041ce 更新1940关卡，替换新玩法出现图片 2026-09-03 20:30:22 +08:00
COMPUTER\EDY 6b56b88284 更新从五彩转移过来的奖励页面 2026-09-03 15:45:05 +08:00
COMPUTER\EDY 81ba29d067 更新内存优化方案，更新获胜结算界面图和动画 2026-09-03 14:58:36 +08:00
COMPUTER\EDY 88cf4760c9 更新 intercept BUG错误 2026-09-02 14:13:58 +08:00
huanghaipeng e30027083b Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster 2026-09-01 20:17:46 +08:00
huanghaipeng 14eb24f493 添加测试服务器请求地址 2026-09-01 20:16:06 +08:00
COMPUTER\EDY 731f89a205 Merge branch 'Memory' 
# Conflicts:
#	assets/Scene/GameScene.fire
#	assets/Script/Map.ts
#	assets/Script/module/Config/GameConfig.ts
#	assets/common.meta
 2026-09-01 20:12:36 +08:00
COMPUTER\EDY d39341d5bc 更新优化 2026-09-01 18:47:54 +08:00
WIN-GKKD951VVMJ\Administrator 76cb0b5546 大更新 2026-08-31 20:03:32 +08:00
COMPUTER\EDY 52c1b924ec 补更新 2026-08-28 23:06:22 +08:00
COMPUTER\EDY f8ef17bd56 更新 2026-08-28 22:59:13 +08:00
COMPUTER\EDY a9c2c0301c 更新内存优化 2026-08-28 19:21:40 +08:00
WIN-GKKD951VVMJ\Administrator 6cf2e385e6 更新UI小鱼干活动 2026-08-28 19:19:27 +08:00
COMPUTER\EDY 393667f236 无用更新 2026-08-27 19:45:54 +08:00
COMPUTER\EDY 4a352390b8 更新 2026-08-27 19:31:20 +08:00
COMPUTER\EDY 588db1bd39 提交 2026-08-26 10:38:10 +08:00