Commit Graph

7859 Commits (cfbc6e00efc080aed8fff726a13f4e8bd897dded)
 

Author SHA1 Message Date
mashiyu d5b2dab9b4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-02-26 19:43:19 +08:00
gaojie c243df65ab 释放io流 2019-02-26 18:11:23 +08:00
mashiyu ead69de1b7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-02-26 16:14:36 +08:00
mashiyu 07c189f09c 断线重连 2019-02-26 16:14:22 +08:00
wangyuan 7684ffe7e0 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-02-25 20:53:51 +08:00
wangyuan cdcff252ab 校验 2019-02-25 20:53:38 +08:00
jiahuiwen 459ec2b0a2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-02-25 20:43:01 +08:00
jiahuiwen d0c8424ec3 增加两个行为类型 15销魂事件点 16消耗道具并销毁事件点 2019-02-25 20:42:47 +08:00
wangyuan 47e04c5d51 修复消息号 2019-02-25 18:08:59 +08:00
wangyuan a598b1dd9c Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-02-25 18:04:45 +08:00
wangyuan 2d97d71c72 聊天 2019-02-25 18:04:30 +08:00
jiahuiwen 32bbca91cd 优化地图代码 2019-02-25 17:53:47 +08:00
jiahuiwen 99ca55edba 优化地图中行为类型 2019-02-25 17:35:38 +08:00
jiahuiwen 57898ddc91 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-02-25 15:55:38 +08:00
jiahuiwen c8cc57b871 离开地图,再进入地图恢复之前状态 2019-02-25 15:55:27 +08:00
wangyuan c2e2981c40 fix 2019-02-25 14:03:09 +08:00
jiahuiwen 0790917a68 添加消息类型 2019-02-25 13:59:23 +08:00
jiahuiwen cbea3a4ecd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-02-25 13:50:41 +08:00
jiahuiwen d8db472845 提交 2019-02-25 13:48:49 +08:00
jiahuiwen 007a004f01 保存地图里的主线任务 2019-02-25 13:44:42 +08:00
wangyuan 3ef502dd5f 百味居 2019-02-25 11:54:10 +08:00
wangyuan e9dc4a0439 table fix 2019-03-04 09:20:45 +08:00
jiahuiwen 7610346352 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-02-22 17:05:38 +08:00
jiahuiwen e9af1d9be0 配置表 2019-02-22 17:05:15 +08:00
wangyuan 5e0ae7bdbf Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-02-22 13:48:23 +08:00
wangyuan 1ff8ad2131 异妖&百味居表 2019-02-22 13:46:01 +08:00
jiahuiwen 971f63cdff 重命名mail 2019-02-22 11:55:47 +08:00
gaojie 16a064bd6d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-02-22 11:54:15 +08:00
gaojie fb5efcb50f fix 2019-02-22 11:54:11 +08:00
jiahuiwen a1385054a3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-02-22 11:48:22 +08:00
jiahuiwen d7cd38d409 地图任务 配置表提交 2019-02-22 11:48:16 +08:00
gaojie 7dda6284c9 活动掉落 2019-02-21 21:00:46 +08:00
jiahuiwen 46d7a7c9e6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-02-21 11:41:24 +08:00
wangyuan 45f52d32bd fix 2019-02-21 10:00:23 +08:00
wangyuan 7e8cbaa914 速度公式修改 2019-02-20 11:14:55 +08:00
jiahuiwen b3d9c9d5cc 任务配置表 2019-02-19 20:51:47 +08:00
jiahuiwen e90fd70cef 地图配置表 2019-02-19 20:51:21 +08:00
jiahuiwen 36028386a8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-02-19 20:49:12 +08:00
jiahuiwen 4116399900 主线任务 2019-02-19 20:48:51 +08:00
wangyuan 4b324dbd2b equip 2019-02-19 20:46:06 +08:00
wangyuan 53ead12c3e fix 2019-02-19 16:17:47 +08:00
mashiyu 2d39d9a28a 提交 2019-02-19 15:58:08 +08:00
wangyuan 0f554b1cef update 2019-02-19 15:43:07 +08:00
wangyuan ae84d45e79 阵容 装备 2019-02-18 18:42:09 +08:00
wangyuan a60edcf3dd 升星校验 2019-02-15 18:44:30 +08:00
wangyuan d500fd4e66 校验异妖不存在 2019-02-15 10:59:38 +08:00
wangyuan ad8bef2b7e 获取编队 2019-02-15 10:53:59 +08:00
wangyuan 53361a76b7 增加符文道具 2019-02-14 18:19:07 +08:00
wangyuan 760ce77dfe 工坊 2019-02-14 17:54:50 +08:00
jiahuiwen 409e11e308 跳转类型修改 2019-01-30 18:11:39 +08:00