Commit Graph

335 Commits (5ed6302f7ece357a5c2360f4bcd4a7782524c52a)

Author SHA1 Message Date
mashiyu 8d031b2455 提交 2019-03-04 11:07:31 +08:00
wangyuan 22de4a9033 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
2019-03-02 18:34:15 +08:00
wangyuan fbb2e1c6f2 精力&行动力 2019-03-02 18:30:38 +08:00
jiahuiwen 6c9252f157 地图战斗开战 2019-03-02 18:27:56 +08:00
wangyuan 5ab788a789 解决死循环 2019-03-02 14:36:54 +08:00
gaojie be75504fb8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-02 13:57:24 +08:00
gaojie c20749d371 mongo 删除key 2019-03-02 13:57:20 +08:00
wangyuan 6e4eda7a53 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-03-02 13:43:05 +08:00
wangyuan 9423ef2fb1 修改抽卡获取协议 & 提交工坊数据 2019-03-02 13:42:33 +08:00
jiahuiwen 0d7f123a01 判断道具 2019-03-01 18:31:29 +08:00
jiahuiwen f7d3b64b61 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-01 17:34:55 +08:00
jiahuiwen 47051d6b69 地图表增加字段 2019-03-01 17:34:43 +08:00
gaojie bba131d632 怪物数据 2019-03-01 16:07:03 +08:00
jiahuiwen b06e783754 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-01 13:40:27 +08:00
jiahuiwen 9ff3046493 地图 8和9 全出现 2019-03-01 13:40:22 +08:00
wangyuan 0a45445c20 规范 2019-02-27 21:31:04 +08:00
wangyuan 291d8acbae 加经验 2019-02-27 16:22:06 +08:00
wangyuan d6ab9a413d 修复队伍上阵同样卡牌 2019-02-26 21:07:45 +08:00
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 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 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
mashiyu 208183198d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-29 14:16:25 +08:00
mashiyu ca8b94eab9 提交 2019-01-29 14:16:15 +08:00
wangyuan cf8e26bf38 hero level up 2019-01-29 12:18:26 +08:00
wangyuan eb1fba0c1f 删除无效代码 2019-01-29 10:16:58 +08:00
jiahuiwen fa098db010 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-28 20:41:52 +08:00
jiahuiwen 7df4872590 地图 2019-01-28 20:41:45 +08:00
wangyuan cec7d88cca fix 2019-01-28 20:40:20 +08:00
wangyuan 564459a8fc speed 2019-01-28 19:11:28 +08:00
jiahuiwen 74d126c782 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-28 19:03:53 +08:00
jiahuiwen 80aa815e76 提交 2019-01-28 19:00:51 +08:00
jiahuiwen 815cfcd3c4 地图修改 2019-01-28 18:54:17 +08:00
wangyuan 741fa5d97d fix 2019-01-28 18:26:31 +08:00
wangyuan 788aa617e5 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-01-28 18:21:22 +08:00
wangyuan 41a27bb260 英雄战力 2019-01-28 18:20:36 +08:00
gaojie 8b14f4b978 fix 2019-01-28 18:11:30 +08:00
gaojie 74f93a4b59 fix 2019-01-28 18:04:49 +08:00
gaojie 82102d009b Merge branch 'master' of http://60.1.1.230/backend/jieling_server
Conflicts:
	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2019-01-28 17:50:40 +08:00
