Commit Graph

22 Commits (32155b143547b5709d4888b840b3c8d6c48f1d32)

Author SHA1 Message Date
jiahuiwen 32155b1435 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/User.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/map/MapLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java
2019-01-07 20:01:02 +08:00
jiahuiwen 5b65323371 地图加优化 2019-01-07 19:36:19 +08:00
wangyuan d953c6377a data 2019-01-07 16:16:59 +08:00
gaojie 94c6b35ac8 静态表数据 2019-01-07 14:27:53 +08:00
wangyuan 4a2b19044a Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-01-07 13:47:43 +08:00
wangyuan 0ebc3f8064 游戏数据 2019-01-07 13:47:25 +08:00
jiahuiwen 2bfa91c676 忽略协议 2019-01-07 10:54:58 +08:00
wangyuan 37c27161ea Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-01-07 10:23:05 +08:00
wangyuan 000d68e093 删除 2019-01-07 10:22:49 +08:00
gaojie 0983e09acd 表初始化 2019-01-07 10:20:33 +08:00
wangyuan d30ec31a63 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-01-07 10:01:07 +08:00
wangyuan a3297be91f 写库 2019-01-07 10:00:52 +08:00
mashiyu 525c245fab 提交心跳初版 2019-01-07 09:53:06 +08:00
mashiyu 99062edcfd 兼容 2019-01-05 09:24:33 +08:00
jiahuiwen 0105f964ed Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-04 18:24:06 +08:00
jiahuiwen 1b4c3305a6 漏提 2019-01-04 18:23:25 +08:00
jiahuiwen ea6d17712d 地图 2019-01-04 18:22:34 +08:00
mashiyu f25f674d23 提交一版 2019-01-04 15:12:48 +08:00
mashiyu eaea13a4b3 坐标转化和前端保持一致 2019-01-04 14:08: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