Compare commits

..

No commits in common. "7c5fd590586b37733d869bed82ae9cca5cf36514" and "e5da90700a4b6c4bacd98f4a6930ed25e14708a3" have entirely different histories.

18 changed files with 615 additions and 1269 deletions

File diff suppressed because one or more lines are too long

View File

@ -114,9 +114,9 @@ Material:
- _WorkflowMode: 1 - _WorkflowMode: 1
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.24463025, g: 0.25139424, b: 0.836478, a: 1} - _BaseColor: {r: 0.07570895, g: 0.20471348, b: 0.8301887, a: 1}
- _Color: {r: 0.24463022, g: 0.2513942, b: 0.836478, a: 1} - _Color: {r: 0.07570892, g: 0.20471343, b: 0.8301887, a: 1}
- _EmissionColor: {r: 0.065748304, g: 0.05323436, b: 2.418379, a: 1} - _EmissionColor: {r: 0.061386257, g: 0.16503848, b: 2.1689942, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &3420804456520092899 --- !u!114 &3420804456520092899

View File

@ -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.021683881, y: 0.9650828, z: -0.24690329, w: 0.08475683} m_LocalRotation: {x: 0.021683885, y: 0.9650828, z: -0.24690329, w: 0.08475686}
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.024118524, y: 0.95756304, z: -0.27462542, w: 0.0840964} m_LocalRotation: {x: 0.024118531, y: 0.95756304, z: -0.27462542, w: 0.084096424}
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.021683881, y: 0.9650828, z: -0.24690329, w: 0.08475683} m_LocalRotation: {x: 0.021683885, y: 0.9650828, z: -0.24690329, w: 0.08475686}
m_LocalPosition: {x: 2.4309628, y: 14.8024, z: 18.973312} m_LocalPosition: {x: 2.430962, 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: []

View File

@ -228,11 +228,6 @@ 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

View File

@ -442,11 +442,6 @@ 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

View File

@ -228,11 +228,6 @@ 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

View File

@ -334,11 +334,6 @@ 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

View File

@ -656,8 +656,6 @@ 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}
@ -1785,90 +1783,6 @@ 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
@ -6034,90 +5948,6 @@ 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
@ -6293,11 +6123,6 @@ 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
@ -6497,11 +6322,6 @@ 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
@ -6689,11 +6509,6 @@ 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
@ -6882,11 +6697,6 @@ 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
@ -7074,11 +6884,6 @@ 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

View File

