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

dev_chengFeng
jiaoyangna 2022-01-07 13:43:37 +08:00
commit 2c5f9c5473
2 changed files with 15 additions and 14 deletions

View File

@ -3814,7 +3814,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &8801044181696536146 --- !u!224 &8801044181696536146
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -4190,10 +4190,10 @@ RectTransform:
m_Father: {fileID: 4322729524025985070} m_Father: {fileID: 4322729524025985070}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 325, y: -55} m_AnchoredPosition: {x: 325, y: 0}
m_SizeDelta: {x: 650, y: 70} m_SizeDelta: {x: 650, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1499828341711153185 --- !u!114 &1499828341711153185
MonoBehaviour: MonoBehaviour:
@ -19620,9 +19620,9 @@ RectTransform:
m_Father: {fileID: 4322729524025985070} m_Father: {fileID: 4322729524025985070}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 325, y: -132} m_AnchoredPosition: {x: 325, y: 0}
m_SizeDelta: {x: 650, y: 0} m_SizeDelta: {x: 650, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4252301830560688640 --- !u!114 &4252301830560688640
@ -23498,10 +23498,10 @@ RectTransform:
m_Father: {fileID: 4322729524025985070} m_Father: {fileID: 4322729524025985070}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 325, y: -111} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 580, y: 2} m_SizeDelta: {x: 580, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1365824058889495408 --- !u!222 &1365824058889495408
CanvasRenderer: CanvasRenderer:
@ -23714,7 +23714,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 148, y: 81} m_AnchoredPosition: {x: 148, y: 81}
m_SizeDelta: {x: 650, y: 182} m_SizeDelta: {x: 650, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7396113761718134804 --- !u!222 &7396113761718134804
CanvasRenderer: CanvasRenderer:

View File

@ -126,13 +126,14 @@ function Practice:BindEvent()
UIManager.OpenPanel(UIName.FightLevelChapterPanel) UIManager.OpenPanel(UIName.FightLevelChapterPanel)
end) end)
Util.AddClick(self.button, function() Util.AddClick(self.button, function()
if self:UpgradeCheck() then return end if self:UpgradeCheck() then return end
if not self.curLevelConfig.LevelUpCost then--如果是破镜阶段 if not self.curLevelConfig.LevelUpCost then--如果是破镜阶段
self.mask:SetActive(true) self.mask:SetActive(true)
self.fx_ui_xiuxingshengxin_01:SetActive(true) self.fx_ui_xiuxingshengxin_01:SetActive(true)
if self.pointList and #self.pointList > 0 then if self.pointList and #self.pointList > 0 then
for i = 1, #self.pointList do for i = 1, #self.pointList do
Util.GetGameObject(self.pointList[i],"looping"):SetActive(false) Util.GetGameObject(self.pointList[i],"looping"):SetActive(false)
self.pointList[i]:GetComponent("Image").color = Color.New(1,1,1,1)
end end
end end
Timer.New(function () Timer.New(function ()