From 3a93a719214c6b9c500c0f26d70edbc3c4027864 Mon Sep 17 00:00:00 2001 From: lq <3298408835@qq.com> Date: Thu, 28 Nov 2024 01:31:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=89=A7=E6=9C=AC=E5=92=8C?= =?UTF-8?q?=E7=96=8F=E6=95=A3=E4=BA=BA=E7=BE=A4=E5=85=AC=E5=B8=83=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PanelPrefabs/EvacuationPanel.prefab | 462 ++++-------------- .../PanelPrefabs/PersonnelPanel.prefab | 198 ++++---- xiaofang/Assets/Prefabs/scenceItem.prefab | 383 --------------- .../Assets/Prefabs/scenceItem.prefab.meta | 7 - xiaofang/Assets/Scenes/Schedule_03.unity | 180 ++++--- xiaofang/Assets/Script/Scheduled_03/Panel.cs | 2 +- .../Assets/Script/UI/PanelUI/ManagerPanel.cs | 59 +-- 7 files changed, 348 insertions(+), 943 deletions(-) delete mode 100644 xiaofang/Assets/Prefabs/scenceItem.prefab delete mode 100644 xiaofang/Assets/Prefabs/scenceItem.prefab.meta diff --git a/xiaofang/Assets/Prefabs/PanelPrefabs/EvacuationPanel.prefab b/xiaofang/Assets/Prefabs/PanelPrefabs/EvacuationPanel.prefab index 02eee87b..f7dacf14 100644 --- a/xiaofang/Assets/Prefabs/PanelPrefabs/EvacuationPanel.prefab +++ b/xiaofang/Assets/Prefabs/PanelPrefabs/EvacuationPanel.prefab @@ -1388,163 +1388,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6860689922999585110 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6860689922999585105} - - component: {fileID: 6860689922999585107} - - component: {fileID: 6860689922999585104} - m_Layer: 5 - m_Name: Text (Legacy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6860689922999585105 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6860689922999585110} - 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: 6860689923120608472} - 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: 46.03064, y: -0.00017023} - m_SizeDelta: {x: 46.2093, y: 40.417} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6860689922999585107 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6860689922999585110} - m_CullTransparentMesh: 1 ---- !u!114 &6860689922999585104 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6860689922999585110} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 68 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 5 ---- !u!1 &6860689923120608473 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6860689923120608472} - - component: {fileID: 6860689923120608474} - - component: {fileID: 6860689923120608475} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6860689923120608472 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6860689923120608473} - 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: 6860689922999585105} - m_Father: {fileID: 6860689924133376962} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 188, y: -1.8999939} - m_SizeDelta: {x: -171.3719, y: -8.7463} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6860689923120608474 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6860689923120608473} - m_CullTransparentMesh: 1 ---- !u!114 &6860689923120608475 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6860689923120608473} - 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: 375aaf8f01c4ad540a4ddd28bc8f5add, 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!1 &6860689923216922051 GameObject: m_ObjectHideFlags: 0 @@ -3625,129 +3468,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u95E8\u536B\u5BA4" ---- !u!1 &6860689924133376963 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6860689924133376962} - - component: {fileID: 6860689924133376991} - - component: {fileID: 6860689924133376988} - - component: {fileID: 6860689924133376989} - m_Layer: 5 - m_Name: kitchenBtn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6860689924133376962 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6860689924133376963} - 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: 6860689924220053897} - - {fileID: 6860689923120608472} - m_Father: {fileID: 6860689923811984865} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 211.6828, y: 49.1634} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6860689924133376991 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6860689924133376963} - m_CullTransparentMesh: 1 ---- !u!114 &6860689924133376988 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6860689924133376963} - 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: 0} - 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: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - 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!114 &6860689924133376989 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6860689924133376963} - 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: 6860689924133376988} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &6860689924160645766 GameObject: m_ObjectHideFlags: 0 @@ -3870,86 +3590,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &6860689924220053902 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6860689924220053897} - - component: {fileID: 6860689924220053899} - - component: {fileID: 6860689924220053896} - m_Layer: 5 - m_Name: Text (Legacy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6860689924220053897 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6860689924220053902} - 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: 6860689924133376962} - 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_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6860689924220053899 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6860689924220053902} - m_CullTransparentMesh: 1 ---- !u!114 &6860689924220053896 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6860689924220053902} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 32 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u53A8\u623F" --- !u!1 &6860689924291490495 GameObject: m_ObjectHideFlags: 0 @@ -4225,3 +3865,105 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 5 +--- !u!1001 &884348542150475701 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6860689923811984865} + m_Modifications: + - target: {fileID: 6013369223040019574, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_Name + value: peoplePrefab + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_SizeDelta.x + value: 211.6828 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_SizeDelta.y + value: 49.1634 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} +--- !u!224 &6860689924133376962 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6013369223040019575, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} + m_PrefabInstance: {fileID: 884348542150475701} + m_PrefabAsset: {fileID: 0} diff --git a/xiaofang/Assets/Prefabs/PanelPrefabs/PersonnelPanel.prefab b/xiaofang/Assets/Prefabs/PanelPrefabs/PersonnelPanel.prefab index 6aff1643..42b031de 100644 --- a/xiaofang/Assets/Prefabs/PanelPrefabs/PersonnelPanel.prefab +++ b/xiaofang/Assets/Prefabs/PanelPrefabs/PersonnelPanel.prefab @@ -462,9 +462,9 @@ RectTransform: m_Father: {fileID: 5032012484100695601} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -387.12698} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012484015947537 @@ -499,9 +499,9 @@ RectTransform: m_Father: {fileID: 5032012484270979575} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -412.33148} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 58.599} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012484019563506 @@ -786,9 +786,9 @@ RectTransform: m_Father: {fileID: 5032012484270979575} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -125.057495} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 58.599} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012484036836432 @@ -1514,9 +1514,9 @@ RectTransform: m_Father: {fileID: 5032012484270979575} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -555.9685} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 58.599} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012484147543054 @@ -1553,9 +1553,9 @@ RectTransform: m_Father: {fileID: 5032012484269811622} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -270.519} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 54.782} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5032012484147543040 @@ -1650,9 +1650,9 @@ RectTransform: m_Father: {fileID: 5032012484270979575} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -364.45248} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 58.599} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012484182716486 @@ -2111,9 +2111,9 @@ RectTransform: m_Father: {fileID: 5032012484270979575} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -747.4846} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 58.599} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012484237691829 @@ -2148,9 +2148,9 @@ RectTransform: m_Father: {fileID: 5032012484270979575} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -651.72656} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 58.599} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012484245166984 @@ -2267,9 +2267,9 @@ RectTransform: m_Father: {fileID: 5032012484269811622} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -148.955} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 54.782} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5032012484261347884 @@ -2684,9 +2684,9 @@ RectTransform: m_Father: {fileID: 5032012484269811622} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -331.301} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 54.782} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5032012484284614244 @@ -2820,9 +2820,9 @@ RectTransform: m_Father: {fileID: 5032012484270979575} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -603.84753} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 58.599} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012484331943027 @@ -2858,9 +2858,9 @@ RectTransform: m_Father: {fileID: 5032012484100695601} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -146.935} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012484335586711 @@ -2896,9 +2896,9 @@ RectTransform: m_Father: {fileID: 5032012484100695601} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -86.887} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012484355293258 @@ -3435,9 +3435,9 @@ RectTransform: m_Father: {fileID: 5032012484269811622} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -27.391} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 54.782} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5032012484402079348 @@ -4325,9 +4325,9 @@ RectTransform: m_Father: {fileID: 5032012484270979575} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -268.6945} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 58.599} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012484606154567 @@ -4672,9 +4672,9 @@ RectTransform: m_Father: {fileID: 5032012484100695601} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -507.223} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012484663071676 @@ -4709,9 +4709,9 @@ RectTransform: m_Father: {fileID: 5032012484270979575} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -220.81549} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 58.599} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012484697694803 @@ -4982,9 +4982,9 @@ RectTransform: m_Father: {fileID: 5032012484270979575} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -77.1785} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 58.599} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012484798089661 @@ -5019,9 +5019,9 @@ RectTransform: m_Father: {fileID: 5032012484270979575} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -699.6056} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 58.599} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012484805430982 @@ -6094,9 +6094,9 @@ RectTransform: m_Father: {fileID: 5032012484270979575} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -29.2995} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 58.599} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012485101818732 @@ -6413,9 +6413,9 @@ RectTransform: m_Father: {fileID: 5032012484100695601} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -447.175} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012485126337745 @@ -6450,9 +6450,9 @@ RectTransform: m_Father: {fileID: 5032012484270979575} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -316.5735} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 58.599} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012485136534363 @@ -6569,9 +6569,9 @@ RectTransform: m_Father: {fileID: 5032012484269811622} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -209.73701} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 54.782} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5032012485245156433 @@ -6831,9 +6831,9 @@ RectTransform: m_Father: {fileID: 5032012484100695601} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -567.271} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012485315367250 @@ -6909,9 +6909,9 @@ RectTransform: m_Father: {fileID: 5032012484100695601} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -327.07898} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012485383888144 @@ -7147,9 +7147,9 @@ RectTransform: m_Father: {fileID: 5032012484270979575} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -508.08948} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 58.599} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012485396403453 @@ -7185,9 +7185,9 @@ RectTransform: m_Father: {fileID: 5032012484100695601} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -26.839} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012485439363397 @@ -7505,9 +7505,9 @@ RectTransform: m_Father: {fileID: 5032012484269811622} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -88.173004} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 54.782} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5032012485469718050 @@ -7852,9 +7852,9 @@ RectTransform: m_Father: {fileID: 5032012484270979575} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -460.21048} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 58.599} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012485589253848 @@ -7981,9 +7981,9 @@ RectTransform: m_Father: {fileID: 5032012484100695601} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -206.983} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012485692566248 @@ -8546,9 +8546,9 @@ RectTransform: m_Father: {fileID: 5032012484100695601} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -267.031} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012485756992581 @@ -9496,9 +9496,9 @@ RectTransform: m_Father: {fileID: 5032012484269811622} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -392.083} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 54.782} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5032012485987885526 @@ -9593,9 +9593,9 @@ RectTransform: m_Father: {fileID: 5032012484270979575} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 194.0772, y: -172.9365} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 388.1544, y: 58.599} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5032012485992265966 diff --git a/xiaofang/Assets/Prefabs/scenceItem.prefab b/xiaofang/Assets/Prefabs/scenceItem.prefab deleted file mode 100644 index dbc6b391..00000000 --- a/xiaofang/Assets/Prefabs/scenceItem.prefab +++ /dev/null @@ -1,383 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4948242153488973737 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4948242153488973718} - - component: {fileID: 4948242153488973716} - - component: {fileID: 4948242153488973719} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4948242153488973718 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4948242153488973737} - 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: 4948242154612453632} - 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: 0.0001, y: -21.1981} - m_SizeDelta: {x: 360, y: 360} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4948242153488973716 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4948242153488973737} - m_CullTransparentMesh: 1 ---- !u!114 &4948242153488973719 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4948242153488973737} - 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: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - 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!1 &4948242153928383527 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4948242153928383524} - - component: {fileID: 4948242153928383522} - - component: {fileID: 4948242153928383525} - m_Layer: 5 - m_Name: hightlight - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4948242153928383524 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4948242153928383527} - 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: 4948242154612453632} - 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: 0} - m_SizeDelta: {x: 408, y: 480} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4948242153928383522 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4948242153928383527} - m_CullTransparentMesh: 1 ---- !u!114 &4948242153928383525 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4948242153928383527} - 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: 2ee846e59d3b47f46b2b2dc7a0c49d4c, 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!1 &4948242154612453635 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4948242154612453632} - - component: {fileID: 4948242154612453646} - - component: {fileID: 4948242154612453633} - - component: {fileID: 4948242154612453647} - - component: {fileID: 4948242154612453644} - m_Layer: 5 - m_Name: scenceItem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4948242154612453632 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4948242154612453635} - 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: 4948242153928383524} - - {fileID: 4948242154808829861} - - {fileID: 4948242153488973718} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 382, y: 458} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4948242154612453646 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4948242154612453635} - m_CullTransparentMesh: 1 ---- !u!114 &4948242154612453633 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4948242154612453635} - 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: 507b62acbf0032142a50bb994ee8805f, 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!114 &4948242154612453647 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4948242154612453635} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: 0 - m_MinHeight: 0 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &4948242154612453644 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4948242154612453635} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, 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: 21300000, guid: 2ee846e59d3b47f46b2b2dc7a0c49d4c, type: 3} - 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: 4948242154612453633} - toggleTransition: 1 - graphic: {fileID: 4948242153928383525} - m_Group: {fileID: 0} - onValueChanged: - m_PersistentCalls: - m_Calls: [] - m_IsOn: 1 ---- !u!1 &4948242154808829860 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4948242154808829861} - - component: {fileID: 4948242154808829859} - - component: {fileID: 4948242154808829858} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4948242154808829861 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4948242154808829860} - 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: 4948242154612453632} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -33.27974, y: -51.6} - m_SizeDelta: {x: 204.8405, y: 36.146698} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4948242154808829859 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4948242154808829860} - m_CullTransparentMesh: 1 ---- !u!114 &4948242154808829858 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4948242154808829860} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u5B66\u6821" diff --git a/xiaofang/Assets/Prefabs/scenceItem.prefab.meta b/xiaofang/Assets/Prefabs/scenceItem.prefab.meta deleted file mode 100644 index b9bc7790..00000000 --- a/xiaofang/Assets/Prefabs/scenceItem.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 78fe1dd7452b1b641ba0043d518aa5e6 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/xiaofang/Assets/Scenes/Schedule_03.unity b/xiaofang/Assets/Scenes/Schedule_03.unity index fc55af2a..9bf86d7f 100644 --- a/xiaofang/Assets/Scenes/Schedule_03.unity +++ b/xiaofang/Assets/Scenes/Schedule_03.unity @@ -2081,9 +2081,9 @@ RectTransform: m_Father: {fileID: 1034927193} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194.0772, y: -507.223} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &501141510 @@ -2825,9 +2825,9 @@ RectTransform: m_Father: {fileID: 666058190} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194.0772, y: -148.955} m_SizeDelta: {x: 388.1544, y: 54.782} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &607262788 @@ -3077,8 +3077,6 @@ MonoBehaviour: personItemPrefab: {fileID: 8573669611114071623, guid: d1942d5ee12cbec428172f221efb03cc, type: 3} scenePanelPrefab: {fileID: 6740850324693622957, guid: a15ee694d5f79864d816998fae77116d, type: 3} sceneText: {fileID: 0} - nameText: {fileID: 0} - dutyText: {fileID: 0} --- !u!1 &618256458 GameObject: m_ObjectHideFlags: 0 @@ -3352,9 +3350,9 @@ RectTransform: m_Father: {fileID: 666058190} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194.0772, y: -331.301} m_SizeDelta: {x: 388.1544, y: 54.782} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &647306252 @@ -3461,7 +3459,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -193.59004, y: 309.82907} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 388.1544, y: 419.47403} m_Pivot: {x: 0, y: 1} --- !u!114 &666058191 MonoBehaviour: @@ -3553,7 +3551,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -193.59004, y: 309.8263} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 388.1544, y: 58.599} m_Pivot: {x: 0, y: 1} --- !u!114 &667280288 MonoBehaviour: @@ -3628,9 +3626,9 @@ RectTransform: m_Father: {fileID: 1034927193} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194.0772, y: -146.935} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &709540181 @@ -3791,9 +3789,9 @@ RectTransform: m_Father: {fileID: 1034927193} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194.0772, y: -86.887} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &756518356 stripped @@ -4083,9 +4081,9 @@ RectTransform: m_Father: {fileID: 666058190} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194.0772, y: -27.391} m_SizeDelta: {x: 388.1544, y: 54.782} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &798325788 @@ -7122,9 +7120,9 @@ RectTransform: m_Father: {fileID: 1034927193} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194.0772, y: -387.12698} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &969942584 @@ -7651,7 +7649,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -193.59004, y: 309.8263} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 388.1544, y: 594.11} m_Pivot: {x: 0, y: 1} --- !u!114 &1034927194 MonoBehaviour: @@ -7803,9 +7801,9 @@ RectTransform: m_Father: {fileID: 666058190} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194.0772, y: -270.519} m_SizeDelta: {x: 388.1544, y: 54.782} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1064920680 @@ -9178,9 +9176,9 @@ RectTransform: m_Father: {fileID: 666058190} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194.0772, y: -392.083} m_SizeDelta: {x: 388.1544, y: 54.782} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1294728126 @@ -10164,11 +10162,16 @@ RectTransform: m_Father: {fileID: 1034927193} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194.0772, y: -206.983} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &1533795120 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6860689923811984865, guid: e6f6debb1a995f84dbbd4311e5162317, type: 3} + m_PrefabInstance: {fileID: 1659159078} + m_PrefabAsset: {fileID: 0} --- !u!114 &1553720334 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1373529959439983606, guid: 26d5710936f5f7d468eb5eb9da96112e, type: 3} @@ -10663,9 +10666,9 @@ RectTransform: m_Father: {fileID: 1034927193} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194.0772, y: -267.031} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1600693805 @@ -10683,7 +10686,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1600693806 RectTransform: m_ObjectHideFlags: 0 @@ -11560,9 +11563,9 @@ RectTransform: m_Father: {fileID: 666058190} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194.0772, y: -209.73701} m_SizeDelta: {x: 388.1544, y: 54.782} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1641457209 @@ -11658,9 +11661,9 @@ RectTransform: m_Father: {fileID: 1034927193} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194.0772, y: -567.271} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1659159078 @@ -11686,6 +11689,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -249.62735 objectReference: {fileID: 0} + - target: {fileID: 6860689922290498302, guid: e6f6debb1a995f84dbbd4311e5162317, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6860689922391231205, guid: e6f6debb1a995f84dbbd4311e5162317, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -11702,6 +11709,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -137.10452 objectReference: {fileID: 0} + - target: {fileID: 6860689922391231210, guid: e6f6debb1a995f84dbbd4311e5162317, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6860689922488204263, guid: e6f6debb1a995f84dbbd4311e5162317, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -11750,6 +11761,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -39.08695 objectReference: {fileID: 0} + - target: {fileID: 6860689923351256852, guid: e6f6debb1a995f84dbbd4311e5162317, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6860689923351256855, guid: e6f6debb1a995f84dbbd4311e5162317, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -11766,6 +11781,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -305.88876 objectReference: {fileID: 0} + - target: {fileID: 6860689923675104104, guid: e6f6debb1a995f84dbbd4311e5162317, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6860689923675104107, guid: e6f6debb1a995f84dbbd4311e5162317, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -11810,6 +11829,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -362.15018 objectReference: {fileID: 0} + - target: {fileID: 6860689923991342083, guid: e6f6debb1a995f84dbbd4311e5162317, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6860689924013287785, guid: e6f6debb1a995f84dbbd4311e5162317, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -11826,6 +11849,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -193.36594 objectReference: {fileID: 0} + - target: {fileID: 6860689924013287790, guid: e6f6debb1a995f84dbbd4311e5162317, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6860689924133376962, guid: e6f6debb1a995f84dbbd4311e5162317, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -11842,6 +11869,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -24.5817 objectReference: {fileID: 0} + - target: {fileID: 6860689924133376963, guid: e6f6debb1a995f84dbbd4311e5162317, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6860689924160645761, guid: e6f6debb1a995f84dbbd4311e5162317, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -11957,6 +11988,21 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6860689924291490494, guid: e6f6debb1a995f84dbbd4311e5162317, type: 3} m_PrefabInstance: {fileID: 1659159078} m_PrefabAsset: {fileID: 0} +--- !u!114 &1659159080 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 614771235} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: da23ef65e616ad3499db22bf6ad52794, type: 3} + m_Name: + m_EditorClassIdentifier: + personnelContent: {fileID: 1533795120} + panel: {fileID: 618256462} + personnelPrefabs: {fileID: 6013369223040019574, guid: f04ec64a2be229743b6f9e94c0082cea, type: 3} --- !u!1 &1667887548 GameObject: m_ObjectHideFlags: 0 @@ -13301,9 +13347,9 @@ RectTransform: m_Father: {fileID: 1034927193} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194.0772, y: -327.07898} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1694829370 @@ -13445,9 +13491,9 @@ RectTransform: m_Father: {fileID: 1034927193} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194.0772, y: -26.839} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1764460408 @@ -13639,6 +13685,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1659159080} + m_TargetAssemblyTypeName: EvacuationPanel, Assembly-CSharp + m_MethodName: SetPersonnel + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_IsOn: 0 --- !u!114 &1783365055 MonoBehaviour: @@ -13993,9 +14051,9 @@ RectTransform: m_Father: {fileID: 666058190} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194.0772, y: -88.173004} m_SizeDelta: {x: 388.1544, y: 54.782} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1816681546 @@ -15181,9 +15239,9 @@ RectTransform: m_Father: {fileID: 1034927193} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194.0772, y: -447.175} m_SizeDelta: {x: 388.1544, y: 53.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &350998940540236966 @@ -15335,7 +15393,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4204671800070690485, guid: 5e14c4abba3cf1a4099ba76ddf50a689, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4204671800070690485, guid: 5e14c4abba3cf1a4099ba76ddf50a689, type: 3} propertyPath: m_AnchorMin.x @@ -15343,7 +15401,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4204671800070690485, guid: 5e14c4abba3cf1a4099ba76ddf50a689, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4204671800070690485, guid: 5e14c4abba3cf1a4099ba76ddf50a689, type: 3} propertyPath: m_SizeDelta.x @@ -15383,11 +15441,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4204671800070690485, guid: 5e14c4abba3cf1a4099ba76ddf50a689, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 194.0772 objectReference: {fileID: 0} - target: {fileID: 4204671800070690485, guid: 5e14c4abba3cf1a4099ba76ddf50a689, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -29.2995 objectReference: {fileID: 0} - target: {fileID: 4204671800070690485, guid: 5e14c4abba3cf1a4099ba76ddf50a689, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/xiaofang/Assets/Script/Scheduled_03/Panel.cs b/xiaofang/Assets/Script/Scheduled_03/Panel.cs index 4f2715b0..d16ea1f8 100644 --- a/xiaofang/Assets/Script/Scheduled_03/Panel.cs +++ b/xiaofang/Assets/Script/Scheduled_03/Panel.cs @@ -94,7 +94,7 @@ public class Panel : MonoBehaviour Text sceneText= managerPanelInstance.transform.Find("top/sceneName").GetComponent(); sceneText.text = sceneEntry.Key; - managerPanel1.CreateScenePanel(sceneEntry.Key, sceneEntry.Value); + managerPanel1.CreateScenePanel(sceneEntry.Key, sceneEntry.Value, managerPanelInstance); //managerPanel1.SetPlate(); ManagerPanel.gameObject.SetActive(true); diff --git a/xiaofang/Assets/Script/UI/PanelUI/ManagerPanel.cs b/xiaofang/Assets/Script/UI/PanelUI/ManagerPanel.cs index a598ea79..566915a5 100644 --- a/xiaofang/Assets/Script/UI/PanelUI/ManagerPanel.cs +++ b/xiaofang/Assets/Script/UI/PanelUI/ManagerPanel.cs @@ -14,8 +14,7 @@ public class ManagerPanel : MonoBehaviour [Header("组件")] public Text sceneText; - public Text nameText; - public Text dutyText; + [Header("数据")] private GameObject currentSelectedItem = null; // 当前选中的项 @@ -31,50 +30,46 @@ public class ManagerPanel : MonoBehaviour { //SetPlate(); } - public void SetPlate() - { - // 清空当前显示 - foreach (Transform child in managerPanelContent) - { - Debug.Log("Destroying: " + child.gameObject.name); - Destroy(child.gameObject); - } + //public void SetPlate() + //{ + // // 清空当前显示 + // foreach (Transform child in managerPanelContent) + // { + // Debug.Log("Destroying: " + child.gameObject.name); + // Destroy(child.gameObject); + // } - // 遍历字典中的每个场景,生成对应的UI项 - foreach (var sceneEntry in panelScript.sceneDataDictionary) - { - CreateScenePanel(sceneEntry.Key, sceneEntry.Value); // 为每个场景调用封装的方法 - } - } + // // 遍历字典中的每个场景,生成对应的UI项 + // foreach (var sceneEntry in panelScript.sceneDataDictionary) + // { + // CreateScenePanel(sceneEntry.Key, sceneEntry.Value); // 为每个场景调用封装的方法 + // } + //} // 根据场景名称和对应的人员列表生成场景面板和人员项 - public void CreateScenePanel(string sceneName, List peopleList) + public void CreateScenePanel(string sceneName, List peopleList,GameObject parentTransform) { - // 为每个场景生成一个新的面板 - //GameObject scenePanel = Instantiate(scenePanelPrefab, panelContent); - - // 在每个场景面板上找到场景名称的文本组件并设置 - //Text sceneText = scenePanel.transform.Find("top/sceneName").GetComponent(); - //sceneText.text = sceneName; - + if (personItemPrefab == null) + { + Debug.LogError("personItemPrefab 没有被正确赋值!"); + } // 遍历该场景下的所有人员,生成对应的UI项 foreach (SelectedInfo person in peopleList) { - CreatePersonItem(person); // 调用封装方法生成人员项 + CreatePersonItem(person, parentTransform); // 传递 managerPanelContent } } // 根据人员信息生成一个UI项 - private void CreatePersonItem(SelectedInfo person) + private void CreatePersonItem(SelectedInfo person, GameObject parentTransform) { + Transform contentTransform = parentTransform.transform.Find("Content"); // 实例化一个人员项并将其作为场景面板的子物体 - GameObject item = Instantiate(personItemPrefab, managerPanelContent); - ArrangementItem arrangementItem= personItemPrefab.gameObject.GetComponent(); + GameObject item = Instantiate(personItemPrefab, contentTransform); + ArrangementItem arrangementItem = item.GetComponent(); - arrangementItem.name.text = person.name; // 设置姓名 - arrangementItem.duty.text = person.duty; // 设置职责 - Debug.Log("----------------------" + arrangementItem.name.text); - Debug.Log("++++++++++++++++++++++" + arrangementItem.duty.text); + arrangementItem.name.text = person.name; // 设置姓名 + arrangementItem.duty.text = person.duty; // 设置职责 } // 点击项时调用 //public void OnItemClicked(GameObject clickedItem)