Commit Graph

283 Commits (204c7e9d0ce1731f884a6795c3448c22aa92b51f)

Author SHA1 Message Date
wangyuan b25d7067ba time control 2019-05-14 16:41:21 +08:00
wangyuan 6b34c37eaa 时间控制功能 2019-05-14 14:28:47 +08:00
wangyuan 69d2ba019d Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-05-13 15:33:29 +08:00
wangyuan 1ebb90b31b 竞技场 2019-05-13 15:28:03 +08:00
gaojie 04de59ded6 商店刷新 2019-05-13 15:01:38 +08:00
gaojie 93beaecf89 获取商店信息 2019-05-11 17:23:31 +08:00
wangyuan 4eb0121eef 竞技场初版 2019-05-10 17:44:44 +08:00
wangyuan 7aa786221b fight 2019-05-09 17:49:23 +08:00
wangyuan 936406315c 数据提交 2019-04-30 11:55:51 +08:00
gaojie 62ab9068a5 装备背包达上限 邮件发送 2019-04-30 11:41:19 +08:00
gaojie a00a5f4597 一次合成碎片上限处理 2019-04-29 20:45:41 +08:00
gaojie 37bb6046df fix 2019-04-29 20:31:12 +08:00
gaojie 0bae114cc9 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	conf/server/ItemConfig.txt
2019-04-29 20:23:43 +08:00
gaojie 22b68a1bf2 道具上限 2019-04-29 20:21:30 +08:00
jiahuiwen 2d5fe1aa50 配置表 2019-04-29 18:39:47 +08:00
jiahuiwen 6e8b4b0b5d 配置表提交 2019-04-29 16:17:36 +08:00
wangyuan a699b4e4dd 挂机 2019-04-25 17:04:36 +08:00
gaojie aa89c05d4f Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	conf/server/OptionConfig.txt
#	conf/server/RewardGroup.txt
2019-04-25 14:55:58 +08:00
gaojie b09ba9646e 随机名字 2019-04-25 14:55:06 +08:00
jiahuiwen aa3c588b87 配置表提交 2019-04-25 10:16:33 +08:00
wangyuan 185467d2fa 提交数据 2019-04-25 14:38:00 +08:00
gaojie a4815854e0 静态表数据 2019-04-24 13:45:46 +08:00
gaojie 2ad5e17afb 道具分解 2019-04-24 10:44:08 +08:00
wangyuan 88595a257a table 2019-04-23 18:30:39 +08:00
jiahuiwen ef2b6dc136 配置表提交 2019-04-23 09:47:24 +08:00
gaojie fbc7c719e2 英雄合成 2019-04-22 17:39:06 +08:00
jiahuiwen 6fef8b2297 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-04-19 19:18:19 +08:00
jiahuiwen a8cbb93ccb 快速战斗 2019-04-19 19:17:23 +08:00
gaojie 46ff11b41d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-19 18:21:22 +08:00
gaojie 9e00bc05f9 物品分解 2019-04-19 18:21:18 +08:00
jiahuiwen ea8fde820e 配置表提交 2019-04-19 15:21:59 +08:00
gaojie 986c064908 首通奖励 2019-04-19 10:32:27 +08:00
mashiyu a69680944a 提交 2019-04-18 09:56:18 +08:00
jiahuiwen d4de27130e 配置表提交 2019-04-17 20:37:31 +08:00
jiahuiwen 29024fae3e 配置表提交 2019-04-17 19:06:44 +08:00
wangyuan 36f85848af 探索度 2019-04-17 15:02:23 +08:00
gaojie fc76607c69 恢复体力 2019-04-16 17:34:32 +08:00
wangyuan 226a50f33d Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-04-16 10:26:17 +08:00
wangyuan ae9a7bc1ee 挂机 2019-04-16 10:25:45 +08:00
jiahuiwen 8e39b783f1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	conf/server/RewardGroup.txt
#	conf/server/RewardItemConfig.txt
2019-04-15 20:36:06 +08:00
jiahuiwen 9a7f180663 配置表提交 2019-04-15 20:35:40 +08:00
gaojie 4a35cfa272 体力 2019-04-15 20:35:15 +08:00
gaojie 7a0690f520 扫荡 2019-04-15 16:07:48 +08:00
jiahuiwen e65f633023 探索修改 2019-04-12 20:57:15 +08:00
jiahuiwen 4ba216f2e3 探索修改 2019-04-12 19:42:32 +08:00
jiahuiwen ab96501d1c 剩余时间 2019-04-12 15:02:10 +08:00
jiahuiwen bea8a835a3 配置表 2019-04-12 14:53:24 +08:00
gaojie f7942c0c1e 关卡,角色升级 2019-04-12 11:19:31 +08:00
wangyuan 5cdfe42b6b '初始化指定星级hero' 2019-04-09 11:17:15 +08:00
jiahuiwen 1d7c0587d3 配置表提交 2019-04-04 14:02:50 +08:00
wangyuan eb7c619eb5 探索度支持多事件点 2019-04-03 16:28:43 +08:00
jiahuiwen b04bce96a9 行为类型 吃buff 2019-04-02 15:51:45 +08:00
jiahuiwen 501ff8f221 地图增加两个行为类型,配置表 2019-04-02 14:27:47 +08:00
gaojie 54d2172361 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-01 19:24:09 +08:00
gaojie 7fe39cdeac 怪物技能属性 2019-04-01 19:24:05 +08:00
mashiyu e5aac81546 同步表 2019-04-01 14:40:07 +08:00
gaojie 77b9db852b 生成txt文件 2019-04-01 11:16:21 +08:00
jiahuiwen 9b92f1295b 配置表提交 2019-04-01 09:49:02 +08:00
wangyuan 4228fcd592 探索任务类型 2019-03-29 15:54:32 +08:00
jiahuiwen 6e413a7129 出地图 2019-03-28 19:56:53 +08:00
jiahuiwen f5cf36911f 地图修改 2019-03-28 15:08:43 +08:00
wangyuan 7471064777 commit data 2019-03-28 10:50:18 +08:00
wangyuan 8e276c9be2 行动力 2019-03-27 20:30:33 +08:00
mashiyu 1ec26b5c8b 怪物表 2019-03-27 17:08:40 +08:00
wangyuan ecb6e2a810 提交配置数据 2019-03-27 10:43:13 +08:00
jiahuiwen 1c42a47e42 配置文件 2019-03-27 10:24:40 +08:00
mashiyu 6fb4dee9c6 同步战斗 2019-03-26 15:11:47 +08:00
wangyuan 88a1188dcf data commit 2019-03-26 11:23:06 +08:00
jiahuiwen 81a603e0dc Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	conf/server/OptionConfig.txt
2019-03-23 17:15:30 +08:00
jiahuiwen f7b6fb9afc 配置表 2019-03-23 17:14:58 +08:00
wangyuan 65f2bd5692 修改推荐妖灵师奖励 2019-03-22 16:16:12 +08:00
jiahuiwen 6c70934842 配置表提交 2019-03-22 14:29:22 +08:00
jiahuiwen d035de5a9e Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	conf/server/OptionConfig.txt
2019-03-22 10:11:49 +08:00
jiahuiwen ec1f65e8e1 地图修改 2019-03-22 10:10:49 +08:00
wangyuan 322c7a3e68 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-03-22 10:03:58 +08:00
wangyuan 705e2d5b7b 冒险推荐英雄 2019-03-22 10:02:46 +08:00
gaojie 3f69e112d8 技能静态数据更新 2019-03-21 17:23:19 +08:00
jiahuiwen 13a95395f8 地图配置表 2019-03-21 15:29:53 +08:00
gaojie 5527f560d9 生成文件数据类型处理 2019-03-21 11:19:25 +08:00
gaojie 21ac81824c fix 2019-03-21 10:54:52 +08:00
wangyuan 7e4c8f7a7e update data 2019-03-20 16:14:45 +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
gaojie 245118a707 fix 2019-03-20 15:05:41 +08:00
gaojie 20b1628d6c 增加怪物组技能 2019-03-20 11:54:43 +08:00
jiahuiwen 73ae2a9bf4 地图新增两个行为 2019-03-19 18:12:36 +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
jiahuiwen dc2dff5378 数据提交 2019-03-14 15:45:29 +08:00
jiahuiwen 96abec7248 配置表提交 2019-03-14 12:08:51 +08:00
wangyuan a1e84b5a16 randhero 2019-03-13 21:04:12 +08:00
jiahuiwen 483dabee0e 数据提交 2019-03-13 20:11:45 +08:00
jiahuiwen 0eec365385 地图数据 2019-03-13 16:43:01 +08:00
wangyuan b847700469 upload data 2019-03-13 16:41:21 +08:00
wangyuan e4b65bc7aa change mongo 2019-03-12 18:59:14 +08:00
wangyuan c259bb3e57 ActionPower 2019-03-12 14:30:20 +08:00
gaojie e5d66d4bd3 技能 2019-03-12 14:03:08 +08:00
gaojie aa9ea25018 技能静态表初始化 2019-03-12 11:10:19 +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 061e0f43c0 地图配置表提交 2019-03-09 18:05:10 +08:00
jiahuiwen 9cdc8ff54c 配置表 2019-03-07 14:07:24 +08:00
jiahuiwen e17873e789 地图选项配置表 2019-03-06 20:56:11 +08:00
jiahuiwen a80f078417 地图 2019-03-06 16:04:57 +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
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 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
gaojie bba131d632 怪物数据 2019-03-01 16:07:03 +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 d7cd38d409 地图任务 配置表提交 2019-02-22 11:48:16 +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
wangyuan 4b324dbd2b equip 2019-02-19 20:46:06 +08:00
wangyuan 0f554b1cef update 2019-02-19 15:43:07 +08:00
wangyuan 53361a76b7 增加符文道具 2019-02-14 18:19:07 +08:00
wangyuan 760ce77dfe 工坊 2019-02-14 17:54:50 +08:00
wangyuan cf8e26bf38 hero level up 2019-01-29 12:18:26 +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
gaojie 8b14f4b978 fix 2019-01-28 18:11:30 +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
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 4f45aa9c5d 抽卡校验消耗 2019-01-25 18:33:38 +08:00
gaojie 0b5dd020c5 初始化道具卡牌 2019-01-25 16:56:24 +08:00
wangyuan 0a42dfd4d1 英雄相关数据 2019-01-25 16:23:00 +08:00
wangyuan 7f2209d1ff item 2019-01-25 10:01:21 +08:00