Skip to content
Snippets Groups Projects
Commit c1e1799e authored by maikeljh's avatar maikeljh
Browse files
parents 2c34e245 ba87e3dd
Branches
Tags
No related merge requests found
...@@ -553,6 +553,9 @@ PrefabInstance: ...@@ -553,6 +553,9 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3}
insertIndex: -1 insertIndex: -1
addedObject: {fileID: 4935392479995179265} addedObject: {fileID: 4935392479995179265}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3}
insertIndex: -1
addedObject: {fileID: 6282763913751042799}
m_SourcePrefab: {fileID: 100100000, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3}
--- !u!4 &6220440759874809753 stripped --- !u!4 &6220440759874809753 stripped
Transform: Transform:
...@@ -706,3 +709,17 @@ Animator: ...@@ -706,3 +709,17 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1 m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0 m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0 m_WriteDefaultValuesOnDisable: 0
--- !u!114 &6282763913751042799
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6708288964639503651}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0e48b3f76a0d9be4f96e3346abc74bf8, type: 3}
m_Name:
m_EditorClassIdentifier:
moveSpeed: 4
safeDistance: 5
...@@ -12434,6 +12434,14 @@ PrefabInstance: ...@@ -12434,6 +12434,14 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 183304858} m_TransformParent: {fileID: 183304858}
m_Modifications: m_Modifications:
- target: {fileID: 164709854376003226, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchoredPosition.x
value: -284
objectReference: {fileID: 0}
- target: {fileID: 164709854376003226, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchoredPosition.y
value: -1
objectReference: {fileID: 0}
- target: {fileID: 478637418533456247, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3} - target: {fileID: 478637418533456247, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: 0
...@@ -12464,7 +12472,7 @@ PrefabInstance: ...@@ -12464,7 +12472,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1361321594723433952, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3} - target: {fileID: 1361321594723433952, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2526570798605016776, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3} - target: {fileID: 2526570798605016776, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
...@@ -12548,7 +12556,7 @@ PrefabInstance: ...@@ -12548,7 +12556,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5712293994674342005, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3} - target: {fileID: 5712293994674342005, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: -567.2367 value: -611.99994
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5712293994674342005, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3} - target: {fileID: 5712293994674342005, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
......
...@@ -28,6 +28,8 @@ public class RajaAbility : MonoBehaviour ...@@ -28,6 +28,8 @@ public class RajaAbility : MonoBehaviour
player = GameObject.FindGameObjectWithTag("Player"); player = GameObject.FindGameObjectWithTag("Player");
playerHealth = player.GetComponent<PlayerHealth>(); playerHealth = player.GetComponent<PlayerHealth>();
playerMovement = player.GetComponent<PlayerMovement>(); playerMovement = player.GetComponent<PlayerMovement>();
petObject = GameObject.FindGameObjectWithTag("PetBuff");
petObjectHealth = petObject.GetComponent<PetHealth>();
anim = GetComponent<Animator>(); anim = GetComponent<Animator>();
// Get weapon manager // Get weapon manager
......
...@@ -98,8 +98,7 @@ namespace Nightmare ...@@ -98,8 +98,7 @@ namespace Nightmare
{ {
for (int i = 0; i < petCount; i++) for (int i = 0; i < petCount; i++)
{ {
GameObject instantiatedItem = Instantiate(pet, enemyInstance.transform); Instantiate(pet, enemyInstance.transform);
instantiatedItem.transform.SetParent(enemyInstance.transform);
} }
} }
} }
......
...@@ -60,6 +60,7 @@ public class CollisionDetection : MonoBehaviour ...@@ -60,6 +60,7 @@ public class CollisionDetection : MonoBehaviour
shopCanvas.gameObject.SetActive(false); shopCanvas.gameObject.SetActive(false);
shopInstructionCanvas.gameObject.SetActive(false); shopInstructionCanvas.gameObject.SetActive(false);
timerColor.a = 1f; timerColor.a = 1f;
timerCanvasTimerUI.color = timerColor;
} }
} }
...@@ -68,6 +69,7 @@ public class CollisionDetection : MonoBehaviour ...@@ -68,6 +69,7 @@ public class CollisionDetection : MonoBehaviour
shopCanvas.gameObject.SetActive(false); shopCanvas.gameObject.SetActive(false);
shopInstructionCanvas.gameObject.SetActive(true); shopInstructionCanvas.gameObject.SetActive(true);
timerColor.a = 1f; timerColor.a = 1f;
timerCanvasTimerUI.color = timerColor;
} }
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment