diff --git a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab index e1763f8a57..2e979658f2 100644 --- a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab @@ -4839,7 +4839,7 @@ ParticleSystem: --- !u!199 &199751331792092884 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9983,7 +9983,7 @@ ParticleSystem: --- !u!199 &199378756395175552 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14672,7 +14672,7 @@ ParticleSystem: --- !u!199 &199265941905233924 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -19698,7 +19698,7 @@ ParticleSystem: --- !u!199 &199262815093580326 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -24524,7 +24524,7 @@ ParticleSystem: --- !u!199 &199124944845306434 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -29441,7 +29441,7 @@ ParticleSystem: --- !u!199 &199983686832042590 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -34417,7 +34417,7 @@ ParticleSystem: --- !u!199 &199467966235450706 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -39545,7 +39545,7 @@ ParticleSystem: --- !u!199 &199106302272808156 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -44497,7 +44497,7 @@ ParticleSystem: --- !u!199 &199296089881545602 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -49410,7 +49410,7 @@ ParticleSystem: --- !u!199 &199638009383337254 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -54171,7 +54171,7 @@ ParticleSystem: --- !u!199 &199981568612824874 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -58932,7 +58932,7 @@ ParticleSystem: --- !u!199 &199088118467275108 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -63825,7 +63825,7 @@ ParticleSystem: --- !u!199 &199402197524602870 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -68660,7 +68660,7 @@ ParticleSystem: --- !u!199 &199999741332136942 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -74154,7 +74154,7 @@ ParticleSystem: --- !u!199 &199717821317809222 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -79159,7 +79159,7 @@ ParticleSystem: --- !u!199 &199919581824800930 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -84141,7 +84141,7 @@ ParticleSystem: --- !u!199 &199582716297619452 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -88967,7 +88967,7 @@ ParticleSystem: --- !u!199 &199111360589554142 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -93786,7 +93786,7 @@ ParticleSystem: --- !u!199 &199726438470990242 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -98889,7 +98889,7 @@ ParticleSystem: --- !u!199 &199454454352356604 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -99822,7 +99822,7 @@ 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: 517, y: -19} + m_AnchoredPosition: {x: 504, y: -19} m_SizeDelta: {x: 512, y: 512} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6807849340416613942 @@ -99970,7 +99970,7 @@ 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: -480, y: 31} + m_AnchoredPosition: {x: -464, y: 31} m_SizeDelta: {x: 512, y: 512} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4017456133974494767 @@ -100044,7 +100044,7 @@ 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: -520, y: -133} + m_AnchoredPosition: {x: -503, y: -133} m_SizeDelta: {x: 512, y: 512} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5769261915054795343 @@ -100118,7 +100118,7 @@ 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: 490, y: -56} + m_AnchoredPosition: {x: 472, y: -56} m_SizeDelta: {x: 512, y: 512} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6522219265209300709 diff --git a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab index a3cee72897..9a0accf51d 100644 --- a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab @@ -56224,7 +56224,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8457073949085946844 RectTransform: m_ObjectHideFlags: 0 @@ -59158,8 +59158,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -5.17, y: 5.17} - m_SizeDelta: {x: -10.34, y: -10.34} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -18, y: -18} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4392721820503069674 CanvasRenderer: @@ -62742,8 +62742,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -5, y: 5} + m_SizeDelta: {x: -10, y: -10} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1868826035819298185 CanvasRenderer: @@ -64703,8 +64703,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: 3.7, y: 2.1} - m_SizeDelta: {x: 160, y: 100} + m_AnchoredPosition: {x: 2.38, y: 8.0675} + m_SizeDelta: {x: 183.7, y: 83.865} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1042790587050974729 CanvasRenderer: @@ -64753,7 +64753,7 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 52 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 2 m_MaxSize: 52 m_Alignment: 4 @@ -82449,7 +82449,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4780999486811112876 RectTransform: m_ObjectHideFlags: 0 @@ -123699,8 +123699,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: 256.5, y: 0.000027776} - m_SizeDelta: {x: 214.9, y: 50} + m_AnchoredPosition: {x: 301, y: 0.000027776} + m_SizeDelta: {x: 304, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1375618934341764161 CanvasRenderer: @@ -123734,14 +123734,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 50 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 4 m_MaxSize: 50 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 1025 --- !u!1 &6787380787382239589 diff --git a/Assets/ManagedResources/Prefabs/UI/Expert/PatFacePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expert/PatFacePanel.prefab index 437eea562c..6333526780 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expert/PatFacePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expert/PatFacePanel.prefab @@ -25591,8 +25591,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: 1.9, y: 5.1} - m_SizeDelta: {x: 350, y: 128} + m_AnchoredPosition: {x: -0.2, y: 4.7} + m_SizeDelta: {x: 217.5, y: 73.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3712341686471216577 CanvasRenderer: @@ -25626,9 +25626,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 300 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ATMMyGuessHistoryPopup.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ATMMyGuessHistoryPopup.lua index 2dfef7230c..2ef1a65c2d 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ATMMyGuessHistoryPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ATMMyGuessHistoryPopup.lua @@ -79,11 +79,11 @@ function this.RefreshData(go, itemData) local redName = Util.GetGameObject(go, "name_2"):GetComponent("Text") local zhan = Util.GetGameObject(go, "zhan") local bai = Util.GetGameObject(go, "bai") - Util.GetGameObject(go, "bai"):GetComponent("Image").sprite = Util.LoadSprite("UI_effect_jiesuan_bai01_zh") + Util.GetGameObject(go, "bai/Image"):GetComponent("Image").sprite = Util.LoadSprite("UI_effect_JJC_JieSuan_ShiBai_png_zh")--UI_effect_jiesuan_bai01_zh") local shengOrBaiParent1 = Util.GetGameObject(go, "shengOrBaiParent1") local shengOrBaiParent2 = Util.GetGameObject(go, "shengOrBaiParent2") local sheng = Util.GetGameObject(go, "sheng") - Util.GetGameObject(go, "sheng"):GetComponent("Image").sprite = Util.LoadSprite("UI_effect_jiesuan_shengli02_zh") + Util.GetGameObject(go, "sheng/Image"):GetComponent("Image").sprite = Util.LoadSprite("UI_effect_jiesuan_shengli02_zh") local state = Util.GetGameObject(go, "state"):GetComponent("Text") local betNum = Util.GetGameObject(go, "betNum"):GetComponent("Text") local getNum = Util.GetGameObject(go, "getNum"):GetComponent("Text")