wangyuan
|
ad8bef2b7e
|
获取编队
|
2019-02-15 10:53:59 +08:00 |
wangyuan
|
53361a76b7
|
增加符文道具
|
2019-02-14 18:19:07 +08:00 |
wangyuan
|
760ce77dfe
|
工坊
|
2019-02-14 17:54:50 +08:00 |
jiahuiwen
|
409e11e308
|
跳转类型修改
|
2019-01-30 18:11:39 +08:00 |
mashiyu
|
208183198d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-29 14:16:25 +08:00 |
mashiyu
|
ca8b94eab9
|
提交
|
2019-01-29 14:16:15 +08:00 |
wangyuan
|
cf8e26bf38
|
hero level up
|
2019-01-29 12:18:26 +08:00 |
wangyuan
|
eb1fba0c1f
|
删除无效代码
|
2019-01-29 10:16:58 +08:00 |
jiahuiwen
|
fa098db010
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-28 20:41:52 +08:00 |
jiahuiwen
|
7df4872590
|
地图
|
2019-01-28 20:41:45 +08:00 |
wangyuan
|
cec7d88cca
|
fix
|
2019-01-28 20:40:20 +08:00 |
wangyuan
|
564459a8fc
|
speed
|
2019-01-28 19:11:28 +08:00 |
jiahuiwen
|
74d126c782
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-28 19:03:53 +08:00 |
jiahuiwen
|
80aa815e76
|
提交
|
2019-01-28 19:00:51 +08:00 |
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
|
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
|
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
|
93aad66ce4
|
fix
|
2019-01-22 16:41:41 +08:00 |
gaojie
|
deec982cb9
|
GM添加卡牌
|
2019-01-22 16:30:21 +08:00 |
gaojie
|
e2df7ba34f
|
GM
|
2019-01-22 16:15:25 +08:00 |
gaojie
|
d17f20627c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-22 16:02:27 +08:00 |
gaojie
|
7ab8e61bbc
|
道具消耗
|
2019-01-22 16:02:24 +08:00 |
wangyuan
|
15eab663e9
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-01-22 14:44:36 +08:00 |
wangyuan
|
13ec95f093
|
删除hero属性
|
2019-01-22 14:44:02 +08:00 |
mashiyu
|
f7a3f9dff4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-22 14:43:56 +08:00 |
mashiyu
|
43330ab36e
|
提交
|
2019-01-22 14:43:39 +08:00 |
gaojie
|
57f73449d8
|
掉落
|
2019-01-22 14:37:10 +08:00 |
mashiyu
|
d809b04af5
|
错误码
|
2019-01-22 13:55:52 +08:00 |
jiahuiwen
|
ab03ce293e
|
地图只能放一个事件
|
2019-01-22 12:03:27 +08:00 |
jiahuiwen
|
80dc8b3fee
|
地图配置表
|
2019-01-22 10:52:09 +08:00 |
wangyuan
|
77f08cd750
|
hero
|
2019-01-22 09:57:49 +08:00 |
wangyuan
|
6ddd6930ec
|
fix
|
2019-01-22 09:56:56 +08:00 |
wangyuan
|
ee902be8ea
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-01-22 09:55:06 +08:00 |
wangyuan
|
3b2df641ea
|
delete
|
2019-01-22 09:54:33 +08:00 |
jiahuiwen
|
be1d601c0e
|
注释报错
|
2019-01-22 09:52:15 +08:00 |
jiahuiwen
|
7e9b6c62af
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-22 09:51:23 +08:00 |
jiahuiwen
|
c658c1f5a0
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-01-22 09:51:12 +08:00 |
wangyuan
|
be088a61f9
|
random
|
2019-01-22 09:46:37 +08:00 |
jiahuiwen
|
1224c2606b
|
地图
|
2019-01-22 09:45:24 +08:00 |
gaojie
|
38080b502e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-22 09:25:49 +08:00 |
gaojie
|
358310d762
|
添加道具公共接口
|
2019-01-22 09:25:44 +08:00 |
mashiyu
|
245ed58ec8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-21 18:27:21 +08:00 |
mashiyu
|
ba247b4161
|
迷雾开格
|
2019-01-21 18:26:48 +08:00 |
wangyuan
|
3e61f6474a
|
delete mapinfo
|
2019-01-21 18:06:56 +08:00 |
wangyuan
|
a937b76400
|
抽卡beta
|
2019-01-21 15:31:02 +08:00 |
jiahuiwen
|
f94a4e66b6
|
log
|
2019-01-21 10:55:20 +08:00 |
jiahuiwen
|
906253e35b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-21 10:51:05 +08:00 |
jiahuiwen
|
627b376b37
|
地图
|
2019-01-21 10:50:59 +08:00 |
mashiyu
|
cc1ab75c18
|
提交
|
2019-01-21 09:40:03 +08:00 |
jiahuiwen
|
168e51c45f
|
删除报错
|
2019-01-18 17:11:46 +08:00 |
jiahuiwen
|
565fd161d6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-01-18 17:05:10 +08:00 |
jiahuiwen
|
5fa0f5b0f4
|
地图
|
2019-01-18 15:38:07 +08:00 |
mashiyu
|
d93064f353
|
提交
|
2019-01-18 12:41:09 +08:00 |
mashiyu
|
ec8c8ca7f6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllItemHandler.java
|
2019-01-18 12:08:26 +08:00 |
mashiyu
|
bab9eb98a8
|
提交
|
2019-01-18 12:06:45 +08:00 |
gaojie
|
362c34e325
|
fix
|
2019-01-18 10:17:31 +08:00 |
gaojie
|
8b26c4a73f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
Conflicts:
serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllItemHandler.java
|
2019-01-18 10:13:59 +08:00 |
gaojie
|
7fb418baf6
|
用户物品
|
2019-01-18 10:10:12 +08:00 |
wangyuan
|
cbd48c5097
|
hero
|
2019-01-18 09:58:37 +08:00 |
mashiyu
|
ee1defd706
|
提交
|
2019-01-17 20:50:13 +08:00 |
mashiyu
|
5012bc0fd0
|
提交
|
2019-01-17 15:08:52 +08:00 |
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 |
jiahuiwen
|
8b19cbdeb5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-01-16 17:19:09 +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 |
jiahuiwen
|
3a77b42b50
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/SCMapConfig.java
# serverlogic/src/main/java/com/ljsd/jieling/config/SCMapEventsConfig.java
|
2019-01-16 15:30:54 +08:00 |
jiahuiwen
|
f6d8b7322c
|
地图提交
|
2019-01-16 15:24:01 +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 |
mashiyu
|
ea5bab62c6
|
Initial commit
|
2018-12-27 17:54:23 +08:00 |