xichaoyin
|
3f36fa83ab
|
Merge branch 'feature/skin' into dev
|
2024-01-05 20:09:26 +08:00 |
|
xichaoyin
|
04fe3029b3
|
fix:
json格式定义
|
2024-01-05 20:09:11 +08:00 |
|
xichaoyin
|
edf071105e
|
Merge branch 'feature/skin' into dev
|
2024-01-05 19:49:59 +08:00 |
|
xichaoyin
|
12d092677a
|
fix:
皮肤穿戴bug
|
2024-01-05 19:49:47 +08:00 |
|
xichaoyin
|
75cadfe391
|
Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev
|
2024-01-05 14:46:33 +08:00 |
|
xichaoyin
|
6e87898cfa
|
feat:json提交
|
2024-01-05 14:46:22 +08:00 |
|
xichaoyin
|
98e34a065b
|
Merge branch 'bugfix' into dev
|
2024-01-04 22:25:31 +08:00 |
|
xichaoyin
|
da37b162d9
|
fix:
破冰礼包一键领取
|
2024-01-04 22:25:17 +08:00 |
|
xichaoyin
|
8e1c5412d6
|
fix:
破冰礼包一键领取
|
2024-01-04 22:20:30 +08:00 |
|
xichaoyin
|
ca0517c4b4
|
Merge branch 'bugfix' into dev
|
2024-01-04 21:41:38 +08:00 |
|
xichaoyin
|
b04ce950cd
|
fix:
充值之后推一次活动红点change
|
2024-01-04 21:41:21 +08:00 |
|
xichaoyin
|
77087741a7
|
Merge branch 'bugfix' into dev
|
2024-01-04 21:37:11 +08:00 |
|
xichaoyin
|
8ec4a46837
|
fix:
修复礼包在最后一天可以一键领取所有奖励
|
2024-01-04 21:36:45 +08:00 |
|
xichaoyin
|
7415823947
|
Merge branch 'bugfix' into dev
|
2024-01-04 21:05:25 +08:00 |
|
xichaoyin
|
d7f0f22df7
|
fix:
伙伴招募红点修改
|
2024-01-04 21:05:11 +08:00 |
|
xichaoyin
|
3a383d6f54
|
Merge branch 'bugfix' into dev
|
2024-01-04 20:32:50 +08:00 |
|
xichaoyin
|
779709a32f
|
fix:
伙伴招募红点修改
|
2024-01-04 20:32:31 +08:00 |
|
xichaoyin
|
6cb6d8f60d
|
Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev
|
2024-01-04 19:51:01 +08:00 |
|
xichaoyin
|
b4221ff4b0
|
feat:json配置提交
|
2024-01-04 19:48:58 +08:00 |
|
dy
|
01f57b347f
|
新增活动脚本
|
2024-01-04 18:25:27 +08:00 |
|
xichaoyin
|
7aaf803fb3
|
Merge branch 'feature/weiwang' into dev
|
2024-01-04 18:08:20 +08:00 |
|
xichaoyin
|
ec40da9ad5
|
fix:
修复战斗威望属性没有生效
|
2024-01-04 18:08:05 +08:00 |
|
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 |
|
