Compare commits

..

No commits in common. "b80c9d960f982c8639c0b210c3c66f1f727fd508" and "32459bec810a13a35fc3ef8100740479c2981e9d" have entirely different histories.

31 changed files with 240 additions and 1159 deletions

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6833538753401515138
--- !u!1 &6232425507328955236
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -8,10 +8,10 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4735696322134991437}
- component: {fileID: 2776254023051504893}
- component: {fileID: 2851877176569532699}
- component: {fileID: 4288064990526774250}
- component: {fileID: 81829978540419969}
- component: {fileID: 3789424986669542967}
- component: {fileID: 3270777934385952829}
- component: {fileID: 3979768280741324332}
m_Layer: 0
m_Name: DamageText
m_TagString: Untagged
@ -19,32 +19,32 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4735696322134991437
--- !u!224 &81829978540419969
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6833538753401515138}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_GameObject: {fileID: 6232425507328955236}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3288169701052299107}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -0.72}
m_SizeDelta: {x: 3, y: 2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!23 &2776254023051504893
--- !u!23 &3789424986669542967
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6833538753401515138}
m_GameObject: {fileID: 6232425507328955236}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
@ -80,13 +80,13 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &2851877176569532699
--- !u!114 &3270777934385952829
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6833538753401515138}
m_GameObject: {fileID: 6232425507328955236}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
@ -109,8 +109,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
rgba: 4279085303
m_fontColor: {r: 0.9685534, g: 0.6569338, b: 0.051777944, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@ -127,8 +127,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 8
m_fontSizeBase: 8
m_fontSize: 5
m_fontSizeBase: 5
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@ -170,15 +170,15 @@ MonoBehaviour:
_SortingLayerID: 0
_SortingOrder: 0
m_hasFontAssetChanged: 0
m_renderer: {fileID: 2776254023051504893}
m_renderer: {fileID: 3789424986669542967}
m_maskType: 0
--- !u!111 &4288064990526774250
--- !u!111 &3979768280741324332
Animation:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6833538753401515138}
m_GameObject: {fileID: 6232425507328955236}
m_Enabled: 1
serializedVersion: 3
m_Animation: {fileID: 7400000, guid: a6deca1a46fd10e4c966a1a58f998693, type: 2}
@ -188,78 +188,3 @@ Animation:
m_PlayAutomatically: 1
m_AnimatePhysics: 0
m_CullingType: 0
--- !u!1 &8357464303304312906
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3288169701052299107}
- component: {fileID: 2241243433806884705}
m_Layer: 0
m_Name: DamageText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3288169701052299107
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8357464303304312906}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4735696322134991437}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2241243433806884705
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8357464303304312906}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 01c9b525ae607a844848c8e44062a0f1, type: 3}
m_Name:
m_EditorClassIdentifier:
damageToSize:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 1
value: 1
inSlope: 0.011841985
outSlope: 0.011841985
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 1
- serializedVersion: 3
time: 250
value: 2
inSlope: 0.004031593
outSlope: 0.004031593
tangentMode: 0
weightedMode: 0
inWeight: 0.9989648
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
damageText: {fileID: 2851877176569532699}
normalColor: {r: 0.90943396, g: 0.90943396, b: 0.90943396, a: 1}
critColor: {r: 1, g: 0.63425434, b: 0.2245282, a: 1}
superCritColor: {r: 1, g: 0.103773475, b: 0.103773475, a: 1}
critThreshold: 25
superCritThreshold: 65

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 25c9a2db8fc5b7c4f8feebba5c73e7a3
guid: 9ac131fe76b864945a3aeb678a16f786
PrefabImporter:
externalObjects: {}
userData:

View File

@ -255,7 +255,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
maxHealth: 100
damageTickDelay: 1
OnHealthZero:
m_PersistentCalls:
m_Calls: []
@ -277,7 +276,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
maxHealth: 100
damageTickDelay: 0.25
OnHealthZero:
m_PersistentCalls:
m_Calls: []

View File

