From 6fa1e2dbbb063eca4a50b43395bc2a1989da08d8 Mon Sep 17 00:00:00 2001 From: Arturo Nereu Date: Sun, 1 Mar 2020 13:03:21 -0600 Subject: [PATCH] Upgraded Project Unity 2019.3.3f1 Entities 0.6.0-preview.24 Hybrid Renderer 0.3.4-preview.24 --- .../Assets/Prefabs/AirDroneHybrid.prefab | 483 +++++++----- .../Assets/Prefabs/AirDroneHybrid.prefab.meta | 3 +- .../Assets/Scenes/DroneHybridScene.unity | 705 ++---------------- .../Scripts/Hybrid/DroneMoveAuthoring.cs | 16 - .../Scripts/Hybrid/DroneMoveAuthoring.cs.meta | 11 - .../Scripts/Hybrid/DroneMoveComponent.cs | 1 + .../Assets/Scripts/Hybrid/DroneMoveSystem.cs | 2 +- .../Scripts/Hybrid/HelixRotateAuthoring.cs | 16 - .../Hybrid/HelixRotateAuthoring.cs.meta | 11 - .../Scripts/Hybrid/HelixRotateComponent.cs | 9 +- .../Scripts/Hybrid/HelixRotateSystem.cs | 2 +- ECS_Drone/Logs/Packages-Update.log | 9 + ECS_Drone/Packages/manifest.json | 8 +- ECS_Drone/ProjectSettings/ProjectVersion.txt | 4 +- 14 files changed, 375 insertions(+), 905 deletions(-) delete mode 100644 ECS_Drone/Assets/Scripts/Hybrid/DroneMoveAuthoring.cs delete mode 100644 ECS_Drone/Assets/Scripts/Hybrid/DroneMoveAuthoring.cs.meta delete mode 100644 ECS_Drone/Assets/Scripts/Hybrid/HelixRotateAuthoring.cs delete mode 100644 ECS_Drone/Assets/Scripts/Hybrid/HelixRotateAuthoring.cs.meta diff --git a/ECS_Drone/Assets/Prefabs/AirDroneHybrid.prefab b/ECS_Drone/Assets/Prefabs/AirDroneHybrid.prefab index 06c5b0c..b4c8704 100644 --- a/ECS_Drone/Assets/Prefabs/AirDroneHybrid.prefab +++ b/ECS_Drone/Assets/Prefabs/AirDroneHybrid.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1254905358367120 +--- !u!1 &8751825604268534160 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,77 +8,44 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4904334575405896} - - component: {fileID: 33166139479664068} - - component: {fileID: 23859993144739120} + - component: {fileID: 8746593118105960718} + - component: {fileID: 8751825604268534161} m_Layer: 0 - m_Name: Propeller1 + m_Name: Helix1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4904334575405896 +--- !u!4 &8746593118105960718 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1254905358367120} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 8751825604268534160} + m_LocalRotation: {x: -0, y: -0.70259196, z: -0, w: 0.711593} + m_LocalPosition: {x: -0.9907273, y: 0.03940001, z: 0.97319114} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4138863488912418} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33166139479664068 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1254905358367120} - m_Mesh: {fileID: 4300006, guid: 083839fcc31a84411ab217e42b5126af, type: 3} ---- !u!23 &23859993144739120 -MeshRenderer: + m_Children: + - {fileID: 8746729405910640804} + m_Father: {fileID: 8754246465050089118} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: -44.271004, z: 0} +--- !u!114 &8751825604268534161 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1254905358367120} + m_GameObject: {fileID: 8751825604268534160} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 500fbbc8b7e634151895f91c91f4bb51, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 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!1 &1421085832850842 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f72b7afa0dcec948af9233c3509ef54, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 +--- !u!1 &8751990727581186962 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -86,30 +53,44 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4800200102680376} + - component: {fileID: 8754186518495469810} + - component: {fileID: 8751990727581186963} m_Layer: 0 - m_Name: Helix2 + m_Name: Helix4 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4800200102680376 +--- !u!4 &8754186518495469810 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1421085832850842} - m_LocalRotation: {x: -0, y: -0.70259196, z: -0, w: 0.711593} - m_LocalPosition: {x: -0.9818, y: 0.03940001, z: -0.9675} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 8751990727581186962} + m_LocalRotation: {x: -0, y: -0.702592, z: -0, w: 0.711593} + m_LocalPosition: {x: 0.9575, y: 0.03940001, z: 0.9723} + m_LocalScale: {x: 1.0000001, y: 1, z: 1.0000001} m_Children: - - {fileID: 4200818690619468} - m_Father: {fileID: 4220753179310670} - m_RootOrder: 2 + - {fileID: 8746771614476167064} + m_Father: {fileID: 8754246465050089118} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: -44.271004, z: 0} ---- !u!1 &1552449061266640 +--- !u!114 &8751990727581186963 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8751990727581186962} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f72b7afa0dcec948af9233c3509ef54, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 +--- !u!1 &8752070350339326908 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -117,9 +98,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4964555442434630} - - component: {fileID: 33336905003005434} - - component: {fileID: 23055936783809380} + - component: {fileID: 8746729405910640804} + - component: {fileID: 8720700834998884252} + - component: {fileID: 8728039498976566708} m_Layer: 0 m_Name: Propeller1 m_TagString: Untagged @@ -127,35 +108,35 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4964555442434630 +--- !u!4 &8746729405910640804 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1552449061266640} + m_GameObject: {fileID: 8752070350339326908} 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: 4443440015262268} + m_Father: {fileID: 8746593118105960718} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33336905003005434 +--- !u!33 &8720700834998884252 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1552449061266640} - m_Mesh: {fileID: 4300004, guid: 083839fcc31a84411ab217e42b5126af, type: 3} ---- !u!23 &23055936783809380 + m_GameObject: {fileID: 8752070350339326908} + m_Mesh: {fileID: 4300008, guid: 083839fcc31a84411ab217e42b5126af, type: 3} +--- !u!23 &8728039498976566708 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1552449061266640} + m_GameObject: {fileID: 8752070350339326908} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -163,6 +144,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -187,7 +169,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!1 &1593730051854866 +--- !u!1 &8752075912185413826 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -195,52 +177,98 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4993160744260836} - - component: {fileID: 33148316574988546} - - component: {fileID: 23705154190155238} + - component: {fileID: 8753980968732765932} + - component: {fileID: 8752075912185413827} m_Layer: 0 - m_Name: BodyAirDrone + m_Name: Helix3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8753980968732765932 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8752075912185413826} + m_LocalRotation: {x: -0, y: -0.702592, z: -0, w: 0.711593} + m_LocalPosition: {x: 0.9641, y: 0.03940001, z: -0.9624} + m_LocalScale: {x: 1.0000001, y: 1, z: 1.0000001} + m_Children: + - {fileID: 8746563575985036950} + m_Father: {fileID: 8754246465050089118} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: -44.271004, z: 0} +--- !u!114 &8752075912185413827 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8752075912185413826} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f72b7afa0dcec948af9233c3509ef54, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 +--- !u!1 &8752111610046249920 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8754230872912794780} + - component: {fileID: 8720386147966238826} + - component: {fileID: 8728677721664499738} + m_Layer: 0 + m_Name: Propeller1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4993160744260836 +--- !u!4 &8754230872912794780 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1593730051854866} + m_GameObject: {fileID: 8752111610046249920} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.016293995, y: 0.3145567, z: 0.000019550323} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4220753179310670} + m_Father: {fileID: 8746737895849655272} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33148316574988546 +--- !u!33 &8720386147966238826 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1593730051854866} - m_Mesh: {fileID: 4300000, guid: 083839fcc31a84411ab217e42b5126af, type: 3} ---- !u!23 &23705154190155238 + m_GameObject: {fileID: 8752111610046249920} + m_Mesh: {fileID: 4300002, guid: 083839fcc31a84411ab217e42b5126af, type: 3} +--- !u!23 &8728677721664499738 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1593730051854866} + m_GameObject: {fileID: 8752111610046249920} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_MotionVectors: 1 - m_LightProbeUsage: 1 + m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -265,56 +293,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!1 &1638428317097820 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4220753179310670} - - component: {fileID: 6538672533309167965} - m_Layer: 0 - m_Name: AirDroneHybrid - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4220753179310670 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1638428317097820} - m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956} - m_LocalPosition: {x: 0, y: 0.34, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4993160744260836} - - {fileID: 4941338197716446} - - {fileID: 4800200102680376} - - {fileID: 4443440015262268} - - {fileID: 4138863488912418} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} ---- !u!114 &6538672533309167965 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1638428317097820} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cde141021a655654fbadd809f876e389, type: 3} - m_Name: - m_EditorClassIdentifier: - movementSpeed: 5 ---- !u!1 &1712098434914064 +--- !u!1 &8752186751414681282 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -322,52 +301,53 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4200818690619468} - - component: {fileID: 33393234254998714} - - component: {fileID: 23032722767600842} + - component: {fileID: 8746579021361297460} + - component: {fileID: 8720778882601637330} + - component: {fileID: 8730119789616427318} m_Layer: 0 - m_Name: Propeller1 + m_Name: BodyAirDrone m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4200818690619468 +--- !u!4 &8746579021361297460 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1712098434914064} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 8752186751414681282} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.016293995, y: 0.3145567, z: 0.000019550323} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4800200102680376} + m_Father: {fileID: 8754246465050089118} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33393234254998714 +--- !u!33 &8720778882601637330 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1712098434914064} - m_Mesh: {fileID: 4300002, guid: 083839fcc31a84411ab217e42b5126af, type: 3} ---- !u!23 &23032722767600842 + m_GameObject: {fileID: 8752186751414681282} + m_Mesh: {fileID: 4300000, guid: 083839fcc31a84411ab217e42b5126af, type: 3} +--- !u!23 &8730119789616427318 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1712098434914064} + m_GameObject: {fileID: 8752186751414681282} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_MotionVectors: 1 - m_LightProbeUsage: 0 + m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -392,7 +372,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!1 &1745592776404844 +--- !u!1 &8752229063231031296 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -400,9 +380,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4796116791723124} - - component: {fileID: 33087822506752844} - - component: {fileID: 23524780992622948} + - component: {fileID: 8746563575985036950} + - component: {fileID: 8720593658425186602} + - component: {fileID: 8728613000516081588} m_Layer: 0 m_Name: Propeller1 m_TagString: Untagged @@ -410,35 +390,35 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4796116791723124 +--- !u!4 &8746563575985036950 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1745592776404844} + m_GameObject: {fileID: 8752229063231031296} 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: 4941338197716446} + m_Father: {fileID: 8753980968732765932} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33087822506752844 +--- !u!33 &8720593658425186602 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1745592776404844} - m_Mesh: {fileID: 4300008, guid: 083839fcc31a84411ab217e42b5126af, type: 3} ---- !u!23 &23524780992622948 + m_GameObject: {fileID: 8752229063231031296} + m_Mesh: {fileID: 4300004, guid: 083839fcc31a84411ab217e42b5126af, type: 3} +--- !u!23 &8728613000516081588 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1745592776404844} + m_GameObject: {fileID: 8752229063231031296} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -446,6 +426,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -470,7 +451,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!1 &1746765170142226 +--- !u!1 &8752315021146256268 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -478,30 +459,62 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4443440015262268} + - component: {fileID: 8754246465050089118} + - component: {fileID: 8752315021146256270} + - component: {fileID: 399295809686762333} m_Layer: 0 - m_Name: Helix3 + m_Name: AirDroneHybrid m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4443440015262268 +--- !u!4 &8754246465050089118 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1746765170142226} - m_LocalRotation: {x: -0, y: -0.702592, z: -0, w: 0.711593} - m_LocalPosition: {x: 0.9641, y: 0.03940001, z: -0.9624} - m_LocalScale: {x: 1.0000001, y: 1, z: 1.0000001} + m_GameObject: {fileID: 8752315021146256268} + m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956} + m_LocalPosition: {x: 0, y: 0.34, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4964555442434630} - m_Father: {fileID: 4220753179310670} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: -44.271004, z: 0} ---- !u!1 &1965058646431554 + - {fileID: 8746579021361297460} + - {fileID: 8746593118105960718} + - {fileID: 8746737895849655272} + - {fileID: 8753980968732765932} + - {fileID: 8754186518495469810} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} +--- !u!114 &8752315021146256270 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8752315021146256268} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bacd4486ca3aeb44cb27400a4e238016, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 1.5 +--- !u!114 &399295809686762333 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8752315021146256268} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea7d7495833204790ba1d3a8755397f8, type: 3} + m_Name: + m_EditorClassIdentifier: + ConversionMode: 0 +--- !u!1 &8752365993724690762 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -509,30 +522,44 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4138863488912418} + - component: {fileID: 8746737895849655272} + - component: {fileID: 8752365993724690763} m_Layer: 0 - m_Name: Helix4 + m_Name: Helix2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4138863488912418 +--- !u!4 &8746737895849655272 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1965058646431554} - m_LocalRotation: {x: -0, y: -0.702592, z: -0, w: 0.711593} - m_LocalPosition: {x: 0.9575, y: 0.03940001, z: 0.9723} - m_LocalScale: {x: 1.0000001, y: 1, z: 1.0000001} + m_GameObject: {fileID: 8752365993724690762} + m_LocalRotation: {x: -0, y: -0.70259196, z: -0, w: 0.711593} + m_LocalPosition: {x: -0.9818, y: 0.03940001, z: -0.9675} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4904334575405896} - m_Father: {fileID: 4220753179310670} - m_RootOrder: 4 + - {fileID: 8754230872912794780} + m_Father: {fileID: 8754246465050089118} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: -44.271004, z: 0} ---- !u!1 &1989029737284928 +--- !u!114 &8752365993724690763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8752365993724690762} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f72b7afa0dcec948af9233c3509ef54, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 5 +--- !u!1 &8752709952293098816 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -540,26 +567,74 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4941338197716446} + - component: {fileID: 8746771614476167064} + - component: {fileID: 8720796722687232276} + - component: {fileID: 8730067959043860960} m_Layer: 0 - m_Name: Helix1 + m_Name: Propeller1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4941338197716446 +--- !u!4 &8746771614476167064 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1989029737284928} - m_LocalRotation: {x: -0, y: -0.70259196, z: -0, w: 0.711593} - m_LocalPosition: {x: -0.9907273, y: 0.03940001, z: 0.97319114} + m_GameObject: {fileID: 8752709952293098816} + 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: 4796116791723124} - m_Father: {fileID: 4220753179310670} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: -44.271004, z: 0} + m_Children: [] + m_Father: {fileID: 8754186518495469810} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8720796722687232276 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8752709952293098816} + m_Mesh: {fileID: 4300006, guid: 083839fcc31a84411ab217e42b5126af, type: 3} +--- !u!23 &8730067959043860960 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8752709952293098816} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 500fbbc8b7e634151895f91c91f4bb51, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 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 diff --git a/ECS_Drone/Assets/Prefabs/AirDroneHybrid.prefab.meta b/ECS_Drone/Assets/Prefabs/AirDroneHybrid.prefab.meta index 69cf8cc..dd288c2 100644 --- a/ECS_Drone/Assets/Prefabs/AirDroneHybrid.prefab.meta +++ b/ECS_Drone/Assets/Prefabs/AirDroneHybrid.prefab.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 guid: 45f8888f89f0c2b43a135415b8abd6f0 -NativeFormatImporter: +PrefabImporter: externalObjects: {} - mainObjectFileID: 100100000 userData: assetBundleName: assetBundleVariant: diff --git a/ECS_Drone/Assets/Scenes/DroneHybridScene.unity b/ECS_Drone/Assets/Scenes/DroneHybridScene.unity index 61c59ee..3ef060f 100644 --- a/ECS_Drone/Assets/Scenes/DroneHybridScene.unity +++ b/ECS_Drone/Assets/Scenes/DroneHybridScene.unity @@ -96,6 +96,7 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -145,8 +146,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170076733} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -258,6 +260,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -387,636 +390,72 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &1408575958773275906 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412682513890620828} - m_LocalRotation: {x: -0, y: -0.70259196, z: -0, w: 0.711593} - m_LocalPosition: {x: -0.9907273, y: 0.03940001, z: 0.97319114} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1408712212277064872} - m_Father: {fileID: 1410528838089476754} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: -44.271004, z: 0} ---- !u!4 &1408616770355741338 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1411959504936850444} - 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: 1410192970805392096} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &1408631630617945144 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1411987596282733262} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.016293995, y: 0.3145567, z: 0.000019550323} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1410528838089476754} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &1408683536702077844 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412370057257273676} - 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: 1410609679749135614} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &1408712212277064872 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412997625283043248} - 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: 1408575958773275906} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &1408720137167824868 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412096434423487814} - m_LocalRotation: {x: -0, y: -0.70259196, z: -0, w: 0.711593} - m_LocalPosition: {x: -0.9818, y: 0.03940001, z: -0.9675} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1410513846442559632} - m_Father: {fileID: 1410528838089476754} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: -44.271004, z: 0} ---- !u!4 &1410192970805392096 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1413003204577434830} - m_LocalRotation: {x: -0, y: -0.702592, z: -0, w: 0.711593} - m_LocalPosition: {x: 0.9641, y: 0.03940001, z: -0.9624} - m_LocalScale: {x: 1.0000001, y: 1, z: 1.0000001} - m_Children: - - {fileID: 1408616770355741338} - m_Father: {fileID: 1410528838089476754} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: -44.271004, z: 0} ---- !u!4 &1410513846442559632 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412968533350148044} - 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: 1408720137167824868} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &1410528838089476754 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1411905308472635264} - m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956} - m_LocalPosition: {x: 0, y: 0.34, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1408631630617945144} - - {fileID: 1408575958773275906} - - {fileID: 1408720137167824868} - - {fileID: 1410192970805392096} - - {fileID: 1410609679749135614} - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} ---- !u!4 &1410609679749135614 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412777283214518174} - m_LocalRotation: {x: -0, y: -0.702592, z: -0, w: 0.711593} - m_LocalPosition: {x: 0.9575, y: 0.03940001, z: 0.9723} - m_LocalScale: {x: 1.0000001, y: 1, z: 1.0000001} - m_Children: - - {fileID: 1408683536702077844} - m_Father: {fileID: 1410528838089476754} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: -44.271004, z: 0} ---- !u!1 &1411905308472635264 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1410528838089476754} - - component: {fileID: 1411905308472635265} - - component: {fileID: 5270269601237985665} - m_Layer: 0 - m_Name: AirDroneHybrid - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1411905308472635265 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1411905308472635264} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ea7d7495833204790ba1d3a8755397f8, type: 3} - m_Name: - m_EditorClassIdentifier: - ConversionMode: 0 ---- !u!1 &1411959504936850444 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1408616770355741338} - - component: {fileID: 1435423411801556262} - - component: {fileID: 1426553671182519224} - m_Layer: 0 - m_Name: Propeller1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1411987596282733262 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1408631630617945144} - - component: {fileID: 1434412381495216606} - - component: {fileID: 1425949997038497082} - m_Layer: 0 - m_Name: BodyAirDrone - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1412096434423487814 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1408720137167824868} - - component: {fileID: 1412096434423487815} - m_Layer: 0 - m_Name: Helix2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1412096434423487815 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412096434423487814} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8cbc9c15133d2c241816ead8476f4058, type: 3} - m_Name: - m_EditorClassIdentifier: - rotationSpeed: 500 ---- !u!1 &1412370057257273676 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1408683536702077844} - - component: {fileID: 1434429657598055704} - - component: {fileID: 1425687010833020396} - m_Layer: 0 - m_Name: Propeller1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1412682513890620828 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1408575958773275906} - - component: {fileID: 1412682513890620829} - m_Layer: 0 - m_Name: Helix1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1412682513890620829 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412682513890620828} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8cbc9c15133d2c241816ead8476f4058, type: 3} - m_Name: - m_EditorClassIdentifier: - rotationSpeed: 500 ---- !u!1 &1412777283214518174 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1410609679749135614} - - component: {fileID: 1412777283214518175} - m_Layer: 0 - m_Name: Helix4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1412777283214518175 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412777283214518174} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8cbc9c15133d2c241816ead8476f4058, type: 3} - m_Name: - m_EditorClassIdentifier: - rotationSpeed: 500 ---- !u!1 &1412968533350148044 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1410513846442559632} - - component: {fileID: 1435356053641419878} - - component: {fileID: 1426548589381725206} - m_Layer: 0 - m_Name: Propeller1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1412997625283043248 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1408712212277064872} - - component: {fileID: 1434475040242174864} - - component: {fileID: 1427176985029804472} - m_Layer: 0 - m_Name: Propeller1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1413003204577434830 -GameObject: +--- !u!1001 &1706845807 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1410192970805392096} - - component: {fileID: 1413003204577434831} - m_Layer: 0 - m_Name: Helix3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1413003204577434831 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1413003204577434830} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8cbc9c15133d2c241816ead8476f4058, type: 3} - m_Name: - m_EditorClassIdentifier: - rotationSpeed: 500 ---- !u!23 &1425687010833020396 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412370057257273676} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 500fbbc8b7e634151895f91c91f4bb51, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 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 &1425949997038497082 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1411987596282733262} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 500fbbc8b7e634151895f91c91f4bb51, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 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 &1426548589381725206 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412968533350148044} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 500fbbc8b7e634151895f91c91f4bb51, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 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 &1426553671182519224 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1411959504936850444} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 500fbbc8b7e634151895f91c91f4bb51, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 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 &1427176985029804472 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412997625283043248} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 500fbbc8b7e634151895f91c91f4bb51, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 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 &1434412381495216606 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1411987596282733262} - m_Mesh: {fileID: 4300000, guid: 083839fcc31a84411ab217e42b5126af, type: 3} ---- !u!33 &1434429657598055704 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412370057257273676} - m_Mesh: {fileID: 4300006, guid: 083839fcc31a84411ab217e42b5126af, type: 3} ---- !u!33 &1434475040242174864 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412997625283043248} - m_Mesh: {fileID: 4300008, guid: 083839fcc31a84411ab217e42b5126af, type: 3} ---- !u!33 &1435356053641419878 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412968533350148044} - m_Mesh: {fileID: 4300002, guid: 083839fcc31a84411ab217e42b5126af, type: 3} ---- !u!33 &1435423411801556262 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1411959504936850444} - m_Mesh: {fileID: 4300004, guid: 083839fcc31a84411ab217e42b5126af, type: 3} ---- !u!114 &5270269601237985665 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1411905308472635264} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cde141021a655654fbadd809f876e389, type: 3} - m_Name: - m_EditorClassIdentifier: - movementSpeed: 5 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8752315021146256268, guid: 45f8888f89f0c2b43a135415b8abd6f0, + type: 3} + propertyPath: m_Name + value: AirDroneHybrid + objectReference: {fileID: 0} + - target: {fileID: 8754246465050089118, guid: 45f8888f89f0c2b43a135415b8abd6f0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8754246465050089118, guid: 45f8888f89f0c2b43a135415b8abd6f0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.34 + objectReference: {fileID: 0} + - target: {fileID: 8754246465050089118, guid: 45f8888f89f0c2b43a135415b8abd6f0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8754246465050089118, guid: 45f8888f89f0c2b43a135415b8abd6f0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8754246465050089118, guid: 45f8888f89f0c2b43a135415b8abd6f0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.38268343 + objectReference: {fileID: 0} + - target: {fileID: 8754246465050089118, guid: 45f8888f89f0c2b43a135415b8abd6f0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8754246465050089118, guid: 45f8888f89f0c2b43a135415b8abd6f0, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.92387956 + objectReference: {fileID: 0} + - target: {fileID: 8754246465050089118, guid: 45f8888f89f0c2b43a135415b8abd6f0, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8754246465050089118, guid: 45f8888f89f0c2b43a135415b8abd6f0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8754246465050089118, guid: 45f8888f89f0c2b43a135415b8abd6f0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 8754246465050089118, guid: 45f8888f89f0c2b43a135415b8abd6f0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 45f8888f89f0c2b43a135415b8abd6f0, type: 3} diff --git a/ECS_Drone/Assets/Scripts/Hybrid/DroneMoveAuthoring.cs b/ECS_Drone/Assets/Scripts/Hybrid/DroneMoveAuthoring.cs deleted file mode 100644 index 31699aa..0000000 --- a/ECS_Drone/Assets/Scripts/Hybrid/DroneMoveAuthoring.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Unity.Entities; -using Unity.Mathematics; -using UnityEngine; - -[DisallowMultipleComponent] -[RequiresEntityConversion] -public class DroneMoveAuthoring : MonoBehaviour, IConvertGameObjectToEntity -{ - [SerializeField] - float movementSpeed = 0; - - public void Convert(Entity entity, EntityManager dstManager, GameObjectConversionSystem conversionSystem) - { - dstManager.AddComponentData(entity, new DroneMoveComponent{ speed = movementSpeed }); - } -} diff --git a/ECS_Drone/Assets/Scripts/Hybrid/DroneMoveAuthoring.cs.meta b/ECS_Drone/Assets/Scripts/Hybrid/DroneMoveAuthoring.cs.meta deleted file mode 100644 index 4f2b96b..0000000 --- a/ECS_Drone/Assets/Scripts/Hybrid/DroneMoveAuthoring.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cde141021a655654fbadd809f876e389 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ECS_Drone/Assets/Scripts/Hybrid/DroneMoveComponent.cs b/ECS_Drone/Assets/Scripts/Hybrid/DroneMoveComponent.cs index 3094045..53dd56a 100644 --- a/ECS_Drone/Assets/Scripts/Hybrid/DroneMoveComponent.cs +++ b/ECS_Drone/Assets/Scripts/Hybrid/DroneMoveComponent.cs @@ -2,6 +2,7 @@ // Here we have the Component part of our drone. Just holding the data (the Transform included). // We are using the MonoBehaviour to be able to assign the script to the helix. Hence the hybrid approach. +[GenerateAuthoringComponent] public struct DroneMoveComponent : IComponentData { public float speed; diff --git a/ECS_Drone/Assets/Scripts/Hybrid/DroneMoveSystem.cs b/ECS_Drone/Assets/Scripts/Hybrid/DroneMoveSystem.cs index 9a7453f..d8b4a1e 100644 --- a/ECS_Drone/Assets/Scripts/Hybrid/DroneMoveSystem.cs +++ b/ECS_Drone/Assets/Scripts/Hybrid/DroneMoveSystem.cs @@ -12,7 +12,7 @@ public class DroneMoveSystem : ComponentSystem // we call it once every frame and then iterate over all the entities that match the criteria. protected override void OnUpdate() { - var dt = Time.time; + float dt = (float)Time.ElapsedTime; Entities.ForEach((Entity entity, ref Translation translation, ref DroneMoveComponent droneMoveComponent) => { diff --git a/ECS_Drone/Assets/Scripts/Hybrid/HelixRotateAuthoring.cs b/ECS_Drone/Assets/Scripts/Hybrid/HelixRotateAuthoring.cs deleted file mode 100644 index ee5356f..0000000 --- a/ECS_Drone/Assets/Scripts/Hybrid/HelixRotateAuthoring.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Unity.Entities; -using Unity.Mathematics; -using UnityEngine; - -[DisallowMultipleComponent] -[RequiresEntityConversion] -public class HelixRotateAuthoring : MonoBehaviour, IConvertGameObjectToEntity -{ - [SerializeField] - float rotationSpeed = 0; - - public void Convert(Entity entity, EntityManager dstManager, GameObjectConversionSystem conversionSystem) - { - dstManager.AddComponentData(entity, new HelixRotateComponent { speed = rotationSpeed }); - } -} diff --git a/ECS_Drone/Assets/Scripts/Hybrid/HelixRotateAuthoring.cs.meta b/ECS_Drone/Assets/Scripts/Hybrid/HelixRotateAuthoring.cs.meta deleted file mode 100644 index eae933f..0000000 --- a/ECS_Drone/Assets/Scripts/Hybrid/HelixRotateAuthoring.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8cbc9c15133d2c241816ead8476f4058 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ECS_Drone/Assets/Scripts/Hybrid/HelixRotateComponent.cs b/ECS_Drone/Assets/Scripts/Hybrid/HelixRotateComponent.cs index a33f540..c582adb 100644 --- a/ECS_Drone/Assets/Scripts/Hybrid/HelixRotateComponent.cs +++ b/ECS_Drone/Assets/Scripts/Hybrid/HelixRotateComponent.cs @@ -4,7 +4,8 @@ // Here we have the Component part of our Helix. Just holding the data (the Transform included). // We are using the MonoBehaviour to be able to assign the script to the drone. Hence the hybrid approach. - public struct HelixRotateComponent : IComponentData - { - public float speed; - } +[GenerateAuthoringComponent] +public struct HelixRotateComponent : IComponentData +{ + public float speed; +} diff --git a/ECS_Drone/Assets/Scripts/Hybrid/HelixRotateSystem.cs b/ECS_Drone/Assets/Scripts/Hybrid/HelixRotateSystem.cs index ef3e75a..d971d6b 100644 --- a/ECS_Drone/Assets/Scripts/Hybrid/HelixRotateSystem.cs +++ b/ECS_Drone/Assets/Scripts/Hybrid/HelixRotateSystem.cs @@ -13,7 +13,7 @@ public class HelixRotateSystem : ComponentSystem // we call it once every frame and then iterate over all the entities that match the criteria. protected override void OnUpdate() { - var dt = Time.deltaTime; + float dt = (float)Time.ElapsedTime; Entities.ForEach((Entity entity, ref Rotation rotation, ref HelixRotateComponent rotateComponent) => { diff --git a/ECS_Drone/Logs/Packages-Update.log b/ECS_Drone/Logs/Packages-Update.log index 16a9582..cbbe92d 100644 --- a/ECS_Drone/Logs/Packages-Update.log +++ b/ECS_Drone/Logs/Packages-Update.log @@ -19,3 +19,12 @@ The following packages were updated: com.unity.timeline from version 1.1.0 to 1.2.6 The following packages were removed: com.unity.package-manager-ui@2.2.0 + +=== Sun Mar 1 12:48:52 2020 + +Packages were changed. +Update Mode: updateDependencies + +The following packages were updated: + com.unity.ide.vscode from version 1.1.3 to 1.1.4 + com.unity.timeline from version 1.2.6 to 1.2.12 diff --git a/ECS_Drone/Packages/manifest.json b/ECS_Drone/Packages/manifest.json index 28758ef..e87d325 100644 --- a/ECS_Drone/Packages/manifest.json +++ b/ECS_Drone/Packages/manifest.json @@ -1,10 +1,10 @@ { "dependencies": { - "com.unity.entities": "0.1.1-preview", - "com.unity.ide.vscode": "1.1.3", - "com.unity.rendering.hybrid": "0.1.1-preview", + "com.unity.entities": "0.6.0-preview.24", + "com.unity.ide.vscode": "1.1.4", + "com.unity.rendering.hybrid": "0.3.4-preview.24", "com.unity.textmeshpro": "2.0.1", - "com.unity.timeline": "1.2.6", + "com.unity.timeline": "1.2.12", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/ECS_Drone/ProjectSettings/ProjectVersion.txt b/ECS_Drone/ProjectSettings/ProjectVersion.txt index 9b0e50b..a8d6725 100644 --- a/ECS_Drone/ProjectSettings/ProjectVersion.txt +++ b/ECS_Drone/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.3.0f1 -m_EditorVersionWithRevision: 2019.3.0f1 (ffacea4b84e7) +m_EditorVersion: 2019.3.3f1 +m_EditorVersionWithRevision: 2019.3.3f1 (7ceaae5f7503)