Merge remote-tracking branch 'origin/NewStory' into NewStory

Assets/AI/FSM/FSM_Demon.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 935bb9a413d880c43895582c99ef16ad
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/AI/GhostDemon.prefab

@@ -1131,7 +1131,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   openCloseEvents: 0
   openCloseWindow: 1
-  selectedToolbar: 12
+  selectedToolbar: 5
   _isDead: 0
   _currentHealth: 225
   isImmortal: 0
@@ -1229,7 +1229,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   disableControllerOnStart: 0
-  currentSpeed: 2
+  currentSpeed: 1
   animatorSpeed: 1
   inputMagnitudeSmooth: 0.2
   useRootMotion: 0
@@ -1349,7 +1349,7 @@ MonoBehaviour:
   _minAttackCount: 1
   _maxAttackCount: 3
   _attackDistance: 3
-  _combatBlockingChance: 25.6
+  _combatBlockingChance: 0
   _onDamageBlockingChance: 0
   _minStayBlockingTime: 4
   _maxStayBlockingTime: 6
@@ -1438,6 +1438,7 @@ MonoBehaviour:
     reaction_id: 0
     damageType: 
     force: {x: 0, y: 0, z: 0}
+    ignoreAllHitEffects: 0
   hitProperties:
     hitDamageTags:
     - Enemy
@@ -1501,10 +1502,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e9fb374bd0aad974e9798f071eb5ecb8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  openCloseEvents: 0
+  openCloseEvents: 1
   openCloseWindow: 1
   selectedToolbar: 0
-  _fsmBehaviour: {fileID: 11400000, guid: 993b0aef9d70a0f4dae3472d750a9c8a, type: 2}
+  _fsmBehaviour: {fileID: 11400000, guid: 935bb9a413d880c43895582c99ef16ad, type: 2}
   _stop: 0
   _debugMode: 0
   onStartFSM:
@@ -2606,6 +2607,7 @@ MonoBehaviour:
     reaction_id: 0
     damageType: 
     force: {x: 0, y: 0, z: 0}
+    ignoreAllHitEffects: 0
   minDamage:
     damageValue: 15
     staminaBlockCost: 5
@@ -2621,6 +2623,7 @@ MonoBehaviour:
     reaction_id: 0
     damageType: 
     force: {x: 0, y: 0, z: 0}
+    ignoreAllHitEffects: 0
   maxDamage:
     damageValue: 15
     staminaBlockCost: 5
@@ -2636,6 +2639,7 @@ MonoBehaviour:
     reaction_id: 0
     damageType: 
     force: {x: 0, y: 0, z: 0}
+    ignoreAllHitEffects: 0
   overrideDamageSender: {fileID: 0}
   hitBoxes:
   - {fileID: 5362143544003886228}
@@ -2973,6 +2977,7 @@ MonoBehaviour:
     reaction_id: 0
     damageType: 
     force: {x: 0, y: 0, z: 0}
+    ignoreAllHitEffects: 0
   minDamage:
     damageValue: 25
     staminaBlockCost: 5
@@ -2988,6 +2993,7 @@ MonoBehaviour:
     reaction_id: 0
     damageType: 
     force: {x: 0, y: 0, z: 0}
+    ignoreAllHitEffects: 0
   maxDamage:
     damageValue: 20
     staminaBlockCost: 5
@@ -3003,6 +3009,7 @@ MonoBehaviour:
     reaction_id: 0
     damageType: 
     force: {x: 0, y: 0, z: 0}
+    ignoreAllHitEffects: 0
   overrideDamageSender: {fileID: 0}
   hitBoxes:
   - {fileID: 4655517810601481317}
@@ -3467,6 +3474,7 @@ MonoBehaviour:
     reaction_id: 0
     damageType: 
     force: {x: 0, y: 0, z: 0}
+    ignoreAllHitEffects: 0
   minDamage:
     damageValue: 15
     staminaBlockCost: 5
@@ -3482,6 +3490,7 @@ MonoBehaviour:
     reaction_id: 0
     damageType: 
     force: {x: 0, y: 0, z: 0}
+    ignoreAllHitEffects: 0
   maxDamage:
     damageValue: 25
     staminaBlockCost: 5
@@ -3497,6 +3506,7 @@ MonoBehaviour:
     reaction_id: 0
     damageType: 
     force: {x: 0, y: 0, z: 0}
+    ignoreAllHitEffects: 0
   overrideDamageSender: {fileID: 0}
   hitBoxes:
   - {fileID: 7703211540812842878}
@@ -4548,7 +4558,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &7395938186809571986
 Transform:
   m_ObjectHideFlags: 0
@@ -4597,6 +4607,7 @@ MonoBehaviour:
     reaction_id: 0
     damageType: 
     force: {x: 0, y: 0, z: 0}
+    ignoreAllHitEffects: 0
   minDamage:
     damageValue: 15
     staminaBlockCost: 5
@@ -4612,6 +4623,7 @@ MonoBehaviour:
     reaction_id: 0
     damageType: 
     force: {x: 0, y: 0, z: 0}
+    ignoreAllHitEffects: 0
   maxDamage:
     damageValue: 15
     staminaBlockCost: 5
@@ -4627,6 +4639,7 @@ MonoBehaviour:
     reaction_id: 0
     damageType: 
     force: {x: 0, y: 0, z: 0}
+    ignoreAllHitEffects: 0
   overrideDamageSender: {fileID: 0}
   hitBoxes:
   - {fileID: 3822061495319371584}
@@ -7035,6 +7048,7 @@ MonoBehaviour:
     reaction_id: 0
     damageType: 
     force: {x: 0, y: 0, z: 0}
+    ignoreAllHitEffects: 0
   minDamage:
     damageValue: 15
     staminaBlockCost: 5
@@ -7050,6 +7064,7 @@ MonoBehaviour:
     reaction_id: 0
     damageType: 
     force: {x: 0, y: 0, z: 0}
+    ignoreAllHitEffects: 0
   maxDamage:
     damageValue: 15
     staminaBlockCost: 5
@@ -7065,6 +7080,7 @@ MonoBehaviour:
     reaction_id: 0
     damageType: 
     force: {x: 0, y: 0, z: 0}
+    ignoreAllHitEffects: 0
   overrideDamageSender: {fileID: 0}
   hitBoxes:
   - {fileID: 6201576030831472258}
@@ -7335,6 +7351,7 @@ MonoBehaviour:
     reaction_id: 0
     damageType: 
     force: {x: 0, y: 0, z: 0}
+    ignoreAllHitEffects: 0
   minDamage:
     damageValue: 15
     staminaBlockCost: 5
@@ -7350,6 +7367,7 @@ MonoBehaviour:
     reaction_id: 0
     damageType: 
     force: {x: 0, y: 0, z: 0}
+    ignoreAllHitEffects: 0
   maxDamage:
     damageValue: 15
     staminaBlockCost: 5
@@ -7365,6 +7383,7 @@ MonoBehaviour:
     reaction_id: 0
     damageType: 
     force: {x: 0, y: 0, z: 0}
+    ignoreAllHitEffects: 0
   overrideDamageSender: {fileID: 0}
   hitBoxes:
   - {fileID: 3632722909168515802}