diff --git a/Assets/Scenes/RiverWorld.unity b/Assets/Scenes/RiverWorld.unity
index ff124acf69ba4b1196d1887a3d0718843e62d2b9..a633ddf7a9272cb656f3b8f2cc02ff1314337d73 100644
--- a/Assets/Scenes/RiverWorld.unity
+++ b/Assets/Scenes/RiverWorld.unity
@@ -273,6 +273,87 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 8816284}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &10054526
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 10054527}
+ - component: {fileID: 10054529}
+ - component: {fileID: 10054528}
+ m_Layer: 0
+ m_Name: Object006
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &10054527
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 10054526}
+ m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067}
+ m_LocalPosition: {x: -0, y: -2.3663206, z: 0}
+ m_LocalScale: {x: 1.2156034, y: 1.2156034, z: 1.6505318}
+ m_Children: []
+ m_Father: {fileID: 1333025062}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &10054528
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 10054526}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: -4963801623029300775, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ 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 &10054529
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 10054526}
+ m_Mesh: {fileID: -2639241166356525208, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
--- !u!1001 &13703654
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2683,7 +2764,7 @@ MonoBehaviour:
FactManager: {fileID: 0}
ignoreLayerMask:
serializedVersion: 2
- m_Bits: 31232
+ m_Bits: 96768
Cursor: {fileID: 1324548121420804703}
lineRenderer: {fileID: 492903072}
linePreviewMaterial: {fileID: 2100000, guid: a8a7bf60a30970f469a9c9d3ae2de6ef, type: 2}
@@ -3462,7 +3543,7 @@ MonoBehaviour:
FactManager: {fileID: 0}
ignoreLayerMask:
serializedVersion: 2
- m_Bits: 31232
+ m_Bits: 96768
Cursor: {fileID: 1324548121420804703}
lineRenderer: {fileID: 492903072}
linePreviewMaterial: {fileID: 2100000, guid: a8a7bf60a30970f469a9c9d3ae2de6ef, type: 2}
@@ -4742,6 +4823,58 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 236076526}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &238169963
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 238169964}
+ - component: {fileID: 238169965}
+ m_Layer: 9
+ m_Name: Fact Deleter
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &238169964
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 238169963}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 2063478022}
+ m_Father: {fileID: 1054037253}
+ m_RootOrder: 6
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &238169965
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 238169963}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9c2c50e559b6f2f438e1bb45ff8856da, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ id: 7
+ UiName:
+ Sprite: {fileID: 21300000, guid: d456617ba2282854d9570dcebcc2b279, type: 3}
+ FactManager: {fileID: 0}
+ ignoreLayerMask:
+ serializedVersion: 2
+ m_Bits: 115217
+ Cursor: {fileID: 1324548121420804703}
--- !u!1001 &244743825
PrefabInstance:
m_ObjectHideFlags: 0
@@ -5213,6 +5346,89 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 258991916}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &259488802
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 259488803}
+ - component: {fileID: 259488805}
+ - component: {fileID: 259488804}
+ m_Layer: 0
+ m_Name: Lamp02
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &259488803
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 259488802}
+ m_LocalRotation: {x: 0.000000091631094, y: 0.72558, z: 0.6881378, w: -0.000000096616816}
+ m_LocalPosition: {x: -0.1869725, y: 1.6138662, z: -0.20825356}
+ m_LocalScale: {x: 2.2279458, y: 2.5400007, z: 2.2279456}
+ m_Children: []
+ m_Father: {fileID: 2063478022}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &259488804
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 259488802}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: -4053520464898690182, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ - {fileID: -4963801623029300775, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ - {fileID: 5967751492454651251, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ 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 &259488805
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 259488802}
+ m_Mesh: {fileID: -4516270096655458733, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
--- !u!1001 &260783611
PrefabInstance:
m_ObjectHideFlags: 0
@@ -5398,7 +5614,7 @@ Transform:
m_Children:
- {fileID: 2011725994}
m_Father: {fileID: 1054037253}
- m_RootOrder: 5
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &262346999
MonoBehaviour:
@@ -5418,7 +5634,7 @@ MonoBehaviour:
FactManager: {fileID: 0}
ignoreLayerMask:
serializedVersion: 2
- m_Bits: 20992
+ m_Bits: 86528
Cursor: {fileID: 1324548121420804703}
lineRenderer: {fileID: 492903072}
linePreviewMaterial: {fileID: 2100000, guid: a8a7bf60a30970f469a9c9d3ae2de6ef, type: 2}
@@ -7198,6 +7414,87 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 340765443}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &342247490
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 342247491}
+ - component: {fileID: 342247493}
+ - component: {fileID: 342247492}
+ m_Layer: 0
+ m_Name: GeoSphere002
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &342247491
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 342247490}
+ m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -0, y: 2.3046205, z: 0}
+ m_LocalScale: {x: 0.9365708, y: 0.39187068, z: 0.9365708}
+ m_Children: []
+ m_Father: {fileID: 1333025062}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &342247492
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 342247490}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 8290782892783832528, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ 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 &342247493
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 342247490}
+ m_Mesh: {fileID: -5008381810204397873, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
--- !u!1001 &343675428
PrefabInstance:
m_ObjectHideFlags: 0
@@ -8209,6 +8506,88 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 360820242}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &361705990
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 361705991}
+ - component: {fileID: 361705993}
+ - component: {fileID: 361705992}
+ m_Layer: 0
+ m_Name: Cylinder004
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &361705991
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 361705990}
+ m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067}
+ m_LocalPosition: {x: -0, y: 2.2088046, z: 0}
+ m_LocalScale: {x: 1.0110741, y: 1.0110741, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1333025062}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &361705992
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 361705990}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: -4963801623029300775, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ - {fileID: -7161351915816769751, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ 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 &361705993
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 361705990}
+ m_Mesh: {fileID: -5208879343037863941, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
--- !u!1 &366034833
GameObject:
m_ObjectHideFlags: 0
@@ -9672,6 +10051,87 @@ Transform:
m_Father: {fileID: 2011725994}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!1 &423700143
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 423700144}
+ - component: {fileID: 423700146}
+ - component: {fileID: 423700145}
+ m_Layer: 0
+ m_Name: Lamp06
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &423700144
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 423700143}
+ m_LocalRotation: {x: -0.0000000035254462, y: 0.99964947, z: -0.026475651, w: -0.00000013311137}
+ m_LocalPosition: {x: -0.18697327, y: 1.2920719, z: -6.279079}
+ m_LocalScale: {x: 3.0876324, y: 3.0876336, z: 4.1923523}
+ m_Children: []
+ m_Father: {fileID: 2063478022}
+ m_RootOrder: 7
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &423700145
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 423700143}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: -4963801623029300775, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ 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 &423700146
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 423700143}
+ m_Mesh: {fileID: 7123417763800259717, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
--- !u!1 &424784665
GameObject:
m_ObjectHideFlags: 0
@@ -12375,6 +12835,88 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 564232033}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &570644004
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 570644005}
+ - component: {fileID: 570644007}
+ - component: {fileID: 570644006}
+ m_Layer: 0
+ m_Name: Object005
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &570644005
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 570644004}
+ m_LocalRotation: {x: 0.000000059604645, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -0, y: 0.027123343, z: 0}
+ m_LocalScale: {x: 0.877144, y: 1, z: 0.877144}
+ m_Children: []
+ m_Father: {fileID: 1333025062}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &570644006
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 570644004}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: -4963801623029300775, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ - {fileID: 5967751492454651251, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ 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 &570644007
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 570644004}
+ m_Mesh: {fileID: 9186633843763367028, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
--- !u!1001 &572130618
PrefabInstance:
m_ObjectHideFlags: 0
@@ -15410,6 +15952,87 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 715240475}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &722990590
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 722990591}
+ - component: {fileID: 722990593}
+ - component: {fileID: 722990592}
+ m_Layer: 0
+ m_Name: Object007
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &722990591
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 722990590}
+ m_LocalRotation: {x: 0.000000059604645, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -0, y: 0.027123343, z: 0}
+ m_LocalScale: {x: 0.877144, y: 1, z: 0.877144}
+ m_Children: []
+ m_Father: {fileID: 1333025062}
+ m_RootOrder: 6
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &722990592
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 722990590}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: -4963801623029300775, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ 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 &722990593
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 722990590}
+ m_Mesh: {fileID: 7733717212360752527, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
--- !u!1001 &726181197
PrefabInstance:
m_ObjectHideFlags: 0
@@ -18206,101 +18829,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 830818568}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &833485076
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 2115984489}
- m_Modifications:
- - target: {fileID: -8679921383154817045, guid: 77b64dedcbc1d5548b2c91fcda846c48,
- type: 3}
- propertyPath: m_RootOrder
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 77b64dedcbc1d5548b2c91fcda846c48,
- type: 3}
- propertyPath: m_LocalScale.x
- value: 0.08
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 77b64dedcbc1d5548b2c91fcda846c48,
- type: 3}
- propertyPath: m_LocalScale.y
- value: 0.10000001
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 77b64dedcbc1d5548b2c91fcda846c48,
- type: 3}
- propertyPath: m_LocalScale.z
- value: 0.099999994
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 77b64dedcbc1d5548b2c91fcda846c48,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 0.464
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 77b64dedcbc1d5548b2c91fcda846c48,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 77b64dedcbc1d5548b2c91fcda846c48,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: 0.39499974
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 77b64dedcbc1d5548b2c91fcda846c48,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 0.3213938
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 77b64dedcbc1d5548b2c91fcda846c48,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: 0.663414
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 77b64dedcbc1d5548b2c91fcda846c48,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: -0.38302216
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 77b64dedcbc1d5548b2c91fcda846c48,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: -0.5566704
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 77b64dedcbc1d5548b2c91fcda846c48,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 77b64dedcbc1d5548b2c91fcda846c48,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: -100
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 77b64dedcbc1d5548b2c91fcda846c48,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: -120
- objectReference: {fileID: 0}
- - target: {fileID: 919132149155446097, guid: 77b64dedcbc1d5548b2c91fcda846c48,
- type: 3}
- propertyPath: m_Name
- value: hammer
- objectReference: {fileID: 0}
- - target: {fileID: 919132149155446097, guid: 77b64dedcbc1d5548b2c91fcda846c48,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 77b64dedcbc1d5548b2c91fcda846c48, type: 3}
---- !u!4 &833485077 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 77b64dedcbc1d5548b2c91fcda846c48,
- type: 3}
- m_PrefabInstance: {fileID: 833485076}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &833506452
PrefabInstance:
m_ObjectHideFlags: 0
@@ -19662,7 +20190,7 @@ Transform:
m_Children:
- {fileID: 999970301}
m_Father: {fileID: 1054037253}
- m_RootOrder: 6
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &877022912
MonoBehaviour:
@@ -19682,7 +20210,7 @@ MonoBehaviour:
FactManager: {fileID: 0}
ignoreLayerMask:
serializedVersion: 2
- m_Bits: 31232
+ m_Bits: 96768
LayerPendulumHits:
serializedVersion: 2
m_Bits: 1
@@ -23199,6 +23727,87 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1038851519}
m_Mesh: {fileID: -3277585872683695184, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+--- !u!1 &1041517548
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1041517549}
+ - component: {fileID: 1041517551}
+ - component: {fileID: 1041517550}
+ m_Layer: 0
+ m_Name: Lamp03
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &1041517549
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1041517548}
+ m_LocalRotation: {x: 0.000000008089408, y: 0.99815303, z: 0.060750425, w: -0.00000013291212}
+ m_LocalPosition: {x: -0.18686707, y: 2.232217, z: -6.360401}
+ m_LocalScale: {x: 1.2480193, y: 1.2480197, z: 0.9301182}
+ m_Children: []
+ m_Father: {fileID: 2063478022}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &1041517550
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1041517548}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 7626191068330388430, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ 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 &1041517551
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1041517548}
+ m_Mesh: {fileID: 9127768759793400938, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
--- !u!1 &1046758678
GameObject:
m_ObjectHideFlags: 0
@@ -23450,9 +24059,9 @@ Transform:
- {fileID: 175866850}
- {fileID: 1427499966}
- {fileID: 132418085}
- - {fileID: 2115984489}
- {fileID: 262346998}
- {fileID: 877022911}
+ - {fileID: 238169964}
m_Father: {fileID: 2198523594935479221}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -28480,6 +29089,45 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1332156002}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1333025061
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1333025062}
+ m_Layer: 0
+ m_Name: Group002
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1333025062
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1333025061}
+ m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+ m_LocalPosition: {x: 0.395, y: -0.143, z: 0.253}
+ m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+ m_Children:
+ - {fileID: 2070218478}
+ - {fileID: 361705991}
+ - {fileID: 342247491}
+ - {fileID: 1700986647}
+ - {fileID: 570644005}
+ - {fileID: 10054527}
+ - {fileID: 722990591}
+ - {fileID: 2091183510}
+ - {fileID: 1606147035}
+ m_Father: {fileID: 2063478022}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!1001 &1334318707
PrefabInstance:
m_ObjectHideFlags: 0
@@ -29886,7 +30534,7 @@ MonoBehaviour:
FactManager: {fileID: 0}
ignoreLayerMask:
serializedVersion: 2
- m_Bits: 31232
+ m_Bits: 96768
Cursor: {fileID: 1324548121420804703}
lineRenderer: {fileID: 492903072}
anglePreviewMaterial: {fileID: 2100000, guid: 8a28cccde2536794c97ec91954e34e90,
@@ -33417,6 +34065,87 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1594468538}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1606147034
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1606147035}
+ - component: {fileID: 1606147037}
+ - component: {fileID: 1606147036}
+ m_Layer: 0
+ m_Name: Tube002
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1606147035
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1606147034}
+ m_LocalRotation: {x: 0.7071068, y: 0.00000009415696, z: -0.7071067, w: 0.00000009415697}
+ m_LocalPosition: {x: -0, y: -2.359513, z: 0.40296298}
+ m_LocalScale: {x: 1.0640908, y: 1, z: 0.45152956}
+ m_Children: []
+ m_Father: {fileID: 1333025062}
+ m_RootOrder: 8
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &1606147036
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1606147034}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: -4963801623029300775, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ 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 &1606147037
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1606147034}
+ m_Mesh: {fileID: -8429489704275616702, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
--- !u!1001 &1606843714
PrefabInstance:
m_ObjectHideFlags: 0
@@ -35658,6 +36387,87 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1698959509}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1700986646
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1700986647}
+ - component: {fileID: 1700986649}
+ - component: {fileID: 1700986648}
+ m_Layer: 0
+ m_Name: Helix002
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1700986647
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1700986646}
+ m_LocalRotation: {x: 0.6427877, y: -0, z: -0, w: 0.76604444}
+ m_LocalPosition: {x: -0.0000419548, y: -2.3787, z: 0.3713122}
+ m_LocalScale: {x: 0.4913462, y: 0.49134624, z: 0.36618823}
+ m_Children: []
+ m_Father: {fileID: 1333025062}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &1700986648
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1700986646}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 7626191068330388430, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ 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 &1700986649
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1700986646}
+ m_Mesh: {fileID: 6016102661566203690, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
--- !u!1001 &1710384107
PrefabInstance:
m_ObjectHideFlags: 0
@@ -53281,6 +54091,88 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1906395140}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1907620896
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1907620897}
+ - component: {fileID: 1907620899}
+ - component: {fileID: 1907620898}
+ m_Layer: 0
+ m_Name: Lamp04
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &1907620897
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1907620896}
+ m_LocalRotation: {x: -0.0000000035254462, y: 0.99964947, z: -0.026475651, w: -0.00000013311137}
+ m_LocalPosition: {x: -0.18697172, y: 1.9071897, z: 5.325448}
+ m_LocalScale: {x: 2.5681279, y: 2.5681279, z: 2.5400007}
+ m_Children: []
+ m_Father: {fileID: 2063478022}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &1907620898
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1907620896}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: -4963801623029300775, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ - {fileID: -7161351915816769751, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ 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 &1907620899
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1907620896}
+ m_Mesh: {fileID: 6226192841892960075, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
--- !u!1 &1911980454
GameObject:
m_ObjectHideFlags: 0
@@ -53451,6 +54343,87 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1923083049}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1929535148
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1929535149}
+ - component: {fileID: 1929535151}
+ - component: {fileID: 1929535150}
+ m_Layer: 0
+ m_Name: Lamp01
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &1929535149
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1929535148}
+ m_LocalRotation: {x: -0.0000000035254462, y: 0.99964947, z: -0.026475651, w: -0.00000013311137}
+ m_LocalPosition: {x: -0.18697327, y: 1.3168347, z: -5.8119106}
+ m_LocalScale: {x: 3.0876324, y: 3.0876336, z: 4.1923523}
+ m_Children: []
+ m_Father: {fileID: 2063478022}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &1929535150
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1929535148}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: -4963801623029300775, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ 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 &1929535151
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1929535148}
+ m_Mesh: {fileID: -1905102930025053637, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
--- !u!1001 &1932528654
PrefabInstance:
m_ObjectHideFlags: 0
@@ -55279,6 +56252,87 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2011812284}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &2015557811
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2015557812}
+ - component: {fileID: 2015557814}
+ - component: {fileID: 2015557813}
+ m_Layer: 0
+ m_Name: Lamp00
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &2015557812
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2015557811}
+ m_LocalRotation: {x: 0.00000009163111, y: 0.72558, z: 0.68813795, w: -0.000000096616816}
+ m_LocalPosition: {x: -0.18697172, y: 1.9200721, z: 5.56848}
+ m_LocalScale: {x: 2.3788898, y: 0.99535114, z: 2.3788908}
+ m_Children: []
+ m_Father: {fileID: 2063478022}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &2015557813
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2015557811}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 8290782892783832528, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ 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 &2015557814
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2015557811}
+ m_Mesh: {fileID: -3277585872683695184, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
--- !u!1001 &2015696004
PrefabInstance:
m_ObjectHideFlags: 0
@@ -55885,6 +56939,45 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2061580019}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &2063478021
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2063478022}
+ m_Layer: 0
+ m_Name: light
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &2063478022
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2063478021}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 1333025062}
+ - {fileID: 2015557812}
+ - {fileID: 1929535149}
+ - {fileID: 259488803}
+ - {fileID: 1041517549}
+ - {fileID: 1907620897}
+ - {fileID: 2070194649}
+ - {fileID: 423700144}
+ - {fileID: 2103925820}
+ m_Father: {fileID: 238169964}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2067273404
PrefabInstance:
m_ObjectHideFlags: 0
@@ -56035,6 +57128,168 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2068061372}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &2070194648
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2070194649}
+ - component: {fileID: 2070194651}
+ - component: {fileID: 2070194650}
+ m_Layer: 0
+ m_Name: Lamp05
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &2070194649
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2070194648}
+ m_LocalRotation: {x: 0.51306266, y: -0.48658693, z: 0.5130625, w: -0.486587}
+ m_LocalPosition: {x: -0.18697327, y: 2.315078, z: -6.3159885}
+ m_LocalScale: {x: 2.7027915, y: 2.5400007, z: 1.146885}
+ m_Children: []
+ m_Father: {fileID: 2063478022}
+ m_RootOrder: 6
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &2070194650
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2070194648}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: -4963801623029300775, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ 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 &2070194651
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2070194648}
+ m_Mesh: {fileID: -1736445758434401373, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+--- !u!1 &2070218477
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2070218478}
+ - component: {fileID: 2070218480}
+ - component: {fileID: 2070218479}
+ m_Layer: 0
+ m_Name: Cylinder003
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2070218478
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2070218477}
+ m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067}
+ m_LocalPosition: {x: -0, y: -2.1821377, z: 0}
+ m_LocalScale: {x: 1.2156034, y: 1.2156034, z: 1.6505318}
+ m_Children: []
+ m_Father: {fileID: 1333025062}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &2070218479
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2070218477}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: -4963801623029300775, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ 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 &2070218480
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2070218477}
+ m_Mesh: {fileID: 8245426573784773463, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
--- !u!1001 &2076046754
PrefabInstance:
m_ObjectHideFlags: 0
@@ -56407,6 +57662,99 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2087797526}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &2091183509
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2091183510}
+ - component: {fileID: 2091183511}
+ m_Layer: 0
+ m_Name: Omni002
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2091183510
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2091183509}
+ m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: -0.7071068}
+ m_LocalPosition: {x: -0, y: 1.2068384, z: -0.00000019378662}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1333025062}
+ m_RootOrder: 7
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!108 &2091183511
+Light:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2091183509}
+ m_Enabled: 1
+ serializedVersion: 10
+ m_Type: 0
+ m_Shape: 0
+ m_Color: {r: 0.9333334, g: 0.9294118, b: 1, a: 1}
+ m_Intensity: 10
+ m_Range: 8.412479
+ m_SpotAngle: 8.7
+ m_InnerSpotAngle: 8.7
+ m_CookieSize: 10
+ m_Shadows:
+ m_Type: 2
+ m_Resolution: -1
+ m_CustomResolution: -1
+ m_Strength: 1
+ m_Bias: 0.05
+ m_NormalBias: 0.4
+ m_NearPlane: 0.2
+ m_CullingMatrixOverride:
+ e00: 1
+ e01: 0
+ e02: 0
+ e03: 0
+ e10: 0
+ e11: 1
+ e12: 0
+ e13: 0
+ e20: 0
+ e21: 0
+ e22: 1
+ e23: 0
+ e30: 0
+ e31: 0
+ e32: 0
+ e33: 1
+ m_UseCullingMatrixOverride: 0
+ m_Cookie: {fileID: 0}
+ m_DrawHalo: 0
+ m_Flare: {fileID: 0}
+ m_RenderMode: 0
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_RenderingLayerMask: 1
+ m_Lightmapping: 4
+ m_LightShadowCasterMode: 0
+ m_AreaSize: {x: 1, y: 1}
+ m_BounceIntensity: 1
+ m_ColorTemperature: 6570
+ m_UseColorTemperature: 0
+ m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+ m_UseBoundingSphereOverride: 0
+ m_UseViewFrustumForShadowCasterCull: 1
+ m_ShadowRadius: 0
+ m_ShadowAngle: 0
--- !u!1001 &2095198189
PrefabInstance:
m_ObjectHideFlags: 0
@@ -56731,177 +58079,258 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e289bf5debb17f6459818c207d781953, type: 3}
---- !u!4 &2098835223 stripped
+--- !u!4 &2098835223 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
+ type: 3}
+ m_PrefabInstance: {fileID: 2098835222}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2099403950
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1961703113}
+ m_Modifications:
+ - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 363
+ objectReference: {fileID: 0}
+ - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -44.384277
+ objectReference: {fileID: 0}
+ - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -48.795143
+ objectReference: {fileID: 0}
+ - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4680757731160225450, guid: 0fde05fa0f3321942a21896ff4f0856f,
+ type: 3}
+ propertyPath: m_Name
+ value: Rock_03 (3)
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 0fde05fa0f3321942a21896ff4f0856f, type: 3}
+--- !u!4 &2099403951 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
+ type: 3}
+ m_PrefabInstance: {fileID: 2099403950}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2102917739
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1961703113}
+ m_Modifications:
+ - target: {fileID: 4661435515762455780, guid: e289bf5debb17f6459818c207d781953,
+ type: 3}
+ propertyPath: m_Name
+ value: Tree_02 (6)
+ objectReference: {fileID: 0}
+ - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 430
+ objectReference: {fileID: 0}
+ - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1.2595
+ objectReference: {fileID: 0}
+ - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1.052413
+ objectReference: {fileID: 0}
+ - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1.2595
+ objectReference: {fileID: 0}
+ - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -45.162613
+ objectReference: {fileID: 0}
+ - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 1.2
+ objectReference: {fileID: 0}
+ - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -40.676083
+ objectReference: {fileID: 0}
+ - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: e289bf5debb17f6459818c207d781953, type: 3}
+--- !u!4 &2102917740 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
type: 3}
- m_PrefabInstance: {fileID: 2098835222}
+ m_PrefabInstance: {fileID: 2102917739}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &2099403950
-PrefabInstance:
+--- !u!1 &2103925819
+GameObject:
m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 1961703113}
- m_Modifications:
- - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
- type: 3}
- propertyPath: m_RootOrder
- value: 363
- objectReference: {fileID: 0}
- - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: -44.384277
- objectReference: {fileID: 0}
- - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: -48.795143
- objectReference: {fileID: 0}
- - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4680757731160225450, guid: 0fde05fa0f3321942a21896ff4f0856f,
- type: 3}
- propertyPath: m_Name
- value: Rock_03 (3)
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 0fde05fa0f3321942a21896ff4f0856f, type: 3}
---- !u!4 &2099403951 stripped
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2103925820}
+ - component: {fileID: 2103925822}
+ - component: {fileID: 2103925821}
+ m_Layer: 0
+ m_Name: Lamp07
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &2103925820
Transform:
- m_CorrespondingSourceObject: {fileID: 4680757731159730826, guid: 0fde05fa0f3321942a21896ff4f0856f,
- type: 3}
- m_PrefabInstance: {fileID: 2099403950}
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &2102917739
-PrefabInstance:
+ m_GameObject: {fileID: 2103925819}
+ m_LocalRotation: {x: 0.000000091631094, y: 0.72558, z: 0.6881378, w: -0.000000096616816}
+ m_LocalPosition: {x: -0.1869725, y: 1.6138662, z: -0.20825356}
+ m_LocalScale: {x: 2.2279458, y: 2.5400007, z: 2.2279456}
+ m_Children: []
+ m_Father: {fileID: 2063478022}
+ m_RootOrder: 8
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &2103925821
+MeshRenderer:
m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 1961703113}
- m_Modifications:
- - target: {fileID: 4661435515762455780, guid: e289bf5debb17f6459818c207d781953,
- type: 3}
- propertyPath: m_Name
- value: Tree_02 (6)
- objectReference: {fileID: 0}
- - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
- type: 3}
- propertyPath: m_RootOrder
- value: 430
- objectReference: {fileID: 0}
- - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
- type: 3}
- propertyPath: m_LocalScale.x
- value: 1.2595
- objectReference: {fileID: 0}
- - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
- type: 3}
- propertyPath: m_LocalScale.y
- value: 1.052413
- objectReference: {fileID: 0}
- - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
- type: 3}
- propertyPath: m_LocalScale.z
- value: 1.2595
- objectReference: {fileID: 0}
- - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: -45.162613
- objectReference: {fileID: 0}
- - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 1.2
- objectReference: {fileID: 0}
- - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: -40.676083
- objectReference: {fileID: 0}
- - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: e289bf5debb17f6459818c207d781953, type: 3}
---- !u!4 &2102917740 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 4661435515762813124, guid: e289bf5debb17f6459818c207d781953,
- type: 3}
- m_PrefabInstance: {fileID: 2102917739}
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2103925819}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: -4963801623029300775, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
+ 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 &2103925822
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2103925819}
+ m_Mesh: {fileID: -5323330051269172871, guid: 1ed450acf42d68f4cbe65c36bce3da06, type: 3}
--- !u!1001 &2106204864
PrefabInstance:
m_ObjectHideFlags: 0
@@ -57052,58 +58481,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2109875885}
m_PrefabAsset: {fileID: 0}
---- !u!1 &2115984488
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 2115984489}
- - component: {fileID: 2115984490}
- m_Layer: 9
- m_Name: ExtraTool
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &2115984489
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2115984488}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 833485077}
- m_Father: {fileID: 1054037253}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2115984490
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2115984488}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 38cd422d38f88564e81d012b615cc77a, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- id: 4
- UiName:
- Sprite: {fileID: 21300000, guid: d456617ba2282854d9570dcebcc2b279, type: 3}
- FactManager: {fileID: 0}
- ignoreLayerMask:
- serializedVersion: 2
- m_Bits: 16896
- Cursor: {fileID: 0}
--- !u!1001 &2116937948
PrefabInstance:
m_ObjectHideFlags: 0
@@ -58233,6 +59610,11 @@ PrefabInstance:
propertyPath: modifier
value: modifier
objectReference: {fileID: 0}
+ - target: {fileID: 293934905664952486, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ propertyPath: modreset
+ value: mod+reset
+ objectReference: {fileID: 0}
- target: {fileID: 293934905664952486, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: CamControl
diff --git a/Assets/Scripts/HideUI.cs b/Assets/Scripts/HideUI.cs
index fdb33eced228aa81da415cd02a172c8c38fac7c0..d75c46ffd555b47bf83a305f5e6a4da07179ddee 100644
--- a/Assets/Scripts/HideUI.cs
+++ b/Assets/Scripts/HideUI.cs
@@ -10,7 +10,8 @@ public class HideUI : MonoBehaviour
public string
modifier,
modundo,
- modredo;
+ modredo,
+ modreset;
public UnityStandardAssets.Characters.FirstPerson.FirstPersonController CamControl;
public bool LockOnly = true;
@@ -51,12 +52,14 @@ void Update()
}
}
- if (Input.GetButton(modifier))
+ else if (Input.GetButton(modifier))
{
if (Input.GetButtonDown(modundo))
Facts.undo();
else if (Input.GetButtonDown(modredo))
Facts.redo();
+ else if (Input.GetButtonDown(modreset))
+ Facts.softreset();
}
/*
diff --git a/Assets/Scripts/InteractionEngine/Fact.cs b/Assets/Scripts/InteractionEngine/Fact.cs
index bfc672fd3185c1c67cf4d97a30091987296cf3ab..84c42faeb213adb5ef08db5b70cd33b0e9b9cd5e 100644
--- a/Assets/Scripts/InteractionEngine/Fact.cs
+++ b/Assets/Scripts/InteractionEngine/Fact.cs
@@ -234,7 +234,7 @@ public override Boolean hasDependentFacts() {
}
public override int[] getDependentFactIds() {
- return null;
+ return new int[] { }; ;
}
public override GameObject instantiateDisplay(GameObject prefab, Transform transform) {
@@ -399,6 +399,7 @@ public override GameObject instantiateDisplay(GameObject prefab, Transform trans
protected override bool EquivalentWrapped(RayFact f1, RayFact f2)
{
+ // TODO! check for similar(float uncertanty!) Directions
if (f1.Dir != f2.Dir && f1.Dir != -f2.Dir)
return false;
diff --git a/Assets/Scripts/InteractionEngine/FactOrganizer.cs b/Assets/Scripts/InteractionEngine/FactOrganizer.cs
index 60146501d8b3cc78b0718a33324484a2625c76f7..bf83ad6b7404cff7b74194695253f3fa115378a4 100644
--- a/Assets/Scripts/InteractionEngine/FactOrganizer.cs
+++ b/Assets/Scripts/InteractionEngine/FactOrganizer.cs
@@ -39,25 +39,25 @@ public stepnote(int Id, bool samestep, bool creation, FactOrganizer that)
{
this.Id = Id;
this.samestep = samestep;
- this.steplink = samestep ? that.Workflow[that.Workflow.Count - 1].steplink : that.Workflow.Count + 1;
this.creation = creation;
if (samestep)
- // steplink = first steptail ? steproot : previous.steplink
+ // steplink = !first_steptail ? previous.steplink : steproot
{
- stepnote prev = that.Workflow[that.Workflow.Count - 1];
- this.steplink = prev.samestep ? prev.steplink : that.Workflow.Count - 1;
+ stepnote prev = that.Workflow[that.marker - 1];
+ this.steplink = prev.samestep ? prev.steplink : that.marker - 1;
}
else
// steproot sets steplink after itself (end of steptail)
- this.steplink = that.Workflow.Count + 1;
+ this.steplink = that.marker + 1;
}
}
private struct meta
{
- // TODO? -> last occurence for safe_dependencies
+ // TODO? -> public int last_occurence for safe_dependencies
+
// reference to first occurrence in Workflow
public int workflow_id;
// keeps track wether Fact is currently in Scene
@@ -111,6 +111,8 @@ private bool FindEquivalent(Fact search, out Fact found)
private void WorkflowAdd(stepnote note)
// adds Workflow; updates meta struct; Invokes Events
{
+ PruneWorkflow();
+
if (note.samestep)
// update steplink of steproot
{
@@ -118,6 +120,8 @@ private void WorkflowAdd(stepnote note)
tmp.steplink = Workflow.Count + 1;
Workflow[note.steplink] = tmp;
}
+ else
+ worksteps++;
Workflow.Add(note);
marker = Workflow.Count;
@@ -130,39 +134,45 @@ private void WorkflowAdd(stepnote note)
InvokeFactEvent(note.creation, note.Id);
}
- public new void Add(int key, Fact value)
- // hide
+ private void PruneWorkflow()
+ // set current (displayed) state in stone; resets un-redo parameters
{
- this.Add(value, out bool obsolete);
- }
-
- public int Add(Fact value, out bool exists, bool samestep = false)
- // also checks for duplicates and active state
- // returns key of actual Fact
- {
- if (resetted)
- this.hardreset(false);
-
- else if (backlog > 0)
+ if (backlog > 0)
{
worksteps -= backlog;
backlog = 0;
- //TODO! incorporate deletion/ multiples in Workflow
for (int i = Workflow.Count - 1; i >= marker; i--)
+ // cleanup now obsolete Facts
{
stepnote last = Workflow[i];
- this[last.Id].delete();
- base.Remove(last.Id);
- MetaInf.Remove(last.Id);
+ if (MetaInf[last.Id].workflow_id == i)
+ // remove for good, if original creation gets pruned
+ {
+ this[last.Id].delete();
+ base.Remove(last.Id);
+ MetaInf.Remove(last.Id);
+ }
}
+ // prune Worklfow down to marker
Workflow.RemoveRange(marker, Workflow.Count - marker);
}
+ }
- if (!samestep)
- worksteps++;
+ public new void Add(int key, Fact value)
+ // hide
+ {
+ this.Add(value, out bool obsolete);
+ }
+
+ public int Add(Fact value, out bool exists, bool samestep = false)
+ // also checks for duplicates and active state
+ // returns key of actual Fact
+ {
+ if (resetted)
+ this.hardreset(false);
int key;
if (exists = FindEquivalent(value, out Fact found))
@@ -179,7 +189,7 @@ public int Add(Fact value, out bool exists, bool samestep = false)
key = value.Id;
base.Add(key, value);
- MetaInf.Add(key, new meta(Workflow.Count, true));
+ MetaInf.Add(key, new meta(marker, true));
}
WorkflowAdd(new stepnote(key, samestep, true, this));
@@ -201,9 +211,8 @@ public bool Remove(Fact value, bool samestep = false)
return true;
}
- //TODO! test
public bool Remove(int key, bool samestep = false)
- //no reset check (impossible)
+ //no reset check needed (impossible state)
{
if (!base.ContainsKey(key))
return false;
@@ -211,13 +220,16 @@ public bool Remove(int key, bool samestep = false)
//TODO: see issue #58
safe_dependencies(key, out List<int> deletethis);
- yeetusdeletus(deletethis, samestep);
+
+ if(deletethis.Count > 0)
+ {
+ yeetusdeletus(deletethis, samestep);
+ }
return true;
}
- // TODO: MMT: decide dependencies there
- // TODO? handle deletions better
+ // TODO: MMT: decide dependencies there (remember virtual deletions in Unity (un-redo)!)
// TODO? decrease runtime from O(n/2)
private bool safe_dependencies(int key, out List<int> dependencies)
// searches for dependencies of a Fact; returns false if any dependencies are steproots
@@ -230,7 +242,7 @@ private bool safe_dependencies(int key, out List<int> dependencies)
int pos = MetaInf[key].workflow_id;
dependencies.Add(key);
- /* consequent!= samestep != dependent
+ /* consequent != samestep != dependent
// get steproot
if (Workflow[pos].samestep)
pos = Workflow[pos].steplink;
@@ -242,7 +254,7 @@ private bool safe_dependencies(int key, out List<int> dependencies)
*/
// accumulate facts that are dependent of dependencies
- for (int i = pos; i < Workflow.Count; i++)
+ for (int i = pos; i < marker; i++)
{
if (!Workflow[i].creation)
{
@@ -341,7 +353,7 @@ public void hardreset(bool invoke_event = true)
{
foreach(var entry in this)
{
- if (invoke_event) //TODO: check if removed?
+ if (invoke_event) //TODO? check if removed
CommunicationEvents.RemoveFactEvent.Invoke(entry.Value);
entry.Value.delete();
}
diff --git a/Assets/Scripts/InteractionEngine/Gadgets/Remover.cs b/Assets/Scripts/InteractionEngine/Gadgets/Remover.cs
new file mode 100644
index 0000000000000000000000000000000000000000..e942aca949951e883d30f340e48115d53b06f400
--- /dev/null
+++ b/Assets/Scripts/InteractionEngine/Gadgets/Remover.cs
@@ -0,0 +1,38 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using static CommunicationEvents;
+
+public class Remover : Gadget
+{
+ public WorldCursor Cursor;
+
+ void Awake()
+ {
+ if (FactManager == null)
+ FactManager = GameObject.FindObjectOfType<FactManager>();
+
+ if (this.Cursor == null)
+ this.Cursor = GameObject.FindObjectOfType<WorldCursor>();
+
+ this.UiName = "Remove Mode";
+ CommunicationEvents.TriggerEvent.AddListener(OnHit);
+ }
+
+ void OnEnable()
+ {
+ this.Cursor.setLayerMask(~this.ignoreLayerMask.value);
+ }
+
+ public override void OnHit(RaycastHit hit)
+ {
+
+ if (!this.isActiveAndEnabled)
+ return;
+
+ // TODO: ask/warn user to cascade
+ var hid = hit.transform.GetComponent<FactObject>().Id;
+ Facts.Remove(hid);
+ }
+
+}
diff --git a/Assets/Scripts/InteractionEngine/Gadgets/Remover.cs.meta b/Assets/Scripts/InteractionEngine/Gadgets/Remover.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..6ec2612037d5ccac757889e58f833079a5f4b2c8
--- /dev/null
+++ b/Assets/Scripts/InteractionEngine/Gadgets/Remover.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9c2c50e559b6f2f438e1bb45ff8856da
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Math3d.cs b/Assets/Scripts/Math3d.cs
index c675190229cdbe722993621be32991644aab0073..b6cf776eef642a9fe8c2bb31df31e9c17a98a01b 100644
--- a/Assets/Scripts/Math3d.cs
+++ b/Assets/Scripts/Math3d.cs
@@ -4,7 +4,7 @@
public class Math3d
{
- public const double vectorPrecission = 1e-4d; //For Vector comparisons
+ public const double vectorPrecission = 1e-5d; //For Vector comparisons
private static Transform tempChild = null;
private static Transform tempParent = null;
diff --git a/Assets/Scripts/Restart.cs b/Assets/Scripts/Restart.cs
index f2fb7c4c16e046e9f1d5491d453ee156da0f5ea7..cf20ce143c751cca4393404951f573c515e88fd2 100644
--- a/Assets/Scripts/Restart.cs
+++ b/Assets/Scripts/Restart.cs
@@ -7,7 +7,7 @@ public void LoadStartScreen()
{
process.Kill();
Level.solved = false;
- //TODO: CommunicationEvents.Facts2.Clear();
+ //TODO: CommunicationEvents.Facts.Clear();
CommunicationEvents.Facts.hardreset();
UnityEngine.SceneManagement.SceneManager.LoadScene(0);
}