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 |
duhui
|
5ce581f898
|
支付端口redis缓存
|
2021-11-02 10:01:40 +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 |
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 |
jiahuiwen
|
452462606d
|
计算世界等级bug
|
2021-10-30 15:01:52 +08:00 |
jiahuiwen
|
29194289cc
|
分解英雄,和升星吞
|
2021-10-30 02:20:57 +08:00 |
jiahuiwen
|
faa21bb46f
|
白金装备增加过滤掉脱装备获得
|
2021-10-30 01:43:45 +08:00 |
duhui
|
cdd3b6b7dd
|
玲珑宝阁,奖池分活动
|
2021-10-29 17:19:44 +08:00 |
jiahuiwen
|
ff57fe280e
|
修复商店
|
2021-10-29 16:19:26 +08:00 |
jiahuiwen
|
59c91e3233
|
修复指定活动
|
2021-10-29 16:10:22 +08:00 |
jiahuiwen
|
40ae6b6a1b
|
添加日志
|
2021-10-29 16:02:35 +08:00 |
jiahuiwen
|
de7c59dff1
|
Merge branch 'master_test_gn_zf' into master_prb_gn
|
2021-10-29 15:50:00 +08:00 |
jiahuiwen
|
97e23512f2
|
热更修复bug
|
2021-10-29 15:49:40 +08:00 |
duhui
|
3524c6ea23
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-10-29 11:00:18 +08:00 |
duhui
|
d6fcda16a0
|
gm轩辕宝镜跳关
|
2021-10-29 11:00:03 +08:00 |
jiahuiwen
|
bf1a911880
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-10-29 10:53:14 +08:00 |
jiahuiwen
|
542563c2c3
|
删除日志
|
2021-10-29 10:53:03 +08:00 |
duhui
|
17a8cc3811
|
车迟斗法积分为0处理
|
2021-10-29 10:51:29 +08:00 |
duhui
|
040d8bff45
|
gm类名修改
|
2021-10-29 09:48:39 +08:00 |
duhui
|
5410f0ecce
|
测试,gm需求
|
2021-10-28 18:10:20 +08:00 |
jiahuiwen
|
39d1c1242f
|
优化
|
2021-10-28 17:44:00 +08:00 |
duhui
|
eb91e2169d
|
车迟斗法伤害溢出问题
|
2021-10-28 16:58:37 +08:00 |
duhui
|
0cdf8dfe92
|
异常码
|
2021-10-28 14:50:02 +08:00 |
duhui
|
83501823b7
|
日志
|
2021-10-28 13:30:59 +08:00 |
duhui
|
0b0f021bf5
|
天眼日志添加
|
2021-10-28 13:20:24 +08:00 |
yuanshuai
|
fb7ed91a36
|
新版三界降魔活动提交
|
2021-10-28 12:05:47 +08:00 |
duhui
|
d5dc87e1cd
|
天眼,取消旧公会信息兼容
|
2021-10-28 11:59:22 +08:00 |
xuexinpeng
|
bb2ace9b66
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-10-28 11:31:53 +08:00 |