zhangqiang
|
40bc0cef59
|
漏提
|
2020-08-21 18:24:16 +08:00 |
zhangqiang
|
0759809be9
|
公会副本提交
|
2020-08-21 18:22:53 +08:00 |
ZhangBiao
|
3e35b2bbff
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-21 16:39:47 +08:00 |
ZhangBiao
|
9e60a7eb1c
|
leijichonghzi data commit
|
2020-08-21 16:39:30 +08:00 |
zhangqiang
|
b725617a8d
|
公会副本提交
|
2020-08-21 15:52:49 +08:00 |
wangzhenxing
|
9a7b7c8eff
|
被动108 改为自身死亡后就不会反弹伤害
|
2020-08-21 15:59:34 +09:00 |
wangzhenxing
|
0f71f295d2
|
被动最佳技能添加类型判断,如果可以触发其他被动就赋成绝技类型,否是附加类型
|
2020-08-21 15:49:42 +09:00 |
liujiaqi
|
1c577e94fe
|
法宝新资源
|
2020-08-21 14:56:38 +08:00 |
ZhangBiao
|
54f285807b
|
代码调整
|
2020-08-21 14:42:36 +08:00 |
ZhangBiao
|
7ae97fdff0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-21 11:24:02 +08:00 |
ZhangBiao
|
b8a8a3980c
|
限时商市 珍奇宝阁
|
2020-08-21 11:23:46 +08:00 |
zhangqiang
|
c08c537b16
|
公会副本提交
|
2020-08-20 20:05:38 +08:00 |
ZhangBiao
|
aa551923b1
|
破阵诛仙 珍奇宝阁
|
2020-08-20 18:32:14 +08:00 |
ZhangBiao
|
f2ab07cb43
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-20 18:08:05 +08:00 |
ZhangBiao
|
7ce2e1423a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# data_execl/base_data/GlobalActivity.xlsx
|
2020-08-20 18:07:59 +08:00 |
ZhangBiao
|
84a0618197
|
珍奇宝阁,限时商市,累计充值 表格提交
|
2020-08-20 18:07:07 +08:00 |
jiaoyangna
|
948f47398c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-20 17:36:31 +08:00 |
jiaoyangna
|
6b0af3d7fb
|
pozhenzhuxian commit
|
2020-08-20 17:36:19 +08:00 |
wangzhenxing
|
dc77526a67
|
把死亡人数检测放到最后检测,防止有些有复活技能无法触发
|
2020-08-20 18:07:08 +09:00 |
ZhangBiao
|
ac6a587466
|
|
2020-08-20 17:04:34 +08:00 |
jiaoyangna
|
6c52db4ec6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-20 16:08:18 +08:00 |
jiaoyangna
|
2eaa10cdbc
|
添加红点
|
2020-08-20 16:08:12 +08:00 |
wangzhenxing
|
9aec289306
|
添加新被动242,243 技能概率追加技能,击杀追加技能
|
2020-08-20 16:54:03 +09:00 |
ZhangBiao
|
b650ba81e8
|
界面顺序调整
(cherry picked from commit d47708cc41ecf75dd8aba813449c9e20e492b5e5)
|
2020-08-20 16:48:30 +08:00 |
ZhangBiao
|
4f43a2513a
|
Revert ""
This reverts commit 6be5ebd2cd .
|
2020-08-20 15:09:40 +08:00 |
ZhangBiao
|
6be5ebd2cd
|
|
2020-08-20 15:08:22 +08:00 |
ZhangBiao
|
b01a3f31f9
|
Merge branch '0副本/副本原版留存' into master_develop
# Conflicts:
# data_execl/base_data/MonsterConfig.xlsx
# data_execl/base_data/MonsterGroup.xlsx
|
2020-08-20 15:00:23 +08:00 |
ZhangBiao
|
17465d2f3d
|
|
2020-08-20 14:56:29 +08:00 |
ZhangBiao
|
e9b8083148
|
|
2020-08-20 14:43:48 +08:00 |
ZhangBiao
|
f93c57fd31
|
副本快结束啦!
|
2020-08-19 20:57:04 +08:00 |
jiaoyangna
|
d1a4bff97e
|
chengjiu update
|
2020-08-19 20:10:48 +08:00 |
jiaoyangna
|
785590bd4f
|
五星成长礼提交
|
2020-08-19 22:11:48 +08:00 |
jiaoyangna
|
fa1f5a7c35
|
五星成长礼提交
|
2020-08-19 22:03:47 +08:00 |
ZhangBiao
|
f9ffc1aa39
|
无尽细节修改
|
2020-08-19 19:37:59 +08:00 |
zhangqiang
|
869481a2cd
|
公会副本部分提交
|
2020-08-19 17:28:17 +08:00 |
ZhangBiao
|
32eadd13ef
|
试炼
|
2020-08-19 17:18:38 +08:00 |
lihaiyang
|
974aada991
|
公会副本解锁时候复制主线阵容
|
2020-08-19 17:14:09 +08:00 |
lihaiyang
|
41d7d849b6
|
公会购买次数配置特权
|
2020-08-19 15:26:06 +08:00 |
liujiaqi
|
87141ee852
|
新法宝资源
|
2020-08-19 14:23:59 +08:00 |
jiaoyangna
|
60095d336d
|
qinglongserect commit
|
2020-08-19 14:12:42 +08:00 |
ZhangBiao
|
2f6042154b
|
|
2020-08-19 10:16:52 +08:00 |
jiaoyangna
|
f439a78b34
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-19 10:05:09 +08:00 |
jiaoyangna
|
4e1236de8c
|
qinglongserecttreasure commit
|
2020-08-19 10:05:01 +08:00 |
ZhangBiao
|
7e4b73dc27
|
两个副本,基本成型了
|
2020-08-18 21:03:55 +08:00 |
liujiaqi
|
911d3fabf9
|
新英雄资源及技能名称资源替换
|
2020-08-18 20:35:51 +08:00 |
lihaiyang
|
6b3697ccad
|
添加公会排行榜邮件
|
2020-08-18 20:18:12 +08:00 |
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 |