@ -2050,7 +2050,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 204031495618622841, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 205003529639557450, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
@ -2074,7 +2074,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 345417292443196300, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 370379603216613205, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_LocalPosition.z
@ -2082,7 +2082,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 420829549692533854, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 423948292859570140, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_LocalPosition.z
@ -2102,7 +2102,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 474291289778153799, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 518040811897931976, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_LocalPosition.z
@ -2206,15 +2206,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1188296123961061510, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1226867100941618726, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1248117058607517531, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1286736717778752383, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_LocalPosition.z
@ -2222,7 +2222,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1306166309550745882, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1312114729465446570, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_LocalPosition.z
@ -2230,7 +2230,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1314348416967425078, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1316546630264019081, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_LocalPosition.z
@ -2434,7 +2434,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2688326620934178760, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2701565387734408324, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
@ -2458,11 +2458,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2777376881448082900, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2843470166969266601, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2882933229648693303, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_LocalPosition.z
@ -2470,7 +2470,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2920273978197248707, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2942913567265352935, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
@ -2490,7 +2490,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2993179368871176222, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2999611508190862279, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_LocalPosition.z
@ -2506,7 +2506,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3041378549263182524, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3074571989939982763, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_LocalPosition.z
@ -2550,7 +2550,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3462066938274630491, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3477295116748343974, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
@ -2630,7 +2630,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3950474771491911942, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3959017408888877880, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_LocalPosition.z
@ -2690,7 +2690,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4383944590839174126, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4416801612616111028, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_LocalPosition.z
@ -2866,7 +2866,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5986174645587177288, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5986486668447781465, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
@ -2942,7 +2942,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6472418518271119051, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6492360292806616209, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_LocalPosition.z
@ -3014,7 +3014,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6666471973930886002, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6666663905502249404, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
@ -3062,7 +3062,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6906933915959314052, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6910653825163457375, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_LocalPosition.z
@ -3070,7 +3070,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6962854702719475454, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7023027171542066455, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
@ -3134,7 +3134,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7431070287896591984, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7611708547693650912, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_LocalScale.x
@ -3222,11 +3222,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8355842165208611031, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8412560244844067422, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8445413365583107412, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
@ -3278,7 +3278,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8563970499245821802, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8564553704292495912, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
@ -3294,7 +3294,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8658297059646015289, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8731356196972858425, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_LocalPosition.z
@ -3322,7 +3322,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8909691919785108070, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8976660235134063690, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
@ -3370,7 +3370,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 9173635054939707328, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9218726293146434581, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3}
propertyPath: m_SortingOrder
@ -3503,55 +3503,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1872712129
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1872712131}
- component: {fileID: 1872712130}
m_Layer: 0
m_Name: Global Volume
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1872712130
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1872712129}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IsGlobal: 1
priority: 0
blendDistance: 0
weight: 1
sharedProfile: {fileID: 11400000, guid: 0cb6fa1e190e2e644bac08f738221576, type: 2}
--- !u!4 &1872712131
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1872712129}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -29.321201, y: 34.399323, z: -10.897489}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1920006246
GameObject:
m_ObjectHideFlags: 0
@ -3960,10 +3911,6 @@ PrefabInstance:
propertyPath: difficultyIncreasePerWave
value: 3
objectReference: {fileID: 0}
- target: {fileID: 5510899577631708383, guid: c53e6971c95afb1429cd82616a7b6737, type: 3}
propertyPath: m_RenderPostProcessing
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5959206239141280122, guid: c53e6971c95afb1429cd82616a7b6737, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@ -4011,81 +3958,8 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 2173372557174057003, guid: c53e6971c95afb1429cd82616a7b6737, type: 3}
insertIndex: -1
addedObject: {fileID: 5796191506433166636}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c53e6971c95afb1429cd82616a7b6737, type: 3}
--- !u!4 &5796191506433166634 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8946450710138871461, guid: c53e6971c95afb1429cd82616a7b6737, type: 3}
m_PrefabInstance: {fileID: 5796191506433166633}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5796191506433166635 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2173372557174057003, guid: c53e6971c95afb1429cd82616a7b6737, type: 3}
m_PrefabInstance: {fileID: 5796191506433166633}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5796191506433166636
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5796191506433166635}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3}
m_Name:
m_EditorClassIdentifier:
volumeTrigger: {fileID: 5796191506433166634}
volumeLayer:
serializedVersion: 2
m_Bits: 257
stopNaNPropagation: 1
finalBlitToCameraTarget: 0
antialiasingMode: 0
temporalAntialiasing:
jitterSpread: 0.75
sharpness: 0.25
stationaryBlending: 0.95
motionBlending: 0.85
subpixelMorphologicalAntialiasing:
quality: 2
fastApproximateAntialiasing:
fastMode: 0
keepAlpha: 0
fog:
enabled: 1
excludeSkybox: 1
debugLayer:
lightMeter:
width: 512
height: 256
showCurves: 1
histogram:
width: 512
height: 256
channel: 3
waveform:
exposure: 0.12
height: 256
vectorscope:
size: 256
exposure: 0.12
overlaySettings:
linearDepth: 0
motionColorIntensity: 4
motionGridSize: 64
colorBlindnessType: 0
colorBlindnessStrength: 1
m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2}
m_ShowToolkit: 0
m_ShowCustomSorter: 0
breakBeforeColorGrading: 0
m_BeforeTransparentBundles: []
m_BeforeStackBundles: []
m_AfterStackBundles: []
--- !u!1001 &7693964683212020007
PrefabInstance:
m_ObjectHideFlags: 0
@ -4094,13 +3968,25 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 480860136}
m_Modifications:
- target: {fileID: 1542618083108825186, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
propertyPath: m_SortingOrder
value: -6
objectReference: {fileID: 0}
- target: {fileID: 1675897312316268218, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
propertyPath: m_Name
value: Ground
objectReference: {fileID: 0}
- target: {fileID: 2304728685345815097, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
propertyPath: m_SortingOrder
value: -6
objectReference: {fileID: 0}
- target: {fileID: 2860439650859292841, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
propertyPath: m_SortingOrder
value: -6
objectReference: {fileID: 0}
- target: {fileID: 3862814901187971034, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: -0.1
objectReference: {fileID: 0}
- target: {fileID: 3862814901187971034, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
propertyPath: m_LocalPosition.y
@ -4138,6 +4024,26 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4095421378541226841, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
propertyPath: m_SortingOrder
value: -6
objectReference: {fileID: 0}
- target: {fileID: 6295918847461186183, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
propertyPath: m_SortingOrder
value: -6
objectReference: {fileID: 0}
- target: {fileID: 6548708967788885172, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
propertyPath: m_SortingOrder
value: -10
objectReference: {fileID: 0}
- target: {fileID: 6971216474781649168, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
propertyPath: m_SortingOrder
value: -6
objectReference: {fileID: 0}
- target: {fileID: 8733470461950675567, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3}
propertyPath: m_SortingOrder
value: -6
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@ -4158,4 +4064,3 @@ SceneRoots:
- {fileID: 1920006249}
- {fileID: 640312360}
- {fileID: 5796191506433166633}
- {fileID: 1872712131}

View File

@ -1,128 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-2493184489784738468
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 29fa0085f50d5e54f8144f766051a691, type: 3}
m_Name: FilmGrain
m_EditorClassIdentifier:
active: 1
type:
m_OverrideState: 1
m_Value: 1
intensity:
m_OverrideState: 1
m_Value: 0.395
response:
m_OverrideState: 1
m_Value: 0.447
texture:
m_OverrideState: 0
m_Value: {fileID: 0}
--- !u!114 &-1052890134610867556
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 899c54efeace73346a0a16faa3afe726, type: 3}
m_Name: Vignette
m_EditorClassIdentifier:
active: 1
color:
m_OverrideState: 0
m_Value: {r: 0, g: 0, b: 0, a: 1}
center:
m_OverrideState: 0
m_Value: {x: 0.5, y: 0.5}
intensity:
m_OverrideState: 1
m_Value: 0.476
smoothness:
m_OverrideState: 1
m_Value: 0.277
rounded:
m_OverrideState: 0
m_Value: 0
--- !u!114 &-379716082122525167
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 81180773991d8724ab7f2d216912b564, type: 3}
m_Name: ChromaticAberration
m_EditorClassIdentifier:
active: 1
intensity:
m_OverrideState: 1
m_Value: 0.137
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3}
m_Name: Global Volume Profile
m_EditorClassIdentifier:
components:
- {fileID: -2493184489784738468}
- {fileID: -1052890134610867556}
- {fileID: -379716082122525167}
- {fileID: 2524404208659327059}
--- !u!114 &2524404208659327059
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 97c23e3b12dc18c42a140437e53d3951, type: 3}
m_Name: Tonemapping
m_EditorClassIdentifier:
active: 1
mode:
m_OverrideState: 1
m_Value: 2
neutralHDRRangeReductionMode:
m_OverrideState: 0
m_Value: 2
acesPreset:
m_OverrideState: 0
m_Value: 3
hueShiftAmount:
m_OverrideState: 0
m_Value: 0
detectPaperWhite:
m_OverrideState: 0
m_Value: 0
paperWhite:
m_OverrideState: 0
m_Value: 300
detectBrightnessLimits:
m_OverrideState: 0
m_Value: 1
minNits:
m_OverrideState: 0
m_Value: 0.005
maxNits:
m_OverrideState: 0
m_Value: 1000

View File

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

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 13cd922737913404080f1cc13599e3f1
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,63 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8e6292b2c06870d4495f009f912b9600, type: 3}
m_Name: Post Processing Volume Profile
m_EditorClassIdentifier:
settings:
- {fileID: 5937522557361361303}
--- !u!114 &5937522557361361303
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 48a79b01ea5641d4aa6daa2e23605641, type: 3}
m_Name: Bloom
m_EditorClassIdentifier:
active: 1
enabled:
overrideState: 1
value: 1
intensity:
overrideState: 1
value: 3.39
threshold:
overrideState: 1
value: 1
softKnee:
overrideState: 1
value: 0.5
clamp:
overrideState: 1
value: 65472
diffusion:
overrideState: 1
value: 7
anamorphicRatio:
overrideState: 1
value: 0
color:
overrideState: 1
value: {r: 1, g: 1, b: 1, a: 1}
fastMode:
overrideState: 1
value: 0
dirtTexture:
overrideState: 1
value: {fileID: 0}
defaultState: 1
dirtIntensity:
overrideState: 1
value: 0

View File

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

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: ac6bed77f0858184d9dd126801214b90
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1782,7 +1782,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.654902}
m_Color: {r: 1, g: 1, b: 1, a: 0.4392157}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@ -1876,55 +1876,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1965053550}
m_CullTransparentMesh: 1
--- !u!1 &2057478378
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2057478380}
- component: {fileID: 2057478379}
m_Layer: 0
m_Name: Global Volume
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &2057478379
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2057478378}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IsGlobal: 1
priority: 0
blendDistance: 0
weight: 1
sharedProfile: {fileID: 11400000, guid: 0cb6fa1e190e2e644bac08f738221576, type: 2}
--- !u!4 &2057478380
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2057478378}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -29.321201, y: 34.399323, z: -10.897489}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2131390919
GameObject:
m_ObjectHideFlags: 0
@ -2033,8 +1984,8 @@ Camera:
m_GameObject: {fileID: 2132464280}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 2
m_BackGroundColor: {r: 0.6749732, g: 0.76468486, b: 0.9056604, a: 0}
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
@ -2113,7 +2064,7 @@ MonoBehaviour:
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 1
m_RenderPostProcessing: 0
m_Antialiasing: 0
m_AntialiasingQuality: 2
m_StopNaN: 0
@ -2134,10 +2085,110 @@ MonoBehaviour:
mipBias: 0
varianceClampScale: 0.9
contrastAdaptiveSharpening: 0
--- !u!1001 &8480879688316675095
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_SizeDelta.x
value: 3
objectReference: {fileID: 0}
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_SizeDelta.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.72
objectReference: {fileID: 0}
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 81829978540419969, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6232425507328955236, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
propertyPath: m_Name
value: DamageText
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 6232425507328955236, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
insertIndex: -1
addedObject: {fileID: 0}
m_SourcePrefab: {fileID: 100100000, guid: 9ac131fe76b864945a3aeb678a16f786, type: 3}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 2132464283}
- {fileID: 1304688535}
- {fileID: 2057478380}
- {fileID: 8480879688316675095}

