Commit Graph

3792 Commits (c6a0354f8112faee913f164156768a198abf8f8f)
 

Author SHA1 Message Date
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
wangyuan 7f2209d1ff item 2019-01-25 10:01:21 +08:00
wangyuan 36ca79085d data 2019-01-24 18:31:02 +08:00
wangyuan 5b701319c2 冒险 2019-01-24 18:21:24 +08:00
gaojie b3ce98deaa fix 2019-01-24 18:19:33 +08:00
gaojie 3964b0b999 fix 2019-01-24 17:53:13 +08:00
gaojie 1ea296dcb2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-24 17:20:11 +08:00
gaojie a5967b2ff1 读取邮件 2019-01-24 17:20:07 +08:00
wangyuan b44af11e55 冒险第一版 2019-01-24 16:31:29 +08:00
gaojie 9b40fd7e62 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-24 14:36:03 +08:00
gaojie 359b669a1e 系统邮件 2019-01-24 14:35:59 +08:00
wangyuan 9db99e959a 装备和冒险 2019-01-24 12:04:52 +08:00
gaojie 1d949a0f61 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-23 18:40:24 +08:00
gaojie afa595c7e0 邮件 2019-01-23 18:40:11 +08:00
jiahuiwen f425af876b 地图 2019-01-23 18:40:03 +08:00
gaojie c7e522bae8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-23 16:14:30 +08:00
gaojie afe89d4879 分页请求物品 2019-01-23 16:14:26 +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 873c6c346e hero up star 2019-01-23 16:03:21 +08:00
gaojie b838bf774e fix 2019-01-23 12:10:43 +08:00
gaojie e0ee84cdae Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-23 12:08:58 +08:00
gaojie f0cc333429 fix 2019-01-23 12:08:45 +08:00
mashiyu 7e0a42c089 提交 2019-01-23 11:48:44 +08:00
mashiyu 1002207e87 提交打包 2019-01-23 11:46:49 +08:00
mashiyu 9273cdd018 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-23 11:33:31 +08:00
mashiyu 4070f43f55 换目录 2019-01-23 11:33:22 +08:00
wangyuan 790da2c3d8 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-01-23 11:07:06 +08:00