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 |
|
