Commit Graph

466 Commits

Author SHA1 Message Date
dy
4538c0dc16 自选礼包红点 2023-12-27 10:23:12 +08:00
dy
f9989cf002 自选礼包 2023-12-27 10:17:38 +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
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
Your Name
b67087a3bf 修改api进程锁 2023-12-26 16:12:09 +08:00
0511ce1727 Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix 2023-12-26 14:38:44 +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
58abdd2fd4 fix: 添加多语言 dixialeitai_13 2023-12-26 14:22:07 +08:00
c0103565a7 fix: 调整地下擂台 fight 接口返回的多语言 2023-12-26 14:14:15 +08:00
Your Name
da35c5ecde 商店刷新更改 2023-12-26 14:10:21 +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
4a9f5cb02e fix: DldFight 接口添加玩家锁 2023-12-26 13:54:49 +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
ba364e13f6 fix: 修复领主来袭接口回参缺少 num 字段的问题 2023-12-26 10:24:35 +08:00
dy
9c4ba3a334 fix 2023-12-26 09:47:06 +08:00
dy
905ed441e4 redis临时修复 2023-12-25 20:54:59 +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
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
4b8be68516 fix pay 2023-12-25 17:17:57 +08:00
dy
93f6b5b7ba 自选类型购买改为统一方法 2023-12-25 16:38:05 +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
bb15e64d6d Merge remote-tracking branch 'origin/bugfix' into bugfix 2023-12-25 13:51:09 +08:00
a0d4c911d8 设置允许装饰器 2023-12-25 13:51:05 +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
c323a9e255 fix: 修复抢红包日志列表长度限制未生效的问题 2023-12-25 11:06:45 +08:00
dy
14daa94dba fix 黑帮争霸分组定时器 2023-12-23 12:30:11 +08:00
dy
077f7a488e Merge branch 'release' into bugfix
# Conflicts:
#	src/api_s2c/email/ApiAllRemove.ts
2023-12-23 11:46:49 +08:00