Commit Graph

1177 Commits (745ddbeadfbf0e642c1ec735e3b392a6316d35ea)

Author SHA1 Message Date
lvxinran 3e3de9e38d 试炼重置修改 2019-07-03 11:17:41 +08:00
lvxinran 69f2522702 日志打印修改 2019-07-03 10:00:29 +08:00
lvxinran 57d77bea09 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-02 22:51:11 +08:00
lvxinran ec27295b72 日志修改,重置buff修改 2019-07-02 22:51:07 +08:00
wangyuan c7ef7294ff food buffer 2019-07-02 22:49:27 +08:00
wangyuan 33cd931e82 fix 2019-07-02 22:09:38 +08:00
wangyuan c5261cc9be mapmanager 2019-07-02 21:58:04 +08:00
lvxinran f4f72607cc 爬塔时间修改 2019-07-02 21:37:59 +08:00
wangyuan ab5f807e7d Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-02 21:16:14 +08:00
wangyuan fe3bac1880 rechage 2019-07-02 21:14:48 +08:00
lvxinran 71f01bc239 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-02 21:10:47 +08:00
lvxinran 8b5daa805d 时间修改 2019-07-02 21:10:42 +08:00
wangyuan 4622b3ff8e Merge branches 'master' and 'master' of 60.1.1.230:backend/jieling_server 2019-07-02 19:54:02 +08:00
wangyuan 4bc16b9c3a 每日任务首次计数 2019-07-02 19:45:52 +08:00
wangyuan 19fcb74513 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-02 18:57:06 +08:00
jiahuiwen 2cac0935cb 爬塔副本 未初始精英怪bug 2019-07-02 18:12:27 +08:00
gaojie 074cd07972 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-02 17:52:40 +08:00
gaojie feb2dbe8f4 关卡扫荡 2019-07-02 17:52:31 +08:00
wangyuan 57a9809a48 sweep 2019-07-02 17:19:32 +08:00
lvxinran 07d172257a 爬塔buff修改 2019-07-02 17:12:51 +08:00
wangyuan 659f0f6945 修复迷雾森林 2019-07-02 16:38:11 +08:00
gaojie f834a14c59 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-02 15:36:31 +08:00
wangyuan 0a832f3e08 修复任务 2019-07-12 15:20:03 +08:00
wangyuan b449d4166e fix daily mission 2019-07-12 15:14:11 +08:00
gaojie 5724c775ec 系统邮件一分钟从数据库中取一次 2019-07-02 15:35:58 +08:00
lvxinran caafce3a02 回滚 2019-07-02 15:01:31 +08:00
lvxinran 02124be971 爬塔商店修改 2019-07-02 13:56:57 +08:00
lvxinran 4e670fea26 fix tower shop 2019-07-02 09:57:19 +08:00
wangyuan ba2a9bf57a mission 2019-07-10 22:37:28 +08:00
wangyuan 8576327656 mission 2019-07-10 22:37:13 +08:00
wangyuan 1e34fc8993 fix 2019-07-08 22:03:17 +08:00
wangyuan b74d2b13b6 fix 2019-07-08 22:02:39 +08:00
wangyuan 4f2b52a685 扫荡计数 2019-07-08 21:22:26 +08:00
wangyuan aaa50d506f fix type 2019-07-08 21:10:37 +08:00
wangyuan ee5a9d752f fix 2019-07-07 21:08:36 +08:00
wangyuan c8b8961ac4 mission open 2019-07-07 21:07:53 +08:00
wangyuan eb81581ee1 fix function type 2019-07-07 20:38:48 +08:00
lvxinran dc92619cbe 爬塔最后一层时间、爬塔扫荡、退出地图修改 2019-07-01 20:28:42 +08:00
wangyuan 1c7be8d183 FIX 2019-07-07 20:22:38 +08:00
wangyuan 38950f5f46 修复体力80问题 2019-07-06 18:51:56 +08:00
wangyuan 7a4ef76467 fix 2019-07-06 18:25:12 +08:00
wangyuan bd54eea409 fix mission 2019-07-06 18:22:14 +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 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 23aa6369c7 Hero信息修改 2019-06-28 19:19:00 +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 62340bf943 击杀奖励 2019-06-30 15:39:15 +08:00
wangyuan 8ec7059ba1 fix 2019-06-28 11:54:26 +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
gaojie 62f5c925e0 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-25 19:41:26 +08:00
gaojie 7fe45e7d71 装备打造跑马灯 2019-06-25 19:41:18 +08:00
jiahuiwen 9c4d61065b 炸弹id 2019-06-25 18:06:16 +08:00
jiahuiwen c010b09b78 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-25 17:14:15 +08:00
jiahuiwen c3037991e6 爬塔副本 2019-06-25 17:14:08 +08:00
wangyuan 990e3bada9 回复英雄副本时间 2019-06-25 17:06:54 +08:00
wangyuan eb8d6f6038 秘境邮件 2019-06-25 15:59:31 +08:00
wukang a47395fcea add log 2019-06-25 15:37:09 +08:00
wukang 1e6044b691 fix 2019-06-25 15:29:49 +08:00
jiahuiwen ee1234ad2c 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-25 15:29:36 +08:00
jiahuiwen 505547fa66 爬塔副本信息(试炼副本) 2019-06-25 15:28:07 +08:00
wangyuan 24e9d35228 fix 取mission问题 2019-06-25 14:21:26 +08:00
wangyuan 65f9592f68 2-->3 2019-06-25 13:58:13 +08:00
jiahuiwen 9eeabfdbe7 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-25 12:08:06 +08:00
jiahuiwen f4e77f9ada 爬塔副本初版 2019-06-25 12:06:41 +08:00
wangyuan 1116f2de9c Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-25 12:02:48 +08:00
wangyuan 2b28e768fb 地图任务 2019-06-25 12:02:10 +08:00
wukang 7b51289291 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-25 10:14:55 +08:00
wukang 7b9eeb78f1 add log 2019-06-25 10:14:36 +08:00
wangyuan c7fdef8058 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-25 10:12:51 +08:00
wangyuan b99522734d 地图探索任务 2019-06-25 10:12:25 +08:00
wukang 7295109844 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-25 10:06:02 +08:00
wukang 4f5477e3c2 副本星级奖励 2019-06-25 10:05:49 +08:00
wangyuan ba55893b1d 装备属性不进行合并 2019-06-24 19:36:34 +08:00
wangyuan abff2b134e 优化地图探索度 2019-06-24 19:10:24 +08:00
wangyuan 8ad8890274 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-24 12:07:13 +08:00
wangyuan b1e9d4040d fix read s table 2019-06-24 12:06:48 +08:00
gaojie 71f98c4887 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-24 11:44:10 +08:00
gaojie 560b97590a 赠送体力状态刷新 2019-06-24 11:44:06 +08:00
wangyuan 30ceef6fb2 fix 2019-06-24 10:38:20 +08:00
jiahuiwen 3e0801d1ce Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-22 15:56:30 +08:00
jiahuiwen c231cdda2f 删除多个点 2019-06-22 15:56:26 +08:00
wangyuan ea9b1eacca fix bug 2019-06-21 18:32:43 +08:00
wangyuan c66f849854 copy mission 2019-06-21 18:24:40 +08:00
wangyuan c65c4ecd75 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java
2019-06-21 18:03:53 +08:00
wangyuan 0e8da41f9c 任务合并 2019-06-21 18:01:22 +08:00
jiahuiwen 1f9144ceef Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-21 17:33:26 +08:00
jiahuiwen fa7c397e5d 领取副本星级奖励 2019-06-21 17:33:19 +08:00
gaojie 4c6485abb8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-21 15:07:19 +08:00
gaojie 2aa329e4d6 聊天 2019-06-21 15:07:11 +08:00
jiahuiwen 02e2cff56b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-21 11:40:57 +08:00
jiahuiwen 11e377d066 行为39 2019-06-21 11:40:42 +08:00
wangyuan d0aa5e79a5 lua fight 2019-06-21 11:22:35 +08:00
wangyuan 4fc3cd92c1 fix 2019-06-20 21:07:26 +08:00
wangyuan f1ac732b56 conf 2019-06-20 21:03:59 +08:00
jiahuiwen 4ece82248c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-20 19:42:21 +08:00
jiahuiwen 3d6690ccab 二维数组赋值 2019-06-20 19:42:17 +08:00
wangyuan 32480ab936 room 2019-06-20 18:17:29 +08:00
gaojie 97241f0f5b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-20 18:12:24 +08:00
gaojie 17d072baa2 fix 2019-06-20 18:12:09 +08:00
wangyuan 97ce706ddf 精英怪奖励 & 充值通过邮件发送道具 2019-06-20 17:26:39 +08:00
wangyuan 02d683718c s 2019-06-20 16:28:07 +08:00
wangyuan ef76a6fff9 前置节点&修改精英怪战斗结束 2019-06-20 16:26:58 +08:00
wangyuan 1046bcfb85 消耗道具 2019-06-20 16:03:26 +08:00
wangyuan 9836927645 fight 2019-06-20 15:47:36 +08:00
jiahuiwen 6433dc032f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-20 15:28:28 +08:00
wangyuan 689d3ae255 精英怪 2019-06-20 19:11:00 +08:00
jiahuiwen 17fdfbd6e4 新行为 39 战斗,推任务,生成新的事件点。15 16修改 2019-06-20 15:28:21 +08:00
wangyuan 0983abb99c fix fight key 2019-06-20 11:37:12 +08:00
wangyuan 5b1e55b61e 精英怪 2019-06-20 11:13:55 +08:00
wangyuan eb2c08c614 修复VIP错误 & 精英怪 2019-06-20 10:21:11 +08:00
wangyuan 7b38c5206c 科技树重置 2019-06-19 17:27:55 +08:00
gaojie d6c569bdf4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-19 16:49:34 +08:00
gaojie 178f56bbe5 fix 2019-06-19 16:49:16 +08:00
wangyuan 0913f47f9a Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-19 16:43:27 +08:00
wangyuan 8ec551cfc4 battle 2019-06-19 16:43:02 +08:00