Commit Graph

124 Commits (93aad66ce4b5b276a96b6ff2cc8742b1336a7db5)
 

Author SHA1 Message Date
gaojie 93aad66ce4 fix 2019-01-22 16:41:41 +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
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