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
|
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 |
gaojie
|
f7942c0c1e
|
关卡,角色升级
|
2019-04-12 11:19:31 +08:00 |
wangyuan
|
1b02fb5935
|
fix gm
|
2019-04-10 18:26:14 +08:00 |
wangyuan
|
5fd58a3472
|
整点执行
|
2019-04-10 15:59:05 +08:00 |
wangyuan
|
a17ef696d3
|
fix
|
2019-04-10 10:19:02 +08:00 |
gaojie
|
419a5c569e
|
fix
|
2019-04-09 23:59:56 +08:00 |
wangyuan
|
894c9e7267
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-09 20:28:49 +08:00 |
wangyuan
|
1b05903053
|
一键背包
|
2019-04-09 20:28:34 +08:00 |
gaojie
|
6165f20a6a
|
删除邮件
|
2019-04-09 20:16:10 +08:00 |
gaojie
|
f8662be876
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-09 16:03:54 +08:00 |
gaojie
|
e3b2c7897a
|
fix
|
2019-04-09 16:03:49 +08:00 |
wangyuan
|
af77563d11
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
|
2019-04-09 15:05:01 +08:00 |
wangyuan
|
ff28574930
|
新手引导
|
2019-04-09 15:04:09 +08:00 |
gaojie
|
fc63077c19
|
删除邮件
|
2019-04-09 14:39:54 +08:00 |
jiahuiwen
|
ce2c268c6a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-09 11:59:22 +08:00 |
jiahuiwen
|
1cc21efa66
|
触发的点 统一保存
|
2019-04-09 11:59:18 +08:00 |
wangyuan
|
36f7eaf835
|
食物buffer消耗
|
2019-04-09 11:32:29 +08:00 |
wangyuan
|
5cdfe42b6b
|
'初始化指定星级hero'
|
2019-04-09 11:17:15 +08:00 |
jiahuiwen
|
baf73f9440
|
bug修改
|
2019-04-09 09:28:37 +08:00 |
jiahuiwen
|
225ebb443a
|
bug 修改
|
2019-04-08 20:52:54 +08:00 |
jiahuiwen
|
982a34d49e
|
bug
|
2019-04-08 20:41:34 +08:00 |
jiahuiwen
|
afd2df23c1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-08 17:14:22 +08:00 |
wangyuan
|
6d328867a8
|
修复挂机删除时间
|
2019-04-08 17:57:01 +08:00 |
jiahuiwen
|
37f085b31c
|
保存信息
|
2019-04-08 17:14:10 +08:00 |
jiahuiwen
|
6bd50b34de
|
添加行为,可以开启其他地图点
|
2019-04-08 14:51:12 +08:00 |
wangyuan
|
b7d51deb04
|
红点
|
2019-04-04 14:00:49 +08:00 |
jiahuiwen
|
0be47a26fa
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-03 20:43:07 +08:00 |
jiahuiwen
|
c6a892ab23
|
迷雾
|
2019-04-03 20:43:03 +08:00 |
wangyuan
|
5495dab69a
|
fix
|
2019-04-03 19:20:25 +08:00 |
wangyuan
|
72760b449f
|
fix gm
|
2019-04-03 17:39:38 +08:00 |
wangyuan
|
eb7c619eb5
|
探索度支持多事件点
|
2019-04-03 16:28:43 +08:00 |
wangyuan
|
f59f3ab9d8
|
修改挂机奖励
|
2019-04-03 15:26:13 +08:00 |
wangyuan
|
27aebc60bb
|
gm 一键背包
|
2019-04-02 20:52:10 +08:00 |
jiahuiwen
|
b03071035d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-02 20:26:11 +08:00 |
jiahuiwen
|
251e724a2e
|
地图保存bug
|
2019-04-02 20:26:02 +08:00 |
wangyuan
|
747d2e4a53
|
修改英雄当前生命枚举值为6
|
2019-04-02 17:42:34 +08:00 |
wangyuan
|
80678b540f
|
fix
|
2019-04-02 17:21:54 +08:00 |
jiahuiwen
|
f3961d007f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-02 16:39:07 +08:00 |
jiahuiwen
|
b97039772d
|
事件点保存
|
2019-04-02 16:39:00 +08:00 |
wangyuan
|
c1ca5b3503
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java
|
2019-04-02 16:29:30 +08:00 |
wangyuan
|
1a40372803
|
吃食物buffer一次性生效,做延缓处理
|
2019-04-02 16:28:39 +08:00 |
jiahuiwen
|
bf235d3fc9
|
buff赋值
|
2019-04-02 16:05:54 +08:00 |
jiahuiwen
|
319a31df60
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-02 15:51:58 +08:00 |
jiahuiwen
|
b04bce96a9
|
行为类型 吃buff
|
2019-04-02 15:51:45 +08:00 |
wangyuan
|
371d8af39d
|
穿多件装备
|
2019-04-02 14:51:17 +08:00 |
jiahuiwen
|
65cb996af4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-02 14:28:45 +08:00 |
wangyuan
|
b8907cded2
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-02 14:28:26 +08:00 |
wangyuan
|
5f9f164320
|
修改食物buffer
|
2019-04-02 14:28:13 +08:00 |
jiahuiwen
|
17a5cddd82
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-02 14:27:55 +08:00 |
jiahuiwen
|
501ff8f221
|
地图增加两个行为类型,配置表
|
2019-04-02 14:27:47 +08:00 |
gaojie
|
ffdf1067fa
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-02 14:26:24 +08:00 |
gaojie
|
d1d06274da
|
初始化开服邮件
|
2019-04-02 14:26:20 +08:00 |
jiahuiwen
|
5de5a252ed
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-01 20:33:21 +08:00 |
jiahuiwen
|
de37dcd698
|
地图 gm
|
2019-04-01 20:31:54 +08:00 |
wangyuan
|
221c102815
|
fightdata
|
2019-04-01 19:49:18 +08:00 |
gaojie
|
215fa27996
|
修改数据类型
|
2019-04-01 19:34:26 +08:00 |
gaojie
|
54d2172361
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-01 19:24:09 +08:00 |
wangyuan
|
77a480f955
|
map gm
|
2019-04-15 05:29:35 +08:00 |
gaojie
|
7fe39cdeac
|
怪物技能属性
|
2019-04-01 19:24:05 +08:00 |
jiahuiwen
|
741c60fccf
|
地图GM,跳转判断
|
2019-04-01 18:57:58 +08:00 |
jiahuiwen
|
d0077f94cc
|
触发顺序
|
2019-04-01 17:11:10 +08:00 |
jiahuiwen
|
3118cd9fd1
|
保存地图事件 bug
|
2019-04-01 14:16:27 +08:00 |
jiahuiwen
|
51da0e539f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-01 11:27:27 +08:00 |
jiahuiwen
|
126df5e58b
|
销毁事件点 需要保存事件信息
|
2019-04-01 11:27:03 +08:00 |
mashiyu
|
f9249bef01
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-01 09:52:38 +08:00 |
mashiyu
|
597b25e3ed
|
bug
|
2019-04-01 09:52:18 +08:00 |
wangyuan
|
d0e785b44a
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-29 19:11:08 +08:00 |
wangyuan
|
c922681143
|
fix get map event id
|
2019-03-29 19:10:51 +08:00 |
jiahuiwen
|
b76f4bd76a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-29 18:52:30 +08:00 |
jiahuiwen
|
7b54dcc2c0
|
任务事件点更新
|
2019-03-29 18:52:08 +08:00 |
wangyuan
|
74d7139b5e
|
更新事件点
|
2019-03-29 18:06:25 +08:00 |
wangyuan
|
4228fcd592
|
探索任务类型
|
2019-03-29 15:54:32 +08:00 |
wangyuan
|
45ccd2f782
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-29 15:48:11 +08:00 |
wangyuan
|
12e75f690e
|
fix
|
2019-03-29 15:47:49 +08:00 |
jiahuiwen
|
e7a7c2b686
|
开地图 GM
|
2019-03-29 15:37:08 +08:00 |
jiahuiwen
|
a1cf44bbca
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-29 15:05:56 +08:00 |
jiahuiwen
|
b68757f7f7
|
地图bug,开图gm
|
2019-03-29 15:05:44 +08:00 |
wangyuan
|
271ffd9b3d
|
精力
|
2019-03-28 20:51:17 +08:00 |
jiahuiwen
|
6e413a7129
|
出地图
|
2019-03-28 19:56:53 +08:00 |
jiahuiwen
|
ec510c3e8c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-28 18:49:04 +08:00 |
jiahuiwen
|
993def6d33
|
边缘触发和覆盖触发
|
2019-03-28 18:48:59 +08:00 |
wangyuan
|
fc15794db3
|
精力
|
2019-03-28 18:32:08 +08:00 |
jiahuiwen
|
d40956b247
|
地图提交
|
2019-03-28 18:20:18 +08:00 |
jiahuiwen
|
a500703394
|
地图修改
|
2019-03-28 17:23:19 +08:00 |
jiahuiwen
|
992ed00675
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-28 15:10:59 +08:00 |
jiahuiwen
|
f5cf36911f
|
地图修改
|
2019-03-28 15:08:43 +08:00 |
mashiyu
|
76d045cc3d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-28 15:00:01 +08:00 |
mashiyu
|
9633f449c6
|
错误码
|
2019-03-28 14:59:48 +08:00 |
wangyuan
|
a549c34d0e
|
道具背包增量返回给前端
|
2019-03-28 14:43:48 +08:00 |
jiahuiwen
|
a6bfd95324
|
地图修改
|
2019-03-28 13:41:21 +08:00 |
jiahuiwen
|
06f5ad260a
|
支持最大最小值相等
|
2019-03-28 10:46:45 +08:00 |
jiahuiwen
|
096a5e4509
|
增加判断
|
2019-03-27 21:18:05 +08:00 |
wangyuan
|
8e276c9be2
|
行动力
|
2019-03-27 20:30:33 +08:00 |
jiahuiwen
|
531285484a
|
漏提
|
2019-03-27 19:59:55 +08:00 |
jiahuiwen
|
3c51f87439
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-27 19:59:14 +08:00 |
jiahuiwen
|
83812a7c0d
|
任务刷新放在战斗胜利后
|
2019-03-27 19:59:08 +08:00 |
wangyuan
|
90dff5ecc7
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-27 19:58:26 +08:00 |
wangyuan
|
ebebe1b2c4
|
相连地图快判断
|
2019-03-27 19:57:43 +08:00 |
jiahuiwen
|
f5fc376c1e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-27 17:11:17 +08:00 |
jiahuiwen
|
d1600d94a9
|
完善地图
|
2019-03-27 17:11:12 +08:00 |
wangyuan
|
d0083ee1ee
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-27 15:53:27 +08:00 |
wangyuan
|
6d6bee9b39
|
探索度 -》 行动力
|
2019-03-27 15:51:01 +08:00 |
mashiyu
|
5b5bf07eec
|
战斗血量bug
|
2019-03-27 15:47:27 +08:00 |
jiahuiwen
|
d6cd2edb89
|
属性判断
|
2019-03-27 11:36:12 +08:00 |
jiahuiwen
|
b0ada06c36
|
回城给道具
|
2019-03-27 10:17:49 +08:00 |
jiahuiwen
|
d9c34ba5cd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-26 20:45:31 +08:00 |
jiahuiwen
|
d272ad0ea1
|
临时背包bug
|
2019-03-26 20:45:25 +08:00 |
wangyuan
|
e8893ce66b
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-26 20:21:19 +08:00 |
wangyuan
|
38a9d7e339
|
fix
|
2019-03-26 20:20:00 +08:00 |
jiahuiwen
|
ea458568c5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-26 19:28:16 +08:00 |
jiahuiwen
|
38dee193ec
|
添加道具bug
|
2019-03-26 19:28:10 +08:00 |
mashiyu
|
947cf95b1b
|
优化
|
2019-03-26 19:25:26 +08:00 |
mashiyu
|
5fa8c7f88b
|
存一个response
|
2019-03-26 18:04:01 +08:00 |
jiahuiwen
|
fee1e82d74
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-26 17:35:15 +08:00 |
jiahuiwen
|
e53a8fe6cd
|
任务没有就不推
|
2019-03-26 17:35:00 +08:00 |
wangyuan
|
85b423d36a
|
fix null
|
2019-03-26 17:05:36 +08:00 |
mashiyu
|
a874e8623d
|
bug
|
2019-03-26 17:03:23 +08:00 |
jiahuiwen
|
ffeb61578f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-26 16:42:27 +08:00 |
jiahuiwen
|
fc39cefe82
|
pointId
|
2019-03-26 16:42:14 +08:00 |
wangyuan
|
41e7d9ce30
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-26 15:55:58 +08:00 |
wangyuan
|
dd93f6f8a9
|
fix
|
2019-03-26 15:55:47 +08:00 |
jiahuiwen
|
5794900e80
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-26 15:39:00 +08:00 |
jiahuiwen
|
1ff4143220
|
战斗地图点先不销毁
|
2019-03-26 15:37:53 +08:00 |
wangyuan
|
a086df2e8a
|
fix
|
2019-03-26 14:15:32 +08:00 |
jiahuiwen
|
30c154d407
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-26 14:03:14 +08:00 |
wangyuan
|
9791ae66fd
|
解决出地图探索度为空
|
2019-03-26 14:02:19 +08:00 |
jiahuiwen
|
7cae5ca7ca
|
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-03-26 13:58:48 +08:00 |
jiahuiwen
|
8918c88a1b
|
保存事件进度
|
2019-03-26 13:56:52 +08:00 |
wangyuan
|
e9b57014bf
|
fix
|
2019-03-26 11:46:00 +08:00 |
wangyuan
|
0bd0d709ea
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-03-26 11:21:47 +08:00 |
wangyuan
|
fb403ea174
|
地图探索度
|
2019-03-26 11:18:43 +08:00 |
jiahuiwen
|
36206f288c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-25 17:51:02 +08:00 |
jiahuiwen
|
96379e36f5
|
增加行为类型24
|
2019-03-25 17:50:58 +08:00 |
mashiyu
|
96312e7a21
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-25 11:46:20 +08:00 |
mashiyu
|
a628ea0507
|
失败处理
|
2019-03-25 11:46:09 +08:00 |
jiahuiwen
|
bb6c70c8f5
|
注释log
|
2019-03-25 11:31:16 +08:00 |
jiahuiwen
|
1f37783914
|
注释log
|
2019-03-25 11:30:26 +08:00 |
mashiyu
|
0f9e39fd77
|
bug
|
2019-03-25 11:28:10 +08:00 |
gaojie
|
32089c7f76
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
Conflicts:
serverlogic/src/main/java/com/ljsd/jieling/config/SSkillLogicConfig.java
|
2019-03-25 11:24:49 +08:00 |
gaojie
|
b348f81919
|
初始化技能数据
|
2019-03-25 11:20:25 +08:00 |
mashiyu
|
cc9b412f63
|
bug
|
2019-03-25 10:58:38 +08:00 |
mashiyu
|
0805e3c16e
|
种子随机
|
2019-03-23 18:17:38 +08:00 |
mashiyu
|
c7c43110e6
|
bug
|
2019-03-23 18:14:38 +08:00 |
jiahuiwen
|
81a603e0dc
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# conf/server/OptionConfig.txt
|
2019-03-23 17:15:30 +08:00 |
jiahuiwen
|
8d9b8e1ff8
|
地图修改
|
2019-03-23 17:14:18 +08:00 |
mashiyu
|
347ec0a577
|
数据bug
|
2019-03-23 17:06:14 +08:00 |
mashiyu
|
bb3fd97b0d
|
log
|
2019-03-22 19:06:00 +08:00 |
mashiyu
|
ce3a58641a
|
错误码
|
2019-03-22 18:57:17 +08:00 |
mashiyu
|
7a779b3ee3
|
战斗验证
|
2019-03-22 18:36:24 +08:00 |
wangyuan
|
2b06b9ace0
|
fix 驻扎时间
|
2019-03-22 17:43:20 +08:00 |
wangyuan
|
65f2bd5692
|
修改推荐妖灵师奖励
|
2019-03-22 16:16:12 +08:00 |
mashiyu
|
1793ddffd9
|
test
|
2019-03-22 15:00:06 +08:00 |
jiahuiwen
|
a165c759de
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-22 14:28:29 +08:00 |
jiahuiwen
|
1dca447d0c
|
空掉落
|
2019-03-22 14:28:13 +08:00 |
mashiyu
|
2e0244059c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-22 11:00:23 +08:00 |
mashiyu
|
e227cefbad
|
提交
|
2019-03-22 11:00:12 +08:00 |
jiahuiwen
|
d035de5a9e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# conf/server/OptionConfig.txt
|
2019-03-22 10:11:49 +08:00 |
jiahuiwen
|
ec1f65e8e1
|
地图修改
|
2019-03-22 10:10:49 +08:00 |
wangyuan
|
322c7a3e68
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-22 10:03:58 +08:00 |
wangyuan
|
705e2d5b7b
|
冒险推荐英雄
|
2019-03-22 10:02:46 +08:00 |
mashiyu
|
60f1dd0aff
|
优化
|
2019-03-21 17:48:37 +08:00 |
mashiyu
|
2c098f4db0
|
更新
|
2019-03-21 17:24:21 +08:00 |
jiahuiwen
|
6ed02aa302
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-21 15:30:05 +08:00 |
jiahuiwen
|
cce1214a65
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-21 15:29:25 +08:00 |
mashiyu
|
ad4178af44
|
路径
|
2019-03-21 15:29:22 +08:00 |
jiahuiwen
|
f6f1cac98e
|
事件点触发方式
|
2019-03-21 15:28:21 +08:00 |
mashiyu
|
0dd082a3b2
|
log
|
2019-03-21 15:24:31 +08:00 |
mashiyu
|
a37e7310f6
|
优化
|
2019-03-21 15:01:27 +08:00 |
mashiyu
|
e56acaea56
|
战斗验证
|
2019-03-21 14:33:56 +08:00 |
gaojie
|
5ed6302f7e
|
技能
|
2019-03-21 12:41:25 +08:00 |
mashiyu
|
c2b163f29c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-20 20:04:24 +08:00 |
mashiyu
|
8eff75e7c6
|
优化
|
2019-03-20 20:04:14 +08:00 |
jiahuiwen
|
04c60c2ac9
|
战斗修改
|
2019-03-20 19:50:21 +08:00 |
jiahuiwen
|
60db6c0005
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-20 19:01:41 +08:00 |
jiahuiwen
|
697487642c
|
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-03-20 19:01:35 +08:00 |
mashiyu
|
1dc2dff60a
|
引用jar
|
2019-03-20 19:01:18 +08:00 |
jiahuiwen
|
618a1903e1
|
任务
|
2019-03-20 18:39:37 +08:00 |
mashiyu
|
ab67577ff6
|
提交
|
2019-03-20 18:36:58 +08:00 |
mashiyu
|
5dae658da3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-20 16:09:06 +08:00 |
wangyuan
|
e10e8b9c55
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-20 16:08:14 +08:00 |
wangyuan
|
1bfe45c373
|
function control
|
2019-03-20 16:07:46 +08:00 |
mashiyu
|
dae6b91053
|
啊啊啊
|
2019-03-20 16:01:44 +08:00 |
mashiyu
|
0e42332a4b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-20 15:24:04 +08:00 |
gaojie
|
65d2d64219
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-20 15:05:45 +08:00 |
gaojie
|
245118a707
|
fix
|
2019-03-20 15:05:41 +08:00 |
wangyuan
|
3e21db3b92
|
驻扎错误信息
|
2019-03-20 14:48:25 +08:00 |
mashiyu
|
f1bb8dae15
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-20 11:55:21 +08:00 |
gaojie
|
20b1628d6c
|
增加怪物组技能
|
2019-03-20 11:54:43 +08:00 |
mashiyu
|
fb7bfcb669
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java
|
2019-03-20 10:19:00 +08:00 |
mashiyu
|
333caa887c
|
提交
|
2019-03-20 10:15:34 +08:00 |
wangyuan
|
c9ead9d4d3
|
前端获取服务器时间
|
2019-03-19 20:08:51 +08:00 |
jiahuiwen
|
64b0a75b7e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-19 19:57:44 +08:00 |
jiahuiwen
|
774828dcc9
|
选择跳转bug
|
2019-03-19 19:57:34 +08:00 |
wangyuan
|
83fcba59f8
|
精力
|
2019-03-19 18:34:14 +08:00 |
jiahuiwen
|
73ae2a9bf4
|
地图新增两个行为
|
2019-03-19 18:12:36 +08:00 |
jiahuiwen
|
b40c61d92d
|
任务可领取
|
2019-03-19 16:15:28 +08:00 |
jiahuiwen
|
6db6e061a5
|
地图探索修改
|
2019-03-19 15:54:37 +08:00 |
jiahuiwen
|
b3a7c9838f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-19 11:15:24 +08:00 |
jiahuiwen
|
e1f606e1ed
|
地图
|
2019-03-19 11:15:19 +08:00 |
wangyuan
|
139a7562a1
|
food buffer first version
|
2019-03-18 18:13:34 +08:00 |
wangyuan
|
0507cb91de
|
拼接英雄属性
|
2019-03-18 13:57:07 +08:00 |
wangyuan
|
b2e560c8bc
|
异妖属性加成
|
2019-03-18 11:40:33 +08:00 |
jiahuiwen
|
f62eda7bda
|
地图刷新
|
2019-03-15 17:08:13 +08:00 |
jiahuiwen
|
ca1f5d5021
|
总步数增加5
|
2019-03-15 14:04:46 +08:00 |
jiahuiwen
|
00c4283490
|
打开行动力
|
2019-03-15 10:35:41 +08:00 |
wangyuan
|
68b5336df8
|
绑定关系
|
2019-03-14 14:46:29 +08:00 |
wangyuan
|
1262ac5fda
|
绑定user
|
2019-03-14 14:37:04 +08:00 |
jiahuiwen
|
bc98404e7a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-14 11:46:21 +08:00 |
jiahuiwen
|
01e6e0c89b
|
添加道具bug
|
2019-03-14 11:46:16 +08:00 |
wangyuan
|
78df2af776
|
change weight
|
2019-03-14 11:13:05 +08:00 |
wangyuan
|
a1e84b5a16
|
randhero
|
2019-03-13 21:04:12 +08:00 |
jiahuiwen
|
483dabee0e
|
数据提交
|
2019-03-13 20:11:45 +08:00 |
wangyuan
|
b847700469
|
upload data
|
2019-03-13 16:41:21 +08:00 |
mashiyu
|
87c14fd895
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-13 14:03:10 +08:00 |
mashiyu
|
eec1857cdc
|
提交
|
2019-03-13 14:02:54 +08:00 |
jiahuiwen
|
810452915c
|
注释行动力,打开临时背包到背包
|
2019-03-13 13:55:09 +08:00 |
jiahuiwen
|
b5eb0629a3
|
打开临时背包
|
2019-03-13 13:48:33 +08:00 |
jiahuiwen
|
90bc0c62c6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-13 13:46:39 +08:00 |
jiahuiwen
|
34495dd9b0
|
临时背包
|
2019-03-13 13:46:33 +08:00 |
wangyuan
|
c840962396
|
fix unload equip
|
2019-03-13 10:59:58 +08:00 |
gaojie
|
a45aae40e2
|
注释临时背包
|
2019-03-12 20:10:46 +08:00 |
wangyuan
|
e4b65bc7aa
|
change mongo
|
2019-03-12 18:59:14 +08:00 |
mashiyu
|
a5ade7d53b
|
优化
|
2019-03-12 17:01:40 +08:00 |
wangyuan
|
c259bb3e57
|
ActionPower
|
2019-03-12 14:30:20 +08:00 |
mashiyu
|
3c5ea4af8b
|
依赖
|
2019-03-12 14:17:01 +08:00 |
mashiyu
|
ae2bc788dc
|
战斗校验
|
2019-03-12 14:11:16 +08:00 |
gaojie
|
e5d66d4bd3
|
技能
|
2019-03-12 14:03:08 +08:00 |
gaojie
|
c5d0813b68
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-12 11:10:23 +08:00 |
gaojie
|
aa9ea25018
|
技能静态表初始化
|
2019-03-12 11:10:19 +08:00 |
wangyuan
|
88d9ee72cb
|
校验星级
|
2019-03-12 10:17:32 +08:00 |
jiahuiwen
|
004cfbe4f0
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-12 09:41:15 +08:00 |
jiahuiwen
|
ceac7c04cd
|
行动力,和临时背包
|
2019-03-12 09:40:48 +08:00 |
jiahuiwen
|
724211771b
|
添加字段
|
2019-03-12 09:37:39 +08:00 |
wangyuan
|
9d033a9fc5
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-11 18:31:10 +08:00 |
wangyuan
|
f2bdb6126c
|
异妖
|
2019-03-11 18:30:42 +08:00 |
jiahuiwen
|
6d89769a68
|
地图 边缘触发
|
2019-03-09 19:02:07 +08:00 |
jiahuiwen
|
af7c0ab359
|
任务赋值
|
2019-03-09 11:51:47 +08:00 |
jiahuiwen
|
afaec0973b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-07 19:22:49 +08:00 |
jiahuiwen
|
b06828e290
|
地图行为类型
|
2019-03-07 19:22:44 +08:00 |
wangyuan
|
77212a2f30
|
初始化三个编队
|
2019-03-07 15:00:05 +08:00 |
jiahuiwen
|
5796e96bc5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-07 14:02:00 +08:00 |
jiahuiwen
|
099b7c7488
|
主线任务
|
2019-03-07 14:01:53 +08:00 |
gaojie
|
90e89386a1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-07 11:13:39 +08:00 |
gaojie
|
27578a91da
|
fix
|
2019-03-07 11:13:35 +08:00 |
mashiyu
|
66f21eb937
|
绑定关系
|
2019-03-07 11:12:42 +08:00 |
mashiyu
|
db19eacd16
|
数据存储优化
|
2019-03-06 19:26:29 +08:00 |
jiahuiwen
|
4e53e8e96c
|
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-03-06 17:30:25 +08:00 |
jiahuiwen
|
f6e0d4b8bf
|
战斗结算
|
2019-03-06 17:29:34 +08:00 |
mashiyu
|
8d19f84382
|
合并代码
|
2019-03-06 16:19:10 +08:00 |
mashiyu
|
5d8c9d35ae
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FinishMissionBehavior.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java
|
2019-03-06 16:17:34 +08:00 |
mashiyu
|
9c71683e83
|
去掉大小key异常
|
2019-03-06 16:14:18 +08:00 |
jiahuiwen
|
738252ecd5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-06 16:05:07 +08:00 |
jiahuiwen
|
a80f078417
|
地图
|
2019-03-06 16:04:57 +08:00 |
mashiyu
|
9ddf90637f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-06 15:07:23 +08:00 |
mashiyu
|
13b8946115
|
数据存贮优化
|
2019-03-06 15:07:12 +08:00 |
wangyuan
|
93ab01facd
|
fix 解析英雄数据表
|
2019-03-06 11:08:42 +08:00 |
jiahuiwen
|
83ef010146
|
初始任务
|
2019-03-05 19:39:52 +08:00 |
mashiyu
|
bf43560c87
|
改数据库
|
2019-03-05 18:59:34 +08:00 |
mashiyu
|
04ebb8ba6f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-05 18:45:03 +08:00 |
mashiyu
|
8575bd5ba5
|
数据库修改
|
2019-03-05 18:44:34 +08:00 |
jiahuiwen
|
105d87f629
|
初始新手任务
|
2019-03-05 17:49:14 +08:00 |
wangyuan
|
78e67277b8
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-05 16:43:38 +08:00 |
wangyuan
|
0d7d9bc10d
|
初始编队
|
2019-03-05 16:43:00 +08:00 |
gaojie
|
ca5b16163b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-05 15:23:45 +08:00 |
gaojie
|
e0fd985a43
|
卡牌装备分页请求
|
2019-03-05 15:23:38 +08:00 |
jiahuiwen
|
03fcab6635
|
展示地图出生点
|
2019-03-05 14:27:25 +08:00 |
jiahuiwen
|
c18d7a6ca2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-04 19:42:54 +08:00 |
jiahuiwen
|
3021511e7e
|
地图
|
2019-03-04 19:42:48 +08:00 |
mashiyu
|
f8dc7f535c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-04 11:09:28 +08:00 |
mashiyu
|
8d031b2455
|
提交
|
2019-03-04 11:07:31 +08:00 |
wangyuan
|
22de4a9033
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-03-02 18:34:15 +08:00 |
wangyuan
|
fbb2e1c6f2
|
精力&行动力
|
2019-03-02 18:30:38 +08:00 |
jiahuiwen
|
6c9252f157
|
地图战斗开战
|
2019-03-02 18:27:56 +08:00 |
wangyuan
|
5ab788a789
|
解决死循环
|
2019-03-02 14:36:54 +08:00 |
gaojie
|
be75504fb8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-02 13:57:24 +08:00 |
gaojie
|
c20749d371
|
mongo 删除key
|
2019-03-02 13:57:20 +08:00 |
wangyuan
|
6e4eda7a53
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-02 13:43:05 +08:00 |
wangyuan
|
9423ef2fb1
|
修改抽卡获取协议 & 提交工坊数据
|
2019-03-02 13:42:33 +08:00 |
jiahuiwen
|
0d7f123a01
|
判断道具
|
2019-03-01 18:31:29 +08:00 |
jiahuiwen
|
f7d3b64b61
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-01 17:34:55 +08:00 |
jiahuiwen
|
47051d6b69
|
地图表增加字段
|
2019-03-01 17:34:43 +08:00 |
gaojie
|
bba131d632
|
怪物数据
|
2019-03-01 16:07:03 +08:00 |
jiahuiwen
|
b06e783754
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-01 13:40:27 +08:00 |
jiahuiwen
|
9ff3046493
|
地图 8和9 全出现
|
2019-03-01 13:40:22 +08:00 |
wangyuan
|
0a45445c20
|
规范
|
2019-02-27 21:31:04 +08:00 |
wangyuan
|
291d8acbae
|
加经验
|
2019-02-27 16:22:06 +08:00 |
wangyuan
|
d6ab9a413d
|
修复队伍上阵同样卡牌
|
2019-02-26 21:07:45 +08:00 |
mashiyu
|
d5b2dab9b4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-02-26 19:43:19 +08:00 |
gaojie
|
c243df65ab
|
释放io流
|
2019-02-26 18:11:23 +08:00 |
mashiyu
|
ead69de1b7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-02-26 16:14:36 +08:00 |
mashiyu
|
07c189f09c
|
断线重连
|
2019-02-26 16:14:22 +08:00 |
wangyuan
|
7684ffe7e0
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-02-25 20:53:51 +08:00 |
wangyuan
|
cdcff252ab
|
校验
|
2019-02-25 20:53:38 +08:00 |
jiahuiwen
|
459ec2b0a2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-02-25 20:43:01 +08:00 |
jiahuiwen
|
d0c8424ec3
|
增加两个行为类型 15销魂事件点 16消耗道具并销毁事件点
|
2019-02-25 20:42:47 +08:00 |
wangyuan
|
47e04c5d51
|
修复消息号
|
2019-02-25 18:08:59 +08:00 |
wangyuan
|
a598b1dd9c
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-02-25 18:04:45 +08:00 |
wangyuan
|
2d97d71c72
|
聊天
|
2019-02-25 18:04:30 +08:00 |
jiahuiwen
|
32bbca91cd
|
优化地图代码
|
2019-02-25 17:53:47 +08:00 |
jiahuiwen
|
99ca55edba
|
优化地图中行为类型
|
2019-02-25 17:35:38 +08:00 |
jiahuiwen
|
c8cc57b871
|
离开地图,再进入地图恢复之前状态
|
2019-02-25 15:55:27 +08:00 |
wangyuan
|
c2e2981c40
|
fix
|
2019-02-25 14:03:09 +08:00 |
jiahuiwen
|
0790917a68
|
添加消息类型
|
2019-02-25 13:59:23 +08:00 |
jiahuiwen
|
cbea3a4ecd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-02-25 13:50:41 +08:00 |
jiahuiwen
|
d8db472845
|
提交
|
2019-02-25 13:48:49 +08:00 |
jiahuiwen
|
007a004f01
|
保存地图里的主线任务
|
2019-02-25 13:44:42 +08:00 |
wangyuan
|
3ef502dd5f
|
百味居
|
2019-02-25 11:54:10 +08:00 |
wangyuan
|
e9dc4a0439
|
table fix
|
2019-03-04 09:20:45 +08:00 |
jiahuiwen
|
7610346352
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-02-22 17:05:38 +08:00 |
jiahuiwen
|
e9af1d9be0
|
配置表
|
2019-02-22 17:05:15 +08:00 |
wangyuan
|
5e0ae7bdbf
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-02-22 13:48:23 +08:00 |
wangyuan
|
1ff8ad2131
|
异妖&百味居表
|
2019-02-22 13:46:01 +08:00 |
jiahuiwen
|
971f63cdff
|
重命名mail
|
2019-02-22 11:55:47 +08:00 |
gaojie
|
16a064bd6d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-02-22 11:54:15 +08:00 |
gaojie
|
fb5efcb50f
|
fix
|
2019-02-22 11:54:11 +08:00 |
jiahuiwen
|
a1385054a3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-02-22 11:48:22 +08:00 |
jiahuiwen
|
d7cd38d409
|
地图任务 配置表提交
|
2019-02-22 11:48:16 +08:00 |
gaojie
|
7dda6284c9
|
活动掉落
|
2019-02-21 21:00:46 +08:00 |
jiahuiwen
|
46d7a7c9e6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-02-21 11:41:24 +08:00 |
wangyuan
|
45f52d32bd
|
fix
|
2019-02-21 10:00:23 +08:00 |
wangyuan
|
7e8cbaa914
|
速度公式修改
|
2019-02-20 11:14:55 +08:00 |
jiahuiwen
|
36028386a8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-02-19 20:49:12 +08:00 |
jiahuiwen
|
4116399900
|
主线任务
|
2019-02-19 20:48:51 +08:00 |
wangyuan
|
4b324dbd2b
|
equip
|
2019-02-19 20:46:06 +08:00 |
wangyuan
|
53ead12c3e
|
fix
|
2019-02-19 16:17:47 +08:00 |
mashiyu
|
2d39d9a28a
|
提交
|
2019-02-19 15:58:08 +08:00 |
wangyuan
|
0f554b1cef
|
update
|
2019-02-19 15:43:07 +08:00 |
wangyuan
|
ae84d45e79
|
阵容 装备
|
2019-02-18 18:42:09 +08:00 |
wangyuan
|
a60edcf3dd
|
升星校验
|
2019-02-15 18:44:30 +08:00 |
wangyuan
|
d500fd4e66
|
校验异妖不存在
|
2019-02-15 10:59:38 +08:00 |
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 |