Commit Graph

105 Commits (5ed6302f7ece357a5c2360f4bcd4a7782524c52a)

Author SHA1 Message Date
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
wangyuan 36ca79085d data 2019-01-24 18:31:02 +08:00
wangyuan b44af11e55 冒险第一版 2019-01-24 16:31:29 +08:00
wangyuan 9db99e959a 装备和冒险 2019-01-24 12:04:52 +08:00
jiahuiwen f425af876b 地图 2019-01-23 18:40:03 +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 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
mashiyu 477bcdab28 删除 2019-01-23 10:38:13 +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
gaojie 93aad66ce4 fix 2019-01-22 16:41:41 +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
jiahuiwen 20aa0dbe48 地图配置表 2019-01-22 11:06:43 +08:00
jiahuiwen 80dc8b3fee 地图配置表 2019-01-22 10:52:09 +08:00
wangyuan 77f08cd750 hero 2019-01-22 09:57:49 +08:00
gaojie 38080b502e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-22 09:25:49 +08:00
gaojie 358310d762 添加道具公共接口 2019-01-22 09:25:44 +08:00
wangyuan a937b76400 抽卡beta 2019-01-21 15:31:02 +08:00
wangyuan cbd48c5097 hero 2019-01-18 09:58:37 +08:00
gaojie d9ac7c1dd2 卡牌静态数据加载 2019-01-16 16:50:26 +08:00
mashiyu 5df73a6802 提交 2019-01-15 16:19:23 +08:00
gaojie 33657a69e7 加载静态数据 2019-01-15 15:19:58 +08:00
gaojie 6870bb9d30 静态表数据 2019-01-15 15:04:27 +08:00
gaojie 93fb410ee9 GM添加道具 2019-01-15 15:03:28 +08:00
gaojie dae7fbe1a7 读取配置文件 2019-01-09 09:57:46 +08:00
jiahuiwen 11cd52dbd8 戒灵地图 2019-01-04 13:39:02 +08:00
gaojie 728d8c62da 初始化静态数据表信息 2019-01-03 17:14:20 +08:00
mashiyu ea5bab62c6 Initial commit 2018-12-27 17:54:23 +08:00