|
|
cd2a54e431
|
更换地下擂台功能redis
|
2023-12-26 14:33:04 +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 |
|
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
|
2c3219918a
|
json
|
2023-12-22 21:57:22 +08:00 |
|
dy
|
e269b1412a
|
类型报错
|
2023-12-22 21:27:44 +08:00 |
|
