dy
|
28adc88ff0
|
新增活动脚本
|
2024-01-04 18:04:39 +08:00 |
|
xichaoyin
|
72377fa50d
|
Merge branch 'feat/skin' into dev
|
2024-01-04 17:49:17 +08:00 |
|
xichaoyin
|
83485d0fd0
|
fix:
皮肤系统
|
2024-01-04 17:42:14 +08:00 |
|
xichaoyin
|
e2df48498a
|
Merge branch 'feature/weiwang' into dev
|
2024-01-04 17:17:28 +08:00 |
|
xichaoyin
|
42601c29fd
|
fix:
修改gud中weiwang字段为weiwangbuff
|
2024-01-04 17:17:10 +08:00 |
|
dy
|
3c7985642e
|
Merge branch 'bugfix' into dev
|
2024-01-04 17:04:36 +08:00 |
|
dy
|
a50b2624ac
|
累计充值红点
|
2024-01-04 17:04:01 +08:00 |
|
dy
|
65d306227b
|
领奖，红点
|
2024-01-04 16:56:33 +08:00 |
|
dy
|
38b2f9a99e
|
破冰礼包增加最后一天可领取所有奖励
|
2024-01-04 16:50:16 +08:00 |
|
xichaoyin
|
a0d06cdaf4
|
Merge branch 'feature/weiwang' into dev
|
2024-01-04 16:13:12 +08:00 |
|
xichaoyin
|
2e054daa65
|
fix:
修复威望系统属性在探险战斗中没有生效
|
2024-01-04 16:12:55 +08:00 |
|
dy
|
3e1c45aaf9
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2024-01-04 16:05:59 +08:00 |
|
dy
|
f1dacd19b6
|
破冰礼包增加轮次，修复bug
|
2024-01-04 16:05:52 +08:00 |
|
|
|
a5e726e811
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-04 15:51:52 +08:00 |
|
|
|
8afa624f44
|
跨服聊天分组
|
2024-01-04 15:51:40 +08:00 |
|
dy
|
6ec6de4d56
|
破冰礼包拦截前端空字符串请求
|
2024-01-04 15:37:09 +08:00 |
|
xichaoyin
|
809030edee
|
frat:json配置提交
|
2024-01-04 15:22:33 +08:00 |
|
xichaoyin
|
df3c9a79bf
|
Merge remote-tracking branch 'origin/bugfix' into dev
|
2024-01-04 14:43:08 +08:00 |
|
|
|
52ab7e9979
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-04 14:30:47 +08:00 |
|
|
|
a1dbacd7fe
|
积分赛只刷出本服对手
|
2024-01-04 14:30:37 +08:00 |
|
dy
|
3fa08f6640
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/json/tanxian.json
|
2024-01-04 14:25:52 +08:00 |
|
dy
|
dabcc8baa4
|
Merge branch 'feature/json' into dev
# Conflicts:
# src/json/renown_level.json
# src/json/tanxian.json
|
2024-01-04 14:25:34 +08:00 |
|
dy
|
12e21ce0f1
|
cehua json
|
2024-01-04 14:25:12 +08:00 |
|
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 |
|
