Commit Graph

3869 Commits (31677bdff6862b243b952ff7254c637f87842627)
 

Author SHA1 Message Date
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
wangyuan ac8d19d079 hero up star 2019-01-23 11:06:36 +08:00
gaojie 511f2f2b3d Merge branch 'master' of http://60.1.1.230/backend/jieling_server
Conflicts:
	serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
2019-01-23 10:42:00 +08:00
gaojie 771ce8de89 fix 2019-01-23 10:41:10 +08:00
mashiyu 477bcdab28 删除 2019-01-23 10:38:13 +08:00
mashiyu f408616cc2 提交 2019-01-23 10:02:41 +08:00
mashiyu 50ee40a186 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-23 09:53:58 +08:00
mashiyu 36b3739049 提交 2019-01-23 09:53:44 +08:00
jiahuiwen 4d1ae3caf3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-23 09:53:11 +08:00
wangyuan f0ef8e4324 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SCHeroRankUpConfig.java
2019-01-23 09:51:54 +08:00
wangyuan 65a6d59259 error code 2019-01-23 09:50:50 +08:00
mashiyu c28ba0913e 打包 2019-01-22 18:55:33 +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
mashiyu 34bcd18e8d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-22 17:17:02 +08:00
mashiyu a831515aad 提交 2019-01-22 17:16:53 +08:00
gaojie c3dc08c1b3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-22 16:41:46 +08:00
gaojie 93aad66ce4 fix 2019-01-22 16:41:41 +08:00
wangyuan b87c421818 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-01-22 16:31:35 +08:00
wangyuan b499104a22 fix 2019-01-22 16:31:10 +08:00
gaojie deec982cb9 GM添加卡牌 2019-01-22 16:30:21 +08:00
gaojie 49b9d9c4f2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-22 16:15:28 +08:00
gaojie e2df7ba34f GM 2019-01-22 16:15:25 +08:00
mashiyu edb330f0fd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-22 16:04:08 +08:00