Camera switch when in safe zone
This commit is contained in:
parent
310c4ce85f
commit
755e6f4f0b
@ -1,5 +1,72 @@
|
|||||||
%YAML 1.1
|
%YAML 1.1
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &3328484984159178892
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6321221765026321715}
|
||||||
|
- component: {fileID: 2157531613931464528}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: VCam Global
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &6321221765026321715
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3328484984159178892}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: -1.9399996}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 3977887685390540695}
|
||||||
|
m_Father: {fileID: 8365024801698166081}
|
||||||
|
m_RootOrder: 2
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!114 &2157531613931464528
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3328484984159178892}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_ExcludedPropertiesInInspector:
|
||||||
|
- m_Script
|
||||||
|
m_LockStageInInspector:
|
||||||
|
m_StreamingVersion: 20170927
|
||||||
|
m_Priority: 15
|
||||||
|
m_StandbyUpdate: 2
|
||||||
|
m_LookAt: {fileID: 0}
|
||||||
|
m_Follow: {fileID: 0}
|
||||||
|
m_Lens:
|
||||||
|
FieldOfView: 60
|
||||||
|
OrthographicSize: 10
|
||||||
|
NearClipPlane: 0.3
|
||||||
|
FarClipPlane: 1000
|
||||||
|
Dutch: 0
|
||||||
|
LensShift: {x: 0, y: 0}
|
||||||
|
m_Transitions:
|
||||||
|
m_BlendHint: 0
|
||||||
|
m_InheritPosition: 0
|
||||||
|
m_OnCameraLive:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_LegacyBlendHint: 0
|
||||||
|
m_ComponentOwner: {fileID: 3977887685390540695}
|
||||||
--- !u!1 &8365024801038495441
|
--- !u!1 &8365024801038495441
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -98,7 +165,7 @@ GameObject:
|
|||||||
- component: {fileID: 8365024801073869717}
|
- component: {fileID: 8365024801073869717}
|
||||||
- component: {fileID: 8365024801073869718}
|
- component: {fileID: 8365024801073869718}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: VCam
|
m_Name: VCam Vampire
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
@ -183,6 +250,7 @@ Transform:
|
|||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 8365024802335227868}
|
- {fileID: 8365024802335227868}
|
||||||
- {fileID: 8365024801073869717}
|
- {fileID: 8365024801073869717}
|
||||||
|
- {fileID: 6321221765026321715}
|
||||||
- {fileID: 8365024802607593188}
|
- {fileID: 8365024802607593188}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
@ -368,7 +436,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 8365024801698166081}
|
m_Father: {fileID: 8365024801698166081}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!114 &8365024802607593189
|
--- !u!114 &8365024802607593189
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -411,3 +479,46 @@ MonoBehaviour:
|
|||||||
- {x: 0.5, y: -0.5, z: 0}
|
- {x: 0.5, y: -0.5, z: 0}
|
||||||
- {x: 0.5, y: 0.5, z: 0}
|
- {x: 0.5, y: 0.5, z: 0}
|
||||||
- {x: -0.5, y: 0.5, z: 0}
|
- {x: -0.5, y: 0.5, z: 0}
|
||||||
|
--- !u!1 &8955375116928980366
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 3977887685390540695}
|
||||||
|
- component: {fileID: 8002876809601959556}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: cm
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &3977887685390540695
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8955375116928980366}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0.1217883, y: -1.235689, z: 10.669466}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 6321221765026321715}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!114 &8002876809601959556
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8955375116928980366}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
|||||||
@ -130,6 +130,22 @@ PrefabInstance:
|
|||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 0}
|
m_TransformParent: {fileID: 0}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 3328484984159178892, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8365024801073869717, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8365024801073869717, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8365024801073869717, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: -1.9399996
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8365024801073869718, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
|
- target: {fileID: 8365024801073869718, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
|
||||||
propertyPath: m_Follow
|
propertyPath: m_Follow
|
||||||
value:
|
value:
|
||||||
@ -138,6 +154,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_LookAt
|
propertyPath: m_LookAt
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 720678398}
|
objectReference: {fileID: 720678398}
|
||||||
|
- target: {fileID: 8365024801073869718, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
|
||||||
|
propertyPath: m_Lens.OrthographicSize
|
||||||
|
value: 7
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8365024801698166081, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
|
- target: {fileID: 8365024801698166081, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
|
||||||
propertyPath: m_RootOrder
|
propertyPath: m_RootOrder
|
||||||
value: 0
|
value: 0
|
||||||
@ -186,6 +206,22 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: SceneStuff
|
value: SceneStuff
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8365024802335227868, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8365024802335227868, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8365024802335227868, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: -1.9399996
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8365024802335227869, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
|
||||||
|
propertyPath: orthographic size
|
||||||
|
value: 7
|
||||||
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
|
||||||
--- !u!4 &720678398 stripped
|
--- !u!4 &720678398 stripped
|
||||||
@ -193,6 +229,11 @@ Transform:
|
|||||||
m_CorrespondingSourceObject: {fileID: 1214567908930553594, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
|
m_CorrespondingSourceObject: {fileID: 1214567908930553594, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
|
||||||
m_PrefabInstance: {fileID: 1942557562}
|
m_PrefabInstance: {fileID: 1942557562}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &994495019 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 3328484984159178892, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 647315810}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1001 &1359990804
|
--- !u!1001 &1359990804
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -200,6 +241,10 @@ PrefabInstance:
|
|||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 0}
|
m_TransformParent: {fileID: 0}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 4164153230343464235, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
|
||||||
|
propertyPath: globalCamera
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 994495019}
|
||||||
- target: {fileID: 9196727425507610130, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
|
- target: {fileID: 9196727425507610130, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
|
||||||
propertyPath: m_RootOrder
|
propertyPath: m_RootOrder
|
||||||
value: 2
|
value: 2
|
||||||
|
|||||||
@ -5,7 +5,7 @@ using UnityEngine;
|
|||||||
[RequireComponent(typeof(Rigidbody2D))]
|
[RequireComponent(typeof(Rigidbody2D))]
|
||||||
public class Entity : MonoBehaviour
|
public class Entity : MonoBehaviour
|
||||||
{
|
{
|
||||||
[field: SerializeField]protected float Health { get; private set; }
|
[field: SerializeField]public float Health { get; private set; }
|
||||||
[SerializeField]private float movementSpeed;
|
[SerializeField]private float movementSpeed;
|
||||||
[SerializeField]private float rotSpeed;
|
[SerializeField]private float rotSpeed;
|
||||||
[SerializeField]private float fov;
|
[SerializeField]private float fov;
|
||||||
|
|||||||
@ -56,9 +56,9 @@ public class MinionThrower : MonoBehaviour {
|
|||||||
}
|
}
|
||||||
|
|
||||||
float minionHealthCost = 10f; // TODO
|
float minionHealthCost = 10f; // TODO
|
||||||
// if(minionHealthCost >= vampireEntity.Health) {
|
if(minionHealthCost >= vampireEntity.Health) {
|
||||||
// return;
|
return;
|
||||||
// }
|
}
|
||||||
vampireEntity.TakeDamage(minionHealthCost);
|
vampireEntity.TakeDamage(minionHealthCost);
|
||||||
|
|
||||||
currentInitialCooldown = 2f; // TODO
|
currentInitialCooldown = 2f; // TODO
|
||||||
|
|||||||
@ -1,16 +1,25 @@
|
|||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
public class SafeZone : MonoBehaviour {
|
public class SafeZone : MonoBehaviour {
|
||||||
|
|
||||||
public SafeZoneStats stats;
|
public SafeZoneStats stats;
|
||||||
[SerializeField] CircleCollider2D moatCollider;
|
[SerializeField] CircleCollider2D moatCollider;
|
||||||
|
[SerializeField] GameObject globalCamera;
|
||||||
|
|
||||||
public bool IsInSafeZone { get; private set; } = true;
|
public bool IsInSafeZone { get; private set; } = true;
|
||||||
|
|
||||||
|
void Start() {
|
||||||
|
globalCamera.SetActive(true);
|
||||||
|
}
|
||||||
|
|
||||||
public void EnterSafeZone() {
|
public void EnterSafeZone() {
|
||||||
IsInSafeZone = true;
|
IsInSafeZone = true;
|
||||||
|
globalCamera.SetActive(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ExitSafeZone() {
|
public void ExitSafeZone() {
|
||||||
IsInSafeZone = false;
|
IsInSafeZone = false;
|
||||||
|
globalCamera.SetActive(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Vector3 GetOutsidePosition(Vector2 direction) {
|
public Vector3 GetOutsidePosition(Vector2 direction) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user