From 1b50141b2843bcbcf45d79e5ac2aa73799ddc741 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Thu, 22 Feb 2024 15:17:44 +0800 Subject: [PATCH] =?UTF-8?q?gm=E4=BF=AE=E6=94=B9=E5=99=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Battle/BattlePanel.prefab | 18 +++++++++--------- .../Prefabs/UI/GMPanel/GMChangePanel.prefab | 2 +- .../~Lua/Modules/Operating/GMChangePanel.lua | 5 ++++- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index e936b77f40..61af42baa9 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -26314,7 +26314,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 134, y: 136} + m_SizeDelta: {x: 182, y: 174.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &211998747 CanvasRenderer: @@ -34018,10 +34018,10 @@ RectTransform: m_Father: {fileID: 954781532} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -1029, y: 1545} - m_SizeDelta: {x: 100, y: 487.8} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 51, y: -307} + m_SizeDelta: {x: 100, y: 487.80005} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8374736667363694714 MonoBehaviour: @@ -80418,9 +80418,9 @@ RectTransform: m_Father: {fileID: 1966515042} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 975, y: -133} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -105, y: -62} m_SizeDelta: {x: 100, y: 487.8} m_Pivot: {x: 0, y: 1} --- !u!114 &6042414525279627023 @@ -82229,7 +82229,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 140, y: 140} + m_SizeDelta: {x: 120, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2874419575038100771 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMChangePanel.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMChangePanel.prefab index c1bf03c526..24f9cf81e4 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMChangePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMChangePanel.prefab @@ -3060,7 +3060,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua index 36ba61b7c8..64f645c9ac 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua @@ -5,7 +5,7 @@ local GMInfo=ConfigManager.GetConfig(ConfigName.GMInfo) local GMMaster=ConfigManager.GetConfig(ConfigName.GMMaster) local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) local rechargeCommodityConfig=ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig) -local icons={"gm_shuachong_scGM_02_zh","gm_shuachong_cjGM_02_zh","gm_shuachong_sjGM_02_zh","gm_shuachong_wsGM_02_zh"} +local icons={"普通特权","超级特权","神级特权","无上特权"} local sortingOrder = 0 local isFirst=true local curBtn=nil @@ -19,6 +19,7 @@ function GMChangePanel:InitComponent() this.addTxt=Util.GetGameObject(self.gameObject, "layout/top/value2"):GetComponent("Text") this.btn_add=Util.GetGameObject(self.gameObject, "layout/top/btn_chong") this.gmIcon=Util.GetGameObject(self.gameObject, "layout/top/Image"):GetComponent("Image") + this.gmTxt=Util.GetGameObject(self.gameObject, "layout/top/Image/Image/Text"):GetComponent("Text") this.btn_up=Util.GetGameObject(self.gameObject, "layout/top/btn_up") this.progress=Util.GetGameObject(self.gameObject, "layout/top/progress") this.progressTxt=Util.GetGameObject(self.gameObject, "layout/top/progress/value"):GetComponent("Text") @@ -105,6 +106,7 @@ function GMChangePanel:ShowTopInfo() local missions=ActivityGiftManager.GetActivityInfoByType(ActivityTypeDef.shuaChongTeQuan).mission local index=1 if missions then + LogError("#missions=========================="..#missions) for i = 1, #missions do if missions[i].state~=0 then index=i @@ -112,6 +114,7 @@ function GMChangePanel:ShowTopInfo() end end --this.gmIcon.sprite=this.spLoader:LoadSprite(icons[index]) + this.gmTxt.text=icons[index] local privile=ConfigManager.GetConfigData(ConfigName.PrivilegeTypeConfig,2101) if privile then maxnum=privile.Condition[index][2]