Demon another fixes
This commit is contained in:
@@ -4968,7 +4968,7 @@ Transform:
|
|||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 4233265158678323538}
|
- {fileID: 4233265158678323538}
|
||||||
@@ -5079,7 +5079,7 @@ MonoBehaviour:
|
|||||||
playerTag: Player
|
playerTag: Player
|
||||||
damageInterval: 1
|
damageInterval: 1
|
||||||
damageSound: {fileID: 8300000, guid: 0af332725d9792840a4caa29e8991d08, type: 3}
|
damageSound: {fileID: 8300000, guid: 0af332725d9792840a4caa29e8991d08, type: 3}
|
||||||
damageEffect: {fileID: 1606542427775616, guid: 0de6da49dab6f8b4d93ab32a4cb441af,
|
damageEffect: {fileID: 1606542427775616, guid: 46d02fdac1ac803448b2bf72bc2a732d,
|
||||||
type: 3}
|
type: 3}
|
||||||
enableDebug: 0
|
enableDebug: 0
|
||||||
--- !u!1 &5185508652979790054
|
--- !u!1 &5185508652979790054
|
||||||
|
|||||||
@@ -9640,7 +9640,7 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
targetTag: Player
|
targetTag: Player
|
||||||
targetHeightOffset: 1
|
targetHeightOffset: 1
|
||||||
speed: 6
|
speed: 7
|
||||||
lockTime: 0.5
|
lockTime: 0.5
|
||||||
maxLifeTime: 60
|
maxLifeTime: 60
|
||||||
arrivalTolerance: 0.25
|
arrivalTolerance: 0.25
|
||||||
|
|||||||
@@ -4786,7 +4786,7 @@ Transform:
|
|||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_LocalPosition: {x: 0, y: 1, z: 0}
|
m_LocalPosition: {x: 0, y: 1, z: 0}
|
||||||
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
|
m_LocalScale: {x: 0.25, y: 0.25, z: 0.25}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 4577187839491108}
|
- {fileID: 4577187839491108}
|
||||||
@@ -9623,7 +9623,7 @@ CapsuleCollider:
|
|||||||
m_ProvidesContacts: 0
|
m_ProvidesContacts: 0
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Radius: 0.5
|
m_Radius: 0.25
|
||||||
m_Height: 0.1
|
m_Height: 0.1
|
||||||
m_Direction: 1
|
m_Direction: 1
|
||||||
m_Center: {x: 0.31801516, y: 0, z: 0}
|
m_Center: {x: 0.31801516, y: 0, z: 0}
|
||||||
@@ -9641,19 +9641,18 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
useOverrideImpactPoint: 0
|
useOverrideImpactPoint: 0
|
||||||
overrideImpactPoint: {x: 0, y: 0, z: 0}
|
overrideImpactPoint: {x: 0, y: 0, z: 0}
|
||||||
|
targetTag: Player
|
||||||
|
targetHeightOffset: 1
|
||||||
snapImpactToGround: 1
|
snapImpactToGround: 1
|
||||||
groundMask:
|
groundMask:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Bits: 1410334711
|
m_Bits: 1410334711
|
||||||
groundSnapRayStart: 3
|
currentTargetPoint: {x: 0, y: 0, z: 0}
|
||||||
groundSnapRayLength: 30
|
speed: 15
|
||||||
impactPoint: {x: 0, y: 0, z: 0}
|
trackingTime: 1.5
|
||||||
speed: 30
|
|
||||||
gravityLikePull: 14
|
|
||||||
spawnHeightAboveTarget: 12
|
|
||||||
arriveEpsilon: 0.35
|
arriveEpsilon: 0.35
|
||||||
maxLifetime: 30
|
maxLifetime: 30
|
||||||
traceRadius: 0.45
|
collisionRadius: 0.8
|
||||||
stopOnLayers:
|
stopOnLayers:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Bits: 1410334711
|
m_Bits: 1410334711
|
||||||
@@ -9661,9 +9660,9 @@ MonoBehaviour:
|
|||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Bits: 1410334711
|
m_Bits: 1410334711
|
||||||
explosionRadius: 5
|
explosionRadius: 5
|
||||||
damage: 40
|
damage: 10
|
||||||
knockbackForce: 5
|
knockbackForce: 5
|
||||||
impactVfxPrefab: {fileID: 1606542427775616, guid: 0de6da49dab6f8b4d93ab32a4cb441af,
|
impactVfxPrefab: {fileID: 1031498901634068, guid: 0ff49e2dd236f364ab8b6ece0a44d04a,
|
||||||
type: 3}
|
type: 3}
|
||||||
onSpawn:
|
onSpawn:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
@@ -9671,6 +9670,7 @@ MonoBehaviour:
|
|||||||
onImpact:
|
onImpact:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
|
enableDebug: 0
|
||||||
--- !u!1001 &833113254389578807
|
--- !u!1001 &833113254389578807
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -130,11 +130,11 @@ MonoBehaviour:
|
|||||||
muzzle: {fileID: 8411050209285398990}
|
muzzle: {fileID: 8411050209285398990}
|
||||||
fireballPrefab: {fileID: 1947871717301538, guid: 9591667a35466484096c6e63785e136c,
|
fireballPrefab: {fileID: 1947871717301538, guid: 9591667a35466484096c6e63785e136c,
|
||||||
type: 3}
|
type: 3}
|
||||||
fireRate: 5
|
fireRate: 6
|
||||||
maxShots: 10
|
maxShots: 10
|
||||||
despawnDelay: 10
|
despawnDelay: 10
|
||||||
initialStaggerRange: {x: 0, y: 0.6}
|
initialStaggerRange: {x: 0, y: 0.6}
|
||||||
fireRateJitter: 0.5
|
fireRateJitter: 5
|
||||||
aimJitterDegrees: 0
|
aimJitterDegrees: 0
|
||||||
turnSpeed: 0
|
turnSpeed: 0
|
||||||
idleSpinSpeed: 0
|
idleSpinSpeed: 0
|
||||||
@@ -143,7 +143,8 @@ MonoBehaviour:
|
|||||||
playerTag: Player
|
playerTag: Player
|
||||||
maxShootingRange: 50
|
maxShootingRange: 50
|
||||||
useShootEffects: 1
|
useShootEffects: 1
|
||||||
muzzleFlashPrefab: {fileID: 0}
|
muzzleFlashPrefab: {fileID: 1514282284419572, guid: ad259b29cbefa54479b68c8a4960565a,
|
||||||
|
type: 3}
|
||||||
shootSound: {fileID: 8300000, guid: f58578c3593cfcd40a4b21417e49421a, type: 3}
|
shootSound: {fileID: 8300000, guid: f58578c3593cfcd40a4b21417e49421a, type: 3}
|
||||||
enableDebug: 1
|
enableDebug: 1
|
||||||
showGizmos: 1
|
showGizmos: 1
|
||||||
|
|||||||
@@ -625,7 +625,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}
|
||||||
@@ -868,11 +868,11 @@ MonoBehaviour:
|
|||||||
- decisions:
|
- decisions:
|
||||||
- trueValue: 1
|
- trueValue: 1
|
||||||
decision: {fileID: 4031404829621142413}
|
decision: {fileID: 4031404829621142413}
|
||||||
isValid: 0
|
isValid: 1
|
||||||
validated: 0
|
validated: 0
|
||||||
- trueValue: 1
|
- trueValue: 1
|
||||||
decision: {fileID: -2866484833343459521}
|
decision: {fileID: -2866484833343459521}
|
||||||
isValid: 0
|
isValid: 1
|
||||||
validated: 0
|
validated: 0
|
||||||
trueState: {fileID: 2986668563461644515}
|
trueState: {fileID: 2986668563461644515}
|
||||||
falseState: {fileID: 0}
|
falseState: {fileID: 0}
|
||||||
@@ -904,7 +904,7 @@ MonoBehaviour:
|
|||||||
- decisions:
|
- decisions:
|
||||||
- trueValue: 0
|
- trueValue: 0
|
||||||
decision: {fileID: 4031404829621142413}
|
decision: {fileID: 4031404829621142413}
|
||||||
isValid: 1
|
isValid: 0
|
||||||
validated: 0
|
validated: 0
|
||||||
trueState: {fileID: -2904979146780567904}
|
trueState: {fileID: -2904979146780567904}
|
||||||
falseState: {fileID: 0}
|
falseState: {fileID: 0}
|
||||||
@@ -936,16 +936,16 @@ MonoBehaviour:
|
|||||||
- decisions:
|
- decisions:
|
||||||
- trueValue: 1
|
- trueValue: 1
|
||||||
decision: {fileID: 4031404829621142413}
|
decision: {fileID: 4031404829621142413}
|
||||||
isValid: 0
|
|
||||||
validated: 0
|
|
||||||
- trueValue: 0
|
|
||||||
decision: {fileID: -2866484833343459521}
|
|
||||||
isValid: 1
|
isValid: 1
|
||||||
validated: 0
|
validated: 0
|
||||||
- trueValue: 0
|
- trueValue: 0
|
||||||
decision: {fileID: 7927421991537792917}
|
decision: {fileID: -2866484833343459521}
|
||||||
isValid: 0
|
isValid: 0
|
||||||
validated: 0
|
validated: 0
|
||||||
|
- trueValue: 0
|
||||||
|
decision: {fileID: 7927421991537792917}
|
||||||
|
isValid: 1
|
||||||
|
validated: 0
|
||||||
trueState: {fileID: -6144582714324757854}
|
trueState: {fileID: -6144582714324757854}
|
||||||
falseState: {fileID: 0}
|
falseState: {fileID: 0}
|
||||||
muteTrue: 0
|
muteTrue: 0
|
||||||
@@ -976,11 +976,11 @@ MonoBehaviour:
|
|||||||
- decisions:
|
- decisions:
|
||||||
- trueValue: 1
|
- trueValue: 1
|
||||||
decision: {fileID: -3690511210373239573}
|
decision: {fileID: -3690511210373239573}
|
||||||
isValid: 0
|
isValid: 1
|
||||||
validated: 0
|
validated: 0
|
||||||
- trueValue: 0
|
- trueValue: 0
|
||||||
decision: {fileID: 7927421991537792917}
|
decision: {fileID: 7927421991537792917}
|
||||||
isValid: 0
|
isValid: 1
|
||||||
validated: 0
|
validated: 0
|
||||||
trueState: {fileID: 0}
|
trueState: {fileID: 0}
|
||||||
falseState: {fileID: 0}
|
falseState: {fileID: 0}
|
||||||
@@ -1012,7 +1012,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}
|
||||||
@@ -1427,14 +1427,14 @@ MonoBehaviour:
|
|||||||
m_Name: Combat
|
m_Name: Combat
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
description: FSM State
|
description: FSM State
|
||||||
selectedDecisionIndex: 4
|
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: 635
|
x: 635
|
||||||
@@ -1593,7 +1593,7 @@ MonoBehaviour:
|
|||||||
validated: 0
|
validated: 0
|
||||||
- trueValue: 1
|
- trueValue: 1
|
||||||
decision: {fileID: 2998305265418220943}
|
decision: {fileID: 2998305265418220943}
|
||||||
isValid: 0
|
isValid: 1
|
||||||
validated: 0
|
validated: 0
|
||||||
trueState: {fileID: 4162026404432437805}
|
trueState: {fileID: 4162026404432437805}
|
||||||
falseState: {fileID: 0}
|
falseState: {fileID: 0}
|
||||||
@@ -1614,7 +1614,7 @@ MonoBehaviour:
|
|||||||
y: 783
|
y: 783
|
||||||
width: 10
|
width: 10
|
||||||
height: 10
|
height: 10
|
||||||
selectedTrue: 1
|
selectedTrue: 0
|
||||||
selectedFalse: 0
|
selectedFalse: 0
|
||||||
trueSideRight: 1
|
trueSideRight: 1
|
||||||
falseSideRight: 1
|
falseSideRight: 1
|
||||||
|
|||||||
@@ -2,21 +2,30 @@
|
|||||||
%TAG !u! tag:unity3d.com,2011:
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
--- !u!21 &2100000
|
--- !u!21 &2100000
|
||||||
Material:
|
Material:
|
||||||
serializedVersion: 6
|
serializedVersion: 8
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: FireFlow
|
m_Name: FireFlow
|
||||||
m_Shader: {fileID: 4800000, guid: 4775e5a8f344d6348adf934e722da85d, type: 3}
|
m_Shader: {fileID: 4800000, guid: 4775e5a8f344d6348adf934e722da85d, type: 3}
|
||||||
m_ShaderKeywords: BlendAdd Clip_ON FrameBlend_OFF FresnelFade_OFF SoftParticles_ON
|
m_Parent: {fileID: 0}
|
||||||
VertLight_OFF
|
m_ModifiedSerializedProperties: 0
|
||||||
|
m_ValidKeywords:
|
||||||
|
- BlendAdd
|
||||||
|
- Clip_ON
|
||||||
|
- FrameBlend_OFF
|
||||||
|
- FresnelFade_OFF
|
||||||
|
- SoftParticles_ON
|
||||||
|
- VertLight_OFF
|
||||||
|
m_InvalidKeywords: []
|
||||||
m_LightmapFlags: 1
|
m_LightmapFlags: 1
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 0
|
m_DoubleSidedGI: 0
|
||||||
m_CustomRenderQueue: -1
|
m_CustomRenderQueue: -1
|
||||||
stringTagMap: {}
|
stringTagMap: {}
|
||||||
disabledShaderPasses: []
|
disabledShaderPasses: []
|
||||||
|
m_LockedProperties:
|
||||||
m_SavedProperties:
|
m_SavedProperties:
|
||||||
serializedVersion: 3
|
serializedVersion: 3
|
||||||
m_TexEnvs:
|
m_TexEnvs:
|
||||||
@@ -56,6 +65,7 @@ Material:
|
|||||||
m_Texture: {fileID: 0}
|
m_Texture: {fileID: 0}
|
||||||
m_Scale: {x: 1, y: 1}
|
m_Scale: {x: 1, y: 1}
|
||||||
m_Offset: {x: 0, y: 0}
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Ints: []
|
||||||
m_Floats:
|
m_Floats:
|
||||||
- CullMode: 0
|
- CullMode: 0
|
||||||
- DstMode: 1
|
- DstMode: 1
|
||||||
@@ -83,3 +93,5 @@ Material:
|
|||||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _TintColor: {r: 2.9056604, g: 0.95813847, b: 0.06852972, a: 0.437}
|
- _TintColor: {r: 2.9056604, g: 0.95813847, b: 0.06852972, a: 0.437}
|
||||||
|
m_BuildTextureStacks: []
|
||||||
|
m_AllowLocking: 1
|
||||||
|
|||||||
Reference in New Issue
Block a user