From 61337f653e942e320c249ed881cab4f256bd82bd Mon Sep 17 00:00:00 2001 From: Joshua Reason Date: Sat, 1 Feb 2020 23:56:54 +1100 Subject: [PATCH] Added more horse stuff + horse ball --- Assets/Scenes/SampleScene.unity | 836 +++++++++++++++++- Assets/Scripts/BlackHole.cs | 21 + Assets/Scripts/BlackHole.cs.meta | 11 + Assets/Scripts/HammerController.cs | 55 ++ Assets/Scripts/HammerController.cs.meta | 11 + Assets/Scripts/Input/BallController.cs | 37 + Assets/Scripts/Input/BallController.cs.meta | 11 + Assets/Scripts/Input/HerdController.cs | 8 +- Assets/Scripts/Input/PlayerController.cs | 14 +- Assets/WorldAssets/Materials/MainMaterial.mat | 4 +- Assets/WorldAssets/Materials/Temp3.mat | 17 +- Assets/WorldAssets/Materials/Temp4.mat | 78 ++ Assets/WorldAssets/Materials/Temp4.mat.meta | 8 + .../Models/BigBigSmallBushes.fbx.meta | 4 +- .../WorldAssets/Models/CrumblingWall.fbx.meta | 2 +- Assets/WorldAssets/Models/HorseModel.fbx.meta | 2 +- Assets/WorldAssets/Models/LongBushes.fbx.meta | 4 +- .../Models/LongSledgeHammer.fbx.meta | 4 +- Assets/WorldAssets/Models/Rocks.fbx.meta | 4 +- .../Models/ShortSledgeHammer.fbx.meta | 4 +- Assets/WorldAssets/Models/SmallBush.fbx.meta | 4 +- .../WorldAssets/Models/SmallBushes.fbx.meta | 4 +- .../Models/SmallWideBushes.fbx.meta | 4 +- .../Models/TallSmallBushes.fbx.meta | 4 +- .../Models/TallWideBushes.fbx.meta | 4 +- 25 files changed, 1089 insertions(+), 66 deletions(-) create mode 100644 Assets/Scripts/BlackHole.cs create mode 100644 Assets/Scripts/BlackHole.cs.meta create mode 100644 Assets/Scripts/HammerController.cs create mode 100644 Assets/Scripts/HammerController.cs.meta create mode 100644 Assets/Scripts/Input/BallController.cs create mode 100644 Assets/Scripts/Input/BallController.cs.meta create mode 100644 Assets/WorldAssets/Materials/Temp4.mat create mode 100644 Assets/WorldAssets/Materials/Temp4.mat.meta diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 9731e06..9adbbcd 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -121,6 +121,150 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &70928934 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4805858307509084595, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + m_PrefabInstance: {fileID: 1723294766} + m_PrefabAsset: {fileID: 0} +--- !u!114 &70928938 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 70928934} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b578ca1f23b4664588275f98a3c3077, type: 3} + m_Name: + m_EditorClassIdentifier: + AngleLimit: {x: -100, y: 100} + RotationAxis: {x: 1, y: 0, z: 0} + HitDirection: {x: 0, y: 0, z: 1} + Force: 5 + Speed: 2 +--- !u!64 &70928939 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 70928934} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -1278364405380825340, guid: a9464dd51bb1eef41b97d9dba3c56cf8, type: 3} +--- !u!1 &101379897 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 101379902} + - component: {fileID: 101379901} + - component: {fileID: 101379900} + - component: {fileID: 101379899} + - component: {fileID: 101379898} + m_Layer: 0 + m_Name: Cube (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &101379898 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101379897} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6921e276aa68434aa72e38b4ad0190f, type: 3} + m_Name: + m_EditorClassIdentifier: + herd: {fileID: 0} +--- !u!65 &101379899 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101379897} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &101379900 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101379897} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d928d9af1f7c5214a99493df063dbf36, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &101379901 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101379897} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &101379902 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101379897} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -131.4, y: -53, z: 13.56534} + m_LocalScale: {x: 1746.2621, y: 37.181408, z: 2115.8079} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &380641380 GameObject: m_ObjectHideFlags: 0 @@ -133,6 +277,7 @@ GameObject: - component: {fileID: 380641383} - component: {fileID: 380641382} - component: {fileID: 380641381} + - component: {fileID: 380641385} m_Layer: 0 m_Name: Cube m_TagString: Untagged @@ -212,8 +357,23 @@ Transform: m_LocalScale: {x: 398.1355, y: 8.4771, z: 482.38937} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &380641385 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 380641380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fbe2851429fe8e8468394372c097ba45, type: 3} + m_Name: + m_EditorClassIdentifier: + HorseCount: 0 + size: 0 + horsePrefab: {fileID: 0} --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -304,8 +464,112 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &728834722 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -6057495791831066277, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7313702 + objectReference: {fileID: 0} + - target: {fileID: -6057495791831066277, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -6057495791831066277, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.68198067 + objectReference: {fileID: 0} + - target: {fileID: -6057495791831066277, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 265.997 + objectReference: {fileID: 0} + - target: {fileID: -6057495791831066277, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -6057495791831066277, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -6057495791831066277, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalPosition.y + value: 17.33 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalPosition.x + value: 77.66 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalPosition.z + value: 139.72 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.29617012 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.9551352 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -325.54498 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_Name + value: ShortSledgeHammer (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a9464dd51bb1eef41b97d9dba3c56cf8, type: 3} --- !u!1 &778362041 GameObject: m_ObjectHideFlags: 0 @@ -392,13 +656,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 778362041} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.8334109, y: 0.2, z: 27.1} + m_LocalRotation: {x: 0.38893333, y: -0, z: -0, w: 0.9212659} + m_LocalPosition: {x: 0.8334109, y: -3.8, z: 27.1} m_LocalScale: {x: 44.013, y: 16.279, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 45.776, y: 0, z: 0} --- !u!1 &913908742 GameObject: m_ObjectHideFlags: 0 @@ -502,12 +766,49 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 913908742} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.1, y: -1.3, z: 44.4} + m_LocalPosition: {x: -94.4, y: -1.3, z: 44.4} m_LocalScale: {x: 10.112, y: 10.156, z: 12.277489} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &942653629 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4805858307509084595, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + m_PrefabInstance: {fileID: 728834722} + m_PrefabAsset: {fileID: 0} +--- !u!114 &942653631 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 942653629} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b578ca1f23b4664588275f98a3c3077, type: 3} + m_Name: + m_EditorClassIdentifier: + AngleLimit: {x: -100, y: 100} + RotationAxis: {x: 1, y: 0, z: 0} + HitDirection: {x: 0, y: 0, z: 1} + Force: 5 + Speed: 2 +--- !u!64 &942653632 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 942653629} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -1278364405380825340, guid: a9464dd51bb1eef41b97d9dba3c56cf8, type: 3} --- !u!1 &962675084 GameObject: m_ObjectHideFlags: 0 @@ -599,7 +900,7 @@ Transform: m_LocalScale: {x: 44.013, y: 16.279, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: -121.83501, z: 0} --- !u!1 &963194225 GameObject: @@ -678,13 +979,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} - m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956} + m_LocalRotation: {x: 0.17364816, y: 0, z: 0, w: 0.9848078} m_LocalPosition: {x: 0, y: 101.4, z: -100} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 20, y: 0, z: 0} --- !u!114 &963194229 MonoBehaviour: m_ObjectHideFlags: 0 @@ -821,8 +1122,115 @@ Transform: m_LocalScale: {x: 46.966, y: 1, z: 60.31198} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1337575830 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1337575831} + - component: {fileID: 1337575835} + - component: {fileID: 1337575834} + - component: {fileID: 1337575833} + - component: {fileID: 1337575832} + m_Layer: 0 + m_Name: Sphere (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1337575831 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1337575830} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_Children: [] + m_Father: {fileID: 1855971753} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1337575832 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1337575830} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 359f12e401afaba459299c65215a0995, type: 3} + m_Name: + m_EditorClassIdentifier: + Force: -10 +--- !u!135 &1337575833 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1337575830} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1337575834 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1337575830} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 950d424518c282344956b5e374c7b715, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1337575835 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1337575830} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1457452758 GameObject: m_ObjectHideFlags: 0 @@ -885,10 +1293,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Prefab: {fileID: 7371939184051845554, guid: f5c2c9744b6f46e4e95ca41ab1d8d560, type: 3} - HerdCount: 100 + HerdCount: 500 SpawnPoint: {fileID: 0} - WaitTime: 0.2 + WaitTime: 0.15 Centre: {fileID: 984142342} + GameState: {fileID: 0} --- !u!4 &1457452761 Transform: m_ObjectHideFlags: 0 @@ -902,7 +1311,7 @@ Transform: m_Children: - {fileID: 984142342} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1649442286 GameObject: @@ -995,7 +1404,7 @@ Transform: m_LocalScale: {x: 44.013, y: 16.279, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1696841851 GameObject: @@ -1088,5 +1497,398 @@ Transform: m_LocalScale: {x: 46.966, y: 1, z: 23.658253} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1723294766 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -6057495791831066277, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7313702 + objectReference: {fileID: 0} + - target: {fileID: -6057495791831066277, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -6057495791831066277, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.68198067 + objectReference: {fileID: 0} + - target: {fileID: -6057495791831066277, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 265.997 + objectReference: {fileID: 0} + - target: {fileID: -6057495791831066277, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -6057495791831066277, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -6057495791831066277, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalPosition.y + value: 17.33 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalPosition.x + value: -21.2 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalPosition.z + value: 90.4 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: a9464dd51bb1eef41b97d9dba3c56cf8, + type: 3} + propertyPath: m_Name + value: ShortSledgeHammer + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a9464dd51bb1eef41b97d9dba3c56cf8, type: 3} +--- !u!1 &1853754227 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1853754232} + - component: {fileID: 1853754231} + - component: {fileID: 1853754230} + - component: {fileID: 1853754229} + - component: {fileID: 1853754228} + m_Layer: 0 + m_Name: Sphere (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1853754228 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1853754227} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fbe2851429fe8e8468394372c097ba45, type: 3} + m_Name: + m_EditorClassIdentifier: + HorseCount: 1000 + size: 10 + horsePrefab: {fileID: -927199367670048503, guid: 707f698da07e87f4ab470faa7ed70d74, + type: 3} +--- !u!54 &1853754229 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1853754227} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!135 &1853754230 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1853754227} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 10 + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &1853754231 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1853754227} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1853754232 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1853754227} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 23.7, y: 58.3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2147049969} + m_Father: {fileID: 0} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1855971748 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1855971753} + - component: {fileID: 1855971752} + - component: {fileID: 1855971751} + - component: {fileID: 1855971750} + - component: {fileID: 1855971749} + m_Layer: 0 + m_Name: Sphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1855971749 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1855971748} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 359f12e401afaba459299c65215a0995, type: 3} + m_Name: + m_EditorClassIdentifier: + Force: -1 +--- !u!135 &1855971750 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1855971748} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1855971751 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1855971748} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 459cd3e0ba7a5fa4490b1d19849b49e2, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1855971752 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1855971748} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1855971753 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1855971748} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -46.4, y: 32.6, z: -5.6} + m_LocalScale: {x: 50, y: 50, z: 0} + m_Children: + - {fileID: 1337575831} + m_Father: {fileID: 0} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2147049968 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2147049969} + - component: {fileID: 2147049972} + - component: {fileID: 2147049971} + - component: {fileID: 2147049970} + m_Layer: 0 + m_Name: Sphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2147049969 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2147049968} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 19, y: 19, z: 19} + m_Children: [] + m_Father: {fileID: 1853754232} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &2147049970 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2147049968} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &2147049971 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2147049968} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 459cd3e0ba7a5fa4490b1d19849b49e2, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &2147049972 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2147049968} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Assets/Scripts/BlackHole.cs b/Assets/Scripts/BlackHole.cs new file mode 100644 index 0000000..bcae279 --- /dev/null +++ b/Assets/Scripts/BlackHole.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BlackHole : MonoBehaviour +{ + + [SerializeField] + private float Force = 5; + + private void OnTriggerStay(Collider other) + { + var horse = other.GetComponent(); + + if (horse != null) + { + Vector3 direction = horse.transform.position - transform.position; + horse.AddForce(direction.normalized * Force); + } + } +} diff --git a/Assets/Scripts/BlackHole.cs.meta b/Assets/Scripts/BlackHole.cs.meta new file mode 100644 index 0000000..cf7fbcf --- /dev/null +++ b/Assets/Scripts/BlackHole.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 359f12e401afaba459299c65215a0995 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/HammerController.cs b/Assets/Scripts/HammerController.cs new file mode 100644 index 0000000..84aa23c --- /dev/null +++ b/Assets/Scripts/HammerController.cs @@ -0,0 +1,55 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class HammerController : MonoBehaviour +{ + + [SerializeField] + private Vector2 AngleLimit; + + [SerializeField] + private Vector3 RotationAxis; + + [SerializeField] + private Vector3 HitDirection; + + [SerializeField] + private float Force; + + [SerializeField] + private float Speed; + + private Vector3 startDir; + + private void Start() + { + transform.forward = Vector3.up; + startDir = transform.forward; + + } + + // Update is called once per frame + void FixedUpdate() + { + float ratio = (Mathf.Sin(Time.time * Speed) + 1) / 2; + transform.forward = Quaternion.AngleAxis(Mathf.Lerp(AngleLimit.x, AngleLimit.y, ratio), transform.parent.InverseTransformDirection(RotationAxis)) * startDir; + Vector3 hitDirection = Quaternion.AngleAxis(Mathf.Lerp(AngleLimit.x, AngleLimit.y, ratio), transform.parent.InverseTransformDirection(RotationAxis)) * transform.parent.InverseTransformDirection(HitDirection) * -(Mathf.Cos(Time.time * Speed)); + + Debug.DrawRay(transform.position, hitDirection * Force, Color.green); + } + + private void OnTriggerStay(Collider other) + { + var horse = other.GetComponent(); + + if (horse != null) + { + float ratio = (Mathf.Sin(Time.time * Speed) + 1) / 2; + Vector3 hitDirection = Quaternion.AngleAxis(Mathf.Lerp(AngleLimit.x, AngleLimit.y, ratio), transform.parent.InverseTransformDirection(RotationAxis)) * transform.parent.InverseTransformDirection(HitDirection) * -(Mathf.Cos(Time.time * Speed)); + + horse.AddForce((hitDirection.normalized + Vector3.up) * Force); + Debug.Log("Hitting horse"); + } + } +} diff --git a/Assets/Scripts/HammerController.cs.meta b/Assets/Scripts/HammerController.cs.meta new file mode 100644 index 0000000..80b35fd --- /dev/null +++ b/Assets/Scripts/HammerController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0b578ca1f23b4664588275f98a3c3077 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Input/BallController.cs b/Assets/Scripts/Input/BallController.cs new file mode 100644 index 0000000..154b415 --- /dev/null +++ b/Assets/Scripts/Input/BallController.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BallController : MonoBehaviour +{ + + public int HorseCount; + public float size; + public GameObject horsePrefab; + + // Start is called before the first frame update + void Start() + { + SpawnHorses(); + } + + // Update is called once per frame + void Update() + { + + } + + public void SpawnHorses() + { + for (int i = 0; i < HorseCount; i++) + { + Vector3 position = Random.onUnitSphere * size + transform.position; + Instantiate(horsePrefab, position,Random.rotation , transform); + } + + + + + } + +} diff --git a/Assets/Scripts/Input/BallController.cs.meta b/Assets/Scripts/Input/BallController.cs.meta new file mode 100644 index 0000000..dda228a --- /dev/null +++ b/Assets/Scripts/Input/BallController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fbe2851429fe8e8468394372c097ba45 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Input/HerdController.cs b/Assets/Scripts/Input/HerdController.cs index 9c1e263..fff83cd 100644 --- a/Assets/Scripts/Input/HerdController.cs +++ b/Assets/Scripts/Input/HerdController.cs @@ -125,9 +125,11 @@ public class HerdController : MonoBehaviour } } - - Centre.position = centreofMass/CountedHorses; - Centre.localScale = bound.size * 0.9f; + if (CountedHorses != 0) + { + Centre.position = centreofMass / CountedHorses; + Centre.localScale = bound.size * 0.75f; + } } else { diff --git a/Assets/Scripts/Input/PlayerController.cs b/Assets/Scripts/Input/PlayerController.cs index 194808a..b89a888 100644 --- a/Assets/Scripts/Input/PlayerController.cs +++ b/Assets/Scripts/Input/PlayerController.cs @@ -78,18 +78,6 @@ public class PlayerController : MonoBehaviour isRagdoll = false; - - //float rotateTo = RotateObject(HorseX, HorseZ); - //HorseZ *= Time.deltaTime * walkSpeed * speedMulitplier; - //HorseX *= Time.deltaTime * walkSpeed * speedMulitplier; - // - // - //transform.Translate(HorseX, 0, HorseZ); - - //Vector3 dir = Quaternion.Euler(-90, rotateTo, 0) * Vector3.forward; - //model.transform.forward = dir; - //LeanTween.rotateY(model, rotateTo, 0.1f); - } public float RotateObject(float xInput, float zInput) @@ -129,7 +117,7 @@ public class PlayerController : MonoBehaviour Vector3 input = receivedInput; yield return new WaitForSeconds(UnityEngine.Random.Range(0, wait / 2)); - if (/*cController.isGrounded*/ true) + if (cController.isGrounded) { Vector3 rotateDir = new Vector3(90 * Math.Sign(input.y), 0, -90 * Math.Sign(input.x)); model.transform.Rotate(rotateDir, Space.World); diff --git a/Assets/WorldAssets/Materials/MainMaterial.mat b/Assets/WorldAssets/Materials/MainMaterial.mat index d03f0f5..2d894be 100644 --- a/Assets/WorldAssets/Materials/MainMaterial.mat +++ b/Assets/WorldAssets/Materials/MainMaterial.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: MainMaterial - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -40,7 +40,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 2d288171dd6bba3418a609bc60164987, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/WorldAssets/Materials/Temp3.mat b/Assets/WorldAssets/Materials/Temp3.mat index 723bba1..e241144 100644 --- a/Assets/WorldAssets/Materials/Temp3.mat +++ b/Assets/WorldAssets/Materials/Temp3.mat @@ -8,14 +8,13 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Temp3 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent + m_CustomRenderQueue: -1 + stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -60,19 +59,19 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 10 + - _DstBlend: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - _Metallic: 0 - - _Mode: 3 + - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - - _ZWrite: 0 + - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 0.15686275} + - _Color: {r: 0.16981131, g: 0.16981131, b: 0.16981131, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/WorldAssets/Materials/Temp4.mat b/Assets/WorldAssets/Materials/Temp4.mat new file mode 100644 index 0000000..64c447d --- /dev/null +++ b/Assets/WorldAssets/Materials/Temp4.mat @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Temp4 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 0.15686275} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/WorldAssets/Materials/Temp4.mat.meta b/Assets/WorldAssets/Materials/Temp4.mat.meta new file mode 100644 index 0000000..45c9d7c --- /dev/null +++ b/Assets/WorldAssets/Materials/Temp4.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e2c9f2830f83b164cb943efc6bb88ba0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WorldAssets/Models/BigBigSmallBushes.fbx.meta b/Assets/WorldAssets/Models/BigBigSmallBushes.fbx.meta index 1571ed0..665c521 100644 --- a/Assets/WorldAssets/Models/BigBigSmallBushes.fbx.meta +++ b/Assets/WorldAssets/Models/BigBigSmallBushes.fbx.meta @@ -39,7 +39,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 35 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -85,7 +85,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.35 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/WorldAssets/Models/CrumblingWall.fbx.meta b/Assets/WorldAssets/Models/CrumblingWall.fbx.meta index 877a5c3..f696f81 100644 --- a/Assets/WorldAssets/Models/CrumblingWall.fbx.meta +++ b/Assets/WorldAssets/Models/CrumblingWall.fbx.meta @@ -85,7 +85,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 35 + globalScale: 0.35 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/WorldAssets/Models/HorseModel.fbx.meta b/Assets/WorldAssets/Models/HorseModel.fbx.meta index 3ef4b99..9f79b49 100644 --- a/Assets/WorldAssets/Models/HorseModel.fbx.meta +++ b/Assets/WorldAssets/Models/HorseModel.fbx.meta @@ -85,7 +85,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 35 + globalScale: 0.35 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/WorldAssets/Models/LongBushes.fbx.meta b/Assets/WorldAssets/Models/LongBushes.fbx.meta index 6321b37..4603610 100644 --- a/Assets/WorldAssets/Models/LongBushes.fbx.meta +++ b/Assets/WorldAssets/Models/LongBushes.fbx.meta @@ -39,7 +39,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 35 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -85,7 +85,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.35 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/WorldAssets/Models/LongSledgeHammer.fbx.meta b/Assets/WorldAssets/Models/LongSledgeHammer.fbx.meta index 08bb6ff..c317468 100644 --- a/Assets/WorldAssets/Models/LongSledgeHammer.fbx.meta +++ b/Assets/WorldAssets/Models/LongSledgeHammer.fbx.meta @@ -39,7 +39,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 20 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -85,7 +85,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.19999999 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/WorldAssets/Models/Rocks.fbx.meta b/Assets/WorldAssets/Models/Rocks.fbx.meta index 3de3324..cab0195 100644 --- a/Assets/WorldAssets/Models/Rocks.fbx.meta +++ b/Assets/WorldAssets/Models/Rocks.fbx.meta @@ -39,7 +39,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 35 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -85,7 +85,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.35 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/WorldAssets/Models/ShortSledgeHammer.fbx.meta b/Assets/WorldAssets/Models/ShortSledgeHammer.fbx.meta index fd9006c..e2f804f 100644 --- a/Assets/WorldAssets/Models/ShortSledgeHammer.fbx.meta +++ b/Assets/WorldAssets/Models/ShortSledgeHammer.fbx.meta @@ -39,7 +39,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 35 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -85,7 +85,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.35 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/WorldAssets/Models/SmallBush.fbx.meta b/Assets/WorldAssets/Models/SmallBush.fbx.meta index 723af4b..34e897b 100644 --- a/Assets/WorldAssets/Models/SmallBush.fbx.meta +++ b/Assets/WorldAssets/Models/SmallBush.fbx.meta @@ -39,7 +39,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 35 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -85,7 +85,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.35 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/WorldAssets/Models/SmallBushes.fbx.meta b/Assets/WorldAssets/Models/SmallBushes.fbx.meta index 034331d..22dcea0 100644 --- a/Assets/WorldAssets/Models/SmallBushes.fbx.meta +++ b/Assets/WorldAssets/Models/SmallBushes.fbx.meta @@ -39,7 +39,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 35 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -85,7 +85,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.35 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/WorldAssets/Models/SmallWideBushes.fbx.meta b/Assets/WorldAssets/Models/SmallWideBushes.fbx.meta index 3ffb3b6..45ac1b4 100644 --- a/Assets/WorldAssets/Models/SmallWideBushes.fbx.meta +++ b/Assets/WorldAssets/Models/SmallWideBushes.fbx.meta @@ -39,7 +39,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 35 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -85,7 +85,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.35 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/WorldAssets/Models/TallSmallBushes.fbx.meta b/Assets/WorldAssets/Models/TallSmallBushes.fbx.meta index 97feef2..0eb735c 100644 --- a/Assets/WorldAssets/Models/TallSmallBushes.fbx.meta +++ b/Assets/WorldAssets/Models/TallSmallBushes.fbx.meta @@ -39,7 +39,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 35 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -85,7 +85,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.35 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/WorldAssets/Models/TallWideBushes.fbx.meta b/Assets/WorldAssets/Models/TallWideBushes.fbx.meta index 5ab58e1..9dd43e6 100644 --- a/Assets/WorldAssets/Models/TallWideBushes.fbx.meta +++ b/Assets/WorldAssets/Models/TallWideBushes.fbx.meta @@ -39,7 +39,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 35 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -85,7 +85,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.35 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0