View File

@ -1,44 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3}
m_Name: Global Volume Profile
m_EditorClassIdentifier:
components:
- {fileID: 4674983090668690263}
--- !u!114 &4674983090668690263
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 899c54efeace73346a0a16faa3afe726, type: 3}
m_Name: Vignette
m_EditorClassIdentifier:
active: 1
color:
m_OverrideState: 1
m_Value: {r: 0, g: 0, b: 0, a: 1}
center:
m_OverrideState: 1
m_Value: {x: 0.5, y: 0.5}
intensity:
m_OverrideState: 1
m_Value: 0.272
smoothness:
m_OverrideState: 1
m_Value: 0.2
rounded:
m_OverrideState: 1
m_Value: 0

View File

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

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 1adc2c64c4020a940aeb0df032c2d8c4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,108 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8e6292b2c06870d4495f009f912b9600, type: 3}
m_Name: Post Processing Volume Profile
m_EditorClassIdentifier:
settings:
- {fileID: 3679975304052589660}
- {fileID: 1963728367029122665}
--- !u!114 &1963728367029122665
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 40b924e2dad56384a8df2a1e111bb675, type: 3}
m_Name: Vignette
m_EditorClassIdentifier:
active: 1
enabled:
overrideState: 1
value: 1
mode:
overrideState: 1
value: 0
color:
overrideState: 1
value: {r: 0, g: 0, b: 0, a: 1}
center:
overrideState: 1
value: {x: 0.5, y: 0.5}
intensity:
overrideState: 1
value: 0.65
smoothness:
overrideState: 1
value: 0.2
roundness:
overrideState: 1
value: 1
rounded:
overrideState: 1
value: 0
mask:
overrideState: 1
value: {fileID: 0}
defaultState: 1
opacity:
overrideState: 1
value: 1
--- !u!114 &3679975304052589660
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 48a79b01ea5641d4aa6daa2e23605641, type: 3}
m_Name: Bloom
m_EditorClassIdentifier:
active: 1
enabled:
overrideState: 1
value: 1
intensity:
overrideState: 1
value: 45.62
threshold:
overrideState: 1
value: 1.77
softKnee:
overrideState: 1
value: 0.5
clamp:
overrideState: 1
value: 65472.02
diffusion:
overrideState: 1
value: 7
anamorphicRatio:
overrideState: 1
value: 0
color:
overrideState: 0
value: {r: 1, g: 1, b: 1, a: 1}
fastMode:
overrideState: 0
value: 0
dirtTexture:
overrideState: 0
value: {fileID: 0}
defaultState: 1
dirtIntensity:
overrideState: 0
value: 0

