Fixes, typos and tweaks

4 年前 · 84e76f64
--- a/UOP1_Project/Assets/Prefabs/Characters/PlantCritter.prefab
+++ b/UOP1_Project/Assets/Prefabs/Characters/PlantCritter.prefab
  - component: {fileID: 460632933}
  - component: {fileID: 460632932}
  m_Layer: 0
-  m_Name: AlertZoneCollider
+  m_Name: AlertZone
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_IsTrigger: 1
  m_Enabled: 1
  serializedVersion: 2
-  m_Radius: 2
+  m_Radius: 7
  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &460632932
 MonoBehaviour:
    m_PersistentCalls:
      m_Calls:
      - m_Target: {fileID: 443910769}
-        m_MethodName: set_IsPlayerInAlertZone
+        m_MethodName: set_isPlayerInAlertZone
        m_Mode: 0
        m_Arguments:
          m_ObjectArgument: {fileID: 0}
  - component: {fileID: 575482850}
  - component: {fileID: 575482849}
  m_Layer: 0
-  m_Name: AttackZoneCollider
+  m_Name: AttackZone
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_IsTrigger: 1
  m_Enabled: 1
  serializedVersion: 2
-  m_Radius: 1
+  m_Radius: 1.5
  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &575482849
 MonoBehaviour:
    m_PersistentCalls:
      m_Calls:
      - m_Target: {fileID: 443910769}
-        m_MethodName: set_IsPlayerInAttackZone
+        m_MethodName: set_isPlayerInAttackZone
        m_Mode: 0
        m_Arguments:
          m_ObjectArgument: {fileID: 0}
  m_Height: 5
  m_Direction: 1
  m_Center: {x: -0.01654327, y: 2, z: 0.03308654}
