Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix slime hop #447

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Bugfix slime hop #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12f5118
Adjust collision sphere for slime critter
pointfivetee Jun 15, 2021
8af0fd6
Adjust plant critter's physics collider
pointfivetee Jun 15, 2021
820098d
Fix bush's wonky collision detection
pointfivetee Jun 16, 2021
3e87a8d
Merge branch 'main' into bugfix-slime-hop
pointfivetee Jun 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions UOP1_Project/Assets/Prefabs/Characters/PlantCritter.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ CapsuleCollider:
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.5180242
m_Height: 5
m_Height: 2
m_Direction: 1
m_Center: {x: -0.01654327, y: 2, z: 0.03308654}
m_Center: {x: -0.01654327, y: 0, z: 0.03308654}
--- !u!136 &1330865802894030747
CapsuleCollider:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -954,12 +954,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 415e24332f8993c4da4c452ed27d2873, type: 3}
--- !u!4 &7900849304968062265 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1745331680755163471, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2154738241042901890 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7528600739965906932, guid: 415e24332f8993c4da4c452ed27d2873,
Expand All @@ -972,6 +966,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7618537762606215315 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -7194598512780364571, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!4 &883400021584321324 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8781925660957204314, guid: 415e24332f8993c4da4c452ed27d2873,
Expand All @@ -996,9 +996,9 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7618537762606215315 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -7194598512780364571, guid: 415e24332f8993c4da4c452ed27d2873,
--- !u!1 &8745063237678790951 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
Expand All @@ -1014,27 +1014,27 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8221149608678237085 stripped
--- !u!4 &7900849304968062265 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 415e24332f8993c4da4c452ed27d2873,
m_CorrespondingSourceObject: {fileID: 1745331680755163471, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8745063237678790951 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 415e24332f8993c4da4c452ed27d2873,
--- !u!4 &3367916164164828314 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6566495199314442476, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5123279322988003801 stripped
--- !u!4 &7492415303597500717 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -5583242968700353105, guid: 415e24332f8993c4da4c452ed27d2873,
m_CorrespondingSourceObject: {fileID: -7897143885434458789, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!4 &4188975802292468309 stripped
--- !u!4 &7234782137268576505 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5746564759562468899, guid: 415e24332f8993c4da4c452ed27d2873,
m_CorrespondingSourceObject: {fileID: -7927811463243438961, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
Expand Down Expand Up @@ -1068,9 +1068,9 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7234782137268576505 stripped
--- !u!4 &2333203040040827346 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -7927811463243438961, guid: 415e24332f8993c4da4c452ed27d2873,
m_CorrespondingSourceObject: {fileID: -3027282400719110748, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
Expand Down Expand Up @@ -1098,9 +1098,9 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2333203040040827346 stripped
--- !u!4 &5093156719673898483 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -3027282400719110748, guid: 415e24332f8993c4da4c452ed27d2873,
m_CorrespondingSourceObject: {fileID: -5533980067985051259, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
Expand All @@ -1116,21 +1116,21 @@ SkinnedMeshRenderer:
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7492415303597500717 stripped
--- !u!4 &4188975802292468309 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -7897143885434458789, guid: 415e24332f8993c4da4c452ed27d2873,
m_CorrespondingSourceObject: {fileID: 5746564759562468899, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3367916164164828314 stripped
--- !u!4 &8221149608678237085 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6566495199314442476, guid: 415e24332f8993c4da4c452ed27d2873,
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5093156719673898483 stripped
--- !u!4 &5123279322988003801 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -5533980067985051259, guid: 415e24332f8993c4da4c452ed27d2873,
m_CorrespondingSourceObject: {fileID: -5583242968700353105, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
2 changes: 1 addition & 1 deletion UOP1_Project/Assets/Prefabs/Characters/SlimeCritter.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ SphereCollider:
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.35
m_Center: {x: 0, y: 0.32, z: 0}
m_Center: {x: 0, y: 0.37, z: 0}
--- !u!135 &6274847306283701072
SphereCollider:
m_ObjectHideFlags: 0
Expand Down
152 changes: 136 additions & 16 deletions UOP1_Project/Assets/Prefabs/Nature/Bush.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,49 +14,169 @@ CapsuleCollider:
m_Height: 1.3
m_Direction: 1
m_Center: {x: 0, y: 0, z: 0.018966928}
--- !u!1 &6860398699643004296
--- !u!114 &2994959601085690081
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2544298900655342970}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 29c354ab60635420c83f79500cd7b617, type: 3}
m_Name:
m_EditorClassIdentifier:
collider: {fileID: 3892591581235103640}
--- !u!1 &6334782100700203521
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6439430392894927796}
- component: {fileID: 6006509236025568789}
- component: {fileID: 550757102349773509}
- component: {fileID: 3892591581235103640}
m_Layer: 0
m_Name: Light Probe Group
m_TagString: EditorOnly
m_Name: Collider
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6439430392894927796
--- !u!4 &550757102349773509
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6860398699643004296}
m_LocalRotation: {x: -0.000000015893253, y: 0.000000043711385, z: 0.000000043711385,
w: 1}
m_GameObject: {fileID: 6334782100700203521}
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: 2883705579607089088}
m_Father: {fileID: 1513339394655935745}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!220 &6006509236025568789
LightProbeGroup:
--- !u!136 &3892591581235103640
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6860398699643004296}
m_GameObject: {fileID: 6334782100700203521}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_SourcePositions:
- {x: 0.000000040281826, y: 0.6607704, z: -0.000000005494632}
m_Dering: 1
m_Radius: 0.5
m_Height: 1.6
m_Direction: 1
m_Center: {x: 0, y: 0.3, z: 0}
--- !u!1001 &1466182808577421127
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 2883705579607089088}
m_Modifications:
- target: {fileID: 96998187169542720, guid: c823b09b59e206649a8779a78929fa2d,
type: 3}
propertyPath: m_Radius
value: 0.49
objectReference: {fileID: 0}
- target: {fileID: 96998187169542720, guid: c823b09b59e206649a8779a78929fa2d,
type: 3}
propertyPath: m_Center.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
type: 3}
propertyPath: _layers.m_Bits
value: 512
objectReference: {fileID: 0}
- target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
type: 3}
propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
type: 3}
propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
type: 3}
propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
type: 3}
propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 2994959601085690081}
- target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
type: 3}
propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
objectReference: {fileID: 2994959601085690081}
- target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
type: 3}
propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
type: 3}
propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnObstacleTriggerChange
objectReference: {fileID: 0}
- target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
type: 3}
propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
value: OnObstacleTriggerChange
objectReference: {fileID: 0}
- target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
type: 3}
propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: Obstacle, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
type: 3}
propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
value: Obstacle, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
type: 3}
propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument
value: 1
objectReference: {fileID: 0}
- target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
type: 3}
propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument
value: 1
objectReference: {fileID: 0}
- target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
type: 3}
propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 96998187169542727, guid: c823b09b59e206649a8779a78929fa2d,
type: 3}
propertyPath: m_Name
value: TriggerZone_Collide
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c823b09b59e206649a8779a78929fa2d, type: 3}
--- !u!4 &1513339394655935745 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
type: 3}
m_PrefabInstance: {fileID: 1466182808577421127}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &3426750649209436203
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
13 changes: 13 additions & 0 deletions UOP1_Project/Assets/Scripts/Characters/Obstacle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using System;
using UnityEngine;

public class Obstacle : MonoBehaviour
{
// This collider is disabled while the player is in the trigger area.
public Collider collider;

public void OnObstacleTriggerChange(bool entered, GameObject who)
{
collider.isTrigger = entered;
}
}
11 changes: 11 additions & 0 deletions UOP1_Project/Assets/Scripts/Characters/Obstacle.cs.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.