From f37ba8ea1c7bc2cf2224d1ebfdc9f96afefa6bd9 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Tue, 16 Apr 2024 15:24:08 +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 --- .../Prefabs/UI/Harmony/HelpFightPanel.prefab | 769 +++++++++++++++++- .../~Lua/Modules/HelpFight/HelpFightPanel.lua | 4 +- 2 files changed, 732 insertions(+), 41 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Harmony/HelpFightPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Harmony/HelpFightPanel.prefab index 97ef890670..17c97b1cc3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Harmony/HelpFightPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Harmony/HelpFightPanel.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 738883362} - component: {fileID: 738883364} - component: {fileID: 738883363} + - component: {fileID: 4499826581847516562} m_Layer: 5 m_Name: AddProTxt m_TagString: Untagged @@ -30,11 +31,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 798015173237835578} - m_RootOrder: 10 + m_RootOrder: 14 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: 685} + m_AnchoredPosition: {x: 0, y: 722} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &738883364 @@ -58,7 +59,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.95686275, b: 0.19607843, a: 1} + m_Color: {r: 0.1571513, g: 0.49056602, b: 0.1504094, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -79,6 +80,95 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: New Text +--- !u!114 &4499826581847516562 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 738883361} + 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.16078432} + m_EffectDistance: {x: 0.1, y: -0.1} + m_UseGraphicAlpha: 1 +--- !u!1 &1350198014 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1350198015} + - component: {fileID: 1350198017} + - component: {fileID: 1350198016} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1350198015 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1350198014} + 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: 16692397602599607} + 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, y: -38.1} + m_SizeDelta: {x: 170, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1350198017 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1350198014} + m_CullTransparentMesh: 0 +--- !u!114 &1350198016 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1350198014} + 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: 413fc49362e98784c9661075ed046cd6, 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 &189702432771633780 GameObject: m_ObjectHideFlags: 0 @@ -207,8 +297,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: 51.00003, y: 79.09996} - m_SizeDelta: {x: 48, y: 32} + m_AnchoredPosition: {x: 42.1, y: 76.3} + m_SizeDelta: {x: 62, y: 30.15} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7653937044788489723 CanvasRenderer: @@ -238,7 +328,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: c73ac4f44d9a7194488674d4fa335c10, type: 3} + m_Sprite: {fileID: 21300000, guid: 0369f1a4b8a6a9a4b8a0017fc41eb2b8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -287,6 +377,10 @@ RectTransform: - {fileID: 5126282984618141853} - {fileID: 1038121354133818456} - {fileID: 8669659402614153496} + - {fileID: 5770029246144410604} + - {fileID: 4778233352170203877} + - {fileID: 7188556017412337773} + - {fileID: 6076024389542462233} - {fileID: 738883362} m_Father: {fileID: 0} m_RootOrder: 0 @@ -491,6 +585,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &826329954321549768 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6076024389542462233} + - component: {fileID: 5709720491573790511} + - component: {fileID: 7308595651825835962} + m_Layer: 5 + m_Name: Image (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6076024389542462233 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 826329954321549768} + 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: 798015173237835578} + m_RootOrder: 13 + 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: 395} + m_SizeDelta: {x: 750, y: 68} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5709720491573790511 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 826329954321549768} + m_CullTransparentMesh: 0 +--- !u!114 &7308595651825835962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 826329954321549768} + 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: e5d62ef53f4e50b4c82c34fb24fff4bd, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &1038121354133818463 GameObject: m_ObjectHideFlags: 0 @@ -528,7 +696,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: 429, y: -24} + m_AnchoredPosition: {x: 478, y: 779} m_SizeDelta: {x: 54.5, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1038121354133818459 @@ -1619,6 +1787,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &3637340882991260981 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5770029246144410604} + - component: {fileID: 3018551745406963285} + - component: {fileID: 243026200248645278} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5770029246144410604 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3637340882991260981} + 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: 798015173237835578} + m_RootOrder: 10 + 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: 715} + m_SizeDelta: {x: 750, y: 68} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3018551745406963285 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3637340882991260981} + m_CullTransparentMesh: 0 +--- !u!114 &243026200248645278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3637340882991260981} + 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: e5d62ef53f4e50b4c82c34fb24fff4bd, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3706264774494383992 GameObject: m_ObjectHideFlags: 0 @@ -1763,7 +2005,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.0000019073, y: 0} + m_AnchoredPosition: {x: 0.0000019073, y: -0.2} m_SizeDelta: {x: 57.37, y: 35.96} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4922464353795196045 @@ -1916,8 +2158,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: 0.799958} - m_SizeDelta: {x: 160, y: 101.6} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 180, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3901700674748662903 CanvasRenderer: @@ -1940,7 +2182,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9811321, g: 0.96724814, b: 0.96724814, a: 1} + m_Color: {r: 0.43137258, g: 0.37647063, b: 0.32156864, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2064,14 +2306,15 @@ RectTransform: 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_Children: + - {fileID: 6480573959951400265} m_Father: {fileID: 798015173237835578} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -3.7000122, y: 7.5999756} + m_SizeDelta: {x: 126, y: 15.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4914383433922142773 CanvasRenderer: @@ -2101,7 +2344,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: a9a0ca4314cf4524fb3f662f83ed8db7, type: 3} + m_Sprite: {fileID: 21300000, guid: f48880d084cc46a45b88d01ec850b233, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2145,8 +2388,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 54.800293} - m_SizeDelta: {x: 1072, y: 60} + m_AnchoredPosition: {x: 0, y: 2107.6} + m_SizeDelta: {x: 1072, y: 68.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5126282984618141852 MonoBehaviour: @@ -2243,8 +2486,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: -448.1} - m_SizeDelta: {x: 974.3, y: 819.9} + m_AnchoredPosition: {x: -2, y: -408.3} + m_SizeDelta: {x: 1076, y: 1031.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4914418831466616219 CanvasRenderer: @@ -2306,6 +2549,80 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!1 &5501073286505690472 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7400317597170588235} + - component: {fileID: 1559024378420418304} + - component: {fileID: 39788323663865757} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7400317597170588235 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5501073286505690472} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6542905183589923407} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 708, y: 2} + m_SizeDelta: {x: 120, y: 28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1559024378420418304 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5501073286505690472} + m_CullTransparentMesh: 0 +--- !u!114 &39788323663865757 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5501073286505690472} + 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: 624c2d722f79d8245affec2286326e15, 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 &5562217807601403981 GameObject: m_ObjectHideFlags: 0 @@ -2336,11 +2653,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 949214042014083134} - 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: 65.23741, y: 92.21993} + m_AnchoredPosition: {x: 72.8, y: 161.4} m_SizeDelta: {x: 28.58, y: 29.93} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &120718745389804567 @@ -2380,6 +2697,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5810416777140388143 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7188556017412337773} + - component: {fileID: 4379232352117682961} + - component: {fileID: 3811651220575838974} + m_Layer: 5 + m_Name: Image (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7188556017412337773 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5810416777140388143} + 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: 798015173237835578} + m_RootOrder: 12 + 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: 502} + m_SizeDelta: {x: 750, y: 68} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4379232352117682961 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5810416777140388143} + m_CullTransparentMesh: 0 +--- !u!114 &3811651220575838974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5810416777140388143} + 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: e5d62ef53f4e50b4c82c34fb24fff4bd, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &6352328463198142089 GameObject: m_ObjectHideFlags: 0 @@ -2525,6 +2916,81 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &6380172793954295165 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 16692397602599607} + - component: {fileID: 2513776468094034293} + - component: {fileID: 5437833331060886409} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &16692397602599607 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6380172793954295165} + 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: + - {fileID: 1350198015} + m_Father: {fileID: 949214042014083134} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -0.0025177002} + m_SizeDelta: {x: 0, y: -0.0049744} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2513776468094034293 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6380172793954295165} + m_CullTransparentMesh: 0 +--- !u!114 &5437833331060886409 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6380172793954295165} + 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: 908254022458864409f7140533336cf2, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &6389995273228161008 GameObject: m_ObjectHideFlags: 0 @@ -2704,11 +3170,11 @@ RectTransform: m_Children: - {fileID: 7500597393201060646} m_Father: {fileID: 949214042014083134} - 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: 6.4, y: 31.400005} + m_AnchoredPosition: {x: 10, y: 86} m_SizeDelta: {x: 153.2, y: 155.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7660555432746505889 @@ -2719,6 +3185,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6764210062993446431} m_CullTransparentMesh: 0 +--- !u!1 &7248426351444964216 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6480573959951400265} + - component: {fileID: 1146728579523732455} + - component: {fileID: 7060261235504159148} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6480573959951400265 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7248426351444964216} + 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: 4916292726979426115} + 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: 4.8, y: -467.3} + m_SizeDelta: {x: 1080, y: 1267} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1146728579523732455 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7248426351444964216} + m_CullTransparentMesh: 0 +--- !u!114 &7060261235504159148 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7248426351444964216} + 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: 7b0438396dd071c4aa0e2085ff2c6654, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7310340421688455795 GameObject: m_ObjectHideFlags: 0 @@ -2749,12 +3289,12 @@ RectTransform: m_Children: - {fileID: 7090123173878873333} m_Father: {fileID: 949214042014083134} - 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: -0.00013638, y: -105} - m_SizeDelta: {x: 153.48, y: 100} + m_AnchoredPosition: {x: 0, y: -107.4} + m_SizeDelta: {x: 180, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4912470173429053717 MonoBehaviour: @@ -2818,12 +3358,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 949214042014083134} - m_RootOrder: 4 + 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} - m_AnchoredPosition: {x: -0.00012207031, y: 125} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0, y: -17.3} + m_SizeDelta: {x: 180, y: 38.65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6737225756271366440 CanvasRenderer: @@ -2846,7 +3386,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9811321, g: 0.96724814, b: 0.96724814, a: 1} + m_Color: {r: 0.8117648, g: 0.52156866, b: 0.3254902, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2855,7 +3395,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 36 + m_FontSize: 34 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -2941,6 +3481,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7711742213396971390 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8338664383111317243} + - component: {fileID: 5704463832098641909} + - component: {fileID: 1069987354388819562} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8338664383111317243 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7711742213396971390} + 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: 6542905183589923407} + 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: -147, y: 0} + m_SizeDelta: {x: 120, y: 28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5704463832098641909 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7711742213396971390} + m_CullTransparentMesh: 0 +--- !u!114 &1069987354388819562 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7711742213396971390} + 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: 624c2d722f79d8245affec2286326e15, 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 &7880080324435757498 GameObject: m_ObjectHideFlags: 0 @@ -3045,6 +3659,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 16692397602599607} - {fileID: 5065347911416600412} - {fileID: 1616674185796874855} - {fileID: 116730074134975029} @@ -3055,8 +3670,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: -1210.0024, y: -539.1} - m_SizeDelta: {x: 153.5, y: 311.5} + m_AnchoredPosition: {x: -997.67957, y: -206.8} + m_SizeDelta: {x: 180, y: 350} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1249272185240198665 CanvasRenderer: @@ -3279,6 +3894,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u521B\u89D23\u5929\u540E\u5F00\u542F" LanguageIndex: 0 +--- !u!1 &8036358588834923131 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4778233352170203877} + - component: {fileID: 3626924624255764753} + - component: {fileID: 8725613978320194} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4778233352170203877 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8036358588834923131} + 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: 798015173237835578} + m_RootOrder: 11 + 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: 610} + m_SizeDelta: {x: 750, y: 68} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3626924624255764753 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8036358588834923131} + m_CullTransparentMesh: 0 +--- !u!114 &8725613978320194 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8036358588834923131} + 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: e5d62ef53f4e50b4c82c34fb24fff4bd, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &8174142923121419316 GameObject: m_ObjectHideFlags: 0 @@ -3366,13 +4055,15 @@ RectTransform: 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_Children: + - {fileID: 8338664383111317243} + - {fileID: 7400317597170588235} m_Father: {fileID: 798015173237835578} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 98.99756, y: 917} + m_AnchoredPosition: {x: 269, y: 1111} m_SizeDelta: {x: 166.19, y: 36.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2068715149087712646 @@ -3396,7 +4087,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7058824, g: 0.79215693, b: 0.8078432, a: 1} + m_Color: {r: 0.4, g: 0.27450982, b: 0.15686275, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3416,7 +4107,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u6BCF\u5F00\u542F\u4E00\u4E2A\u9635\u4F4D,\u52A9\u6218\u5C5E\u6027\u63D020%" + m_Text: "\u6BCF\u5F00\u542F\u4E00\u4E2A\u9635\u4F4D\u5E76\u52A9\u9635,\u52A9\u9635\u5C5E\u6027\u6574\u4F53\u63D0\u534720%" LanguageIndex: 10145 --- !u!1 &8835364443203700819 GameObject: @@ -3494,10 +4185,10 @@ RectTransform: - {fileID: 7560741003393163213} - {fileID: 7962436949187198387} m_Father: {fileID: 949214042014083134} - 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: -2.7, y: 9.400002} + m_AnchoredPosition: {x: 0.89997864, y: 63.999977} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/~Lua/Modules/HelpFight/HelpFightPanel.lua b/Assets/ManagedResources/~Lua/Modules/HelpFight/HelpFightPanel.lua index 6345f6105e..7c47bbfbe5 100644 --- a/Assets/ManagedResources/~Lua/Modules/HelpFight/HelpFightPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HelpFight/HelpFightPanel.lua @@ -94,7 +94,7 @@ function HelpFightPanel:OnShow() end local str="" for k, v in pairs(addProList) do - str=str..GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.PropertyConfig,k).Info).." +"..v.."\n"..string.format("(阵位加成%s%%)\n",addNum/100) + str=str..GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.PropertyConfig,k).Info).." +"..v.." "..string.format("(阵位加成%s%%)\n\n",addNum/100) end self.AddProTxt.text=str --self.tipInfo.text="" @@ -124,7 +124,7 @@ function HelpFightPanel:SingleItemDataShow(_go,_data,_index) infoTxt.text=title lockObj:SetActive(_data.state==0) tipObj:SetActive(_data.state==0) - tipTxt.text=string.format("创角%s天后开启",_data.config.Experience) + tipTxt.text=string.format("%s天后开启",_data.config.Experience) local proList={} if _data.hero then heroObj:SetActive(true)