Pull request #12: Jason
Merge in CEGJ/ludumdare50 from jason to dev * commit '5bd494aaca9537d8bbab12f588aa2885d1394bd8': Integrated SampleScene Tweaked arena colliders Make Vampire empty color on death Cleared off nullable warnings Blur fade!
This commit is contained in:
Jason Durand 01
commit
10114b268a
@ -30,7 +30,7 @@ Transform:
|
||||
m_Children:
|
||||
- {fileID: 38022213}
|
||||
m_Father: {fileID: 9196727425507610130}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!156049354 &4743508
|
||||
Grid:
|
||||
@ -27520,7 +27520,7 @@ Transform:
|
||||
m_Children:
|
||||
- {fileID: 2010475200}
|
||||
m_Father: {fileID: 9196727425507610130}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!156049354 &165724847
|
||||
Grid:
|
||||
@ -27771,7 +27771,7 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 9196727425507610130}
|
||||
m_RootOrder: 8
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &884789453
|
||||
GameObject:
|
||||
@ -28108,7 +28108,7 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 9196727425507610130}
|
||||
m_RootOrder: 9
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1778143990
|
||||
GameObject:
|
||||
@ -28140,7 +28140,7 @@ Transform:
|
||||
m_Children:
|
||||
- {fileID: 1153557250}
|
||||
m_Father: {fileID: 9196727425507610130}
|
||||
m_RootOrder: 7
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!156049354 &1778143991
|
||||
Grid:
|
||||
@ -28182,7 +28182,7 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 9196727425507610130}
|
||||
m_RootOrder: 10
|
||||
m_RootOrder: 9
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1835717887
|
||||
GameObject:
|
||||
@ -29570,7 +29570,7 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 884789454}
|
||||
m_Father: {fileID: 9196727425507610130}
|
||||
m_RootOrder: 11
|
||||
m_RootOrder: 10
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
@ -60030,7 +60030,7 @@ Transform:
|
||||
m_Children:
|
||||
- {fileID: 1835717888}
|
||||
m_Father: {fileID: 9196727425507610130}
|
||||
m_RootOrder: 6
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!156049354 &2084289214
|
||||
Grid:
|
||||
@ -60691,7 +60691,7 @@ Transform:
|
||||
- {fileID: 1933134022827887006}
|
||||
- {fileID: 2462970514231273154}
|
||||
m_Father: {fileID: 9196727425507610130}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &8205972623206729468
|
||||
GameObject:
|
||||
@ -60838,7 +60838,7 @@ Transform:
|
||||
- {fileID: 3634272314743084365}
|
||||
- {fileID: 5600268923404240777}
|
||||
m_Father: {fileID: 9196727425507610130}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!58 &1578908696495753955
|
||||
CircleCollider2D:
|
||||
@ -61114,8 +61114,8 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9196727423885834082}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: -11.5, z: 0}
|
||||
m_LocalScale: {x: 16, y: 4, z: 1}
|
||||
m_LocalPosition: {x: 0.0112, y: -11.9016, z: 0}
|
||||
m_LocalScale: {x: 15.862897, y: 3.1968, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 9196727424792191263}
|
||||
m_RootOrder: 5
|
||||
@ -61223,8 +61223,8 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9196727424183148076}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -16.25, y: -11.5, z: 0}
|
||||
m_LocalScale: {x: 8.9999, y: 4, z: 1}
|
||||
m_LocalPosition: {x: -16.0581, y: -11.9325, z: 0}
|
||||
m_LocalScale: {x: 9.384196, y: 3.135003, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 9196727424792191263}
|
||||
m_RootOrder: 1
|
||||
@ -61332,8 +61332,8 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9196727424492844843}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -19, y: 7, z: 0}
|
||||
m_LocalScale: {x: 3.5, y: 6, z: 1}
|
||||
m_LocalPosition: {x: -19.0472, y: 6.8347, z: 0}
|
||||
m_LocalScale: {x: 3.4055, y: 6.3306, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 9196727424792191263}
|
||||
m_RootOrder: 8
|
||||
@ -61441,8 +61441,8 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9196727424680933871}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -16.25, y: 12.5, z: 0}
|
||||
m_LocalScale: {x: 8.9999, y: 6, z: 1}
|
||||
m_LocalPosition: {x: -16.0993, y: 12.5, z: 0}
|
||||
m_LocalScale: {x: 9.301396, y: 6, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 9196727424792191263}
|
||||
m_RootOrder: 0
|
||||
@ -61567,7 +61567,7 @@ Transform:
|
||||
- {fileID: 5720071058300721486}
|
||||
- {fileID: 7342882877614581494}
|
||||
m_Father: {fileID: 9196727425507610130}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &9196727424937918673
|
||||
GameObject:
|
||||
@ -61677,8 +61677,8 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9196727425065881107}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 19, y: 7, z: 0}
|
||||
m_LocalScale: {x: 3.5, y: 6, z: 1}
|
||||
m_LocalPosition: {x: 19.0399, y: 6.8204, z: 0}
|
||||
m_LocalScale: {x: 3.4201999, y: 6.3594003, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 9196727424792191263}
|
||||
m_RootOrder: 9
|
||||
@ -61786,8 +61786,8 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9196727425066418762}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 19, y: -7, z: 0}
|
||||
m_LocalScale: {x: 3.5, y: 6, z: 1}
|
||||
m_LocalPosition: {x: 19.0479, y: -7, z: 0}
|
||||
m_LocalScale: {x: 3.4041, y: 6, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 9196727424792191263}
|
||||
m_RootOrder: 7
|
||||
@ -61895,8 +61895,8 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9196727425080706353}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 16.25, y: -11.5, z: 0}
|
||||
m_LocalScale: {x: 8.9999, y: 4, z: 1}
|
||||
m_LocalPosition: {x: 16.0808, y: -11.9026, z: 0}
|
||||
m_LocalScale: {x: 9.338297, y: 3.1948, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 9196727424792191263}
|
||||
m_RootOrder: 3
|
||||
@ -62004,8 +62004,8 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9196727425130084007}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -19, y: -7, z: 0}
|
||||
m_LocalScale: {x: 3.5, y: 6, z: 1}
|
||||
m_LocalPosition: {x: -19.0457, y: -7, z: 0}
|
||||
m_LocalScale: {x: 3.4086502, y: 6, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 9196727424792191263}
|
||||
m_RootOrder: 6
|
||||
@ -62087,88 +62087,6 @@ BoxCollider2D:
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!1 &9196727425198182341
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9196727425198182340}
|
||||
- component: {fileID: 9196727425198182347}
|
||||
m_Layer: 0
|
||||
m_Name: Ground
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 4294967295
|
||||
m_IsActive: 1
|
||||
--- !u!4 &9196727425198182340
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9196727425198182341}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: -0, z: 0}
|
||||
m_LocalScale: {x: 35, y: 20, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 9196727425507610130}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &9196727425198182347
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9196727425198182341}
|
||||
m_Enabled: 0
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 0
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 541259567
|
||||
m_SortingLayer: -1
|
||||
m_SortingOrder: -3
|
||||
m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3}
|
||||
m_Color: {r: 0.9056604, g: 0.80022454, b: 0.51690996, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &9196727425386152776
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -62195,8 +62113,8 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9196727425386152776}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 16.25, y: 12.5, z: 0}
|
||||
m_LocalScale: {x: 8.9999, y: 6, z: 1}
|
||||
m_LocalPosition: {x: 16.0854, y: 12.5, z: 0}
|
||||
m_LocalScale: {x: 9.329296, y: 6, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 9196727424792191263}
|
||||
m_RootOrder: 2
|
||||
@ -62389,7 +62307,6 @@ Transform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 9196727425198182340}
|
||||
- {fileID: 9196727423716235680}
|
||||
- {fileID: 9196727424792191263}
|
||||
- {fileID: 9154910266712610851}
|
||||
@ -62401,6 +62318,7 @@ Transform:
|
||||
- {fileID: 1550580935}
|
||||
- {fileID: 1787272690}
|
||||
- {fileID: 1853140661}
|
||||
- {fileID: 7588367539711513062}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -62448,6 +62366,8 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
gameTimer: {fileID: 0}
|
||||
mainMenu: {fileID: 0}
|
||||
UICanvas: {fileID: 0}
|
||||
<pauseLevel>k__BackingField: 1
|
||||
fadingTime: 3
|
||||
minFadingValue: 0.1
|
||||
@ -63259,6 +63179,80 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1933134022928666816, guid: 4da2d7c3520f17b4ebee7e57a5908d12, type: 3}
|
||||
m_PrefabInstance: {fileID: 1575358957}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &1739929594
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 9196727425507610130}
|
||||
m_Modifications:
|
||||
- target: {fileID: 7588367541264262684, guid: c642408fc60a479419848c9119286505, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7588367541264262684, guid: c642408fc60a479419848c9119286505, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7588367541264262684, guid: c642408fc60a479419848c9119286505, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7588367541264262684, guid: c642408fc60a479419848c9119286505, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7588367541264262684, guid: c642408fc60a479419848c9119286505, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7588367541264262684, guid: c642408fc60a479419848c9119286505, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7588367541264262684, guid: c642408fc60a479419848c9119286505, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7588367541264262684, guid: c642408fc60a479419848c9119286505, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7588367541264262684, guid: c642408fc60a479419848c9119286505, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7588367541264262684, guid: c642408fc60a479419848c9119286505, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7588367541264262684, guid: c642408fc60a479419848c9119286505, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7588367541264262684, guid: c642408fc60a479419848c9119286505, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7588367541264262684, guid: c642408fc60a479419848c9119286505, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7588367541264262684, guid: c642408fc60a479419848c9119286505, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7775117503087316140, guid: c642408fc60a479419848c9119286505, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Global Volume
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: c642408fc60a479419848c9119286505, type: 3}
|
||||
--- !u!4 &7588367539711513062 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7588367541264262684, guid: c642408fc60a479419848c9119286505, type: 3}
|
||||
m_PrefabInstance: {fileID: 1739929594}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &1779977739
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
64
Assets/Prefabs/Global Volume.prefab
Normal file
64
Assets/Prefabs/Global Volume.prefab
Normal file
@ -0,0 +1,64 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &7775117503087316140
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7588367541264262684}
|
||||
- component: {fileID: 6742154694633569523}
|
||||
- component: {fileID: 5221859989499760603}
|
||||
m_Layer: 0
|
||||
m_Name: Global Volume
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7588367541264262684
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7775117503087316140}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -400.00003, y: -225.09909, z: -10.568032}
|
||||
m_LocalScale: {x: 1.0568032, y: 1.0568032, z: 1.0568032}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &6742154694633569523
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7775117503087316140}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
isGlobal: 1
|
||||
priority: 0
|
||||
blendDistance: 0
|
||||
weight: 1
|
||||
sharedProfile: {fileID: 11400000, guid: 19d4201eb56e2de4582bf8a0a32b484a, type: 2}
|
||||
--- !u!114 &5221859989499760603
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7775117503087316140}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 2e0e17f28aaf1fe44af28e32da43d018, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
transitionSpeed: 0.04
|
||||
7
Assets/Prefabs/Global Volume.prefab.meta
Normal file
7
Assets/Prefabs/Global Volume.prefab.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c642408fc60a479419848c9119286505
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -392,7 +392,7 @@ MonoBehaviour:
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 0}
|
||||
- m_Target: {fileID: 1568061621804763920}
|
||||
m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp
|
||||
m_MethodName: QuitGame
|
||||
m_Mode: 1
|
||||
@ -404,18 +404,6 @@ MonoBehaviour:
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
- m_Target: {fileID: 0}
|
||||
m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine
|
||||
m_MethodName: Play
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!114 &1568932900757633595
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -497,7 +485,6 @@ RectTransform:
|
||||
- {fileID: 4394421821813469863}
|
||||
- {fileID: 182458769}
|
||||
- {fileID: 4394421820717285783}
|
||||
- {fileID: 9052363376224837333}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -1090,51 +1077,3 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &9154125589810721893
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9052363376224837333}
|
||||
- component: {fileID: 5296173155622552634}
|
||||
m_Layer: 0
|
||||
m_Name: Global Volume
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &9052363376224837333
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9154125589810721893}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -400.00003, y: -225.09909, z: -10.568032}
|
||||
m_LocalScale: {x: 1.0568032, y: 1.0568032, z: 1.0568032}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4394421820928219484}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &5296173155622552634
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9154125589810721893}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
isGlobal: 1
|
||||
priority: 0
|
||||
blendDistance: 0
|
||||
weight: 1
|
||||
sharedProfile: {fileID: 11400000, guid: 19d4201eb56e2de4582bf8a0a32b484a, type: 2}
|
||||
|
||||
@ -80,10 +80,10 @@ MonoBehaviour:
|
||||
<attackDmg>k__BackingField: 0
|
||||
attackCooldown: 0
|
||||
target: {fileID: 0}
|
||||
<renderer>k__BackingField: {fileID: 0}
|
||||
<renderer>k__BackingField: {fileID: 3061273954050112714}
|
||||
halo: {fileID: 0}
|
||||
deadColor: {r: 1, g: 0, b: 0, a: 1}
|
||||
emptyColor: {r: 1, g: 0, b: 0, a: 1}
|
||||
emptyColor: {r: 0.25490198, g: 0.25490198, b: 0.25490198, a: 0.7019608}
|
||||
animator: {fileID: 0}
|
||||
playerStats: {fileID: 11400000, guid: 12a626b5a296d934ba078d222ad6ba98, type: 2}
|
||||
playerMovement: {fileID: 0}
|
||||
|
||||
@ -123,12 +123,17 @@ NavMeshSettings:
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!1 &30189384 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 9196727425507610131, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
|
||||
m_PrefabInstance: {fileID: 1359990804}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &171858601 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
|
||||
m_PrefabInstance: {fileID: 1359990804}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_GameObject: {fileID: 30189384}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e3fecdc4a8b2cb4419ef9d03180d130d, type: 3}
|
||||
@ -139,7 +144,7 @@ MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: -7596782781093632548, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
|
||||
m_PrefabInstance: {fileID: 1359990804}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_GameObject: {fileID: 30189384}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 72794012913ccd840a73788b90573212, type: 3}
|
||||
@ -568,10 +573,38 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||
value:
|
||||
objectReference: {fileID: 171858601}
|
||||
- target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
|
||||
value:
|
||||
objectReference: {fileID: 30189384}
|
||||
- target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
|
||||
value: ToStartFlowState
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
|
||||
value: GameFlowManager, Assembly-CSharp
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4394421821813469848, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
|
||||
--- !u!1001 &1942557562
|
||||
|
||||
@ -120,7 +120,7 @@ public class AIEntity : Entity {
|
||||
RaycastHit2D hit = Physics2D.Raycast(transform.position, direction, attackRange, (1 << LayerMask.NameToLayer("Safezone")));//Layer 6 is safeZone
|
||||
Physics2D.queriesHitTriggers = true;
|
||||
if(!(hit.collider is null)){ //We have hit the safe zone
|
||||
Debug.Log("hit");
|
||||
//Debug.Log("hit");
|
||||
isAvoiding = true;
|
||||
Vector3 avoidDir = Vector3.zero;
|
||||
//Between top and bottom
|
||||
|
||||
29
Assets/Scripts/BlurFade.cs
Normal file
29
Assets/Scripts/BlurFade.cs
Normal file
@ -0,0 +1,29 @@
|
||||
#nullable enable
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Rendering;
|
||||
|
||||
public class BlurFade : MonoBehaviour {
|
||||
Volume volume = null!;
|
||||
Coroutine? coroutine;
|
||||
bool blurred;
|
||||
[SerializeField] [Range(0f, 1f)]
|
||||
float transitionSpeed = 0.2f;
|
||||
|
||||
void Awake() => volume = GetComponent<Volume>();
|
||||
|
||||
public void SetBlurred(bool value) {
|
||||
blurred = value;
|
||||
coroutine ??= StartCoroutine(BlurCoroutine());
|
||||
}
|
||||
|
||||
IEnumerator BlurCoroutine() {
|
||||
while (blurred ? volume.weight <= 1f : volume.weight >= 0f) {
|
||||
volume.weight += transitionSpeed * (blurred ? 1f : -1f);
|
||||
yield return null;
|
||||
}
|
||||
|
||||
coroutine = null;
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/BlurFade.cs.meta
Normal file
11
Assets/Scripts/BlurFade.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2e0e17f28aaf1fe44af28e32da43d018
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -16,8 +16,7 @@ public class Entity : MonoBehaviour {
|
||||
|
||||
public Arena arena = null!;
|
||||
|
||||
[SerializeField]
|
||||
[Required]
|
||||
[SerializeField] [Required]
|
||||
public GameFlowManager gameFlowManager = null!;
|
||||
|
||||
[field: SerializeField] public float Health { get; private set; }
|
||||
@ -36,9 +35,9 @@ public class Entity : MonoBehaviour {
|
||||
public Transform target;
|
||||
public EntityFlag entityType { get; protected set; }
|
||||
public Vector3 direction { get; set; }
|
||||
public Rigidbody2D rb { get; private set; }
|
||||
public Collider2D collider { get; private set; }
|
||||
[field: SerializeField]public SpriteRenderer renderer { get; private set; }
|
||||
public Rigidbody2D rb { get; private set; } = null!;
|
||||
public new Collider2D collider { get; private set; } = null!;
|
||||
[field: SerializeField] [field: Required]public new SpriteRenderer renderer { get; private set; }
|
||||
[SerializeField] GameObject halo;
|
||||
[SerializeField] protected Color deadColor = Color.red;
|
||||
[SerializeField] protected Color emptyColor = Color.grey;
|
||||
|
||||
@ -15,6 +15,8 @@ public class GameFlowManager : MonoBehaviour {
|
||||
[SerializeField] [Required]
|
||||
Canvas UICanvas = null!;
|
||||
|
||||
BlurFade blurFade = null!;
|
||||
|
||||
public enum PauseLevel {
|
||||
NotPaused,
|
||||
PreventActions,
|
||||
@ -35,14 +37,17 @@ public class GameFlowManager : MonoBehaviour {
|
||||
float fadeStep = 0.02f;
|
||||
float fadingTimer;
|
||||
bool fadingIn = false;
|
||||
[field: SerializeField] TMP_Text startTxt;
|
||||
[field: SerializeField] TMP_Text endTxt;
|
||||
|
||||
public event Action<BaseState> stateChanged;
|
||||
[field: SerializeField] TMP_Text startTxt = null!;
|
||||
[field: SerializeField] TMP_Text endTxt = null!;
|
||||
|
||||
public event Action<BaseState>? stateChanged;
|
||||
|
||||
#region Unity Messages
|
||||
|
||||
void Awake() {
|
||||
blurFade = GetComponentInChildren<BlurFade>();
|
||||
|
||||
CurrentState = new StartMenuFlowState(this);
|
||||
if (startTxt != null) {
|
||||
startTxt.transform.parent.gameObject.SetActive(true);
|
||||
@ -152,6 +157,7 @@ public class GameFlowManager : MonoBehaviour {
|
||||
gameFlowManager.mainMenu.gameObject.SetActive(true);
|
||||
gameFlowManager.mainMenu.SetMenuMode(MainMenuManager.MenuMode.MainMenu);
|
||||
gameFlowManager.UICanvas.gameObject.SetActive(false);
|
||||
gameFlowManager.blurFade.SetBlurred(true);
|
||||
}
|
||||
|
||||
public override void LeaveState() {
|
||||
@ -160,6 +166,7 @@ public class GameFlowManager : MonoBehaviour {
|
||||
gameFlowManager.mainMenu.ResetMenuState();
|
||||
gameFlowManager.mainMenu.gameObject.SetActive(false);
|
||||
gameFlowManager.UICanvas.gameObject.SetActive(true);
|
||||
gameFlowManager.blurFade.SetBlurred(false);
|
||||
}
|
||||
}
|
||||
|
||||
@ -207,6 +214,7 @@ public class GameFlowManager : MonoBehaviour {
|
||||
gameFlowManager.mainMenu.gameObject.SetActive(true);
|
||||
gameFlowManager.mainMenu.SetMenuMode(MainMenuManager.MenuMode.PauseMenu);
|
||||
gameFlowManager.SetPauseLevel(PauseLevel.TimeStop);
|
||||
gameFlowManager.blurFade.SetBlurred(true);
|
||||
}
|
||||
|
||||
public override void LeaveState() {
|
||||
@ -215,6 +223,7 @@ public class GameFlowManager : MonoBehaviour {
|
||||
gameFlowManager.mainMenu.ResetMenuState();
|
||||
gameFlowManager.mainMenu.gameObject.SetActive(false);
|
||||
gameFlowManager.SetPauseLevel(PauseLevel.NotPaused);
|
||||
gameFlowManager.blurFade.SetBlurred(false);
|
||||
}
|
||||
}
|
||||
|
||||
@ -226,8 +235,11 @@ public class GameFlowManager : MonoBehaviour {
|
||||
|
||||
Debug.Log("You died!\nPress Accept to restart!");
|
||||
gameFlowManager.SetPauseLevel(PauseLevel.PreventActions);
|
||||
gameFlowManager.blurFade.SetBlurred(true);
|
||||
}
|
||||
|
||||
public override void LeaveState() => gameFlowManager.blurFade.SetBlurred(false);
|
||||
|
||||
public void ReloadGame() {
|
||||
Debug.Log("Reloading scene...");
|
||||
SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex);
|
||||
|
||||
@ -11,14 +11,15 @@ public class MinionThrower : MonoBehaviour {
|
||||
[SerializeField] [Required]
|
||||
PlayerStats playerStats = null!;
|
||||
|
||||
public Entity[] minionPrefabs;
|
||||
public GameObject aimArrow;
|
||||
public Entity[] minionPrefabs = null!;
|
||||
public GameObject aimArrow = null!;
|
||||
|
||||
bool isInThrowMode;
|
||||
Vector2 throwDirection;
|
||||
MinionBar minionBar;
|
||||
VampireEntity vampireEntity;
|
||||
PlayerMovement movement;
|
||||
MinionBar minionBar = null!;
|
||||
VampireEntity vampireEntity = null!;
|
||||
PlayerMovement movement = null!;
|
||||
|
||||
float currentCooldownTimer;
|
||||
float currentInitialCooldown;
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ public class PlayerMovement : MonoBehaviour {
|
||||
|
||||
[SerializeField] [field: Required]
|
||||
PlayerStats stats = null!;
|
||||
[SerializeField] GameObject globalCamera;
|
||||
[SerializeField] GameObject globalCamera = null!;
|
||||
|
||||
[field: Required]
|
||||
Rigidbody2D rb = null!;
|
||||
@ -18,8 +18,8 @@ public class PlayerMovement : MonoBehaviour {
|
||||
Vector2 moveDirection;
|
||||
BaseState currentState = null!;
|
||||
SafeZone? safeZone;
|
||||
VampireEntity vampireEntity;
|
||||
Animator animator;
|
||||
VampireEntity vampireEntity = null!;
|
||||
Animator animator = null!;
|
||||
public bool facingRight { get; private set; } = true;
|
||||
|
||||
bool lastJumpButton;
|
||||
|
||||
@ -34,5 +34,8 @@ public class VampireEntity : Entity {
|
||||
|
||||
public bool IsInSafeZone() => playerMovement.IsInSafeZone;
|
||||
|
||||
protected override void OnDied() => gameFlowManager.GameOver();
|
||||
protected override void OnDied() {
|
||||
OnEmpty();
|
||||
gameFlowManager.GameOver();
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user