From 4c74102719e1bdd4e32b140502d5117759ab4bb8 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Thu, 27 Aug 2026 17:09:13 +0800 Subject: [PATCH] =?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 | 64 +++++++++---------- .../Prefabs/UI/Guild/GuildFetePopup.prefab | 4 +- .../UI/TianShuMiJuan/IncarnationPanel.prefab | 16 ++--- .../ContinuePackage/ContinuePackagePanel.lua | 6 +- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab index 3ccc6d7c12..9ab87c1fda 100644 --- a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab @@ -1695,7 +1695,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4736825884349271533} + - {fileID: 8297146906049044123} - {fileID: 2917160263920522954} - {fileID: 1053341947613772312} - {fileID: 8892065666247826579} @@ -2698,143 +2698,143 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 ---- !u!1001 &501785368138100814 +--- !u!1001 &3346507627901490770 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 2750471745573935426} m_Modifications: - - target: {fileID: 5134766058386521684, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 5286514998332591038, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_Name - value: live2d_painting_1002 + value: live2d_painting_1005 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_AnchoredPosition.y value: 619 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_SizeDelta.x value: 100 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_SizeDelta.y value: 100 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_LocalScale.x value: 0.8 objectReference: {fileID: 0} - - target: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: m_LocalScale.y value: 0.8 objectReference: {fileID: 0} - - target: {fileID: 8666817872765595873, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + - target: {fileID: 2382565346169273572, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} propertyPath: startingAnimation value: A1 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 682b2a9c0e71f6841bbddd3ca830a74f, type: 3} ---- !u!224 &4736825884349271533 stripped + m_SourcePrefab: {fileID: 100100000, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} +--- !u!224 &8297146906049044123 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 5136959186128584099, guid: 682b2a9c0e71f6841bbddd3ca830a74f, + m_CorrespondingSourceObject: {fileID: 6725085709511477449, guid: 2a59a3c2038f5024ab58fbc5559b6ff7, type: 3} - m_PrefabInstance: {fileID: 501785368138100814} + m_PrefabInstance: {fileID: 3346507627901490770} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab index d558684577..7adb84e456 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab @@ -81133,14 +81133,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.8666667} + 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: ca22cfea2075bb94290ca014d378e270, type: 3} + m_Sprite: {fileID: 21300000, guid: f2cf38fb36556ea49aa1eeb763f409d7, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab index e823816e61..bc2a0d6acf 100644 --- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab @@ -179702,7 +179702,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4901961, g: 0.29411766, b: 0.9294118, a: 0.50980395} + m_Color: {r: 0.18039216, g: 0.18039216, b: 0.18039216, a: 0.50980395} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -331645,7 +331645,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: cc6829a47fb062b4faacd497bcbf00e0, type: 3} + m_Sprite: {fileID: 21300000, guid: 41820652f83f3b340a3ddd907e2569e6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -353789,7 +353789,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4901961, g: 0.29411766, b: 0.9294118, a: 0.50980395} + m_Color: {r: 0.18039216, g: 0.18039216, b: 0.18039216, a: 0.50980395} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -356931,16 +356931,16 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 766.8 objectReference: {fileID: 0} - - target: {fileID: 4914193227855868971, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.x value: 39.475 objectReference: {fileID: 0} + - target: {fileID: 4914193227855868971, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 440662846547803826, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Sprite diff --git a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua index d1d2ba9f2c..bf18ecd92c 100644 --- a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua @@ -155,12 +155,12 @@ function ContinuePackagePanel:ShowSingleHero(go,data,index) obj:SetActive(false) canBuyTime.text = string.format( "剩余：%s次",data.progress) canBuyTime.gameObject:SetActive(self.curPage ~= btnType.LianGou)--第一页连购好礼不显示剩余次数 - btnImg.sprite = self.spLoader:LoadSprite("X1_zhanling_pata_bt_03") + btnImg.sprite = self.spLoader:LoadSprite("tongyong_btn1") if data.otherData.GoodType == 1 then--直购 btnText.gameObject:SetActive(true) btnText.text = string.format("%s 元",data.otherData.Price) if data.state == 8 then - btnImg.sprite = self.spLoader:LoadSprite("X1_zhanling_pata_bt_04") + btnImg.sprite = self.spLoader:LoadSprite("tongyong_btn3") btnText.text = Language[10514] canBuyTime.text = "" elseif data.state == 3 then @@ -177,7 +177,7 @@ function ContinuePackagePanel:ShowSingleHero(go,data,index) if data.state == 8 then obj:SetActive(false) btnText.gameObject:SetActive(true) - btnImg.sprite = self.spLoader:LoadSprite("Btn_hz_lan_01") + btnImg.sprite = self.spLoader:LoadSprite("tongyong_btn4") btnText.text = Language[10514] canBuyTime.text = "" elseif data.state == 3 then