View File

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

View File

@ -78,6 +78,6 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.8301887, g: 0.15299338, b: 0.13705936, a: 0.7372549}
- _Color: {r: 0.8301887, g: 0.15299344, b: 0.13705944, a: 0.4627451}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@ -1,15 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class DestroyAfter : MonoBehaviour
{
[SerializeField]
private float destroyInSeconds = 1.0f;
public void Init(float delay)
{
this.destroyInSeconds = delay;
Destroy(gameObject, delay);
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 612e58b28f1e9ab449b1bba4737e2dc2
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -22,9 +22,9 @@ public class HealthBar : MonoBehaviour
attachedHealth.OnHealthChange.RemoveListener(UpdateHealthBar);
}
private void UpdateHealthBar(float prevHealth, float newHealth)
private void UpdateHealthBar(int prevHealth, int newHealth)
{
float percent = newHealth / attachedHealth.getMaxHealth();
float percent = ((float) newHealth) / ((float)attachedHealth.getMaxHealth());
healthBarImg.fillAmount = percent;
}
}

View File

@ -1,23 +1,14 @@
using UnityEngine;
using UnityEngine.Events;
using TMPro;
using System;
using UnityUtils;
public class HealthComponent : MonoBehaviour, ISquezeDamageReceiver
{
[SerializeField] float maxHealth = 100;
[SerializeField] float damageTickDelay = 0.25f;
private float currentDamageTick = 0f;
private float accumulatedDamageInTick = 0f;
public float currentHealth { get; private set; }
public static event Action<Vector3, float> OnHealthChangeAtPos;
[SerializeField] int maxHealth = 100;
public int currentHealth { get; private set; }
public UnityEvent OnHealthZero;
public UnityEvent<float, float> OnHealthChange;
public UnityEvent<int, int> OnHealthChange;
[Header("Squeze Damage")]
[SerializeField]
@ -31,43 +22,25 @@ public class HealthComponent : MonoBehaviour, ISquezeDamageReceiver
currentHealth = maxHealth;
}
void Update()
{
if (currentDamageTick < Time.time)
{
if (accumulatedDamageInTick < 1f) return;
OnHealthChangeAtPos?.Invoke(transform.position.Add(y: 2f), accumulatedDamageInTick);
currentDamageTick = Time.time + damageTickDelay;
accumulatedDamageInTick = 0f;
}
}
public float getMaxHealth() {
public int getMaxHealth() {
return maxHealth;
}
public void setMaxHealth(float amount, bool heal = false) {
public void setMaxHealth(int amount, bool heal = false) {
maxHealth = amount;
if (heal)
currentHealth = amount;
}
public void TakeDamage(float damage)
public void TakeDamage(int damage)
{
currentHealth -= damage;
OnHealthChange?.Invoke(currentHealth + damage, currentHealth);
accumulatedDamageInTick += damage;
if (currentHealth <= 0) {
// Make sure to flush accumulated when dying
if (accumulatedDamageInTick > 1f)
OnHealthChangeAtPos?.Invoke(transform.position.Add(y: 2f), accumulatedDamageInTick);
OnHealthZero?.Invoke();
BloodComputeShader.Instance.createBlood(transform.position, (int)(maxHealth *maxHealth * BloodComputeShader.Instance.scoreMult), maxHealth / 8.0f);
BloodComputeShader.Instance.createBlood(transform.position, (int)(maxHealth *maxHealth * BloodComputeShader.Instance.scoreMult), maxHealth / 25.0f);
}
}

View File

@ -1,29 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using TMPro;
public class DamageText : MonoBehaviour
{
[SerializeField] AnimationCurve damageToSize;
[SerializeField] TextMeshPro damageText;
[SerializeField]
private Color normalColor, critColor, superCritColor;
[SerializeField]
private float critThreshold, superCritThreshold;
public void Init(float damage)
{
transform.localScale = Vector3.one * damageToSize.Evaluate(damage);
damageText.color = normalColor;
if (damage > critThreshold)
damageText.color = critColor;
if (damage > superCritThreshold)
damageText.color = superCritColor;
damageText.text = damage.ToString();
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 01c9b525ae607a844848c8e44062a0f1
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,29 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using JetBrains.Annotations;
using UnityEngine;
public class DamageTextManager : MonoBehaviour
{
[SerializeField] Transform textParent;
[SerializeField] GameObject damageTextPrefab;
[SerializeField] float lifeTime = 3f;
private void OnEnable()
{
HealthComponent.OnHealthChangeAtPos += SpawnDamage;
}
private void OnDisable()
{
HealthComponent.OnHealthChangeAtPos -= SpawnDamage;
}
public void SpawnDamage(Vector3 position, float damage)
{
GameObject go = Instantiate(damageTextPrefab, position, Quaternion.identity, textParent);
go.GetComponent<DamageText>().Init(damage);
go.AddComponent<DestroyAfter>().Init(lifeTime);
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: aab27275f26e5e244856836f6d17b909
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -24,7 +24,7 @@ public class HealthDisplay : MonoBehaviour
healthComponent.OnHealthChange.RemoveListener(UpdateHealth);
}
public void UpdateHealth(float prevHealth, float newHealth)
public void UpdateHealth(int prevHealth, int newHealth)
{
healthText.text = padding + healthComponent.currentHealth;
}

View File

@ -7,7 +7,6 @@
"com.unity.ide.rider": "3.0.27",
"com.unity.ide.visualstudio": "2.0.22",
"com.unity.inputsystem": "1.7.0",
"com.unity.postprocessing": "3.2.2",
"com.unity.render-pipelines.universal": "14.0.9",
"com.unity.test-framework": "1.1.33",
"com.unity.textmeshpro": "3.0.6",

View File

@ -194,15 +194,6 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.postprocessing": {
"version": "3.2.2",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.modules.physics": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.render-pipelines.core": {
"version": "14.0.9",
"depth": 1,

View File

@ -559,20 +559,7 @@ PlayerSettings:
webGLMemoryGeometricGrowthStep: 0.2
webGLMemoryGeometricGrowthCap: 96
webGLPowerPreference: 2
scriptingDefineSymbols:
Android: UNITY_POST_PROCESSING_STACK_V2
EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2
GameCoreXboxOne: UNITY_POST_PROCESSING_STACK_V2
Nintendo Switch: UNITY_POST_PROCESSING_STACK_V2
PS4: UNITY_POST_PROCESSING_STACK_V2
PS5: UNITY_POST_PROCESSING_STACK_V2
QNX: UNITY_POST_PROCESSING_STACK_V2
Stadia: UNITY_POST_PROCESSING_STACK_V2
Standalone: UNITY_POST_PROCESSING_STACK_V2
VisionOS: UNITY_POST_PROCESSING_STACK_V2
WebGL: UNITY_POST_PROCESSING_STACK_V2
XboxOne: UNITY_POST_PROCESSING_STACK_V2
tvOS: UNITY_POST_PROCESSING_STACK_V2
scriptingDefineSymbols: {}
additionalCompilerArguments: {}
platformArchitecture: {}
scriptingBackend: {}

View File

@ -13,7 +13,7 @@ TagManager:
- UI
- Rope
- Player
- Post Processing
-
-
-
-