wangyuan
|
f246d8ce74
|
set level
|
2019-10-14 15:54:19 +08:00 |
wangyuan
|
b83aa4b27a
|
fix
|
2019-10-14 15:32:58 +08:00 |
wangyuan
|
94ac2788df
|
change classloader
|
2019-10-14 15:30:13 +08:00 |
lvxinran
|
8851b2e725
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-14 07:14:10 +08:00 |
zhangshanxue
|
29c2042d70
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-30 16:38:12 +08:00 |
zhangshanxue
|
847740bfad
|
充值活动
|
2019-10-30 16:38:01 +08:00 |
lvxinran
|
5c554fec56
|
控制服务器公会战加入
|
2019-10-14 07:13:46 +08:00 |
lvxinran
|
759488f99f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-14 05:22:38 +08:00 |
lvxinran
|
e8f10f1f04
|
戒灵秘宝,公会修改
|
2019-10-14 05:20:05 +08:00 |
lvxinran
|
a4bed99395
|
配置回滚
|
2019-10-13 06:23:58 +08:00 |
lvxinran
|
c007ac7f3b
|
公会修改
|
2019-10-13 06:13:37 +08:00 |
lvxinran
|
e5f1007862
|
戒灵秘宝周刷新修改
|
2019-10-25 05:05:31 +08:00 |
lvxinran
|
6983bb86de
|
修改任务
|
2019-10-22 03:01:17 +08:00 |
lvxinran
|
89ac91c01b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-22 02:53:11 +08:00 |
lvxinran
|
4ca3c49ffe
|
戒灵秘宝开始前重置
|
2019-10-22 02:53:02 +08:00 |
zhangshanxue
|
36e7bca253
|
血战配置
|
2019-10-12 15:30:13 +08:00 |
zhangshanxue
|
e009ee3191
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-12 15:24:24 +08:00 |
zhangshanxue
|
7a228f968e
|
血战配置
|
2019-10-12 15:22:11 +08:00 |
zhangshanxue
|
467024e9bb
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-11 19:09:49 +08:00 |
zhangshanxue
|
6e6bb5550c
|
幸运探宝
|
2019-10-11 19:09:44 +08:00 |
wangyuan
|
060e6f1ad3
|
一键移除
|
2019-10-11 18:29:16 +08:00 |
wangyuan
|
823d0176ce
|
fix fight data
|
2019-10-11 18:13:16 +08:00 |
zhangshanxue
|
c9f2e3514d
|
静态配置
|
2019-10-11 17:28:45 +08:00 |
zhangshanxue
|
c3aa2c15f7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-11 16:55:54 +08:00 |
lvxinran
|
9476a9b529
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-21 09:45:04 +08:00 |
lvxinran
|
28ca7043c7
|
邮件优化
|
2019-10-21 09:44:56 +08:00 |
lvxinran
|
c588030e47
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-14 05:08:41 +08:00 |
lvxinran
|
7bfa624269
|
周刷新
|
2019-10-14 05:08:20 +08:00 |
zhangshanxue
|
fb33d6bdb6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/SRechargeCommodityConfig.java
# serverlogic/src/main/java/com/ljsd/jieling/config/SSpecialConfig.java
# serverlogic/src/main/java/com/ljsd/jieling/config/STreasureTaskConfig.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/UserLevelEventHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java
|
2019-10-11 16:55:39 +08:00 |
zhangshanxue
|
85996ead41
|
工具模块 配置模块提取 热更新优化
|
2019-10-11 16:32:20 +08:00 |
wangyuan
|
819a7621af
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-10-11 11:17:15 +08:00 |
wangyuan
|
98ea41df73
|
fix hero level task
|
2019-10-11 11:16:57 +08:00 |
wangyuan
|
06ea43d6bd
|
fix rank
|
2019-10-11 10:02:01 +08:00 |
wangyuan
|
0226f85fec
|
fix recharge
|
2019-10-10 20:08:29 +08:00 |
wangyuan
|
a86722392e
|
fix buygoodslogic
|
2019-10-10 17:52:18 +08:00 |
wangyuan
|
51f2865a52
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-10-10 17:51:26 +08:00 |
lvxinran
|
8fd72f8a25
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-15 05:03:25 +08:00 |
lvxinran
|
3130428158
|
戒灵秘宝GM,修改,公会战条件添加
|
2019-10-15 05:03:20 +08:00 |
wangyuan
|
f69ee85be1
|
fix buygoodslogic
|
2019-10-10 17:51:04 +08:00 |
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 |