From 2e518db90e762626a23651ccbe5c51801e1e9228 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Mon, 22 Jan 2024 19:03:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=95=8C=E9=9D=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Popup/RewardTailsmanChipShowPopup.prefab | 170 ++++++++++++++---- .../Popup/RewardTailsmanChipShowPopup.lua | 6 +- 2 files changed, 136 insertions(+), 40 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTailsmanChipShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTailsmanChipShowPopup.prefab index ac799d4c59..7291f188ac 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTailsmanChipShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTailsmanChipShowPopup.prefab @@ -144,7 +144,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.6792453, g: 0.40967014, b: 0.14417945, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -152,7 +152,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: 34 m_FontStyle: 0 m_BestFit: 0 @@ -224,7 +224,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.6792453, g: 0.40967014, b: 0.14417945, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -232,7 +232,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: 34 m_FontStyle: 0 m_BestFit: 0 @@ -446,8 +446,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: bd924e4cc5106cc4d9954033f40bb316, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: d93ad50a8a319c44c887d7e7743089a7, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -568,6 +568,80 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &1929993521001645928 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1642184620074367834} + - component: {fileID: 5225504746995189278} + - component: {fileID: 8068461201563231928} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1642184620074367834 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1929993521001645928} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5509733079217669299} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 28, y: -32} + m_SizeDelta: {x: 61, y: 65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5225504746995189278 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1929993521001645928} + m_CullTransparentMesh: 0 +--- !u!114 &8068461201563231928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1929993521001645928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + 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: 605a8c08b14ed4d47a762484c22b6dd9, 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 --- !u!1 &2536559242930971238 GameObject: m_ObjectHideFlags: 0 @@ -628,7 +702,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.8490566, g: 0.45689204, b: 0.07609467, a: 0.88235295} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -636,7 +710,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: 36 m_FontStyle: 0 m_BestFit: 0 @@ -893,7 +967,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.9716981, g: 0.96078944, b: 0.93961376, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -901,7 +975,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 @@ -933,7 +1007,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3535724585431877029 RectTransform: m_ObjectHideFlags: 0 @@ -1394,7 +1468,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 911.109, y: 70} + m_SizeDelta: {x: 918.05, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7108203465756532978 CanvasRenderer: @@ -1424,8 +1498,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b44f71f84aa20084a9ed3a8ef44c483c, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: a40c39d20c3dbcb419e836a687d8dcdd, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1491,7 +1565,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.92549026, g: 0.8588236, b: 0.74509805, a: 1} + m_Color: {r: 0.9811321, g: 0.9760011, b: 0.96724814, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1499,7 +1573,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: 50 m_FontStyle: 0 m_BestFit: 0 @@ -1579,7 +1653,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: 40 m_FontStyle: 0 m_BestFit: 0 @@ -1626,8 +1700,8 @@ RectTransform: m_Father: {fileID: 6594472603124481167} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 442.9, y: 0} m_SizeDelta: {x: 825.8, y: 0} m_Pivot: {x: 0.5, y: 1} @@ -1679,6 +1753,7 @@ GameObject: - component: {fileID: 5509733079217669299} - component: {fileID: 6944288296359601059} - component: {fileID: 4209770797376294750} + - component: {fileID: 2594512101136336917} m_Layer: 5 m_Name: topBar m_TagString: Untagged @@ -1704,13 +1779,14 @@ RectTransform: - {fileID: 465399823903699223} - {fileID: 7686199749489823501} - {fileID: 4898254141833732587} + - {fileID: 1642184620074367834} m_Father: {fileID: 5981932543035177726} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 920, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 460, y: 160.40002} + m_SizeDelta: {x: 920, y: 320.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6944288296359601059 CanvasRenderer: @@ -1740,7 +1816,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c631863816651274abd68bcc2fe42c9c, type: 3} + m_Sprite: {fileID: 21300000, guid: 62be17046a9303b4f862f4b27c5d68fe, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1749,6 +1825,26 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &2594512101136336917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5743153875269478888} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &5826246561062144640 GameObject: m_ObjectHideFlags: 0 @@ -1807,7 +1903,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.9716981, g: 0.96702296, b: 0.9579477, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1815,7 +1911,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: 34 m_FontStyle: 0 m_BestFit: 0 @@ -1863,9 +1959,9 @@ RectTransform: m_Father: {fileID: 5981932543035177726} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 460, y: -355} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 460, y: 0} m_SizeDelta: {x: 905, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5201084322800259043 @@ -1963,7 +2059,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.8490566, g: 0.45689204, b: 0.07609467, a: 0.88235295} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1971,7 +2067,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: 36 m_FontStyle: 0 m_BestFit: 0 @@ -2104,7 +2200,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.9716981, g: 0.96390617, b: 0.9487807, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2112,7 +2208,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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 44 m_FontStyle: 0 m_BestFit: 0 @@ -2144,7 +2240,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5910622177605777387 RectTransform: m_ObjectHideFlags: 0 @@ -2257,7 +2353,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: 412.90002, y: 0} + m_AnchoredPosition: {x: 412.9, y: 0} m_SizeDelta: {x: 825.8, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5631977101328081240 @@ -2281,7 +2377,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.6792453, g: 0.40967014, b: 0.14417945, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2289,7 +2385,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: 34 m_FontStyle: 0 m_BestFit: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTailsmanChipShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTailsmanChipShowPopup.lua index 6017e2041c..d260833644 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTailsmanChipShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTailsmanChipShowPopup.lua @@ -81,10 +81,10 @@ function RewardTailsmanChipShowPopup:OnShow() local cardId=ConfigManager.GetConfigDataByKey(ConfigName.ChangingCard,"CardId",self.cardItemId).Id local proDatas = IncarnationManager.GetChangeCardPropertyAdd(cardId,self.level,self.star) - self.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong_di_"..itemData.Quantity) + self.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("Bg_hz_beibao_pinjise_00"..itemData.Quantity) - self.equipQuaText.text=GetStringByEquipQua(itemData.Quantity,GetQuaStringByEquipQua(itemData.Quantity)) - self.eqiopName.text=GetStringByEquipQua(itemData.Quantity,GetLanguageStrById(itemData.Name)) + self.equipQuaText.text=GetQuaStringByEquipQua(itemData.Quantity)--GetStringByEquipQua(itemData.Quantity,) + self.eqiopName.text=GetLanguageStrById(itemData.Name)-- GetStringByEquipQua(itemData.Quantity,) self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemData.Quantity)) self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemData.ResourceID)) self.equipInfoText.text = GetLanguageStrById(itemData.ItemDescribe)