wangyuan
|
0132a2ff2c
|
修复挂机奖励和地图探索optionId问题
|
2019-04-26 16:31:09 +08:00 |
jiahuiwen
|
c76e2278d1
|
通关星级替换
|
2019-04-26 15:25:21 +08:00 |
gaojie
|
9e5c23315c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-25 21:03:15 +08:00 |
gaojie
|
66d4f6279c
|
升级
|
2019-04-25 21:03:07 +08:00 |
wangyuan
|
8760187393
|
等级校验
|
2019-04-25 20:23:07 +08:00 |
gaojie
|
44f60a050e
|
关卡等级限制
|
2019-04-25 20:15:53 +08:00 |
gaojie
|
85636fdabf
|
名字合法性验证
|
2019-04-25 18:29:08 +08:00 |
gaojie
|
16ff5cc025
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-25 18:18:56 +08:00 |
gaojie
|
d6b0063066
|
名字
|
2019-04-25 18:18:51 +08:00 |
jiahuiwen
|
064ddce83f
|
200
|
2019-04-25 17:39:47 +08:00 |
jiahuiwen
|
e9da699d03
|
从1开始
|
2019-04-25 17:32:41 +08:00 |
jiahuiwen
|
b05cb6edd6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-25 17:31:18 +08:00 |
jiahuiwen
|
30b39089c1
|
地图读200开始
|
2019-04-25 17:30:53 +08:00 |
wangyuan
|
a699b4e4dd
|
挂机
|
2019-04-25 17:04:36 +08:00 |
jiahuiwen
|
cfd59bebba
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-25 15:40:27 +08:00 |
jiahuiwen
|
4c47d1c36e
|
时间从小到大
|
2019-04-25 15:40:12 +08:00 |
gaojie
|
aa89c05d4f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# conf/server/OptionConfig.txt
# conf/server/RewardGroup.txt
|
2019-04-25 14:55:58 +08:00 |
gaojie
|
b09ba9646e
|
随机名字
|
2019-04-25 14:55:06 +08:00 |
jiahuiwen
|
42ee3ccc12
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-25 14:47:52 +08:00 |
jiahuiwen
|
fac16f9dfd
|
竞速排行bug
|
2019-04-25 14:47:38 +08:00 |
wangyuan
|
8a35e83c47
|
进地图要给最大血量
|
2019-04-25 14:40:13 +08:00 |
jiahuiwen
|
aa3c588b87
|
配置表提交
|
2019-04-25 10:16:33 +08:00 |
jiahuiwen
|
b9e4cc3626
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-24 18:31:18 +08:00 |
jiahuiwen
|
f94b50b54c
|
时间判断
|
2019-04-24 18:31:11 +08:00 |
gaojie
|
7bd38e7bd4
|
fix
|
2019-04-24 18:18:03 +08:00 |
wangyuan
|
07018af62e
|
分解装备
|
2019-04-24 18:17:04 +08:00 |
jiahuiwen
|
9c035670ea
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-24 16:10:04 +08:00 |
wangyuan
|
b0fe7b66e2
|
挂机
|
2019-04-25 15:15:35 +08:00 |
jiahuiwen
|
5cf78e6bc9
|
删除不要的字段
|
2019-04-24 16:09:53 +08:00 |
wangyuan
|
185467d2fa
|
提交数据
|
2019-04-25 14:38:00 +08:00 |
wangyuan
|
c4e6b0252e
|
活动 &玩家默认名称
|
2019-04-25 14:36:41 +08:00 |
gaojie
|
a5f6bf571d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-24 15:01:49 +08:00 |
gaojie
|
badb33e936
|
玩家升级 以及通关关卡
|
2019-04-24 15:01:46 +08:00 |
gaojie
|
736e14eada
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-24 14:18:34 +08:00 |
wangyuan
|
dcde6fae0a
|
删除装备
|
2019-04-25 13:53:03 +08:00 |
gaojie
|
888761b2f0
|
分解
|
2019-04-24 14:18:29 +08:00 |
gaojie
|
a4815854e0
|
静态表数据
|
2019-04-24 13:45:46 +08:00 |
gaojie
|
2ad5e17afb
|
道具分解
|
2019-04-24 10:44:08 +08:00 |
wangyuan
|
88595a257a
|
table
|
2019-04-23 18:30:39 +08:00 |
wangyuan
|
b21808a080
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
|
2019-04-23 18:22:59 +08:00 |
wangyuan
|
4289588f92
|
活动
|
2019-04-23 18:22:02 +08:00 |
gaojie
|
ade79c00a2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-23 17:28:27 +08:00 |
gaojie
|
891d6c0ece
|
功能开关
|
2019-04-23 17:28:23 +08:00 |
jiahuiwen
|
ef2b6dc136
|
配置表提交
|
2019-04-23 09:47:24 +08:00 |
jiahuiwen
|
a0a9ae3b8d
|
任务完成时间
|
2019-04-23 09:43:48 +08:00 |
wangyuan
|
ae0e068b35
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-22 19:26:29 +08:00 |
wangyuan
|
eaa1767284
|
活动
|
2019-04-22 19:25:03 +08:00 |
gaojie
|
fbc7c719e2
|
英雄合成
|
2019-04-22 17:39:06 +08:00 |
gaojie
|
f135001dac
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-22 16:12:50 +08:00 |
gaojie
|
5e3e632282
|
合成英雄
|
2019-04-22 16:09:24 +08:00 |