Commit Graph

7623 Commits (51ebe23d8d0887af947f19b6e5036ab1a1af9580)
 

Author SHA1 Message Date
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
jiahuiwen 50d827edfb 地图数据名字修改 2019-01-29 16:25:21 +08:00
gaojie a52dfcf6d7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-29 15:39:14 +08:00
gaojie b487696cf3 数据类型转化 2019-01-29 15:39:10 +08:00
wangyuan 4c7894faac delete 2019-01-29 15:09:05 +08:00
wangyuan b0f577ac1f delete unuse files 2019-01-29 15:08:10 +08:00
wangyuan 943afb4c96 delete unuse files 2019-01-29 15:06:09 +08:00
wangyuan 2690156185 fix 2019-01-29 14:53:32 +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