Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/ColorDefense
This commit is contained in:
commit
669f5c015e
|
@ -217,7 +217,7 @@ Transform:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1400473914611959530}
|
m_GameObject: {fileID: 1400473914611959530}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_LocalRotation: {x: 0.021683885, y: 0.9650828, z: -0.24690329, w: 0.08475686}
|
m_LocalRotation: {x: 0.021683881, y: 0.9650828, z: -0.24690329, w: 0.08475683}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
|
@ -375,7 +375,7 @@ Transform:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 3339643807228368672}
|
m_GameObject: {fileID: 3339643807228368672}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_LocalRotation: {x: 0.024118531, y: 0.95756304, z: -0.27462542, w: 0.084096424}
|
m_LocalRotation: {x: 0.024118524, y: 0.95756304, z: -0.27462542, w: 0.0840964}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
|
@ -635,8 +635,8 @@ Transform:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 6163557566655415017}
|
m_GameObject: {fileID: 6163557566655415017}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_LocalRotation: {x: 0.021683885, y: 0.9650828, z: -0.24690329, w: 0.08475686}
|
m_LocalRotation: {x: 0.021683881, y: 0.9650828, z: -0.24690329, w: 0.08475683}
|
||||||
m_LocalPosition: {x: 2.430962, y: 14.8024, z: 18.973312}
|
m_LocalPosition: {x: 2.4309628, y: 14.8024, z: 18.973312}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
|
|
|
@ -228,6 +228,11 @@ PrefabInstance:
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: GreenBoy1
|
value: GreenBoy1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 369596802107988542, guid: eff762e00bcd52a438a5abf98a554a0b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: startHealth
|
||||||
|
value: 20
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8270377878650669399, guid: eff762e00bcd52a438a5abf98a554a0b,
|
- target: {fileID: 8270377878650669399, guid: eff762e00bcd52a438a5abf98a554a0b,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: MoneyDropOnDeath
|
propertyPath: MoneyDropOnDeath
|
||||||
|
|
|
@ -442,6 +442,11 @@ PrefabInstance:
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: GreenBoy2
|
value: GreenBoy2
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 369596802107988542, guid: eff762e00bcd52a438a5abf98a554a0b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: startHealth
|
||||||
|
value: 40
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8270377878650669399, guid: eff762e00bcd52a438a5abf98a554a0b,
|
- target: {fileID: 8270377878650669399, guid: eff762e00bcd52a438a5abf98a554a0b,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: MoneyDropOnDeath
|
propertyPath: MoneyDropOnDeath
|
||||||
|
|
|
@ -228,6 +228,11 @@ PrefabInstance:
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: GreenBoyBoss
|
value: GreenBoyBoss
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 369596802107988542, guid: eff762e00bcd52a438a5abf98a554a0b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: startHealth
|
||||||
|
value: 200
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8270377878650669399, guid: eff762e00bcd52a438a5abf98a554a0b,
|
- target: {fileID: 8270377878650669399, guid: eff762e00bcd52a438a5abf98a554a0b,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: MoneyDropOnDeath
|
propertyPath: MoneyDropOnDeath
|
||||||
|
|
|
@ -334,6 +334,11 @@ PrefabInstance:
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: GreenBoyJetpack
|
value: GreenBoyJetpack
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 369596802107988542, guid: eff762e00bcd52a438a5abf98a554a0b,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: startHealth
|
||||||
|
value: 20
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8270377878650669399, guid: eff762e00bcd52a438a5abf98a554a0b,
|
- target: {fileID: 8270377878650669399, guid: eff762e00bcd52a438a5abf98a554a0b,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: MoneyDropOnDeath
|
propertyPath: MoneyDropOnDeath
|
||||||
|
|
|
@ -656,6 +656,8 @@ RectTransform:
|
||||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
|
- {fileID: 7783882627863173104}
|
||||||
|
- {fileID: 6120504688934157380}
|
||||||
- {fileID: 7134937801519496076}
|
- {fileID: 7134937801519496076}
|
||||||
- {fileID: 1264509985005215626}
|
- {fileID: 1264509985005215626}
|
||||||
- {fileID: 4189792432299129876}
|
- {fileID: 4189792432299129876}
|
||||||
|
@ -1783,6 +1785,90 @@ MonoBehaviour:
|
||||||
y: 0
|
y: 0
|
||||||
width: 1
|
width: 1
|
||||||
height: 1
|
height: 1
|
||||||
|
--- !u!1 &2505835712473296967
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6120504688934157380}
|
||||||
|
- component: {fileID: 2340308458956773668}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: view
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 0
|
||||||
|
--- !u!4 &6120504688934157380
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2505835712473296967}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: -350, z: 0}
|
||||||
|
m_LocalScale: {x: 100, y: 100, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 3367038424042638127}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!212 &2340308458956773668
|
||||||
|
SpriteRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2505835712473296967}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_CastShadows: 0
|
||||||
|
m_ReceiveShadows: 0
|
||||||
|
m_DynamicOccludee: 1
|
||||||
|
m_StaticShadowCaster: 0
|
||||||
|
m_MotionVectors: 1
|
||||||
|
m_LightProbeUsage: 1
|
||||||
|
m_ReflectionProbeUsage: 1
|
||||||
|
m_RayTracingMode: 0
|
||||||
|
m_RayTraceProcedural: 0
|
||||||
|
m_RenderingLayerMask: 1
|
||||||
|
m_RendererPriority: 0
|
||||||
|
m_Materials:
|
||||||
|
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
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: 0
|
||||||
|
m_SortingLayer: 0
|
||||||
|
m_SortingOrder: 0
|
||||||
|
m_Sprite: {fileID: 21300000, guid: abcc1e7fece93674299c1355e433dcc8, type: 3}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_FlipX: 0
|
||||||
|
m_FlipY: 0
|
||||||
|
m_DrawMode: 0
|
||||||
|
m_Size: {x: 2.62, y: 0.97}
|
||||||
|
m_AdaptiveModeThreshold: 0.5
|
||||||
|
m_SpriteTileMode: 0
|
||||||
|
m_WasSpriteAssigned: 1
|
||||||
|
m_MaskInteraction: 0
|
||||||
|
m_SpriteSortPoint: 0
|
||||||
--- !u!1 &2823193282597070615
|
--- !u!1 &2823193282597070615
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -5948,6 +6034,90 @@ MonoBehaviour:
|
||||||
m_OnClick:
|
m_OnClick:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
|
--- !u!1 &8953897987241724881
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 7783882627863173104}
|
||||||
|
- component: {fileID: 3937151363574610184}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Rotato
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &7783882627863173104
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8953897987241724881}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: -675, y: -419, z: 0}
|
||||||
|
m_LocalScale: {x: 100, y: 100, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 3367038424042638127}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!212 &3937151363574610184
|
||||||
|
SpriteRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8953897987241724881}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_CastShadows: 0
|
||||||
|
m_ReceiveShadows: 0
|
||||||
|
m_DynamicOccludee: 1
|
||||||
|
m_StaticShadowCaster: 0
|
||||||
|
m_MotionVectors: 1
|
||||||
|
m_LightProbeUsage: 1
|
||||||
|
m_ReflectionProbeUsage: 1
|
||||||
|
m_RayTracingMode: 0
|
||||||
|
m_RayTraceProcedural: 0
|
||||||
|
m_RenderingLayerMask: 1
|
||||||
|
m_RendererPriority: 0
|
||||||
|
m_Materials:
|
||||||
|
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
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: 0
|
||||||
|
m_SortingLayer: 0
|
||||||
|
m_SortingOrder: 0
|
||||||
|
m_Sprite: {fileID: 21300000, guid: ea2988855e5f9e840a7ada4d8a3bc1c3, type: 3}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_FlipX: 0
|
||||||
|
m_FlipY: 0
|
||||||
|
m_DrawMode: 0
|
||||||
|
m_Size: {x: 2.62, y: 0.97}
|
||||||
|
m_AdaptiveModeThreshold: 0.5
|
||||||
|
m_SpriteTileMode: 0
|
||||||
|
m_WasSpriteAssigned: 1
|
||||||
|
m_MaskInteraction: 0
|
||||||
|
m_SpriteSortPoint: 0
|
||||||
--- !u!1 &9154155236048502357
|
--- !u!1 &9154155236048502357
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -6123,6 +6293,11 @@ PrefabInstance:
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4958432309469098302, guid: fff998a9abaaf2f43a388f7a721aa1c2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: -20.599998
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 7027000765413775412, guid: fff998a9abaaf2f43a388f7a721aa1c2,
|
- target: {fileID: 7027000765413775412, guid: fff998a9abaaf2f43a388f7a721aa1c2,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
|
@ -6322,6 +6497,11 @@ PrefabInstance:
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4958432309469098302, guid: fff998a9abaaf2f43a388f7a721aa1c2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: -20.599998
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 7027000765413775412, guid: fff998a9abaaf2f43a388f7a721aa1c2,
|
- target: {fileID: 7027000765413775412, guid: fff998a9abaaf2f43a388f7a721aa1c2,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
|
@ -6509,6 +6689,11 @@ PrefabInstance:
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4958432309469098302, guid: fff998a9abaaf2f43a388f7a721aa1c2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: -20.599998
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 7027000765413775412, guid: fff998a9abaaf2f43a388f7a721aa1c2,
|
- target: {fileID: 7027000765413775412, guid: fff998a9abaaf2f43a388f7a721aa1c2,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
|
@ -6697,6 +6882,11 @@ PrefabInstance:
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4958432309469098302, guid: fff998a9abaaf2f43a388f7a721aa1c2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: -20.599998
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 7027000765413775412, guid: fff998a9abaaf2f43a388f7a721aa1c2,
|
- target: {fileID: 7027000765413775412, guid: fff998a9abaaf2f43a388f7a721aa1c2,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
|
@ -6884,6 +7074,11 @@ PrefabInstance:
|
||||||
propertyPath: m_hasFontAssetChanged
|
propertyPath: m_hasFontAssetChanged
|
||||||
value: 1
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4958432309469098302, guid: fff998a9abaaf2f43a388f7a721aa1c2,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: -20.599998
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 7027000765413775412, guid: fff998a9abaaf2f43a388f7a721aa1c2,
|
- target: {fileID: 7027000765413775412, guid: fff998a9abaaf2f43a388f7a721aa1c2,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -55,15 +55,10 @@ public class EnemySpawnManager : MonoBehaviour
|
||||||
|
|
||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
if (waveQueue.Count <= 0)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (HasStarted && IsAutoPlaying)
|
if (HasStarted && IsAutoPlaying)
|
||||||
time += Time.deltaTime;
|
time += Time.deltaTime;
|
||||||
|
|
||||||
if (waveQueue.Peek().spawnTime < time)
|
if (waveQueue.Count > 0 && waveQueue.Peek().spawnTime < time)
|
||||||
{
|
{
|
||||||
PopWave();
|
PopWave();
|
||||||
}
|
}
|
||||||
|
@ -81,6 +76,10 @@ public class EnemySpawnManager : MonoBehaviour
|
||||||
|
|
||||||
void PopWave()
|
void PopWave()
|
||||||
{
|
{
|
||||||
|
if (waveQueue.Count <= 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
|
||||||
time = 0;
|
time = 0;
|
||||||
WaveNum++;
|
WaveNum++;
|
||||||
|
|
||||||
|
|
|
@ -5,12 +5,19 @@ public class CameraSlotClickDetect : MonoBehaviour
|
||||||
{
|
{
|
||||||
[SerializeField] private TowerCam towerCam;
|
[SerializeField] private TowerCam towerCam;
|
||||||
|
|
||||||
|
[SerializeField] private GameObject escImg;
|
||||||
|
|
||||||
public Camera mainCamera;
|
public Camera mainCamera;
|
||||||
public LayerMask layerMask;
|
public LayerMask layerMask;
|
||||||
public LayerMask selectLayer;
|
public LayerMask selectLayer;
|
||||||
|
|
||||||
private SlotManager PrevHoveredSlot;
|
private SlotManager PrevHoveredSlot;
|
||||||
|
|
||||||
|
private void Start()
|
||||||
|
{
|
||||||
|
escImg.SetActive(false);
|
||||||
|
}
|
||||||
|
|
||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
if (Input.GetMouseButtonDown(0))
|
if (Input.GetMouseButtonDown(0))
|
||||||
|
@ -19,6 +26,7 @@ public class CameraSlotClickDetect : MonoBehaviour
|
||||||
}
|
}
|
||||||
if (Input.GetKeyDown(KeyCode.Escape))
|
if (Input.GetKeyDown(KeyCode.Escape))
|
||||||
{
|
{
|
||||||
|
escImg.SetActive(false);
|
||||||
GameManager.Instance.SelectedTower = null;
|
GameManager.Instance.SelectedTower = null;
|
||||||
if (towerCam != null)
|
if (towerCam != null)
|
||||||
towerCam.ChangeToTarget(null);
|
towerCam.ChangeToTarget(null);
|
||||||
|
@ -41,7 +49,9 @@ public class CameraSlotClickDetect : MonoBehaviour
|
||||||
if (tower != null)
|
if (tower != null)
|
||||||
{
|
{
|
||||||
GameManager.Instance.SelectedTower = tower;
|
GameManager.Instance.SelectedTower = tower;
|
||||||
|
|
||||||
|
escImg.SetActive(true);
|
||||||
|
|
||||||
if (towerCam != null)
|
if (towerCam != null)
|
||||||
towerCam.ChangeToTarget(tower.gameObject);
|
towerCam.ChangeToTarget(tower.gameObject);
|
||||||
else
|
else
|
||||||
|
@ -54,6 +64,8 @@ public class CameraSlotClickDetect : MonoBehaviour
|
||||||
slotInfo.OnClick();
|
slotInfo.OnClick();
|
||||||
GameManager.Instance.SelectedTower = null;
|
GameManager.Instance.SelectedTower = null;
|
||||||
|
|
||||||
|
escImg.SetActive(false);
|
||||||
|
|
||||||
if (towerCam != null)
|
if (towerCam != null)
|
||||||
towerCam.ChangeToTarget(null);
|
towerCam.ChangeToTarget(null);
|
||||||
else
|
else
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 4.2 KiB |
|
@ -0,0 +1,114 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ea2988855e5f9e840a7ada4d8a3bc1c3
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 13
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
flipGreenChannel: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMipmapLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
swizzle: 50462976
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 4.7 KiB |
|
@ -0,0 +1,114 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: abcc1e7fece93674299c1355e433dcc8
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 13
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
flipGreenChannel: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMipmapLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
swizzle: 50462976
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Loading…
Reference in New Issue