MatchMaster

yangzhao/MatchMaster

Fork 0

Commit Graph

Select branches

Hide Pull Requests

Laser_gate

Memory

abTest_50Level

abTest_layerThree_levelTimeChange

codex/coin-madness

feat-newPass

feat-newShop

feat-newVersion

feat-newbieGift

feat-weekCompetition

feature/mini_program_benefits

feature/seven_day_gift

hotfix-memoryuse

layout-optimization

main

newRanks

newUI

new_shop

rainbow

rainbow_old

removeShopAndLevel

test

three_wins

#1

#2

#3

#4

#5

#6

#7

2fe6c9fb62 feat: 百人赛 guanchao 2026-09-24 19:33:11 +08:00
8fb2ef1be8 Merge branch 'feat-cloudRise' guanchao 2026-09-24 17:12:25 +08:00
5bbf4e94ee feat: 百人赛提交 guanchao 2026-09-24 16:50:43 +08:00
8b0510e7ef Merge branch 'main' into new_shop $COMPUTER\EDY$ COMPUTER\EDY 2026-09-24 16:27:50 +08:00
ad047b618a 优化更新弹窗奖励窗口数字 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-24 16:26:57 +08:00
7fd60ef294 shop 从首场景拆分完毕 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-24 15:00:09 +08:00
6a4990bb35 紧急修复一个墙壁BUG $COMPUTER\EDY$ COMPUTER\EDY 2026-09-24 11:03:21 +08:00
07169e59f4 更新 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-23 19:55:20 +08:00
8ab910f644 更新弹窗背景大小和首页按钮显示问题 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-23 17:03:53 +08:00
564488612d 更换各类图片的数字编程棕色 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-23 16:06:12 +08:00
3256667420 更新金币和头像框图片，更新一个游戏BUG和失败界面金币还有时钟 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-23 12:39:31 +08:00
300313595d 修复首页和商城体力值，歪的情况 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-22 19:54:35 +08:00
a6a73f352c 将游戏中所有图片压缩一遍 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-22 18:09:02 +08:00
2e0d1826f1 更新首页homeScene涉及到的按钮，以及涉及到的所有分包或者活动的按钮增加震动 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-22 17:38:43 +08:00
b028946207 战令修复 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-22 17:00:52 +08:00
13ea6d64ab 修复战令商城的显示，还有无限体力特效调整 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-22 15:32:32 +08:00
fcb0e7a43d 更新图片素材，修复合并BUG $COMPUTER\EDY$ COMPUTER\EDY 2026-09-22 13:41:47 +08:00
d9393c362d feat: 商城UI改版 feat-newShop guanchao 2026-09-22 10:17:58 +08:00
951bf403b5 Merge main into rainbow_old and preserve C rainbow integration rainbow_old $COMPUTER\EDY$ COMPUTER\EDY 2026-09-21 20:57:42 +08:00
1440395025 更新图片十连胜遮罩 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-21 19:48:14 +08:00
b6ddb8a613 更新最新UI修改，复活礼包修改。 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-21 18:05:43 +08:00
bd4984c909 老彩虹最新更新 $WIN-GKKD951VVMJ\Administrator$ WIN-GKKD951VVMJ\Administrator 2026-09-21 18:03:23 +08:00
4018dbfbfc feat: add per-run reborn gift price tiers $COMPUTER\EDY$ COMPUTER\EDY 2026-09-21 17:13:35 +08:00
af624bcb5f feat: 每日任务更新任务配置 guanchao 2026-09-21 16:40:28 +08:00
736a6bb342 更新各类UI newUI $COMPUTER\EDY$ COMPUTER\EDY 2026-09-21 15:30:27 +08:00
67f2306301 feat: 百人赛完成 guanchao 2026-09-21 12:44:48 +08:00
d9a4ad6f5f Merge branch 'main' into newUI $COMPUTER\EDY$ COMPUTER\EDY 2026-09-20 18:29:55 +08:00
4a81f2c454 更新图片资源 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-20 17:51:35 +08:00
3600a78b6b 更新战令UI $COMPUTER\EDY$ COMPUTER\EDY 2026-09-20 17:37:54 +08:00
74cf4413b5 增加一版彩虹机制 $WIN-GKKD951VVMJ\Administrator$ WIN-GKKD951VVMJ\Administrator 2026-09-20 17:14:40 +08:00
c44064852d 更新游戏到1980关，新增添加我的小程序和添加到桌面的埋点 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-20 16:22:02 +08:00
480d1af18b 增加埋点 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-20 15:39:50 +08:00
85014adc78 更新UI $COMPUTER\EDY$ COMPUTER\EDY 2026-09-20 12:14:38 +08:00
19f86db6df Add maximum single recharge amount to user statistics guanchao 2026-09-18 19:10:12 +08:00
ba0bc19949 十连胜调整UI rainbow $COMPUTER\EDY$ COMPUTER\EDY 2026-09-18 18:32:09 +08:00
feebcb935e Merge branch 'main' into rainbow $COMPUTER\EDY$ COMPUTER\EDY 2026-09-18 17:13:36 +08:00
e2802389a7 为十连胜小更新 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-18 16:43:22 +08:00
9fcdc523a5 Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster $COMPUTER\EDY$ COMPUTER\EDY 2026-09-18 16:12:27 +08:00
c125db45c2 十连胜终结提交 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-18 15:59:32 +08:00
bf94bf33e0 Merge remote-tracking branch 'origin/main' into codex/coin-madness keke 2026-09-18 15:46:55 +08:00
7cd1ee331e 更新获胜里面10连胜图片资源 $WIN-GKKD951VVMJ\Administrator$ WIN-GKKD951VVMJ\Administrator 2026-09-18 14:02:07 +08:00
e7a456918a 合并 PR #5：优化微信小程序福利功能 dongwenke 2026-09-18 12:24:16 +08:00
a7aa79bd16 优化微信小程序福利功能 feature/mini_program_benefits keke 2026-09-18 12:14:57 +08:00
f047f63a7b 优化微信小程序福利功能 keke 2026-09-18 11:49:52 +08:00
fdd3d748f4 更新使用锤子时不暂停时间 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-18 11:06:25 +08:00
320517f94e 最终更新，功能完毕，UI待更新 $WIN-GKKD951VVMJ\Administrator$ WIN-GKKD951VVMJ\Administrator 2026-09-18 10:56:57 +08:00
b1eb031eaa 继续更新UI $COMPUTER\EDY$ COMPUTER\EDY 2026-09-18 09:15:55 +08:00
f69fd8daf7 Merge branch 'main' into newUI $COMPUTER\EDY$ COMPUTER\EDY 2026-09-17 17:01:42 +08:00
9ae6b0e6af 将游戏内玩法介绍弹窗的释放做了优化，并且下载做了提前下载bundle,优先级放在了 GameScene 最低优先级。 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-17 16:37:30 +08:00
ebe5a4ec35 合并 PR #4：修复玩法介绍道具图尺寸被代码覆盖 dongwenke 2026-09-17 16:33:30 +08:00
d8e249bcb2 修复玩法介绍道具图尺寸被代码覆盖 layout-optimization keke 2026-09-17 16:30:18 +08:00
2643dd398e feat: 百人赛提交，准备提取公共资源 guanchao 2026-09-17 16:15:06 +08:00
d9a67264b2 更新UI $COMPUTER\EDY$ COMPUTER\EDY 2026-09-17 14:54:17 +08:00
35d8b8a611 合并 PR #3：优化七日显示与动画，优化新玩法提示分页器与图片显示 dongwenke 2026-09-17 11:19:39 +08:00
5fe9f72c17 优化七日显示与动画，优化新玩法提示分页器与图片显示 keke 2026-09-17 10:43:21 +08:00
f14efa81b5 更新打包配置 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-16 19:16:34 +08:00
09b8a24da1 feat: 暂存百人赛 guanchao 2026-09-16 18:19:34 +08:00
606abfbe9b 更新配置 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-16 18:14:25 +08:00
60e58dfc46 更新小手，更新难度出现机制 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-16 18:13:28 +08:00
1f25d9725b 修正玩法介绍图片英文命名并更新微信引擎插件至2.4.15 keke 2026-09-16 16:17:12 +08:00
c18d47f4b0 更新配置 $WIN-GKKD951VVMJ\Administrator$ WIN-GKKD951VVMJ\Administrator 2026-09-16 14:55:47 +08:00
c2f51a01ee Merge pull request 'layout-optimization' (#2) from layout-optimization into main dongwenke 2026-09-16 14:19:36 +08:00
6a3ffd09f5 Move recharge statistics to dedicated collection guanchao 2026-09-16 13:11:27 +08:00
8cb1ab2ec8 feat: 百人赛暂存 guanchao 2026-09-16 12:44:01 +08:00
194323ff2c chore: remove gameplay preview tools and restore production start scene keke 2026-09-16 12:00:42 +08:00
d916c5528a Merge remote-tracking branch 'origin/main' into layout-optimization keke 2026-09-16 11:55:49 +08:00
5e71692956 fix: 修复七日礼包已领取遮罩层级及第七天显示 feature/seven_day_gift keke 2026-09-16 11:48:42 +08:00
e1fb37816f fix: correct seven-day gift claimed overlay keke 2026-09-16 11:47:17 +08:00
130e3d6065 忽略， $COMPUTER\EDY$ COMPUTER\EDY 2026-09-16 10:55:50 +08:00
efdbceb351 更新shader动画，更新不可移动机制十连胜 $WIN-GKKD951VVMJ\Administrator$ WIN-GKKD951VVMJ\Administrator 2026-09-15 20:14:07 +08:00
ad1ba08bc3 feat: add level gameplay introduction panel and preview tools keke 2026-09-15 20:06:12 +08:00
59bf39cd4e 调整十连胜彩虹功能参数 $WIN-GKKD951VVMJ\Administrator$ WIN-GKKD951VVMJ\Administrator 2026-09-15 18:55:37 +08:00
2fa17cb972 fix: count normal main-level wins in Coin Madness mock keke 2026-09-15 18:48:12 +08:00
ba0fdcb74c 更新瓶子动画 $WIN-GKKD951VVMJ\Administrator$ WIN-GKKD951VVMJ\Administrator 2026-09-15 18:41:45 +08:00
2029441aae 更新迭代动画效果 $WIN-GKKD951VVMJ\Administrator$ WIN-GKKD951VVMJ\Administrator 2026-09-15 18:31:24 +08:00
58a97dc355 fix: anchor recharge statistics to previous Beijing day end guanchao 2026-09-15 18:01:22 +08:00
d137b4e030 fix: report recharge in fen with daily three-hour cutoff guanchao 2026-09-15 17:51:32 +08:00
2224688b65 feat: add rolling paid-user recharge statistics job guanchao 2026-09-15 17:38:54 +08:00
5d408e3434 更新 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-15 17:32:01 +08:00
28215af395 时间拉长 $WIN-GKKD951VVMJ\Administrator$ WIN-GKKD951VVMJ\Administrator 2026-09-15 17:23:46 +08:00
f3a7653f8f 彩虹10连胜初版 $WIN-GKKD951VVMJ\Administrator$ WIN-GKKD951VVMJ\Administrator 2026-09-15 17:16:01 +08:00
d4dc79f0b9 refactor: keep Coin Madness frontend-only with mock service keke 2026-09-15 16:50:53 +08:00
baaf020811 feat: add on-demand Coin Madness activity bundle keke 2026-09-15 16:29:13 +08:00
e992a8f226 更新战令图片 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-15 11:53:23 +08:00
2b62fda4b0 更新abTest B方案第十五关不返回首页，线上版本已经更新，涉及 Map.ts和版本 GameConfig.ts $COMPUTER\EDY$ COMPUTER\EDY 2026-09-15 10:44:19 +08:00
fe1ca780b5 更新关卡配置1943出新功能，更新GameScene中一个屏蔽浮层没放UI屏蔽下层点击事件 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-14 18:13:21 +08:00
b447dcf273 1980关卡，提交 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-14 14:00:05 +08:00
dafc275bf0 修复每日任务和小鱼干入口显示异常，关卡上限调整为1960 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-14 13:33:18 +08:00
ca6b7b4b56 更新新玩法出现模式，以及获胜配置 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-11 21:29:08 +08:00
89e7f695b6 abTest 前50关补充。 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-11 20:22:07 +08:00
ada42385d4 提交 abTest_50Level $COMPUTER\EDY$ COMPUTER\EDY 2026-09-11 19:12:58 +08:00
ff5ed8e4e3 abTest前50关的大版本完结，涉及 Jiazai,ts Map.ts GameTool $COMPUTER\EDY$ COMPUTER\EDY 2026-09-11 19:08:58 +08:00
5a197ec6b8 1： Avatar头像调整一张特殊的大小 GameTool 修改finishi_stage上传不对问题， Win获胜分包单独加一个cat图片 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-11 17:36:27 +08:00
18805043f3 去掉七日签到log $COMPUTER\EDY$ COMPUTER\EDY 2026-09-11 15:30:30 +08:00
c3894186c9 refactor: read onboarding AB assignments within server functions $COMPUTER\EDY$ COMPUTER\EDY 2026-09-11 15:11:43 +08:00
e7613e9091 更新，取消新手礼包错误码展示 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-11 14:36:13 +08:00
365b224a47 测试AB 前五十更新， $COMPUTER\EDY$ COMPUTER\EDY 2026-09-11 14:28:21 +08:00
1909d6561f 1960关卡内容 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-10 20:10:20 +08:00
9c69ebb095 更新ABTest 前五十关方案初版 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-10 19:55:12 +08:00
5d0f498f9e fix: keep cleared streaks from triggering delayed B guide $COMPUTER\EDY$ COMPUTER\EDY 2026-09-10 19:47:04 +08:00

1 2 3 4