xuexinpeng
|
8ef68e0a98
|
周卡修改
|
2021-11-08 00:04:52 +08:00 |
yuanshuai
|
f7041150b6
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-04 10:59:22 +08:00 |
yuanshuai
|
2f675017fa
|
英雄图鉴bug修改
|
2021-11-04 10:59:12 +08:00 |
duhui
|
8f35b31222
|
跨服排行榜修改
|
2021-11-04 10:47:51 +08:00 |
duhui
|
5c70df47db
|
跨服分组修改
|
2021-11-04 10:11:42 +08:00 |
xuexinpeng
|
fb69e8de2e
|
周卡打开
|
2021-11-08 00:06:49 +08:00 |
yuanshuai
|
9e22fed4ad
|
Merge branch 'master_test_gn_godsoul' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
|
2021-11-03 19:03:22 +08:00 |
jiahuiwen
|
a4e418364d
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-03 17:48:08 +08:00 |
jiahuiwen
|
bff21f989c
|
支持商店下架商品
|
2021-11-03 17:46:27 +08:00 |
duhui
|
ed62e827fe
|
Merge branch 'dh_dev_crossrank' into master_test_gn
|
2021-11-03 17:35:26 +08:00 |
duhui
|
34333c9a33
|
跨服数据更到最新
|
2021-11-03 17:35:01 +08:00 |
DESKTOP-98AVA47\Administrator
|
0458b323bf
|
车迟斗法个人排行积分
|
2021-11-10 11:00:11 +08:00 |
xuexinpeng
|
d3ffae3f7e
|
yx挑战限制
|
2021-11-07 23:34:20 +08:00 |
xuexinpeng
|
190e3fcf79
|
玉虚换一批11.30过后不让刷新
|
2021-11-07 23:33:08 +08:00 |
duhui
|
692e3858c8
|
礼包bug修改
|
2021-11-03 16:33:48 +08:00 |
jiahuiwen
|
b24f82df04
|
redis key 优化
|
2021-11-03 14:51:44 +08:00 |
xuexinpeng
|
772420df81
|
删除yx换一批log
|
2021-11-08 01:47:15 +08:00 |
xuexinpeng
|
77b5e4b3d2
|
yx线上log查问题
|
2021-11-08 01:13:45 +08:00 |
xuexinpeng
|
d4c461a5e1
|
战斗数据新加职业类型
|
2021-11-02 20:02:30 +08:00 |
duhui
|
bcfe4d5dac
|
竞技场每日发奖
|
2021-11-02 11:14:19 +08:00 |
yuanshuai
|
20a26c4f7c
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-11-02 11:02:47 +08:00 |
yuanshuai
|
bbe44fe3c6
|
修行主角技能相关代码还原
|
2021-11-02 11:01:59 +08:00 |
duhui
|
fbdf3ebdad
|
车迟挑战
|
2021-11-02 10:40:49 +08:00 |
yuanshuai
|
45d11881a1
|
漏提交
|
2021-11-02 10:28:26 +08:00 |
yuanshuai
|
667c1a1845
|
神魂绑定条件修改提交
|
2021-11-02 10:27:29 +08:00 |
duhui
|
5ce581f898
|
支付端口redis缓存
|
2021-11-02 10:01:40 +08:00 |
yuanshuai
|
7c1b05d419
|
-神魂绑定修改
|
2021-11-01 18:54:48 +08:00 |
jiahuiwen
|
30fbdc5683
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-01 18:39:16 +08:00 |
DESKTOP-98AVA47\Administrator
|
bbceffe1a9
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-05 01:48:08 +08:00 |
jiahuiwen
|
449efd9de5
|
优化http 关闭连接
|
2021-11-01 18:39:03 +08:00 |
yuanshuai
|
5c0c449856
|
神魂绑定检测条件代码修改
|
2021-11-01 18:32:03 +08:00 |
xuexinpeng
|
e3813d4e47
|
玉虚打机器人先后手
|
2021-11-01 17:30:06 +08:00 |
jiahuiwen
|
61bb5e7e14
|
删除修复bug代码
|
2021-11-01 15:44:16 +08:00 |
jiahuiwen
|
922f532aca
|
优化log
|
2021-11-01 15:28:15 +08:00 |
jiahuiwen
|
b8e9545c55
|
删除无用方法
|
2021-11-01 15:26:43 +08:00 |
jiahuiwen
|
51e47e6588
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-01 15:25:54 +08:00 |
duhui
|
6b577dca45
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-01 15:00:43 +08:00 |
duhui
|
74c7f78291
|
无尽秘宝网页支付
|
2021-11-01 15:00:30 +08:00 |
xuexinpeng
|
032ce3646d
|
玉虚三个修改 玉虚赛季发奖时间 挑战后自动换一批 战斗的先后手问题
注释周卡相关
|
2021-11-01 15:00:09 +08:00 |
jiahuiwen
|
77b9fb6426
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-01 14:23:52 +08:00 |
duhui
|
59f9bf9f70
|
Merge branch 'dh_dev' into master_test_gn
|
2021-11-01 14:01:20 +08:00 |
duhui
|
121c01dce1
|
道具,坐骑碎片
|
2021-11-01 14:00:43 +08:00 |
xuexinpeng
|
fc2d33d4c9
|
周卡相关
|
2021-11-01 13:18:29 +08:00 |
duhui
|
182244cfb0
|
好友获取优化
|
2021-11-07 10:43:49 +08:00 |
duhui
|
0692f312fa
|
玲珑宝阁问题修改
|
2021-11-04 18:04:59 +08:00 |
jiahuiwen
|
eadaa7d40e
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-11-01 10:07:11 +08:00 |
jiahuiwen
|
7747c85c86
|
罗浮争锋修复bug
|
2021-10-31 21:28:06 +08:00 |
jiahuiwen
|
b58f222669
|
Merge branch 'master_prb_gn' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2021-10-31 16:29:34 +08:00 |
jiahuiwen
|
3388120fa1
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-10-31 16:17:24 +08:00 |
jiahuiwen
|
dfdd659e0c
|
优化
|
2021-10-31 16:17:17 +08:00 |