Commit Graph

668 Commits

Author SHA1 Message Date
dy
7b5c470f52 fix 红点 2023-12-27 22:31:09 +08:00
dy
b9a556ea30 fix pay 2023-12-27 22:09:53 +08:00
dy
757f1ba4b8 Merge branch 'feature/xiaofeijingsai' into release 2023-12-27 21:06:44 +08:00
dy
722e92a54b 消费竞赛 2023-12-27 21:05:53 +08:00
dy
2309ff4a9c Merge branch 'feature/json' into release 2023-12-27 20:50:05 +08:00
dy
c0e6f6516c cehua json 2023-12-27 20:49:23 +08:00
dy
d6d8b39afe Merge branch 'feature/json' into release
# Conflicts:
#	src/json/attr.json
#	src/json/huodong.json5
2023-12-27 20:21:51 +08:00
dy
27ec272347 cehua json 2023-12-27 20:21:13 +08:00
dy
47f16b583a Merge branch 'feature/xiaofeijingsai' into release 2023-12-27 20:20:23 +08:00
dy
82d323d5c8 Merge branch 'feature/yuandan' into release
# Conflicts:
#	src/public/pay.ts
2023-12-27 20:20:01 +08:00
dy
dced990c89 Merge remote-tracking branch 'origin/fix_rank' into release 2023-12-27 20:19:25 +08:00
dy
12300703b5 每日刷新付费礼包 2023-12-27 20:09:59 +08:00
dy
2e84333776 fix 元旦任务计数 2023-12-27 19:59:50 +08:00
dy
add9c7c562 fix 元旦任务 2023-12-27 19:49:33 +08:00
dy
dbb012675a fix 自选支付 2023-12-27 19:30:49 +08:00
dy
771c4a2ceb cehua json 2023-12-27 19:15:51 +08:00
dy
3e198b688e Merge branch 'master' into feature/json 2023-12-27 19:15:27 +08:00
dy
7af728b68c fix 自选购买 2023-12-27 19:13:17 +08:00
dy
837e9b58c8 fix 元旦红点 2023-12-27 18:50:36 +08:00
dy
5e476fa5c6 fix 探险 2023-12-27 18:34:04 +08:00
dy
3c034fb296 每10分钟刷新排行榜前一千名玩家的用户数据 2023-12-27 17:53:32 +08:00
dy
53a2becac5 娃娃机改为掉落组 2023-12-27 16:53:33 +08:00
xcy
e00e9c4dfc fix:
丛林狩猎优化
2023-12-27 16:42:46 +08:00
xcy
686f1fafc6 fix:
丛林猎手优化
2023-12-31 14:18:57 +08:00
dy
7c83a8bbe8 娃娃机改为掉落组 2023-12-27 16:41:22 +08:00
dy
0df09e0f9e 娃娃机改为掉落组 2023-12-27 16:33:31 +08:00
dy
bdb83f9da7 英雄爆伤限制为最大值1000% 2023-12-27 16:00:43 +08:00
dy
b821afc6b0 修复配件套装战力计算 2023-12-27 15:47:44 +08:00
dy
6089ad5dd2 增加抓娃娃的任务类型,userPing同步玩家钻石金币 2023-12-27 15:06:22 +08:00
dy
b578bb0db0 消费竞赛改为跨服活动 2023-12-27 14:17:10 +08:00
dy
d4bd776b48 proto 2023-12-27 11:09:00 +08:00
dy
c3fa18c9b1 proto 2023-12-27 11:08:42 +08:00
dy
34ace42872 proto 2023-12-27 11:03:10 +08:00
dy
1cf4784d42 元旦红点,破冰红点 2023-12-27 11:02:53 +08:00
dy
4538c0dc16 自选礼包红点 2023-12-27 10:23:12 +08:00
dy
f9989cf002 自选礼包 2023-12-27 10:17:38 +08:00
dy
944ef41d5d 达摩献礼 2023-12-27 09:51:37 +08:00
dy
8503a65c1f yuandan fun 2023-12-26 20:04:05 +08:00
dy
f50f6de933 yuandan 2023-12-26 19:49:46 +08:00
dy
a6efa1019e fix 讨伐海盗 2023-12-26 18:57:23 +08:00
dy
1f92fe7dc3 Revert "Revert "fix 自选支付""
This reverts commit 9e3d1b92aa.
2023-12-26 18:38:20 +08:00
dy
3e5479760d Revert "Revert "fix pay""
This reverts commit d13b9fcae0.
2023-12-26 18:38:17 +08:00
dy
74c28c787b Revert "Revert "自选类型购买改为统一方法""
This reverts commit 9837d27132.
2023-12-26 18:38:14 +08:00
dy
08d0bed291 元旦活动 2023-12-26 17:33:48 +08:00
Your Name
78b246f32a 排行榜修改 2023-12-26 17:25:03 +08:00
dy
720dc255fe Revert "redis临时修复"
This reverts commit 0e089582
2023-12-26 17:03:32 +08:00
dy
9837d27132 Revert "自选类型购买改为统一方法"
This reverts commit 93f6b5b7ba.
2023-12-26 17:02:36 +08:00
dy
d13b9fcae0 Revert "fix pay"
This reverts commit 4b8be68516.
2023-12-26 17:02:33 +08:00
dy
9e3d1b92aa Revert "fix 自选支付"
This reverts commit 91c2827b33.
2023-12-26 17:02:15 +08:00
dy
5a62e3e965 Merge branch 'bugfix' into release
# Conflicts:
#	src/public/gud.ts
2023-12-26 17:01:48 +08:00