Commit Graph

122 Commits (3676c49c2b485d3601a131b66093895dd7b655ac)

Author SHA1 Message Date
wangyuan 7471064777 commit data 2019-03-28 10:50:18 +08:00
wangyuan 8e276c9be2 行动力 2019-03-27 20:30:33 +08:00
mashiyu 1ec26b5c8b 怪物表 2019-03-27 17:08:40 +08:00
wangyuan ecb6e2a810 提交配置数据 2019-03-27 10:43:13 +08:00
jiahuiwen 1c42a47e42 配置文件 2019-03-27 10:24:40 +08:00
mashiyu 6fb4dee9c6 同步战斗 2019-03-26 15:11:47 +08:00
wangyuan 88a1188dcf data commit 2019-03-26 11:23:06 +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
wangyuan 65f2bd5692 修改推荐妖灵师奖励 2019-03-22 16:16:12 +08:00
jiahuiwen 6c70934842 配置表提交 2019-03-22 14:29:22 +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
gaojie 3f69e112d8 技能静态数据更新 2019-03-21 17:23:19 +08:00
jiahuiwen 13a95395f8 地图配置表 2019-03-21 15:29:53 +08:00
gaojie 5527f560d9 生成文件数据类型处理 2019-03-21 11:19:25 +08:00
gaojie 21ac81824c fix 2019-03-21 10:54:52 +08:00
wangyuan 7e4c8f7a7e update data 2019-03-20 16:14:45 +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
gaojie 245118a707 fix 2019-03-20 15:05:41 +08:00
gaojie 20b1628d6c 增加怪物组技能 2019-03-20 11:54:43 +08:00
jiahuiwen 73ae2a9bf4 地图新增两个行为 2019-03-19 18:12:36 +08:00
jiahuiwen 6db6e061a5 地图探索修改 2019-03-19 15:54:37 +08:00
jiahuiwen b3a7c9838f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-19 11:15:24 +08:00
jiahuiwen e1f606e1ed 地图 2019-03-19 11:15:19 +08:00
wangyuan 139a7562a1 food buffer first version 2019-03-18 18:13:34 +08:00
jiahuiwen dc2dff5378 数据提交 2019-03-14 15:45:29 +08:00
jiahuiwen 96abec7248 配置表提交 2019-03-14 12:08:51 +08:00
wangyuan a1e84b5a16 randhero 2019-03-13 21:04:12 +08:00
jiahuiwen 483dabee0e 数据提交 2019-03-13 20:11:45 +08:00
jiahuiwen 0eec365385 地图数据 2019-03-13 16:43:01 +08:00
wangyuan b847700469 upload data 2019-03-13 16:41:21 +08:00
wangyuan e4b65bc7aa change mongo 2019-03-12 18:59:14 +08:00
wangyuan c259bb3e57 ActionPower 2019-03-12 14:30:20 +08:00
gaojie e5d66d4bd3 技能 2019-03-12 14:03:08 +08:00
gaojie aa9ea25018 技能静态表初始化 2019-03-12 11:10:19 +08:00
wangyuan 9d033a9fc5 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-03-11 18:31:10 +08:00
wangyuan f2bdb6126c 异妖 2019-03-11 18:30:42 +08:00
jiahuiwen 061e0f43c0 地图配置表提交 2019-03-09 18:05:10 +08:00
jiahuiwen 9cdc8ff54c 配置表 2019-03-07 14:07:24 +08:00
jiahuiwen e17873e789 地图选项配置表 2019-03-06 20:56:11 +08:00
jiahuiwen a80f078417 地图 2019-03-06 16:04:57 +08:00
gaojie ca5b16163b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-05 15:23:45 +08:00
gaojie e0fd985a43 卡牌装备分页请求 2019-03-05 15:23:38 +08:00
jiahuiwen 03fcab6635 展示地图出生点 2019-03-05 14:27:25 +08:00
wangyuan 22de4a9033 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-02 18:34:15 +08:00
wangyuan fbb2e1c6f2 精力&行动力 2019-03-02 18:30:38 +08:00