gaojie ad3309189c 道具使用道具出售 2019-01-28 17:49:01 +08:00
wangyuan b183dd664b 英雄升星 2019-01-28 17:36:07 +08:00
wangyuan 075b53abf4 异妖 2019-01-28 17:11:35 +08:00
wangyuan 4d80dba09f Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2019-01-28 11:21:09 +08:00
wangyuan f9ef5ffb1b hero atribute 2019-01-28 11:16:43 +08:00
jiahuiwen 102d9a1eae Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-26 17:10:47 +08:00
jiahuiwen 97878442d8 地图 2019-01-26 17:10:42 +08:00
wangyuan 79285dde1a 错误信息 2019-01-25 19:13:07 +08:00
wangyuan 4f45aa9c5d 抽卡校验消耗 2019-01-25 18:33:38 +08:00
jiahuiwen 8ce37171b1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java
2019-01-25 18:20:37 +08:00
jiahuiwen 51ae768167 地图修改 2019-01-25 18:19:57 +08:00
wangyuan 887183aac8 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-01-25 17:29:08 +08:00
wangyuan 873c16076e equip 2019-01-25 17:25:42 +08:00
gaojie 0b5dd020c5 初始化道具卡牌 2019-01-25 16:56:24 +08:00
wangyuan 0a42dfd4d1 英雄相关数据 2019-01-25 16:23:00 +08:00
gaojie af7e96dfa3 修改物品类型 2019-01-25 10:24:28 +08:00
wangyuan 5b701319c2 冒险 2019-01-24 18:21:24 +08:00
gaojie b3ce98deaa fix 2019-01-24 18:19:33 +08:00
gaojie 3964b0b999 fix 2019-01-24 17:53:13 +08:00
gaojie 1ea296dcb2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-24 17:20:11 +08:00
gaojie a5967b2ff1 读取邮件 2019-01-24 17:20:07 +08:00
wangyuan b44af11e55 冒险第一版 2019-01-24 16:31:29 +08:00
gaojie 9b40fd7e62 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-24 14:36:03 +08:00
gaojie 359b669a1e 系统邮件 2019-01-24 14:35:59 +08:00
wangyuan 9db99e959a 装备和冒险 2019-01-24 12:04:52 +08:00
gaojie 1d949a0f61 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-23 18:40:24 +08:00
gaojie afa595c7e0 邮件 2019-01-23 18:40:11 +08:00
jiahuiwen f425af876b 地图 2019-01-23 18:40:03 +08:00
gaojie c7e522bae8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-23 16:14:30 +08:00
gaojie afe89d4879 分页请求物品 2019-01-23 16:14:26 +08:00
jiahuiwen 57d00c5505 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-23 16:05:52 +08:00
jiahuiwen d897a8e24a 地图 2019-01-23 16:05:25 +08:00
wangyuan 873c6c346e hero up star 2019-01-23 16:03:21 +08:00
gaojie b838bf774e fix 2019-01-23 12:10:43 +08:00
gaojie e0ee84cdae Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-23 12:08:58 +08:00
gaojie f0cc333429 fix 2019-01-23 12:08:45 +08:00
mashiyu 7e0a42c089 提交 2019-01-23 11:48:44 +08:00
mashiyu 1002207e87 提交打包 2019-01-23 11:46:49 +08:00
mashiyu 9273cdd018 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-23 11:33:31 +08:00
mashiyu 4070f43f55 换目录 2019-01-23 11:33:22 +08:00
wangyuan 790da2c3d8 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-01-23 11:07:06 +08:00
wangyuan ac8d19d079 hero up star 2019-01-23 11:06:36 +08:00
gaojie 511f2f2b3d Merge branch 'master' of http://60.1.1.230/backend/jieling_server
Conflicts:
	serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
2019-01-23 10:42:00 +08:00
gaojie 771ce8de89 fix 2019-01-23 10:41:10 +08:00
mashiyu f408616cc2 提交 2019-01-23 10:02:41 +08:00
mashiyu 50ee40a186 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-23 09:53:58 +08:00
mashiyu 36b3739049 提交 2019-01-23 09:53:44 +08:00
jiahuiwen 4d1ae3caf3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-23 09:53:11 +08:00
wangyuan f0ef8e4324 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SCHeroRankUpConfig.java
2019-01-23 09:51:54 +08:00
wangyuan 65a6d59259 error code 2019-01-23 09:50:50 +08:00
mashiyu c28ba0913e 打包 2019-01-22 18:55:33 +08:00
jiahuiwen 482f9c07b3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-22 18:01:15 +08:00
jiahuiwen 18431a9ccd 地图 2019-01-22 18:00:16 +08:00
mashiyu 34bcd18e8d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-22 17:17:02 +08:00
mashiyu a831515aad 提交 2019-01-22 17:16:53 +08:00
gaojie 93aad66ce4 fix 2019-01-22 16:41:41 +08:00
gaojie deec982cb9 GM添加卡牌 2019-01-22 16:30:21 +08:00
gaojie e2df7ba34f GM 2019-01-22 16:15:25 +08:00
gaojie d17f20627c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-22 16:02:27 +08:00
gaojie 7ab8e61bbc 道具消耗 2019-01-22 16:02:24 +08:00
wangyuan 15eab663e9 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-01-22 14:44:36 +08:00
wangyuan 13ec95f093 删除hero属性 2019-01-22 14:44:02 +08:00
mashiyu f7a3f9dff4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-22 14:43:56 +08:00
mashiyu 43330ab36e 提交 2019-01-22 14:43:39 +08:00
gaojie 57f73449d8 掉落 2019-01-22 14:37:10 +08:00
mashiyu d809b04af5 错误码 2019-01-22 13:55:52 +08:00
jiahuiwen ab03ce293e 地图只能放一个事件 2019-01-22 12:03:27 +08:00
jiahuiwen 80dc8b3fee 地图配置表 2019-01-22 10:52:09 +08:00