Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
ZhangBiao 2021-05-27 10:04:08 +08:00
commit e0a5d6d134
3 changed files with 7 additions and 3 deletions

View File

@ -682,8 +682,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 24.493, y: 1}
m_SizeDelta: {x: 785.42, y: 21.2}
m_AnchoredPosition: {x: -0.00099754, y: 1}
m_SizeDelta: {x: 736.43, y: 21.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1327947703286240706
CanvasRenderer:
@ -718,7 +718,7 @@ MonoBehaviour:
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 0
m_FillAmount: 0.66
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0

View File

@ -1004,6 +1004,7 @@ JumpType = {
CompoundHero = 78,--神将合成、置换
Pokemon = 79,--灵兽山
HongMengZhen = 86,-- 鸿蒙阵
FightLevel = 107,-- 山河社稷图
BuyVigor = 10000, --体力购买

View File

@ -637,6 +637,9 @@ local jumpDic = {
[JumpType.XingChenShangDian] = function (data)
this.JumpActivity(JumpType.XingChenShangDian,data[1])
end,
[JumpType.FightLevel] = function (data)
UIManager.OpenPanel(UIName.FightLevelChapterPanel)
end,
}
function this.JumpActivity(data,skipfactor)