diff --git a/Assets/Horse/HorseMat.mat b/Assets/Horse/HorseMat.mat index 626768f..c641c40 100644 --- a/Assets/Horse/HorseMat.mat +++ b/Assets/Horse/HorseMat.mat @@ -101,6 +101,6 @@ Material: - _Grey2: {r: 0.6698113, g: 0.587731, b: 0.5149963, a: 1} - _Hair: {r: 1, g: 0.3348031, b: 0, a: 1} - _SkinFeatures: {r: 0.0642577, g: 0.7169812, b: 0.2675285, a: 1} - - _SkinMain: {r: 0.9433962, g: 0.44914007, b: 0.048949808, a: 1} + - _SkinMain: {r: 0.9150943, g: 0.4567178, b: 0.082013145, a: 1} - _SkinSecondry: {r: 0.115111865, g: 0.04454431, b: 0.8584906, a: 1} - _White: {r: 0.8490566, g: 0.8096868, b: 0.124154456, a: 1} diff --git a/Assets/Scenes/CaseyTest.unity b/Assets/Scenes/CaseyTest.unity index 9176714..a82c23f 100644 --- a/Assets/Scenes/CaseyTest.unity +++ b/Assets/Scenes/CaseyTest.unity @@ -1279,6 +1279,39 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4163547e129287f4fa90a8c7ae767017, type: 3} +--- !u!1 &117169023 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 35ac7956d8504d644b7aa8d2234ae9c7, + type: 3} + m_PrefabInstance: {fileID: 398170603} + m_PrefabAsset: {fileID: 0} +--- !u!64 &117169024 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 117169023} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 1980917502627260308, guid: 35ac7956d8504d644b7aa8d2234ae9c7, type: 3} +--- !u!114 &117169025 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 117169023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 359f12e401afaba459299c65215a0995, type: 3} + m_Name: + m_EditorClassIdentifier: + Force: 5 --- !u!1001 &119338212 PrefabInstance: m_ObjectHideFlags: 0 @@ -1598,6 +1631,95 @@ Transform: type: 3} m_PrefabInstance: {fileID: 412045781} m_PrefabAsset: {fileID: 0} +--- !u!1001 &202594730 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1996227573} + m_Modifications: + - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, + type: 3} + propertyPath: m_LocalPosition.x + value: -9.1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, + type: 3} + propertyPath: m_LocalPosition.y + value: 915.5 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, + type: 3} + propertyPath: m_LocalPosition.z + value: 2902 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.17535868 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9845047 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, + type: 3} + propertyPath: m_RootOrder + value: 124 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -20.199001 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, + type: 3} + propertyPath: m_LocalScale.x + value: 6.82775 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, + type: 3} + propertyPath: m_LocalScale.y + value: 6.82775 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, + type: 3} + propertyPath: m_LocalScale.z + value: 6.82775 + objectReference: {fileID: 0} + - target: {fileID: -1504981713932161579, guid: 35ac7956d8504d644b7aa8d2234ae9c7, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 41dd6c0d44ba4f94ca2ef9c9a117d460, type: 2} + - target: {fileID: -927199367670048503, guid: 35ac7956d8504d644b7aa8d2234ae9c7, + type: 3} + propertyPath: m_Name + value: sm_Mushrooms (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 35ac7956d8504d644b7aa8d2234ae9c7, type: 3} --- !u!4 &217508401 stripped Transform: m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 5efa3794de547b04988f66fb110ef963, @@ -3060,12 +3182,12 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, type: 3} propertyPath: m_LocalPosition.y - value: 885.3 + value: 863.2 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, type: 3} propertyPath: m_LocalPosition.z - value: 2803.3 + value: 2759.9 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, type: 3} @@ -5665,6 +5787,45 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5efa3794de547b04988f66fb110ef963, type: 3} +--- !u!1 &815853356 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 35ac7956d8504d644b7aa8d2234ae9c7, + type: 3} + m_PrefabInstance: {fileID: 202594730} + m_PrefabAsset: {fileID: 0} +--- !u!4 &815853357 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, + type: 3} + m_PrefabInstance: {fileID: 202594730} + m_PrefabAsset: {fileID: 0} +--- !u!64 &815853358 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 815853356} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 1980917502627260308, guid: 35ac7956d8504d644b7aa8d2234ae9c7, type: 3} +--- !u!114 &815853359 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 815853356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 359f12e401afaba459299c65215a0995, type: 3} + m_Name: + m_EditorClassIdentifier: + Force: 5 --- !u!4 &830646265 stripped Transform: m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 4163547e129287f4fa90a8c7ae767017, @@ -12813,6 +12974,7 @@ Transform: - {fileID: 676632259} - {fileID: 1449888924} - {fileID: 407548803} + - {fileID: 815853357} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -12978,7 +13140,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2009130163} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 16.43, z: 67.6} + m_LocalPosition: {x: 0, y: 8, z: 73.9} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1457452761} diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index cc789d7..0bdcfca 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -153,7 +153,7 @@ RectTransform: m_Children: - {fileID: 501482869} m_Father: {fileID: 1626799341} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -504,7 +504,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 354978088} m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -4.0100746, y: 154.06068, z: 73.17647} + m_LocalPosition: {x: -4.0100746, y: 154.06068, z: 4} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1934409498} @@ -826,8 +826,8 @@ ParticleSystem: startSize: serializedVersion: 2 minMaxState: 3 - scalar: 12 - minScalar: 7 + scalar: 6 + minScalar: 3 maxCurve: serializedVersion: 2 m_Curve: @@ -5472,6 +5472,79 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 501482868} m_CullTransparentMesh: 0 +--- !u!1 &607260669 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 607260670} + - component: {fileID: 607260672} + - component: {fileID: 607260671} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &607260670 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 607260669} + 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: 1626799341} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &607260671 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 607260669} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 51bf57fb574407f4ca9568a974b34ef3, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &607260672 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 607260669} + m_CullTransparentMesh: 0 --- !u!1 &819178988 GameObject: m_ObjectHideFlags: 0 @@ -6551,8 +6624,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 607260670} - {fileID: 28924394} - {fileID: 2067882348} + - {fileID: 1764920230} m_Father: {fileID: 1934409498} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6561,6 +6636,79 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &1764920229 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1764920230} + - component: {fileID: 1764920232} + - component: {fileID: 1764920231} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1764920230 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1764920229} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 4.5128, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1626799341} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -108} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1764920231 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1764920229} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 16e393da2728ce6449d7eb4c2e3578ee, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1764920232 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1764920229} + m_CullTransparentMesh: 0 --- !u!1 &1901608153 GameObject: m_ObjectHideFlags: 0 @@ -6745,7 +6893,7 @@ RectTransform: m_Children: - {fileID: 1485579967} m_Father: {fileID: 1626799341} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/BlackHole.cs b/Assets/Scripts/BlackHole.cs index bcae279..460f05e 100644 --- a/Assets/Scripts/BlackHole.cs +++ b/Assets/Scripts/BlackHole.cs @@ -14,8 +14,7 @@ public class BlackHole : MonoBehaviour if (horse != null) { - Vector3 direction = horse.transform.position - transform.position; - horse.AddForce(direction.normalized * Force); + horse.AddForce((Vector3.up * 2 + transform.forward) * Force); } } } diff --git a/Assets/Scripts/HumptyDumptyFollow.cs b/Assets/Scripts/HumptyDumptyFollow.cs new file mode 100644 index 0000000..530a110 --- /dev/null +++ b/Assets/Scripts/HumptyDumptyFollow.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class HumptyDumptyFollow : MonoBehaviour +{ + public Transform Centre; + public Vector3 Offset; + + + // Update is called once per frame + void Update() + { + transform.position = Centre.position + Offset; + } +} diff --git a/Assets/Scripts/HumptyDumptyFollow.cs.meta b/Assets/Scripts/HumptyDumptyFollow.cs.meta new file mode 100644 index 0000000..d0d89b3 --- /dev/null +++ b/Assets/Scripts/HumptyDumptyFollow.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 48503f69a7f0ea9458ae404e5b00ffd9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Input/PlayerController.cs b/Assets/Scripts/Input/PlayerController.cs index db65685..34d29ec 100644 --- a/Assets/Scripts/Input/PlayerController.cs +++ b/Assets/Scripts/Input/PlayerController.cs @@ -113,7 +113,7 @@ public class PlayerController : MonoBehaviour speedMulitplier = ((Mathf.Sin(Time.time * UnityEngine.Random.Range(0.95f, 1.05f) + randomizer) + 2) * 0.25f); directionRandmoizer = Mathf.Cos(Time.time + randomizer / 2) * 0.0f; UpdatePosition(); - DestroyOffCamera(); + //DestroyOffCamera(); } public void AddForce(Vector3 direction) diff --git a/Assets/Scripts/SetHorseMat.cs b/Assets/Scripts/SetHorseMat.cs new file mode 100644 index 0000000..1bfc4c3 --- /dev/null +++ b/Assets/Scripts/SetHorseMat.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SetHorseMat : MonoBehaviour +{ + public List allMats; + + // Start is called before the first frame update + void Start() + { + int randomIndex = Random.Range(0, allMats.Count - 1); + Debug.Log("RandomIndex: " + randomIndex); + GetComponentInChildren().material = allMats[randomIndex]; + + } +} diff --git a/Assets/Scripts/SetHorseMat.cs.meta b/Assets/Scripts/SetHorseMat.cs.meta new file mode 100644 index 0000000..8b660bf --- /dev/null +++ b/Assets/Scripts/SetHorseMat.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c16c4586273f9b84e97fcbbb885db687 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WorldAssets/Models/Bushes.fbx b/Assets/WorldAssets/Models/Bushes.fbx new file mode 100644 index 0000000..09e168a --- /dev/null +++ b/Assets/WorldAssets/Models/Bushes.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ff8a9ddfcf3e967f8406ab89c7ca95848314bb061396ab622389df6e022b247 +size 717209 diff --git a/Assets/WorldAssets/Models/Bushes.fbx.meta b/Assets/WorldAssets/Models/Bushes.fbx.meta new file mode 100644 index 0000000..a88278e --- /dev/null +++ b/Assets/WorldAssets/Models/Bushes.fbx.meta @@ -0,0 +1,101 @@ +fileFormatVersion: 2 +guid: b9735b5b8136a914cb85c54ffbd43b4e +ModelImporter: + serializedVersion: 19300 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: surfaceShader1 + second: {fileID: 2100000, guid: 41dd6c0d44ba4f94ca2ef9c9a117d460, type: 2} + materials: + materialImportMode: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 15 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 0.14999999 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WorldAssets/Models/BushesTrees.fbx b/Assets/WorldAssets/Models/BushesTrees.fbx new file mode 100644 index 0000000..83f47e3 --- /dev/null +++ b/Assets/WorldAssets/Models/BushesTrees.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b2b81741703efc337146e8aa68e4cac9a4d1dbbdda11d29cca643d75f8d884a +size 1919192 diff --git a/Assets/WorldAssets/Models/BushesTrees.fbx.meta b/Assets/WorldAssets/Models/BushesTrees.fbx.meta new file mode 100644 index 0000000..8226017 --- /dev/null +++ b/Assets/WorldAssets/Models/BushesTrees.fbx.meta @@ -0,0 +1,101 @@ +fileFormatVersion: 2 +guid: 22494ddbeb89f9a4ab5fdd8fea2e1393 +ModelImporter: + serializedVersion: 19300 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: surfaceShader3 + second: {fileID: 2100000, guid: 41dd6c0d44ba4f94ca2ef9c9a117d460, type: 2} + materials: + materialImportMode: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 7 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 0.07 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WorldAssets/Prefabs/HammerPivot.prefab b/Assets/WorldAssets/Prefabs/HammerPivot.prefab index f222cac..84f0ff9 100644 --- a/Assets/WorldAssets/Prefabs/HammerPivot.prefab +++ b/Assets/WorldAssets/Prefabs/HammerPivot.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 842352160587668309} - component: {fileID: 2209663211348394647} + - component: {fileID: 8439922854271340065} m_Layer: 0 m_Name: HammerPivot m_TagString: Untagged @@ -24,14 +25,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6895687127998917466} - m_LocalRotation: {x: 0.72248065, y: -0.000000029802322, z: 0.000000029802322, w: -0.6913912} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.1, y: 26.9, z: 0.2} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1984495177250762214} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 267.48102, y: 0, z: -0.000015258789} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2209663211348394647 MonoBehaviour: m_ObjectHideFlags: 0 @@ -49,6 +50,19 @@ MonoBehaviour: HitDirection: {x: 0, y: 0, z: 1} Force: 10 Speed: 2 +--- !u!65 &8439922854271340065 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6895687127998917466} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 3.8, y: 8.57, z: 24.1} + m_Center: {x: -0.03, y: 0.49, z: -14.66} --- !u!1 &8274505431927084302 GameObject: m_ObjectHideFlags: 0 @@ -137,7 +151,7 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8274505431927084302} m_Material: {fileID: 0} - m_IsTrigger: 1 + m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 3 m_Convex: 1 diff --git a/Assets/WorldAssets/Texture/All the Kings Horses.png b/Assets/WorldAssets/Texture/All the Kings Horses.png new file mode 100644 index 0000000..404ebb7 --- /dev/null +++ b/Assets/WorldAssets/Texture/All the Kings Horses.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e5757dcca38a365e7b5c49a0249167716606e86a5e9f9be0399b4898c4a83e0 +size 8219 diff --git a/Assets/WorldAssets/Texture/All the Kings Horses.png.meta b/Assets/WorldAssets/Texture/All the Kings Horses.png.meta new file mode 100644 index 0000000..1cfacb1 --- /dev/null +++ b/Assets/WorldAssets/Texture/All the Kings Horses.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 16e393da2728ce6449d7eb4c2e3578ee +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WorldAssets/Texture/Background.png b/Assets/WorldAssets/Texture/Background.png new file mode 100644 index 0000000..51c0bb6 --- /dev/null +++ b/Assets/WorldAssets/Texture/Background.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8ed80f51d954fdbf97caa751431da35645b4acce4af189969fc1e9648d94a12 +size 50464 diff --git a/Assets/WorldAssets/Texture/Background.png.meta b/Assets/WorldAssets/Texture/Background.png.meta new file mode 100644 index 0000000..ebce453 --- /dev/null +++ b/Assets/WorldAssets/Texture/Background.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 51bf57fb574407f4ca9568a974b34ef3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WorldAssets/Texture/Success.png b/Assets/WorldAssets/Texture/Success.png new file mode 100644 index 0000000..4cb86dc --- /dev/null +++ b/Assets/WorldAssets/Texture/Success.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7c9bdc35215349f6cc9fb5b4401a65540fadf868b6163112a5aeb48ad161cbf +size 10773 diff --git a/Assets/WorldAssets/Texture/Success.png.meta b/Assets/WorldAssets/Texture/Success.png.meta new file mode 100644 index 0000000..23b2909 --- /dev/null +++ b/Assets/WorldAssets/Texture/Success.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 29d3525af4bd9c449a5878f3583d34a8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: