From b85ca6959945590fa1c5551b821d94fca5aa4956 Mon Sep 17 00:00:00 2001 From: UVCLimHun Date: Wed, 11 Jun 2025 17:40:10 +0900 Subject: [PATCH] bug fix --- Assets/Canvas_Library.cs | 2 - Assets/Materials/Floor.mat | 23 +- .../Scene/Grid/RTSceneGrid.cs | 22 + Assets/Scenes/Simulation_0.0.1.unity | 1453 ++--------------- Assets/Scripts/ClickHandler.cs | 4 + Assets/Scripts/Manager/DataManager.cs | 5 +- .../SimulationModels/SimulationModel.cs | 8 +- Assets/Settings/DefaultVolumeProfile.asset | 5 +- ...niversalRenderPipelineGlobalSettings.asset | 60 +- Assets/WorkSpace/LH/Canvas.prefab | 765 +++++++++ Assets/WorkSpace/LH/Canvas.prefab.meta | 7 + .../WorkSpace/LH/LogicData/LogicUIManager.cs | 26 +- .../LH/LogicData/Panel_ConnectedObject.cs | 10 +- .../WorkSpace/LH/LogicData/Panel_LogicData.cs | 1 + Assets/WorkSpace/LH/Panel_Grid.cs | 22 + Assets/WorkSpace/LH/Panel_Grid.cs.meta | 2 + Assets/WorkSpace/LWJ/SaveLoadmanager.cs | 67 +- ProjectSettings/GraphicsSettings.asset | 2 +- 18 files changed, 1092 insertions(+), 1392 deletions(-) create mode 100644 Assets/WorkSpace/LH/Canvas.prefab create mode 100644 Assets/WorkSpace/LH/Canvas.prefab.meta create mode 100644 Assets/WorkSpace/LH/Panel_Grid.cs create mode 100644 Assets/WorkSpace/LH/Panel_Grid.cs.meta diff --git a/Assets/Canvas_Library.cs b/Assets/Canvas_Library.cs index d4dec317..7c230ebf 100644 --- a/Assets/Canvas_Library.cs +++ b/Assets/Canvas_Library.cs @@ -1,6 +1,4 @@ using System.Collections.Generic; -using Mono.Cecil; -using Unity.VisualScripting; using UnityEngine; using UnityEngine.UI; diff --git a/Assets/Materials/Floor.mat b/Assets/Materials/Floor.mat index 8e23ea3a..e2cba2e2 100644 --- a/Assets/Materials/Floor.mat +++ b/Assets/Materials/Floor.mat @@ -12,16 +12,21 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _RECEIVE_SHADOWS_OFF - _SPECULAR_SETUP + - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: - RenderType: Opaque + RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -96,8 +101,8 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 + - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -107,19 +112,19 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueOffset: 0 - - _ReceiveShadows: 1 + - _ReceiveShadows: 0 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - - _Surface: 0 + - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0.8509804, g: 0.8509804, b: 0.8509804, a: 1} - - _Color: {r: 0.8509804, g: 0.8509804, b: 0.8509804, a: 1} + - _BaseColor: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Runtime Transform Gizmos/Scripts/Runtime Package Common/Scene/Grid/RTSceneGrid.cs b/Assets/Runtime Transform Gizmos/Scripts/Runtime Package Common/Scene/Grid/RTSceneGrid.cs index ece798f6..cc34d744 100644 --- a/Assets/Runtime Transform Gizmos/Scripts/Runtime Package Common/Scene/Grid/RTSceneGrid.cs +++ b/Assets/Runtime Transform Gizmos/Scripts/Runtime Package Common/Scene/Grid/RTSceneGrid.cs @@ -33,6 +33,27 @@ namespace RTG public XZGridSettings Settings { get { return _settings; } } public XZGridLookAndFeel LookAndFeel { get { return _lookAndFeel; } } + float accumulation=0f; + public event Action onAccumulationUpdated; + public float _accumulation + { + get + { + return accumulation; + } + set + { + if (MathF.Abs(value - accumulation) < 0.000001f) + { + + } + else + { + accumulation = value; + onAccumulationUpdated?.Invoke(accumulation); + } + } + } public void Initialize_SystemCall() { RTInputDevice.Get.Device.DoubleTap += OnInputDeviceDoubleTap; @@ -119,6 +140,7 @@ namespace RTG // Calculate the cell size scale value based on the calculated powers of 10 float csScale0 = Mathf.Pow(10.0f, csPower0); float csScale1 = Mathf.Pow(10.0f, csPower1); + _accumulation=csScale0; // Calculate the alpha scale values. The first alpha scale value is used to fade out the small cells. // The second alpha is used to fade in the bigger ones. diff --git a/Assets/Scenes/Simulation_0.0.1.unity b/Assets/Scenes/Simulation_0.0.1.unity index c27a0000..78c59bbb 100644 --- a/Assets/Scenes/Simulation_0.0.1.unity +++ b/Assets/Scenes/Simulation_0.0.1.unity @@ -3791,8 +3791,8 @@ MonoBehaviour: _moveSettings: _canBeDisplayed: 1 _isExpanded: 1 - _moveSpeed: 6 - _accelerationRate: 15 + _moveSpeed: 4 + _accelerationRate: 10 _panSettings: _canBeDisplayed: 1 _isExpanded: 1 @@ -3827,8 +3827,8 @@ MonoBehaviour: _canBeDisplayed: 1 _isExpanded: 1 _zoomMode: 0 - _orthoStandardZoomSensitivity: 10 - _perspStandardZoomSensitivity: 10 + _orthoStandardZoomSensitivity: 5 + _perspStandardZoomSensitivity: 5 _orthoSmoothZoomSensitivity: 5 _perspSmoothZoomSensitivity: 5 _orthoZoomSmoothValue: 5 @@ -4165,83 +4165,6 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 ---- !u!1 &798728645 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 798728646} - - component: {fileID: 798728648} - - component: {fileID: 798728647} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &798728646 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 798728645} - 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: 1749491063} - - {fileID: 821125855} - m_Father: {fileID: 1455737141} - 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: 110, y: 63} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &798728647 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 798728645} - 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: ba88614dda727c242a00d88f748ae5e5, 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 &798728648 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 798728645} - m_CullTransparentMesh: 1 --- !u!1 &801042363 GameObject: m_ObjectHideFlags: 0 @@ -4294,205 +4217,6 @@ MonoBehaviour: _gradientOffset: 0 _isVisible: 0 _renderIgnoreCameras: [] ---- !u!1 &804817934 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 804817935} - - component: {fileID: 804817937} - - component: {fileID: 804817936} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &804817935 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 804817934} - 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: 1915301304} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 11} - m_Pivot: {x: 0, y: 1} ---- !u!114 &804817936 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 804817934} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: New Text - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 05bae3109f77490458ea729d51e7df78, type: 2} - m_sharedMaterial: {fileID: -7290017371581542385, guid: 05bae3109f77490458ea729d51e7df78, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 10 - m_fontSizeBase: 10 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &804817937 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 804817934} - m_CullTransparentMesh: 1 ---- !u!1 &821125854 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 821125855} - - component: {fileID: 821125856} - m_Layer: 5 - m_Name: DataZone - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &821125855 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 821125854} - 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: 1915301304} - m_Father: {fileID: 798728646} - 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: 0, y: -30} - m_SizeDelta: {x: 100, y: 11} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &821125856 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 821125854} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 1 - 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!1 &907453004 GameObject: m_ObjectHideFlags: 0 @@ -4593,8 +4317,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1025518480} - - component: {fileID: 1025518479} - - component: {fileID: 1025518478} - component: {fileID: 1025518477} m_Layer: 6 m_Name: Plane @@ -4625,59 +4347,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &1025518478 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1025518476} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 8aa3cdb8f64cb474b98ced48657a07a7, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1025518479 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1025518476} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1025518480 Transform: m_ObjectHideFlags: 0 @@ -4687,284 +4356,12 @@ Transform: m_GameObject: {fileID: 1025518476} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.001, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 100, y: 1, z: 100} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1033171393 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1033171394} - - component: {fileID: 1033171396} - - component: {fileID: 1033171395} - m_Layer: 5 - m_Name: Text (TMP) (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1033171394 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1033171393} - 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: 1915301304} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 11} - m_Pivot: {x: 1, y: 1} ---- !u!114 &1033171395 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1033171393} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: New Text - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 05bae3109f77490458ea729d51e7df78, type: 2} - m_sharedMaterial: {fileID: -7290017371581542385, guid: 05bae3109f77490458ea729d51e7df78, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 10 - m_fontSizeBase: 10 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 4 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1033171396 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1033171393} - m_CullTransparentMesh: 1 ---- !u!1 &1176758357 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1176758358} - - component: {fileID: 1176758360} - - component: {fileID: 1176758359} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1176758358 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1176758357} - 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: 1749491063} - 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!114 &1176758359 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1176758357} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uC591\uD488\uD050" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 05bae3109f77490458ea729d51e7df78, type: 2} - m_sharedMaterial: {fileID: -7290017371581542385, guid: 05bae3109f77490458ea729d51e7df78, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 10 - m_fontSizeBase: 10 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1176758360 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1176758357} - m_CullTransparentMesh: 1 --- !u!1 &1216065597 GameObject: m_ObjectHideFlags: 0 @@ -4995,8 +4392,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8870650165866447933} - - {fileID: 6102562032740385466} + - {fileID: 1403186478} m_Father: {fileID: 1916153470} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -5247,6 +4643,156 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1403186477 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1403186478} + - component: {fileID: 1403186481} + - component: {fileID: 1403186480} + - component: {fileID: 1403186479} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1403186478 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1403186477} + 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: 1216065598} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 100, y: 25} + m_SizeDelta: {x: 150, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1403186479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1403186477} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9991ff8caf756b54db38f064147d65fd, type: 3} + m_Name: + m_EditorClassIdentifier: + text: {fileID: 0} +--- !u!114 &1403186480 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1403186477} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 'grid : ' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 05bae3109f77490458ea729d51e7df78, type: 2} + m_sharedMaterial: {fileID: -7290017371581542385, guid: 05bae3109f77490458ea729d51e7df78, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1403186481 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1403186477} + m_CullTransparentMesh: 1 --- !u!1 &1407014991 GameObject: m_ObjectHideFlags: 0 @@ -5295,108 +4841,6 @@ MonoBehaviour: _canBeDisplayed: 1 _isExpanded: 1 _physicsMode: 1 ---- !u!1 &1455737137 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1455737141} - - component: {fileID: 1455737140} - - component: {fileID: 1455737139} - - component: {fileID: 1455737138} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1455737138 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1455737137} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1455737139 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1455737137} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1455737140 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1455737137} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: -1 - m_TargetDisplay: 0 ---- !u!224 &1455737141 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1455737137} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 798728646} - m_Father: {fileID: 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: 0, y: 0} - m_Pivot: {x: 0, y: 0} --- !u!114 &1516086530 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2808401242743568216, guid: 91b280356e2a9674aac91102f2da87f8, type: 3} @@ -5408,82 +4852,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1749491062 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1749491063} - - component: {fileID: 1749491065} - - component: {fileID: 1749491064} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1749491063 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1749491062} - 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: 1176758358} - m_Father: {fileID: 798728646} - 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: 0, y: -7} - m_SizeDelta: {x: 90, y: 16} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &1749491064 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1749491062} - 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: bb3bb527c21a71a4aad7e68cc7a13c13, 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 &1749491065 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1749491062} - m_CullTransparentMesh: 1 --- !u!224 &1821473417 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1724037624722385076, guid: 461675fb4e57d014f90cc1f743049f29, type: 3} @@ -5548,7 +4916,7 @@ Camera: width: 1 height: 1 near clip plane: 0.3 - far clip plane: 1000 + far clip plane: 10000 field of view: 60 orthographic: 0 orthographic size: 5 @@ -5705,43 +5073,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1915301303 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1915301304} - m_Layer: 5 - m_Name: DataPrefab - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1915301304 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1915301303} - 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: 804817935} - - {fileID: 1033171394} - m_Father: {fileID: 821125855} - 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: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1916153466 GameObject: m_ObjectHideFlags: 0 @@ -7765,11 +7096,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4935031868873592951 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3512657831314021627, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - m_PrefabInstance: {fileID: 8413769712500345996} - m_PrefabAsset: {fileID: 0} --- !u!114 &4945962056964874811 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8274,140 +7600,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1001 &6102562032740385465 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1216065598} - m_Modifications: - - target: {fileID: 1431522413430459930, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: content - value: - objectReference: {fileID: 4935031868873592951} - - target: {fileID: 2484588977064667418, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: content - value: - objectReference: {fileID: 4935031868873592951} - - target: {fileID: 2516755401795187921, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: content - value: - objectReference: {fileID: 4935031868873592951} - - target: {fileID: 2725894703401018449, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: content - value: - objectReference: {fileID: 4935031868873592951} - - target: {fileID: 4513414337717465626, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: content - value: - objectReference: {fileID: 4935031868873592951} - - target: {fileID: 6331681032754426235, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: content - value: - objectReference: {fileID: 4935031868873592951} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_SizeDelta.x - value: -1492 - objectReference: {fileID: 0} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_AnchoredPosition.x - value: 152 - objectReference: {fileID: 0} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_AnchoredPosition.y - value: 540 - objectReference: {fileID: 0} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8179489441993505069, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: content - value: - objectReference: {fileID: 4935031868873592951} - - target: {fileID: 8428412304579997239, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: content - value: - objectReference: {fileID: 4935031868873592951} - - target: {fileID: 8677907592028259944, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - propertyPath: m_Name - value: ObjectLibraryTabs - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} ---- !u!224 &6102562032740385466 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7628280530353347633, guid: 2c9478a9db38d9e43955f5e518e0f860, type: 3} - m_PrefabInstance: {fileID: 6102562032740385465} - m_PrefabAsset: {fileID: 0} --- !u!224 &6137159009526871422 RectTransform: m_ObjectHideFlags: 0 @@ -9438,331 +8630,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1001 &8413769712500345996 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1216065598} - m_Modifications: - - target: {fileID: 36875114256037943, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 36875114256037943, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 36875114256037943, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 36875114256037943, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 642466797153263884, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 642466797153263884, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 642466797153263884, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 642466797153263884, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 803467512187708991, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 803467512187708991, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 803467512187708991, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 803467512187708991, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1080092103115914585, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1080092103115914585, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1080092103115914585, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1080092103115914585, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_SizeDelta.x - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_SizeDelta.y - value: 81 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.y - value: 40.5 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1438218454054238619, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1438218454054238619, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1438218454054238619, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1438218454054238619, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1512442371092840043, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1512442371092840043, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1512442371092840043, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1512442371092840043, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1602567149755754496, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1602567149755754496, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1602567149755754496, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1602567149755754496, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2002596603948465480, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2002596603948465480, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2265601726016123544, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2265601726016123544, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2307873482672832875, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2307873482672832875, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3164975517789104253, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3164975517789104253, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3164975517789104253, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3164975517789104253, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3512657831314021627, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4909713418528101439, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4909713418528101439, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4909713418528101439, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4909713418528101439, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7094217425313152132, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7094217425313152132, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7094217425313152132, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7094217425313152132, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7574926083564323930, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7574926083564323930, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7574926083564323930, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7574926083564323930, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7770922069808366893, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7770922069808366893, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7884294797245305317, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_Name - value: ObjectLibrary - objectReference: {fileID: 0} - - target: {fileID: 9003163838006525450, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9003163838006525450, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9003163838006525450, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9003163838006525450, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} --- !u!224 &8541730773499721231 RectTransform: m_ObjectHideFlags: 0 @@ -9890,11 +8757,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 71, y: 41} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &8870650165866447933 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1142040368317778097, guid: bc16ce627450b4a46a0bfdbe5fd69f94, type: 3} - m_PrefabInstance: {fileID: 8413769712500345996} - m_PrefabAsset: {fileID: 0} --- !u!1 &8877016271756794153 GameObject: m_ObjectHideFlags: 0 @@ -10169,4 +9031,3 @@ SceneRoots: - {fileID: 594906197750746389} - {fileID: 352453666} - {fileID: 1251266451} - - {fileID: 1455737141} diff --git a/Assets/Scripts/ClickHandler.cs b/Assets/Scripts/ClickHandler.cs index a9a08e04..a6207026 100644 --- a/Assets/Scripts/ClickHandler.cs +++ b/Assets/Scripts/ClickHandler.cs @@ -1,5 +1,6 @@ using UnityEditor; using UnityEngine; +using System; public class ClickHandler : MonoBehaviour { @@ -11,6 +12,7 @@ public class ClickHandler : MonoBehaviour float clickStart = 0; Vector3 clickStartPos; + public event Action onDeSelectObject; public enum InputState { none, objectHandling, pathMaking, @@ -61,10 +63,12 @@ public class ClickHandler : MonoBehaviour //objStatus.gameObject.SetActive(false); RTGController.I.SetWorkGizmoId(RTGController.GizmoId.None); RTGController.I.ClearGizmoTargetObjects(); + onDeSelectObject?.Invoke(); } return; } highLight.HideHighlight(); + onDeSelectObject?.Invoke(); } } } diff --git a/Assets/Scripts/Manager/DataManager.cs b/Assets/Scripts/Manager/DataManager.cs index 33fd66f4..19a115d6 100644 --- a/Assets/Scripts/Manager/DataManager.cs +++ b/Assets/Scripts/Manager/DataManager.cs @@ -2,6 +2,8 @@ using UnityEngine; using System; using System.Collections.Generic; using System.Linq; +using Octopus.Simulator; + public class DataManager : UnitySingleton { public bool isPlaying = false; @@ -13,7 +15,8 @@ public class DataManager : UnitySingleton if (models.Any(x => x == model)) return; int objCount = models.FindAll(x => x.modelName.Contains(model.modelName)).Count; - model.modelName = model.modelName + "_" + objCount.ToString(); + model.modelName = model.modelName + "_" + objCount.ToString(); + model.onModelClicked += FindAnyObjectByType(FindObjectsInactive.Include).SetConnectedDataItem; models.Add(model); onModelsUpdated?.Invoke(models); } diff --git a/Assets/Scripts/SimulationModels/SimulationModel.cs b/Assets/Scripts/SimulationModels/SimulationModel.cs index 8159a90a..ebf3b8e7 100644 --- a/Assets/Scripts/SimulationModels/SimulationModel.cs +++ b/Assets/Scripts/SimulationModels/SimulationModel.cs @@ -4,6 +4,7 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json; using System.Collections.Generic; using Octopus.Simulator; +using System; public enum SimulationModelType { @@ -24,6 +25,7 @@ public class SimulationModel : MonoBehaviour, IClickable public string modelID; public string nodeID; private bool isQuitting = false; + public Action onModelClicked; void Awake() { FitCollider(); @@ -31,6 +33,9 @@ public class SimulationModel : MonoBehaviour, IClickable private void Start() { + onModelClicked += FindAnyObjectByType(FindObjectsInactive.Include).SetConnectedDataItem; + onModelClicked += FindAnyObjectByType(FindObjectsInactive.Include).ModelSelected; + onModelClicked += (value)=>FindAnyObjectByType(FindObjectsInactive.Include).UnsetPlacedObjectDataItem(); } private void OnEnable() @@ -49,7 +54,8 @@ public class SimulationModel : MonoBehaviour, IClickable } public void OnClick() { - Debug.Log("Clicked : " + gameObject.name); + //Debug.Log("Clicked : " + gameObject.name); + onModelClicked?.Invoke(this); } void FitCollider() { diff --git a/Assets/Settings/DefaultVolumeProfile.asset b/Assets/Settings/DefaultVolumeProfile.asset index 6fb18220..9e4bbfdd 100644 --- a/Assets/Settings/DefaultVolumeProfile.asset +++ b/Assets/Settings/DefaultVolumeProfile.asset @@ -342,6 +342,9 @@ MonoBehaviour: skyOcclusionIntensityMultiplier: m_OverrideState: 1 m_Value: 1 + worldOffset: + m_OverrideState: 1 + m_Value: {x: 0, y: 0, z: 0} --- !u!114 &-1216621516061285780 MonoBehaviour: m_ObjectHideFlags: 3 @@ -462,8 +465,6 @@ MonoBehaviour: - {fileID: -6288072647309666549} - {fileID: 7518938298396184218} - {fileID: -1410297666881709256} - - {fileID: -7750755424749557576} - - {fileID: -5139089513906902183} --- !u!114 &853819529557874667 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index 63d99b28..5a020abc 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -33,28 +33,28 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 1324587836083798086 - - rid: 1324587836083798087 + - rid: 6289116578057027712 + - rid: 6289116578057027713 - rid: 6852985685364965378 - rid: 6852985685364965379 - rid: 6852985685364965380 - rid: 6852985685364965381 - - rid: 1324587836083798088 - - rid: 1324587836083798089 + - rid: 6289116578057027714 + - rid: 6289116578057027715 - rid: 6852985685364965384 - rid: 6852985685364965385 - - rid: 1324587836083798090 - - rid: 1324587836083798091 - - rid: 1324587836083798092 - - rid: 1324587836083798093 - - rid: 1324587836083798094 - - rid: 1324587836083798095 + - rid: 6289116578057027716 + - rid: 6289116578057027717 + - rid: 6289116578057027718 + - rid: 6289116578057027719 + - rid: 6289116578057027720 + - rid: 6289116578057027721 - rid: 6852985685364965392 - - rid: 1324587836083798096 + - rid: 6289116578057027722 - rid: 6852985685364965394 - rid: 8712630790384254976 - rid: 5092397466944798720 - - rid: 1324587836083798097 + - rid: 6289116578057027723 m_RuntimeSettings: m_List: - rid: 6852985685364965378 @@ -97,14 +97,20 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 1324587836083798086 + - rid: 5092397466944798720 + type: {class: UniversalRenderPipelineRuntimeXRResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3} + m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3} + m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3} + - rid: 6289116578057027712 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 m_StripUnusedPostProcessingVariants: 1 m_StripUnusedVariants: 1 m_StripScreenCoordOverrideVariants: 1 - - rid: 1324587836083798087 + - rid: 6289116578057027713 type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} @@ -116,7 +122,7 @@ MonoBehaviour: m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} - - rid: 1324587836083798088 + - rid: 6289116578057027714 type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -131,7 +137,7 @@ MonoBehaviour: m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} - - rid: 1324587836083798089 + - rid: 6289116578057027715 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -140,7 +146,7 @@ MonoBehaviour: m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - - rid: 1324587836083798090 + - rid: 6289116578057027716 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -153,13 +159,13 @@ MonoBehaviour: m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} - - rid: 1324587836083798091 + - rid: 6289116578057027717 type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} - - rid: 1324587836083798092 + - rid: 6289116578057027718 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -172,12 +178,12 @@ MonoBehaviour: skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - - rid: 1324587836083798093 + - rid: 6289116578057027719 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 1324587836083798094 + - rid: 6289116578057027720 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -187,30 +193,24 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 1324587836083798095 + - rid: 6289116578057027721 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 1324587836083798096 + - rid: 6289116578057027722 type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} - - rid: 1324587836083798097 + - rid: 6289116578057027723 type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} - - rid: 5092397466944798720 - type: {class: UniversalRenderPipelineRuntimeXRResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3} - m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3} - m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3} - rid: 6852985685364965378 type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: diff --git a/Assets/WorkSpace/LH/Canvas.prefab b/Assets/WorkSpace/LH/Canvas.prefab new file mode 100644 index 00000000..edc687f3 --- /dev/null +++ b/Assets/WorkSpace/LH/Canvas.prefab @@ -0,0 +1,765 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &421532050102554550 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1168184618592263708} + - component: {fileID: 7961800208045960925} + - component: {fileID: 3778500546090955285} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1168184618592263708 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 421532050102554550} + 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: 4753026599782103283} + m_Father: {fileID: 1050893671084969260} + 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: 0, y: -7} + m_SizeDelta: {x: 90, y: 16} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &7961800208045960925 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 421532050102554550} + m_CullTransparentMesh: 1 +--- !u!114 &3778500546090955285 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 421532050102554550} + 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: bb3bb527c21a71a4aad7e68cc7a13c13, 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 &707855914559450750 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2593446174104300330} + - component: {fileID: 6963110946979293367} + - component: {fileID: 6001547180791528037} + m_Layer: 5 + m_Name: Text (TMP) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2593446174104300330 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 707855914559450750} + 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: 7480557562701270505} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 50, y: 11} + m_Pivot: {x: 1, y: 1} +--- !u!222 &6963110946979293367 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 707855914559450750} + m_CullTransparentMesh: 1 +--- !u!114 &6001547180791528037 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 707855914559450750} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 05bae3109f77490458ea729d51e7df78, type: 2} + m_sharedMaterial: {fileID: -7290017371581542385, guid: 05bae3109f77490458ea729d51e7df78, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 10 + m_fontSizeBase: 10 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2607946471508113693 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1050893671084969260} + - component: {fileID: 8605567264437318580} + - component: {fileID: 973582583655149570} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1050893671084969260 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2607946471508113693} + 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: 1168184618592263708} + - {fileID: 4864636284212759356} + m_Father: {fileID: 9130801069055771650} + 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: 110, y: 63} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8605567264437318580 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2607946471508113693} + m_CullTransparentMesh: 1 +--- !u!114 &973582583655149570 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2607946471508113693} + 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: ba88614dda727c242a00d88f748ae5e5, 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 &2631649659559480277 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4864636284212759356} + - component: {fileID: 4470715915541714119} + m_Layer: 5 + m_Name: DataZone + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4864636284212759356 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2631649659559480277} + 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: 7480557562701270505} + m_Father: {fileID: 1050893671084969260} + 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: 0, y: -30} + m_SizeDelta: {x: 100, y: 11} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &4470715915541714119 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2631649659559480277} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 1 + 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!1 &2995211686437133662 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3468170854461680748} + - component: {fileID: 8662073776816388481} + - component: {fileID: 7935291303925935750} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3468170854461680748 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2995211686437133662} + 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: 7480557562701270505} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 50, y: 11} + m_Pivot: {x: 0, y: 1} +--- !u!222 &8662073776816388481 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2995211686437133662} + m_CullTransparentMesh: 1 +--- !u!114 &7935291303925935750 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2995211686437133662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 05bae3109f77490458ea729d51e7df78, type: 2} + m_sharedMaterial: {fileID: -7290017371581542385, guid: 05bae3109f77490458ea729d51e7df78, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 10 + m_fontSizeBase: 10 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3520220627650942402 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4753026599782103283} + - component: {fileID: 7311176494005944353} + - component: {fileID: 525786986351485248} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4753026599782103283 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3520220627650942402} + 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: 1168184618592263708} + 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 &7311176494005944353 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3520220627650942402} + m_CullTransparentMesh: 1 +--- !u!114 &525786986351485248 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3520220627650942402} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\uC591\uD488\uD050" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 05bae3109f77490458ea729d51e7df78, type: 2} + m_sharedMaterial: {fileID: -7290017371581542385, guid: 05bae3109f77490458ea729d51e7df78, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 10 + m_fontSizeBase: 10 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4593238938533165015 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9130801069055771650} + - component: {fileID: 3968287705350669790} + - component: {fileID: 7346153876772795183} + - component: {fileID: 2618602215651148150} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9130801069055771650 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4593238938533165015} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1050893671084969260} + m_Father: {fileID: 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: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &3968287705350669790 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4593238938533165015} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: -1 + m_TargetDisplay: 0 +--- !u!114 &7346153876772795183 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4593238938533165015} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &2618602215651148150 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4593238938533165015} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &7142593953284461487 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7480557562701270505} + m_Layer: 5 + m_Name: DataPrefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7480557562701270505 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7142593953284461487} + 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: 3468170854461680748} + - {fileID: 2593446174104300330} + m_Father: {fileID: 4864636284212759356} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/WorkSpace/LH/Canvas.prefab.meta b/Assets/WorkSpace/LH/Canvas.prefab.meta new file mode 100644 index 00000000..6380087a --- /dev/null +++ b/Assets/WorkSpace/LH/Canvas.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3bec99d1dd59287429bce825c3151e05 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WorkSpace/LH/LogicData/LogicUIManager.cs b/Assets/WorkSpace/LH/LogicData/LogicUIManager.cs index eb838aa4..1783686b 100644 --- a/Assets/WorkSpace/LH/LogicData/LogicUIManager.cs +++ b/Assets/WorkSpace/LH/LogicData/LogicUIManager.cs @@ -1,5 +1,5 @@ -using Octopus.Simulator; using System; +using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; @@ -23,8 +23,10 @@ namespace Octopus.Simulator Button backGround; public event Action onLogicItemSelected; + public event Action onModelSelected; public event Action onLogicItemDeSelected; - private Dictionary idMap=new Dictionary(); + private Dictionary idMap = new Dictionary(); + private Dictionary itemMap = new Dictionary(); // Start is called once before the first execution of Update after the MonoBehaviour is created private void Awake() { @@ -34,6 +36,7 @@ namespace Octopus.Simulator void Start() { backGround.onClick.AddListener(() => onLogicItemDeSelected?.Invoke()); + FindAnyObjectByType().onDeSelectObject += ()=>onLogicItemDeSelected?.Invoke(); FindAnyObjectByType().onLogicUpdated += BuildLogicUI; FindAnyObjectByType().onLogicBTNClicked += SetActive; } @@ -64,10 +67,10 @@ namespace Octopus.Simulator private void CreateAllButtons(LogicData data) { if (data.data.queues != null && data.data.queues.Count > 0) - QueueVisualization(data.data.queues,data.webConfig); + QueueVisualization(data.data.queues, data.webConfig); if (data.data.resources != null && data.data.resources.Count > 0) - ResourceVisualization(data.data.resources,data.webConfig); + ResourceVisualization(data.data.resources, data.webConfig); if (data.data.stores != null && data.data.stores.Count > 0) StoreVisualization(data.data.stores, data.webConfig); @@ -76,15 +79,17 @@ namespace Octopus.Simulator ComponentVisualization(data.data.components, data.webConfig); } - void QueueVisualization(List queues,LogicWebConfig config) + void QueueVisualization(List queues, LogicWebConfig config) { idMap.Clear(); + itemMap.Clear(); foreach (var queue in queues) { var logicButton = Instantiate(LogicPrefab, logicContent); var item = logicButton.GetComponent(); item.Setup(queue); + itemMap.Add(queue.name, queue); idMap.Add(config.nodes.Find(n => n.data.name == queue.name).id, logicButton); logicButton.onClick.AddListener(() => OnLogicButtonClick(queue)); logicButton.GetComponent().anchoredPosition = new Vector2(config.nodes.Find(n => n.data.name == queue.name).position.x, -config.nodes.Find(n => n.data.name == queue.name).position.y); @@ -98,6 +103,7 @@ namespace Octopus.Simulator var logicButton = Instantiate(LogicPrefab, logicContent); var item = logicButton.GetComponent(); item.Setup(resource); + itemMap.Add(resource.name, resource); idMap.Add(config.nodes.Find(n => n.data.name == resource.name).id, logicButton); logicButton.onClick.AddListener(() => OnLogicButtonClick(resource)); logicButton.GetComponent().anchoredPosition = new Vector2(config.nodes.Find(n => n.data.name == resource.name).position.x, -config.nodes.Find(n => n.data.name == resource.name).position.y); @@ -111,6 +117,7 @@ namespace Octopus.Simulator var logicButton = Instantiate(LogicPrefab, logicContent); var item = logicButton.GetComponent(); item.Setup(store); + itemMap.Add(store.name, store); idMap.Add(config.nodes.Find(n => n.data.name == store.name).id, logicButton); logicButton.onClick.AddListener(() => OnLogicButtonClick(store)); logicButton.GetComponent().anchoredPosition = new Vector2(config.nodes.Find(n => n.data.name == store.name).position.x, -config.nodes.Find(n => n.data.name == store.name).position.y); @@ -124,6 +131,7 @@ namespace Octopus.Simulator var logicButton = Instantiate(LogicPrefab, logicContent); var item = logicButton.GetComponent(); item.Setup(component); + itemMap.Add(component.Name, component); idMap.Add(config.nodes.Find(n => n.data.name == component.Name).id, logicButton); logicButton.onClick.AddListener(() => OnLogicButtonClick(component)); logicButton.GetComponent().anchoredPosition = new Vector2(config.nodes.Find(n => n.data.name == component.Name).position.x, -config.nodes.Find(n => n.data.name == component.Name).position.y); @@ -149,5 +157,13 @@ namespace Octopus.Simulator { onLogicItemSelected?.Invoke(item); } + + public void ModelSelected(SimulationModel model) + { + if (itemMap.ContainsKey(model.nodeID)) + { + onModelSelected?.Invoke(itemMap[model.nodeID]); + } + } } } \ No newline at end of file diff --git a/Assets/WorkSpace/LH/LogicData/Panel_ConnectedObject.cs b/Assets/WorkSpace/LH/LogicData/Panel_ConnectedObject.cs index a066c97b..29f7183d 100644 --- a/Assets/WorkSpace/LH/LogicData/Panel_ConnectedObject.cs +++ b/Assets/WorkSpace/LH/LogicData/Panel_ConnectedObject.cs @@ -31,7 +31,7 @@ namespace Octopus.Simulator private void Start() { var logicUIManager = FindAnyObjectByType(); - logicUIManager.onLogicItemSelected += SetLogicDataItem; + logicUIManager.onLogicItemSelected += SetConnectedDataItem; logicUIManager.onLogicItemDeSelected += UnsetConnectedDataItem; gameObject.SetActive(false); } @@ -62,7 +62,7 @@ namespace Octopus.Simulator } } - public void SetLogicDataItem(ILogicItem item) + public void SetConnectedDataItem(ILogicItem item) { gameObject.SetActive(true); ClearItem(); @@ -84,11 +84,13 @@ namespace Octopus.Simulator onPanelUpdated?.Invoke(); } - public void SetConnectedDataItem(string itemName) + public void SetConnectedDataItem(SimulationModel go) { gameObject.SetActive(true); ClearItem(); - GetObjectByName(itemName); + dataMap["À̸§"] = go.name; + dataMap["À§Ä¡"] = go.transform.position.ToString(); + dataMap["ID"] = go.modelID; float itemHeight = logicItem.GetComponent().rect.height; SetRectHeight(itemHeight); diff --git a/Assets/WorkSpace/LH/LogicData/Panel_LogicData.cs b/Assets/WorkSpace/LH/LogicData/Panel_LogicData.cs index 1ea43903..223aaf74 100644 --- a/Assets/WorkSpace/LH/LogicData/Panel_LogicData.cs +++ b/Assets/WorkSpace/LH/LogicData/Panel_LogicData.cs @@ -27,6 +27,7 @@ namespace Octopus.Simulator { var logicUIManager = FindAnyObjectByType(); logicUIManager.onLogicItemSelected += SetLogicDataItem; + logicUIManager.onModelSelected += SetLogicDataItem; logicUIManager.onLogicItemDeSelected += UnsetLogicDataItem; gameObject.SetActive(false); } diff --git a/Assets/WorkSpace/LH/Panel_Grid.cs b/Assets/WorkSpace/LH/Panel_Grid.cs new file mode 100644 index 00000000..55c29ccf --- /dev/null +++ b/Assets/WorkSpace/LH/Panel_Grid.cs @@ -0,0 +1,22 @@ +using UnityEngine; +using TMPro; +using RTG; + +public class Panel_Grid : MonoBehaviour +{ + [SerializeField] + TMP_Text text; + private void Awake() + { + text = gameObject.GetComponent(); + } + void Start() + { + FindAnyObjectByType().onAccumulationUpdated += UpateText; + } + + void UpateText(float value) + { + text.text = $"grid : {value}M"; + } +} diff --git a/Assets/WorkSpace/LH/Panel_Grid.cs.meta b/Assets/WorkSpace/LH/Panel_Grid.cs.meta new file mode 100644 index 00000000..b296a81b --- /dev/null +++ b/Assets/WorkSpace/LH/Panel_Grid.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9991ff8caf756b54db38f064147d65fd \ No newline at end of file diff --git a/Assets/WorkSpace/LWJ/SaveLoadmanager.cs b/Assets/WorkSpace/LWJ/SaveLoadmanager.cs index ce3e9af8..9a733687 100644 --- a/Assets/WorkSpace/LWJ/SaveLoadmanager.cs +++ b/Assets/WorkSpace/LWJ/SaveLoadmanager.cs @@ -11,12 +11,6 @@ namespace Octopus.Simulator.Networks { public class SaveLoadmanager : MonoBehaviour { - // Start is called once before the first execution of Update after the MonoBehaviour is created - void Start() - { - - } - // Update is called once per frame void Update() { @@ -45,14 +39,14 @@ namespace Octopus.Simulator.Networks { var tmpSimulationModelInfo = new SimulationModelInfo(); - tmpSimulationModelInfo.prefabName = item.gameObject.name.Replace("(Clone)", ""); - tmpSimulationModelInfo.modelName = item.modelName; - //tmpSimulationModelInfo.modelType = item.modelType.ToString(); - tmpSimulationModelInfo.modelID = item.modelID; - tmpSimulationModelInfo.nodeID = item.nodeID; - tmpSimulationModelInfo.position = item.transform.position.ToString(); - tmpSimulationModelInfo.rotation = item.transform.rotation.ToString(); - tmpSimulationModelInfo.scale = item.transform.localScale.ToString(); + tmpSimulationModelInfo.prefabName = item.gameObject.name.Replace("(Clone)", ""); + tmpSimulationModelInfo.modelName = item.modelName; + //tmpSimulationModelInfo.modelType = item.modelType.ToString(); + tmpSimulationModelInfo.modelID = item.modelID; + tmpSimulationModelInfo.nodeID = item.nodeID; + tmpSimulationModelInfo.position = item.transform.position.ToString(); + tmpSimulationModelInfo.rotation = item.transform.rotation.ToString(); + tmpSimulationModelInfo.scale = item.transform.localScale.ToString(); saveInfos.Add(tmpSimulationModelInfo); } @@ -93,10 +87,10 @@ namespace Octopus.Simulator.Networks var simulationModel = Resources.Load(string.Format("{0}/{1}", resourcePath, item.prefabName)); var spawnItem = Instantiate(simulationModel).GetComponent(); - spawnItem.modelName = item.modelName; - //spawnItem.modelType = item.modelType; - spawnItem.modelID = item.modelID; - spawnItem.nodeID = item.nodeID; + spawnItem.modelName = item.modelName; + //spawnItem.modelType = item.modelType; + spawnItem.modelID = item.modelID; + spawnItem.nodeID = item.nodeID; spawnItem.gameObject.transform.position = ParseVector3(item.position); spawnItem.gameObject.transform.localScale = ParseVector3(item.scale); @@ -121,14 +115,14 @@ namespace Octopus.Simulator.Networks { var tmpSimulationModelInfo = new SimulationModelInfo(); - tmpSimulationModelInfo.prefabName = item.gameObject.name.Replace("(Clone)", ""); - tmpSimulationModelInfo.modelName = item.modelName; - //tmpSimulationModelInfo.modelType = item.modelType; - tmpSimulationModelInfo.modelID = item.modelID; - tmpSimulationModelInfo.nodeID = item.nodeID; - tmpSimulationModelInfo.position = item.transform.position.ToString(); - tmpSimulationModelInfo.rotation = item.transform.rotation.ToString(); - tmpSimulationModelInfo.scale = item.transform.localScale.ToString(); + tmpSimulationModelInfo.prefabName = item.gameObject.name.Replace("(Clone)", ""); + tmpSimulationModelInfo.modelName = item.modelName; + //tmpSimulationModelInfo.modelType = item.modelType; + tmpSimulationModelInfo.modelID = item.modelID; + tmpSimulationModelInfo.nodeID = item.nodeID; + tmpSimulationModelInfo.position = item.transform.position.ToString(); + tmpSimulationModelInfo.rotation = item.transform.rotation.ToString(); + tmpSimulationModelInfo.scale = item.transform.localScale.ToString(); saveInfos.Add(tmpSimulationModelInfo); } @@ -177,17 +171,6 @@ namespace Octopus.Simulator.Networks public void Onclick_Load(string jsonData) { - /* - var path = StandaloneFileBrowser.OpenFilePanel("Open Layout", "", "", false); - - FileStream fileStream = new FileStream(string.Format("{0}", path), FileMode.Open); - byte[] data = new byte[fileStream.Length]; - fileStream.Read(data, 0, data.Length); - fileStream.Close(); - - string jsonData = Encoding.UTF8.GetString(data); - */ - List loadInfos = new List(); loadInfos = JsonConvert.DeserializeObject>(jsonData); @@ -203,15 +186,17 @@ namespace Octopus.Simulator.Networks var simulationModel = Resources.Load(string.Format("{0}/{1}", resourcePath, item.prefabName)); var spawnItem = Instantiate(simulationModel).GetComponent(); - spawnItem.modelName = item.modelName; - //spawnItem.modelType = item.modelType; - spawnItem.modelID = item.modelID; - spawnItem.nodeID = item.nodeID; + spawnItem.modelName = item.modelName; + //spawnItem.modelType = item.modelType; + spawnItem.modelID = item.modelID; + spawnItem.nodeID = item.nodeID; spawnItem.gameObject.transform.position = ParseVector3(item.position); spawnItem.gameObject.transform.localScale = ParseVector3(item.scale); spawnItem.gameObject.transform.rotation = ParseQuaternion(item.rotation); + DataManager.I.AddModel(spawnItem); + if (!string.IsNullOrEmpty(item.nodeID)) loadModels.Add(item.nodeID, spawnItem); } diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index a148e490..ccce59b9 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -55,7 +55,7 @@ GraphicsSettings: m_LightmapKeepSubtractive: 1 m_FogKeepLinear: 1 m_FogKeepExp: 1 - m_FogKeepExp2: 1 + m_FogKeepExp2: 0 m_AlbedoSwatchInfos: [] m_RenderPipelineGlobalSettingsMap: UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 18dc0cd2c080841dea60987a38ce93fa, type: 2}