gaoxin
|
df08c8c159
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 16:22:04 +08:00 |
lihaiyang
|
a5f15a4861
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-25 00:39:20 +08:00 |
lihaiyang
|
ce27636de3
|
破阵诛仙累充
破阵诛仙任务
破阵诛仙限时商市
破阵诛仙珍奇宝阁
修改为开服第二周开启,暂时跟随前面的配置
戒灵秘宝
戒灵秘宝
配置为22号开启
|
2020-08-25 00:36:17 +08:00 |
gaoxin
|
af532fce6e
|
海外相关修改合并
|
2020-08-22 16:19:50 +08:00 |
jiaoyangna
|
3a16bedd0d
|
qinglong update
|
2020-08-22 15:48:01 +08:00 |
jiaoyangna
|
9395df5406
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-22 15:43:53 +08:00 |
jiaoyangna
|
f0f8a5d69e
|
qinglong update
|
2020-08-22 15:42:07 +08:00 |
jiaoyangna
|
98e9b9757e
|
huodong commit
|
2020-08-29 13:46:08 +08:00 |
zhangqiang
|
9aec7d16e8
|
公会副本提交
|
2020-08-22 15:34:02 +08:00 |
zhangqiang
|
e1b223e83f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# data_execl/base_data/ItemConfig.xlsx
# data_execl/base_data/MonsterConfig.xlsx
# data_execl/base_data/PrivilegeTypeConfig.xlsx
# data_execl/base_data/RewardGroup.xlsx
# data_execl/base_data/RewardItemConfig.xlsx
# data_execl/base_data/SpecialConfig.xlsx
# data_execl/base_data/StoreConfig.xlsx
# data_execl/base_data/UIConfig.xlsx
|
2020-08-22 13:59:35 +08:00 |
zhangqiang
|
b279baaa41
|
公会副本提交
|
2020-08-22 13:49:47 +08:00 |
ZhangBiao
|
8391f5638f
|
破阵诛仙 通天教主替换资源
|
2020-08-22 10:20:41 +08:00 |
ZhangBiao
|
7f0d404e5d
|
添加一键购买、礼包界面计时器销毁
|
2020-08-22 10:09:30 +08:00 |
ZhangBiao
|
1a826a3f3e
|
累计充值
|
2020-08-21 20:11:24 +08:00 |
zhangqiang
|
4ed5ba896a
|
公会副本号角
|
2020-08-21 19:09:33 +08:00 |
ZhangBiao
|
52dda5ff47
|
青龙入口 破阵长度
|
2020-08-21 19:03:41 +08:00 |
ZhangBiao
|
3530600553
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-21 18:56:12 +08:00 |
jiaoyangna
|
cbd8b9c084
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 18:33:09 +08:00 |
jiaoyangna
|
2646f9418a
|
|
2020-08-28 18:32:59 +08:00 |
jiaoyangna
|
7592690072
|
|
2020-08-28 18:07:50 +08:00 |
jiaoyangna
|
b9cc475e6d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 17:47:02 +08:00 |
jiaoyangna
|
8c17479fd6
|
破阵诛仙活动 调整
|
2020-08-28 17:46:07 +08:00 |
jiaoyangna
|
14e58ae443
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 16:37:01 +08:00 |
jiaoyangna
|
3bb8e284d9
|
破阵诛仙
|
2020-08-28 16:36:08 +08:00 |
jiaoyangna
|
66556e506a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-28 11:33:24 +08:00 |
jiaoyangna
|
22de98dc18
|
commit
|
2020-08-28 11:31:38 +08:00 |
jiaoyangna
|
e4a9c5c614
|
qinglong update
|
2020-08-28 11:05:31 +08:00 |
ZhangBiao
|
baaee2e547
|
|
2020-08-21 18:56:00 +08:00 |
ZhangBiao
|
bbe2c8c1f3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-21 18:30:50 +08:00 |
ZhangBiao
|
7058d73193
|
破阵诛仙 提交
|
2020-08-21 18:30:44 +08:00 |
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 |