+--- !u!136 &1330865802894030747
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8745063237678790951}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  m_Radius: 0.38419735
+  m_Height: 0.9338093
+  m_Direction: 1
+  m_Center: {x: 0, y: 0.50470877, z: 0.03308642}
 --- !u!95 &950100416
 Animator:
  serializedVersion: 3
  m_Script: {fileID: 11500000, guid: d83d74df43f0a0b42afeaffe5c3e02cc, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- !u!136 &1330865802894030747
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8745063237678790951}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  m_Radius: 0.38419735
-  m_Height: 0.9338093
-  m_Direction: 1
-  m_Center: {x: 0, y: 0.50470877, z: 0.03308642}
+  _fullHealth: 20
 --- !u!1001 &8475173613595968630
 PrefabInstance:
  m_ObjectHideFlags: 0
    - target: {fileID: -8679921383154817045, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: 0.41807827
+      value: 1.09
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
    - target: {fileID: -8679921383154817045, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
      propertyPath: m_LocalPosition.z
-      value: -4.303776
+      value: -7.58
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
--- a/UOP1_Project/Assets/Prefabs/GameplayEssentials/SpawnSystem.prefab
+++ b/UOP1_Project/Assets/Prefabs/GameplayEssentials/SpawnSystem.prefab
  _defaultSpawnIndex: 0
  _playerPrefab: {fileID: 5557640735889932260, guid: 062b3805bf6784e4d9c599ee60eaa002,
    type: 3}
+  _playerTransformAnchor: {fileID: 11400000, guid: 35fc4039342b6ba458d0d4429e89ee74,
+    type: 2}
  _playerInstantiatedChannel: {fileID: 11400000, guid: 2723b3f59f7ede3498fe7e385d2bb6ee,
    type: 2}
  _spawnLocations:
--- a/UOP1_Project/Assets/Prefabs/Props/Collectible
+++ b/UOP1_Project/Assets/Prefabs/Props/Collectible
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2126586097156616357}
  m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
  m_Enabled: 1
  serializedVersion: 2
  m_Size: {x: 1, y: 1, z: 1}
  m_Script: {fileID: 11500000, guid: 49f5b1dd052cb44c895e54e5b56c5cfa, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  currentItem: {fileID: 11400000, guid: 8aff2c01ad67b48d0a0627754d613415, type: 2}
-  itemImages:
+  _currentItem: {fileID: 11400000, guid: 8aff2c01ad67b48d0a0627754d613415, type: 2}
+  _itemImages:
  - {fileID: 2126586096464319711}
  - {fileID: 2126586096979771816}
  - {fileID: 2126586097710057018}
--- a/UOP1_Project/Assets/Scenes/Examples/InteractionExample.unity
+++ b/UOP1_Project/Assets/Scenes/Examples/InteractionExample.unity
    - target: {fileID: 1657732992883833910, guid: 45632f0a227c860489bcba0eb1f4ec3e,
        type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0.03563515
+      value: 0.03581318
-      value: -0.009175836
+      value: -0.008454343
-      value: 0.24919106
+      value: 0.22959732
+      objectReference: {fileID: 0}
+    - target: {fileID: 1657732992883833910, guid: 45632f0a227c860489bcba0eb1f4ec3e,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.97258985
-      value: 0.035795752
+      value: 0.03581318
-      value: -0.0085278535
+      value: -0.008454343
-      value: 0.23159355
+      value: 0.22959732
+      objectReference: {fileID: 0}
+    - target: {fileID: 2808035858438402709, guid: 45632f0a227c860489bcba0eb1f4ec3e,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.97258985
-      value: 0.2295973
+      value: 0.22959732
-      value: 0.03581321
+      value: 0.03581318
-      value: -0.00845435
+      value: -0.008454343
+      objectReference: {fileID: 0}
+    - target: {fileID: 2955398947125553842, guid: 45632f0a227c860489bcba0eb1f4ec3e,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.97258985
      objectReference: {fileID: 0}
    - target: {fileID: 8745341640208226293, guid: 45632f0a227c860489bcba0eb1f4ec3e,
        type: 3}
    - target: {fileID: 8745341641394998850, guid: 45632f0a227c860489bcba0eb1f4ec3e,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: -0.73545265
+      value: -0.88254315
-      value: -9.9729185
+      value: -11.967503
-      value: 0.24919108
+      value: 0.22959733
-      value: 0.03563516
+      value: 0.03581318
-      value: -0.009175838
+      value: -0.008454344
-      value: -0.73545265
+      value: -0.88254315
-      value: -9.9729185
+      value: -11.967503
-      value: 0.967755
+      value: 0.97258985
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3}
--- a/UOP1_Project/Assets/Scenes/TestingGround.unity
+++ b/UOP1_Project/Assets/Scenes/TestingGround.unity
--- a/UOP1_Project/Assets/Scripts/Characters/Critter.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/Critter.cs
 	[SerializeField] private int _fullHealth = 20;

 	private int _currentHealth = default;
-	private bool _playerInAlertZone = default;
-	public bool IsPlayerInAlertZone
-	{
-		get => _playerInAlertZone;
-		set => _playerInAlertZone = value;
-	}
-
-	private bool _isPlayerInAttackZone = default;
-
-	public bool IsPlayerInAttackZone
-	{
-		get => _isPlayerInAttackZone;
-		set => _isPlayerInAttackZone = value;
-	}
-
-	private bool _getHit = default;
-	public bool GetHit
-	{
-		get => _getHit;
-		set => _getHit = value;
-	}
-
-	private bool _isDead = default;
-	public bool IsDead
-	{
-		get => _isDead;
-		set => _isDead = true;
-	}
+	public bool isPlayerInAlertZone { get; set; }
+	public bool isPlayerInAttackZone { get; set; }
+	public bool getHit { get; set; }
+	public bool isDead { get; set; }

 	private void Awake()
 	{
 	private void ReceiveAnAttack(int damange)
 	{
 		_currentHealth -= damange;
-		_getHit = true;
+		getHit = true;
-			_isDead = true;
+			isDead = true;
 		}
 	}

-		if (!_getHit && playerWeapon != null && playerWeapon.Enable)
+		if (!getHit && playerWeapon != null && playerWeapon.Enable)
 		{
 			ReceiveAnAttack(playerWeapon.AttackStrength);
 		}
--- a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/ResetGetHitStateSO.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/ResetGetHitStateSO.cs

 	public override void OnStateExit()
 	{
-		_critter.GetHit = false;
+		_critter.getHit = false;
 	}
 }
--- a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsCritterGettingHitSO.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsCritterGettingHitSO.cs
 		bool result = false;
 		if (_critter != null)
 		{
-			result = _critter.GetHit;
+			result = _critter.getHit;
 		}
 		return result;
 	}
--- a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsCritterKilledHitSO.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsCritterKilledHitSO.cs
 		bool result = false;
 		if (_critter != null)
 		{
-			result = _critter.IsDead;
+			result = _critter.isDead;
 		}
 		return result;
 	}
--- a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/PlayerIsInZoneSO.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/PlayerIsInZoneSO.cs
 			switch (((PlayerIsInZoneSO)OriginSO).zone)
 			{
 				case ZoneType.Alert:
-					result = _critter.IsPlayerInAlertZone;
+					result = _critter.isPlayerInAlertZone;
-					result = _critter.IsPlayerInAttackZone;
+					result = _critter.isPlayerInAttackZone;
 					break;
 				default:
 					break;
--- a/UOP1_Project/Assets/Scripts/Interaction/InteractionManager.cs
+++ b/UOP1_Project/Assets/Scripts/Interaction/InteractionManager.cs

 	private void OnTriggerExit(Collider other)
 	{
-
-
 		ResetInteraction();
 	}