From 3b06a6aede6daecbb32401d938205d869e3905e7 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Mon, 15 Jan 2024 17:01:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E7=9B=B8=E8=AF=A6=E6=83=85=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RewardTalismanSingleShowPopup2.prefab | 63 ++++++++++--------- .../Popup/RewardTalismanSingleShowPopup2.lua | 4 +- 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup2.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup2.prefab index 2e9bd26217..f1210262c3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup2.prefab @@ -210,7 +210,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 m_SortingLayerID: 0 - m_SortingOrder: 0 + m_SortingOrder: 200 m_TargetDisplay: 0 --- !u!114 &323580604260708879 MonoBehaviour: @@ -2001,7 +2001,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -35.2, y: -15} + m_AnchoredPosition: {x: -35.199997, y: -15} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4006395159395324770 @@ -2155,7 +2155,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 467.50003, y: 0} + m_AnchoredPosition: {x: 467.5, y: 0} m_SizeDelta: {x: 875, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1821127820560671879 @@ -3313,8 +3313,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: 166.07, y: 34} - m_SizeDelta: {x: 734.83, y: 30} + m_AnchoredPosition: {x: 135, y: 34} + m_SizeDelta: {x: 604.8, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8023241171678285426 CanvasRenderer: @@ -3345,17 +3345,17 @@ 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: 634137158f07dff488d018d707aa403a, type: 2} - m_FontSize: 0 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 - m_MaxSize: 40 + m_MaxSize: 50 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 86685 --- !u!114 &2195797781509412881 @@ -3365,7 +3365,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5114980906403964641} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} m_Name: @@ -4261,7 +4261,7 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 50 - m_FontStyle: 0 + m_FontStyle: 2 m_BestFit: 0 m_MinSize: 4 m_MaxSize: 50 @@ -4283,7 +4283,7 @@ GameObject: m_Component: - component: {fileID: 662623705748646040} - component: {fileID: 2533878072398287922} - - component: {fileID: 1206320692568682144} + - component: {fileID: 3023291623794891906} m_Layer: 5 m_Name: warImage m_TagString: Untagged @@ -4307,8 +4307,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: -175.81, y: 34.000008} + m_SizeDelta: {x: 88.38, y: 45.49} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2533878072398287922 CanvasRenderer: @@ -4318,7 +4318,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6391301374764562366} m_CullTransparentMesh: 0 ---- !u!114 &1206320692568682144 +--- !u!114 &3023291623794891906 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4327,26 +4327,31 @@ MonoBehaviour: m_GameObject: {fileID: 6391301374764562366} 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: 3 + m_MaxSize: 50 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u8BC4\u5206\uFF1A" --- !u!1 &6396212611413063840 GameObject: m_ObjectHideFlags: 0 @@ -5190,7 +5195,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -0.000015162148} + m_AnchoredPosition: {x: 0, y: -0.00005255246} m_SizeDelta: {x: 905, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &22196219189311584 @@ -5264,7 +5269,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -35.2, y: -15} + m_AnchoredPosition: {x: -35.199997, y: -15} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3631761058427521969 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua index d8c601c664..2b3c422b01 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua @@ -319,9 +319,9 @@ function RewardTalismanSingleShowPopup2:OnShow() --装备描述 self.equipInfoText.text = GetLanguageStrById(itemConfigData.ItemDescribe) --品质 - self.equipQuaText.text = GetStringByEquipQua(itemConfigData.Quantity,GetQuaStringByEquipQua(itemConfigData.Quantity)) + self.equipQuaText.text =GetQuaStringByEquipQua(itemConfigData.Quantity)-- GetStringByEquipQua(itemConfigData.Quantity,GetQuaStringByEquipQua(itemConfigData.Quantity)) --装备名称 - self.eqiopName.text=GetStringByEquipQua(itemConfigData.Quantity,GetLanguageStrById(itemConfigData.Name)) + self.eqiopName.text=GetLanguageStrById(itemConfigData.Name) --上方底图 self.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("Bg_hz_beibao_pinjise_00"..itemConfigData.Quantity) --计算战力