From 3dcea18a33c17657e5216f4f1161c54bc729db86 Mon Sep 17 00:00:00 2001 From: excitedneon Date: Sat, 20 May 2017 03:27:54 +0300 Subject: [PATCH 1/2] Tweak some graphics settings --- Assets/PostProcessingProfiles/DefaultPP.asset | 12 ++++++------ Assets/Scenes/TestMap.unity | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/PostProcessingProfiles/DefaultPP.asset b/Assets/PostProcessingProfiles/DefaultPP.asset index f55e1d3..20842f0 100644 --- a/Assets/PostProcessingProfiles/DefaultPP.asset +++ b/Assets/PostProcessingProfiles/DefaultPP.asset @@ -29,7 +29,7 @@ MonoBehaviour: m_Settings: excludeSkybox: 1 antialiasing: - m_Enabled: 0 + m_Enabled: 1 m_Settings: method: 1 fxaaSettings: @@ -134,9 +134,9 @@ MonoBehaviour: colorWheels: mode: 1 log: - slope: {r: 0, g: 0, b: 0, a: 0} - power: {r: 0, g: 0, b: 0, a: 0} - offset: {r: 0, g: 0, b: 0, a: 0} + slope: {r: 1, g: 1, b: 1, a: 0} + power: {r: 1, g: 1, b: 1, a: 0} + offset: {r: 1, g: 1, b: 1, a: 0} linear: lift: {r: 0, g: 0, b: 0, a: 0} gamma: {r: 0, g: 0, b: 0, a: 0} @@ -160,7 +160,7 @@ MonoBehaviour: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 + m_RotationOrder: 0 m_Loop: 0 m_ZeroValue: 0 m_Range: 1 @@ -305,7 +305,7 @@ MonoBehaviour: opacity: 1 rounded: 0 dithering: - m_Enabled: 0 + m_Enabled: 1 monitors: currentMonitorID: 0 refreshOnPlay: 0 diff --git a/Assets/Scenes/TestMap.unity b/Assets/Scenes/TestMap.unity index 8bbf64d..677c2ba 100644 --- a/Assets/Scenes/TestMap.unity +++ b/Assets/Scenes/TestMap.unity @@ -14,8 +14,8 @@ OcclusionCullingSettings: RenderSettings: m_ObjectHideFlags: 0 serializedVersion: 8 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_Fog: 1 + m_FogColor: {r: 0, g: 0, b: 0, a: 1} m_FogMode: 3 m_FogDensity: 0.01 m_LinearFogStart: 0 From da0e4236a42c4411fefd1115abe9687caf485b66 Mon Sep 17 00:00:00 2001 From: excitedneon Date: Sun, 21 May 2017 21:34:44 +0300 Subject: [PATCH 2/2] Change MeshDB to PrefabDB, add gun to inventory --- Assets/Models/Materials/Hologram Item.mat | 4 +- Assets/PostProcessingProfiles/DefaultPP.asset | 10 +- Assets/Prefabs/Cube.prefab | 111 + Assets/Prefabs/Cube.prefab.meta | 9 + Assets/Prefabs/Cylinder.prefab | 111 + Assets/Prefabs/Cylinder.prefab.meta | 9 + Assets/Prefabs/NPC.prefab | 134 +- Assets/Prefabs/PC.prefab | 2230 +---------------- Assets/Prefabs/Revolver.prefab | 284 +++ Assets/Prefabs/Revolver.prefab.meta | 9 + Assets/Prefabs/Street Lamp.prefab | 2 +- Assets/Scenes/FrontendDevMap.unity | 88 +- Assets/Scenes/TestMap.unity | 151 +- Assets/Scripts/Controls/EquipmentInterface.cs | 41 +- Assets/Scripts/Controls/InventoryInterface.cs | 136 +- .../Scripts/Entities/SyncBases/Inventory.cs | 1 + Assets/Scripts/Items/ItemDB.cs | 1 + Assets/Scripts/Util/Lerper.cs | 14 +- Assets/Scripts/Util/MeshDB.cs | 35 - Assets/Scripts/Util/MeshUtil.cs | 95 + Assets/Scripts/Util/MeshUtil.cs.meta | 12 + Assets/Scripts/Util/PrefabDB.cs | 44 + .../Util/{MeshDB.cs.meta => PrefabDB.cs.meta} | 0 23 files changed, 1038 insertions(+), 2493 deletions(-) create mode 100644 Assets/Prefabs/Cube.prefab create mode 100644 Assets/Prefabs/Cube.prefab.meta create mode 100644 Assets/Prefabs/Cylinder.prefab create mode 100644 Assets/Prefabs/Cylinder.prefab.meta create mode 100644 Assets/Prefabs/Revolver.prefab create mode 100644 Assets/Prefabs/Revolver.prefab.meta delete mode 100644 Assets/Scripts/Util/MeshDB.cs create mode 100644 Assets/Scripts/Util/MeshUtil.cs create mode 100644 Assets/Scripts/Util/MeshUtil.cs.meta create mode 100644 Assets/Scripts/Util/PrefabDB.cs rename Assets/Scripts/Util/{MeshDB.cs.meta => PrefabDB.cs.meta} (100%) diff --git a/Assets/Models/Materials/Hologram Item.mat b/Assets/Models/Materials/Hologram Item.mat index ecf2b17..01dcc90 100644 --- a/Assets/Models/Materials/Hologram Item.mat +++ b/Assets/Models/Materials/Hologram Item.mat @@ -73,6 +73,6 @@ Material: - _UVSec: 0 - _ZWrite: 0 m_Colors: - - _Color: {r: 1, g: 0.14700001, b: 0.97646916, a: 0.5019608} - - _EmissionColor: {r: 2.4, g: 1.5287998, b: 2.34947, a: 1} + - _Color: {r: 1, g: 0.14700001, b: 0.97646916, a: 0.678} + - _EmissionColor: {r: 2.3, g: 1.2007352, b: 2.2697449, a: 1} - _TintColor: {r: 1, g: 0.13725491, b: 0.7058824, a: 0.028} diff --git a/Assets/PostProcessingProfiles/DefaultPP.asset b/Assets/PostProcessingProfiles/DefaultPP.asset index 20842f0..637b579 100644 --- a/Assets/PostProcessingProfiles/DefaultPP.asset +++ b/Assets/PostProcessingProfiles/DefaultPP.asset @@ -100,14 +100,14 @@ MonoBehaviour: m_Enabled: 1 m_Settings: bloom: - intensity: 0.5 - threshold: 1.3 + intensity: 0.1 + threshold: 0.1 softKnee: 0.5 - radius: 5 - antiFlicker: 0 + radius: 4 + antiFlicker: 1 lensDirt: texture: {fileID: 2800000, guid: a2960ffde020f27409e070d92fb2e00b, type: 3} - intensity: 0.75 + intensity: 1 colorGrading: m_Enabled: 0 m_Settings: diff --git a/Assets/Prefabs/Cube.prefab b/Assets/Prefabs/Cube.prefab new file mode 100644 index 0000000..676dc42 --- /dev/null +++ b/Assets/Prefabs/Cube.prefab @@ -0,0 +1,111 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1234348911399036} + m_IsPrefabParent: 1 +--- !u!1 &1141994068573534 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4589947661171960} + - component: {fileID: 33329614007622854} + - component: {fileID: 23149232739000136} + m_Layer: 0 + m_Name: Mesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1234348911399036 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4247694155128182} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4247694155128182 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1234348911399036} + 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: 4589947661171960} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4589947661171960 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1141994068573534} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_Children: [] + m_Father: {fileID: 4247694155128182} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23149232739000136 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1141994068573534} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: ce8dfa1cfa2f741819d5c8702d8739d4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + 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 +--- !u!33 &33329614007622854 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1141994068573534} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Assets/Prefabs/Cube.prefab.meta b/Assets/Prefabs/Cube.prefab.meta new file mode 100644 index 0000000..f95b84b --- /dev/null +++ b/Assets/Prefabs/Cube.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e95d72dd366d446c7a31d2fbb90b5c12 +timeCreated: 1495362496 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Cylinder.prefab b/Assets/Prefabs/Cylinder.prefab new file mode 100644 index 0000000..f03ecb7 --- /dev/null +++ b/Assets/Prefabs/Cylinder.prefab @@ -0,0 +1,111 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1723129093729032} + m_IsPrefabParent: 1 +--- !u!1 &1062053544341604 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4890812469165510} + - component: {fileID: 33094480760550290} + - component: {fileID: 23595422366951510} + m_Layer: 0 + m_Name: Mesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1723129093729032 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4333959237908536} + m_Layer: 0 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4333959237908536 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1723129093729032} + 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: 4890812469165510} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4890812469165510 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1062053544341604} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_Children: [] + m_Father: {fileID: 4333959237908536} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23595422366951510 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1062053544341604} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: ce8dfa1cfa2f741819d5c8702d8739d4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + 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 +--- !u!33 &33094480760550290 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1062053544341604} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Assets/Prefabs/Cylinder.prefab.meta b/Assets/Prefabs/Cylinder.prefab.meta new file mode 100644 index 0000000..140651b --- /dev/null +++ b/Assets/Prefabs/Cylinder.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 6992caf23fc7342a88450abc87761579 +timeCreated: 1495362540 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/NPC.prefab b/Assets/Prefabs/NPC.prefab index 29247d6..4c41f9a 100644 --- a/Assets/Prefabs/NPC.prefab +++ b/Assets/Prefabs/NPC.prefab @@ -55,8 +55,6 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 4021186793457802} - - component: {fileID: 33347327159040576} - - component: {fileID: 23664335955531464} m_Layer: 0 m_Name: Left Hand m_TagString: Untagged @@ -104,8 +102,6 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 4530387361756610} - - component: {fileID: 33512562496570824} - - component: {fileID: 23983100625939084} m_Layer: 0 m_Name: Hat Mesh m_TagString: Untagged @@ -121,8 +117,6 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 4029151840286420} - - component: {fileID: 33917458294930386} - - component: {fileID: 23177266068827686} m_Layer: 0 m_Name: Right Hand m_TagString: Untagged @@ -154,7 +148,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1061796689964632} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.6, y: -0.30000007, z: 0.6} + m_LocalPosition: {x: -0.3, y: -0.25, z: 0.3} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4900355877646882} @@ -167,7 +161,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1702112528416172} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.6, y: -0.30000007, z: 0.6} + m_LocalPosition: {x: 0.3, y: -0.25, z: 0.3} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4900355877646882} @@ -290,38 +284,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!23 &23177266068827686 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1702112528416172} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: cac55f0f5d2b94909899376ddfca7276, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 --- !u!23 &23446230835089794 MeshRenderer: m_ObjectHideFlags: 1 @@ -386,70 +348,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!23 &23664335955531464 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1061796689964632} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: cac55f0f5d2b94909899376ddfca7276, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23983100625939084 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1473522455052964} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: cac55f0f5d2b94909899376ddfca7276, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 --- !u!33 &33321560475186088 MeshFilter: m_ObjectHideFlags: 1 @@ -457,20 +355,6 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1042355583027620} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33347327159040576 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1061796689964632} - m_Mesh: {fileID: 0} ---- !u!33 &33512562496570824 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1473522455052964} - m_Mesh: {fileID: 0} --- !u!33 &33780506824302906 MeshFilter: m_ObjectHideFlags: 1 @@ -485,13 +369,6 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1147981388454896} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33917458294930386 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1702112528416172} - m_Mesh: {fileID: 0} --- !u!114 &114052379458543858 MonoBehaviour: m_ObjectHideFlags: 1 @@ -521,14 +398,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Inventory: {fileID: 114934786006823366} - UpdateFrequency: 5 Slots: - Slot: 0 - Mesh: {fileID: 33512562496570824} + Transform: {fileID: 4530387361756610} - Slot: 1 - Mesh: {fileID: 33917458294930386} + Transform: {fileID: 4029151840286420} - Slot: 2 - Mesh: {fileID: 33347327159040576} + Transform: {fileID: 4021186793457802} --- !u!114 &114934786006823366 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/PC.prefab b/Assets/Prefabs/PC.prefab index 504870d..6e592f1 100644 --- a/Assets/Prefabs/PC.prefab +++ b/Assets/Prefabs/PC.prefab @@ -11,40 +11,6 @@ Prefab: m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 1297568499365208} m_IsPrefabParent: 1 ---- !u!1 &1008365958193210 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4849036440631004} - - component: {fileID: 33922702416605096} - - component: {fileID: 23809245653824050} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1025623427266330 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4118628390879112} - - component: {fileID: 33347912404414610} - - component: {fileID: 23387601956580074} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1052033749481372 GameObject: m_ObjectHideFlags: 1 @@ -62,40 +28,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1073554920665706 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4773352918757262} - - component: {fileID: 33064456677619514} - - component: {fileID: 23360991739981784} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1099916689909070 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4461988704565230} - - component: {fileID: 33055579101222036} - - component: {fileID: 23305099846569636} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1101618282831644 GameObject: m_ObjectHideFlags: 1 @@ -163,40 +95,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1138410146323874 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4280223700020638} - - component: {fileID: 33537590497262118} - - component: {fileID: 23284153173061476} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1161476972701840 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4896526597983852} - - component: {fileID: 33086038859886000} - - component: {fileID: 23254850180731812} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1163271349184480 GameObject: m_ObjectHideFlags: 1 @@ -214,40 +112,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1169828016369232 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4523926159743548} - - component: {fileID: 33476772205059668} - - component: {fileID: 23164110666389192} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1173974356424114 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4796293627473552} - - component: {fileID: 33449618604398976} - - component: {fileID: 23091525415731782} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1177482620057598 GameObject: m_ObjectHideFlags: 1 @@ -316,23 +180,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1248976874401108 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4660445963097950} - - component: {fileID: 33123624710881376} - - component: {fileID: 23510525455413732} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1276656054691086 GameObject: m_ObjectHideFlags: 1 @@ -358,8 +205,6 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 4603884443367184} - - component: {fileID: 33816067446785734} - - component: {fileID: 23947590342960758} m_Layer: 0 m_Name: Hat Mesh m_TagString: Untagged @@ -402,23 +247,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1296316799000626 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4345907313541278} - - component: {fileID: 33733195925545652} - - component: {fileID: 23393009392738676} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1297568499365208 GameObject: m_ObjectHideFlags: 0 @@ -439,40 +267,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1312791058985896 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4221439388768320} - - component: {fileID: 33292458609092014} - - component: {fileID: 23337096414830034} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1318315545082708 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4522262741704188} - - component: {fileID: 33831674242328916} - - component: {fileID: 23998028416288906} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1320617713043724 GameObject: m_ObjectHideFlags: 1 @@ -523,23 +317,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1371998637789986 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4651031504024864} - - component: {fileID: 33520149278772894} - - component: {fileID: 23804598168857420} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1373682370141446 GameObject: m_ObjectHideFlags: 1 @@ -574,23 +351,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1423050520125662 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4938880339575446} - - component: {fileID: 33545474583017300} - - component: {fileID: 23283053728706072} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1455034129804424 GameObject: m_ObjectHideFlags: 1 @@ -599,8 +359,6 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 4949557329132524} - - component: {fileID: 33570510947136580} - - component: {fileID: 23795875440691066} m_Layer: 0 m_Name: Left Hand m_TagString: Untagged @@ -608,23 +366,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1467080138821004 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4199549140126762} - - component: {fileID: 33535826242326588} - - component: {fileID: 23391780332851722} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1473348076947890 GameObject: m_ObjectHideFlags: 1 @@ -658,23 +399,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1491104319836832 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4892213105523124} - - component: {fileID: 33548306597594738} - - component: {fileID: 23008863380251862} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1508824872999592 GameObject: m_ObjectHideFlags: 1 @@ -710,23 +434,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1509849257957848 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4612469421790772} - - component: {fileID: 33120057851128182} - - component: {fileID: 23629924963844176} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1534634039560822 GameObject: m_ObjectHideFlags: 1 @@ -761,23 +468,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1585839934909782 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4870922274357464} - - component: {fileID: 33756008920457032} - - component: {fileID: 23997482671804020} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1593278606667730 GameObject: m_ObjectHideFlags: 1 @@ -786,8 +476,6 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 4778775157160844} - - component: {fileID: 33975615408091930} - - component: {fileID: 23193880740220832} m_Layer: 0 m_Name: Right Hand m_TagString: Untagged @@ -795,57 +483,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1603012649709942 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4484000868882010} - - component: {fileID: 33256690769251264} - - component: {fileID: 23550202703388746} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1611770961802438 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4463075796076504} - - component: {fileID: 33079585148053682} - - component: {fileID: 23804466063309962} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1614693744922738 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4885341820297518} - - component: {fileID: 33086492884285004} - - component: {fileID: 23895540604298594} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1631579676868556 GameObject: m_ObjectHideFlags: 1 @@ -864,23 +501,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1631952559203138 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4131289299435130} - - component: {fileID: 33504816941838216} - - component: {fileID: 23862045926527804} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1645509716543668 GameObject: m_ObjectHideFlags: 1 @@ -971,40 +591,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1750284427022208 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4971862187212216} - - component: {fileID: 33351832541301346} - - component: {fileID: 23485292378779438} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1763859699079746 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4516900350087752} - - component: {fileID: 33912407548578608} - - component: {fileID: 23202936207886656} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1770406887915222 GameObject: m_ObjectHideFlags: 1 @@ -1057,23 +643,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1798430208900394 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4946028163711694} - - component: {fileID: 33496375962999984} - - component: {fileID: 23243368877284692} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1805804382620302 GameObject: m_ObjectHideFlags: 1 @@ -1109,40 +678,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1847434687487808 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4750818610206166} - - component: {fileID: 33585471952367662} - - component: {fileID: 23383567650321370} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1848307522325432 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4347380629457474} - - component: {fileID: 33638918544535274} - - component: {fileID: 23964641026033906} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1863830862307530 GameObject: m_ObjectHideFlags: 1 @@ -1160,23 +695,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1883316003296622 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4475385910747810} - - component: {fileID: 33646979899608124} - - component: {fileID: 23055009020132306} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1892519892396820 GameObject: m_ObjectHideFlags: 1 @@ -1330,23 +848,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1966794789270002 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4199826361845304} - - component: {fileID: 33476797233759506} - - component: {fileID: 23824449170381274} - m_Layer: 0 - m_Name: Item Preview Mesh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1979598013507698 GameObject: m_ObjectHideFlags: 1 @@ -1407,8 +908,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.8961, z: 0.2478} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4280223700020638} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1421,8 +921,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.8961, z: 0.1123} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4345907313541278} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1449,8 +948,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.7602, z: 0.6559001} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4463075796076504} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1463,24 +961,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.6244, z: 0.24780013} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4892213105523124} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4118628390879112 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1025623427266330} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4799191749864078} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4126889091672100 Transform: m_ObjectHideFlags: 1 @@ -1494,19 +978,6 @@ Transform: m_Father: {fileID: 4883048021777868} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4131289299435130 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1631952559203138} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4145663281164610} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4145297277959534 Transform: m_ObjectHideFlags: 1 @@ -1516,8 +987,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.0029999916, y: 1.04, z: -0.44400024} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4750818610206166} + m_Children: [] m_Father: {fileID: 4236387573765288} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1530,8 +1000,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.4877, z: 0.65590036} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4131289299435130} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1544,8 +1013,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.8956, z: -0.0238} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4849036440631004} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1558,8 +1026,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.7599, z: 0.24780007} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4199549140126762} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1585,37 +1052,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.7599, z: 0.3843001} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4347380629457474} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4199549140126762 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1467080138821004} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4156216193351948} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4199826361845304 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1966794789270002} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4208013247027646} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4208013247027646 Transform: m_ObjectHideFlags: 1 @@ -1625,8 +1065,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.8961, z: 0.5199} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4199826361845304} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1639,24 +1078,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.4874, z: 0.24780019} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4651031504024864} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4221439388768320 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1312791058985896} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4258899495113432} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4236387573765288 Transform: m_ObjectHideFlags: 1 @@ -1718,24 +1143,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.4874, z: 0.5199004} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4221439388768320} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4280223700020638 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1138410146323874} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4010476409272322} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4334285771407092 Transform: m_ObjectHideFlags: 1 @@ -1750,32 +1161,6 @@ Transform: m_Father: {fileID: 4236387573765288} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} ---- !u!4 &4345907313541278 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1296316799000626} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4080092195731418} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4347380629457474 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1848307522325432} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4194975350273374} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4360509542216554 Transform: m_ObjectHideFlags: 1 @@ -1785,8 +1170,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.8957, z: -0.1603} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4896526597983852} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1799,8 +1183,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.487, z: -0.16030009} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4971862187212216} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1813,8 +1196,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.6247, z: 0.65590024} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4870922274357464} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1853,8 +1235,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.8961, z: 0.3843} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4516900350087752} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1867,63 +1248,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.6244, z: 0.11230006} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4523926159743548} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4461988704565230 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1099916689909070} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4943232433337334} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4463075796076504 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1611770961802438} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4105190110964144} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4475385910747810 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1883316003296622} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4683796730834956} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4484000868882010 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1603012649709942} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4749684931174024} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4492604351735376 Transform: m_ObjectHideFlags: 1 @@ -1933,8 +1261,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.6244, z: 0.51990026} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4938880339575446} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1947,8 +1274,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.7594, z: -0.023800008} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4522262741704188} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1965,45 +1291,6 @@ Transform: m_Father: {fileID: 4236387573765288} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 90} ---- !u!4 &4516900350087752 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1763859699079746} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4400926797842380} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4522262741704188 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1318315545082708} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4495420574010918} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4523926159743548 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1169828016369232} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4416405116119186} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4530114029127332 Transform: m_ObjectHideFlags: 1 @@ -2013,8 +1300,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.7599, z: 0.51990014} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4946028163711694} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2055,8 +1341,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.7595, z: -0.16030003} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4796293627473552} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2073,19 +1358,6 @@ Transform: m_Father: {fileID: 4883048021777868} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4612469421790772 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1509849257957848} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4714979731061144} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4638548974480200 Transform: m_ObjectHideFlags: 1 @@ -2108,37 +1380,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.7599, z: 0.11230003} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4773352918757262} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4651031504024864 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1371998637789986} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4211227510040078} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4660445963097950 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1248976874401108} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4887939030648004} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4683796730834956 Transform: m_ObjectHideFlags: 1 @@ -2148,8 +1393,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.4869, z: -0.023800023} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4475385910747810} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2175,8 +1419,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.6244, z: 0.38430023} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4612469421790772} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2189,37 +1432,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.4874, z: 0.11230009} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4484000868882010} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4750818610206166 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1847434687487808} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} - m_LocalScale: {x: 0.10000018, y: 0.1, z: 0.10000018} - m_Children: [] - m_Father: {fileID: 4145297277959534} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4773352918757262 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1073554920665706} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4646528272650776} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4778775157160844 Transform: m_ObjectHideFlags: 1 @@ -2227,7 +1443,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1593278606667730} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.6, y: -0.30000007, z: 0.6} + m_LocalPosition: {x: 0.3, y: -0.25, z: 0.3} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4883048021777868} @@ -2274,19 +1490,6 @@ Transform: m_Father: {fileID: 4236387573765288} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4796293627473552 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1173974356424114} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4597477275868484} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4799191749864078 Transform: m_ObjectHideFlags: 1 @@ -2296,8 +1499,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.624, z: -0.16030006} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4118628390879112} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2327,19 +1529,6 @@ Transform: m_Father: {fileID: 4236387573765288} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 108.933, y: 89.99999, z: 180} ---- !u!4 &4849036440631004 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1008365958193210} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4151678043807474} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4850852153405518 Transform: m_ObjectHideFlags: 1 @@ -2353,19 +1542,6 @@ Transform: m_Father: {fileID: 4236387573765288} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} ---- !u!4 &4870922274357464 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1585839934909782} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4368372580065680} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4871279644634608 Transform: m_ObjectHideFlags: 1 @@ -2398,19 +1574,6 @@ Transform: m_Father: {fileID: 4586682446228250} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4885341820297518 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1614693744922738} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4967445830105586} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4887939030648004 Transform: m_ObjectHideFlags: 1 @@ -2420,50 +1583,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.6239, z: -0.023800015} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4660445963097950} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4892213105523124 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1491104319836832} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4109703148614224} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4896526597983852 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1161476972701840} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4360509542216554} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4938880339575446 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1423050520125662} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4492604351735376} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4943232433337334 Transform: m_ObjectHideFlags: 1 @@ -2473,22 +1596,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.8964, z: 0.6559} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4461988704565230} - m_Father: {fileID: 4783870784903044} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4946028163711694 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1798430208900394} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} m_Children: [] - m_Father: {fileID: 4530114029127332} + m_Father: {fileID: 4783870784903044} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4949557329132524 @@ -2498,7 +1607,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1455034129804424} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.6, y: -0.3, z: 0.6} + m_LocalPosition: {x: -0.3, y: -0.25, z: 0.3} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4883048021777868} @@ -2513,24 +1622,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02, y: 0.4874, z: 0.38430035} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: - - {fileID: 4885341820297518} + m_Children: [] m_Father: {fileID: 4783870784903044} m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4971862187212216 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1750284427022208} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} - m_Children: [] - m_Father: {fileID: 4360854262006104} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &20678872378488080 Camera: m_ObjectHideFlags: 1 @@ -2561,108 +1656,12 @@ Camera: m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 1 - m_AllowMSAA: 1 + m_AllowMSAA: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 m_StereoMirrorMode: 0 ---- !u!23 &23008863380251862 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1491104319836832} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23055009020132306 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1883316003296622} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23091525415731782 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1173974356424114} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 --- !u!23 &23114746529417128 MeshRenderer: m_ObjectHideFlags: 1 @@ -2695,262 +1694,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!23 &23164110666389192 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1169828016369232} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23193880740220832 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1593278606667730} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: cac55f0f5d2b94909899376ddfca7276, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23202936207886656 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1763859699079746} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23243368877284692 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1798430208900394} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23254850180731812 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1161476972701840} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23283053728706072 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1423050520125662} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23284153173061476 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1138410146323874} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23305099846569636 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1099916689909070} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 --- !u!23 &23314793801828000 MeshRenderer: m_ObjectHideFlags: 1 @@ -3015,38 +1758,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!23 &23337096414830034 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1312791058985896} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 --- !u!23 &23360414563318538 MeshRenderer: m_ObjectHideFlags: 1 @@ -3079,38 +1790,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!23 &23360991739981784 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1073554920665706} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 --- !u!23 &23368467152873994 MeshRenderer: m_ObjectHideFlags: 1 @@ -3143,134 +1822,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!23 &23383567650321370 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1847434687487808} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23387601956580074 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1025623427266330} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23391780332851722 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1467080138821004} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23393009392738676 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1296316799000626} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 --- !u!23 &23436966457259662 MeshRenderer: m_ObjectHideFlags: 1 @@ -3303,70 +1854,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!23 &23485292378779438 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1750284427022208} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23510525455413732 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1248976874401108} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 --- !u!23 &23512526763929976 MeshRenderer: m_ObjectHideFlags: 1 @@ -3399,70 +1886,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!23 &23550202703388746 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1603012649709942} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23629924963844176 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1509849257957848} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 --- !u!23 &23667304044291600 MeshRenderer: m_ObjectHideFlags: 1 @@ -3559,166 +1982,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!23 &23795875440691066 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1455034129804424} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: cac55f0f5d2b94909899376ddfca7276, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23804466063309962 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1611770961802438} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23804598168857420 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1371998637789986} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23809245653824050 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1008365958193210} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23824449170381274 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1966794789270002} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 --- !u!23 &23853909658500366 MeshRenderer: m_ObjectHideFlags: 1 @@ -3751,70 +2014,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!23 &23862045926527804 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1631952559203138} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23895540604298594 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1614693744922738} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 --- !u!23 &23929481531100956 MeshRenderer: m_ObjectHideFlags: 1 @@ -3850,70 +2049,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!23 &23947590342960758 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1282435183566290} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: cac55f0f5d2b94909899376ddfca7276, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23964641026033906 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1848307522325432} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 --- !u!23 &23982704159771918 MeshRenderer: m_ObjectHideFlags: 1 @@ -3946,84 +2081,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!23 &23997482671804020 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1585839934909782} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!23 &23998028416288906 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1318315545082708} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - 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 ---- !u!33 &33055579101222036 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1099916689909070} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33064456677619514 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1073554920665706} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &33067661023441796 MeshFilter: m_ObjectHideFlags: 1 @@ -4031,48 +2088,6 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1892519892396820} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33079585148053682 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1611770961802438} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33086038859886000 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1161476972701840} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33086492884285004 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1614693744922738} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33120057851128182 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1509849257957848} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33123624710881376 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1248976874401108} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33256690769251264 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1603012649709942} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &33272790934557900 MeshFilter: m_ObjectHideFlags: 1 @@ -4080,13 +2095,6 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1938407866563824} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33292458609092014 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1312791058985896} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &33337063842811222 MeshFilter: m_ObjectHideFlags: 1 @@ -4094,55 +2102,6 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1355516313789472} m_Mesh: {fileID: 4300000, guid: 8d9188969010c44ce935ad4421c967df, type: 3} ---- !u!33 &33347912404414610 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1025623427266330} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33351832541301346 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1750284427022208} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33449618604398976 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1173974356424114} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33476772205059668 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1169828016369232} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33476797233759506 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1966794789270002} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33496375962999984 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1798430208900394} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33504816941838216 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1631952559203138} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &33510040498267354 MeshFilter: m_ObjectHideFlags: 1 @@ -4150,13 +2109,6 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1733941371029502} m_Mesh: {fileID: 4300000, guid: 8d9188969010c44ce935ad4421c967df, type: 3} ---- !u!33 &33520149278772894 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1371998637789986} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &33521042049071656 MeshFilter: m_ObjectHideFlags: 1 @@ -4164,20 +2116,6 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1660701953044296} m_Mesh: {fileID: 4300000, guid: 8d9188969010c44ce935ad4421c967df, type: 3} ---- !u!33 &33535826242326588 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1467080138821004} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33537590497262118 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1138410146323874} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &33540133742758052 MeshFilter: m_ObjectHideFlags: 1 @@ -4185,13 +2123,6 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1373682370141446} m_Mesh: {fileID: 4300000, guid: 8d9188969010c44ce935ad4421c967df, type: 3} ---- !u!33 &33545474583017300 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1423050520125662} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &33546741408812898 MeshFilter: m_ObjectHideFlags: 1 @@ -4199,41 +2130,6 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1509121232505744} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33548306597594738 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1491104319836832} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33570510947136580 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1455034129804424} - m_Mesh: {fileID: 0} ---- !u!33 &33585471952367662 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1847434687487808} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33638918544535274 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1848307522325432} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33646979899608124 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1883316003296622} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &33683376200718996 MeshFilter: m_ObjectHideFlags: 1 @@ -4248,20 +2144,6 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1781319298924144} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33733195925545652 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1296316799000626} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33756008920457032 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1585839934909782} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &33797246170962224 MeshFilter: m_ObjectHideFlags: 1 @@ -4276,20 +2158,6 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1292364954462330} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33816067446785734 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1282435183566290} - m_Mesh: {fileID: 0} ---- !u!33 &33831674242328916 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1318315545082708} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &33855553013256190 MeshFilter: m_ObjectHideFlags: 1 @@ -4297,20 +2165,6 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1118036843494872} m_Mesh: {fileID: 4300000, guid: fc26c95dfc47945d5b323d895acc1d06, type: 3} ---- !u!33 &33912407548578608 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1763859699079746} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33922702416605096 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1008365958193210} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &33947386320701838 MeshFilter: m_ObjectHideFlags: 1 @@ -4318,13 +2172,6 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1631579676868556} m_Mesh: {fileID: 4300000, guid: 8d9188969010c44ce935ad4421c967df, type: 3} ---- !u!33 &33975615408091930 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1593278606667730} - m_Mesh: {fileID: 0} --- !u!64 &64013687062017004 MeshCollider: m_ObjectHideFlags: 1 @@ -4933,7 +2780,7 @@ MonoBehaviour: Hologram: {fileID: 114633016952828368} ItemNameText: {fileID: 114834032454661740} ItemDescriptionText: {fileID: 114599527678381310} - ItemPreviewMesh: {fileID: 33585471952367662} + ItemPreview: {fileID: 4145297277959534} ItemPreviewSpinner: {fileID: 114807753601238226} IconInventory: {fileID: 23114746529417128} IconStatus: {fileID: 23853909658500366} @@ -4943,6 +2790,10 @@ MonoBehaviour: ItemGridSelector: {fileID: 4334285771407092} ItemGridParent: {fileID: 4783870784903044} ItemGridDimensions: {x: 7, y: 4} + ItemGridHologramMaterial: {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, + type: 2} + ItemPreviewHologramMaterial: {fileID: 2100000, guid: dc8a9321c9cc446d3b29e4581ce4524d, + type: 2} --- !u!114 &114385213279389382 MonoBehaviour: m_ObjectHideFlags: 1 @@ -5232,14 +3083,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Inventory: {fileID: 114702404122310282} - UpdateFrequency: 15 Slots: - Slot: 0 - Mesh: {fileID: 33816067446785734} + Transform: {fileID: 4603884443367184} - Slot: 1 - Mesh: {fileID: 33975615408091930} + Transform: {fileID: 4778775157160844} - Slot: 2 - Mesh: {fileID: 33570510947136580} + Transform: {fileID: 4949557329132524} --- !u!114 &114800660248371886 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/Revolver.prefab b/Assets/Prefabs/Revolver.prefab new file mode 100644 index 0000000..31ae94a --- /dev/null +++ b/Assets/Prefabs/Revolver.prefab @@ -0,0 +1,284 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1189570342817650} + m_IsPrefabParent: 1 +--- !u!1 &1189570342817650 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4120815632844386} + - component: {fileID: 95210833825758216} + m_Layer: 0 + m_Name: Revolver + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1636027850798724 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4854108128273276} + m_Layer: 0 + m_Name: Root + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1658484764950030 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4497048483641736} + m_Layer: 0 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1662957851593570 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4161320097804978} + m_Layer: 0 + m_Name: Hammer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1807536173560240 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4139935116609196} + - component: {fileID: 137873237851816630} + m_Layer: 0 + m_Name: Revolver + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1906255200147712 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4020990981463640} + m_Layer: 0 + m_Name: Armature + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1925943292885272 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4541820958096452} + m_Layer: 0 + m_Name: Trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4020990981463640 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1906255200147712} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4854108128273276} + m_Father: {fileID: 4120815632844386} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4120815632844386 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1189570342817650} + 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: 4020990981463640} + - {fileID: 4139935116609196} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4139935116609196 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1807536173560240} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4120815632844386} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4161320097804978 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1662957851593570} + m_LocalRotation: {x: -0.00000010940482, y: -5.434581e-10, z: 0.004967419, w: 0.99998766} + m_LocalPosition: {x: -0.09575599, y: -0.022962062, z: 0.05999526} + m_LocalScale: {x: 0.99999994, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4854108128273276} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4497048483641736 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1658484764950030} + m_LocalRotation: {x: 0.21537921, y: 0.6735071, z: -0.21388468, w: 0.6739833} + m_LocalPosition: {x: -0.0833501, y: -0.0005345028, z: 0.09397061} + m_LocalScale: {x: 1, y: 0.99999994, z: 0.9999999} + m_Children: [] + m_Father: {fileID: 4854108128273276} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4541820958096452 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1925943292885272} + m_LocalRotation: {x: -0.00000010940484, y: -5.434583e-10, z: 0.004967418, w: 0.99998766} + m_LocalPosition: {x: -0.034001924, y: -0.014679911, z: 0.08898599} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4854108128273276} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4854108128273276 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1636027850798724} + m_LocalRotation: {x: -0.49751332, y: -0.5024743, z: 0.50248075, w: -0.49750698} + m_LocalPosition: {x: -0.0002935566, y: -0.00007437801, z: 0.0004956032} + m_LocalScale: {x: 0.99999994, y: 1, z: 0.99999994} + m_Children: + - {fileID: 4497048483641736} + - {fileID: 4161320097804978} + - {fileID: 4541820958096452} + m_Father: {fileID: 4020990981463640} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &95210833825758216 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1189570342817650} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: 4bdb9c3cf6eb02a46813d71d2e3c87ad, type: 3} + m_Controller: {fileID: 0} + m_CullingMode: 1 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 +--- !u!137 &137873237851816630 +SkinnedMeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1807536173560240} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: d7eb6d68ec87f9842af7f1e1b4b5cdd0, type: 2} + - {fileID: 2100000, guid: c21fe0b9ebdc3c54b92f9504a816be02, type: 2} + - {fileID: 2100000, guid: 0e5403f39757d4243a701ef7f975e417, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + 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 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 0 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: 4300000, guid: 4bdb9c3cf6eb02a46813d71d2e3c87ad, type: 3} + m_Bones: + - {fileID: 4854108128273276} + - {fileID: 4541820958096452} + - {fileID: 4161320097804978} + - {fileID: 4497048483641736} + m_BlendShapeWeights: [] + m_RootBone: {fileID: 4854108128273276} + m_AABB: + m_Center: {x: -0.024172641, y: -0.00078928843, z: 0.17103767} + m_Extent: {x: 0.102851205, y: 0.03587121, z: 0.22000009} + m_DirtyAABB: 0 diff --git a/Assets/Prefabs/Revolver.prefab.meta b/Assets/Prefabs/Revolver.prefab.meta new file mode 100644 index 0000000..ac05c95 --- /dev/null +++ b/Assets/Prefabs/Revolver.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: fed35f862b6524339a68bb9dc36f6acb +timeCreated: 1495362564 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Street Lamp.prefab b/Assets/Prefabs/Street Lamp.prefab index 546233d..1f7082c 100644 --- a/Assets/Prefabs/Street Lamp.prefab +++ b/Assets/Prefabs/Street Lamp.prefab @@ -245,7 +245,7 @@ Light: serializedVersion: 8 m_Type: 2 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 1.3 + m_Intensity: 0.8 m_Range: 13 m_SpotAngle: 30 m_CookieSize: 10 diff --git a/Assets/Scenes/FrontendDevMap.unity b/Assets/Scenes/FrontendDevMap.unity index 19f43f4..4b580a4 100644 --- a/Assets/Scenes/FrontendDevMap.unity +++ b/Assets/Scenes/FrontendDevMap.unity @@ -395,9 +395,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 928708f1fbd954c6e9e015942b8ddb92, type: 3} m_Name: m_EditorClassIdentifier: - Meshes: - - {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} - - {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} + Prefabs: [] --- !u!1 &310461191 GameObject: m_ObjectHideFlags: 0 @@ -843,48 +841,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9d715320baa1f401ab0f46b603399dc3, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &662048545 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} - m_IsPrefabParent: 0 --- !u!1 &746314094 GameObject: m_ObjectHideFlags: 0 @@ -1328,6 +1284,48 @@ Transform: m_Father: {fileID: 19192150} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &963953023 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4586682446228250, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: e8761b9491a974d1780e60dafbd372a2, type: 2} + m_IsPrefabParent: 0 --- !u!1 &1116159554 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TestMap.unity b/Assets/Scenes/TestMap.unity index 677c2ba..968d579 100644 --- a/Assets/Scenes/TestMap.unity +++ b/Assets/Scenes/TestMap.unity @@ -17,7 +17,7 @@ RenderSettings: m_Fog: 1 m_FogColor: {r: 0, g: 0, b: 0, a: 1} m_FogMode: 3 - m_FogDensity: 0.01 + m_FogDensity: 0.02 m_LinearFogStart: 0 m_LinearFogEnd: 300 m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} @@ -37,7 +37,7 @@ RenderSettings: m_ReflectionBounces: 1 m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} + m_Sun: {fileID: 1810916632} m_IndirectSpecularColor: {r: 0.010379571, g: 0.0037877169, b: 0.0007244428, a: 1} --- !u!157 &3 LightmapSettings: @@ -354,6 +354,8 @@ Transform: m_Children: - {fileID: 769207969} - {fileID: 1810916633} + - {fileID: 458076501} + - {fileID: 2039610603} - {fileID: 949094013} - {fileID: 824127003} m_Father: {fileID: 0} @@ -910,7 +912,7 @@ GameObject: - component: {fileID: 274219296} - component: {fileID: 274219297} m_Layer: 0 - m_Name: MeshDB + m_Name: PrefabDB m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -940,9 +942,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 928708f1fbd954c6e9e015942b8ddb92, type: 3} m_Name: m_EditorClassIdentifier: - Meshes: - - {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} - - {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} + Prefabs: + - {fileID: 1234348911399036, guid: e95d72dd366d446c7a31d2fbb90b5c12, type: 2} + - {fileID: 1723129093729032, guid: 6992caf23fc7342a88450abc87761579, type: 2} + - {fileID: 1189570342817650, guid: fed35f862b6524339a68bb9dc36f6acb, type: 2} --- !u!114 &310461193 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 114930047805146446, guid: 03523048e15d74908b251a069e8163fa, @@ -1714,6 +1717,71 @@ Transform: m_Father: {fileID: 1042143220} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &458076499 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 458076501} + - component: {fileID: 458076500} + m_Layer: 0 + m_Name: Ambient Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &458076500 +Light: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 458076499} + m_Enabled: 1 + serializedVersion: 8 + m_Type: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 0.45 + m_Range: 10 + m_SpotAngle: 30 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_Lightmapping: 4 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &458076501 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 458076499} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 2, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 19192150} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &483169919 GameObject: m_ObjectHideFlags: 0 @@ -3621,7 +3689,7 @@ Transform: m_Children: - {fileID: 1854896671} m_Father: {fileID: 19192150} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &824127004 MeshRenderer: @@ -4483,7 +4551,7 @@ Transform: - {fileID: 1596443182} - {fileID: 2132855673} m_Father: {fileID: 19192150} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &961663886 GameObject: @@ -5837,7 +5905,7 @@ Transform: m_GameObject: {fileID: 1444061381} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.001, z: 0} - m_LocalScale: {x: 4, y: 1, z: 3.08} + m_LocalScale: {x: 20, y: 1, z: 20} m_Children: [] m_Father: {fileID: 949094013} m_RootOrder: 0 @@ -8520,6 +8588,71 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2032081181} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &2039610601 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 2039610603} + - component: {fileID: 2039610602} + m_Layer: 0 + m_Name: Ambient Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &2039610602 +Light: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2039610601} + m_Enabled: 1 + serializedVersion: 8 + m_Type: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 0.3 + m_Range: 10 + m_SpotAngle: 30 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_Lightmapping: 4 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &2039610603 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2039610601} + m_LocalRotation: {x: -0.9212198, y: -0.077828385, z: -0.24684006, w: 0.2904595} + m_LocalPosition: {x: 0, y: 2, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 19192150} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: -145, y: -30, z: 0} --- !u!1 &2098021898 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Controls/EquipmentInterface.cs b/Assets/Scripts/Controls/EquipmentInterface.cs index 5ecd552..8be69dd 100644 --- a/Assets/Scripts/Controls/EquipmentInterface.cs +++ b/Assets/Scripts/Controls/EquipmentInterface.cs @@ -26,7 +26,7 @@ namespace Cyber.Controls { /// /// The in-world slot of the item. /// - public MeshFilter Mesh; + public Transform Transform; } /// @@ -34,35 +34,34 @@ namespace Cyber.Controls { /// public Inventory Inventory; - /// - /// How many times per second the visual equipment should be updated. - /// - public float UpdateFrequency = 1f; - /// /// The slots where the equipped items go. /// public EquipmentMesh[] Slots; - private float LastUpdateTime = 0; + private Dictionary LastEquips = new Dictionary(); private void Update() { - if (Time.time - LastUpdateTime >= 1f / UpdateFrequency) { - Dictionary Equips = Inventory.Drive.GetEquippedItems(); - // Empty all slots - for (int i = 0; i < Slots.Length; i++) { - Slots[i].Mesh.mesh = null; - } - // Equip all slots - foreach (EquipSlot Slot in Equips.Keys) { - for (int i = 0; i < Slots.Length; i++) { - if (Slots[i].Slot == Slot) { - Slots[i].Mesh.mesh = MeshDB.GetMesh(Equips[Slots[i].Slot].ModelID); - break; - } + Dictionary Equips = Inventory.Drive.GetEquippedItems(); + for (int i = 0; i < Slots.Length; i++) { + bool Equipped = Equips.ContainsKey(Slots[i].Slot); + bool LastEquipped = LastEquips.ContainsKey(Slots[i].Slot); + // Check if this slot needs to be changed + if (Equipped != LastEquipped || (Equipped && Equips[Slots[i].Slot] != LastEquips[Slots[i].Slot])) { + // Clear slot + for (int j = 0; j < Slots[i].Transform.childCount; j++) { + Destroy(Slots[i].Transform.GetChild(j).gameObject); + } + if (!Equipped) { + // Nothing is equipped + LastEquips.Remove(Slots[i].Slot); + } else { + // Something is equipped + Item Item = Equips[Slots[i].Slot]; + PrefabDB.Create(Item.ModelID, Slots[i].Transform); + LastEquips[Slots[i].Slot] = Item; } } - LastUpdateTime = Time.time; } } } diff --git a/Assets/Scripts/Controls/InventoryInterface.cs b/Assets/Scripts/Controls/InventoryInterface.cs index 292650a..9b71189 100644 --- a/Assets/Scripts/Controls/InventoryInterface.cs +++ b/Assets/Scripts/Controls/InventoryInterface.cs @@ -42,9 +42,9 @@ namespace Cyber.Controls { public TextTextureApplier ItemDescriptionText; /// - /// The item preview mesh. + /// The item preview parent. /// - public MeshFilter ItemPreviewMesh; + public Transform ItemPreview; /// /// The item preview spinner. @@ -92,11 +92,22 @@ namespace Cyber.Controls { /// public Vector2 ItemGridDimensions; + /// + /// The material of the items in the item grid. + /// + public Material ItemGridHologramMaterial; + + /// + /// The material of the item in the item preview. + /// + public Material ItemPreviewHologramMaterial; + private bool InventoryOpen = false; private float PreviewVisibility = 0f; + private int PreviewModelID = -1; private List ItemGridCells; - private List ItemGridCellMeshes; + private Dictionary ItemGridContainedItems = new Dictionary(); private int ItemGridSelectedIndex; private Transform GrabbedItem; private int GrabbedItemIndex = -1; @@ -117,11 +128,9 @@ namespace Cyber.Controls { private void Start() { int ItemGridSize = (int) ItemGridDimensions.x * (int) ItemGridDimensions.y; ItemGridCells = new List(ItemGridSize); - ItemGridCellMeshes = new List(ItemGridSize); for (int i = 0; i < ItemGridSize; i++) { Transform Cell = ItemGridParent.GetChild(i).transform; ItemGridCells.Add(Cell); - ItemGridCellMeshes.Add(Cell.GetComponentInChildren()); } IconInventoryColor = IconInventory.material.GetColor("_EmissionColor"); @@ -178,23 +187,32 @@ namespace Cyber.Controls { } } else { // Something is grabbed, make things react to this + ItemGridSelectedIndex = CurrentIndex; if (Input.GetButtonUp("Activate")) { // Grab was released, drop item here - // Lerp things - ItemGridCellMeshes[GrabbedItemIndex].transform.position = ItemGridCells[CurrentIndex].position; - Lerper.LerpTransformPosition(ItemGridCellMeshes[GrabbedItemIndex].transform, new Vector3(), 10f); - Lerper.LerpTransformPosition(ItemGridCellMeshes[CurrentIndex].transform, new Vector3(), 10f); + if (GrabbedItemIndex == CurrentIndex) { + // The item was dropped in place, reset the position + if (ItemGridCells[GrabbedItemIndex].childCount > 0) { + ItemGridCells[GrabbedItemIndex].GetChild(0).localPosition = new Vector3(); + } + } else { + // Lerp things (if the models are set) + Vector3 ReturnToPos = ItemGridCells[GrabbedItemIndex].position; + ItemGridCells[GrabbedItemIndex].position = ItemGridCells[CurrentIndex].position; + Lerper.LerpTransformPosition(ItemGridCells[GrabbedItemIndex], ReturnToPos, 20f); - // Switch items - Inventory.Drive.SwitchSlots(GrabbedItemIndex, CurrentIndex); - Client.Send(PktType.InventoryAction, Inventory.ActionHandler.BuildSlotSwitch(GrabbedItemIndex, CurrentIndex)); + // Switch items + Inventory.Drive.SwitchSlots(GrabbedItemIndex, CurrentIndex); + Client.Send(PktType.InventoryAction, Inventory.ActionHandler.BuildSlotSwitch(GrabbedItemIndex, CurrentIndex)); + } // Reset grabbing GrabbedItem = null; GrabbedItemIndex = -1; - ItemGridSelectedIndex = CurrentIndex; } else { - ItemGridCellMeshes[GrabbedItemIndex].transform.position = LookedAt.point; + if (ItemGridCells[GrabbedItemIndex].childCount > 0) { + ItemGridCells[GrabbedItemIndex].GetChild(0).position = LookedAt.point; + } } } } else if (Mesh != null) { @@ -248,25 +266,38 @@ namespace Cyber.Controls { // Find the item and mesh int i = x + y * (int) ItemGridDimensions.x; Item Item = Inventory.Drive.GetItemAt(x + y * (int) ItemGridDimensions.x); - Mesh Mesh = null; - if (Item != null) { - Mesh = MeshDB.GetMesh(Item.ModelID); + if (Item != null && (!ItemGridContainedItems.ContainsKey(i) || ItemGridContainedItems[i] != Item)) { + // Clear cell + for (int j = 0; j < ItemGridCells[i].childCount; j++) { + DestroyImmediate(ItemGridCells[i].GetChild(j).gameObject); + } + + // Add new item + GameObject ItemObject = PrefabDB.Create(Item.ModelID, ItemGridCells[i]); + MeshUtil.SetMaterial(ItemObject, ItemGridHologramMaterial); + ItemGridContainedItems[i] = Item; + } else if (Item == null && ItemGridContainedItems.ContainsKey(i)) { + for (int j = 0; j < ItemGridCells[i].childCount; j++) { + Destroy(ItemGridCells[i].GetChild(j).gameObject); + } + ItemGridContainedItems.Remove(i); } - ItemGridCellMeshes[i].mesh = Mesh; // Set the base scale and spin status - float Scale = 0.08f; + float Scale = 0.13f; bool Spinning = false; if (focused == i || ItemGridSelectedIndex == i) { // Item is selected or hovered, animate - Scale = 0.1f; + Scale = 0.16f; Spinning = true; } if (ItemGridSelectedIndex == i) { // Set preview information - SetPreviewMesh(Mesh); + if (ItemGridCells[i].childCount > 0) { + SetPreviewItem(Item); + } TextTextureProperties NameProps = ItemNameText.TextProperties; TextTextureProperties DescriptionProps = ItemDescriptionText.TextProperties; if (Item != null) { @@ -286,7 +317,7 @@ namespace Cyber.Controls { } else { ItemGridSelector.position = Vector3.Lerp(ItemGridSelector.position, - ItemGridCells[i].position, 20f * Time.deltaTime); + ItemGridCells[i].position, 10f * Time.deltaTime); } Vector3 NewRot = ItemGridSelector.localEulerAngles; NewRot.z = 0; @@ -295,15 +326,21 @@ namespace Cyber.Controls { if (!Spinning) { // Not selected, reset rotation - ItemGridCellMeshes[i].transform.LookAt(Camera.transform); - Vector3 NewRot = ItemGridCellMeshes[i].transform.localEulerAngles; - NewRot.z = 0; - ItemGridCellMeshes[i].transform.localEulerAngles = NewRot; + if (ItemGridCells[i].childCount > 0) { + Transform ItemTransform = ItemGridCells[i].GetChild(0); + ItemTransform.LookAt(Camera.transform); + Vector3 NewRot = ItemTransform.localEulerAngles; + NewRot.z = 0; + NewRot.y += 90; + ItemTransform.localEulerAngles = NewRot; + } } // Update spinning status and scaling ItemGridCells[i].GetComponent().Spinning = Spinning; - FixMeshScaling(ItemGridCellMeshes[i], Scale); + if (ItemGridCells[i].childCount > 0) { + FixMeshScaling(ItemGridCells[i].GetChild(0), Scale); + } } } @@ -312,7 +349,7 @@ namespace Cyber.Controls { // Clean up the preview screen if there was no item if (!ItemFound) { - SetPreviewMesh(null); + SetPreviewItem(null); TextTextureProperties NameProps = ItemNameText.TextProperties; TextTextureProperties DescriptionProps = ItemDescriptionText.TextProperties; NameProps.Text = ""; @@ -325,38 +362,35 @@ namespace Cyber.Controls { } } - private void SetPreviewMesh(Mesh mesh) { - ItemPreviewSpinner.Spinning = mesh != null; - if (mesh != null) { - ItemPreviewMesh.mesh = mesh; + private void SetPreviewItem(Item item) { + ItemPreviewSpinner.Spinning = item != null; + if (item != null && PreviewModelID != item.ModelID) { + for (int j = 0; j < ItemPreview.childCount; j++) { + DestroyImmediate(ItemPreview.GetChild(j).gameObject); + } + GameObject ItemObject = PrefabDB.Create(item.ModelID, ItemPreview); + MeshUtil.SetMaterial(ItemObject, ItemPreviewHologramMaterial); + PreviewModelID = item.ModelID; } - FixMeshScaling(ItemPreviewMesh, 0.175f * PreviewVisibility); + FixMeshScaling(ItemPreview, 0.35f * PreviewVisibility); } - private void FixMeshScaling(MeshFilter toFix, float scale) { - if (toFix.mesh == null) { - return; - } - + private void FixMeshScaling(Transform toFix, float scale) { + Vector3 Extents = MeshUtil.GetMeshBounds(toFix.gameObject).extents; float HighestExtent = 0.1f; - float Height = toFix.mesh.bounds.extents.y * 2f; - float Width = Mathf.Sqrt(Mathf.Pow(toFix.mesh.bounds.extents.x * 2f, 2) + - Mathf.Pow(toFix.mesh.bounds.extents.y * 2f, 2)); - float Depth = Mathf.Sqrt(Mathf.Pow(toFix.mesh.bounds.extents.z * 2f, 2) + - Mathf.Pow(toFix.mesh.bounds.extents.y * 2f, 2)); - if (Height > HighestExtent) { - HighestExtent = Height; + if (Extents.x > HighestExtent) { + HighestExtent = Extents.x; } - if (Width > HighestExtent) { - HighestExtent = Width; + if (Extents.y > HighestExtent) { + HighestExtent = Extents.y; } - if (Depth > HighestExtent) { - HighestExtent = Depth; + if (Extents.z > HighestExtent) { + HighestExtent = Extents.z; } - float Scale = scale * 1f / HighestExtent; - toFix.transform.localScale = new Vector3(Scale, Scale, Scale); + float Scale = scale * 0.5f / HighestExtent; + toFix.localScale = new Vector3(Scale, Scale, Scale); } } } diff --git a/Assets/Scripts/Entities/SyncBases/Inventory.cs b/Assets/Scripts/Entities/SyncBases/Inventory.cs index 88e904e..df6e291 100644 --- a/Assets/Scripts/Entities/SyncBases/Inventory.cs +++ b/Assets/Scripts/Entities/SyncBases/Inventory.cs @@ -38,6 +38,7 @@ namespace Cyber.Entities.SyncBases { Drive.AddItem(ItemDB.Singleton.Get(0)); Drive.AddItem(ItemDB.Singleton.Get(1)); Drive.AddItem(ItemDB.Singleton.Get(2)); + Drive.AddItem(ItemDB.Singleton.Get(3)); } } diff --git a/Assets/Scripts/Items/ItemDB.cs b/Assets/Scripts/Items/ItemDB.cs index 07a77d5..071ab23 100644 --- a/Assets/Scripts/Items/ItemDB.cs +++ b/Assets/Scripts/Items/ItemDB.cs @@ -23,6 +23,7 @@ namespace Cyber.Items { AddItem(new Item(Counter++, 0, "Very Long Item Name", 1.5f, EquipSlot.Hat, "This item is a rare piece of the \"way too long of a name\" technology, invented by space goblins in ancient times.")); AddItem(new Item(Counter++, 1, "Outworldly Spherical Tube", .5f, EquipSlot.RightHand, "It's so spherical and smooth that it seems like it's not even from this world!")); AddItem(new Item(Counter++, 0, "Cube Of Debuggery", 1.5f, EquipSlot.LeftHand, "Does some debuggery when you poke it.", (host) => { Term.Println("*DEBUGGERY*"); })); + AddItem(new Item(Counter++, 2, "Punk Revolver", 1f, EquipSlot.RightHand, "It only knows three chords. Shoots five times though.", (host) => { Term.Println("*BANG*"); })); } /// diff --git a/Assets/Scripts/Util/Lerper.cs b/Assets/Scripts/Util/Lerper.cs index 5091616..119ea9b 100644 --- a/Assets/Scripts/Util/Lerper.cs +++ b/Assets/Scripts/Util/Lerper.cs @@ -30,7 +30,7 @@ namespace Cyber.Util { } /// - /// Lerps the transform local position. + /// Lerps the transform world position. /// /// Transform. /// To. @@ -41,13 +41,17 @@ namespace Cyber.Util { } } - private void Update() { + private void LateUpdate() { List RemoveThese = new List(); foreach (Transform Transform in PositionLerps.Keys) { - Transform.localPosition = Vector3.Lerp(Transform.localPosition, + if (Transform == null) { + PositionLerps.Remove(Transform); + continue; + } + Transform.position = Vector3.Lerp(Transform.position, PositionLerps[Transform].Target, PositionLerps[Transform].Speed * Time.deltaTime); - if ((Transform.localPosition - PositionLerps[Transform].Target).magnitude < 0.001f) { - Transform.localPosition = PositionLerps[Transform].Target; + if ((Transform.position - PositionLerps[Transform].Target).magnitude < 0.001f) { + Transform.position = PositionLerps[Transform].Target; RemoveThese.Add(Transform); } } diff --git a/Assets/Scripts/Util/MeshDB.cs b/Assets/Scripts/Util/MeshDB.cs deleted file mode 100644 index e034dfa..0000000 --- a/Assets/Scripts/Util/MeshDB.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace Cyber.Util { - - /// - /// Mesh database, contains all the meshes in the game. This should be - /// used if meshes are needed at runtime. - /// - public class MeshDB : MonoBehaviour { - private static MeshDB Singleton; - - /// - /// The meshes that can be used at runtime. - /// - public Mesh[] Meshes; - - /// - /// Sets the Singleton. - /// - public MeshDB() { - Singleton = this; - } - - /// - /// Get the mesh at the defined index. - /// - /// The mesh. - /// Index. - public static Mesh GetMesh(int index) { - return Singleton.Meshes[index]; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Util/MeshUtil.cs b/Assets/Scripts/Util/MeshUtil.cs new file mode 100644 index 0000000..7bcdaf5 --- /dev/null +++ b/Assets/Scripts/Util/MeshUtil.cs @@ -0,0 +1,95 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Cyber.Util { + + /// + /// Utility functions for mesh-related things. + /// + public class MeshUtil : MonoBehaviour { + + /// + /// Gets the bounds of a gameobject or its children with a mesh. + /// + /// The bounds of the object. + /// Object. + public static Bounds GetMeshBounds(GameObject obj) { + MeshFilter Mesh = GetMeshFilter(obj); + if (Mesh != null) { + return Mesh.mesh.bounds; + } + SkinnedMeshRenderer SkinnedMesh = GetSkinnedMeshRenderer(obj); + if (SkinnedMesh != null) { + return SkinnedMesh.sharedMesh.bounds; + } + return new Bounds(); + } + + /// + /// Sets the material in the objects or its children. + /// + /// Object. + /// Mat. + public static void SetMaterial(GameObject obj, Material mat) { + MeshRenderer MeshRenderer = MeshUtil.GetMeshRenderer(obj); + if (MeshRenderer != null) { + Material[] NewMats = new Material[MeshRenderer.materials.Length]; + for (int j = 0; j < MeshRenderer.materials.Length; j++) { + NewMats[j] = mat; + } + MeshRenderer.materials = NewMats; + } + SkinnedMeshRenderer SkinnedMeshRenderer = MeshUtil.GetSkinnedMeshRenderer(obj); + if (SkinnedMeshRenderer != null) { + Material[] NewMats = new Material[SkinnedMeshRenderer.materials.Length]; + for (int j = 0; j < SkinnedMeshRenderer.materials.Length; j++) { + NewMats[j] = mat; + } + SkinnedMeshRenderer.materials = NewMats; + } + } + + /// + /// Gets a MeshFilter in a gameobject or its children. + /// + /// The MeshFilter in object. + /// Object. + public static MeshFilter GetMeshFilter(GameObject obj) { + MeshFilter Mesh = obj.GetComponent(); + if (Mesh == null) { + // No mesh found, search children + Mesh = obj.GetComponentInChildren(); + } + return Mesh; + } + + /// + /// Gets a MeshRenderer in a gameobject or its children. + /// + /// The MeshRenderer in object. + /// Object. + public static MeshRenderer GetMeshRenderer(GameObject obj) { + MeshRenderer Mesh = obj.GetComponent(); + if (Mesh == null) { + // No mesh found, search children + Mesh = obj.GetComponentInChildren(); + } + return Mesh; + } + + /// + /// Gets a SkinnedMeshRenderer in a gameobject or its children. + /// + /// The SkinnedMeshRenderer in object. + /// Object. + public static SkinnedMeshRenderer GetSkinnedMeshRenderer(GameObject obj) { + SkinnedMeshRenderer Mesh = obj.GetComponent(); + if (Mesh == null) { + // No mesh found, search children + Mesh = obj.GetComponentInChildren(); + } + return Mesh; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Util/MeshUtil.cs.meta b/Assets/Scripts/Util/MeshUtil.cs.meta new file mode 100644 index 0000000..9b214ce --- /dev/null +++ b/Assets/Scripts/Util/MeshUtil.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: eca7ccdc67deb4f24a06764028c17dd5 +timeCreated: 1495362148 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Util/PrefabDB.cs b/Assets/Scripts/Util/PrefabDB.cs new file mode 100644 index 0000000..bb391c2 --- /dev/null +++ b/Assets/Scripts/Util/PrefabDB.cs @@ -0,0 +1,44 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Cyber.Util { + + /// + /// Prefab database, contains all the prefabs that might be needed at + /// runtime. Intended to be called through the static functions. + /// + public class PrefabDB : MonoBehaviour { + private static PrefabDB Singleton; + + /// + /// The prefabs that can be used at runtime. + /// + public GameObject[] Prefabs; + + /// + /// Sets the Singleton. + /// + public PrefabDB() { + Singleton = this; + } + + /// + /// Creates a new prefab with the given position, rotation and parent. + /// + /// The prefab. + /// Index. + /// The position (local, if parent is not null). + /// The rotation (local, if parent is not null). + /// The parent transform. + public static GameObject Create(int index, Transform parent, + Vector3 pos = new Vector3(), Quaternion rot = new Quaternion()) { + GameObject Result = Instantiate(Singleton.Prefabs[index], pos, rot, parent); + if (parent != null) { + Result.transform.localPosition = pos; + Result.transform.localRotation = rot; + } + return Result; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Util/MeshDB.cs.meta b/Assets/Scripts/Util/PrefabDB.cs.meta similarity index 100% rename from Assets/Scripts/Util/MeshDB.cs.meta rename to Assets/Scripts/Util/PrefabDB.cs.meta