Fixes demon & Giant
This commit is contained in:
@@ -4948,7 +4948,6 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 7058331355936229169}
|
- component: {fileID: 7058331355936229169}
|
||||||
- component: {fileID: 1024337125332675931}
|
- component: {fileID: 1024337125332675931}
|
||||||
- component: {fileID: -42539312977873233}
|
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: DemonShield
|
m_Name: DemonShield
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -4964,9 +4963,9 @@ Transform:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 4089514887418515818}
|
m_GameObject: {fileID: 4089514887418515818}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_LocalRotation: {x: -0, y: 0.6895887, z: -0, w: 0.72420126}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_LocalPosition: {x: -34.021095, y: 41.496, z: -60.96627}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 4233265158678323538}
|
- {fileID: 4233265158678323538}
|
||||||
@@ -4976,7 +4975,7 @@ Transform:
|
|||||||
- {fileID: 246192023928898687}
|
- {fileID: 246192023928898687}
|
||||||
- {fileID: 3950270626124424465}
|
- {fileID: 3950270626124424465}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 87.195, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!136 &1024337125332675931
|
--- !u!136 &1024337125332675931
|
||||||
CapsuleCollider:
|
CapsuleCollider:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -4996,37 +4995,10 @@ CapsuleCollider:
|
|||||||
m_ProvidesContacts: 0
|
m_ProvidesContacts: 0
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Radius: 2
|
m_Radius: 2.5
|
||||||
m_Height: 2
|
m_Height: 2.5
|
||||||
m_Direction: 1
|
m_Direction: 1
|
||||||
m_Center: {x: 0, y: 1.25, z: 0}
|
m_Center: {x: 0, y: 1, z: 0}
|
||||||
--- !u!54 &-42539312977873233
|
|
||||||
Rigidbody:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 4089514887418515818}
|
|
||||||
serializedVersion: 4
|
|
||||||
m_Mass: 1000
|
|
||||||
m_Drag: 0
|
|
||||||
m_AngularDrag: 0.05
|
|
||||||
m_CenterOfMass: {x: 0, y: 0, z: 0}
|
|
||||||
m_InertiaTensor: {x: 1, y: 1, z: 1}
|
|
||||||
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
||||||
m_IncludeLayers:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Bits: 0
|
|
||||||
m_ExcludeLayers:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Bits: 0
|
|
||||||
m_ImplicitCom: 1
|
|
||||||
m_ImplicitTensor: 1
|
|
||||||
m_UseGravity: 1
|
|
||||||
m_IsKinematic: 1
|
|
||||||
m_Interpolate: 0
|
|
||||||
m_Constraints: 0
|
|
||||||
m_CollisionDetection: 0
|
|
||||||
--- !u!1 &5185508652979790054
|
--- !u!1 &5185508652979790054
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -138,12 +138,6 @@ namespace DemonBoss.Magic
|
|||||||
spawnedShield = LeanPool.Spawn(shieldFXPrefab, spawnPosition, spawnRotation);
|
spawnedShield = LeanPool.Spawn(shieldFXPrefab, spawnPosition, spawnRotation);
|
||||||
|
|
||||||
if (enableDebug) Debug.Log($"[SA_CastShield] Shield spawned at NPC position: {spawnPosition}");
|
if (enableDebug) Debug.Log($"[SA_CastShield] Shield spawned at NPC position: {spawnPosition}");
|
||||||
|
|
||||||
// Parent the shield to the NPC so it moves with them
|
|
||||||
if (spawnedShield != null)
|
|
||||||
{
|
|
||||||
spawnedShield.transform.SetParent(npcTransform);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -667,7 +667,7 @@ MonoBehaviour:
|
|||||||
- decisions:
|
- decisions:
|
||||||
- trueValue: 0
|
- trueValue: 0
|
||||||
decision: {fileID: 7927421991537792917}
|
decision: {fileID: 7927421991537792917}
|
||||||
isValid: 0
|
isValid: 1
|
||||||
validated: 0
|
validated: 0
|
||||||
trueState: {fileID: -312774025800194259}
|
trueState: {fileID: -312774025800194259}
|
||||||
falseState: {fileID: 0}
|
falseState: {fileID: 0}
|
||||||
@@ -1114,7 +1114,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: a5fc604039227434d8b4e63ebc5e74a5, type: 3}
|
m_Script: {fileID: 11500000, guid: a5fc604039227434d8b4e63ebc5e74a5, type: 3}
|
||||||
m_Name: FSM_Demon
|
m_Name: FSM_Demon
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
selectedNode: {fileID: 2986668563461644515}
|
selectedNode: {fileID: 4162026404432437805}
|
||||||
wantConnection: 0
|
wantConnection: 0
|
||||||
connectionNode: {fileID: 0}
|
connectionNode: {fileID: 0}
|
||||||
showProperties: 1
|
showProperties: 1
|
||||||
@@ -1131,7 +1131,7 @@ MonoBehaviour:
|
|||||||
- {fileID: 9112689765763526057}
|
- {fileID: 9112689765763526057}
|
||||||
- {fileID: 766956384951898899}
|
- {fileID: 766956384951898899}
|
||||||
- {fileID: 4162026404432437805}
|
- {fileID: 4162026404432437805}
|
||||||
panOffset: {x: -413, y: 291}
|
panOffset: {x: -410, y: 290}
|
||||||
overNode: 0
|
overNode: 0
|
||||||
actions:
|
actions:
|
||||||
- {fileID: 0}
|
- {fileID: 0}
|
||||||
@@ -1285,17 +1285,17 @@ MonoBehaviour:
|
|||||||
isSelected: 0
|
isSelected: 0
|
||||||
nodeRect:
|
nodeRect:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 837
|
x: 840
|
||||||
y: 416
|
y: 415
|
||||||
width: 150
|
width: 150
|
||||||
height: 62
|
height: 62
|
||||||
positionRect: {x: 837, y: 416}
|
positionRect: {x: 840, y: 415}
|
||||||
rectWidth: 150
|
rectWidth: 150
|
||||||
editingName: 1
|
editingName: 1
|
||||||
nodeColor: {r: 1, g: 1, b: 1, a: 1}
|
nodeColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
resizeLeft: 0
|
resizeLeft: 0
|
||||||
resizeRight: 0
|
resizeRight: 0
|
||||||
inDrag: 1
|
inDrag: 0
|
||||||
resetCurrentDestination: 1
|
resetCurrentDestination: 1
|
||||||
transitions:
|
transitions:
|
||||||
- decisions: []
|
- decisions: []
|
||||||
@@ -1308,14 +1308,14 @@ MonoBehaviour:
|
|||||||
parentState: {fileID: 766956384951898899}
|
parentState: {fileID: 766956384951898899}
|
||||||
trueRect:
|
trueRect:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 827
|
x: 830
|
||||||
y: 446
|
y: 445
|
||||||
width: 10
|
width: 10
|
||||||
height: 10
|
height: 10
|
||||||
falseRect:
|
falseRect:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 987
|
x: 990
|
||||||
y: 456
|
y: 455
|
||||||
width: 10
|
width: 10
|
||||||
height: 10
|
height: 10
|
||||||
selectedTrue: 0
|
selectedTrue: 0
|
||||||
@@ -1464,14 +1464,14 @@ MonoBehaviour:
|
|||||||
m_Name: Combat
|
m_Name: Combat
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
description: FSM State
|
description: FSM State
|
||||||
selectedDecisionIndex: 2
|
selectedDecisionIndex: 0
|
||||||
canRemove: 1
|
canRemove: 1
|
||||||
canTranstTo: 1
|
canTranstTo: 1
|
||||||
canSetAsDefault: 1
|
canSetAsDefault: 1
|
||||||
canEditName: 1
|
canEditName: 1
|
||||||
canEditColor: 1
|
canEditColor: 1
|
||||||
isOpen: 1
|
isOpen: 1
|
||||||
isSelected: 1
|
isSelected: 0
|
||||||
nodeRect:
|
nodeRect:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 307
|
x: 307
|
||||||
@@ -1490,7 +1490,7 @@ MonoBehaviour:
|
|||||||
- decisions:
|
- decisions:
|
||||||
- trueValue: 1
|
- trueValue: 1
|
||||||
decision: {fileID: 7927421991537792917}
|
decision: {fileID: 7927421991537792917}
|
||||||
isValid: 1
|
isValid: 0
|
||||||
validated: 0
|
validated: 0
|
||||||
trueState: {fileID: -2904979146780567904}
|
trueState: {fileID: -2904979146780567904}
|
||||||
falseState: {fileID: 0}
|
falseState: {fileID: 0}
|
||||||
@@ -1579,7 +1579,7 @@ MonoBehaviour:
|
|||||||
y: 760
|
y: 760
|
||||||
width: 10
|
width: 10
|
||||||
height: 10
|
height: 10
|
||||||
selectedTrue: 1
|
selectedTrue: 0
|
||||||
selectedFalse: 0
|
selectedFalse: 0
|
||||||
trueSideRight: 1
|
trueSideRight: 1
|
||||||
falseSideRight: 1
|
falseSideRight: 1
|
||||||
@@ -1713,20 +1713,20 @@ MonoBehaviour:
|
|||||||
canEditName: 1
|
canEditName: 1
|
||||||
canEditColor: 1
|
canEditColor: 1
|
||||||
isOpen: 1
|
isOpen: 1
|
||||||
isSelected: 0
|
isSelected: 1
|
||||||
nodeRect:
|
nodeRect:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 802
|
x: 840
|
||||||
y: 616
|
y: 625
|
||||||
width: 150
|
width: 150
|
||||||
height: 62
|
height: 62
|
||||||
positionRect: {x: 802, y: 616}
|
positionRect: {x: 840, y: 625}
|
||||||
rectWidth: 150
|
rectWidth: 150
|
||||||
editingName: 1
|
editingName: 1
|
||||||
nodeColor: {r: 1, g: 1, b: 1, a: 1}
|
nodeColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
resizeLeft: 0
|
resizeLeft: 0
|
||||||
resizeRight: 0
|
resizeRight: 0
|
||||||
inDrag: 1
|
inDrag: 0
|
||||||
resetCurrentDestination: 1
|
resetCurrentDestination: 1
|
||||||
transitions:
|
transitions:
|
||||||
- decisions: []
|
- decisions: []
|
||||||
@@ -1739,14 +1739,14 @@ MonoBehaviour:
|
|||||||
parentState: {fileID: 4162026404432437805}
|
parentState: {fileID: 4162026404432437805}
|
||||||
trueRect:
|
trueRect:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 792
|
x: 830
|
||||||
y: 646
|
y: 655
|
||||||
width: 10
|
width: 10
|
||||||
height: 10
|
height: 10
|
||||||
falseRect:
|
falseRect:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 952
|
x: 990
|
||||||
y: 656
|
y: 665
|
||||||
width: 10
|
width: 10
|
||||||
height: 10
|
height: 10
|
||||||
selectedTrue: 0
|
selectedTrue: 0
|
||||||
@@ -1912,17 +1912,17 @@ MonoBehaviour:
|
|||||||
isSelected: 0
|
isSelected: 0
|
||||||
nodeRect:
|
nodeRect:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 627
|
x: 845
|
||||||
y: 286
|
y: 225
|
||||||
width: 150
|
width: 150
|
||||||
height: 30
|
height: 30
|
||||||
positionRect: {x: 627, y: 286}
|
positionRect: {x: 845, y: 225}
|
||||||
rectWidth: 150
|
rectWidth: 150
|
||||||
editingName: 1
|
editingName: 1
|
||||||
nodeColor: {r: 1, g: 1, b: 1, a: 1}
|
nodeColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
resizeLeft: 0
|
resizeLeft: 0
|
||||||
resizeRight: 0
|
resizeRight: 0
|
||||||
inDrag: 1
|
inDrag: 0
|
||||||
resetCurrentDestination: 1
|
resetCurrentDestination: 1
|
||||||
transitions:
|
transitions:
|
||||||
- decisions: []
|
- decisions: []
|
||||||
@@ -1935,14 +1935,14 @@ MonoBehaviour:
|
|||||||
parentState: {fileID: 9112689765763526057}
|
parentState: {fileID: 9112689765763526057}
|
||||||
trueRect:
|
trueRect:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 702
|
x: 920
|
||||||
y: 301
|
y: 240
|
||||||
width: 0
|
width: 0
|
||||||
height: 0
|
height: 0
|
||||||
falseRect:
|
falseRect:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 702
|
x: 920
|
||||||
y: 301
|
y: 240
|
||||||
width: 0
|
width: 0
|
||||||
height: 0
|
height: 0
|
||||||
selectedTrue: 0
|
selectedTrue: 0
|
||||||
|
|||||||
1640
Assets/AI/FSM/FSM_Giant.asset
Normal file
1640
Assets/AI/FSM/FSM_Giant.asset
Normal file
File diff suppressed because it is too large
Load Diff
8
Assets/AI/FSM/FSM_Giant.asset.meta
Normal file
8
Assets/AI/FSM/FSM_Giant.asset.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 8a6b7d8e31ffda843b06eaa079b5ed5d
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
8
Assets/AI/Gigant.meta
Normal file
8
Assets/AI/Gigant.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b9f57b9ef3a51cd4285f9c4514b79802
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
5566
Assets/AI/Gigant/Giant.prefab
Normal file
5566
Assets/AI/Gigant/Giant.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/AI/Gigant/Giant.prefab.meta
Normal file
7
Assets/AI/Gigant/Giant.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 05db168aa73c6d7489b4930e8ac0f2ce
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
23
Assets/AI/Gigant/LookAtPlayerInitialization.cs
Normal file
23
Assets/AI/Gigant/LookAtPlayerInitialization.cs
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
using RootMotion.FinalIK;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class LookAtPlayerInitialization : MonoBehaviour
|
||||||
|
{
|
||||||
|
public LookAtIK lookAtIK;
|
||||||
|
public string playerTag = "Player";
|
||||||
|
private Transform player;
|
||||||
|
|
||||||
|
private void OnEnable()
|
||||||
|
{
|
||||||
|
GameObject playerObj = GameObject.FindGameObjectWithTag(playerTag);
|
||||||
|
if (playerObj != null)
|
||||||
|
{
|
||||||
|
player = playerObj.transform;
|
||||||
|
if (lookAtIK != null)
|
||||||
|
{
|
||||||
|
lookAtIK.solver.target = player;
|
||||||
|
lookAtIK.solver.IKPositionWeight = 1f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
2
Assets/AI/Gigant/LookAtPlayerInitialization.cs.meta
Normal file
2
Assets/AI/Gigant/LookAtPlayerInitialization.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 529e37587f83e4b4893a5814cd0cb915
|
||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user