wangyuan
|
eb7c619eb5
|
探索度支持多事件点
|
2019-04-03 16:28:43 +08:00 |
jiahuiwen
|
b04bce96a9
|
行为类型 吃buff
|
2019-04-02 15:51:45 +08:00 |
jiahuiwen
|
501ff8f221
|
地图增加两个行为类型,配置表
|
2019-04-02 14:27:47 +08:00 |
gaojie
|
54d2172361
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-01 19:24:09 +08:00 |
gaojie
|
7fe39cdeac
|
怪物技能属性
|
2019-04-01 19:24:05 +08:00 |
mashiyu
|
e5aac81546
|
同步表
|
2019-04-01 14:40:07 +08:00 |
gaojie
|
77b9db852b
|
生成txt文件
|
2019-04-01 11:16:21 +08:00 |
jiahuiwen
|
9b92f1295b
|
配置表提交
|
2019-04-01 09:49:02 +08:00 |
wangyuan
|
4228fcd592
|
探索任务类型
|
2019-03-29 15:54:32 +08:00 |
jiahuiwen
|
6e413a7129
|
出地图
|
2019-03-28 19:56:53 +08:00 |
jiahuiwen
|
f5cf36911f
|
地图修改
|
2019-03-28 15:08:43 +08:00 |
wangyuan
|
7471064777
|
commit data
|
2019-03-28 10:50:18 +08:00 |
wangyuan
|
8e276c9be2
|
行动力
|
2019-03-27 20:30:33 +08:00 |
mashiyu
|
1ec26b5c8b
|
怪物表
|
2019-03-27 17:08:40 +08:00 |
wangyuan
|
ecb6e2a810
|
提交配置数据
|
2019-03-27 10:43:13 +08:00 |
jiahuiwen
|
1c42a47e42
|
配置文件
|
2019-03-27 10:24:40 +08:00 |
mashiyu
|
6fb4dee9c6
|
同步战斗
|
2019-03-26 15:11:47 +08:00 |
wangyuan
|
88a1188dcf
|
data commit
|
2019-03-26 11:23:06 +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
|
f7b6fb9afc
|
配置表
|
2019-03-23 17:14:58 +08:00 |
wangyuan
|
65f2bd5692
|
修改推荐妖灵师奖励
|
2019-03-22 16:16:12 +08:00 |
jiahuiwen
|
6c70934842
|
配置表提交
|
2019-03-22 14:29:22 +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 |
gaojie
|
3f69e112d8
|
技能静态数据更新
|
2019-03-21 17:23:19 +08:00 |
jiahuiwen
|
13a95395f8
|
地图配置表
|
2019-03-21 15:29:53 +08:00 |
gaojie
|
5527f560d9
|
生成文件数据类型处理
|
2019-03-21 11:19:25 +08:00 |
gaojie
|
21ac81824c
|
fix
|
2019-03-21 10:54:52 +08:00 |
wangyuan
|
7e4c8f7a7e
|
update data
|
2019-03-20 16:14:45 +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 |
gaojie
|
245118a707
|
fix
|
2019-03-20 15:05:41 +08:00 |
gaojie
|
20b1628d6c
|
增加怪物组技能
|
2019-03-20 11:54:43 +08:00 |
jiahuiwen
|
73ae2a9bf4
|
地图新增两个行为
|
2019-03-19 18:12:36 +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 |
jiahuiwen
|
dc2dff5378
|
数据提交
|
2019-03-14 15:45:29 +08:00 |
jiahuiwen
|
96abec7248
|
配置表提交
|
2019-03-14 12:08:51 +08:00 |
wangyuan
|
a1e84b5a16
|
randhero
|
2019-03-13 21:04:12 +08:00 |
jiahuiwen
|
483dabee0e
|
数据提交
|
2019-03-13 20:11:45 +08:00 |
jiahuiwen
|
0eec365385
|
地图数据
|
2019-03-13 16:43:01 +08:00 |
wangyuan
|
b847700469
|
upload data
|
2019-03-13 16:41:21 +08:00 |
wangyuan
|
e4b65bc7aa
|
change mongo
|
2019-03-12 18:59:14 +08:00 |
wangyuan
|
c259bb3e57
|
ActionPower
|
2019-03-12 14:30:20 +08:00 |
gaojie
|
e5d66d4bd3
|
技能
|
2019-03-12 14:03:08 +08:00 |
gaojie
|
aa9ea25018
|
技能静态表初始化
|
2019-03-12 11:10:19 +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
|
061e0f43c0
|
地图配置表提交
|
2019-03-09 18:05:10 +08:00 |
jiahuiwen
|
9cdc8ff54c
|
配置表
|
2019-03-07 14:07:24 +08:00 |
jiahuiwen
|
e17873e789
|
地图选项配置表
|
2019-03-06 20:56:11 +08:00 |
jiahuiwen
|
a80f078417
|
地图
|
2019-03-06 16:04:57 +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 |
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
|
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 |
gaojie
|
bba131d632
|
怪物数据
|
2019-03-01 16:07:03 +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
|
d7cd38d409
|
地图任务 配置表提交
|
2019-02-22 11:48:16 +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
|
b3d9c9d5cc
|
任务配置表
|
2019-02-19 20:51:47 +08:00 |
jiahuiwen
|
e90fd70cef
|
地图配置表
|
2019-02-19 20:51:21 +08:00 |
wangyuan
|
4b324dbd2b
|
equip
|
2019-02-19 20:46:06 +08:00 |
wangyuan
|
0f554b1cef
|
update
|
2019-02-19 15:43:07 +08:00 |
wangyuan
|
53361a76b7
|
增加符文道具
|
2019-02-14 18:19:07 +08:00 |
wangyuan
|
760ce77dfe
|
工坊
|
2019-02-14 17:54:50 +08:00 |
wangyuan
|
cf8e26bf38
|
hero level up
|
2019-01-29 12:18:26 +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 |
gaojie
|
8b14f4b978
|
fix
|
2019-01-28 18:11:30 +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 |
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
|
4f45aa9c5d
|
抽卡校验消耗
|
2019-01-25 18:33:38 +08:00 |
gaojie
|
0b5dd020c5
|
初始化道具卡牌
|
2019-01-25 16:56:24 +08:00 |
wangyuan
|
0a42dfd4d1
|
英雄相关数据
|
2019-01-25 16:23:00 +08:00 |
wangyuan
|
7f2209d1ff
|
item
|
2019-01-25 10:01:21 +08:00 |
wangyuan
|
36ca79085d
|
data
|
2019-01-24 18:31:02 +08:00 |
wangyuan
|
b44af11e55
|
冒险第一版
|
2019-01-24 16:31:29 +08:00 |
wangyuan
|
9db99e959a
|
装备和冒险
|
2019-01-24 12:04:52 +08:00 |
jiahuiwen
|
f425af876b
|
地图
|
2019-01-23 18:40:03 +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
|
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 |
mashiyu
|
477bcdab28
|
删除
|
2019-01-23 10:38:13 +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 |
gaojie
|
93aad66ce4
|
fix
|
2019-01-22 16:41:41 +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 |
jiahuiwen
|
20aa0dbe48
|
地图配置表
|
2019-01-22 11:06:43 +08:00 |
jiahuiwen
|
80dc8b3fee
|
地图配置表
|
2019-01-22 10:52:09 +08:00 |
wangyuan
|
77f08cd750
|
hero
|
2019-01-22 09:57:49 +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 |
wangyuan
|
a937b76400
|
抽卡beta
|
2019-01-21 15:31:02 +08:00 |
wangyuan
|
cbd48c5097
|
hero
|
2019-01-18 09:58:37 +08:00 |
gaojie
|
d9ac7c1dd2
|
卡牌静态数据加载
|
2019-01-16 16:50:26 +08:00 |
mashiyu
|
5df73a6802
|
提交
|
2019-01-15 16:19:23 +08:00 |
gaojie
|
33657a69e7
|
加载静态数据
|
2019-01-15 15:19:58 +08:00 |
gaojie
|
6870bb9d30
|
静态表数据
|
2019-01-15 15:04:27 +08:00 |
gaojie
|
93fb410ee9
|
GM添加道具
|
2019-01-15 15:03:28 +08:00 |
gaojie
|
dae7fbe1a7
|
读取配置文件
|
2019-01-09 09:57: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 |