Commit Graph

1220 Commits (6ef92b7d2d796e0e0528358ac8b5761906b81224)
 

Author SHA1 Message Date
wangyuan 608d7dbb9f delete log 2019-07-06 18:05:02 +08:00
wangyuan 1f4eea88c0 fix hero 2019-07-06 18:04:17 +08:00
lvxinran 1846fed4c9 爬塔修改 2019-07-01 18:00:39 +08:00
lvxinran 58a2d9e87a 试炼更新 2019-07-01 17:29:39 +08:00
wangyuan c0e6246a04 battlemain 2019-07-06 15:08:04 +08:00
wangyuan 6c69715840 conf 2019-07-02 13:41:30 +08:00
wangyuan 803850c4ea fight 2019-07-02 13:32:16 +08:00
wangyuan 6e71bccd2a conf 2019-07-02 13:01:43 +08:00
gaojie fb63575f3f 体力上限 2019-07-01 12:00:55 +08:00
gaojie 681e26ae0a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-01 11:28:24 +08:00
gaojie 4d31031f31 log 2019-07-01 11:26:42 +08:00
wangyuan be4cabc23b fix mission 2019-06-29 16:49:09 +08:00
lvxinran de2b8cf853 试炼副本相关提交 2019-06-29 16:29:28 +08:00
wangyuan 92d17073ae fix force 2019-06-29 16:22:34 +08:00
wangyuan 51257cda85 坐标 2019-06-29 11:06:33 +08:00
lvxinran 4dd64f4237 试炼爬塔副本相关提交 2019-06-29 10:11:52 +08:00
lvxinran ae5e0ce08b lvxinran提交 2019-06-28 19:36:10 +08:00
lvxinran 23aa6369c7 Hero信息修改 2019-06-28 19:19:00 +08:00
wangyuan eaa72f5efa conf 2019-06-28 17:58:42 +08:00
wangyuan 50fdae30bf fix 2019-06-30 20:14:40 +08:00
wangyuan d064d102ab new event type 2019-06-30 20:11:34 +08:00
wangyuan 0f7550d798 misison 2019-06-30 19:59:49 +08:00
wangyuan f979eb10a2 任务 2019-06-30 19:24:45 +08:00
wangyuan 08289dd789 snp fight 2019-06-30 18:15:18 +08:00
wangyuan 62340bf943 击杀奖励 2019-06-30 15:39:15 +08:00
wangyuan 8ec7059ba1 fix 2019-06-28 11:54:26 +08:00
wangyuan fdb1e52792 luafight 2019-06-28 11:28:45 +08:00
wangyuan 1128d19217 领取秘境奖励次数 2019-06-28 11:24:17 +08:00
wangyuan a13cd2de02 fix work shop 2019-06-27 20:50:42 +08:00
wangyuan 0204a27a38 fix skip fight 2019-06-27 19:32:03 +08:00
wangyuan 121c465496 创角时间 2019-06-27 18:06:00 +08:00
wangyuan 18cd2bd4b9 fix 40 2019-06-27 17:45:25 +08:00
wangyuan 82c1fc4dd8 挂机 2019-06-27 17:34:21 +08:00
wangyuan 1655043499 fix skip boss 2019-06-27 17:08:56 +08:00
lvxinran 09a19a126b 表格信息更改 2019-06-27 14:56:23 +08:00
wangyuan e5cf962cee 地图类型40 2019-06-27 14:08:10 +08:00
wangyuan f7ee8b388e 修复日常任务多穿了一个参数 2019-06-26 20:55:11 +08:00
jiahuiwen 2a3c2988f2 删除 2019-06-26 19:01:43 +08:00
jiahuiwen 7cea727ea5 删除多余方法 2019-06-26 18:57:58 +08:00
jiahuiwen 79bc55a648 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-06-26 18:56:47 +08:00
jiahuiwen 6a806eca6d 爬塔副本 2019-06-26 18:56:15 +08:00
wangyuan ec6c26e8a9 自动删除精英怪坐标 2019-06-26 18:04:54 +08:00
wangyuan 5dbcbb4bd3 fix 2019-06-26 16:25:39 +08:00
wangyuan 84093dd1a4 battle 2019-06-26 16:02:31 +08:00
wangyuan 587c317dc4 fix 2019-06-26 15:02:21 +08:00
lvxinran 9245d843b7 线程管理单例修改 2019-06-26 14:49:47 +08:00
lvxinran 7ee6ab2961 修改系统时间延迟修改 2019-06-26 13:40:20 +08:00
wangyuan a9f8d02ece 功绩奖励-》一维数组 2019-06-26 10:36:11 +08:00
jiahuiwen 4b612732ef Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-25 20:03:41 +08:00
jiahuiwen d9bf43b0d1 爬塔副本 2019-06-25 20:03:36 +08:00