diff --git a/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab b/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab index 56eda410f1..f967466ac5 100644 --- a/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab @@ -539,6 +539,7 @@ GameObject: - component: {fileID: 360998003311274107} - component: {fileID: 362241511279985437} - component: {fileID: 3909683961332466234} + - component: {fileID: 4112480267321677873} m_Layer: 5 m_Name: titleText m_TagString: Untagged @@ -562,7 +563,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: -2.7, y: 595} + m_AnchoredPosition: {x: 0, y: 592} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &362241511279985437 @@ -595,10 +596,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 50 + m_FontSize: 42 m_FontStyle: 2 m_BestFit: 0 - m_MinSize: 5 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 @@ -608,6 +609,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5F00\u670D\u798F\u5229" LanguageIndex: 0 +--- !u!114 &4112480267321677873 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 439712149449196651} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &439932659696406613 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMChangePanel.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMChangePanel.prefab index 9680011b11..c1bf03c526 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMChangePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMChangePanel.prefab @@ -153,7 +153,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: 15, y: 578} + m_AnchoredPosition: {x: 0, y: 578} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &319057116 @@ -186,7 +186,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 48 + m_FontSize: 42 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 4 diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMSong10WanPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMSong10WanPanel.prefab index 35a4e0d3f9..2264c83174 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMSong10WanPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMSong10WanPanel.prefab @@ -901,7 +901,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: 60.8, y: -81} + m_AnchoredPosition: {x: 0, y: -81} m_SizeDelta: {x: 889.5, y: 1463.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2083260476 @@ -1635,7 +1635,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: 12.1, y: 264} + m_AnchoredPosition: {x: 0, y: 264} m_SizeDelta: {x: 776.5, y: 56.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5496272257055034553 @@ -2439,7 +2439,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: -101, y: 689} + m_AnchoredPosition: {x: -89, y: 689} m_SizeDelta: {x: 750, y: 71} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2179404046346611410 @@ -2588,7 +2588,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: 182, y: 1} + m_AnchoredPosition: {x: 126, y: 1} m_SizeDelta: {x: 300, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6934366467833337042 @@ -2621,7 +2621,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 45 + m_FontSize: 42 m_FontStyle: 2 m_BestFit: 0 m_MinSize: 3 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 94544b3299..c6bec248c3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -152,7 +152,7 @@ function this:InitComponent() this.btnGMChange=Util.GetGameObject(self.gameObject,"RightDown/btnGMChange") Util.GetGameObject(this.btnGMChange,"redPoint"):SetActive(false) this.gmEffect=Util.GetGameObject(self.gameObject,"RightDown/btnGMChange/UI_Effect_jinkuang_Yuan") - Util.GetGameObject(this.btnGMChange,"Image"):GetComponent("Image").sprite=this.spLoader:LoadSprite("gm_change_maincity_btn_zh") + Util.GetGameObject(this.btnGMChange,"Image"):GetComponent("Image").sprite=this.spLoader:LoadSprite("UI_hz_zhonghe05_108") this.btnHotRank=Util.GetGameObject(self.gameObject,"RightDown/btnHotRank") this.hrRedPoint = Util.GetGameObject(this.btnHotRank,"redPoint") this.btnGMChange:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua index 5acec7d231..36ba61b7c8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua @@ -111,7 +111,7 @@ function GMChangePanel:ShowTopInfo() end end end - this.gmIcon.sprite=this.spLoader:LoadSprite(icons[index]) + --this.gmIcon.sprite=this.spLoader:LoadSprite(icons[index]) local privile=ConfigManager.GetConfigData(ConfigName.PrivilegeTypeConfig,2101) if privile then maxnum=privile.Condition[index][2]