lihaiyang
|
935e4bb811
|
添加工会?tips配置
|
2020-08-18 20:08:47 +08:00 |
lihaiyang
|
7fb8634749
|
添加怪物血量仅显示用
|
2020-08-18 19:56:22 +08:00 |
lihaiyang
|
f75c843751
|
Merge branch '0功能/公会副本' of http://60.1.1.230/gaoxin/JL_Client into 0功能/公会副本
|
2020-08-18 19:44:34 +08:00 |
lihaiyang
|
600c6094ec
|
添加军团经验仅显示用
|
2020-08-18 19:43:54 +08:00 |
zhangqiang
|
c6b0acb7d8
|
Merge branch 'master_develop' into 0功能/公会副本
# Conflicts:
# data_execl/base_data/MonsterConfig.xlsx
|
2020-08-18 19:36:17 +08:00 |
zhangqiang
|
1c5a338c53
|
Merge branch '0功能/公会副本' of http://60.1.1.230/gaoxin/JL_Client into 0功能/公会副本
|
2020-08-18 19:33:54 +08:00 |
zhangqiang
|
00f1060be7
|
公会副本提交初始界面
|
2020-08-18 19:33:31 +08:00 |
ZhangBiao
|
e261370ff4
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-18 19:17:43 +08:00 |
ZhangBiao
|
f18973cea9
|
极速达人修改
|
2020-08-18 19:17:20 +08:00 |
lihaiyang
|
21ee34c964
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-18 18:49:21 +08:00 |
lihaiyang
|
6a809c25e2
|
轩辕宝境怪物添加被动 修改怪物属性 添加公会副本的怪物
|
2020-08-18 18:48:20 +08:00 |
lihaiyang
|
3696a0ec4f
|
公会副本怪物修改位置
|
2020-08-18 17:25:35 +08:00 |
gongjiawei
|
af6dcc4410
|
音频更新
|
2020-08-18 16:23:57 +08:00 |
jiaoyangna
|
e2b2517ad0
|
live2d commit
|
2020-08-18 15:42:21 +08:00 |
jiaoyangna
|
95593175ec
|
dailycarbonpanel update
|
2020-08-18 14:00:03 +08:00 |
jiaoyangna
|
a5209137f0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-18 10:34:27 +08:00 |
jiaoyangna
|
3e9fcb7e71
|
xuanyuan update
|
2020-08-18 10:33:19 +08:00 |
jiaoyangna
|
92447e21a8
|
列表优化提交
|
2020-08-18 10:22:24 +08:00 |
wangzhenxing
|
98eb034cfc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-18 10:26:44 +09:00 |
wangzhenxing
|
d16361e4d1
|
纵排改为仇恨目标
|
2020-08-18 10:26:24 +09:00 |
lihaiyang
|
1974091d69
|
修改公会副本的怪物和技能id
|
2020-08-17 22:38:33 +08:00 |
lihaiyang
|
b1268b9977
|
删除军团等级限制
|
2020-08-17 20:22:32 +08:00 |
lihaiyang
|
8f475634c9
|
公会副本排行榜配置
|
2020-08-17 20:20:17 +08:00 |
lihaiyang
|
ca9043b734
|
排行榜区间配置到special表中
|
2020-08-17 20:19:50 +08:00 |
lihaiyang
|
5f95ed147b
|
关卡等级控制在65级
|
2020-08-17 19:19:52 +08:00 |
lihaiyang
|
e5cb168709
|
公会副本配置
|
2020-08-17 18:22:09 +08:00 |
lihaiyang
|
f55b1b64c3
|
工会购买挑战次数价格添加
|
2020-08-17 18:19:46 +08:00 |
lihaiyang
|
6f8aea3203
|
工会奖励配置
|
2020-08-17 18:16:45 +08:00 |
wangzhenxing
|
46ec8ef4b4
|
吸血修改,由finalDamage 改为 damage
|
2020-08-17 19:15:04 +09:00 |
gongjiawei
|
5954f92915
|
音频更新
|
2020-08-17 18:33:05 +08:00 |
lihaiyang
|
9031acef95
|
军团副本免费挑战次数
|
2020-08-17 18:13:54 +08:00 |
lihaiyang
|
0132763a3d
|
怪物表临时配置
|
2020-08-17 18:11:42 +08:00 |
lihaiyang
|
a418114850
|
添加工会副本挑战次数 id72
|
2020-08-17 18:04:34 +08:00 |
zhangqiang
|
c67951f5fb
|
公会副本资源提交
|
2020-08-17 16:19:25 +08:00 |
wangzhenxing
|
cd5f26e8af
|
完整显示多段伤害
|
2020-08-17 17:12:34 +09:00 |
zhangqiang
|
cdf78a9dcf
|
剑影仙踪资源提交
|
2020-08-17 15:59:33 +08:00 |
jiaoyangna
|
be5eff5373
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-17 15:49:02 +08:00 |
jiaoyangna
|
7ff435c765
|
xuanyuan update
|
2020-08-17 15:48:40 +08:00 |
liujiaqi
|
803a7f4797
|
开探索达人
|
2020-08-17 15:48:05 +08:00 |
jiaoyangna
|
17524007d7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-17 15:18:03 +08:00 |
jiaoyangna
|
0210dc3109
|
conflict commit
|
2020-08-17 15:17:58 +08:00 |
liujiaqi
|
9b6277f8fe
|
极速达人
|
2020-08-17 14:38:14 +08:00 |
ZhangBiao
|
77b3386efb
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-17 11:57:01 +08:00 |
ZhangBiao
|
c2fdcb06bd
|
极速达人
|
2020-08-17 11:56:38 +08:00 |
zhangqiang
|
6df142b067
|
修改bug 分解吞宝器 宝器穿的不显示属性 婚姻副本跳转 宝器合成背景隐藏
|
2020-08-17 11:39:41 +08:00 |
jl_ios
|
21ea44a475
|
导表工具完善
|
2020-08-15 16:42:55 +08:00 |
gaoxin
|
d256a6da7c
|
符号错误
|
2020-08-15 15:21:56 +08:00 |
gaoxin
|
dc1188b886
|
修复非Android和Ios版本会报错的问题
|
2020-08-15 15:20:02 +08:00 |
gaoxin
|
fcda2d9d1d
|
导表工具添加
|
2020-08-15 15:09:27 +08:00 |
jl_ios
|
7dbd376327
|
Merge branch '0功能/iOS-sdk' into master_develop
|
2020-08-15 11:45:59 +08:00 |