Sveskejuice
/
3DTD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui fix

This commit is contained in:
Sveske Juice 2024-04-21 13:34:05 +02:00
parent 409cd3f048
commit b73b634cc2
7 changed files with 198 additions and 615 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Assets/Prefabs/Enemies/Enemy.prefab
View File

@ -145,8 +145,8 @@ Canvas:
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 0
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: -1
m_SortingLayerID: 664711655
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!114 &6292430518164601119
MonoBehaviour:
@ -328,22 +328,22 @@ PrefabInstance:
- target: {fileID: 4530051785811330537, guid: 1436120f3fce990d6ad280ccb90837ad,
type: 3}
propertyPath: m_SizeDelta.x
value: -0.045
value: -0.01274
objectReference: {fileID: 0}
- target: {fileID: 4530051785811330537, guid: 1436120f3fce990d6ad280ccb90837ad,
type: 3}
propertyPath: m_SizeDelta.y
value: -0.050000004
value: -0.01296
objectReference: {fileID: 0}
- target: {fileID: 4530051785811330537, guid: 1436120f3fce990d6ad280ccb90837ad,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.0024999976
value: -0.00022999942
objectReference: {fileID: 0}
- target: {fileID: 4530051785811330537, guid: 1436120f3fce990d6ad280ccb90837ad,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -0.0010100007
objectReference: {fileID: 0}
- target: {fileID: 5650998000461597353, guid: 1436120f3fce990d6ad280ccb90837ad,
type: 3}

3
Assets/Prefabs/Towers/MrLazer.prefab
View File

@ -17498,7 +17498,8 @@ MonoBehaviour:
serializedVersion: 2
m_Bits: 257
beam: {fileID: 4784832335096719658}
attackSecondsDelay: 1
attackSecondsDelay: 0.1
beamDuration: 1
--- !u!114 &2915935455592246780 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3214375543219620994, guid: f54a14318952c90c5b47a300aedb0d15,

6
Assets/Prefabs/UI/GameUI.prefab
View File

@ -683,7 +683,7 @@ Canvas:
serializedVersion: 3
m_RenderMode: 1
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PlaneDistance: 1
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
@ -2285,7 +2285,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -767687967
m_SortingLayer: 1
m_SortingLayer: 2
m_SortingOrder: 10
m_Sprite: {fileID: 21300000, guid: 018869dee58a46448a71dde3b39911b4, type: 3}
m_Color: {r: 0, g: 0, b: 0, a: 1}
@ -3849,7 +3849,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 359.99994, y: 0}
m_AnchoredPosition: {x: 360, y: 0}
m_SizeDelta: {x: 720, y: 1100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8199987074529867173

732
Assets/Scenes/GameScene.unity
View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
m_IndirectSpecularColor: {r: 0.18029143, g: 0.22572419, b: 0.30693057, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -233,7 +233,7 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 66896262}
m_PrefabAsset: {fileID: 0}
--- !u!21 &147017146
--- !u!21 &129310422
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
@ -598,88 +598,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!21 &308231508
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 0, a: 40}
- _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137}
m_BuildTextureStacks: []
--- !u!21 &336182599
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 0, a: 40}
- _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137}
m_BuildTextureStacks: []
--- !u!1 &339673435
GameObject:
m_ObjectHideFlags: 0
@ -902,6 +820,47 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 359510068}
m_PrefabAsset: {fileID: 0}
--- !u!21 &371816795
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 340.1145, g: 535, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 0, a: 40}
- _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573}
m_BuildTextureStacks: []
--- !u!1 &419643241
GameObject:
m_ObjectHideFlags: 0
@ -1112,6 +1071,47 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 443970459}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!21 &452806913
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 5, g: 13.05, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 5, a: 5}
- _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511}
m_BuildTextureStacks: []
--- !u!1 &463101172
GameObject:
m_ObjectHideFlags: 0
@ -1229,7 +1229,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7355133f21643b44e8b997303686916c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!21 &682368138
--- !u!21 &490438992
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
@ -1266,9 +1266,50 @@ Material:
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0}
- _r: {r: 30.96, g: 0, b: 0, a: 0}
- _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626}
- _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0}
- _r: {r: 40, g: 0, b: 0, a: 40}
- _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046}
m_BuildTextureStacks: []
--- !u!21 &656188226
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 0, a: 40}
- _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137}
m_BuildTextureStacks: []
--- !u!1 &739155301
GameObject:
@ -1441,88 +1482,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!21 &821021286
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 5, g: 13.05, b: 0, a: 0}
- _r: {r: 5, g: 5, b: 0, a: 0}
- _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511}
m_BuildTextureStacks: []
--- !u!21 &841286592
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0}
- _r: {r: 30.96, g: 0, b: 0, a: 0}
- _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626}
m_BuildTextureStacks: []
--- !u!1 &846938778
GameObject:
m_ObjectHideFlags: 0
@ -1762,17 +1721,17 @@ PrefabInstance:
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalPosition.x
value: 2.430962
value: 2.4309628
objectReference: {fileID: 0}
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.08475686
value: 0.08475683
objectReference: {fileID: 0}
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.021683885
value: 0.021683881
objectReference: {fileID: 0}
- target: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
@ -1797,12 +1756,12 @@ PrefabInstance:
- target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.08475686
value: 0.08475683
objectReference: {fileID: 0}
- target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.021683885
value: 0.021683881
objectReference: {fileID: 0}
- target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
@ -2325,48 +2284,7 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1211328792}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!21 &1263759025
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 340.1145, g: 535, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 0, a: 40}
- _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573}
m_BuildTextureStacks: []
--- !u!21 &1323209471
--- !u!21 &1304927327
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
@ -2404,8 +2322,8 @@ Material:
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 5, g: 13.05, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 5, a: 5}
- _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511}
- _r: {r: 5, g: 5, b: 0, a: 0}
- _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511}
m_BuildTextureStacks: []
--- !u!114 &1335003908 stripped
MonoBehaviour:
@ -2480,7 +2398,7 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!21 &1434899285
--- !u!21 &1456007328
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
@ -2517,11 +2435,11 @@ Material:
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0}
- _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0}
- _r: {r: 40, g: 0, b: 0, a: 40}
- _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046}
- _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244}
m_BuildTextureStacks: []
--- !u!21 &1466274967
--- !u!21 &1465467873
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
@ -2558,9 +2476,9 @@ Material:
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 5, g: 13.05, b: 0, a: 0}
- _r: {r: 5, g: 5, b: 0, a: 0}
- _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511}
- _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0}
- _r: {r: 30.96, g: 0, b: 0, a: 0}
- _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626}
m_BuildTextureStacks: []
--- !u!1 &1483033597
GameObject:
@ -2704,47 +2622,6 @@ Transform:
- {fileID: 779612216}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!21 &1546477645
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0}
- _r: {r: 40, g: 0, b: 0, a: 40}
- _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244}
m_BuildTextureStacks: []
--- !u!1001 &1554436711
PrefabInstance:
m_ObjectHideFlags: 0
@ -3085,47 +2962,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8e7a492524fd6434aae9b71446cfe174, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!21 &1865637146
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0}
- _r: {r: 40, g: 0, b: 0, a: 40}
- _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244}
m_BuildTextureStacks: []
--- !u!1 &1875223176
GameObject:
m_ObjectHideFlags: 0
@ -3349,47 +3185,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!21 &1941411346
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0}
- _r: {r: 40, g: 0, b: 0, a: 40}
- _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046}
m_BuildTextureStacks: []
--- !u!1 &2004418198
GameObject:
m_ObjectHideFlags: 0
@ -3523,47 +3318,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1c668d8e87e6aee4a8527281f0b61954, type: 3}
--- !u!21 &2093695134
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 360, g: 550, b: 0, a: 0}
- _r: {r: 0, g: 59.4, b: 59.4, a: 59.4}
- _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651}
m_BuildTextureStacks: []
--- !u!1001 &2098922850
PrefabInstance:
m_ObjectHideFlags: 0
@ -3668,88 +3422,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2098922850}
m_PrefabAsset: {fileID: 0}
--- !u!21 &2112685200
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 340.1145, g: 535, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 0, a: 40}
- _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573}
m_BuildTextureStacks: []
--- !u!21 &2142971424
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/IndependentRoundedCorners
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _halfSize: {r: 5, g: 13.05, b: 0, a: 0}
- _r: {r: 0, g: 0, b: 5, a: 5}
- _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511}
m_BuildTextureStacks: []
--- !u!1001 &1982784166430990024
PrefabInstance:
m_ObjectHideFlags: 0
@ -3999,26 +3671,6 @@ PrefabInstance:
propertyPath: m_Name
value: Canvas
objectReference: {fileID: 0}
- target: {fileID: 774744338376071623, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 774744338376071623, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 774744338376071623, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 774744338376071623, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1230386429136411041, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_Camera
@ -4028,12 +3680,12 @@ PrefabInstance:
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 1865637146}
objectReference: {fileID: 1456007328}
- target: {fileID: 3197579811349159231, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 841286592}
objectReference: {fileID: 1465467873}
- target: {fileID: 3367038424042638127, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_Pivot.x
@ -4138,112 +3790,32 @@ PrefabInstance:
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 2112685200}
- target: {fileID: 3735913226073384232, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3735913226073384232, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3735913226073384232, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3735913226073384232, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
objectReference: {fileID: 371816795}
- target: {fileID: 3990110949884708462, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 2142971424}
objectReference: {fileID: 452806913}
- target: {fileID: 4061834703391351603, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 1466274967}
- target: {fileID: 4848966849677167603, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4848966849677167603, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4848966849677167603, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4848966849677167603, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
objectReference: {fileID: 1304927327}
- target: {fileID: 4992629952180980787, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 1941411346}
- target: {fileID: 7402271907180742918, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7402271907180742918, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7402271907180742918, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7402271907180742918, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7535063074468933406, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7535063074468933406, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7535063074468933406, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7535063074468933406, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
objectReference: {fileID: 490438992}
- target: {fileID: 8443057073470027503, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 147017146}
objectReference: {fileID: 129310422}
- target: {fileID: 9067100205361516806, guid: 0a81f2c7ca749af478944c043ef306dc,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 336182599}
objectReference: {fileID: 656188226}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []

53
Assets/Scripts/Tower/BeamTower.cs
View File

@ -11,6 +11,7 @@ public class BeamTower : AimTower
private const float k_maxBeamDist = 100f;
[SerializeField] private LineRenderer beam;
[SerializeField, Range(0.01f, 20f)] private float attackSecondsDelay = 1f;
[SerializeField] private float beamDuration = 1f;
protected override void Awake()
{
@ -36,36 +37,42 @@ public class BeamTower : AimTower
yield return new WaitForEndOfFrame();
continue;
}
int burstsInBeam = (int) (attackSecondsDelay / beamDuration);
Vector3 origin = barrel.Tip.position;
Vector3 rayDir = barrel.transform.forward;
List<Vector3> hitPoints = new();
hitPoints.Add(origin);
for (int i = 0; i < maxBounces; i++)
for (int i = 0; i < burstsInBeam; i++)
{
Debug.DrawRay(origin, rayDir.normalized * k_maxBeamDist, Color.red, 5f);
RaycastHit hit;
if (!Physics.Raycast(origin, rayDir, out hit, k_maxBeamDist, beamMask))
break;
Vector3 origin = barrel.Tip.position;
Vector3 rayDir = barrel.transform.forward;
// Is damagable?
HealthComponent healthComp = hit.collider.gameObject.GetComponent<HealthComponent>();
if (healthComp != null)
List<Vector3> hitPoints = new();
hitPoints.Add(origin);
for (int j = 0; j < maxBounces; j++)
{
Debug.Log($"hitting {healthComp.name} {i}");
healthComp.TakeDamage(damage);
break;
Debug.DrawRay(origin, rayDir.normalized * k_maxBeamDist, Color.red, 5f);
RaycastHit hit;
if (!Physics.Raycast(origin, rayDir, out hit, k_maxBeamDist, beamMask))
break;
// Is damagable?
HealthComponent healthComp = hit.collider.gameObject.GetComponent<HealthComponent>();
if (healthComp != null)
{
healthComp.TakeDamage(damage);
break;
}
hitPoints.Add(hit.point);
rayDir = Vector3.Reflect(rayDir, hit.normal);
origin = hit.point;
}
hitPoints.Add(hit.point);
rayDir = Vector3.Reflect(rayDir, hit.normal);
origin = hit.point;
beam.positionCount = hitPoints.Count;
beam.SetPositions(hitPoints.ToArray());
this.OnAttack?.Invoke();
yield return new WaitForSeconds(attackSecondsDelay);
}
beam.positionCount = hitPoints.Count;
beam.SetPositions(hitPoints.ToArray());
this.OnAttack?.Invoke();
yield return new WaitForSeconds(attackSecondsDelay);
beam.enabled = !beam.enabled;
yield return new WaitForSeconds(beamDuration);
} while (true);
}

2
ProjectSettings/DynamicsManager.asset
View File

@ -18,7 +18,7 @@ PhysicsManager:
m_ClothInterCollisionDistance: 0.1
m_ClothInterCollisionStiffness: 0.2
m_ContactsGeneration: 1
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffbfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffbffdffffffffffffffffffffbfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_SimulationMode: 0
m_AutoSyncTransforms: 0
m_ReuseCollisionCallbacks: 1

5
ProjectSettings/TagManager.asset
View File

@ -15,7 +15,7 @@ TagManager:
- Projectile
- PostProcessing
- Tower
-
- Slider
-
-
-
@ -42,6 +42,9 @@ TagManager:
- name: Default
uniqueID: 0
locked: 0
- name: EnemyUI
uniqueID: 664711655
locked: 0
- name: Overlay
uniqueID: 3527279329
locked: 0