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 |
lvxinran
|
162b0880b7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-27 15:02:56 +08:00 |
lvxinran
|
4fa201093a
|
已加入工会提示
|
2019-09-27 15:02:46 +08:00 |
wangyuan
|
9c33a505a6
|
Merge branch 'project0.93'
|
2019-09-27 14:58:45 +08:00 |
wangyuan
|
3f17df4540
|
fix gm
|
2019-09-27 14:53:07 +08:00 |
wangyuan
|
85bb61208d
|
upload
|
2019-09-27 14:17:33 +08:00 |
wangyuan
|
7bd4b67364
|
fix item drop
|
2019-09-27 14:10:36 +08:00 |
wangyuan
|
21dba7ff37
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-09-27 14:05:50 +08:00 |
wangyuan
|
29caa89314
|
fix bug
|
2019-09-27 14:05:30 +08:00 |
lvxinran
|
8867433bf4
|
Merge branch 'project0.93'
|
2019-09-27 13:36:46 +08:00 |
lvxinran
|
6e4ba9ed73
|
公会走路
|
2019-09-27 13:36:09 +08:00 |
lvxinran
|
ffc3e7890d
|
公会战bug
|
2019-09-29 12:06:40 +08:00 |
wangyuan
|
2900cade4c
|
vip特权结算收益
|
2019-09-27 11:53:56 +08:00 |
wangyuan
|
12b13fa6b0
|
OFFLINE TIME
|
2019-09-27 11:40:59 +08:00 |
zhangshanxue
|
b98fd6b273
|
幸运探宝
|
2019-09-27 11:16:35 +08:00 |
wangyuan
|
cc1a749227
|
好友赠送友情点
|
2019-09-27 10:38:13 +08:00 |
wangyuan
|
c70ea68e76
|
delete log
|
2019-09-27 10:25:23 +08:00 |
wangyuan
|
514a4086b6
|
fix
|
2019-09-27 10:22:42 +08:00 |
wangyuan
|
ac8466f081
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalSystemConfig.java
|
2019-09-27 10:21:16 +08:00 |
wangyuan
|
405ab16ed0
|
new fight
|
2019-09-27 10:18:38 +08:00 |
lvxinran
|
0319fcefae
|
公会优化
|
2019-09-27 04:52:58 +08:00 |
lvxinran
|
9d90c6f661
|
工会申请列表红点
|
2019-09-26 17:56:15 +08:00 |
lvxinran
|
63687ab6cd
|
Merge branch 'project0.93'
|
2019-09-27 04:53:12 +08:00 |
lvxinran
|
ae3e1e9a71
|
Merge branch 'project0.93'
|
2019-09-27 04:51:30 +08:00 |
wangyuan
|
9357d3e802
|
fix team id
|
2019-09-26 15:53:27 +08:00 |
zhangshanxue
|
aff8be52f7
|
Merge branch 'project0.94'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_role_gm.java
|
2019-09-26 14:20:13 +08:00 |
zhangshanxue
|
f10ff47dc4
|
gm命令 异步事件分发 探宝活动
|
2019-09-26 14:18:27 +08:00 |
wangyuan
|
24c49c8cfe
|
fix report
|
2019-09-26 13:44:35 +08:00 |
wangyuan
|
ae1b86a695
|
fix
|
2019-09-26 11:04:43 +08:00 |
wangyuan
|
cb46ed50c8
|
Merge branch 'newfight'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/STestWelfare.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
|
2019-09-26 10:36:41 +08:00 |
wangyuan
|
201765fd9f
|
fix maxlevel
|
2019-09-26 10:27:28 +08:00 |
wangyuan
|
9067ca3e07
|
new fight & workshoplevel & herolevel
|
2019-09-26 10:06:55 +08:00 |
lvxinran
|
1cd0fe5ce7
|
孙龙宝藏重置
|
2019-09-26 09:54:17 +08:00 |
zhangshanxue
|
cf8066ae5c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-25 15:39:23 +08:00 |
zhangshanxue
|
e76e1f93c6
|
定时系统邮件
|
2019-09-25 15:39:17 +08:00 |
lvxinran
|
b5d2808ec8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-25 14:48:00 +08:00 |
lvxinran
|
04002b3fac
|
公会相关
|
2019-09-25 14:47:54 +08:00 |
lvxinran
|
ffd91d6adb
|
gm无尽商店
|
2019-09-28 08:22:40 +08:00 |
wangyuan
|
0b2d08276c
|
log
|
2019-09-25 14:06:58 +08:00 |
lvxinran
|
c2be0dc3f8
|
无尽商店
|
2019-09-25 10:54:27 +08:00 |
lvxinran
|
38ff05edb4
|
怪物战力
|
2019-09-25 10:53:34 +08:00 |
wangyuan
|
e0aaca6306
|
fix
|
2019-09-25 10:37:14 +08:00 |
wangyuan
|
a7f07c668e
|
log
|
2019-09-25 10:34:09 +08:00 |
lvxinran
|
7ebb58041c
|
表格报错
|
2019-09-25 10:26:52 +08:00 |
wangyuan
|
95d82b59bd
|
fix store
|
2019-09-25 10:14:46 +08:00 |
wangyuan
|
20e9b0f8ec
|
new fight
|
2019-09-25 09:58:02 +08:00 |
lvxinran
|
c208d37eb5
|
邮件修改
|
2019-09-24 21:38:26 +08:00 |