xcy
|
8a69a4fc1e
|
修复排行榜
|
2023-12-28 18:13:50 +08:00 |
|
dy
|
63877a2664
|
Merge branch 'bugfix' into release
|
2023-12-28 17:34:02 +08:00 |
|
dy
|
1a88ed0784
|
Merge branch 'feature/json' into release
|
2023-12-28 17:33:54 +08:00 |
|
dy
|
f2b9f12390
|
huodong.json
|
2023-12-28 17:33:47 +08:00 |
|
dy
|
6a0a158fba
|
fix 脚本
|
2023-12-28 17:33:08 +08:00 |
|
dy
|
9d9c37714b
|
Merge branch 'bugfix' into release
|
2023-12-28 16:13:54 +08:00 |
|
dy
|
37f2472f5d
|
修复脚本模板，刷新活动内容脚本
|
2023-12-28 16:10:56 +08:00 |
|
xcy
|
bf4f22d092
|
fix:
修复终身卡邮件没有type
|
2023-12-28 15:18:47 +08:00 |
|
dy
|
4343d50f7c
|
Merge branch 'feature/yuandan' into release
|
2023-12-28 15:17:35 +08:00 |
|
dy
|
5512bf3422
|
Merge branch 'feature/json' into release
|
2023-12-28 15:17:24 +08:00 |
|
dy
|
86595c68b3
|
cehua json
|
2023-12-28 15:17:06 +08:00 |
|
dy
|
847a1d03e9
|
注释
|
2023-12-28 15:14:42 +08:00 |
|
xcy
|
96729c719a
|
fix:
终身卡发放奖励bug修复
|
2023-12-28 14:48:52 +08:00 |
|
xcy
|
075c60a9f8
|
fix:
终身卡定时器log
|
2023-12-28 14:42:45 +08:00 |
|
dy
|
1412da00ae
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2023-12-28 14:18:33 +08:00 |
|
dy
|
4e19dc21a1
|
fix聊天禁言，英雄阵形战力计算
|
2023-12-28 14:18:26 +08:00 |
|
xcy
|
27d7a56d10
|
累计充值累计金额修改为累计vip经验(金额*10)
|
2023-12-28 13:44:35 +08:00 |
|
dy
|
053ab1ab23
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2023-12-28 13:39:54 +08:00 |
|
dy
|
07fa117614
|
fix公共方法 random
|
2023-12-28 13:39:28 +08:00 |
|
xcy
|
d6e41758f9
|
fix:
修复终身卡每周奖励未发放bug
|
2023-12-28 11:49:21 +08:00 |
|
Your Name
|
4fc0aa8576
|
fix:
修复悬赏任务一键领取3倍奖励逻辑错误
|
2023-12-28 11:11:13 +08:00 |
|
Your Name
|
47b1fe4d22
|
fix:修复悬赏任务一键领取特权问题
|
2023-12-28 10:08:19 +08:00 |
|
dy
|
e098e41885
|
paylog增加args记录
|
2023-12-28 10:05:52 +08:00 |
|
xcy
|
36a82d135b
|
Merge branch 'fix/conglinshoulie' into dev
|
2023-12-28 00:02:35 +08:00 |
|
dy
|
f0fc5a5901
|
Merge branch 'bugfix' into dev
|
2023-12-31 17:52:22 +08:00 |
|
dy
|
9e032536f0
|
Merge branch 'bugfix' into dev
|
2023-12-31 17:22:26 +08:00 |
|
dy
|
b46260f4a2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-31 17:05:25 +08:00 |
|
dy
|
22dd6644a3
|
Merge branch 'bugfix' into dev
|
2023-12-31 17:05:15 +08:00 |
|
dy
|
76f9dd1f98
|
Merge branch 'bugfix' into dev
|
2023-12-31 15:23:06 +08:00 |
|
xcy
|
60bcf1d794
|
Merge branch 'fix/conglinshoulie' into dev
|
2023-12-31 14:20:08 +08:00 |
|
xcy
|
686f1fafc6
|
fix:
丛林猎手优化
|
2023-12-31 14:18:57 +08:00 |
|
dy
|
3f2daecfef
|
Merge branch 'bugfix' into dev
|
2023-12-31 13:43:53 +08:00 |
|
dy
|
dbd1e72657
|
Merge branch 'bugfix' into dev
|
2023-12-31 13:37:06 +08:00 |
|
dy
|
4128508a4c
|
Merge branch 'feature/leichong' into dev
|
2023-12-31 11:45:57 +08:00 |
|
dy
|
6f17e77f14
|
Merge branch 'bugfix' into dev
|
2023-12-31 11:24:45 +08:00 |
|
dy
|
eafa42880a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-31 09:48:45 +08:00 |
|
dy
|
da4a53d071
|
Merge branch 'feature/leichong' into dev
|
2023-12-31 09:48:33 +08:00 |
|
xcy
|
a7d11fe54e
|
Merge branch 'bugfix' into dev
|
2023-12-30 18:04:20 +08:00 |
|
dy
|
86866e9233
|
Merge branch 'bugfix' into dev
|
2023-12-30 16:32:49 +08:00 |
|
dy
|
611898b501
|
Merge branch 'feature/leichong' into dev
|
2023-12-30 16:32:38 +08:00 |
|
dy
|
f6df6fd8bc
|
Merge branch 'bugfix' into dev
|
2023-12-30 10:43:31 +08:00 |
|
dy
|
005a086ea1
|
Merge branch 'master' into dev
|
2023-12-30 10:28:00 +08:00 |
|
dy
|
9d14aea6b8
|
Merge branch 'bugfix' into dev
|
2023-12-29 19:42:43 +08:00 |
|
xcy
|
59a07175e6
|
Merge branch 'bugfix' into dev
|
2023-12-29 18:43:58 +08:00 |
|
dy
|
718add173f
|
Merge branch 'feature/json' into dev
|
2023-12-29 16:52:17 +08:00 |
|
dy
|
94cf1f9c4f
|
Merge branch 'bugfix' into dev
|
2023-12-29 16:26:22 +08:00 |
|
dy
|
be8691ce6d
|
Merge branch 'bugfix' into dev
|
2023-12-29 16:21:55 +08:00 |
|
dy
|
f7cf497ded
|
Merge branch 'bugfix' into dev
|
2023-12-29 14:22:17 +08:00 |
|
dy
|
3462540159
|
Merge branch 'bugfix' into dev
# Conflicts:
# src/public/pay.ts
|
2023-12-29 13:53:02 +08:00 |
|
xcy
|
52a112085b
|
Merge remote-tracking branch 'origin/bugfix' into dev
|
2023-12-28 18:46:58 +08:00 |
|
xcy
|
2894f384b9
|
Merge remote-tracking branch 'origin/bugfix' into dev
# Conflicts:
# src/public/rank/rank.ts
|
2023-12-28 18:22:20 +08:00 |
|
xcy
|
2739774842
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-28 18:20:15 +08:00 |
|
dy
|
17aa676fa9
|
Merge branch 'bugfix' into dev
|
2023-12-28 16:16:09 +08:00 |
|
xcy
|
34ce5c01aa
|
fix:
修复终身卡邮件没有type
|
2023-12-28 15:19:06 +08:00 |
|
xcy
|
4fa797f93d
|
fix:
终身卡发放奖励bug修复
|
2023-12-28 14:49:17 +08:00 |
|
xcy
|
be85366d04
|
fix:
终身卡定时器log
|
2023-12-28 14:43:00 +08:00 |
|
dy
|
e1430b6411
|
Merge branch 'bugfix' into dev
|
2023-12-28 14:18:58 +08:00 |
|
xcy
|
0b2a9f3dc7
|
累计充值累计金额修改为累计vip经验(金额*10)
|
2023-12-28 13:44:53 +08:00 |
|
xcy
|
b79d80beed
|
fix:
修复终身卡每周奖励未发放bug
|
2023-12-28 11:49:44 +08:00 |
|
Your Name
|
3898cee713
|
fix:
修复悬赏任务一键领取3倍奖励逻辑错误
|
2023-12-28 11:11:34 +08:00 |
|
Your Name
|
dda879b037
|
Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev
|
2023-12-28 10:10:05 +08:00 |
|
Your Name
|
99e84d65a5
|
fix:修复悬赏任务一键领取特权问题
|
2023-12-28 10:09:58 +08:00 |
|
dy
|
2811d16323
|
Merge branch 'bugfix' into dev
|
2023-12-28 10:06:30 +08:00 |
|
xcy
|
0e93358e74
|
fix:
丛林猎手优化
|
2023-12-28 00:02:12 +08:00 |
|
dy
|
57c5a8a5e7
|
Revert "fix pay"
This reverts commit b9a556ea30.
|
2023-12-27 22:56:55 +08:00 |
|
dy
|
7b5c470f52
|
fix 红点
|
2023-12-27 22:31:09 +08:00 |
|
dy
|
b013e9042c
|
Merge branch 'bugfix' into dev
|
2023-12-27 22:10:19 +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
|
1158f26eaa
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-27 21:06:10 +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
|
6efe04ed6d
|
Merge branch 'feature/json' into dev
|
2023-12-27 20:49:47 +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
|
968ce25e5f
|
Merge branch 'feature/yuandan' into dev
|
2023-12-27 20:10:25 +08:00 |
|
dy
|
12300703b5
|
每日刷新付费礼包
|
2023-12-27 20:09:59 +08:00 |
|
dy
|
944a675af3
|
Merge branch 'feature/yuandan' into dev
|
2023-12-27 20:00:01 +08:00 |
|
dy
|
6fa3a8224c
|
Merge branch 'bugfix' into dev
|
2023-12-27 19:59:57 +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
|
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
|
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 |
|
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 |
|
dy
|
6af6eec94d
|
Merge branch 'feature/yuandan' into dev
# Conflicts:
# src/shared/protocols/serviceProto.ts
|
2023-12-26 15:27:21 +08:00 |
|
dy
|
72ff17ba0b
|
元旦活动
|
2023-12-26 15:26:58 +08:00 |
|
dy
|
45e149c2c0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-26 15:07:52 +08:00 |
|
dy
|
b5288be10a
|
Merge branch 'feature/yuandan' into dev
|
2023-12-26 15:07:46 +08:00 |
|
dy
|
1e90b96c6c
|
huodong json
|
2023-12-26 15:07:00 +08:00 |
|
|
|
e3f0b4347e
|
fix: 元旦相关 proto 重新生成
|
2023-12-26 14:42:29 +08:00 |
|
|
|
0511ce1727
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-26 14:38:44 +08:00 |
|
|
|
b4ffe0a4d2
|
Merge branch 'bugfix' into dev
|
2023-12-26 14:34:52 +08:00 |
|
|
|
884c2570a0
|
fix: 调整锁超时时间
|
2023-12-26 14:34:30 +08:00 |
|
|
|
fb28f2d4e7
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-26 14:33:14 +08:00 |
|
|
|
cd2a54e431
|
更换地下擂台功能redis
|
2023-12-26 14:33:04 +08:00 |
|
dy
|
b6c7b3717b
|
Merge branch 'feature/yuandan' into dev
|
2023-12-26 14:30:20 +08:00 |
|
dy
|
9b6d29ddf2
|
元旦活动,娃娃机
|
2023-12-26 14:30:10 +08:00 |
|
|
|
209470c89f
|
Merge branch 'bugfix' into dev
|
2023-12-26 14:22:27 +08:00 |
|
|
|
58abdd2fd4
|
fix: 添加多语言 dixialeitai_13
|
2023-12-26 14:22:07 +08:00 |
|
dy
|
60bbb97a40
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-26 14:16:28 +08:00 |
|
dy
|
bc8440f9a9
|
Merge branch 'feature/yuandan' into dev
# Conflicts:
# src/public/pay.ts
# src/shared/protocols/hongdian/PtlGet.ts
|
2023-12-26 14:16:15 +08:00 |
|
|
|
6c8a649fab
|
Merge branch 'bugfix' into dev
|
2023-12-26 14:14:33 +08:00 |
|
|
|
c0103565a7
|
fix: 调整地下擂台 fight 接口返回的多语言
|
2023-12-26 14:14:15 +08:00 |
|
Your Name
|
da35c5ecde
|
商店刷新更改
|
2023-12-26 14:10:21 +08:00 |
|
dy
|
fd035faf86
|
元旦活动
|
2023-12-26 14:04:19 +08:00 |
|
|
|
9585377a97
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-26 14:03:26 +08:00 |
|
|
|
5f81ba1189
|
替换tanxian的redis缓存
|
2023-12-26 14:03:15 +08:00 |
|
|
|
6d1149d6ee
|
Merge branch 'bugfix' into dev
|
2023-12-26 13:55:29 +08:00 |
|
|
|
4a9f5cb02e
|
fix: DldFight 接口添加玩家锁
|
2023-12-26 13:54:49 +08:00 |
|
|
|
3aca92818f
|
Merge branch 'bugfix' into dev
|
2023-12-26 11:50:34 +08:00 |
|
|
|
2a78f515b1
|
fix: 大乱斗添加积分上限
|
2023-12-26 11:50:17 +08:00 |
|
|
|
a0043e1080
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-26 10:33:07 +08:00 |
|
|
|
7537f108ad
|
增加索引，解决慢查询
|
2023-12-26 10:32:27 +08:00 |
|
|
|
7de66c4f09
|
Merge branch 'bugfix' into dev
|
2023-12-26 10:24:59 +08:00 |
|
|
|
ba364e13f6
|
fix: 修复领主来袭接口回参缺少 num 字段的问题
|
2023-12-26 10:24:35 +08:00 |
|
dy
|
dd9065a083
|
Merge branch 'bugfix' into dev
|
2023-12-26 09:47:19 +08:00 |
|
dy
|
9c4ba3a334
|
fix
|
2023-12-26 09:47:06 +08:00 |
|
dy
|
4a4f9ec3aa
|
Merge branch 'bugfix' into dev
|
2023-12-26 09:40:29 +08:00 |
|
dy
|
d5ef0b3187
|
yuandan
|
2023-12-26 09:40:15 +08:00 |
|
dy
|
905ed441e4
|
redis临时修复
|
2023-12-25 20:54:59 +08:00 |
|
dy
|
c384b2de27
|
Revert "铁笼死斗积分修改"
This reverts commit 3274911772.
|
2023-12-25 20:31:25 +08:00 |
|
dy
|
d3e931e634
|
Merge branch 'bugfix' into dev
|
2023-12-25 20:30:44 +08:00 |
|
dy
|
8df40bff28
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2023-12-25 20:27:48 +08:00 |
|
dy
|
91c2827b33
|
fix 自选支付
|
2023-12-25 20:27:39 +08:00 |
|
|
|
bb7495379e
|
去掉所有注释了的G.redis的代码，为全面弃用该redisJson做准备
|
2023-12-25 20:21:46 +08:00 |
|
dy
|
5486c2adf7
|
json
|
2023-12-25 18:03:15 +08:00 |
|
Your Name
|
080665f24e
|
黑帮争霸积分
|
2023-12-25 17:43:34 +08:00 |
|
Your Name
|
5ab463eadd
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-25 17:43:12 +08:00 |
|
Your Name
|
3274911772
|
铁笼死斗积分修改
|
2023-12-25 17:40:59 +08:00 |
|
dy
|
4dd4afd007
|
Merge branch 'bugfix' into dev
|
2023-12-25 17:18:38 +08:00 |
|
dy
|
4b8be68516
|
fix pay
|
2023-12-25 17:17:57 +08:00 |
|
dy
|
1d6143794c
|
元旦活动
|
2023-12-25 17:13:59 +08:00 |
|
dy
|
e701ce6722
|
Merge branch 'bugfix' into dev
|
2023-12-25 16:43:52 +08:00 |
|
dy
|
93f6b5b7ba
|
自选类型购买改为统一方法
|
2023-12-25 16:38:05 +08:00 |
|
|
|
24649d335c
|
Merge branch 'bugfix' into dev
|
2023-12-25 15:50:22 +08:00 |
|
|
|
36d92262b7
|
fix: 修复 boss 锁状态不释放的问题
|
2023-12-25 15:50:06 +08:00 |
|
|
|
1244a99c4c
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-25 14:33:01 +08:00 |
|
|
|
dd2962a80e
|
清理redis
|
2023-12-25 14:32:52 +08:00 |
|
dy
|
cba4f4563d
|
json
|
2023-12-25 14:00:30 +08:00 |
|
dy
|
a4d7fb7909
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2023-12-25 13:50:53 +08:00 |
|
dy
|
88c39187a0
|
商店加入version，当版本不一致时刷新商店内容
|
2023-12-25 13:50:43 +08:00 |
|
|
|
43f640595b
|
脚本模板
|
2023-12-25 13:50:28 +08:00 |
|
dy
|
00804fa8c1
|
init 元旦活动
|
2023-12-25 13:48:18 +08:00 |
|
|
|
3346957b5a
|
Merge branch 'bugfix' into dev
|
2023-12-25 11:23:03 +08:00 |
|
|
|
c323a9e255
|
fix: 修复抢红包日志列表长度限制未生效的问题
|
2023-12-25 11:06:45 +08:00 |
|
dy
|
14daa94dba
|
fix 黑帮争霸分组定时器
|
2023-12-23 12:30:11 +08:00 |
|
dy
|
6fd4f83882
|
proto
|
2023-12-23 11:49:30 +08:00 |
|
dy
|
8c3907c370
|
Merge branch 'master' into dev
# Conflicts:
# src/shared/protocols/hongdian/PtlGet.ts
# src/shared/protocols/pushgift/PtlItemNoEnough.ts
# src/shared/protocols/serviceProto.ts
|
2023-12-23 11:48:20 +08:00 |
|
dy
|
077f7a488e
|
Merge branch 'release' into bugfix
# Conflicts:
# src/api_s2c/email/ApiAllRemove.ts
|
2023-12-23 11:46:49 +08:00 |
|
xcy
|
f8298f08e9
|
fix:
修复邮件
|
2023-12-23 01:35:48 +08:00 |
|
xcy
|
8c0487bd58
|
Merge remote-tracking branch 'origin/release' into release
|
2023-12-23 01:11:56 +08:00 |
|
xcy
|
862052e827
|
fix:
修复邮件
|
2023-12-23 01:11:45 +08:00 |
|
dy
|
d37774d54f
|
fix:
json配置提交
|
2023-12-23 01:08:49 +08:00 |
|
xcy
|
e49861bcaf
|
fix:
修复邮件
|
2023-12-23 00:46:08 +08:00 |
|
xcy
|
ef6498c0d6
|
fix:
修复邮件
|
2023-12-23 00:44:04 +08:00 |
|
xcy
|
7354ad9ae8
|
Merge remote-tracking branch 'origin/release' into bugfix
|
2023-12-23 00:40:20 +08:00 |
|
dy
|
a242d6a66a
|
fix:
json同步
|
2023-12-22 23:33:02 +08:00 |
|
dy
|
34b3f84418
|
proto
|
2023-12-22 22:58:49 +08:00 |
|
dy
|
7fb7f952c7
|
Merge branch 'feature/json' into release
|
2023-12-22 22:56:38 +08:00 |
|
dy
|
4d3377fc3c
|
json
|
2023-12-22 22:54:36 +08:00 |
|
dy
|
38c1b28f9c
|
Merge remote-tracking branch 'origin/dev-leijichongzhi' into release
# Conflicts:
# src/api_s2c/hongdian/ApiGet.ts
# src/api_s2c/pushgift/ApiOpen.ts
# src/globalListener.ts
# src/module/collection_event.ts
# src/public/pushgift.ts
# src/shared/protocols/hongdian/PtlGet.ts
# src/shared/protocols/msg_s2c/MsgPushGiftChange.ts
# src/shared/protocols/serviceProto.ts
|
2023-12-22 22:50:59 +08:00 |
|
dy
|
eabcc57242
|
Merge remote-tracking branch 'origin/dev-meirilibao' into release
|
2023-12-22 22:43:24 +08:00 |
|
dy
|
5ed699a64a
|
Merge remote-tracking branch 'origin/feature/xiaofeijingsai' into release
# Conflicts:
# src/shared/protocols/serviceProto.ts
|
2023-12-22 22:43:08 +08:00 |
|
dy
|
75e921dbc2
|
Merge remote-tracking branch 'origin/feature/planb' into release
# Conflicts:
# src/api_s2c/hongdian/ApiGet.ts
# src/module/collection_event.ts
# src/shared/protocols/hongdian/PtlGet.ts
# src/shared/protocols/serviceProto.ts
|
2023-12-22 22:42:44 +08:00 |
|
dy
|
466d02221d
|
Merge remote-tracking branch 'origin/feature/pay_for_diamond' into release
# Conflicts:
# src/shared/protocols/serviceProto.ts
|
2023-12-22 22:40:40 +08:00 |
|
dy
|
a4a84aba24
|
Merge remote-tracking branch 'origin/feature/dadian' into release
|
2023-12-22 22:40:03 +08:00 |
|
xcy
|
62d954c743
|
fix:
推送礼包
|
2023-12-22 22:20:56 +08:00 |
|
xcy
|
474246463c
|
Merge remote-tracking branch 'origin/pushgift' into release
# Conflicts:
# src/api_s2c/pushgift/ApiOpen.ts
# src/public/fight.ts
# src/public/pushgift.ts
# src/shared/protocols/msg_s2c/MsgPushGiftChange.ts
# src/shared/protocols/serviceProto.ts
|
2023-12-22 22:18:56 +08:00 |
|
dy
|
712c85ff64
|
Merge branch 'feature/json' into dev
|
2023-12-22 21:58:20 +08:00 |
|
dy
|
2c3219918a
|
json
|
2023-12-22 21:57:22 +08:00 |
|
dy
|
5eee059c1e
|
Merge branch 'bugfix' into dev
|
2023-12-22 21:28:08 +08:00 |
|
dy
|
e269b1412a
|
类型报错
|
2023-12-22 21:27:44 +08:00 |
|
|
|
976f4b7f36
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 21:23:48 +08:00 |
|
|
|
c304a6d8cc
|
fix: 已领取的玩家添加gotAmount 字段
|
2023-12-22 21:23:13 +08:00 |
|
dy
|
aaf133d37f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-22 20:59:37 +08:00 |
|
dy
|
9579cb2b4d
|
Merge branch 'feature/json' into dev
|
2023-12-22 20:59:28 +08:00 |
|
dy
|
287db25686
|
json
|
2023-12-22 20:59:18 +08:00 |
|
|
|
fff54f4097
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 20:48:21 +08:00 |
|
|
|
4a6a40403d
|
fix: canReceive 接口添加玩家领取到的数额
|
2023-12-22 20:47:52 +08:00 |
|
xcy
|
7babb93e10
|
fix:
推送礼包
|
2023-12-22 20:39:37 +08:00 |
|
xcy
|
159e5578d7
|
fix:
推送礼包
|
2023-12-22 20:39:36 +08:00 |
|
xcy
|
5a7c645e0f
|
fix:
推送礼包
|
2023-12-22 20:39:14 +08:00 |
|
xcy
|
ae8da996ae
|
fix:
推送礼包
|
2023-12-22 20:38:43 +08:00 |
|
xcy
|
58ba7b489d
|
feat:
1.推送礼包
(cherry picked from commit e99b5dad15)
|
2023-12-22 20:34:51 +08:00 |
|
xcy
|
df641aa69f
|
feat:
1.推送礼包
(cherry picked from commit ef90c131f3)
|
2023-12-22 20:34:42 +08:00 |
|
dy
|
14effac507
|
Merge branch 'feature/json' into dev
|
2023-12-22 20:33:45 +08:00 |
|
dy
|
30a02fbd36
|
json
|
2023-12-22 20:33:34 +08:00 |
|
dy
|
0850a729ed
|
Merge branch 'dev-meirilibao' into dev
|
2023-12-22 20:26:44 +08:00 |
|
dy
|
7fc9b0564f
|
每日礼包领取免费
|
2023-12-22 20:26:25 +08:00 |
|
|
|
df6927b8ff
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 20:13:43 +08:00 |
|
|
|
bcca0ebbab
|
fix: 修复最大总额计算错误的 bug
|
2023-12-22 20:13:18 +08:00 |
|
xcy
|
76626120c4
|
feat:
累充礼包
|
2023-12-22 20:02:14 +08:00 |
|
xcy
|
372c84fd05
|
feat:
proto
|
2023-12-22 20:00:13 +08:00 |
|
xcy
|
9490faa364
|
fix:
累充礼包
|
2023-12-22 19:52:58 +08:00 |
|
dy
|
9df6e2f19f
|
Merge branch 'feature/json' into dev
|
2023-12-22 19:47:24 +08:00 |
|
dy
|
d00cb7895e
|
json
|
2023-12-22 19:47:15 +08:00 |
|
|
|
243265a49c
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 19:27:30 +08:00 |
|
|
|
7eb34f872d
|
fix: 调整可领取红包的判断逻辑
|
2023-12-22 19:26:18 +08:00 |
|
xcy
|
27f2ac75c5
|
fix:
添加接口
|
2023-12-22 19:21:23 +08:00 |
|
xcy
|
506785f360
|
fix:
添加接口
|
2023-12-22 19:20:28 +08:00 |
|
|
|
9d5b36b223
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 19:00:34 +08:00 |
|
|
|
02dccd18a7
|
fix: 修复细节问题
|
2023-12-22 19:00:11 +08:00 |
|
|
|
26a04a778b
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 18:28:45 +08:00 |
|
dy
|
82fd7da144
|
proto
|
2023-12-22 18:27:57 +08:00 |
|
|
|
40774138d2
|
fix: 将活动改为跨服活动
|
2023-12-22 18:27:46 +08:00 |
|
dy
|
511a663e6b
|
Merge branch 'feature/dadian' into dev
|
2023-12-22 18:18:29 +08:00 |
|
dy
|
7f60477a86
|
游戏内打点
|
2023-12-22 18:18:10 +08:00 |
|
xcy
|
4c9ad23bc1
|
fix:
添加接口
|
2023-12-22 18:04:56 +08:00 |
|
dy
|
2d9d577f8b
|
Merge branch 'feature/json' into dev
|
2023-12-22 18:01:45 +08:00 |
|
dy
|
acbf8a6ec6
|
json
|
2023-12-22 17:57:50 +08:00 |
|
|
|
b47c729a3c
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 17:09:01 +08:00 |
|
|
|
eed6dd1b8f
|
fix: 添加红点及玩家发奖
|
2023-12-22 17:06:19 +08:00 |
|
dy
|
122fc28388
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-22 16:50:33 +08:00 |
|
dy
|
c3ba3934d4
|
消费竞赛定时器发奖，每天0点5分检测活动 结束
|
2023-12-22 16:49:21 +08:00 |
|
|
|
dec4ce2cc4
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 16:35:25 +08:00 |
|
|
|
36b15af077
|
fix: 添加 price 回参表示领取门槛
|
2023-12-22 16:34:54 +08:00 |
|
xcy
|
efe5bd3216
|
fix:
email 过滤 prizelist
|
2023-12-22 16:15:22 +08:00 |
|
xcy
|
a2d16fb530
|
fix:
email 过滤 prizelist
|
2023-12-22 16:15:06 +08:00 |
|
xcy
|
32c779a5a4
|
fix:
异步查库改为同步插库
|
2023-12-22 16:07:15 +08:00 |
|
xcy
|
753dd8decb
|
fix:
异步查库改为同步插库
|
2023-12-22 16:06:57 +08:00 |
|
xcy
|
2720d5e59a
|
fix:
异步查库改为同步插库
|
2023-12-22 16:02:11 +08:00 |
|
dy
|
8837ded042
|
Merge branch 'feature/json' into feature/xiaofeijingsai
|
2023-12-22 16:00:28 +08:00 |
|
xcy
|
791dbc5472
|
fix:
异步查库改为同步插库
|
2023-12-22 16:00:23 +08:00 |
|
dy
|
1ed15d2b5c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-22 15:01:40 +08:00 |
|
dy
|
7c3da937a5
|
Merge branch 'feature/json' into dev
|
2023-12-22 15:01:30 +08:00 |
|
dy
|
6b80b07cfe
|
json
|
2023-12-22 15:01:23 +08:00 |
|
dy
|
a135acbc93
|
Merge branch 'master' into feature/json
|
2023-12-22 15:00:23 +08:00 |
|
|
|
304a67e56f
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 15:00:20 +08:00 |
|
|
|
2a492a8919
|
fix: 修复玩家可以重复领取的 bug
|
2023-12-22 14:59:33 +08:00 |
|
dy
|
ffbb2b3af3
|
Merge branch 'bugfix' into dev
|
2023-12-22 14:39:25 +08:00 |
|
|
|
7ca6fe75e3
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-22 14:34:18 +08:00 |
|
dy
|
a0bdc11a05
|
Merge remote-tracking branch 'origin/dev-leijichongzhi' into dev
|
2023-12-22 14:34:08 +08:00 |
|
|
|
dda11bb122
|
事件容错处理
|
2023-12-22 14:33:49 +08:00 |
|
xcy
|
6526d386c4
|
feat:
累充礼包
|
2023-12-22 14:33:43 +08:00 |
|
dy
|
8710d7d04f
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-22 14:11:02 +08:00 |
|
dy
|
4e435c4ed9
|
Merge branch 'bugfix' into dev
|
2023-12-22 14:08:19 +08:00 |
|
dy
|
445cd60548
|
fix bug 支付、英雄上阵bug
|
2023-12-22 14:07:55 +08:00 |
|
|
|
77f8380080
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 14:05:49 +08:00 |
|
|
|
86910e7ad7
|
debug: 添加玩家领取记录的日志输出
|
2023-12-22 14:05:15 +08:00 |
|
|
|
6154ddbe61
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 13:57:23 +08:00 |
|
|
|
c5817b4acf
|
fix: 添加玩家领取记录的 upsert 选项
|
2023-12-22 13:57:02 +08:00 |
|
|
|
5801423fb7
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 13:40:30 +08:00 |
|
|
|
06062716ef
|
fix: 调整领取时查询的条件表达式
|
2023-12-22 13:40:13 +08:00 |
|
|
|
093de3350f
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 12:13:21 +08:00 |
|
|
|
e0a624adba
|
fix: 添加领取日志信息
|
2023-12-22 12:11:20 +08:00 |
|
xcy
|
bafed44a56
|
feat:
proto
|
2023-12-22 11:57:39 +08:00 |
|
xcy
|
377b7553e2
|
Merge branch 'dev' into dev-leijichongzhi
# Conflicts:
# src/shared/protocols/serviceProto.ts
|
2023-12-22 11:51:18 +08:00 |
|
xcy
|
1184b0b6de
|
feat:
脚本
|
2023-12-22 11:50:45 +08:00 |
|
xcy
|
a326ef7d39
|
feat:
脚本
|
2023-12-22 11:49:14 +08:00 |
|
dy
|
6e67ae6441
|
Merge branch 'master' into feature/xiaofeijingsai
|
2023-12-22 11:39:29 +08:00 |
|
dy
|
f17f4182a9
|
消费竞赛定时器
|
2023-12-22 11:39:17 +08:00 |
|
|
|
ce9238ccdb
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 11:31:31 +08:00 |
|
|
|
76a04a34d5
|
fix: 修复 groups 配置取值错误的问题
|
2023-12-22 11:30:54 +08:00 |
|
dy
|
e34a5a635f
|
Merge branch 'master' into dev
|
2023-12-22 11:04:11 +08:00 |
|
|
|
e660adb95c
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 10:15:44 +08:00 |
|
|
|
bb60b00d93
|
Merge branch 'feature/json' into dev
|
2023-12-22 10:12:43 +08:00 |
|
|
|
4b190272b1
|
fix: 调整 remaining 计算规则
|
2023-12-22 10:11:24 +08:00 |
|
|
|
3d43fa1a34
|
fix: 更新抢钻石活动的数据结构
|
2023-12-22 10:07:23 +08:00 |
|
dy
|
ba2c49868f
|
fix pay
|
2023-12-22 00:22:54 +08:00 |
|
dy
|
c695388208
|
fix pay
|
2023-12-21 23:51:03 +08:00 |
|
dy
|
50c52556e0
|
fix pay
|
2023-12-21 23:40:41 +08:00 |
|
dy
|
be5d421393
|
Merge branch 'master' into bugfix
|
2023-12-21 22:14:30 +08:00 |
|
|
|
607d590f2f
|
Merge branch 'feature/json' into dev
|
2023-12-21 21:41:18 +08:00 |
|
|
|
bfb6e4ff4e
|
build: 更新活动配置
|
2023-12-21 21:40:49 +08:00 |
|
xcy
|
c70c154099
|
feat:
累充礼包
|
2023-12-21 21:38:53 +08:00 |
|
|
|
2fc85853dc
|
feat: 充值抢钻石活动
|
2023-12-21 21:14:13 +08:00 |
|
|
|
ba8653dca9
|
fix: 添加领取数额的最大值配置
|
2023-12-21 21:08:22 +08:00 |
|
|
|
6808b53dd4
|
fix: 允许玩家领取到的钻石数小于配置的最低档位额度
|
2023-12-21 20:33:47 +08:00 |
|
|
|
2ae2a1362d
|
feat: 添加炫耀逻辑
|
2023-12-21 20:16:29 +08:00 |
|
|
|
82b4b61725
|
feat: 抢红包分钻石接口 初版
|
2023-12-21 19:52:19 +08:00 |
|
xcy
|
122041f404
|
feat:
脚本目录
|
2023-12-21 18:16:54 +08:00 |
|
dy
|
5bf5f59bfa
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-21 17:49:19 +08:00 |
|
dy
|
351f8f7934
|
Merge branch 'bugfix' into dev
|
2023-12-21 17:34:06 +08:00 |
|
dy
|
720d89e988
|
主角皮肤计算属性
|
2023-12-21 17:33:31 +08:00 |
|
yushunrui
|
4690254453
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-21 16:42:43 +08:00 |
|
yushunrui
|
f1a4daece3
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-21 16:42:42 +08:00 |
|
yushunrui
|
05368fc0de
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-21 16:42:42 +08:00 |
|
yushunrui
|
48038d1b07
|
fix:圣诞活动新增vip经验任务157
|
2023-12-21 16:42:41 +08:00 |
|
