dy
|
0cde599ddd
|
Merge branch 'master' into feature/json
# Conflicts:
# src/json/clsl_com.json5
|
2024-01-04 14:24:42 +08:00 |
|
xichaoyin
|
69c44155ec
|
Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev
|
2024-01-04 13:41:14 +08:00 |
|
xichaoyin
|
944a13f591
|
feat:
配置提交
|
2024-01-04 13:41:05 +08:00 |
|
dy
|
4c0a37cd78
|
Merge branch 'bugfix' into dev
|
2024-01-04 11:36:52 +08:00 |
|
dy
|
04533c80f4
|
fix pata/saodang
|
2024-01-04 11:20:00 +08:00 |
|
dy
|
98a3927966
|
fix lingzhulaixi
|
2024-01-04 11:05:05 +08:00 |
|
dy
|
eb73af1dd2
|
数据监测改为查半小时内在线用户
|
2024-01-03 22:40:24 +08:00 |
|
dy
|
1dd7bc2175
|
api pay
|
2024-01-03 22:10:35 +08:00 |
|
dy
|
ecc17a22a9
|
api 锁修改,一键接取悬赏
|
2024-01-03 21:57:12 +08:00 |
|
dy
|
4379a95d7e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-03 20:50:19 +08:00 |
|
dy
|
124681d757
|
Merge branch 'release' into dev
|
2024-01-03 20:50:12 +08:00 |
|
dy
|
826840455c
|
api 锁修改
|
2024-01-03 20:19:58 +08:00 |
|
dy
|
60d0e04e33
|
fix 探险 gamelog
|
2024-01-03 19:36:28 +08:00 |
|
dy
|
6233a6672e
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2024-01-03 19:28:34 +08:00 |
|
dy
|
afd856af30
|
fix 探险
|
2024-01-03 19:28:22 +08:00 |
|
xichaoyin
|
1090a5f8df
|
Merge branch 'bugfix' into dev
|
2024-01-03 18:47:04 +08:00 |
|
xichaoyin
|
698c7bd3f6
|
fix:
修复讨伐海盗挑战boss胜利不扣除战斗次数bug
|
2024-01-03 18:42:36 +08:00 |
|
dy
|
b9a612239d
|
Merge branch 'master' into dev
|
2024-01-03 17:36:07 +08:00 |
|
dy
|
7dd83e06ef
|
watchdog.json
|
2024-01-03 17:35:08 +08:00 |
|
xichaoyin
|
a1a687773c
|
Merge branch 'feature/weiwang' into dev
|
2024-01-03 16:28:15 +08:00 |
|
xichaoyin
|
3c50fdbd01
|
fix:
修复威望升级消耗计算错误
|
2024-01-03 16:27:59 +08:00 |
|
xichaoyin
|
20f0f41c22
|
fix:
王者荣耀发奖定时器容错修改
|
2024-01-03 15:47:02 +08:00 |
|
xichaoyin
|
9f512e8fbc
|
Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev
|
2024-01-03 15:33:09 +08:00 |
|
xichaoyin
|
a7f527bf09
|
fix:
王者荣耀发奖定时器容错修改
|
2024-01-03 15:33:05 +08:00 |
|
dy
|
f2911269e0
|
Merge branch 'bugfix' into dev
|
2024-01-03 15:22:58 +08:00 |
|
dy
|
6cc58ffd94
|
还原
|
2024-01-03 15:22:36 +08:00 |
|
xichaoyin
|
7eec14188f
|
Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev
|
2024-01-03 14:49:00 +08:00 |
|
xichaoyin
|
bc078b9c95
|
feat:
探险新增声望掉落
|
2024-01-03 14:48:58 +08:00 |
|
dy
|
d3f272f1e4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-03 14:47:03 +08:00 |
|
dy
|
89ea1a47af
|
Merge branch 'bugfix' into dev
|
2024-01-03 14:46:58 +08:00 |
|
dy
|
8d9ecf30b6
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
# Conflicts:
# src/api_s2c/event/leijichongzhi/ApiRec.ts
|
2024-01-03 14:46:30 +08:00 |
|
dy
|
ec85961633
|
累计充值轮次加校验
|
2024-01-03 14:45:51 +08:00 |
|
|
|
d490550abf
|
容错
|
2024-01-03 14:44:50 +08:00 |
|
xichaoyin
|
08c59b522b
|
Merge branch 'feature/weiwang' into dev
|
2024-01-03 14:35:58 +08:00 |
|
xichaoyin
|
c65aea9ae2
|
fix:
威望配置提交
|
2024-01-03 14:35:19 +08:00 |
|
|
|
38dca3a653
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-03 14:32:40 +08:00 |
|
|
|
7e589e23b3
|
容错
|
2024-01-03 14:31:47 +08:00 |
|
dy
|
22b577036f
|
watchdog
|
2024-01-03 14:29:22 +08:00 |
|
|
|
6e9d65241e
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-03 14:00:29 +08:00 |
|
|
|
43aeef2501
|
容错
|
2024-01-03 13:44:51 +08:00 |
|
dy
|
1a9f942297
|
还原
|
2024-01-03 11:38:06 +08:00 |
|
dy
|
8f0c24bc87
|
Merge branch 'feature/warning' into bugfix
|
2024-01-03 11:09:56 +08:00 |
|
dy
|
1fcedaff59
|
还原
|
2024-01-03 11:09:39 +08:00 |
|
dy
|
a1c7f2e4d0
|
监控init
|
2024-01-03 11:01:12 +08:00 |
|
|
|
78c306ce5e
|
数据监控
|
2024-01-03 10:58:09 +08:00 |
|
|
|
ad15cf73bf
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-03 10:36:35 +08:00 |
|
|
|
3c380f1e55
|
数据监控
|
2024-01-03 10:36:17 +08:00 |
|
dy
|
953303d9a4
|
Merge branch 'master' into feature/warning
|
2024-01-03 10:18:20 +08:00 |
|
dy
|
8f92372471
|
Merge branch 'master' into dev
|
2024-01-03 10:18:06 +08:00 |
|
dy
|
c839d844ec
|
Merge branch 'bugfix' into release
|
2024-01-02 20:42:33 +08:00 |
|
