wangyuan
|
ac8d19d079
|
hero up star
|
2019-01-23 11:06:36 +08:00 |
gaojie
|
511f2f2b3d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
Conflicts:
serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
|
2019-01-23 10:42:00 +08:00 |
gaojie
|
771ce8de89
|
fix
|
2019-01-23 10:41:10 +08:00 |
mashiyu
|
477bcdab28
|
删除
|
2019-01-23 10:38:13 +08:00 |
mashiyu
|
f408616cc2
|
提交
|
2019-01-23 10:02:41 +08:00 |
mashiyu
|
50ee40a186
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-23 09:53:58 +08:00 |
mashiyu
|
36b3739049
|
提交
|
2019-01-23 09:53:44 +08:00 |
jiahuiwen
|
4d1ae3caf3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-23 09:53:11 +08:00 |
wangyuan
|
f0ef8e4324
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/SCHeroRankUpConfig.java
|
2019-01-23 09:51:54 +08:00 |
wangyuan
|
65a6d59259
|
error code
|
2019-01-23 09:50:50 +08:00 |
mashiyu
|
c28ba0913e
|
打包
|
2019-01-22 18:55:33 +08:00 |
jiahuiwen
|
482f9c07b3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-22 18:01:15 +08:00 |
jiahuiwen
|
18431a9ccd
|
地图
|
2019-01-22 18:00:16 +08:00 |
mashiyu
|
34bcd18e8d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-22 17:17:02 +08:00 |
mashiyu
|
a831515aad
|
提交
|
2019-01-22 17:16:53 +08:00 |
gaojie
|
c3dc08c1b3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-22 16:41:46 +08:00 |
gaojie
|
93aad66ce4
|
fix
|
2019-01-22 16:41:41 +08:00 |
wangyuan
|
b87c421818
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-01-22 16:31:35 +08:00 |
wangyuan
|
b499104a22
|
fix
|
2019-01-22 16:31:10 +08:00 |
gaojie
|
deec982cb9
|
GM添加卡牌
|
2019-01-22 16:30:21 +08:00 |
gaojie
|
49b9d9c4f2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-22 16:15:28 +08:00 |
gaojie
|
e2df7ba34f
|
GM
|
2019-01-22 16:15:25 +08:00 |
mashiyu
|
edb330f0fd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-22 16:04:08 +08:00 |
mashiyu
|
5c59a5e59f
|
提交
|
2019-01-22 16:03:56 +08:00 |
gaojie
|
d17f20627c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-22 16:02:27 +08:00 |
gaojie
|
7ab8e61bbc
|
道具消耗
|
2019-01-22 16:02:24 +08:00 |
wangyuan
|
15eab663e9
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-01-22 14:44:36 +08:00 |
wangyuan
|
13ec95f093
|
删除hero属性
|
2019-01-22 14:44:02 +08:00 |
mashiyu
|
f7a3f9dff4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-22 14:43:56 +08:00 |
mashiyu
|
43330ab36e
|
提交
|
2019-01-22 14:43:39 +08:00 |
gaojie
|
57f73449d8
|
掉落
|
2019-01-22 14:37:10 +08:00 |
mashiyu
|
d809b04af5
|
错误码
|
2019-01-22 13:55:52 +08:00 |
jiahuiwen
|
ab03ce293e
|
地图只能放一个事件
|
2019-01-22 12:03:27 +08:00 |
jiahuiwen
|
20aa0dbe48
|
地图配置表
|
2019-01-22 11:06:43 +08:00 |
jiahuiwen
|
80dc8b3fee
|
地图配置表
|
2019-01-22 10:52:09 +08:00 |
wangyuan
|
77f08cd750
|
hero
|
2019-01-22 09:57:49 +08:00 |
wangyuan
|
6ddd6930ec
|
fix
|
2019-01-22 09:56:56 +08:00 |
wangyuan
|
ee902be8ea
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-01-22 09:55:06 +08:00 |
wangyuan
|
3b2df641ea
|
delete
|
2019-01-22 09:54:33 +08:00 |
jiahuiwen
|
be1d601c0e
|
注释报错
|
2019-01-22 09:52:15 +08:00 |
jiahuiwen
|
7e9b6c62af
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-22 09:51:23 +08:00 |
jiahuiwen
|
c658c1f5a0
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-01-22 09:51:12 +08:00 |
wangyuan
|
be088a61f9
|
random
|
2019-01-22 09:46:37 +08:00 |
jiahuiwen
|
1224c2606b
|
地图
|
2019-01-22 09:45:24 +08:00 |
gaojie
|
38080b502e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-22 09:25:49 +08:00 |
gaojie
|
358310d762
|
添加道具公共接口
|
2019-01-22 09:25:44 +08:00 |
mashiyu
|
245ed58ec8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-21 18:27:21 +08:00 |
mashiyu
|
ba247b4161
|
迷雾开格
|
2019-01-21 18:26:48 +08:00 |
wangyuan
|
3e61f6474a
|
delete mapinfo
|
2019-01-21 18:06:56 +08:00 |
wangyuan
|
a937b76400
|
抽卡beta
|
2019-01-21 15:31:02 +08:00 |