Commit Graph

438 Commits (88a1188dcf2355d9da82288d854b1df0e8e309a7)
 

Author SHA1 Message Date
wangyuan 88a1188dcf data commit 2019-03-26 11:23:06 +08:00
wangyuan 0bd0d709ea Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
2019-03-26 11:21:47 +08:00
wangyuan fb403ea174 地图探索度 2019-03-26 11:18:43 +08:00
mashiyu ba834ed742 战斗 2019-03-25 19:41:30 +08:00
jiahuiwen 36206f288c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-25 17:51:02 +08:00
jiahuiwen 96379e36f5 增加行为类型24 2019-03-25 17:50:58 +08:00
mashiyu 96312e7a21 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-25 11:46:20 +08:00
mashiyu a628ea0507 失败处理 2019-03-25 11:46:09 +08:00
jiahuiwen bb6c70c8f5 注释log 2019-03-25 11:31:16 +08:00
jiahuiwen 1f37783914 注释log 2019-03-25 11:30:26 +08:00
mashiyu 0f9e39fd77 bug 2019-03-25 11:28:10 +08:00
gaojie 32089c7f76 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
Conflicts:
	serverlogic/src/main/java/com/ljsd/jieling/config/SSkillLogicConfig.java
2019-03-25 11:24:49 +08:00
gaojie b348f81919 初始化技能数据 2019-03-25 11:20:25 +08:00
mashiyu cc9b412f63 bug 2019-03-25 10:58:38 +08:00
mashiyu 0805e3c16e 种子随机 2019-03-23 18:17:38 +08:00
mashiyu c7c43110e6 bug 2019-03-23 18:14:38 +08:00
jiahuiwen 81a603e0dc Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	conf/server/OptionConfig.txt
2019-03-23 17:15:30 +08:00
jiahuiwen f7b6fb9afc 配置表 2019-03-23 17:14:58 +08:00
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