Commit Graph

520 Commits (51da0e539f2a6c139021daa7cc34b1e7cd5ea339)
 

Author SHA1 Message Date
jiahuiwen 8d9b8e1ff8 地图修改 2019-03-23 17:14:18 +08:00
mashiyu 347ec0a577 数据bug 2019-03-23 17:06:14 +08:00
mashiyu c1a542867a bug 2019-03-23 13:18:16 +08:00
mashiyu bb3fd97b0d log 2019-03-22 19:06:00 +08:00
mashiyu ce3a58641a 错误码 2019-03-22 18:57:17 +08:00
mashiyu 7a779b3ee3 战斗验证 2019-03-22 18:36:24 +08:00
wangyuan 2b06b9ace0 fix 驻扎时间 2019-03-22 17:43:20 +08:00
wangyuan 65f2bd5692 修改推荐妖灵师奖励 2019-03-22 16:16:12 +08:00
mashiyu 1793ddffd9 test 2019-03-22 15:00:06 +08:00
jiahuiwen 6c70934842 配置表提交 2019-03-22 14:29:22 +08:00
jiahuiwen a165c759de Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-22 14:28:29 +08:00
jiahuiwen 1dca447d0c 空掉落 2019-03-22 14:28:13 +08:00
mashiyu 2e0244059c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-22 11:00:23 +08:00
mashiyu e227cefbad 提交 2019-03-22 11:00:12 +08:00
jiahuiwen d035de5a9e Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	conf/server/OptionConfig.txt
2019-03-22 10:11:49 +08:00
jiahuiwen ec1f65e8e1 地图修改 2019-03-22 10:10:49 +08:00
wangyuan 322c7a3e68 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-03-22 10:03:58 +08:00
wangyuan 705e2d5b7b 冒险推荐英雄 2019-03-22 10:02:46 +08:00
mashiyu 60f1dd0aff 优化 2019-03-21 17:48:37 +08:00
mashiyu 2c098f4db0 更新 2019-03-21 17:24:21 +08:00
gaojie 3f69e112d8 技能静态数据更新 2019-03-21 17:23:19 +08:00
mashiyu d7fc189d91 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-21 15:32:48 +08:00
mashiyu ad4d349c7b 路径 2019-03-21 15:32:29 +08:00
jiahuiwen 6ed02aa302 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-21 15:30:05 +08:00
jiahuiwen 13a95395f8 地图配置表 2019-03-21 15:29:53 +08:00
jiahuiwen cce1214a65 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-21 15:29:25 +08:00
mashiyu ad4178af44 路径 2019-03-21 15:29:22 +08:00
jiahuiwen f6f1cac98e 事件点触发方式 2019-03-21 15:28:21 +08:00
mashiyu 0dd082a3b2 log 2019-03-21 15:24:31 +08:00
mashiyu a37e7310f6 优化 2019-03-21 15:01:27 +08:00
mashiyu e56acaea56 战斗验证 2019-03-21 14:33:56 +08:00
gaojie 5ed6302f7e 技能 2019-03-21 12:41:25 +08:00
gaojie 5527f560d9 生成文件数据类型处理 2019-03-21 11:19:25 +08:00
gaojie 21ac81824c fix 2019-03-21 10:54:52 +08:00
mashiyu c2b163f29c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-20 20:04:24 +08:00
mashiyu 8eff75e7c6 优化 2019-03-20 20:04:14 +08:00
jiahuiwen 04c60c2ac9 战斗修改 2019-03-20 19:50:21 +08:00
jiahuiwen 60db6c0005 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-20 19:01:41 +08:00
jiahuiwen 697487642c 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-03-20 19:01:35 +08:00
mashiyu 1dc2dff60a 引用jar 2019-03-20 19:01:18 +08:00
jiahuiwen 618a1903e1 任务 2019-03-20 18:39:37 +08:00
mashiyu ab67577ff6 提交 2019-03-20 18:36:58 +08:00
mashiyu 700c6f4d4c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-20 18:36:19 +08:00
wangyuan 7e4c8f7a7e update data 2019-03-20 16:14:45 +08:00
mashiyu 5dae658da3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-20 16:09:06 +08:00
wangyuan e10e8b9c55 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-03-20 16:08:14 +08:00
wangyuan 1bfe45c373 function control 2019-03-20 16:07:46 +08:00
mashiyu dae6b91053 啊啊啊 2019-03-20 16:01:44 +08:00
mashiyu 0e42332a4b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-20 15:24:04 +08:00
gaojie 65d2d64219 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-20 15:05:45 +08:00