@ -14,24 +14,24 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
Enemies: Enemies:
- name: - name:
moveSpeed: 0.4 moveSpeed: 1
FlyPath: 0 FlyPath: 0
feetOffset: 0.7 feetOffset: 0.7
prefab: {fileID: 369660384824789643, guid: 784f819fe659a3e488f123c96ee801ad, type: 3} prefab: {fileID: 369660384824789643, guid: 784f819fe659a3e488f123c96ee801ad, type: 3}
- name: - name:
moveSpeed: 0.8 moveSpeed: 2
FlyPath: 0 FlyPath: 0
feetOffset: 0.7 feetOffset: 0.7
prefab: {fileID: 4537037150239815062, guid: bd436a2c4dcc94241a7ecbb15e61a724, prefab: {fileID: 4537037150239815062, guid: bd436a2c4dcc94241a7ecbb15e61a724,
type: 3} type: 3}
- name: - name:
moveSpeed: 1.5 moveSpeed: 4
FlyPath: 1 FlyPath: 1
feetOffset: 0 feetOffset: 0
prefab: {fileID: 4537037150239815062, guid: 5a35ef73a064d664cbaf53a719468025, prefab: {fileID: 4537037150239815062, guid: 5a35ef73a064d664cbaf53a719468025,
type: 3} type: 3}
- name: - name:
moveSpeed: 0.3 moveSpeed: 0.5
FlyPath: 0 FlyPath: 0
feetOffset: 0.7 feetOffset: 0.7
prefab: {fileID: 4537037150239815062, guid: d932943ff31baa849b971b949d37222a, prefab: {fileID: 4537037150239815062, guid: d932943ff31baa849b971b949d37222a,

View File

@ -15,169 +15,17 @@ MonoBehaviour:
Waves: Waves:
- spawnTime: 0 - spawnTime: 0
groups: groups:
- enemyIndex: 0
num: 6
spawnInterval: 1.5
- spawnTime: 5
groups:
- enemyIndex: 0
num: 5
spawnInterval: 1
- enemyIndex: 1
num: 2
spawnInterval: 2
- spawnTime: 5
groups:
- enemyIndex: 1
num: 5
spawnInterval: 1.5
- enemyIndex: 0 - enemyIndex: 0
num: 10 num: 10
spawnInterval: 1 spawnInterval: 1
- spawnTime: 5
groups:
- enemyIndex: 2
num: 5
spawnInterval: 3
- spawnTime: 5
groups:
- enemyIndex: 2
num: 2
spawnInterval: 2
- enemyIndex: 1
num: 3
spawnInterval: 1
- enemyIndex: 2 - enemyIndex: 2
num: 2 num: 2
spawnInterval: 0
- spawnTime: 5
groups:
- enemyIndex: 0
num: 12
spawnInterval: 1
- enemyIndex: 1
num: 5
spawnInterval: 2 spawnInterval: 2
- enemyIndex: 0
num: 5
spawnInterval: 1
- spawnTime: 5
groups:
- enemyIndex: 3
num: 1
spawnInterval: 2
- spawnTime: 5
groups:
- enemyIndex: 0
num: 20
spawnInterval: 0.7
- spawnTime: 5
groups:
- enemyIndex: 2
num: 5
spawnInterval: 1
- enemyIndex: 2
num: 5
spawnInterval: 1
- spawnTime: 5
groups:
- enemyIndex: 1
num: 10
spawnInterval: 2.5
- enemyIndex: 0
num: 20
spawnInterval: 0.6
- spawnTime: 5
groups:
- enemyIndex: 3
num: 2
spawnInterval: 5
- spawnTime: 5
groups:
- enemyIndex: 2
num: 10
spawnInterval: 2.5
- enemyIndex: 1
num: 5
spawnInterval: 1
- spawnTime: 5
groups:
- enemyIndex: 1
num: 10
spawnInterval: 2.5
- enemyIndex: 3
num: 1
spawnInterval: 5
- spawnTime: 5
groups:
- enemyIndex: 0
num: 30
spawnInterval: 0.5
- spawnTime: 5
groups:
- enemyIndex: 1
num: 5
spawnInterval: 1
- enemyIndex: 2
num: 5
spawnInterval: 1
- enemyIndex: 1
num: 5
spawnInterval: 1
- enemyIndex: 2
num: 5
spawnInterval: 1
- spawnTime: 5
groups:
- enemyIndex: 3
num: 3
spawnInterval: 4
- spawnTime: 5
groups:
- enemyIndex: 2
num: 15
spawnInterval: 2
- enemyIndex: 3
num: 1
spawnInterval: 2
- spawnTime: 5
groups:
- enemyIndex: 1
num: 20
spawnInterval: 0.8
- enemyIndex: 0
num: 30
spawnInterval: 0.8
- spawnTime: 5
groups:
- enemyIndex: 3
num: 1
spawnInterval: 1
- enemyIndex: 2
num: 5
spawnInterval: 1
- enemyIndex: 3
num: 1
spawnInterval: 1
- spawnTime: 5
groups:
- enemyIndex: 3
num: 5
spawnInterval: 3
- spawnTime: 5
groups:
- enemyIndex: 2
num: 15
spawnInterval: 1
- enemyIndex: 1
num: 15
spawnInterval: 1
- enemyIndex: 0
num: 30
spawnInterval: 0.6
- spawnTime: 5
groups:
- enemyIndex: 3
num: 20
spawnInterval: 1
- enemyIndex: 2
num: 20
spawnInterval: 1
- enemyIndex: 1
num: 20
spawnInterval: 0.6
- enemyIndex: 0
num: 20
spawnInterval: 0.5

View File

@ -25,10 +25,10 @@ MonoBehaviour:
price: 500 price: 500
prefab: {fileID: 645933633211530419, guid: 4e5e3131ea2a78cfd93219be3806da6d, type: 3} prefab: {fileID: 645933633211530419, guid: 4e5e3131ea2a78cfd93219be3806da6d, type: 3}
- name: Tesla - name: Tesla
price: 550 price: 500
prefab: {fileID: 1328109535653931045, guid: 148ea27cfb89dc0398835d59bed11cca, prefab: {fileID: 1328109535653931045, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3} type: 3}
- name: Black hole - name: Black hole
price: 650 price: 500
prefab: {fileID: 4611178744751000815, guid: 1d7949721a9f0bc9ba1a8c49ca5fd099, prefab: {fileID: 4611178744751000815, guid: 1d7949721a9f0bc9ba1a8c49ca5fd099,
type: 3} type: 3}

View File

@ -53,7 +53,6 @@ public class WaypointPath : MonoBehaviour
float minDist = Math.Min(dist, data.MoveSpeed * Time.deltaTime); float minDist = Math.Min(dist, data.MoveSpeed * Time.deltaTime);
data.Entity.position += normTargetDir * minDist; data.Entity.position += normTargetDir * minDist;
data.Entity.right = -normTargetDir;
} }
} }

View File

@ -5,19 +5,12 @@ 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))
@ -26,7 +19,6 @@ 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);
@ -49,9 +41,7 @@ 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
@ -64,8 +54,6 @@ 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.

Before

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -1,114 +0,0 @@
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.

Before

Width:  |  Height:  |  Size: 4.7 KiB

View File

@ -1,114 +0,0 @@
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: