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 |