diff --git a/Assets/ManagedResources/ArtFont_vi/s_shop_shop_vi.png b/Assets/ManagedResources/ArtFont_vi/s_shop_shop_vi.png index ed19b37c46..29af19a561 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/s_shop_shop_vi.png and b/Assets/ManagedResources/ArtFont_vi/s_shop_shop_vi.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyBossPopup.prefab b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyBossPopup.prefab index fe679965be..754e194fed 100644 --- a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyBossPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyBossPopup.prefab @@ -206,6 +206,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1475120091422015330} + - {fileID: 7797857577976584434} - {fileID: 130060101533686417} - {fileID: 2700222768937658443} - {fileID: 4107591401879039839} @@ -329,7 +330,6 @@ RectTransform: - {fileID: 4276829474227143814} - {fileID: 4676225956264609679} - {fileID: 1573761868660145790} - - {fileID: 7797857577976584434} m_Father: {fileID: 7920936004859207622} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1090,7 +1090,7 @@ RectTransform: - {fileID: 8027812953909120337} - {fileID: 56022171868789839} m_Father: {fileID: 7555683376229264185} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 10} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1315,7 +1315,7 @@ RectTransform: m_Children: - {fileID: 7657352103914167475} m_Father: {fileID: 7555683376229264185} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2109,7 +2109,7 @@ RectTransform: m_Children: - {fileID: 7912490698841947553} m_Father: {fileID: 7555683376229264185} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2182,12 +2182,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1346270003324202311} - m_RootOrder: 5 + m_Father: {fileID: 7555683376229264185} + m_RootOrder: 1 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: -0.53, y: -383.38} + m_AnchoredPosition: {x: -0.53, y: -383.18} m_SizeDelta: {x: 903.74, y: 188} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1802398284509029411 @@ -2552,7 +2552,7 @@ RectTransform: - {fileID: 4227166638646970797} - {fileID: 2066454705874325479} m_Father: {fileID: 7555683376229264185} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2645,7 +2645,7 @@ RectTransform: - {fileID: 6785485563758215467} - {fileID: 5562965766551207654} m_Father: {fileID: 7555683376229264185} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2780,7 +2780,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7555683376229264185} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2861,7 +2861,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7555683376229264185} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoYouPanel.prefab b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoYouPanel.prefab index f391d64a7c..f47260b732 100644 --- a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoYouPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoYouPanel.prefab @@ -14378,8 +14378,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 70, y: 90} - m_SizeDelta: {x: 140, y: 121} + m_AnchoredPosition: {x: 57.5, y: 90} + m_SizeDelta: {x: 116, y: 121} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4266711045581207608 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua index 3bb38ba635..a18571df4f 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua @@ -167,7 +167,7 @@ function this.SingleDataShow(btn, go, data, index) -- lock:SetActive(not data.isUnLock) name.text = GetLanguageStrById(data.mapName) - SetTextVerTial(name.gameObject, Vector3.New(99, 22, 0), "MiddleLeft") + --SetTextVerTial(name.gameObject, Vector3.New(99, 22, 0), "MiddleLeft") if data.isUnLock then redPoint:SetActive(XiaoYaoManager.CheckRedPoint(data.mapId)) Util.SetGray(go, false) @@ -202,7 +202,7 @@ function this.SingleDataShow(btn, go, data, index) num.text = Language[13024] end end - SetTextVerTial(num.gameObject, Vector3.New(17.5, 6.5, 0), "MiddleLeft") + --SetTextVerTial(num.gameObject, Vector3.New(17.5, 6.5, 0), "MiddleLeft") -- fightIcon.sprite=this.spLoader:LoadSprite(data.mapImage) zi.sprite = this.spLoader:LoadSprite(data.ziImage) -- local prog=data.progress < 100 and data.progress or 0