Commit Graph

155 Commits (ade79c00a2f8099460846f257d85be3c1eeb3974)

Author SHA1 Message Date
jiahuiwen ef2b6dc136 配置表提交 2019-04-23 09:47:24 +08:00
gaojie fbc7c719e2 英雄合成 2019-04-22 17:39:06 +08:00
jiahuiwen 6fef8b2297 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-04-19 19:18:19 +08:00
jiahuiwen a8cbb93ccb 快速战斗 2019-04-19 19:17:23 +08:00
gaojie 46ff11b41d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-19 18:21:22 +08:00
gaojie 9e00bc05f9 物品分解 2019-04-19 18:21:18 +08:00
jiahuiwen ea8fde820e 配置表提交 2019-04-19 15:21:59 +08:00
gaojie 986c064908 首通奖励 2019-04-19 10:32:27 +08:00
mashiyu a69680944a 提交 2019-04-18 09:56:18 +08:00
jiahuiwen d4de27130e 配置表提交 2019-04-17 20:37:31 +08:00
jiahuiwen 29024fae3e 配置表提交 2019-04-17 19:06:44 +08:00
wangyuan 36f85848af 探索度 2019-04-17 15:02:23 +08:00
gaojie fc76607c69 恢复体力 2019-04-16 17:34:32 +08:00
wangyuan 226a50f33d Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-04-16 10:26:17 +08:00
wangyuan ae9a7bc1ee 挂机 2019-04-16 10:25:45 +08:00
jiahuiwen 8e39b783f1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	conf/server/RewardGroup.txt
#	conf/server/RewardItemConfig.txt
2019-04-15 20:36:06 +08:00
jiahuiwen 9a7f180663 配置表提交 2019-04-15 20:35:40 +08:00
gaojie 4a35cfa272 体力 2019-04-15 20:35:15 +08:00
gaojie 7a0690f520 扫荡 2019-04-15 16:07:48 +08:00
jiahuiwen e65f633023 探索修改 2019-04-12 20:57:15 +08:00
jiahuiwen 4ba216f2e3 探索修改 2019-04-12 19:42:32 +08:00
jiahuiwen ab96501d1c 剩余时间 2019-04-12 15:02:10 +08:00
jiahuiwen bea8a835a3 配置表 2019-04-12 14:53:24 +08:00
gaojie f7942c0c1e 关卡,角色升级 2019-04-12 11:19:31 +08:00
wangyuan 5cdfe42b6b '初始化指定星级hero' 2019-04-09 11:17:15 +08:00
jiahuiwen 1d7c0587d3 配置表提交 2019-04-04 14:02:50 +08:00
wangyuan eb7c619eb5 探索度支持多事件点 2019-04-03 16:28:43 +08:00
jiahuiwen b04bce96a9 行为类型 吃buff 2019-04-02 15:51:45 +08:00
jiahuiwen 501ff8f221 地图增加两个行为类型,配置表 2019-04-02 14:27:47 +08:00
gaojie 54d2172361 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-01 19:24:09 +08:00
gaojie 7fe39cdeac 怪物技能属性 2019-04-01 19:24:05 +08:00
mashiyu e5aac81546 同步表 2019-04-01 14:40:07 +08:00
gaojie 77b9db852b 生成txt文件 2019-04-01 11:16:21 +08:00
jiahuiwen 9b92f1295b 配置表提交 2019-04-01 09:49:02 +08:00
wangyuan 4228fcd592 探索任务类型 2019-03-29 15:54:32 +08:00
jiahuiwen 6e413a7129 出地图 2019-03-28 19:56:53 +08:00
jiahuiwen f5cf36911f 地图修改 2019-03-28 15:08:43 +08:00
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