dy
|
add9c7c562
|
fix 元旦任务
|
2023-12-27 19:49:33 +08:00 |
|
dy
|
479c309481
|
Merge branch 'bugfix' into dev
|
2023-12-27 19:32:03 +08:00 |
|
dy
|
dbb012675a
|
fix 自选支付
|
2023-12-27 19:30:49 +08:00 |
|
dy
|
b2eb783dc1
|
Merge branch 'feature/json' into dev
# Conflicts:
# src/json/huodong.json5
|
2023-12-27 19:16:06 +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
|
892717ca09
|
Merge branch 'bugfix' into dev
|
2023-12-27 19:13:24 +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
|
05ea2e4213
|
Merge remote-tracking branch 'origin/fix_rank' into dev
|
2023-12-27 18:34:29 +08:00 |
|
dy
|
3450796bb7
|
Merge branch 'bugfix' into dev
|
2023-12-27 18:34:16 +08:00 |
|
dy
|
5e476fa5c6
|
fix 探险
|
2023-12-27 18:34:04 +08:00 |
|
dy
|
4ebe8ae338
|
Merge branch 'bugfix' into dev
|
2023-12-27 17:55:29 +08:00 |
|
dy
|
3c034fb296
|
每10分钟刷新排行榜前一千名玩家的用户数据
|
2023-12-27 17:53:32 +08:00 |
|
dy
|
de90e27b3f
|
Merge branch 'bugfix' into dev
|
2023-12-27 17:06:34 +08:00 |
|
dy
|
1292156a9d
|
Merge branch 'feature/yuandan' into dev
|
2023-12-27 17:00:30 +08:00 |
|
dy
|
53a2becac5
|
娃娃机改为掉落组
|
2023-12-27 16:53:33 +08:00 |
|
xcy
|
26fd486595
|
Merge branch 'fix/conglinshoulie' into dev
|
2023-12-27 16:43:28 +08:00 |
|
xcy
|
e00e9c4dfc
|
fix:
丛林狩猎优化
|
2023-12-27 16:42:46 +08:00 |
|
dy
|
95a3e9d3fb
|
Merge branch 'feature/yuandan' into dev
|
2023-12-27 16:41:54 +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
|
03d2736e8d
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-27 14:17:21 +08:00 |
|
dy
|
b578bb0db0
|
消费竞赛改为跨服活动
|
2023-12-27 14:17:10 +08:00 |
|
dy
|
58e23b1812
|
Merge branch 'feature/yuandan' into dev
|
2023-12-27 11:09:09 +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
|
bff3115f75
|
Merge branch 'feature/yuandan' into dev
|
2023-12-27 11:03:21 +08:00 |
|
dy
|
34ace42872
|
proto
|
2023-12-27 11:03:10 +08:00 |
|
dy
|
1cf4784d42
|
元旦红点，破冰红点
|
2023-12-27 11:02:53 +08:00 |
|
dy
|
9a5cc99fb1
|
Merge branch 'bugfix' into dev
|
2023-12-27 10:23:57 +08:00 |
|
dy
|
4538c0dc16
|
自选礼包红点
|
2023-12-27 10:23:12 +08:00 |
|
dy
|
058529ea6a
|
Merge branch 'bugfix' into dev
|
2023-12-27 10:20:00 +08:00 |
|
dy
|
f9989cf002
|
自选礼包
|
2023-12-27 10:17:38 +08:00 |
|
dy
|
47a9c6efb7
|
Merge branch 'feature/yuandan' into dev
|
2023-12-27 09:51:50 +08:00 |
|
dy
|
944ef41d5d
|
达摩献礼
|
2023-12-27 09:51:37 +08:00 |
|
dy
|
2a4ed01a34
|
Merge branch 'feature/yuandan' into dev
|
2023-12-26 20:04:13 +08:00 |
|
dy
|
8503a65c1f
|
yuandan fun
|
2023-12-26 20:04:05 +08:00 |
|
dy
|
9ee67b5193
|
Merge branch 'feature/yuandan' into dev
|
2023-12-26 19:50:09 +08:00 |
|
dy
|
f50f6de933
|
yuandan
|
2023-12-26 19:49:46 +08:00 |
|
dy
|
f8b87f751e
|
Merge branch 'bugfix' into dev
|
2023-12-26 19:00:08 +08:00 |
|
dy
|
df027cdf08
|
Merge branch 'master' into dev
# Conflicts:
# src/public/pay.ts
|
2023-12-26 19:00:05 +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
|
408562d576
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-26 17:34:21 +08:00 |
|