From 6c2dcd710a1fd0cf07b1476847144017f7a78905 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Mon, 15 Apr 2024 11:48:38 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Battle/DamageResult.prefab | 70 ++++++++++++++----- 1 file changed, 51 insertions(+), 19 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab index baf3222478..b2456d5e6e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab @@ -271,8 +271,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: -6, y: 507} - m_SizeDelta: {x: 400, y: 56} + m_AnchoredPosition: {x: -17.5, y: 505} + m_SizeDelta: {x: 423, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9171929062687719813 CanvasRenderer: @@ -302,8 +302,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: 288461e87c49b6d4eb6b055d683d345c, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 62181b1332d1f5d4ca47cb151447db41, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1032,8 +1032,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: 0, y: 507} - m_SizeDelta: {x: 400, y: 56} + m_AnchoredPosition: {x: 17, y: 505} + m_SizeDelta: {x: 423, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &982918930573210986 CanvasRenderer: @@ -1063,8 +1063,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: 288461e87c49b6d4eb6b055d683d345c, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 62181b1332d1f5d4ca47cb151447db41, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1364,7 +1364,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.0049973, y: -1.67} - m_SizeDelta: {x: 130.49, y: 77.48} + m_SizeDelta: {x: 130, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1528867972333169377 CanvasRenderer: @@ -1387,7 +1387,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9921569, g: 0.92549026, b: 0.8000001, a: 1} + m_Color: {r: 0.4245283, g: 0.3057274, b: 0.082102165, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1692,6 +1692,7 @@ GameObject: - component: {fileID: 7864751433302195166} - component: {fileID: 1230793493522679058} - component: {fileID: 4297469349141405335} + - component: {fileID: 4286919666457608776} m_Layer: 5 m_Name: name m_TagString: Untagged @@ -1715,7 +1716,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: -35.7, y: 505.00006} + m_AnchoredPosition: {x: -16.1, y: 505.00006} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1230793493522679058 @@ -1739,7 +1740,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.98823535, g: 0.89019614, b: 0.8235295, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1761,6 +1762,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u73A9\u5BB6\u540D\u5B57\u4E03\u4E2A\u5B57" LanguageIndex: 10060 +--- !u!114 &4286919666457608776 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3956542178577682214} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &3958685813021414586 GameObject: m_ObjectHideFlags: 0 @@ -1968,6 +1984,7 @@ GameObject: - component: {fileID: 4523281070502087435} - component: {fileID: 5544174398057538207} - component: {fileID: 2900382452137204729} + - component: {fileID: 2716491875253857155} m_Layer: 5 m_Name: name m_TagString: Untagged @@ -1991,7 +2008,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: 31.5, y: 505} + m_AnchoredPosition: {x: 14.9, y: 505} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5544174398057538207 @@ -2015,7 +2032,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.98823535, g: 0.89019614, b: 0.8235295, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2037,6 +2054,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u73A9\u5BB6\u540D\u5B57\u4E03\u4E2A\u5B57" LanguageIndex: 10060 +--- !u!114 &2716491875253857155 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4597098360175446927} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &4710375642015881500 GameObject: m_ObjectHideFlags: 0 @@ -2074,7 +2106,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -135.5, y: 3.416} - m_SizeDelta: {x: 130.48, y: 79.595} + m_SizeDelta: {x: 130, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2222332344144637697 CanvasRenderer: @@ -2915,7 +2947,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.89411765, g: 0.7176471, b: 0.48235294, a: 1} + m_Color: {r: 0.31132078, g: 0.18390521, b: 0.013216442, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3995,7 +4027,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.89411765, g: 0.7176471, b: 0.48235294, a: 1} + m_Color: {r: 0.3137255, g: 0.18431373, b: 0.015686275, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4341,8 +4373,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: 0.000015258789, y: -3.4159968} - m_SizeDelta: {x: 162.14, y: 109.42} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 130, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7883256375757895650 CanvasRenderer: From d17f9dfd3c4b90245feea7fb5b60c5992f02dc0a Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Mon, 15 Apr 2024 13:03:04 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E7=9C=8B=E4=B8=8D=E6=B8=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Arena/ArenaMainPanel.prefab | 74 +++++++++++++++++-- 1 file changed, 69 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab index 958cfaaaeb..e55dd77833 100644 --- a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab @@ -85,6 +85,7 @@ GameObject: - component: {fileID: 186321250} - component: {fileID: 186321252} - component: {fileID: 186321251} + - component: {fileID: 2579853163779597987} m_Layer: 5 m_Name: Text (1) m_TagString: Untagged @@ -154,6 +155,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u8D5B\u5B63\u6311\u6218\u5956\u52B1\uFF1A" LanguageIndex: 11665 +--- !u!114 &2579853163779597987 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 186321249} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &352799017 GameObject: m_ObjectHideFlags: 0 @@ -2416,6 +2432,7 @@ GameObject: - component: {fileID: 224164602086186616} - component: {fileID: 222346043805713504} - component: {fileID: 8220880007477159516} + - component: {fileID: 4252831003377322298} m_Layer: 0 m_Name: timelab m_TagString: Untagged @@ -2490,6 +2507,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u8D5B\u5B63\u5269\u4F59\u65F6\u95F4\n" LanguageIndex: 10057 +--- !u!114 &4252831003377322298 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1539315279723976} + 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: 0.5} + m_EffectDistance: {x: 0.1, y: -0.1} + m_UseGraphicAlpha: 1 --- !u!1 &1569047852161328 GameObject: m_ObjectHideFlags: 0 @@ -13218,6 +13250,7 @@ GameObject: - component: {fileID: 460352526202496736} - component: {fileID: 7777670130619924261} - component: {fileID: 4160404129245020082} + - component: {fileID: 8856244156091927584} m_Layer: 0 m_Name: Power m_TagString: Untagged @@ -13241,7 +13274,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 193.8, y: -30.9} + m_AnchoredPosition: {x: 180.5, y: -30.9} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7777670130619924261 @@ -13287,6 +13320,21 @@ MonoBehaviour: m_LineSpacing: 0 m_Text: 4285 LanguageIndex: 10066 +--- !u!114 &8856244156091927584 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2261365349935469722} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.20754719, g: 0.20754719, b: 0.20754719, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &2374762703795595374 GameObject: m_ObjectHideFlags: 0 @@ -29052,7 +29100,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9647059, g: 0.98039216, b: 0.9843137, a: 1} + m_Color: {r: 0.31132078, g: 0.15494071, b: 0.071956225, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -34967,7 +35015,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9647059, g: 0.98039216, b: 0.9843137, a: 1} + m_Color: {r: 0.3137255, g: 0.15686275, b: 0.07450981, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -36115,6 +36163,7 @@ GameObject: - component: {fileID: 8872551768251343228} - component: {fileID: 4717455265299457090} - component: {fileID: 1418494626104594842} + - component: {fileID: 2653106799993089066} m_Layer: 0 m_Name: Rank m_TagString: Untagged @@ -36184,6 +36233,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6392\u540D\u672A\u4E0A\u699C" LanguageIndex: 10065 +--- !u!114 &2653106799993089066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6823619106234951128} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &6824225027584662474 GameObject: m_ObjectHideFlags: 0 @@ -47841,7 +47905,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9647059, g: 0.98039216, b: 0.9843137, a: 1} + m_Color: {r: 0.3137255, g: 0.15686275, b: 0.07450981, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -48989,7 +49053,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9647059, g: 0.98039216, b: 0.9843137, a: 1} + m_Color: {r: 0.3137255, g: 0.15686275, b: 0.07450981, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: From 0dd36cde40cd9b0d7dfe285ca7aacc821233b307 Mon Sep 17 00:00:00 2001 From: "DESKTOP-MMO982B\\User" <752966621@qq.com> Date: Mon, 15 Apr 2024 14:27:24 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=BF=B7=E8=B8=AA=E5=95=86=E5=BA=97?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E9=93=BA=E6=BB=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab b/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab index d7b882b3fa..04b87f8da8 100644 --- a/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab @@ -3063,8 +3063,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 540, y: 861} - m_SizeDelta: {x: 1446, y: 1920} + m_AnchoredPosition: {x: 540, y: 1051} + m_SizeDelta: {x: 1446, y: 2299.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6880687076429657506 CanvasRenderer: From e9e96de912474199495cafd3c7ada0bd308ed231 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Tue, 16 Apr 2024 16:30:00 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContinuePackagePanel.prefab | 334 ++++++++++++++++-- .../ContinuePackage/ContinuePackagePanel.lua | 6 +- 2 files changed, 313 insertions(+), 27 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab index 6eecd57a44..ae10ca1f50 100644 --- a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab @@ -107,11 +107,11 @@ RectTransform: - {fileID: 2021593734682218} - {fileID: 3909224449922192452} m_Father: {fileID: 2750471745573935426} - m_RootOrder: 3 + m_RootOrder: 4 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: -420, y: 33} + m_AnchoredPosition: {x: -433, y: 19} m_SizeDelta: {x: 100, y: 657.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &30253706966678147 @@ -730,6 +730,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2750408323913912010 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 253587907237702522} + - component: {fileID: 6315334172905970200} + - component: {fileID: 8733824694599193646} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &253587907237702522 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2750408323913912010} + 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: 898193909354494019} + m_RootOrder: 1 + 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: -324, y: 273} + m_SizeDelta: {x: 616, y: 178} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6315334172905970200 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2750408323913912010} + m_CullTransparentMesh: 0 +--- !u!114 &8733824694599193646 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2750408323913912010} + 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: 6aac9c39c2fd0fb42a549305c0b66ab4, 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 &3133122158697389110 GameObject: m_ObjectHideFlags: 0 @@ -840,7 +914,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 898193909354494019} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1010,6 +1084,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7842824894853748038} + - {fileID: 253587907237702522} + - {fileID: 2961410780586226010} - {fileID: 2750471745573935426} - {fileID: 3346197970643441062} - {fileID: 6504940580371637700} @@ -1329,7 +1405,7 @@ RectTransform: - {fileID: 9217321028818647536} - {fileID: 6672776976815628957} m_Father: {fileID: 898193909354494019} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1445,12 +1521,12 @@ RectTransform: m_Children: - {fileID: 5720075157619710336} m_Father: {fileID: 2750471745573935426} - m_RootOrder: 0 + m_RootOrder: 1 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: 0, y: 374.5} - m_SizeDelta: {x: 302, y: 68} + m_AnchoredPosition: {x: 0, y: 293} + m_SizeDelta: {x: 302, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6506979086108423105 CanvasRenderer: @@ -1467,7 +1543,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4753472372400523063} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -1480,7 +1556,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: f4df57e57b538b44cb6ffc1cf1189c71, type: 3} + m_Sprite: {fileID: 21300000, guid: ce3d810834691bb428836131cb3e3f7a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1698,7 +1774,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5324930657412983010 RectTransform: m_ObjectHideFlags: 0 @@ -1844,8 +1920,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: 2aaa6456430fe044b9979521c30bb14f, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 02d017b768196614cba74209330fa078, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2099,8 +2175,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: 2aaa6456430fe044b9979521c30bb14f, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 02d017b768196614cba74209330fa078, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2433,12 +2509,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 6804100958746107471} - {fileID: 1053341947613772312} - {fileID: 8892065666247826579} - {fileID: 6793231540162019059} - {fileID: 7465221042871974731} m_Father: {fileID: 898193909354494019} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2460,7 +2537,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6605752224547364992} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -2711,7 +2788,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: 94.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2545760152514230900 @@ -2800,12 +2877,12 @@ RectTransform: m_Children: - {fileID: 4957794194947264391} m_Father: {fileID: 2750471745573935426} - m_RootOrder: 1 + m_RootOrder: 2 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: 4.7, y: -156.5} - m_SizeDelta: {x: 745.3, y: 868.6} + m_AnchoredPosition: {x: 4.7, y: -211.6} + m_SizeDelta: {x: 745.3, y: 909.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6588532141008816022 CanvasRenderer: @@ -2815,6 +2892,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7338693464047317080} m_CullTransparentMesh: 0 +--- !u!1 &7338739437908461751 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6804100958746107471} + - component: {fileID: 1373586012985535829} + - component: {fileID: 3641111040312374666} + m_Layer: 0 + m_Name: BG1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6804100958746107471 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7338739437908461751} + 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: 2750471745573935426} + m_RootOrder: 0 + 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: 0.9, y: -230} + m_SizeDelta: {x: 769.69, y: 1140} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1373586012985535829 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7338739437908461751} + m_CullTransparentMesh: 0 +--- !u!114 &3641111040312374666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7338739437908461751} + 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: fa3d641a2aaa74141b80cb107d219230, 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 &7750522437075200657 GameObject: m_ObjectHideFlags: 0 @@ -2846,11 +2997,11 @@ RectTransform: m_Children: - {fileID: 5387329556305204595} m_Father: {fileID: 2750471745573935426} - m_RootOrder: 2 + m_RootOrder: 3 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: 0, y: -700} + m_AnchoredPosition: {x: 0, y: -730} m_SizeDelta: {x: 700, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7805140256559782348 @@ -3058,8 +3209,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: 2aaa6456430fe044b9979521c30bb14f, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 02d017b768196614cba74209330fa078, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3204,3 +3355,138 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 +--- !u!1001 &6444757294358580646 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 898193909354494019} + m_Modifications: + - target: {fileID: 3792560709543872591, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_Name + value: live2d_c_0014 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 83 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -640 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_LocalScale.x + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + propertyPath: m_LocalScale.y + value: 0.7 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 586a3eec70a65874486a9c5046269a6d, type: 3} +--- !u!224 &2961410780586226010 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, + type: 3} + m_PrefabInstance: {fileID: 6444757294358580646} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua index 8a7e596c36..d7dc31af56 100644 --- a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua @@ -4,9 +4,9 @@ local rechargeConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfi local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local artResourcesConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) local BTNS = { - [1] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "b_baibao_liangouhaoli-a",text2 = "b_baibao_liangouhaoli",title = "b_baibao_liangouhaoli-b"}, - [2] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "b_baibao_meiritehui-a",text2 = "b_baibao_meiritehui",title = "b_baibao_meiritehui-b"}, - [3] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "b_baibao_chaozhitehui-a",text2 = "b_baibao_chaozhitehui",title = "b_baibao_chaozhitehui-b"}, + [1] = {bg1 = "lingshou_lingshoumingzidi",bg2 = "lingshou_lingshoumingzidi",text1 = "b_baibao_liangouhaoli-a",text2 = "b_baibao_liangouhaoli",title = "b_baibao_liangouhaoli-b"}, + [2] = {bg1 = "lingshou_lingshoumingzidi",bg2 = "lingshou_lingshoumingzidi",text1 = "b_baibao_meiritehui-a",text2 = "b_baibao_meiritehui",title = "b_baibao_meiritehui-b"}, + [3] = {bg1 = "lingshou_lingshoumingzidi",bg2 = "lingshou_lingshoumingzidi",text1 = "b_baibao_chaozhitehui-a",text2 = "b_baibao_chaozhitehui",title = "b_baibao_chaozhitehui-b"}, } local btnType = { LianGou = 1, From e25e58e02c55888c85fd7749615c3622fe8b5353 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Tue, 16 Apr 2024 16:37:58 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FourElement/s_silingshilian_cengdi2.png.meta | 2 +- .../UI/UpGradePackage/UpGradePackagePanel.prefab | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/Atlas/FourElement/s_silingshilian_cengdi2.png.meta b/Assets/ManagedResources/Atlas/FourElement/s_silingshilian_cengdi2.png.meta index fe982934d0..9d9d697774 100644 --- a/Assets/ManagedResources/Atlas/FourElement/s_silingshilian_cengdi2.png.meta +++ b/Assets/ManagedResources/Atlas/FourElement/s_silingshilian_cengdi2.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 17, y: 19, z: 22, w: 14} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab b/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab index f14f8b94c2..f3af429107 100644 --- a/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab @@ -9713,7 +9713,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: -777} + m_AnchoredPosition: {x: -15, y: -746} m_SizeDelta: {x: 917, y: 742} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4093235016657068332 @@ -19589,7 +19589,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.5372549} + m_Color: {r: 1, g: 1, b: 1, a: 0.74509805} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -49497,12 +49497,12 @@ PrefabInstance: - target: {fileID: 7626389589213615499, guid: a05d87d3deb77324799a769473e7c4e8, type: 3} propertyPath: m_AnchoredPosition.x - value: -52 + value: -98 objectReference: {fileID: 0} - target: {fileID: 7626389589213615499, guid: a05d87d3deb77324799a769473e7c4e8, type: 3} propertyPath: m_AnchoredPosition.y - value: -660 + value: -521 objectReference: {fileID: 0} - target: {fileID: 7626389589213615499, guid: a05d87d3deb77324799a769473e7c4e8, type: 3} @@ -49547,12 +49547,12 @@ PrefabInstance: - target: {fileID: 7626389589213615499, guid: a05d87d3deb77324799a769473e7c4e8, type: 3} propertyPath: m_LocalScale.x - value: 0.6 + value: 0.65 objectReference: {fileID: 0} - target: {fileID: 7626389589213615499, guid: a05d87d3deb77324799a769473e7c4e8, type: 3} propertyPath: m_LocalScale.y - value: 0.6 + value: 0.65 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a05d87d3deb77324799a769473e7c4e8, type: 3} From 9b636de09771a57331872dc95abe8417a569898a Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Tue, 16 Apr 2024 17:03:30 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=89=B9=E6=95=88=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefab/JL/UI/UI_Effect_YJBK_Zao.prefab | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Assets/ManagedResources/EffectResUI/YiJingBaoKu/Prefab/JL/UI/UI_Effect_YJBK_Zao.prefab b/Assets/ManagedResources/EffectResUI/YiJingBaoKu/Prefab/JL/UI/UI_Effect_YJBK_Zao.prefab index 12978f45b2..5490e303af 100644 --- a/Assets/ManagedResources/EffectResUI/YiJingBaoKu/Prefab/JL/UI/UI_Effect_YJBK_Zao.prefab +++ b/Assets/ManagedResources/EffectResUI/YiJingBaoKu/Prefab/JL/UI/UI_Effect_YJBK_Zao.prefab @@ -23,7 +23,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2512513232103719832} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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: @@ -4770,7 +4770,7 @@ ParticleSystem: --- !u!199 &2512513232348516584 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9526,7 +9526,7 @@ ParticleSystem: --- !u!199 &2512513232378346498 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14229,7 +14229,7 @@ ParticleSystem: --- !u!199 &2512513232617237825 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -18994,7 +18994,7 @@ ParticleSystem: --- !u!199 &2512513232716747607 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -23759,7 +23759,7 @@ ParticleSystem: --- !u!199 &2512513232942801638 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -28447,7 +28447,7 @@ ParticleSystem: --- !u!199 &2512513232958693697 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -28580,7 +28580,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -46, y: 46} - m_SizeDelta: {x: 260, y: 260} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2512513233187924399 CanvasRenderer: @@ -28610,7 +28610,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: 1b118356aa70e614088c8698e1a873cf, type: 3} + m_Sprite: {fileID: 21300000, guid: f29204093308f04448f53d123422f952, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -33325,7 +33325,7 @@ ParticleSystem: --- !u!199 &2512513233262773146 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -38081,7 +38081,7 @@ ParticleSystem: --- !u!199 &2512513233651206243 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -42882,7 +42882,7 @@ ParticleSystem: --- !u!199 &2512513233699592858 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -47549,7 +47549,7 @@ ParticleSystem: --- !u!199 &2512513233701013317 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} From 150c1bf31b0cb834022242090e6669e10ee41774 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Tue, 16 Apr 2024 17:32:26 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI_Effect_TouXiang_Lanlong_02.mat | 2 +- .../ContinuePackagePanel.prefab | 82 +++++++++++++++---- .../ContinuePackage/ContinuePackagePanel.lua | 6 +- 3 files changed, 69 insertions(+), 21 deletions(-) diff --git a/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_Lanlong_02.mat b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_Lanlong_02.mat index 4d307968a0..e67ed8c2f4 100644 --- a/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_Lanlong_02.mat +++ b/Assets/ManagedResources/EffectResUI/TianGongXunBao/Materials/UI_Effect_TouXiang_Lanlong_02.mat @@ -24,7 +24,7 @@ Material: m_Scale: {x: 1, y: 0.5} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: e1d78aa0a727c9046bbb92cdb973574a, type: 3} + m_Texture: {fileID: 2800000, guid: a9323b2e7c02d764281c424ad4de54d0, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab index ae10ca1f50..2546b88659 100644 --- a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab @@ -34,7 +34,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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 3.7} m_SizeDelta: {x: 202, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5324488390377574465 @@ -111,7 +111,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: -433, y: 19} + m_AnchoredPosition: {x: -420.9, y: -31.4} m_SizeDelta: {x: 100, y: 657.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &30253706966678147 @@ -149,6 +149,7 @@ GameObject: - component: {fileID: 2297690547128844912} - component: {fileID: 2543937715046013831} - component: {fileID: 1956498916347039920} + - component: {fileID: 6639456072969222838} m_Layer: 0 m_Name: Image m_TagString: Untagged @@ -212,6 +213,21 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &6639456072969222838 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 897851489569006964} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1391152455146847042 GameObject: m_ObjectHideFlags: 0 @@ -667,6 +683,7 @@ GameObject: - component: {fileID: 1736114184632764560} - component: {fileID: 3018363680338757996} - component: {fileID: 6804330082045791357} + - component: {fileID: 3232029441091425335} m_Layer: 0 m_Name: Image m_TagString: Untagged @@ -730,6 +747,21 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &3232029441091425335 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2230658934678160912} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &2750408323913912010 GameObject: m_ObjectHideFlags: 0 @@ -764,8 +796,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: -324, y: 273} - m_SizeDelta: {x: 616, y: 178} + m_AnchoredPosition: {x: -271, y: 240} + m_SizeDelta: {x: 872, y: 272} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6315334172905970200 CanvasRenderer: @@ -1525,8 +1557,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: 0, y: 293} - m_SizeDelta: {x: 302, y: 60} + m_AnchoredPosition: {x: 0, y: 301.9} + m_SizeDelta: {x: 302, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6506979086108423105 CanvasRenderer: @@ -1543,7 +1575,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4753472372400523063} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -1556,7 +1588,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: ce3d810834691bb428836131cb3e3f7a, type: 3} + m_Sprite: {fileID: 21300000, guid: f4df57e57b538b44cb6ffc1cf1189c71, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1693,6 +1725,7 @@ GameObject: - component: {fileID: 2236015055772779925} - component: {fileID: 8788463930399519910} - component: {fileID: 302465533002043506} + - component: {fileID: 309538036565980646} m_Layer: 0 m_Name: Image m_TagString: Untagged @@ -1756,6 +1789,21 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &309538036565980646 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4815340943803729415} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &4901700481088866384 GameObject: m_ObjectHideFlags: 0 @@ -1774,7 +1822,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5324930657412983010 RectTransform: m_ObjectHideFlags: 0 @@ -1920,8 +1968,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: 02d017b768196614cba74209330fa078, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 823d43d843e587346a4b9e3e48fb69b9, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2175,8 +2223,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: 02d017b768196614cba74209330fa078, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 823d43d843e587346a4b9e3e48fb69b9, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3209,8 +3257,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: 02d017b768196614cba74209330fa078, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 4c1d83a37f3fb5a4782ed084e5b45180, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3425,12 +3473,12 @@ PrefabInstance: - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, type: 3} propertyPath: m_AnchoredPosition.x - value: 83 + value: 80 objectReference: {fileID: 0} - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, type: 3} propertyPath: m_AnchoredPosition.y - value: -640 + value: -500 objectReference: {fileID: 0} - target: {fileID: 8100124113991073020, guid: 586a3eec70a65874486a9c5046269a6d, type: 3} diff --git a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua index d7dc31af56..cad1b1575d 100644 --- a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua @@ -4,9 +4,9 @@ local rechargeConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfi local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local artResourcesConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) local BTNS = { - [1] = {bg1 = "lingshou_lingshoumingzidi",bg2 = "lingshou_lingshoumingzidi",text1 = "b_baibao_liangouhaoli-a",text2 = "b_baibao_liangouhaoli",title = "b_baibao_liangouhaoli-b"}, - [2] = {bg1 = "lingshou_lingshoumingzidi",bg2 = "lingshou_lingshoumingzidi",text1 = "b_baibao_meiritehui-a",text2 = "b_baibao_meiritehui",title = "b_baibao_meiritehui-b"}, - [3] = {bg1 = "lingshou_lingshoumingzidi",bg2 = "lingshou_lingshoumingzidi",text1 = "b_baibao_chaozhitehui-a",text2 = "b_baibao_chaozhitehui",title = "b_baibao_chaozhitehui-b"}, + [1] = {bg1 = "r_zhouka_btn_bg3",bg2 = "r_zhouka_btn_bg4",text1 = "b_baibao_liangouhaoli-a",text2 = "b_baibao_liangouhaoli",title = "b_baibao_liangouhaoli-b"}, + [2] = {bg1 = "r_zhouka_btn_bg3",bg2 = "r_zhouka_btn_bg4",text1 = "b_baibao_meiritehui-a",text2 = "b_baibao_meiritehui",title = "b_baibao_meiritehui-b"}, + [3] = {bg1 = "r_zhouka_btn_bg3",bg2 = "r_zhouka_btn_bg4",text1 = "b_baibao_chaozhitehui-a",text2 = "b_baibao_chaozhitehui",title = "b_baibao_chaozhitehui-b"}, } local btnType = { LianGou = 1,