dev_chengFeng
zhangqiang 2020-09-02 18:27:03 +08:00
parent 2b33e3859b
commit 4c000c6cb3
3 changed files with 29504 additions and 29427 deletions

View File

@ -913,7 +913,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 504, y: -466.99} m_AnchoredPosition: {x: 504, y: -466.99005}
m_SizeDelta: {x: 4, y: -1373.34} m_SizeDelta: {x: 4, y: -1373.34}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &173035024539309245 --- !u!222 &173035024539309245
@ -1379,7 +1379,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0.0083923, y: -492.34863} m_AnchoredPosition: {x: 0.0083923, y: -492.3487}
m_SizeDelta: {x: 929.85, y: -1322.6} m_SizeDelta: {x: 929.85, y: -1322.6}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &173035024914206083 --- !u!222 &173035024914206083
@ -3829,7 +3829,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0.0083923, y: -348.4004} m_AnchoredPosition: {x: 0.0083923, y: -348.40045}
m_SizeDelta: {x: 929.85, y: -1177} m_SizeDelta: {x: 929.85, y: -1177}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6194927168383836729 --- !u!222 &6194927168383836729
@ -9915,7 +9915,7 @@ RectTransform:
m_GameObject: {fileID: 995251634560491521} m_GameObject: {fileID: 995251634560491521}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1.1, y: 1.1, z: 1}
m_Children: m_Children:
- {fileID: 1068230877970663819} - {fileID: 1068230877970663819}
- {fileID: 5199556423600505248} - {fileID: 5199556423600505248}
@ -12032,7 +12032,7 @@ RectTransform:
m_GameObject: {fileID: 1971588861962642612} m_GameObject: {fileID: 1971588861962642612}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1.1, y: 1.1, z: 1}
m_Children: m_Children:
- {fileID: 7328945178204686472} - {fileID: 7328945178204686472}
- {fileID: 1368575800441111279} - {fileID: 1368575800441111279}
@ -14977,7 +14977,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0.0083923, y: -408} m_AnchoredPosition: {x: 0.0083923, y: -408.00006}
m_SizeDelta: {x: 929.85, y: -1017.5} m_SizeDelta: {x: 929.85, y: -1017.5}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7287690149934656752 --- !u!222 &7287690149934656752
@ -25375,7 +25375,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 532, y: -353.13965} m_AnchoredPosition: {x: 532, y: -353.1397}
m_SizeDelta: {x: 6, y: -1216.2} m_SizeDelta: {x: 6, y: -1216.2}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1117989593625853423 --- !u!222 &1117989593625853423
@ -27779,7 +27779,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 507.50006, y: -353.79004} m_AnchoredPosition: {x: 507.50006, y: -353.7901}
m_SizeDelta: {x: 6, y: -1214.89} m_SizeDelta: {x: 6, y: -1214.89}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &266827119730822412 --- !u!222 &266827119730822412
@ -36430,7 +36430,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 507.50006, y: -364} m_AnchoredPosition: {x: 507.50006, y: -364.00006}
m_SizeDelta: {x: 6, y: -1065.95} m_SizeDelta: {x: 6, y: -1065.95}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5697768870323344403 --- !u!222 &5697768870323344403
@ -36735,7 +36735,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0.0083923, y: -348.4004} m_AnchoredPosition: {x: 0.0083923, y: -348.40045}
m_SizeDelta: {x: 929.85, y: -1177} m_SizeDelta: {x: 929.85, y: -1177}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2612244264290486243 --- !u!222 &2612244264290486243

View File

@ -36,7 +36,7 @@ function ExpeditionMainPanel:InitComponent()
self.gridMaskImage = Util.GetGameObject(self.gameObject, "rect/grid/mask/Image"):GetComponent("RectTransform") self.gridMaskImage = Util.GetGameObject(self.gameObject, "rect/grid/mask/Image"):GetComponent("RectTransform")
self.bg1 = Util.GetGameObject(self.gameObject, "bg/bg (1)") self.bg1 = Util.GetGameObject(self.gameObject, "bg/bg (1)")
self.bg2 = Util.GetGameObject(self.gameObject, "bg/bg (2)") self.bg2 = Util.GetGameObject(self.gameObject, "bg/bg (2)")
self.backBtn = Util.GetGameObject(self.parent, "lowGO/btnBack") self.backBtn = Util.GetGameObject(self.gameObject, "btnBackParent/btnBack")
self.Btn1 = Util.GetGameObject(self.parent, "lowGO/Btn1") self.Btn1 = Util.GetGameObject(self.parent, "lowGO/Btn1")
self.Btn2 = Util.GetGameObject(self.parent, "lowGO/Btn2") self.Btn2 = Util.GetGameObject(self.parent, "lowGO/Btn2")
self.Btn3 = Util.GetGameObject(self.parent, "lowGO/Btn3") self.Btn3 = Util.GetGameObject(self.parent, "lowGO/Btn3")
@ -167,6 +167,7 @@ end
function ExpeditionMainPanel:OnSortingOrderChange() function ExpeditionMainPanel:OnSortingOrderChange()
self.gridMask:GetComponent("Canvas").sortingOrder = self.sortingOrder + 1 self.gridMask:GetComponent("Canvas").sortingOrder = self.sortingOrder + 1
self.parent:GetComponent("Canvas").sortingOrder = self.sortingOrder + 20 self.parent:GetComponent("Canvas").sortingOrder = self.sortingOrder + 20
Util.GetGameObject(self.gameObject, "btnBackParent"):GetComponent("Canvas").sortingOrder = self.sortingOrder + 21
self.UI_Effect_ChuanSongMen_LanSeBtn:GetComponent("Canvas").sortingOrder = self.sortingOrder + 10 self.UI_Effect_ChuanSongMen_LanSeBtn:GetComponent("Canvas").sortingOrder = self.sortingOrder + 10
self.UI_Effect_ChuanSongMen_JinSeBtn:GetComponent("Canvas").sortingOrder = self.sortingOrder + 10 self.UI_Effect_ChuanSongMen_JinSeBtn:GetComponent("Canvas").sortingOrder = self.sortingOrder + 10