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
|
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 |
jiahuiwen
|
295bb4f70a
|
开地图点支持开多个
|
2019-04-22 15:11:10 +08:00 |
jiahuiwen
|
fbafd3f227
|
购买挑战次数
|
2019-04-22 11:51:31 +08:00 |
jiahuiwen
|
7ba0084c23
|
血量负数
|
2019-04-20 17:56:19 +08:00 |
jiahuiwen
|
0d308bc58c
|
team 顺序
|
2019-04-20 16:55:24 +08:00 |
jiahuiwen
|
f4cdbdcf15
|
快速战斗阵亡 复活bug
|
2019-04-20 16:02:47 +08:00 |
jiahuiwen
|
e175d7db38
|
购买挑战次数bug
|
2019-04-20 14:53:53 +08:00 |
wangyuan
|
39404df90d
|
修复随机道具数量为0
|
2019-04-19 20:05:58 +08:00 |
jiahuiwen
|
dbb8413947
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-19 19:55:46 +08:00 |
jiahuiwen
|
cacd625577
|
快速战斗bug
|
2019-04-19 19:55:40 +08:00 |
wangyuan
|
8c51272314
|
修复AdventureStateInfo 入库
|
2019-04-19 19:28:57 +08:00 |
jiahuiwen
|
6fef8b2297
|
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-04-19 19:18:19 +08:00 |
jiahuiwen
|
a8cbb93ccb
|
快速战斗
|
2019-04-19 19:17:23 +08:00 |
wangyuan
|
8910551a51
|
地图吃buffer直接覆盖
|
2019-04-19 18:58:13 +08:00 |
wangyuan
|
587cacade2
|
地图探索度
|
2019-04-19 18:54:29 +08:00 |
gaojie
|
ed17b87905
|
fix
|
2019-04-19 18:37:49 +08:00 |
gaojie
|
46ff11b41d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-19 18:21:22 +08:00 |
gaojie
|
9e00bc05f9
|
物品分解
|
2019-04-19 18:21:18 +08:00 |
jiahuiwen
|
0367c5fbcb
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-19 18:16:16 +08:00 |
jiahuiwen
|
419c1b08c6
|
买挑战次数
|
2019-04-19 18:16:11 +08:00 |
wangyuan
|
db6e3014ca
|
更新地图buffer消失机制
|
2019-04-19 18:00:40 +08:00 |
jiahuiwen
|
ecc3f992e3
|
登录时间
|
2019-04-19 17:48:54 +08:00 |
wangyuan
|
4ac7c99b2a
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-19 17:13:03 +08:00 |
wangyuan
|
425b13e291
|
修改血量
|
2019-04-19 17:12:29 +08:00 |
jiahuiwen
|
a12544232c
|
行为类型17 不推任务
|
2019-04-19 16:44:38 +08:00 |
jiahuiwen
|
2bece3f31d
|
任务奖励改数组
|
2019-04-19 15:20:34 +08:00 |
jiahuiwen
|
7176513785
|
改名字
|
2019-04-19 14:43:35 +08:00 |
wangyuan
|
ebbd6dfb8e
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-19 14:24:40 +08:00 |
wangyuan
|
1b39896daf
|
血量 & 挂机显示离线时间
|
2019-04-19 14:24:28 +08:00 |
jiahuiwen
|
705fc6d7c4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-19 11:35:04 +08:00 |
jiahuiwen
|
bdb1de4a3f
|
地图修改
|
2019-04-19 11:34:59 +08:00 |
gaojie
|
986c064908
|
首通奖励
|
2019-04-19 10:32:27 +08:00 |
jiahuiwen
|
dd3ca2829c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-18 14:55:03 +08:00 |
jiahuiwen
|
3be70ed3e7
|
每天重置副本次数
|
2019-04-18 14:54:23 +08:00 |
mashiyu
|
ba1a376f9a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-18 13:25:12 +08:00 |
mashiyu
|
67e8ce4dc5
|
多拨怪异常处理
|
2019-04-18 13:25:01 +08:00 |
wangyuan
|
4c17e74472
|
出图英雄血量重置不计算食物buffer
|
2019-04-18 10:20:34 +08:00 |
mashiyu
|
a69680944a
|
提交
|
2019-04-18 09:56:18 +08:00 |
mashiyu
|
d302961cd3
|
图内给奖励
|
2019-04-17 22:42:36 +08:00 |
mashiyu
|
9e56ae7df6
|
出图不保存血量
|
2019-04-17 21:46:22 +08:00 |
mashiyu
|
4f2239f7c9
|
关卡不不记录血量
|
2019-04-17 21:32:58 +08:00 |
jiahuiwen
|
a8717a73a9
|
掉落改数组
|
2019-04-17 19:20:40 +08:00 |
jiahuiwen
|
29024fae3e
|
配置表提交
|
2019-04-17 19:06:44 +08:00 |
jiahuiwen
|
8a72ea0037
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-17 19:02:50 +08:00 |
jiahuiwen
|
d89b59021f
|
副本扫荡,购买挑战次数,获取排行榜
|
2019-04-17 19:02:33 +08:00 |
gaojie
|
93dd29348d
|
fix
|
2019-04-17 18:36:38 +08:00 |
gaojie
|
7e1bce2c83
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-17 18:02:55 +08:00 |
gaojie
|
87616377a1
|
升级加体力
|
2019-04-17 18:02:51 +08:00 |
wangyuan
|
e4def0f68b
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# conf/server/GameSetting.txt
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-04-17 15:04:56 +08:00 |
wangyuan
|
36f85848af
|
探索度
|
2019-04-17 15:02:23 +08:00 |
jiahuiwen
|
af186980d4
|
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-04-17 14:37:12 +08:00 |
jiahuiwen
|
42451d1c36
|
找回代码
|
2019-04-17 14:29:24 +08:00 |
gaojie
|
8466795034
|
等级升级,体力恢复
|
2019-04-17 12:11:15 +08:00 |
gaojie
|
2760830091
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-17 11:10:00 +08:00 |
gaojie
|
c465fd0dec
|
关卡掉落进背包
|
2019-04-17 11:09:55 +08:00 |
wangyuan
|
7307a444f4
|
修复挂机key
|
2019-04-17 09:47:16 +08:00 |
gaojie
|
1f7d626309
|
fix
|
2019-04-16 21:04:09 +08:00 |
gaojie
|
f11ca34c98
|
关卡状态
|
2019-04-16 21:00:14 +08:00 |
wangyuan
|
60026e5384
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-16 20:02:00 +08:00 |
wangyuan
|
1074c36d6f
|
地图探索度 删除无效协议
|
2019-04-16 20:01:48 +08:00 |
jiahuiwen
|
1169dffab5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-16 19:31:22 +08:00 |
jiahuiwen
|
e8b7f7d168
|
无用导入
|
2019-04-16 19:31:07 +08:00 |
wangyuan
|
3a9daeb6eb
|
探索度 删除不必要的协议
|
2019-04-16 17:59:52 +08:00 |
gaojie
|
fc76607c69
|
恢复体力
|
2019-04-16 17:34:32 +08:00 |
gaojie
|
befccd4e38
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-16 14:10:37 +08:00 |
gaojie
|
2a36654ab1
|
多波怪物
|
2019-04-16 14:10:29 +08:00 |
wangyuan
|
5e27f52711
|
''
|
2019-04-16 13:50:59 +08:00 |
wangyuan
|
226a50f33d
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-16 10:26:17 +08:00 |
wangyuan
|
b07a7f5673
|
挂机
|
2019-04-16 10:26:03 +08:00 |
wangyuan
|
ae9a7bc1ee
|
挂机
|
2019-04-16 10:25:45 +08:00 |
jiahuiwen
|
8e39b783f1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# conf/server/RewardGroup.txt
# conf/server/RewardItemConfig.txt
|
2019-04-15 20:36:06 +08:00 |
jiahuiwen
|
9a7f180663
|
配置表提交
|
2019-04-15 20:35:40 +08:00 |
gaojie
|
4a35cfa272
|
体力
|
2019-04-15 20:35:15 +08:00 |
gaojie
|
ac7ffe50ec
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-15 19:18:59 +08:00 |
gaojie
|
6a111ddfb9
|
fix
|
2019-04-15 19:18:56 +08:00 |
jiahuiwen
|
fdac21e724
|
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-04-15 18:04:49 +08:00 |
jiahuiwen
|
a35c93b6fb
|
地图修改
|
2019-04-15 18:03:48 +08:00 |
gaojie
|
761776f126
|
fix
|
2019-04-15 16:34:01 +08:00 |
gaojie
|
b3a9cfc288
|
阵容校验
|
2019-04-15 16:21:29 +08:00 |
gaojie
|
7a0690f520
|
扫荡
|
2019-04-15 16:07:48 +08:00 |
gaojie
|
d6a2b84015
|
fix
|
2019-04-13 15:53:02 +08:00 |
gaojie
|
06d665e02c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-13 15:10:24 +08:00 |
jiahuiwen
|
e65f633023
|
探索修改
|
2019-04-12 20:57:15 +08:00 |
jiahuiwen
|
4ba216f2e3
|
探索修改
|
2019-04-12 19:42:32 +08:00 |
gaojie
|
ce1cd08478
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
Conflicts:
conf/server/MonsterGroup.txt
|
2019-04-12 18:28:09 +08:00 |
gaojie
|
0dce1d8ee4
|
关卡
|
2019-04-12 18:26:36 +08:00 |
jiahuiwen
|
ab96501d1c
|
剩余时间
|
2019-04-12 15:02:10 +08:00 |
jiahuiwen
|
9fdbc8b1da
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java
|
2019-04-12 14:52:45 +08:00 |
jiahuiwen
|
66b7367e4d
|
地图探索
|
2019-04-12 14:50:45 +08:00 |
gaojie
|
db3d53cc35
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-12 11:19:42 +08:00 |