From 260f818bba2b73eeabe04eb5d39242beead69e1f Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Wed, 17 Jan 2024 11:47:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=B8=E6=B0=94=20=E7=A5=9E=E5=8D=B0?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/GodPrint/GodPrintPopUp.prefab | 41 +++++++++++-------- .../Prefabs/UI/Popup/RoleGetInfoPopup.prefab | 12 +++--- .../Prefabs/UI/Popup/SoulPrintPopUp.prefab | 35 +++++++++------- .../~Lua/Modules/GodPrint/GodPrintPopUp.lua | 2 +- .../~Lua/Modules/Popup/SoulPrintPopUp.lua | 2 +- 5 files changed, 51 insertions(+), 41 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GodPrint/GodPrintPopUp.prefab b/Assets/ManagedResources/Prefabs/UI/GodPrint/GodPrintPopUp.prefab index ba71104a3b..a2d31ec0bc 100644 --- a/Assets/ManagedResources/Prefabs/UI/GodPrint/GodPrintPopUp.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GodPrint/GodPrintPopUp.prefab @@ -1034,7 +1034,7 @@ GameObject: m_Component: - component: {fileID: 2569204043210945671} - component: {fileID: 2569204043210945665} - - component: {fileID: 2569204043210945664} + - component: {fileID: 7803910901657031901} m_Layer: 5 m_Name: warImage m_TagString: Untagged @@ -1058,8 +1058,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: -174, y: 34.799805} - m_SizeDelta: {x: 138, y: 86} + m_AnchoredPosition: {x: -153.3, y: 30.18} + m_SizeDelta: {x: 109.14, y: 63.18} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2569204043210945665 CanvasRenderer: @@ -1069,7 +1069,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2569204043210945670} m_CullTransparentMesh: 0 ---- !u!114 &2569204043210945664 +--- !u!114 &7803910901657031901 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1078,26 +1078,31 @@ MonoBehaviour: m_GameObject: {fileID: 2569204043210945670} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b688f63ae154b384ca379ac3d3b6609c, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 + m_FontData: + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 5 + m_MaxSize: 50 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u8BC4\u5206\uFF1A" --- !u!1 &2569204043259009984 GameObject: m_ObjectHideFlags: 0 @@ -1908,7 +1913,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.990566, g: 0.9889774, b: 0.98589355, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2033,7 +2038,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.9811321, g: 0.9764115, b: 0.96724814, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2331,7 +2336,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.990566, g: 0.9858001, b: 0.97654855, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab index a060fb23ef..4f89652302 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab @@ -2040,7 +2040,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 28 + m_FontSize: 26 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -2919,7 +2919,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 28 + m_FontSize: 26 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -3192,7 +3192,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 28 + m_FontSize: 26 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -3626,7 +3626,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 28 + m_FontSize: 26 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -4451,7 +4451,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 28 + m_FontSize: 26 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -5659,7 +5659,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 28 + m_FontSize: 26 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/SoulPrintPopUp.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/SoulPrintPopUp.prefab index 1007f267fa..5e55e857a9 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/SoulPrintPopUp.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/SoulPrintPopUp.prefab @@ -641,7 +641,7 @@ GameObject: m_Component: - component: {fileID: 2569204043210945671} - component: {fileID: 2569204043210945665} - - component: {fileID: 2569204043210945664} + - component: {fileID: 366997008540260071} m_Layer: 5 m_Name: warImage m_TagString: Untagged @@ -665,8 +665,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: -174, y: 34.799805} - m_SizeDelta: {x: 138, y: 86} + m_AnchoredPosition: {x: -149.7, y: 34} + m_SizeDelta: {x: 77.44, y: 63.29} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2569204043210945665 CanvasRenderer: @@ -676,7 +676,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2569204043210945670} m_CullTransparentMesh: 0 ---- !u!114 &2569204043210945664 +--- !u!114 &366997008540260071 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -685,26 +685,31 @@ MonoBehaviour: m_GameObject: {fileID: 2569204043210945670} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b688f63ae154b384ca379ac3d3b6609c, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 + m_FontData: + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 60 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u8BC4\u5206\uFF1A" --- !u!1 &2569204043259009984 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua index bb382e1b1d..f88b701d49 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua @@ -255,7 +255,7 @@ function GodPrintPopUp:RefreshShow(_type) self.lvTxt.gameObject:SetActive(equipConfig[soulId].Star>0) self.lvTxt.text="+"..equipConfig[soulId].Star self.equipInfoText.text = GetLanguageStrById(itemConfig[soulId].ItemDescribe) - self.equipQuaText.text= GetStringByEquipQua(equipConfig[soulId].Quality, GetQuaStringByEquipQua(equipConfig[soulId].Quality)) + self.equipQuaText.text= GetQuaStringByEquipQua(equipConfig[soulId].Quality) self.equipType.text= Language[11089]..GetEquipPosStrByEquipPosNum(equipConfig[soulId].Position) self.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("Bg_hz_beibao_pinjise_00"..equipConfig[soulId].Quality) self.effectbaijin:SetActive(equipConfig[soulId].Quality==7) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua index 0126dc1143..27ac0c3062 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua @@ -223,7 +223,7 @@ function SoulPrintPopUp:RefreshShow(type) self.circleFrame.sprite = self.spLoader:LoadSprite(SoulPrintSpriteByQuantity[itemConfig[soulId].Quantity].circle) self.powerNum.text = equipConfig[soulId].Score--战力 self.equipInfoText.text = GetLanguageStrById(itemConfig[soulId].ItemDescribe) - self.equipQuaText.text= GetStringByEquipQua(equipConfig[soulId].Quality, GetQuaStringByEquipQua(equipConfig[soulId].Quality)) + self.equipQuaText.text= GetQuaStringByEquipQua(equipConfig[soulId].Quality) self.equipType.text= Language[11089]..GetEquipPosStrByEquipPosNum(equipConfig[soulId].Position) self.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("Bg_hz_beibao_pinjise_00"..equipConfig[soulId].Quality) self.effectbaijin:SetActive(equipConfig[soulId].Quality==7)