wangyuan
|
93643930c6
|
fixc resend
|
2019-10-27 17:35:16 +08:00 |
wangyuan
|
b0ef60d864
|
filter 0
|
2019-10-27 16:37:24 +08:00 |
wangyuan
|
3df321bc11
|
hero
|
2019-10-27 16:18:08 +08:00 |
zhangshanxue
|
ccc0b8512a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-25 15:34:53 +08:00 |
wangyuan
|
a07565b16b
|
rank
|
2019-10-27 15:34:21 +08:00 |
wangyuan
|
8b0480c652
|
fix fight rank
|
2019-10-27 12:03:07 +08:00 |
zhangshanxue
|
be7a119263
|
异常和错误提示修改
|
2019-10-25 15:34:46 +08:00 |
zhangshanxue
|
b946685cdf
|
跑马灯
|
2019-10-25 15:27:24 +08:00 |
zhangshanxue
|
62e5c9314c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-25 11:57:08 +08:00 |
wangyuan
|
d1f50fddf7
|
fix fight hero passskill
|
2019-10-27 11:33:27 +08:00 |
zhangshanxue
|
14e86450a4
|
跑马灯
|
2019-10-25 11:57:03 +08:00 |
zhangshanxue
|
070774cc6b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-24 10:34:07 +08:00 |
zhangshanxue
|
d2be1a3355
|
异常和错误提示修改
|
2019-10-24 10:34:02 +08:00 |
lvxinran
|
d254b2793b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-23 17:38:51 +08:00 |
lvxinran
|
e50658debc
|
背包上限修改
|
2019-10-23 17:38:46 +08:00 |
zhangshanxue
|
bbfbfc5c9b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-23 17:36:07 +08:00 |
zhangshanxue
|
30a775ff89
|
异常和错误提示修改
|
2019-10-23 17:36:03 +08:00 |
wangyuan
|
47e0d4fb65
|
fix adventure rewrd
|
2019-10-23 15:11:53 +08:00 |
lvxinran
|
5ed723c9da
|
无尽副本修改
|
2019-10-23 14:48:40 +08:00 |
lvxinran
|
3fad81a218
|
公会战安慰奖励
|
2019-10-24 00:11:43 +08:00 |
lvxinran
|
fa6f4e546d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-23 22:12:19 +08:00 |
lvxinran
|
49453817c2
|
背包已满处理
|
2019-10-23 22:12:14 +08:00 |
lvxinran
|
21b79fcf03
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-22 21:45:11 +08:00 |
lvxinran
|
8a761ab982
|
公会战条件
|
2019-10-22 21:45:06 +08:00 |
wangyuan
|
c536c8c6a5
|
fix adventure reward
|
2019-10-22 14:06:50 +08:00 |
zhangshanxue
|
6f4f669923
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-22 11:59:36 +08:00 |
zhangshanxue
|
bfdddc8158
|
异常和错误提示修改
|
2019-10-22 11:59:23 +08:00 |
wangyuan
|
30c61f868f
|
just one hero in team when init user
|
2019-10-22 10:38:32 +08:00 |
wangyuan
|
915639672d
|
fix week send time
|
2019-10-22 10:34:53 +08:00 |
wangyuan
|
d588467de9
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-10-21 20:21:27 +08:00 |
wangyuan
|
0d73139b22
|
boss
|
2019-10-21 19:17:39 +08:00 |
lvxinran
|
634bdf6317
|
公会战阶段信息无公会判断
|
2019-10-21 17:53:28 +08:00 |
lvxinran
|
dbaac6a1c7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-21 15:25:16 +08:00 |
lvxinran
|
554c62964b
|
公会邮件修改
|
2019-10-21 15:25:11 +08:00 |
wangyuan
|
6ac4dc6cea
|
fix chat
|
2019-10-21 14:39:32 +08:00 |
wangyuan
|
b9b8eaba39
|
pokemon skill
|
2019-10-21 14:20:56 +08:00 |
wangyuan
|
223a0a8216
|
fix mission
|
2019-10-21 10:10:22 +08:00 |
wangyuan
|
3bc2f7d755
|
fix daily mission
|
2019-10-18 17:49:10 +08:00 |
wangyuan
|
fa0a8f7990
|
fix
|
2019-11-18 17:43:24 +08:00 |
wangyuan
|
be434caaee
|
fix
|
2019-10-18 17:33:00 +08:00 |
wangyuan
|
425d3bd03a
|
change task
|
2019-10-18 16:58:32 +08:00 |
lvxinran
|
237b1d5683
|
公会战修改
|
2019-10-18 14:02:40 +08:00 |
lvxinran
|
550a383acf
|
公会战力修改
|
2019-10-18 10:41:55 +08:00 |
lvxinran
|
363aa9afad
|
公会战修改
|
2019-10-18 10:22:35 +08:00 |
wangyuan
|
693097895b
|
fix bug
|
2019-10-17 18:07:10 +08:00 |
wangyuan
|
321e8fab22
|
fix serverlogic
|
2019-10-17 17:56:09 +08:00 |
lvxinran
|
d4d04d44a2
|
邮件改为 错误码
|
2019-10-17 17:39:01 +08:00 |
lvxinran
|
31c48619dd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-17 16:53:03 +08:00 |
lvxinran
|
c3f35cce43
|
转让会长修改
|
2019-10-17 16:52:57 +08:00 |
wangyuan
|
c87291d6ca
|
change remaintime to leveltime
|
2019-10-17 16:38:38 +08:00 |
lvxinran
|
7d255d416b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-17 16:24:09 +08:00 |
lvxinran
|
1bd24f20d8
|
公会战修改
|
2019-10-17 16:24:04 +08:00 |
zhangshanxue
|
3f1300a0f6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-17 15:25:27 +08:00 |
zhangshanxue
|
eb4064b821
|
排行榜优化
|
2019-10-17 15:25:23 +08:00 |
lvxinran
|
abe5e76f64
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-17 15:01:49 +08:00 |
lvxinran
|
df36a686cf
|
公会布防人数修改
|
2019-10-17 15:01:44 +08:00 |
lvxinran
|
91acb26eed
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-02 05:43:21 +08:00 |
lvxinran
|
4702609ebb
|
云梦祈福活动修改
|
2019-11-02 05:43:16 +08:00 |
lvxinran
|
dcdb7bd330
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-30 15:18:33 +08:00 |
lvxinran
|
663680048b
|
戒灵秘宝修改
|
2019-10-30 15:18:28 +08:00 |
wangyuan
|
b77dd92777
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-10-17 13:48:01 +08:00 |
wangyuan
|
29c503412b
|
fix mainlevel
|
2019-10-17 13:47:04 +08:00 |
wangyuan
|
308ff97757
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-10-16 17:17:46 +08:00 |
wangyuan
|
fa15abe76d
|
add guild name
|
2019-10-16 17:17:28 +08:00 |
wangyuan
|
cdde4a9ef3
|
add hero info
|
2019-10-16 15:09:22 +08:00 |
lvxinran
|
eba1a6bd0e
|
无尽本修改
|
2019-10-16 14:16:23 +08:00 |
lvxinran
|
5fb0071318
|
戒灵秘宝等级推送删除
|
2019-10-16 13:53:20 +08:00 |
zhangshanxue
|
aa2d6d0648
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-16 11:25:07 +08:00 |
zhangshanxue
|
a2ac1eaf28
|
跑马灯
|
2019-10-16 11:25:03 +08:00 |
zhangshanxue
|
146444119f
|
排行榜判null
|
2019-10-16 11:23:56 +08:00 |
lvxinran
|
c0a0514fe7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-16 10:20:59 +08:00 |
lvxinran
|
b3e6d44a8b
|
邮件获取修改
|
2019-10-16 10:20:54 +08:00 |
lvxinran
|
a2b6955507
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-17 01:01:02 +08:00 |
lvxinran
|
164a3cb45f
|
头像提交
|
2019-10-17 01:00:57 +08:00 |
wangyuan
|
46e26c9959
|
view hero detail
|
2019-10-15 16:53:08 +08:00 |
wangyuan
|
589138f8a1
|
view team info
|
2019-10-15 16:15:08 +08:00 |
wangyuan
|
d5b455eb27
|
view team details
|
2019-10-15 14:31:54 +08:00 |
wangyuan
|
8f34ad884a
|
fix activity
|
2019-10-15 10:22:08 +08:00 |
wangyuan
|
539c43c50e
|
extra drop
|
2019-10-14 19:59:00 +08:00 |
lvxinran
|
c87de8e301
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-14 18:09:25 +08:00 |
lvxinran
|
29b7f592e8
|
公会战修改
|
2019-10-14 18:08:44 +08:00 |
lvxinran
|
c70b7b17ef
|
邮件修改
|
2019-10-15 08:08:14 +08:00 |
wangyuan
|
a3eed6219f
|
store close
|
2019-10-14 17:27:03 +08:00 |
wangyuan
|
f531fd85d6
|
fix store open
|
2019-10-14 17:17:25 +08:00 |
wangyuan
|
2acbce61b4
|
fix store
|
2019-10-14 16:32:30 +08:00 |
wangyuan
|
f246d8ce74
|
set level
|
2019-10-14 15:54:19 +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
|
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
|
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 |
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 |