Commit Graph

487 Commits (5cdfe42b6b8adbfe1ee4a344f5957ec8f213badf)

Author SHA1 Message Date
mashiyu a37e7310f6 优化 2019-03-21 15:01:27 +08:00
mashiyu e56acaea56 战斗验证 2019-03-21 14:33:56 +08:00
gaojie 5ed6302f7e 技能 2019-03-21 12:41:25 +08:00
mashiyu c2b163f29c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-20 20:04:24 +08:00
mashiyu 8eff75e7c6 优化 2019-03-20 20:04:14 +08:00
jiahuiwen 04c60c2ac9 战斗修改 2019-03-20 19:50:21 +08:00
jiahuiwen 60db6c0005 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-20 19:01:41 +08:00
jiahuiwen 697487642c 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-03-20 19:01:35 +08:00
mashiyu 1dc2dff60a 引用jar 2019-03-20 19:01:18 +08:00
jiahuiwen 618a1903e1 任务 2019-03-20 18:39:37 +08:00
mashiyu ab67577ff6 提交 2019-03-20 18:36:58 +08:00
mashiyu 5dae658da3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-20 16:09:06 +08:00
wangyuan e10e8b9c55 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-03-20 16:08:14 +08:00
wangyuan 1bfe45c373 function control 2019-03-20 16:07:46 +08:00
mashiyu dae6b91053 啊啊啊 2019-03-20 16:01:44 +08:00
mashiyu 0e42332a4b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-20 15:24:04 +08:00
gaojie 65d2d64219 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-20 15:05:45 +08:00
gaojie 245118a707 fix 2019-03-20 15:05:41 +08:00
wangyuan 3e21db3b92 驻扎错误信息 2019-03-20 14:48:25 +08:00
mashiyu f1bb8dae15 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-20 11:55:21 +08:00
gaojie 20b1628d6c 增加怪物组技能 2019-03-20 11:54:43 +08:00
mashiyu fb7bfcb669 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java
2019-03-20 10:19:00 +08:00
mashiyu 333caa887c 提交 2019-03-20 10:15:34 +08:00
wangyuan c9ead9d4d3 前端获取服务器时间 2019-03-19 20:08:51 +08:00
jiahuiwen 64b0a75b7e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-19 19:57:44 +08:00
jiahuiwen 774828dcc9 选择跳转bug 2019-03-19 19:57:34 +08:00
wangyuan 83fcba59f8 精力 2019-03-19 18:34:14 +08:00
jiahuiwen 73ae2a9bf4 地图新增两个行为 2019-03-19 18:12:36 +08:00
jiahuiwen b40c61d92d 任务可领取 2019-03-19 16:15:28 +08:00
jiahuiwen 6db6e061a5 地图探索修改 2019-03-19 15:54:37 +08:00
jiahuiwen b3a7c9838f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-19 11:15:24 +08:00
jiahuiwen e1f606e1ed 地图 2019-03-19 11:15:19 +08:00
wangyuan 139a7562a1 food buffer first version 2019-03-18 18:13:34 +08:00
wangyuan 0507cb91de 拼接英雄属性 2019-03-18 13:57:07 +08:00
wangyuan b2e560c8bc 异妖属性加成 2019-03-18 11:40:33 +08:00
jiahuiwen f62eda7bda 地图刷新 2019-03-15 17:08:13 +08:00
jiahuiwen ca1f5d5021 总步数增加5 2019-03-15 14:04:46 +08:00
jiahuiwen 00c4283490 打开行动力 2019-03-15 10:35:41 +08:00
wangyuan 68b5336df8 绑定关系 2019-03-14 14:46:29 +08:00
wangyuan 1262ac5fda 绑定user 2019-03-14 14:37:04 +08:00
jiahuiwen bc98404e7a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-14 11:46:21 +08:00
jiahuiwen 01e6e0c89b 添加道具bug 2019-03-14 11:46:16 +08:00
wangyuan 78df2af776 change weight 2019-03-14 11:13:05 +08:00
wangyuan a1e84b5a16 randhero 2019-03-13 21:04:12 +08:00
jiahuiwen 483dabee0e 数据提交 2019-03-13 20:11:45 +08:00
wangyuan b847700469 upload data 2019-03-13 16:41:21 +08:00
mashiyu 87c14fd895 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-13 14:03:10 +08:00
mashiyu eec1857cdc 提交 2019-03-13 14:02:54 +08:00
jiahuiwen 810452915c 注释行动力,打开临时背包到背包 2019-03-13 13:55:09 +08:00
jiahuiwen b5eb0629a3 打开临时背包 2019-03-13 13:48:33 +08:00
jiahuiwen 90bc0c62c6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-13 13:46:39 +08:00
jiahuiwen 34495dd9b0 临时背包 2019-03-13 13:46:33 +08:00
wangyuan c840962396 fix unload equip 2019-03-13 10:59:58 +08:00
gaojie a45aae40e2 注释临时背包 2019-03-12 20:10:46 +08:00
wangyuan e4b65bc7aa change mongo 2019-03-12 18:59:14 +08:00
mashiyu a5ade7d53b 优化 2019-03-12 17:01:40 +08:00
wangyuan c259bb3e57 ActionPower 2019-03-12 14:30:20 +08:00
mashiyu 3c5ea4af8b 依赖 2019-03-12 14:17:01 +08:00
mashiyu ae2bc788dc 战斗校验 2019-03-12 14:11:16 +08:00
gaojie e5d66d4bd3 技能 2019-03-12 14:03:08 +08:00
gaojie c5d0813b68 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-12 11:10:23 +08:00
gaojie aa9ea25018 技能静态表初始化 2019-03-12 11:10:19 +08:00
wangyuan 88d9ee72cb 校验星级 2019-03-12 10:17:32 +08:00
jiahuiwen 004cfbe4f0 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-12 09:41:15 +08:00
jiahuiwen ceac7c04cd 行动力,和临时背包 2019-03-12 09:40:48 +08:00
jiahuiwen 724211771b 添加字段 2019-03-12 09:37:39 +08:00
wangyuan 9d033a9fc5 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-03-11 18:31:10 +08:00
wangyuan f2bdb6126c 异妖 2019-03-11 18:30:42 +08:00
jiahuiwen 6d89769a68 地图 边缘触发 2019-03-09 19:02:07 +08:00
jiahuiwen af7c0ab359 任务赋值 2019-03-09 11:51:47 +08:00
jiahuiwen afaec0973b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-07 19:22:49 +08:00
jiahuiwen b06828e290 地图行为类型 2019-03-07 19:22:44 +08:00
wangyuan 77212a2f30 初始化三个编队 2019-03-07 15:00:05 +08:00
jiahuiwen 5796e96bc5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-07 14:02:00 +08:00
jiahuiwen 099b7c7488 主线任务 2019-03-07 14:01:53 +08:00
gaojie 90e89386a1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-07 11:13:39 +08:00
gaojie 27578a91da fix 2019-03-07 11:13:35 +08:00
mashiyu 66f21eb937 绑定关系 2019-03-07 11:12:42 +08:00
mashiyu db19eacd16 数据存储优化 2019-03-06 19:26:29 +08:00
jiahuiwen 4e53e8e96c 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-03-06 17:30:25 +08:00
jiahuiwen f6e0d4b8bf 战斗结算 2019-03-06 17:29:34 +08:00
mashiyu 8d19f84382 合并代码 2019-03-06 16:19:10 +08:00
mashiyu 5d8c9d35ae Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FinishMissionBehavior.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java
2019-03-06 16:17:34 +08:00
mashiyu 9c71683e83 去掉大小key异常 2019-03-06 16:14:18 +08:00
jiahuiwen 738252ecd5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-06 16:05:07 +08:00
jiahuiwen a80f078417 地图 2019-03-06 16:04:57 +08:00
mashiyu 9ddf90637f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-06 15:07:23 +08:00
mashiyu 13b8946115 数据存贮优化 2019-03-06 15:07:12 +08:00
wangyuan 93ab01facd fix 解析英雄数据表 2019-03-06 11:08:42 +08:00
jiahuiwen 83ef010146 初始任务 2019-03-05 19:39:52 +08:00
mashiyu bf43560c87 改数据库 2019-03-05 18:59:34 +08:00
mashiyu 04ebb8ba6f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-05 18:45:03 +08:00
mashiyu 8575bd5ba5 数据库修改 2019-03-05 18:44:34 +08:00
jiahuiwen 105d87f629 初始新手任务 2019-03-05 17:49:14 +08:00
wangyuan 78e67277b8 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-03-05 16:43:38 +08:00
wangyuan 0d7d9bc10d 初始编队 2019-03-05 16:43:00 +08:00
gaojie ca5b16163b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-05 15:23:45 +08:00
gaojie e0fd985a43 卡牌装备分页请求 2019-03-05 15:23:38 +08:00
jiahuiwen 03fcab6635 展示地图出生点 2019-03-05 14:27:25 +08:00
jiahuiwen c18d7a6ca2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-04 19:42:54 +08:00
jiahuiwen 3021511e7e 地图 2019-03-04 19:42:48 +08:00
mashiyu f8dc7f535c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-04 11:09:28 +08:00
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