Commit Graph

1204 Commits (fe3bac1880f6d9da4a35e93de5ccc6bad868b264)
 

Author SHA1 Message Date
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 cdda69bad3 conf 2019-06-24 19:48:53 +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 098024c896 add lua log 2019-06-24 11:21:25 +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
wangyuan 9c30a38abe conf 2019-06-21 14:27:08 +08:00
wangyuan 73f8598948 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-21 13:28:49 +08:00
wangyuan fb1dc92445 conf 2019-06-21 13:27:51 +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 49c5ac8bc1 conf 2019-06-21 10:34:12 +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