mashiyu
|
aa52efc22b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Item.java
|
2019-01-17 14:38:47 +08:00 |
mashiyu
|
4fc7cd3f32
|
提交
|
2019-01-17 14:38:03 +08:00 |
gaojie
|
14297b68f0
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-16 16:50:30 +08:00 |
gaojie
|
d9ac7c1dd2
|
卡牌静态数据加载
|
2019-01-16 16:50:26 +08:00 |
wangyuan
|
ecb8d8cc51
|
修改测试客户端 & 修改item
|
2019-01-16 16:19:44 +08:00 |
mashiyu
|
5df73a6802
|
提交
|
2019-01-15 16:19:23 +08:00 |
gaojie
|
33657a69e7
|
加载静态数据
|
2019-01-15 15:19:58 +08:00 |
gaojie
|
9e160953e1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-15 15:04:32 +08:00 |
gaojie
|
93fb410ee9
|
GM添加道具
|
2019-01-15 15:03:28 +08:00 |
mashiyu
|
8776743e16
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-15 11:39:28 +08:00 |
mashiyu
|
51dc8cb857
|
提交
|
2019-01-15 11:38:14 +08:00 |
gaojie
|
69c5314ff4
|
生成静态表数据
|
2019-01-14 18:19:40 +08:00 |
mashiyu
|
79f9bd2169
|
改类名
|
2019-01-14 16:54:18 +08:00 |
mashiyu
|
b293b11973
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-14 16:35:17 +08:00 |
mashiyu
|
2c9c067bf5
|
提交一版
|
2019-01-14 16:34:49 +08:00 |
jiahuiwen
|
c062ebb996
|
漏提
|
2019-01-14 16:03:48 +08:00 |
jiahuiwen
|
e7990613a7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-14 16:02:48 +08:00 |
jiahuiwen
|
04b3560808
|
excel 转 txt 工具
|
2019-01-14 16:02:43 +08:00 |
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 |
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 |