Browse Source

Added Mushroom + stopped kill camera

master
Joshua Reason 4 years ago
parent
commit
29fd595a3d
5 changed files with 185 additions and 10 deletions
  1. +1
    -1
      Assets/Horse/HorseMat.mat
  2. +165
    -3
      Assets/Scenes/CaseyTest.unity
  3. +1
    -2
      Assets/Scripts/BlackHole.cs
  4. +1
    -1
      Assets/Scripts/Input/PlayerController.cs
  5. +17
    -3
      Assets/WorldAssets/Prefabs/HammerPivot.prefab

+ 1
- 1
Assets/Horse/HorseMat.mat View File

@ -101,6 +101,6 @@ Material:
- _Grey2: {r: 0.6698113, g: 0.587731, b: 0.5149963, a: 1} - _Grey2: {r: 0.6698113, g: 0.587731, b: 0.5149963, a: 1}
- _Hair: {r: 1, g: 0.3348031, b: 0, a: 1} - _Hair: {r: 1, g: 0.3348031, b: 0, a: 1}
- _SkinFeatures: {r: 0.0642577, g: 0.7169812, b: 0.2675285, 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} - _SkinSecondry: {r: 0.115111865, g: 0.04454431, b: 0.8584906, a: 1}
- _White: {r: 0.8490566, g: 0.8096868, b: 0.124154456, a: 1} - _White: {r: 0.8490566, g: 0.8096868, b: 0.124154456, a: 1}

+ 165
- 3
Assets/Scenes/CaseyTest.unity View File

@ -1236,6 +1236,39 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4163547e129287f4fa90a8c7ae767017, type: 3} 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 --- !u!1001 &119338212
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1555,6 +1588,95 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 412045781} m_PrefabInstance: {fileID: 412045781}
m_PrefabAsset: {fileID: 0} 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 --- !u!4 &217508401 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 5efa3794de547b04988f66fb110ef963, m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 5efa3794de547b04988f66fb110ef963,
@ -3129,12 +3251,12 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 885.3
value: 863.2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 2803.3
value: 2759.9
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7, - target: {fileID: -4216859302048453862, guid: 35ac7956d8504d644b7aa8d2234ae9c7,
type: 3} type: 3}
@ -5827,6 +5949,45 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5efa3794de547b04988f66fb110ef963, type: 3} 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 --- !u!4 &830646265 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 4163547e129287f4fa90a8c7ae767017, m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 4163547e129287f4fa90a8c7ae767017,
@ -13338,6 +13499,7 @@ Transform:
- {fileID: 676632259} - {fileID: 676632259}
- {fileID: 1449888924} - {fileID: 1449888924}
- {fileID: 407548803} - {fileID: 407548803}
- {fileID: 815853357}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -13503,7 +13665,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2009130163} m_GameObject: {fileID: 2009130163}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} 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: -38.4, z: -2775}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1457452761} m_Father: {fileID: 1457452761}

+ 1
- 2
Assets/Scripts/BlackHole.cs View File

@ -14,8 +14,7 @@ public class BlackHole : MonoBehaviour
if (horse != null) if (horse != null)
{ {
Vector3 direction = horse.transform.position - transform.position;
horse.AddForce(direction.normalized * Force);
horse.AddForce((Vector3.up * 2 + transform.forward) * Force);
} }
} }
} }

+ 1
- 1
Assets/Scripts/Input/PlayerController.cs View File

@ -113,7 +113,7 @@ public class PlayerController : MonoBehaviour
speedMulitplier = ((Mathf.Sin(Time.time * UnityEngine.Random.Range(0.95f, 1.05f) + randomizer) + 2) * 0.25f); 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; directionRandmoizer = Mathf.Cos(Time.time + randomizer / 2) * 0.0f;
UpdatePosition(); UpdatePosition();
DestroyOffCamera();
//DestroyOffCamera();
} }
public void AddForce(Vector3 direction) public void AddForce(Vector3 direction)

+ 17
- 3
Assets/WorldAssets/Prefabs/HammerPivot.prefab View File

@ -10,6 +10,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 842352160587668309} - component: {fileID: 842352160587668309}
- component: {fileID: 2209663211348394647} - component: {fileID: 2209663211348394647}
- component: {fileID: 8439922854271340065}
m_Layer: 0 m_Layer: 0
m_Name: HammerPivot m_Name: HammerPivot
m_TagString: Untagged m_TagString: Untagged
@ -24,14 +25,14 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6895687127998917466} 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_LocalPosition: {x: -1.1, y: 26.9, z: 0.2}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 1984495177250762214} - {fileID: 1984495177250762214}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 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 --- !u!114 &2209663211348394647
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -49,6 +50,19 @@ MonoBehaviour:
HitDirection: {x: 0, y: 0, z: 1} HitDirection: {x: 0, y: 0, z: 1}
Force: 10 Force: 10
Speed: 2 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 --- !u!1 &8274505431927084302
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -137,7 +151,7 @@ MeshCollider:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8274505431927084302} m_GameObject: {fileID: 8274505431927084302}
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 1
m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 3 serializedVersion: 3
m_Convex: 1 m_Convex: 1

Loading…
Cancel
Save