wangyuan
|
a45850cfd5
|
fix bug
|
2019-10-10 17:23:47 +08:00 |
wangyuan
|
23382f5e74
|
fix bug
|
2019-10-10 17:08:05 +08:00 |
wangyuan
|
3c103fac3e
|
check
|
2019-10-10 15:55:37 +08:00 |
wangyuan
|
698bab2122
|
fix rank
|
2019-10-10 15:49:58 +08:00 |
wangyuan
|
ba4a28d792
|
fix rank
|
2019-10-10 14:44:53 +08:00 |
wangyuan
|
c9d59f06ae
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-10-10 14:34:19 +08:00 |
wangyuan
|
ba8cad8cef
|
fix rank
|
2019-10-10 14:33:57 +08:00 |
lvxinran
|
6b0ef26a42
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-10 13:41:35 +08:00 |
lvxinran
|
8c73e07e12
|
戒灵秘宝升级
|
2019-10-10 13:41:29 +08:00 |
wangyuan
|
e79303692b
|
fix mainlevle level limit
|
2019-10-10 11:59:42 +08:00 |
wangyuan
|
a24369e2f5
|
漏提
|
2019-10-10 11:53:07 +08:00 |
wangyuan
|
410427b268
|
fix main level fight
|
2019-10-10 11:48:30 +08:00 |
zhangshanxue
|
cea0f58b31
|
幸运探宝活动奖励领完 重置进度
|
2019-10-10 11:42:22 +08:00 |
zhangshanxue
|
3f6971c071
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-10 11:12:39 +08:00 |
zhangshanxue
|
2ff9f1583e
|
幸运探宝活动奖励领完 重置进度
|
2019-10-10 11:08:30 +08:00 |
lvxinran
|
994f38dd78
|
Merge branch 'develop'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/SSpecialConfig.java
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java
|
2019-10-10 10:11:24 +08:00 |
lvxinran
|
ea8ab53cb8
|
戒灵秘宝
|
2019-10-10 10:04:02 +08:00 |
lvxinran
|
a8f94462d7
|
孙龙宝藏修改不发0等级
|
2019-10-19 18:57:37 +08:00 |
lvxinran
|
138af14f00
|
孙龙宝藏修改
|
2019-10-19 16:49:38 +08:00 |
wangyuan
|
0de65cad89
|
fix msg
|
2019-10-09 19:38:19 +08:00 |
wangyuan
|
5c70a649da
|
print log
|
2019-10-09 18:31:12 +08:00 |
wangyuan
|
dcc606cb3c
|
fix reason
|
2019-10-09 18:28:53 +08:00 |
zhangshanxue
|
3d769948ad
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-09 18:16:19 +08:00 |
zhangshanxue
|
0ac0b161f5
|
活动奖励领完 重置进度
|
2019-10-09 18:16:13 +08:00 |
wangyuan
|
fc42f6c655
|
limit
|
2019-10-09 18:04:36 +08:00 |
wangyuan
|
f0e4c61ccc
|
reason
|
2019-10-09 17:36:19 +08:00 |
zhangshanxue
|
2062561e7e
|
热加载新类
|
2019-10-09 17:03:46 +08:00 |
wangyuan
|
2f3701fe49
|
fix indicaiton
|
2019-10-09 16:07:27 +08:00 |
wangyuan
|
0d58fa4b38
|
黑名单
|
2019-10-09 15:58:55 +08:00 |
zhangshanxue
|
f47b80ea14
|
幸运探宝
|
2019-10-09 15:25:06 +08:00 |
zhangshanxue
|
5eb8af467a
|
jar中查找类
|
2019-10-09 15:23:11 +08:00 |
zhangshanxue
|
e8e1f7b744
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-09 15:12:16 +08:00 |
zhangshanxue
|
981191c053
|
jar中查找类
|
2019-10-09 15:12:11 +08:00 |
wangyuan
|
ee140b7495
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-10-09 14:38:04 +08:00 |
wangyuan
|
81b5ec7236
|
fix final fight
|
2019-10-09 14:36:48 +08:00 |
wangyuan
|
0e44a8795f
|
fix fastreward & fix especialEquip misison
|
2019-10-09 14:13:23 +08:00 |
zhangshanxue
|
c6cf91aa70
|
非注解handler注入
|
2019-10-09 10:33:37 +08:00 |
zhangshanxue
|
f9dab7ddae
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-08 18:56:28 +08:00 |
zhangshanxue
|
0758d2da32
|
兽潮快速战斗
|
2019-10-08 18:56:05 +08:00 |
wangyuan
|
03c948bf9a
|
des
|
2019-10-08 18:06:45 +08:00 |
wangyuan
|
29a6ab23a3
|
des
|
2019-10-08 16:38:02 +08:00 |
wangyuan
|
0da5001de3
|
battle
|
2019-10-08 16:35:19 +08:00 |
wangyuan
|
65d1405b13
|
hero lock & fix msg
|
2019-10-08 16:30:00 +08:00 |
wangyuan
|
d302e893b4
|
hero lock
|
2019-10-08 15:59:36 +08:00 |
wangyuan
|
36340f3a18
|
跑马灯& 回溯
|
2019-10-08 15:31:28 +08:00 |
zhangshanxue
|
6f1972e902
|
幸运探宝
|
2019-10-08 10:04:26 +08:00 |
zhangshanxue
|
dd496531a3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
|
2019-09-28 11:01:22 +08:00 |
zhangshanxue
|
13cb402343
|
幸运探宝
|
2019-09-28 11:00:06 +08:00 |
wangyuan
|
6cbab124e9
|
add login white
|
2019-09-27 18:11:26 +08:00 |
wangyuan
|
8d92dcbfdc
|
fix map
|
2019-09-27 17:38:17 +08:00 |