Commit Graph

88 Commits (96abec724853294f249250c96a6a6c9f0d29452f)

Author SHA1 Message Date
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