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 |
|
dy
|
4ae077503f
|
Merge branch 'feature/yuandan' into dev
|
2023-12-26 17:34:11 +08:00 |
|
dy
|
08d0bed291
|
元旦活动
|
2023-12-26 17:33:48 +08:00 |
|
Your Name
|
c901756cc8
|
排行榜修改
|
2023-12-26 17:27:22 +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 |
|
dy
|
7b7a4486eb
|
shop json
|
2023-12-26 17:00:33 +08:00 |
|
Your Name
|
d6c801db91
|
商店刷新更改
|
2023-12-26 17:00:33 +08:00 |
|
dy
|
0e08958202
|
redis临时修复
|
2023-12-26 17:00:33 +08:00 |
|
dy
|
03b774b73e
|
Merge branch 'feature/yuandan' into dev
|
2023-12-26 16:53:53 +08:00 |
|
dy
|
21994f214a
|
元旦fix
|
2023-12-26 16:53:43 +08:00 |
|
dy
|
ceec9c5be2
|
Merge branch 'feature/json' into dev
# Conflicts:
# src/json/huodong.json5
|
2023-12-26 16:49:13 +08:00 |
|
dy
|
5fa9d088d9
|
cehua json
|
2023-12-26 16:48:20 +08:00 |
|
dy
|
4e83e2ac72
|
Merge branch 'bugfix' into dev
|
2023-12-26 16:33:55 +08:00 |
|
dy
|
bb8ec648e3
|
Merge branch 'feature/yuandan' into dev
|
2023-12-26 16:33:41 +08:00 |
|
dy
|
ae0a5c6882
|
fix元旦
|
2023-12-26 16:33:31 +08:00 |
|
dy
|
3d2e73e76d
|
Merge branch 'feature/yuandan' into dev
|
2023-12-26 16:21:38 +08:00 |
|
dy
|
bfc9ff369c
|
fix元旦
|
2023-12-26 16:20:59 +08:00 |
|
Your Name
|
b67087a3bf
|
修改api进程锁
|
2023-12-26 16:12:09 +08:00 |
|
dy
|
5f2d865966
|
proto
|
2023-12-26 15:28:36 +08:00 |
|