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 |
jiahuiwen
|
f94a4e66b6
|
log
|
2019-01-21 10:55:20 +08:00 |
jiahuiwen
|
906253e35b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-21 10:51:05 +08:00 |
jiahuiwen
|
627b376b37
|
地图
|
2019-01-21 10:50:59 +08:00 |
mashiyu
|
cc1ab75c18
|
提交
|
2019-01-21 09:40:03 +08:00 |
jiahuiwen
|
168e51c45f
|
删除报错
|
2019-01-18 17:11:46 +08:00 |
jiahuiwen
|
565fd161d6
|
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-18 17:05:10 +08:00 |
jiahuiwen
|
5fa0f5b0f4
|
地图
|
2019-01-18 15:38:07 +08:00 |
gaojie
|
713ecb6902
|
提交
|
2019-01-18 15:37:44 +08:00 |
mashiyu
|
d93064f353
|
提交
|
2019-01-18 12:41:09 +08:00 |
wangyuan
|
68a9e3e38e
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-01-18 12:13:12 +08:00 |
wangyuan
|
6a096f78e9
|
根据配置文件自动生成java文件
|
2019-01-18 12:12:58 +08:00 |
mashiyu
|
ec8c8ca7f6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllItemHandler.java
|
2019-01-18 12:08:26 +08:00 |
mashiyu
|
bab9eb98a8
|
提交
|
2019-01-18 12:06:45 +08:00 |
gaojie
|
362c34e325
|
fix
|
2019-01-18 10:17:31 +08:00 |
gaojie
|
8b26c4a73f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
Conflicts:
serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllItemHandler.java
|
2019-01-18 10:13:59 +08:00 |
gaojie
|
7fb418baf6
|
用户物品
|
2019-01-18 10:10:12 +08:00 |
wangyuan
|
cbd48c5097
|
hero
|
2019-01-18 09:58:37 +08:00 |
mashiyu
|
ee1defd706
|
提交
|
2019-01-17 20:50:13 +08:00 |
mashiyu
|
5012bc0fd0
|
提交
|
2019-01-17 15:08:52 +08:00 |
mashiyu
|
aa52efc22b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Item.java
|
2019-01-17 14:38:47 +08:00 |
mashiyu
|
4fc7cd3f32
|
提交
|
2019-01-17 14:38:03 +08:00 |
jiahuiwen
|
96c9a573b8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-16 17:19:33 +08:00 |
gaojie
|
e09fea0d76
|
fix
|
2019-01-16 17:19:17 +08:00 |
jiahuiwen
|
8b19cbdeb5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-16 17:19:09 +08:00 |
gaojie
|
14297b68f0
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-16 16:50:30 +08:00 |
gaojie
|
d9ac7c1dd2
|
卡牌静态数据加载
|
2019-01-16 16:50:26 +08:00 |
wangyuan
|
1b1495939a
|
fix
|
2019-01-16 16:30:41 +08:00 |
wangyuan
|
ecb8d8cc51
|
修改测试客户端 & 修改item
|
2019-01-16 16:19:44 +08:00 |
jiahuiwen
|
3a77b42b50
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/SCMapConfig.java
# serverlogic/src/main/java/com/ljsd/jieling/config/SCMapEventsConfig.java
|
2019-01-16 15:30:54 +08:00 |
jiahuiwen
|
f6d8b7322c
|
地图提交
|
2019-01-16 15:24:01 +08:00 |
mashiyu
|
5df73a6802
|
提交
|
2019-01-15 16:19:23 +08:00 |
gaojie
|
62b82fe8e3
|
fix
|
2019-01-15 15:55:08 +08:00 |
gaojie
|
33657a69e7
|
加载静态数据
|
2019-01-15 15:19:58 +08:00 |
gaojie
|
9e160953e1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-15 15:04:32 +08:00 |
gaojie
|
6870bb9d30
|
静态表数据
|
2019-01-15 15:04:27 +08:00 |
gaojie
|
93fb410ee9
|
GM添加道具
|
2019-01-15 15:03:28 +08:00 |
mashiyu
|
8776743e16
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-15 11:39:28 +08:00 |