mashiyu
|
2420c68092
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-11 19:23:46 +08:00 |
mashiyu
|
ff58d6a115
|
提交
|
2019-01-11 19:23:32 +08:00 |
gaojie
|
270ba601d9
|
加载静态数据表
|
2019-01-09 17:52:01 +08:00 |
jiahuiwen
|
1409e0292f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-09 16:06:40 +08:00 |
jiahuiwen
|
8c3fafda61
|
读地图信息
|
2019-01-09 16:06:34 +08:00 |
gaojie
|
5c31c6263a
|
定时检查配置文件
|
2019-01-09 13:58:05 +08:00 |
jiahuiwen
|
841218be5a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-09 10:44:58 +08:00 |
gaojie
|
c6aa139152
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
Conflicts:
serverlogic/src/main/java/com/ljsd/GameApplication.java
|
2019-01-09 09:58:49 +08:00 |
gaojie
|
dae7fbe1a7
|
读取配置文件
|
2019-01-09 09:57:46 +08:00 |
mashiyu
|
176ff89acf
|
线程管理模型
|
2019-01-08 18:46:36 +08:00 |
jiahuiwen
|
a173e7c0d1
|
整理包路径
|
2019-01-08 15:06:31 +08:00 |
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 |
wangyuan
|
a5db8e814a
|
新方式不支持map,还原
|
2019-01-07 15:16:42 +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
|
12c066fd9f
|
忽略out
|
2019-01-07 11:05:20 +08:00 |
jiahuiwen
|
2bfa91c676
|
忽略协议
|
2019-01-07 10:54:58 +08:00 |
jiahuiwen
|
089106fc64
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-07 10:52:03 +08:00 |
jiahuiwen
|
a5fcc34d02
|
单词拼写错误
|
2019-01-07 10:51:31 +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
|
bd1122aadf
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-04 15:11:43 +08:00 |
mashiyu
|
bc0499c383
|
不提交
|
2019-01-04 15:11:19 +08:00 |
gaojie
|
e269a68bcc
|
提交隐藏文件
|
2019-01-04 14:15:46 +08:00 |
mashiyu
|
eaea13a4b3
|
坐标转化和前端保持一致
|
2019-01-04 14:08:46 +08:00 |
jiahuiwen
|
11cd52dbd8
|
戒灵地图
|
2019-01-04 13:39:02 +08:00 |
gaojie
|
6a39b09166
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-03 17:14:34 +08:00 |
gaojie
|
728d8c62da
|
初始化静态数据表信息
|
2019-01-03 17:14:20 +08:00 |
jiahuiwen
|
e075f60d4a
|
忽略*.class文件
|
2019-01-03 16:49:18 +08:00 |
jiahuiwen
|
56a23659b3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# .gitignore
|
2019-01-03 11:10:24 +08:00 |
jiahuiwen
|
ddc53399f3
|
添加忽略文件
|
2019-01-03 11:09:25 +08:00 |
wukang
|
faca415f09
|
忽略某些文件
|
2019-01-03 10:31:22 +08:00 |
mashiyu
|
ea5bab62c6
|
Initial commit
|
2018-12-27 17:54:23 +08:00 |