From 0887d61c5ebff482593e8f2dea51f7ed9ea506ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com> Date: Sun, 6 Sep 2026 15:51:51 +0800 Subject: [PATCH] 1 --- .../PaoTai/DaQiao/JiGuang/Laser.prefab | 6 +- .../PaoTai/DaQiao/JiGuang/start.prefab | 5 +- .../PaoTai/GeSiLa/JiGuang/Laser.prefab | 2 +- .../PaoTai/MeiRenYu/JiGuang/Laser.prefab | 2 +- .../PaoTai/SunWuKong/JiGuang/Efx.prefab | 6 +- .../PaoTai/XiongMao/JiGuang/Laser (1).prefab | 2 +- .../PaoTai/YangJian/JiGuang/Laser.prefab | 24 +- Assets/MyGame/Scenes/UIScene.unity | 1398 ----------------- Assets/MyGame/Scripts/Turret/SitPosData.cs | 24 +- .../Game/display_FishEntry_4022.prefab | 2 +- .../Game/display_wargod_14901_0_dev.prefab | 10 +- .../Game/display_wargod_14902_0_dev.prefab | 10 +- .../Game/display_wargod_in_14053_0_dev.prefab | 4 +- .../aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab | 8 +- .../aa/UI/Game/GameMainPanel_FishBase.cs | 207 ++- Assets/MyGame/aa/UI/Game/PropConfigData.cs | 73 + .../MyGame/aa/UI/Game/PropConfigData.cs.meta | 11 + Assets/MyGame/aa/UI/Game/左下.prefab | 4 +- 18 files changed, 343 insertions(+), 1455 deletions(-) create mode 100644 Assets/MyGame/aa/UI/Game/PropConfigData.cs create mode 100644 Assets/MyGame/aa/UI/Game/PropConfigData.cs.meta diff --git a/Assets/Art/FengLei/PaoTai/DaQiao/JiGuang/Laser.prefab b/Assets/Art/FengLei/PaoTai/DaQiao/JiGuang/Laser.prefab index cfc7a4958..c266267af 100644 --- a/Assets/Art/FengLei/PaoTai/DaQiao/JiGuang/Laser.prefab +++ b/Assets/Art/FengLei/PaoTai/DaQiao/JiGuang/Laser.prefab @@ -7009,7 +7009,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2202994275601626415} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -7022,7 +7022,7 @@ Transform: - {fileID: 3122417861231297320} - {fileID: 1888482946497413280} m_Father: {fileID: 9068781256090722184} - m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} + m_LocalEulerAnglesHint: {x: 0, y: -0, z: 90} --- !u!1 &4471339292961239833 GameObject: m_ObjectHideFlags: 0 @@ -16410,7 +16410,7 @@ Transform: m_LocalRotation: {x: -0.000000015890757, y: -0.00000032782552, z: -0.000000035510983, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 0.999998} + m_LocalScale: {x: 1, y: 2, z: 0.999998} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8101731493252368859} diff --git a/Assets/Art/FengLei/PaoTai/DaQiao/JiGuang/start.prefab b/Assets/Art/FengLei/PaoTai/DaQiao/JiGuang/start.prefab index ea541c7e3..6e5051dac 100644 --- a/Assets/Art/FengLei/PaoTai/DaQiao/JiGuang/start.prefab +++ b/Assets/Art/FengLei/PaoTai/DaQiao/JiGuang/start.prefab @@ -71,7 +71,6 @@ MonoBehaviour: m_Scale3D: {x: 10, y: 10, z: 10} m_AnimatableProperties: [] m_Particles: - - {fileID: 8106755085163116203} - {fileID: 2761749364946528661} - {fileID: 3100310087577128612} - {fileID: 6614605102306004990} @@ -2463,7 +2462,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0.4226183, y: 0, z: 0, w: 0.9063078} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2.5, y: 2.5, z: 2.5} + m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 75254570390358182} @@ -4677,7 +4676,7 @@ ParticleSystemRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5020808015505471155} - m_Enabled: 0 + m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 diff --git a/Assets/Art/FengLei/PaoTai/GeSiLa/JiGuang/Laser.prefab b/Assets/Art/FengLei/PaoTai/GeSiLa/JiGuang/Laser.prefab index 8fe2fc951..57b7dffef 100644 --- a/Assets/Art/FengLei/PaoTai/GeSiLa/JiGuang/Laser.prefab +++ b/Assets/Art/FengLei/PaoTai/GeSiLa/JiGuang/Laser.prefab @@ -26,7 +26,7 @@ Transform: serializedVersion: 2 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_LocalScale: {x: 3, y: 3, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4602256425977988424} diff --git a/Assets/Art/FengLei/PaoTai/MeiRenYu/JiGuang/Laser.prefab b/Assets/Art/FengLei/PaoTai/MeiRenYu/JiGuang/Laser.prefab index ac73f19a7..7fc72b1c2 100644 --- a/Assets/Art/FengLei/PaoTai/MeiRenYu/JiGuang/Laser.prefab +++ b/Assets/Art/FengLei/PaoTai/MeiRenYu/JiGuang/Laser.prefab @@ -11735,7 +11735,7 @@ Transform: serializedVersion: 2 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_LocalScale: {x: 3, y: 3, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3450969322148793143} diff --git a/Assets/Art/FengLei/PaoTai/SunWuKong/JiGuang/Efx.prefab b/Assets/Art/FengLei/PaoTai/SunWuKong/JiGuang/Efx.prefab index 3a7a1961f..fdaef2d45 100644 --- a/Assets/Art/FengLei/PaoTai/SunWuKong/JiGuang/Efx.prefab +++ b/Assets/Art/FengLei/PaoTai/SunWuKong/JiGuang/Efx.prefab @@ -79,7 +79,7 @@ LineRenderer: - {x: 0, y: 0, z: -7} m_Parameters: serializedVersion: 3 - widthMultiplier: 6 + widthMultiplier: 12 widthCurve: serializedVersion: 2 m_Curve: @@ -351,7 +351,7 @@ LineRenderer: - {x: 0, y: 0, z: -7} m_Parameters: serializedVersion: 3 - widthMultiplier: 3 + widthMultiplier: 6 widthCurve: serializedVersion: 2 m_Curve: @@ -487,7 +487,7 @@ LineRenderer: - {x: 0, y: 0, z: -7} m_Parameters: serializedVersion: 3 - widthMultiplier: 5 + widthMultiplier: 10 widthCurve: serializedVersion: 2 m_Curve: diff --git a/Assets/Art/FengLei/PaoTai/XiongMao/JiGuang/Laser (1).prefab b/Assets/Art/FengLei/PaoTai/XiongMao/JiGuang/Laser (1).prefab index ce3391ede..5bf81d578 100644 --- a/Assets/Art/FengLei/PaoTai/XiongMao/JiGuang/Laser (1).prefab +++ b/Assets/Art/FengLei/PaoTai/XiongMao/JiGuang/Laser (1).prefab @@ -18908,7 +18908,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 2, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8876878966390754402} diff --git a/Assets/Art/FengLei/PaoTai/YangJian/JiGuang/Laser.prefab b/Assets/Art/FengLei/PaoTai/YangJian/JiGuang/Laser.prefab index b1815d0a9..a7784a8cb 100644 --- a/Assets/Art/FengLei/PaoTai/YangJian/JiGuang/Laser.prefab +++ b/Assets/Art/FengLei/PaoTai/YangJian/JiGuang/Laser.prefab @@ -76,10 +76,10 @@ LineRenderer: m_SortingOrder: 1 m_Positions: - {x: 0, y: 0, z: 0} - - {x: -2.256836, y: 0, z: 2.9524384} + - {x: 0, y: 0, z: 1} m_Parameters: serializedVersion: 3 - widthMultiplier: 3 + widthMultiplier: 6 widthCurve: serializedVersion: 2 m_Curve: @@ -212,10 +212,10 @@ LineRenderer: m_SortingOrder: 3 m_Positions: - {x: 0, y: 0, z: 0} - - {x: -2.256836, y: 0, z: 2.9524384} + - {x: 0, y: 0, z: 1} m_Parameters: serializedVersion: 3 - widthMultiplier: 1.5 + widthMultiplier: 3 widthCurve: serializedVersion: 2 m_Curve: @@ -348,10 +348,10 @@ LineRenderer: m_SortingOrder: 2 m_Positions: - {x: 0, y: 0, z: 0} - - {x: -2.256836, y: 0, z: 2.9524384} + - {x: 0, y: 0, z: 1} m_Parameters: serializedVersion: 3 - widthMultiplier: 2.5 + widthMultiplier: 5 widthCurve: serializedVersion: 2 m_Curve: @@ -484,10 +484,10 @@ LineRenderer: m_SortingOrder: 2 m_Positions: - {x: 0, y: 0, z: 0} - - {x: -2.256836, y: 0, z: 2.9524384} + - {x: 0, y: 0, z: 1} m_Parameters: serializedVersion: 3 - widthMultiplier: 3 + widthMultiplier: 6 widthCurve: serializedVersion: 2 m_Curve: @@ -652,10 +652,10 @@ LineRenderer: m_SortingOrder: 1 m_Positions: - {x: 0, y: 0, z: 0} - - {x: -2.256836, y: 0, z: 2.9524384} + - {x: 0, y: 0, z: 1} m_Parameters: serializedVersion: 3 - widthMultiplier: 1.2 + widthMultiplier: 2.4 widthCurve: serializedVersion: 2 m_Curve: @@ -736,7 +736,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7822299184040054704} serializedVersion: 2 - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + 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_ConstrainProportionsScale: 0 @@ -747,4 +747,4 @@ Transform: - {fileID: 649510477359111152} - {fileID: 2848377205242279173} m_Father: {fileID: 9170579408037849450} - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity index b7c371d75..2842a1298 100644 --- a/Assets/MyGame/Scenes/UIScene.unity +++ b/Assets/MyGame/Scenes/UIScene.unity @@ -948,126 +948,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 266572082} m_CullTransparentMesh: 1 ---- !u!1 &266767336 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 266767337} - - component: {fileID: 266767339} - - component: {fileID: 266767338} - - component: {fileID: 266767340} - m_Layer: 0 - m_Name: "\u706B\u7BAD\u70AE" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &266767337 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 266767336} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 393807740} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40, y: -42.5} - m_SizeDelta: {x: 56, y: 65} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &266767338 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 266767336} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 638fc00fa614e5b45adc9bba44e51fc2, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &266767339 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 266767336} - m_CullTransparentMesh: 1 ---- !u!114 &266767340 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 266767336} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 266767338} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &277665105 GameObject: m_ObjectHideFlags: 0 @@ -1934,127 +1814,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 367977124} m_CullTransparentMesh: 1 ---- !u!1 &393807739 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 393807740} - - component: {fileID: 393807744} - - component: {fileID: 393807743} - - component: {fileID: 393807742} - - component: {fileID: 393807741} - m_Layer: 0 - m_Name: BY_PlaneInf_006 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &393807740 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 393807739} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 266767337} - - {fileID: 1230206839} - - {fileID: 1159918084} - - {fileID: 882728235} - m_Father: {fileID: 2092297742} - 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: 93.5, y: -4.9999695} - m_SizeDelta: {x: 75, y: 277} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &393807741 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 393807739} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 12 - m_Right: 0 - m_Top: 10 - m_Bottom: 10 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &393807742 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 393807739} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 1 ---- !u!114 &393807743 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 393807739} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cf8a23405db4fdd4ab2df6d5dca60f9f, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &393807744 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 393807739} - m_CullTransparentMesh: 1 --- !u!1 &441163902 GameObject: m_ObjectHideFlags: 0 @@ -4106,414 +3865,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 848545023} m_CullTransparentMesh: 1 ---- !u!1 &882728234 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 882728235} - - component: {fileID: 882728237} - - component: {fileID: 882728236} - - component: {fileID: 882728238} - m_Layer: 0 - m_Name: "\u5927\u5587\u53ED" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &882728235 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 882728234} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 393807740} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40.5, y: -235} - m_SizeDelta: {x: 57, y: 64} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &882728236 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 882728234} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 36cce6bf8fda6624fba6241dfdade24e, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &882728237 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 882728234} - m_CullTransparentMesh: 1 ---- !u!114 &882728238 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 882728234} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 882728236} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1001 &920468902 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1096182889} - m_Modifications: - - target: {fileID: 269617451122607351, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: btn_Prop - value: - objectReference: {fileID: 2092297746} - - target: {fileID: 269617451122607351, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: btn_GuaGuaKa - value: - objectReference: {fileID: 1159918087} - - target: {fileID: 269617451122607351, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: obj_PropPanel - value: - objectReference: {fileID: 393807739} - - target: {fileID: 2317508501387410268, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2317508501387410268, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2317508501387410268, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2317508501387410268, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3066473336798849514, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3066473336798849514, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3066473336798849514, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3066473336798849514, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3101029105125260877, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3463654937139411066, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5277770457036584548, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5860049383923451584, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_Name - value: GameMainPanel_FLZY - objectReference: {fileID: 0} - - target: {fileID: 5860049383923451584, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7069774063767299635, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7069774063767299635, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7069774063767299635, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7069774063767299635, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8268002276817246579, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8268002276817246579, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8268002276817246579, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8268002276817246579, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8441262843426643071, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8441262843426643071, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8441262843426643071, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 95 - objectReference: {fileID: 0} - - target: {fileID: 8441262843426643071, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -555 - objectReference: {fileID: 0} - - target: {fileID: 8846911067250442823, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_LocalScale.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8846911067250442823, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_LocalScale.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8846911067250442823, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - propertyPath: m_LocalScale.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - insertIndex: 5 - addedObject: {fileID: 1703182077} - - targetCorrespondingSourceObject: {fileID: 3138140027130194899, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - insertIndex: -1 - addedObject: {fileID: 2092297742} - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b7049b34ef7178248b09689838182b4d, type: 3} ---- !u!224 &920468903 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8080891624328096898, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - m_PrefabInstance: {fileID: 920468902} - m_PrefabAsset: {fileID: 0} ---- !u!224 &920468904 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3138140027130194899, guid: b7049b34ef7178248b09689838182b4d, - type: 3} - m_PrefabInstance: {fileID: 920468902} - m_PrefabAsset: {fileID: 0} --- !u!1 &971215805 GameObject: m_ObjectHideFlags: 0 @@ -4962,7 +4313,6 @@ RectTransform: m_Children: - {fileID: 1819495571} - {fileID: 3182697403238626235} - - {fileID: 920468903} - {fileID: 1159290238} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5350,126 +4700,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1159290237} m_CullTransparentMesh: 1 ---- !u!1 &1159918083 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1159918084} - - component: {fileID: 1159918086} - - component: {fileID: 1159918085} - - component: {fileID: 1159918087} - m_Layer: 0 - m_Name: "\u522E\u522E\u5361" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1159918084 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1159918083} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 393807740} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40.5, y: -171} - m_SizeDelta: {x: 57, y: 64} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1159918085 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1159918083} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 22d1d87308197904daf37acd8018b57a, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1159918086 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1159918083} - m_CullTransparentMesh: 1 ---- !u!114 &1159918087 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1159918083} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1159918085} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &1166163658 GameObject: m_ObjectHideFlags: 0 @@ -5861,126 +5091,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1217258839} m_CullTransparentMesh: 1 ---- !u!1 &1230206838 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1230206839} - - component: {fileID: 1230206841} - - component: {fileID: 1230206840} - - component: {fileID: 1230206842} - m_Layer: 0 - m_Name: "\u53EC\u5524\u5361" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1230206839 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1230206838} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 393807740} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40, y: -107} - m_SizeDelta: {x: 56, y: 64} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1230206840 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1230206838} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 51e6fb12f3138424b8ed70848955769d, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1230206841 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1230206838} - m_CullTransparentMesh: 1 ---- !u!114 &1230206842 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1230206838} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1230206840} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &1242213261 GameObject: m_ObjectHideFlags: 0 @@ -6491,82 +5601,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1426290880} m_CullTransparentMesh: 1 ---- !u!1 &1442049952 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1442049953} - - component: {fileID: 1442049955} - - component: {fileID: 1442049954} - m_Layer: 0 - m_Name: BY_PlaneInfoPanel2_2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1442049953 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1442049952} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1898979278} - m_Father: {fileID: 1703182077} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 37.5, y: -37.5} - m_SizeDelta: {x: 59, y: 59} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1442049954 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1442049952} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c5fbedec371f0c44192a3f69e600541e, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1442049955 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1442049952} - m_CullTransparentMesh: 1 --- !u!1 &1454440209 GameObject: m_ObjectHideFlags: 0 @@ -6933,145 +5967,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1703182076 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1703182077} - - component: {fileID: 1703182081} - - component: {fileID: 1703182080} - - component: {fileID: 1703182079} - - component: {fileID: 1703182078} - - component: {fileID: 1703182082} - m_Layer: 0 - m_Name: "\u56FE\u5C42 2" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1703182077 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1703182076} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1442049953} - m_Father: {fileID: 920468903} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 213.00006, y: 25.5} - m_SizeDelta: {x: 75, y: 75} - m_Pivot: {x: -0.00000016950071, y: 0.5} ---- !u!114 &1703182078 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1703182076} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 1 - m_VerticalFit: 0 ---- !u!114 &1703182079 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1703182076} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 8 - m_Right: 8 - m_Top: 8 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 3.67 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &1703182080 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1703182076} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 58ab346c9b9787f409630325857dc91b, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1703182081 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1703182076} - m_CullTransparentMesh: 1 ---- !u!114 &1703182082 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1703182076} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!1 &1760199023 GameObject: m_ObjectHideFlags: 0 @@ -7626,81 +6521,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1830800392} m_CullTransparentMesh: 1 ---- !u!1 &1898979277 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1898979278} - - component: {fileID: 1898979280} - - component: {fileID: 1898979279} - m_Layer: 0 - m_Name: special_item_0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1898979278 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1898979277} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1442049953} - 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: -1, y: -5} - m_SizeDelta: {x: 31, y: 45} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1898979279 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1898979277} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c9d9bfeb57b17f2429b33797d4791fcc, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1898979280 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1898979277} - m_CullTransparentMesh: 1 --- !u!1 &1916312893 GameObject: m_ObjectHideFlags: 0 @@ -8155,81 +6975,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2016282716} m_CullTransparentMesh: 1 ---- !u!1 &2071352967 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2071352968} - - component: {fileID: 2071352970} - - component: {fileID: 2071352969} - m_Layer: 0 - m_Name: "\u9053\u5177" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2071352968 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2071352967} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2092297742} - 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.5, y: -17.99997} - m_SizeDelta: {x: 33, y: 16} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2071352969 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2071352967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2fd086f5362b7b44bafa9d86bc429dd6, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2071352970 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2071352967} - m_CullTransparentMesh: 1 --- !u!1 &2075409194 GameObject: m_ObjectHideFlags: 0 @@ -8721,149 +7466,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioMixer: {fileID: 24100000, guid: ca43f9a7549657a49a2978e97c7a621a, type: 2} ---- !u!1 &2092297741 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2092297742} - - component: {fileID: 2092297744} - - component: {fileID: 2092297743} - - component: {fileID: 2092297746} - - component: {fileID: 2092297745} - m_Layer: 0 - m_Name: "\u56FE\u5C42 9" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2092297742 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2092297741} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2071352968} - - {fileID: 393807740} - m_Father: {fileID: 920468904} - 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: 74, y: -56.00003} - m_SizeDelta: {x: 44, y: 36} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2092297743 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2092297741} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8cdc3ba368ba14b4ab61c7302d37b6c6, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2092297744 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2092297741} - m_CullTransparentMesh: 1 ---- !u!114 &2092297745 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2092297741} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &2092297746 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2092297741} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 2092297743} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!114 &253829674362749262 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/Scripts/Turret/SitPosData.cs b/Assets/MyGame/Scripts/Turret/SitPosData.cs index 6914925de..8baec8633 100644 --- a/Assets/MyGame/Scripts/Turret/SitPosData.cs +++ b/Assets/MyGame/Scripts/Turret/SitPosData.cs @@ -951,7 +951,8 @@ public class SitPosData : MonoBehaviour, IPointerDownHandler, IPointerUpHandler } /// - /// 显示文字表情：先激活 ziObj，延迟一帧再设置 child0（TextMeshProUGUI）的文字， + /// 显示文字表情：先设置文字再激活 ziObj，激活后立即强制刷新两级 ContentSizeFitter + /// （child0 的 TMP 自身 + 父物体），避免宽度延迟一帧才更新。 /// biaoQingDuration 秒后自动隐藏。与 spine 表情互斥（同时只显示一种）。 /// /// 文字内容 @@ -967,19 +968,18 @@ public class SitPosData : MonoBehaviour, IPointerDownHandler, IPointerUpHandler if (spineObj != null) spineObj.SetActive(false); if (_biaoQingCoroutine != null) { StopCoroutine(_biaoQingCoroutine); _biaoQingCoroutine = null; } - // ⭐ 先激活，延迟一帧再设置字体：TMP 激活当帧设置 text 可能不刷新（显示旧字/默认字） + // ⭐ 先设置字，再激活：TMP 非激活时改字不会向布局系统注册重建，激活后统一处理 + tmp.text = text; ziObj.SetActive(true); - _biaoQingCoroutine = StartCoroutine(ShowBiaoQingZiRoutine(tmp, text)); - } - /// 文字表情协程：延迟一帧设置文字 → 显示 biaoQingDuration 秒 → 自动隐藏 - private IEnumerator ShowBiaoQingZiRoutine(TextMeshProUGUI tmp, string text) - { - yield return null; // 等一帧，激活完成后再改字 - if (tmp != null) tmp.text = text; - yield return new WaitForSeconds(biaoQingDuration); - if (ziObj != null) ziObj.SetActive(false); - _biaoQingCoroutine = null; + // ⭐ 激活后立即按"先子后父"顺序强制刷新两级 ContentSizeFitter： + // 子级 TMP 先算出新宽度，父级 Fitter 再根据子级新宽度收缩， + // 否则布局要等帧末才重建，当帧读到的还是旧宽度 + LayoutRebuilder.ForceRebuildLayoutImmediate(tmp.rectTransform); + LayoutRebuilder.ForceRebuildLayoutImmediate(ziObj.transform as RectTransform); + Canvas.ForceUpdateCanvases(); + + _biaoQingCoroutine = StartCoroutine(HideBiaoQingAfter(ziObj)); } /// 表情显示 biaoQingDuration 秒后自动隐藏 diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/display_FishEntry_4022.prefab b/Assets/MyGame/aa/Game/ZhanShen/Game/display_FishEntry_4022.prefab index 2a5f0a0d2..8c58fce0e 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/Game/display_FishEntry_4022.prefab +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/display_FishEntry_4022.prefab @@ -607,7 +607,7 @@ MonoBehaviour: type: 3} laserWidth: 3 laserColor: {r: 1, g: 0.3, b: 0.3, a: 0.9} - laserLengthCorrect: 1 + laserLengthCorrect: 0.1 turretNumber: 0 turretType: 1 displayName: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14901_0_dev.prefab b/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14901_0_dev.prefab index 0ad492100..0ff40fa41 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14901_0_dev.prefab +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14901_0_dev.prefab @@ -576,12 +576,12 @@ PrefabInstance: - target: {fileID: 3368964918331985250, guid: ffe5b917cd8f21941adf54c437e9a701, type: 3} propertyPath: m_LocalRotation.w - value: 0.49999994 + value: 0.64278764 objectReference: {fileID: 0} - target: {fileID: 3368964918331985250, guid: ffe5b917cd8f21941adf54c437e9a701, type: 3} propertyPath: m_LocalRotation.x - value: -0.86602545 + value: -0.7660445 objectReference: {fileID: 0} - target: {fileID: 3368964918331985250, guid: ffe5b917cd8f21941adf54c437e9a701, type: 3} @@ -596,7 +596,7 @@ PrefabInstance: - target: {fileID: 3368964918331985250, guid: ffe5b917cd8f21941adf54c437e9a701, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -120 + value: -100 objectReference: {fileID: 0} - target: {fileID: 3368964918331985250, guid: ffe5b917cd8f21941adf54c437e9a701, type: 3} @@ -1522,7 +1522,7 @@ MonoBehaviour: bulletPrefab_Two: {fileID: 0} bulletPrefab: {fileID: 6670333658430945950, guid: 8fe85e61b2779ff49a78511b999887b7, type: 3} - laserPrefab: {fileID: 5897679978818280078, guid: f968506c49fa41842bb684eb1e7016ac, + laserPrefab: {fileID: 5294742924000077673, guid: 4e8a4d64710e62e4cb4eb4d0bb55758f, type: 3} laserWidth: 3 laserColor: {r: 1, g: 0.3, b: 0.3, a: 0.9} @@ -1556,7 +1556,7 @@ MonoBehaviour: type: 3} JGHitFXPrefab: {fileID: 7295806364047431194, guid: 080eb186e56776942b012e4f8177f4f7, type: 3} - selfOffsetJGStart: {x: 90, y: 400} + selfOffsetJGStart: {x: 30, y: 170} buttomOffsetZSRotateInit: {x: 0, y: 0, z: 0} topOffsetZSRotateInit: {x: -125, y: 0, z: 0} --- !u!95 &8661363738911940257 stripped diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14902_0_dev.prefab b/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14902_0_dev.prefab index 1982cce09..87f164673 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14902_0_dev.prefab +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_14902_0_dev.prefab @@ -71,12 +71,12 @@ PrefabInstance: - target: {fileID: 73765426979110781, guid: 83f830ab856bfc642b235330651c6513, type: 3} propertyPath: m_LocalRotation.w - value: 0.49999994 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 73765426979110781, guid: 83f830ab856bfc642b235330651c6513, type: 3} propertyPath: m_LocalRotation.x - value: -0.86602545 + value: -0.7071068 objectReference: {fileID: 0} - target: {fileID: 73765426979110781, guid: 83f830ab856bfc642b235330651c6513, type: 3} @@ -91,7 +91,7 @@ PrefabInstance: - target: {fileID: 73765426979110781, guid: 83f830ab856bfc642b235330651c6513, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -120 + value: -90 objectReference: {fileID: 0} - target: {fileID: 73765426979110781, guid: 83f830ab856bfc642b235330651c6513, type: 3} @@ -3761,7 +3761,7 @@ MonoBehaviour: type: 3} laserWidth: 3 laserColor: {r: 1, g: 0.3, b: 0.3, a: 0.9} - laserLengthCorrect: 0.145 + laserLengthCorrect: 0.16 turretNumber: 0 turretType: 1 displayName: @@ -3791,7 +3791,7 @@ MonoBehaviour: type: 3} JGHitFXPrefab: {fileID: 8868472629103351600, guid: 7710811b4a7a0c247b198169050755fe, type: 3} - selfOffsetJGStart: {x: 55, y: 480} + selfOffsetJGStart: {x: 15, y: 150} buttomOffsetZSRotateInit: {x: 0, y: 0, z: 0} topOffsetZSRotateInit: {x: -125, y: 0, z: 0} --- !u!95 &3827418405087986554 stripped diff --git a/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_in_14053_0_dev.prefab b/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_in_14053_0_dev.prefab index 355c80719..7ad412a35 100644 --- a/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_in_14053_0_dev.prefab +++ b/Assets/MyGame/aa/Game/ZhanShen/Game/display_wargod_in_14053_0_dev.prefab @@ -933,11 +933,11 @@ MonoBehaviour: bulletPrefab_Two: {fileID: 0} bulletPrefab: {fileID: 6300000819753586713, guid: b8f336cf2aed76541ae9e48d99280a5b, type: 3} - laserPrefab: {fileID: 5897679978818280078, guid: f968506c49fa41842bb684eb1e7016ac, + laserPrefab: {fileID: 8282812116592331526, guid: 011d6daac6096ee4c80a7b2e7c8731bf, type: 3} laserWidth: 3 laserColor: {r: 1, g: 0.3, b: 0.3, a: 0.9} - laserLengthCorrect: 1 + laserLengthCorrect: 0.143 turretNumber: 0 turretType: 1 displayName: diff --git a/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab b/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab index ce447543f..d07fd3f47 100644 --- a/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab +++ b/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab @@ -3882,6 +3882,10 @@ MonoBehaviour: dalaba: {fileID: 0} zhanhuanka: {fileID: 0} huojianpao: {fileID: 0} + obj_DaLaBaPanel: {fileID: 0} + tmp_DaLaBaInput: {fileID: 0} + btn_DaLaBaSend: {fileID: 0} + btn_DaLaBaClose: {fileID: 0} btn_SettingList: {fileID: 8183400499693274360} SittingListParent: {fileID: 3985212453111435068} btn_TuJian: {fileID: 8299373129192596900} @@ -7410,7 +7414,7 @@ PrefabInstance: - target: {fileID: 3429558903206714841, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} @@ -7420,7 +7424,7 @@ PrefabInstance: - target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5494969937974881520, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} diff --git a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs index 1ab27e885..d9659083e 100644 --- a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs +++ b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs @@ -120,6 +120,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base public string sceneName; public GameTypeEnum gameType; [Header("Left")] + public PropConfigData propConfigData; // 道具菜单配置（Assets右键 Create → MyGame → 左侧道具配置） public Button btn_Prop; public GameObject obj_PropItemParent; public GameObject obj_PropPanel; @@ -132,6 +133,12 @@ public class GameMainPanel_FishBase : GameMainPanel_Base public Button zhanhuanka; public Button huojianpao; + [Header("大喇叭弹幕输入")] + public GameObject obj_DaLaBaPanel; // 大喇叭弹幕输入面板 + public TMP_InputField tmp_DaLaBaInput; // 弹幕输入框 + public Button btn_DaLaBaSend; // 发送按钮 + public Button btn_DaLaBaClose; // 关闭按钮 + [Header("Right")] [Header("设置")] protected bool isOpenSetting; @@ -580,15 +587,39 @@ public class GameMainPanel_FishBase : GameMainPanel_Base if (btn_ChangeRoom != null) btn_ChangeRoom.onClick.AddListener(StartChangeRoom); - // ⭐ 左侧道具按钮：只做开启/关闭 obj_PropPanel - // （第二层 tmp_PropTwoPanel/tmp_PropTwoItem 等暂不实现，字段先留着） + // ⭐ 左侧道具按钮：开启/关闭 obj_PropPanel（一级列表由 PropConfigData 配置构建， + // 点击一级道具在 tmp_PropTwoPanel 展开二级子道具） if (btn_Prop != null) btn_Prop.onClick.AddListener(() => { - if (obj_PropPanel != null) - obj_PropPanel.SetActive(!obj_PropPanel.activeSelf); + if (obj_PropPanel == null) return; + bool open = !obj_PropPanel.activeSelf; + obj_PropPanel.SetActive(open); + if (open) + BuildPropList(); + else if (tmp_PropTwoPanel != null) + tmp_PropTwoPanel.SetActive(false); }); + // ⭐ 大喇叭：开/关弹幕输入面板 + if (dalaba != null) + dalaba.onClick.AddListener(() => + { + if (obj_DaLaBaPanel != null) + obj_DaLaBaPanel.SetActive(!obj_DaLaBaPanel.activeSelf); + }); + if (btn_DaLaBaSend != null) + btn_DaLaBaSend.onClick.AddListener(OnClickDaLaBaSend); + if (btn_DaLaBaClose != null) + btn_DaLaBaClose.onClick.AddListener(() => + { + if (obj_DaLaBaPanel != null) obj_DaLaBaPanel.SetActive(false); + }); + + // ⭐ 召唤卡：使用召唤卡召唤Boss + if (zhanhuanka != null) + zhanhuanka.onClick.AddListener(OnClickZhanHuanKa); + // 服务器广播监听 EventCenter.Instance.AddEventListener(ConstEventString.SyncGameData_Rotate, SyncGameData_Rotate); EventCenter.Instance.AddEventListener(ConstEventString.SyncGameData_FireBullet, SyncGameData_FireBullit); @@ -1394,6 +1425,174 @@ public class GameMainPanel_FishBase : GameMainPanel_Base #endregion + #region 大喇叭/召唤卡（Left道具快捷按钮） + + /// + /// 大喇叭发送：输入弹幕 → /api/Hall/SendBroadcast 全服广播 + /// （与背包大喇叭 OnClickFaSong 流程一致），发送成功后清空输入框并关闭面板。 + /// + private void OnClickDaLaBaSend() + { + string msg = tmp_DaLaBaInput?.text?.Trim(); + if (string.IsNullOrEmpty(msg)) + { + UIManager.Instance.ShowBoardError("请输入广播内容"); + return; + } + + APIRequestList.SendBroadcast("广播:" + msg, (result) => + { + // 发送成功：清空输入框并关闭面板（广播内容会通过 LoginBroadcast 全服弹幕显示） + if (tmp_DaLaBaInput != null) tmp_DaLaBaInput.text = ""; + if (obj_DaLaBaPanel != null) obj_DaLaBaPanel.SetActive(false); + }); + } + + /// + /// 使用召唤卡：从背包找到召唤卡道具（type=11）拿道具编号 + /// → /api/SummonCard/use 召唤Boss（Boss鱼由服务端 OnFishSpawn 下发给房间所有人） + /// → 显示服务器返回消息 + 拉取最新用户数据同步道具数量。 + /// + private void OnClickZhanHuanKa() + { + var props = GameManager.Instance.user?.props; + if (props != null) + { + foreach (var p in props) + { + if (p.type == (int)PropEnum.召唤卡 && p.count > 0) + { + APIRequestList.UseSummonCard( + new Assets.MyGame.Scripts.Net.APIRequest.Params.SummonCardUseParam { cardNumber = p.number }, + (msg) => + { + UIManager.Instance.ShowBoardError(string.IsNullOrEmpty(msg) ? "使用成功" : msg); + // 刷新用户数据，同步召唤卡剩余数量 + APIRequestList.GetUser((user) => + { + if (user != null) + GameManager.Instance.UpdataUserData(user); + }); + }); + return; + } + } + } + UIManager.Instance.ShowBoardError("召唤卡数量不足"); + } + + #endregion + + #region 左侧道具菜单（PropConfigData 一级道具 + 二级展开子道具） + + private bool _propListBuilt; + + /// + /// 按 PropConfigData 构建一级道具列表（只在首次打开时构建一次） + /// + private void BuildPropList() + { + if (_propListBuilt) return; + _propListBuilt = true; + if (propConfigData == null || tmp_PropItem == null || obj_PropItemParent == null) return; + + // ⭐ 模板是场景内对象时先隐藏（引用指向预制体资产时 scene 无效，不能 SetActive 以免改资产） + if (tmp_PropItem.scene.IsValid()) tmp_PropItem.SetActive(false); + + for (int i = 0; i < propConfigData.props.Count; i++) + { + var cfg = propConfigData.props[i]; + if (cfg == null) continue; + var item = Instantiate(tmp_PropItem, obj_PropItemParent.transform); + SetPropItemText(item, cfg.name); + SetPropItemIcon(item, cfg.icon); + var data = cfg; // 闭包捕获当前项，避免循环变量被覆盖 + var btn = GetPropItemButton(item); + if (btn != null) btn.onClick.AddListener(() => ShowPropTwo(data)); + } + } + + /// + /// 点击一级道具：在 tmp_PropTwoPanel 内按配置展开二级子道具列表 + /// + private void ShowPropTwo(PropItemData cfg) + { + if (cfg == null || tmp_PropTwoPanel == null || tmp_PropTwoItem == null || tmp_PropTwoItemParent == null) return; + + // 清空上次克隆的子道具（模板本身若是该父对象的子节点则跳过） + for (int i = tmp_PropTwoItemParent.transform.childCount - 1; i >= 0; i--) + { + var child = tmp_PropTwoItemParent.transform.GetChild(i).gameObject; + if (child == tmp_PropTwoItem) continue; + Destroy(child); + } + + // ⚠ 注意：这里判断的是 tmp_PropTwoItem（不是 tmp_PropItem） + if (tmp_PropTwoItem.scene.IsValid()) tmp_PropTwoItem.SetActive(false); + + foreach (var sub in cfg.subProps) + { + if (sub == null) continue; + var item = Instantiate(tmp_PropTwoItem, tmp_PropTwoItemParent.transform); + SetPropItemText(item, sub.name); + SetPropItemIcon(item, sub.icon); + var data = sub; + var btn = GetPropItemButton(item); + if (btn != null) btn.onClick.AddListener(() => UsePropEffect(data)); + } + tmp_PropTwoPanel.SetActive(true); + } + + /// + /// 点击二级子道具：按枚举 effectType 分发效果（未接入的类型统一提示） + /// + private void UsePropEffect(SubPropData sub) + { + if (sub == null) return; + switch (sub.effectType) + { + case PropEffectType.大喇叭: + if (obj_DaLaBaPanel != null) obj_DaLaBaPanel.SetActive(true); + break; + case PropEffectType.召唤卡: + OnClickZhanHuanKa(); + break; + default: + UIManager.Instance.ShowBoardError($"[{sub.effectType}] 效果暂未接入"); + break; + } + } + + /// 克隆项文本：优先取 child0 的 TMP，再退回自身/子级查找（与表情列表同惯例） + private void SetPropItemText(GameObject item, string text) + { + if (string.IsNullOrEmpty(text)) return; + var tmp = item.transform.childCount > 0 ? item.transform.GetChild(0).GetComponent() : null; + if (tmp == null) tmp = item.GetComponent(); + if (tmp == null) tmp = item.GetComponentInChildren(); + if (tmp != null) tmp.text = text; + } + + /// 克隆项图标：优先取 child0 的 Image，再退回自身/子级查找（icon 不填则跳过） + private void SetPropItemIcon(GameObject item, Sprite icon) + { + if (icon == null) return; + var img = item.transform.childCount > 0 ? item.transform.GetChild(0).GetComponent() : null; + if (img == null) img = item.GetComponent(); + if (img == null) img = item.GetComponentInChildren(); + if (img != null) img.sprite = icon; + } + + /// 克隆项按钮：自身优先，其次子级查找 + private Button GetPropItemButton(GameObject item) + { + var btn = item.GetComponent