diff --git a/Assets/Audio/AudioLib.asset b/Assets/Audio/AudioLib.asset index 1821385..511dae3 100644 --- a/Assets/Audio/AudioLib.asset +++ b/Assets/Audio/AudioLib.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: AudioLib m_EditorClassIdentifier: Clips: - - {fileID: 8300000, guid: ea208a46b2ab9bc45b936d5d7e0455cf, type: 3} + - {fileID: 8300000, guid: 866ac77aa3587de4aa79a63029d631e6, type: 3} - {fileID: 8300000, guid: 58d0fae7e12873e4293f7e9bce59fcdc, type: 3} - {fileID: 8300000, guid: 1d08abd4771cf954a92649be9eaa32da, type: 3} - {fileID: 8300000, guid: fe1f2d7ea272e2d47aa2140b739f93fa, type: 3} diff --git a/Assets/Models/1ShootTower.fbx.meta b/Assets/Models/1ShootTower.fbx.meta index 198f782..2d121d0 100644 --- a/Assets/Models/1ShootTower.fbx.meta +++ b/Assets/Models/1ShootTower.fbx.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 0.1 diff --git a/Assets/Models/BlackHole.fbx.meta b/Assets/Models/BlackHole.fbx.meta index 9b6bfd3..275d93e 100644 --- a/Assets/Models/BlackHole.fbx.meta +++ b/Assets/Models/BlackHole.fbx.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 0.1 @@ -90,7 +90,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 0.001 + globalScale: 0.1 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/Models/GreenBoy.fbx.meta b/Assets/Models/GreenBoy.fbx.meta index e08f8f5..a32cc30 100644 --- a/Assets/Models/GreenBoy.fbx.meta +++ b/Assets/Models/GreenBoy.fbx.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 0.1 @@ -90,7 +90,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 0.001 + globalScale: 0.1 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/Models/Gripper.fbx.meta b/Assets/Models/Gripper.fbx.meta index feabd42..b943f96 100644 --- a/Assets/Models/Gripper.fbx.meta +++ b/Assets/Models/Gripper.fbx.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 0.1 @@ -90,7 +90,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 0.001 + globalScale: 0.1 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/Models/MrLazer.fbx.meta b/Assets/Models/MrLazer.fbx.meta index cb753d6..fbe0deb 100644 --- a/Assets/Models/MrLazer.fbx.meta +++ b/Assets/Models/MrLazer.fbx.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 0.1 @@ -90,7 +90,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 0.001 + globalScale: 0.1 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/Models/Tesla.fbx.meta b/Assets/Models/Tesla.fbx.meta index d3e5c90..786af76 100644 --- a/Assets/Models/Tesla.fbx.meta +++ b/Assets/Models/Tesla.fbx.meta @@ -32,7 +32,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 0 + isReadable: 1 meshes: lODScreenPercentages: [] globalScale: 0.1 @@ -90,7 +90,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 0.001 + globalScale: 0.1 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/Prefabs/Camera/TowerCam.prefab b/Assets/Prefabs/Camera/TowerCam.prefab index 3ff165e..b9882df 100644 --- a/Assets/Prefabs/Camera/TowerCam.prefab +++ b/Assets/Prefabs/Camera/TowerCam.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 3935553693191687206} - component: {fileID: 3732065988533673491} - component: {fileID: 2139314887802289122} - - component: {fileID: 3078086233640988956} + - component: {fileID: 3080339522778764198} m_Layer: 0 m_Name: cm m_TagString: Untagged @@ -59,7 +59,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 2.5, z: -3} + m_FollowOffset: {x: 0, y: 4.5, z: -1.75} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -100,7 +100,7 @@ MonoBehaviour: m_LegacyHeightOffset: 3.4028235e+38 m_LegacyHeadingBias: 3.4028235e+38 m_HeadingIsSlave: 1 ---- !u!114 &3078086233640988956 +--- !u!114 &3080339522778764198 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -109,24 +109,9 @@ MonoBehaviour: m_GameObject: {fileID: 1257898757355507338} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Script: {fileID: 11500000, guid: 1e8b78ac948f05a46a6d8339a503172b, type: 3} m_Name: m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.55 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 --- !u!1 &2261812770106084702 GameObject: m_ObjectHideFlags: 3 @@ -217,7 +202,7 @@ GameObject: - component: {fileID: 3027632321437918642} - component: {fileID: 4362122749243549594} - component: {fileID: 8016315811664278882} - - component: {fileID: 6889278937293188591} + - component: {fileID: 4301055406757644015} m_Layer: 0 m_Name: cm m_TagString: Untagged @@ -265,7 +250,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 2.5, z: -3} + m_FollowOffset: {x: 0, y: 4.5, z: -1.75} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -306,7 +291,7 @@ MonoBehaviour: m_LegacyHeightOffset: 3.4028235e+38 m_LegacyHeadingBias: 3.4028235e+38 m_HeadingIsSlave: 1 ---- !u!114 &6889278937293188591 +--- !u!114 &4301055406757644015 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -315,24 +300,9 @@ MonoBehaviour: m_GameObject: {fileID: 4740903846569071278} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Script: {fileID: 11500000, guid: 1e8b78ac948f05a46a6d8339a503172b, type: 3} m_Name: m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.5 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 --- !u!1 &6141502994562452495 GameObject: m_ObjectHideFlags: 3 @@ -423,7 +393,7 @@ GameObject: - component: {fileID: 8170234917192505078} - component: {fileID: 511076899392859752} - component: {fileID: 1492161936061921830} - - component: {fileID: 4059060178688909238} + - component: {fileID: 8827996852199296668} m_Layer: 0 m_Name: cm m_TagString: Untagged @@ -471,7 +441,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 2.5, z: -3} + m_FollowOffset: {x: 0, y: 4.5, z: -1.75} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -512,7 +482,7 @@ MonoBehaviour: m_LegacyHeightOffset: 3.4028235e+38 m_LegacyHeadingBias: 3.4028235e+38 m_HeadingIsSlave: 1 ---- !u!114 &4059060178688909238 +--- !u!114 &8827996852199296668 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -521,24 +491,9 @@ MonoBehaviour: m_GameObject: {fileID: 6870596811972565747} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Script: {fileID: 11500000, guid: 1e8b78ac948f05a46a6d8339a503172b, type: 3} m_Name: m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.6 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 --- !u!1 &7138673713016148905 GameObject: m_ObjectHideFlags: 3 @@ -629,6 +584,9 @@ GameObject: - component: {fileID: 1628714305827477991} - component: {fileID: 9015098249639605300} - component: {fileID: 6162594480593627889} + - component: {fileID: 5831827090361496139} + - component: {fileID: 1880671857495123661} + - component: {fileID: 3685285690701009546} m_Layer: 0 m_Name: TowerCam m_TagString: Untagged @@ -694,14 +652,14 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_YAxis: - Value: 0.5 + Value: 1 m_SpeedMode: 0 m_MaxSpeed: 2 m_AccelTime: 0.2 m_DecelTime: 0.1 m_InputAxisName: Mouse Y m_InputAxisValue: 0 - m_InvertInput: 0 + m_InvertInput: 1 m_MinValue: 0 m_MaxValue: 1 m_Wrap: 0 @@ -725,7 +683,7 @@ MonoBehaviour: m_DecelTime: 0.1 m_InputAxisName: Mouse X m_InputAxisValue: 0 - m_InvertInput: 1 + m_InvertInput: 0 m_MinValue: -180 m_MaxValue: 180 m_Wrap: 1 @@ -771,3 +729,79 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bb343e5418f1e1144aab7c51b7482da7, type: 3} m_Name: m_EditorClassIdentifier: + m_gameObject: {fileID: 0} +--- !u!114 &5831827090361496139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7612880158138396871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf9c49671cd01e143b3f6bb3ecf490d5, type: 3} + m_Name: + m_EditorClassIdentifier: + cam: {fileID: 7612880158138396871} + scrollSpeed: 2.5 + stopAfterTime: 5 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + sens: {x: 300, y: 3} +--- !u!114 &1880671857495123661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7612880158138396871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44d70cc20219cd84593f67d248eafe36, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Offset: {x: 0, y: 0, z: -0.1} + m_ApplyAfter: 1 + m_PreserveComposition: 0 +--- !u!114 &3685285690701009546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7612880158138396871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0aa8da13840a5cb43997aca17b09b15d, type: 3} + m_Name: + m_EditorClassIdentifier: + target: {fileID: 0} + origin: {fileID: 7612880158138396871} + towerCamScript: {fileID: 6162594480593627889} + hideFadeSpeed: 7 + showFadeSpeed: 2 + sphereRadius: 3.5 + sphereRange: 2.5 + sphereOffset: {x: 0, y: 8, z: 0} diff --git a/Assets/Prefabs/Projectiles/PlasmaBullet.prefab b/Assets/Prefabs/Projectiles/PlasmaBullet.prefab index 98339d9..bdec4dd 100644 --- a/Assets/Prefabs/Projectiles/PlasmaBullet.prefab +++ b/Assets/Prefabs/Projectiles/PlasmaBullet.prefab @@ -11,8 +11,7 @@ GameObject: - component: {fileID: 5074286193465566833} - component: {fileID: 622750128577529191} - component: {fileID: 6351475726872690782} - - component: {fileID: 599986095408968252} - m_Layer: 0 + m_Layer: 6 m_Name: Cube m_TagString: Untagged m_Icon: {fileID: 0} @@ -84,27 +83,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &599986095408968252 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 351786554158684029} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &3238744023741729767 GameObject: m_ObjectHideFlags: 0 @@ -116,8 +94,7 @@ GameObject: - component: {fileID: 2775812873468504414} - component: {fileID: 4675805639711564604} - component: {fileID: 4219885489247769707} - - component: {fileID: 5021138776713670615} - m_Layer: 0 + m_Layer: 6 m_Name: Cube (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -189,27 +166,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &5021138776713670615 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3238744023741729767} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &3248525637879141301 GameObject: m_ObjectHideFlags: 0 @@ -222,7 +178,10 @@ GameObject: - component: {fileID: 99605857738449373} - component: {fileID: 7995358721369753704} - component: {fileID: 6343727252069474822} - m_Layer: 0 + - component: {fileID: 4402499257783305611} + - component: {fileID: 40811086166306172} + - component: {fileID: -5026537654431272615} + m_Layer: 6 m_Name: PlasmaBullet m_TagString: Untagged m_Icon: {fileID: 0} @@ -353,6 +312,73 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 +--- !u!65 &4402499257783305611 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3248525637879141301} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.35, y: 0.35, z: 0.35} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &40811086166306172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3248525637879141301} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a98521a4b559621438fc196adc605f3b, type: 3} + m_Name: + m_EditorClassIdentifier: + bounciness: 1 + damage: 10 + wallRebounces: 4 + comingFrom: {fileID: 0} + OnReflect: + m_PersistentCalls: + m_Calls: [] +--- !u!54 &-5026537654431272615 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3248525637879141301} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &4076130981359727988 GameObject: m_ObjectHideFlags: 0 @@ -364,8 +390,7 @@ GameObject: - component: {fileID: 1553517095972250766} - component: {fileID: 6040231071127825331} - component: {fileID: 8585621083194835676} - - component: {fileID: 4415436936380299287} - m_Layer: 0 + m_Layer: 6 m_Name: Cube (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -437,27 +462,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &4415436936380299287 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4076130981359727988} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &5166680093018848385 GameObject: m_ObjectHideFlags: 0 @@ -469,7 +473,7 @@ GameObject: - component: {fileID: 952306820225547086} - component: {fileID: 3616690214030999077} - component: {fileID: 6503966235850705177} - m_Layer: 0 + m_Layer: 6 m_Name: Bounce / Shoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -5366,7 +5370,7 @@ GameObject: - component: {fileID: 3826416426683448326} - component: {fileID: 6047847810707290244} - component: {fileID: 1756746869659166590} - m_Layer: 0 + m_Layer: 6 m_Name: Particle System m_TagString: Untagged m_Icon: {fileID: 0} @@ -10205,8 +10209,7 @@ GameObject: - component: {fileID: 5911113516372945005} - component: {fileID: 7029898274017296766} - component: {fileID: 7206949835680583260} - - component: {fileID: 2153801654926115010} - m_Layer: 0 + m_Layer: 6 m_Name: Cube (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -10278,24 +10281,3 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &2153801654926115010 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8900264520011667323} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Towers/BaseTower.prefab b/Assets/Prefabs/Towers/BaseTower.prefab index b731fe1..c07e1b2 100644 --- a/Assets/Prefabs/Towers/BaseTower.prefab +++ b/Assets/Prefabs/Towers/BaseTower.prefab @@ -12,7 +12,6 @@ GameObject: - component: {fileID: 7883233016828513649} - component: {fileID: 5565472806559733162} - component: {fileID: -4368249141776341009} - - component: {fileID: 8326258332086092779} - component: {fileID: 1772828647246745231} - component: {fileID: 3214375543219620994} m_Layer: 8 @@ -36,9 +35,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5000648575824335922} - - {fileID: 3231648858884615218} - - {fileID: 4220667717328304921} - - {fileID: 85471039882070109} - {fileID: 8658008248069201232} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -142,111 +138,6 @@ MonoBehaviour: precomputeOutline: 0 bakeKeys: [] bakeValues: [] ---- !u!114 &8326258332086092779 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 872127579833310669} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 319d2fe34a804e245819465c9505ea59, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 527409087646353271} - m_Follow: {fileID: 527409087646353271} - m_CommonLens: 1 - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_YAxis: - Value: 0.5 - m_SpeedMode: 0 - m_MaxSpeed: 2 - m_AccelTime: 0.2 - m_DecelTime: 0.1 - m_InputAxisName: Mouse Y - m_InputAxisValue: 0 - m_InvertInput: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_Wrap: 0 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_YAxisRecentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: Mouse X - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_BindingMode: 5 - m_SplineCurvature: 0.2 - m_Orbits: - - m_Height: 4.5 - m_Radius: 1.75 - - m_Height: 2.5 - m_Radius: 3 - - m_Height: 0.4 - m_Radius: 1.3 - m_LegacyHeadingBias: 3.4028235e+38 - m_Rigs: - - {fileID: 6733197279741857448} - - {fileID: 3875905170154804327} - - {fileID: 7471033669110783771} --- !u!114 &1772828647246745231 MonoBehaviour: m_ObjectHideFlags: 0 @@ -273,545 +164,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d720360aef3510faf93af9ce3a78b2fc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &881819783351085137 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3043206501377313387} - - component: {fileID: 1604521831440090531} - - component: {fileID: 3654006014515307891} - - component: {fileID: 8314437777887737673} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3043206501377313387 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 881819783351085137} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 85471039882070109} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1604521831440090531 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 881819783351085137} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &3654006014515307891 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 881819783351085137} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 2.5, z: -3} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &8314437777887737673 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 881819783351085137} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.6 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 ---- !u!1 &1829274643066236986 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5028610344310564584} - - component: {fileID: 2921780199747443927} - - component: {fileID: 703045981101343854} - - component: {fileID: 429639274105194281} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5028610344310564584 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1829274643066236986} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3231648858884615218} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2921780199747443927 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1829274643066236986} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &703045981101343854 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1829274643066236986} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 2.5, z: -3} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &429639274105194281 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1829274643066236986} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.5 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 ---- !u!1 &3352080502988888719 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7908333169234343085} - - component: {fileID: 932518073561982220} - - component: {fileID: 2611612522491397238} - - component: {fileID: 2140871769417237111} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7908333169234343085 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3352080502988888719} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4220667717328304921} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &932518073561982220 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3352080502988888719} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2611612522491397238 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3352080502988888719} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 5 - m_FollowOffset: {x: 0, y: 2.5, z: -3} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &2140871769417237111 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3352080502988888719} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.55 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 ---- !u!1 &3558272651156871278 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3231648858884615218} - - component: {fileID: 6733197279741857448} - m_Layer: 0 - m_Name: TopRig - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3231648858884615218 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3558272651156871278} - serializedVersion: 2 - m_LocalRotation: {x: 0.34042525, y: -0.00000002288009, z: 0.000000008283735, w: 0.9402716} - m_LocalPosition: {x: -1.745, y: 2.334, z: -3} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5028610344310564584} - m_Father: {fileID: 527409087646353271} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6733197279741857448 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3558272651156871278} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 5028610344310564584} ---- !u!1 &4474798581911876227 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4220667717328304921} - - component: {fileID: 3875905170154804327} - m_Layer: 0 - m_Name: MiddleRig - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4220667717328304921 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4474798581911876227} - serializedVersion: 2 - m_LocalRotation: {x: 0.32326588, y: -0.000000016282542, z: 0.0000000055622356, w: 0.9463082} - m_LocalPosition: {x: -1.745, y: 2.334, z: -3} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7908333169234343085} - m_Father: {fileID: 527409087646353271} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3875905170154804327 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4474798581911876227} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 7908333169234343085} --- !u!1 &4657144566828515878 GameObject: m_ObjectHideFlags: 0 @@ -1148,85 +500,6 @@ MonoBehaviour: m_FillOrigin: 1 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6616012430861705016 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 85471039882070109} - - component: {fileID: 7471033669110783771} - m_Layer: 0 - m_Name: BottomRig - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &85471039882070109 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6616012430861705016} - serializedVersion: 2 - m_LocalRotation: {x: 0.3060453, y: 0.000000023165901, z: -0.0000000074471513, w: 0.952017} - m_LocalPosition: {x: -1.745, y: 2.334, z: -3} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3043206501377313387} - m_Father: {fileID: 527409087646353271} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7471033669110783771 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6616012430861705016} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 3043206501377313387} --- !u!1 &8398575655800056308 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Towers/Gripper.prefab b/Assets/Prefabs/Towers/Gripper.prefab index 73cc508..67c5137 100644 --- a/Assets/Prefabs/Towers/Gripper.prefab +++ b/Assets/Prefabs/Towers/Gripper.prefab @@ -192,7 +192,7 @@ Transform: m_GameObject: {fileID: 1335003672673836309} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.00226} + m_LocalPosition: {x: 0, y: -0, z: 0.00265} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1184,6 +1184,41 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.z + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.99934006 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.03632495 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} - target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.x @@ -1239,6 +1274,81 @@ PrefabInstance: propertyPath: m_Name value: Gripper objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.z + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.x + value: -1e-45 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalPosition.z + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9998346 + objectReference: {fileID: 0} + - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.018189488 + objectReference: {fileID: 0} + - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.000000017203536 + objectReference: {fileID: 0} + - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_LocalRotation.z + value: 3.1297526e-10 + objectReference: {fileID: 0} + - target: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5565472806559733162, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_Size.x @@ -1274,21 +1384,6 @@ PrefabInstance: propertyPath: m_Rigs.Array.size value: 3 objectReference: {fileID: 0} - - target: {fileID: 8326258332086092779, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - propertyPath: m_Rigs.Array.data[0] - value: - objectReference: {fileID: 2535829998905118396} - - target: {fileID: 8326258332086092779, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - propertyPath: m_Rigs.Array.data[1] - value: - objectReference: {fileID: 451396761876996652} - - target: {fileID: 8326258332086092779, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - propertyPath: m_Rigs.Array.data[2] - value: - objectReference: {fileID: 137830739692147640} m_RemovedComponents: - {fileID: 703045981101343854, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} - {fileID: 429639274105194281, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1342,217 +1437,7 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 518739909791365985} - - targetCorrespondingSourceObject: {fileID: 3558272651156871278, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - insertIndex: -1 - addedObject: {fileID: 2535829998905118396} - - targetCorrespondingSourceObject: {fileID: 1829274643066236986, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - insertIndex: -1 - addedObject: {fileID: -653555726885491193} - - targetCorrespondingSourceObject: {fileID: 1829274643066236986, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - insertIndex: -1 - addedObject: {fileID: -1985646451265340337} - - targetCorrespondingSourceObject: {fileID: 4474798581911876227, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - insertIndex: -1 - addedObject: {fileID: 451396761876996652} - - targetCorrespondingSourceObject: {fileID: 3352080502988888719, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - insertIndex: -1 - addedObject: {fileID: 7361492656729499411} - - targetCorrespondingSourceObject: {fileID: 3352080502988888719, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - insertIndex: -1 - addedObject: {fileID: -5494429373303235990} - - targetCorrespondingSourceObject: {fileID: 6616012430861705016, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - insertIndex: -1 - addedObject: {fileID: 137830739692147640} - - targetCorrespondingSourceObject: {fileID: 881819783351085137, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - insertIndex: -1 - addedObject: {fileID: 3170189884128747661} - - targetCorrespondingSourceObject: {fileID: 881819783351085137, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - insertIndex: -1 - addedObject: {fileID: 577103753674577615} m_SourcePrefab: {fileID: 100100000, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} ---- !u!1 &494127321866500263 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1829274643066236986, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - m_PrefabInstance: {fileID: 2286031694991280285} - m_PrefabAsset: {fileID: 0} ---- !u!114 &-653555726885491193 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 494127321866500263} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 1 - m_FollowOffset: {x: 0, y: 0, z: -10} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &-1985646451265340337 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 494127321866500263} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.5 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 ---- !u!1 &1406609474406375628 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 881819783351085137, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - m_PrefabInstance: {fileID: 2286031694991280285} - m_PrefabAsset: {fileID: 0} ---- !u!114 &3170189884128747661 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1406609474406375628} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 1 - m_FollowOffset: {x: 0, y: 0, z: -10} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &577103753674577615 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1406609474406375628} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.6 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 --- !u!1 &1415246146501367120 stripped GameObject: m_CorrespondingSourceObject: {fileID: 872127579833310669, guid: f54a14318952c90c5b47a300aedb0d15, @@ -1571,7 +1456,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3c6fb039e74d12a7bbfde22591bc7eee, type: 3} m_Name: m_EditorClassIdentifier: - selectedUI: {fileID: 0} + selectedUI: {fileID: 6852259792091155131} + OnAttack: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3684608807871333407} + m_TargetAssemblyTypeName: PlaySound, Assembly-CSharp + m_MethodName: PlayASound + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Shotgun Shoot + m_BoolArgument: 0 + m_CallState: 2 barrel: {fileID: 2362138183372646645} horizontalArc: {fileID: 9137069524165408036} verticalArc: {fileID: 8606494081824023083} @@ -1589,7 +1489,7 @@ MonoBehaviour: - Arc: 0 Amount: 1 Speed: 100 - bulletPrefab: {fileID: 2962360034595352958, guid: 32921dff6554af324ba0001ca8b56fee, + bulletPrefab: {fileID: 4420203067853765648, guid: 86d1599960f06fa4b830584980cb93c7, type: 3} Burst: 0 BurstDelay: 0 @@ -1612,264 +1512,21 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2286031694991280285} m_PrefabAsset: {fileID: 0} ---- !u!1 &2422989569247558174 stripped +--- !u!114 &3684608807871333407 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3214375543219620994, guid: f54a14318952c90c5b47a300aedb0d15, + type: 3} + m_PrefabInstance: {fileID: 2286031694991280285} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1415246146501367120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d720360aef3510faf93af9ce3a78b2fc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &6852259792091155131 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 4474798581911876227, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - m_PrefabInstance: {fileID: 2286031694991280285} - m_PrefabAsset: {fileID: 0} ---- !u!114 &451396761876996652 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2422989569247558174} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 8248789844841184304} ---- !u!1 &3375478334972236019 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3558272651156871278, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - m_PrefabInstance: {fileID: 2286031694991280285} - m_PrefabAsset: {fileID: 0} ---- !u!114 &2535829998905118396 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3375478334972236019} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 6516897509766409845} ---- !u!1 &3548105072935637522 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3352080502988888719, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - m_PrefabInstance: {fileID: 2286031694991280285} - m_PrefabAsset: {fileID: 0} ---- !u!114 &7361492656729499411 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3548105072935637522} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 1 - m_FollowOffset: {x: 0, y: 0, z: -10} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &-5494429373303235990 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3548105072935637522} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.55 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 ---- !u!4 &3855707480985977590 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3043206501377313387, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - m_PrefabInstance: {fileID: 2286031694991280285} - m_PrefabAsset: {fileID: 0} ---- !u!1 &4929561385314670501 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6616012430861705016, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - m_PrefabInstance: {fileID: 2286031694991280285} - m_PrefabAsset: {fileID: 0} ---- !u!114 &137830739692147640 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4929561385314670501} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 3855707480985977590} ---- !u!4 &6516897509766409845 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5028610344310564584, guid: f54a14318952c90c5b47a300aedb0d15, - type: 3} - m_PrefabInstance: {fileID: 2286031694991280285} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8248789844841184304 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7908333169234343085, guid: f54a14318952c90c5b47a300aedb0d15, + m_CorrespondingSourceObject: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} m_PrefabInstance: {fileID: 2286031694991280285} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Towers/MrLazer.prefab b/Assets/Prefabs/Towers/MrLazer.prefab index 6cc8a2e..2d523a8 100644 --- a/Assets/Prefabs/Towers/MrLazer.prefab +++ b/Assets/Prefabs/Towers/MrLazer.prefab @@ -1178,7 +1178,7 @@ PrefabInstance: - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.w - value: 0.7807551 + value: 0.78075516 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1218,17 +1218,17 @@ PrefabInstance: - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.x - value: 0.268424 + value: 0.26842403 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: 0.527322 + value: 0.52732193 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: -0.18013711 + value: -0.18013707 objectReference: {fileID: 0} - target: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} diff --git a/Assets/Prefabs/Towers/Tesla.prefab b/Assets/Prefabs/Towers/Tesla.prefab index 2512c4e..24555ff 100644 --- a/Assets/Prefabs/Towers/Tesla.prefab +++ b/Assets/Prefabs/Towers/Tesla.prefab @@ -1423,17 +1423,17 @@ PrefabInstance: - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.x - value: 0.29548866 + value: 0.2954887 objectReference: {fileID: 0} - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: 0.24788545 + value: 0.2478855 objectReference: {fileID: 0} - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: -0.079687834 + value: -0.07968786 objectReference: {fileID: 0} - target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1443,12 +1443,12 @@ PrefabInstance: - target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.y - value: 7.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.z - value: -9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1513,17 +1513,17 @@ PrefabInstance: - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.x - value: 0.32868278 + value: 0.32868275 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: 0.24482724 + value: 0.24482721 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: -0.08863968 + value: -0.08863967 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1548,17 +1548,17 @@ PrefabInstance: - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.x - value: 0.31211528 + value: 0.3121153 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: 0.24639907 + value: 0.24639902 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: -0.08417174 + value: -0.08417173 objectReference: {fileID: 0} - target: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1708,7 +1708,7 @@ MonoBehaviour: - Arc: 0 Amount: 1 Speed: 100 - bulletPrefab: {fileID: 2962360034595352958, guid: 32921dff6554af324ba0001ca8b56fee, + bulletPrefab: {fileID: 3248525637879141301, guid: 2ad3be6c6ede5d64e9c73ce6b7a060a5, type: 3} Burst: 0 BurstDelay: 0 diff --git a/Assets/Prefabs/Towers/Turret.prefab b/Assets/Prefabs/Towers/Turret.prefab index 9c61ed3..ea5a8bc 100644 --- a/Assets/Prefabs/Towers/Turret.prefab +++ b/Assets/Prefabs/Towers/Turret.prefab @@ -931,12 +931,12 @@ PrefabInstance: - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: 3.153011e-36 + value: -0 objectReference: {fileID: 0} - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: 1.3634104e-37 + value: -0 objectReference: {fileID: 0} - target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1021,7 +1021,7 @@ PrefabInstance: - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.x - value: 2.524355e-29 + value: -1e-45 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1061,12 +1061,12 @@ PrefabInstance: - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: -0.00000001990998 + value: -0.000000017203536 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: -3.6221226e-10 + value: -3.1297526e-10 objectReference: {fileID: 0} - target: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1641,7 +1641,7 @@ MonoBehaviour: - Arc: 0 Amount: 1 Speed: 100 - bulletPrefab: {fileID: 2962360034595352958, guid: 32921dff6554af324ba0001ca8b56fee, + bulletPrefab: {fileID: 4420203067853765648, guid: 86d1599960f06fa4b830584980cb93c7, type: 3} Burst: 0 BurstDelay: 0 diff --git a/Assets/Prefabs/UI/GameUI.prefab b/Assets/Prefabs/UI/GameUI.prefab index 7907e0d..45d4003 100644 --- a/Assets/Prefabs/UI/GameUI.prefab +++ b/Assets/Prefabs/UI/GameUI.prefab @@ -1,5 +1,139 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &15713718906236803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3924426802208158751} + - component: {fileID: 7689507736539613673} + - component: {fileID: 3032624624951903766} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3924426802208158751 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 15713718906236803} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5335440098138690820} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -6.8} + m_SizeDelta: {x: 115.1155, y: 25.5046} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &7689507736539613673 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 15713718906236803} + m_CullTransparentMesh: 1 +--- !u!114 &3032624624951903766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 15713718906236803} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Cancel + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4280163870 + m_fontColor: {r: 0.11949676, g: 0.11949676, b: 0.11949676, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 21.4 + m_fontSizeBase: 21.4 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &215452377197404683 GameObject: m_ObjectHideFlags: 0 @@ -461,6 +595,7 @@ GameObject: - component: {fileID: 690056826935864709} - component: {fileID: 3685877439028762280} - component: {fileID: 1977405528458548599} + - component: {fileID: 1670233975246388694} m_Layer: 5 m_Name: GameUI m_TagString: Untagged @@ -482,8 +617,9 @@ RectTransform: m_Children: - {fileID: 1264509985005215626} - {fileID: 4189792432299129876} - - {fileID: 5203690656153714838} - {fileID: 7094050956717546836} + - {fileID: 5203690656153714838} + - {fileID: 4429602029198271624} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -594,6 +730,21 @@ MonoBehaviour: anim: {fileID: 4666018611790278925} OpenerTrigger: {fileID: 8309357188702065273} CloseTrigger: {fileID: 3164206115851743815} +--- !u!114 &1670233975246388694 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 715023913428069073} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 345b869fb2a87d048b4d3297670ca10f, type: 3} + m_Name: + m_EditorClassIdentifier: + ShopUI: {fileID: 5443863488021826499} + ConstructionUI: {fileID: 4415559599605733937} + CancelButton: {fileID: 4179011387012367373} --- !u!1 &916661619396280674 GameObject: m_ObjectHideFlags: 0 @@ -2256,6 +2407,43 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &4415559599605733937 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4429602029198271624} + m_Layer: 5 + m_Name: ContructionUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4429602029198271624 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4415559599605733937} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7041526889317522378} + - {fileID: 5335440098138690820} + m_Father: {fileID: 3367038424042638127} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4447011606509579576 GameObject: m_ObjectHideFlags: 0 @@ -2393,6 +2581,78 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4580602139949487142 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7041526889317522378} + - component: {fileID: 4686081723849999900} + - component: {fileID: 6854959695554337315} + m_Layer: 5 + m_Name: ConstructionBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7041526889317522378 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4580602139949487142} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4429602029198271624} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4686081723849999900 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4580602139949487142} + m_CullTransparentMesh: 1 +--- !u!114 &6854959695554337315 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4580602139949487142} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 98c95a575adf2f648a18d729b173789a, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &4733917317194524145 GameObject: m_ObjectHideFlags: 0 @@ -2570,7 +2830,7 @@ GameObject: - component: {fileID: 4666018611790278925} - component: {fileID: 97991100743388055} m_Layer: 5 - m_Name: UI Border + m_Name: ShopUI m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3008,6 +3268,80 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1 &6439036065638827550 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5335440098138690820} + - component: {fileID: 63844667557183575} + - component: {fileID: 1928548670811694117} + m_Layer: 5 + m_Name: ButtonContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5335440098138690820 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6439036065638827550} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3924426802208158751} + - {fileID: 5865018047227388532} + m_Father: {fileID: 4429602029198271624} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 46.2, y: 47.9} + m_SizeDelta: {x: 100, y: 150} + m_Pivot: {x: 0, y: 0} +--- !u!222 &63844667557183575 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6439036065638827550} + m_CullTransparentMesh: 1 +--- !u!114 &1928548670811694117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6439036065638827550} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: fa8f31dc92661784a9c4bc994a7073d7, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &6601331152233782693 GameObject: m_ObjectHideFlags: 0 @@ -3962,6 +4296,126 @@ MonoBehaviour: r: {x: 30.96, y: 0, z: 0, w: 0} rect2props: {x: 7.7400208, y: -7.7400017, z: 84.93025, w: 95.87626} image: {fileID: 3197579811349159231} +--- !u!1 &8933712729125795071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5865018047227388532} + - component: {fileID: 6200093961610863849} + - component: {fileID: 4583122141775293707} + - component: {fileID: 4179011387012367373} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5865018047227388532 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8933712729125795071} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5335440098138690820} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 55} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6200093961610863849 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8933712729125795071} + m_CullTransparentMesh: 1 +--- !u!114 &4583122141775293707 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8933712729125795071} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 65f4785c1fd93dc45b06d111c6e5f70e, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4179011387012367373 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8933712729125795071} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4583122141775293707} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &9154155236048502357 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index a55ae87..dd9d72e 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -268,6 +268,47 @@ Transform: type: 3} m_PrefabInstance: {fileID: 66896262} m_PrefabAsset: {fileID: 0} +--- !u!21 &143475085 +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 &203396308 PrefabInstance: m_ObjectHideFlags: 0 @@ -356,6 +397,47 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0c13e24f92c86f84a85c76e0bca22830, type: 3} +--- !u!21 &209003985 +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 &224165741 GameObject: m_ObjectHideFlags: 0 @@ -633,6 +715,47 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!21 &287645411 +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!1 &339673435 GameObject: m_ObjectHideFlags: 0 @@ -1014,6 +1137,47 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!21 &891221911 +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 &922758185 GameObject: m_ObjectHideFlags: 0 @@ -1145,66 +1309,76 @@ PrefabInstance: propertyPath: m_Name value: Cinemachine objectReference: {fileID: 0} + - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: -0.10023358 + value: 0.08534326 objectReference: {fileID: 0} - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: -0.022605715 + value: 0.019247493 objectReference: {fileID: 0} - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.y - value: 0.9703356 + value: 0.9717585 objectReference: {fileID: 0} - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.z - value: -0.21884015 + value: -0.219161 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.x - value: 10.297432 + value: 2.4309573 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.y - value: 12.445195 + value: 12.445194 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.z - value: 18.85268 + value: 18.973312 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: -0.09954502 + value: 0.08475698 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: -0.02546724 + value: 0.021683913 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.y - value: 0.9636698 + value: 0.9650828 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.z - value: -0.2465418 + value: -0.24690327 objectReference: {fileID: 0} - target: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: field of view value: 60 objectReference: {fileID: 0} + - target: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_CullingMask.m_Bits + value: 1399 + objectReference: {fileID: 0} - target: {fileID: 3313768392743891090, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: sphereRange @@ -1225,11 +1399,31 @@ PrefabInstance: propertyPath: maxSphereRayDistance value: 7 objectReference: {fileID: 0} + - target: {fileID: 3665490202611795451, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_LocalPosition.x + value: 3.9598308 + objectReference: {fileID: 0} - target: {fileID: 3665490202611795451, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.y value: 7.6427956 objectReference: {fileID: 0} + - target: {fileID: 3665490202611795451, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_LocalPosition.z + value: 10.336213 + objectReference: {fileID: 0} + - target: {fileID: 3837216061230793568, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: scrollSpeed + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3837216061230793568, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: stopAfterTime + value: 7.5 + objectReference: {fileID: 0} - target: {fileID: 5664717836218291588, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_Orbits.Array.data[0].m_Height @@ -1245,50 +1439,65 @@ PrefabInstance: propertyPath: m_Orbits.Array.data[2].m_Height value: -10 objectReference: {fileID: 0} + - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: -0.09954503 + value: 0.08475697 objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: -0.025467241 + value: 0.021683915 objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.y - value: 0.9636698 + value: 0.9650828 objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.z - value: -0.24654177 + value: -0.24690327 + objectReference: {fileID: 0} + - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: -0.098769374 + value: 0.08409653 objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: -0.028326679 + value: 0.024118563 objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.y - value: 0.956161 + value: 0.95756304 objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.z - value: -0.27422333 + value: -0.27462542 objectReference: {fileID: 0} - target: {fileID: 7757173428948913319, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} @@ -1661,6 +1870,47 @@ Material: - _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!21 &1264086189 +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 &1336732493 Material: serializedVersion: 8 @@ -1891,6 +2141,88 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1554436711} m_PrefabAsset: {fileID: 0} +--- !u!21 &1568062461 +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!21 &1574897282 +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!21 &1671723125 Material: serializedVersion: 8 @@ -2056,6 +2388,47 @@ Transform: type: 3} m_PrefabInstance: {fileID: 203396308} m_PrefabAsset: {fileID: 0} +--- !u!21 &1846975739 +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 &1902554698 GameObject: m_ObjectHideFlags: 0 @@ -2232,11 +2605,61 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1880671857495123661, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: m_Offset.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1880671857495123661, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: m_ApplyAfter + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1880671857495123661, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: m_PreserveComposition + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3685285690701009546, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3685285690701009546, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: sphereOffset.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5831827090361496139, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5831827090361496139, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: scrollSpeed + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 5831827090361496139, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: stopAfterTime + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6162594480593627889, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7612880158138396871, guid: 1c668d8e87e6aee4a8527281f0b61954, type: 3} propertyPath: m_Name value: TowerCam objectReference: {fileID: 0} + - target: {fileID: 9015098249639605300, guid: 1c668d8e87e6aee4a8527281f0b61954, + type: 3} + propertyPath: m_YAxis.Value + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2359,6 +2782,26 @@ 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: 2757975024506450034, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material @@ -2474,6 +2917,26 @@ PrefabInstance: propertyPath: m_Material value: objectReference: {fileID: 1362039392} + - 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} - target: {fileID: 3990110949884708462, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material @@ -2484,11 +2947,71 @@ PrefabInstance: propertyPath: m_Material value: objectReference: {fileID: 1671723125} + - 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} - target: {fileID: 4992629952180980787, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: objectReference: {fileID: 937715444} + - 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} - target: {fileID: 8443057073470027503, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material diff --git a/Assets/Scenes/TowerPlacement.unity b/Assets/Scenes/TowerPlacement.unity index 350116f..5a0b738 100644 --- a/Assets/Scenes/TowerPlacement.unity +++ b/Assets/Scenes/TowerPlacement.unity @@ -171,48 +171,7 @@ MonoBehaviour: m_EditorClassIdentifier: RebuildGrid: 0 SilhouetteMaterial: {fileID: 2100000, guid: 0610eb89b05f0b546929db3664a351d8, type: 2} ---- !u!21 &52370823 -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!21 &217571809 +--- !u!21 &248483236 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -259,7 +218,7 @@ Transform: type: 3} m_PrefabInstance: {fileID: 8480757413362724446} m_PrefabAsset: {fileID: 0} ---- !u!21 &433985873 +--- !u!21 &295930840 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -296,9 +255,9 @@ Material: - _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} + - _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 &510617948 GameObject: @@ -418,7 +377,7 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 ---- !u!21 &747932710 +--- !u!21 &824310134 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -455,132 +414,9 @@ Material: - _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!21 &819202709 -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 &853102900 -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!21 &975441898 -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} + - _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!1001 &1039229583 PrefabInstance: @@ -599,12 +435,12 @@ PrefabInstance: type: 3} propertyPath: m_Material value: - objectReference: {fileID: 853102900} + objectReference: {fileID: 1571237924} - target: {fileID: 3197579811349159231, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 52370823} + objectReference: {fileID: 295930840} - target: {fileID: 3367038424042638127, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Pivot.x @@ -709,32 +545,32 @@ PrefabInstance: type: 3} propertyPath: m_Material value: - objectReference: {fileID: 433985873} + objectReference: {fileID: 1721603329} - target: {fileID: 3990110949884708462, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 217571809} + objectReference: {fileID: 248483236} - target: {fileID: 4061834703391351603, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 1922957880} + objectReference: {fileID: 824310134} - target: {fileID: 4992629952180980787, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 975441898} + objectReference: {fileID: 1407489464} - target: {fileID: 8443057073470027503, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 747932710} + objectReference: {fileID: 1641935362} - target: {fileID: 9067100205361516806, guid: 0a81f2c7ca749af478944c043ef306dc, type: 3} propertyPath: m_Material value: - objectReference: {fileID: 819202709} + objectReference: {fileID: 1676908719} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -746,6 +582,47 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1625022535} m_PrefabAsset: {fileID: 0} +--- !u!21 &1407489464 +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 &1508047062 GameObject: m_ObjectHideFlags: 0 @@ -904,6 +781,47 @@ MonoBehaviour: selectLayer: serializedVersion: 2 m_Bits: 256 +--- !u!21 &1571237924 +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 &1625022535 PrefabInstance: m_ObjectHideFlags: 0 @@ -982,7 +900,7 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0c13e24f92c86f84a85c76e0bca22830, type: 3} ---- !u!21 &1922957880 +--- !u!21 &1641935362 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -1019,9 +937,91 @@ 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: 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!21 &1676908719 +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 &1721603329 +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!1001 &2331233393358520666 PrefabInstance: diff --git a/Assets/Scenes/TowerTest.unity b/Assets/Scenes/TowerTest.unity index 1a2964c..5b6cd7f 100644 --- a/Assets/Scenes/TowerTest.unity +++ b/Assets/Scenes/TowerTest.unity @@ -149,12 +149,12 @@ PrefabInstance: - target: {fileID: 681885395900820027, guid: 1d7949721a9f0bc9ba1a8c49ca5fd099, type: 3} propertyPath: m_LocalRotation.y - value: 0.000000017203512 + value: 0.000000017203536 objectReference: {fileID: 0} - target: {fileID: 681885395900820027, guid: 1d7949721a9f0bc9ba1a8c49ca5fd099, type: 3} propertyPath: m_LocalRotation.z - value: 3.129748e-10 + value: 3.1297526e-10 objectReference: {fileID: 0} - target: {fileID: 2251032668217228560, guid: 1d7949721a9f0bc9ba1a8c49ca5fd099, type: 3} @@ -648,12 +648,12 @@ PrefabInstance: - target: {fileID: 2259584953001852341, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} propertyPath: m_LocalRotation.y - value: 0.000000023165915 + value: -0.000000023165905 objectReference: {fileID: 0} - target: {fileID: 2259584953001852341, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} propertyPath: m_LocalRotation.z - value: -0.0000000074471567 + value: 0.0000000074471527 objectReference: {fileID: 0} - target: {fileID: 2659055701601603313, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} @@ -683,12 +683,12 @@ PrefabInstance: - target: {fileID: 2659055701601603313, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} propertyPath: m_LocalRotation.y - value: 0.000000016282518 + value: -0.000000016282542 objectReference: {fileID: 0} - target: {fileID: 2659055701601603313, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} propertyPath: m_LocalRotation.z - value: -0.0000000055622285 + value: 0.0000000055622356 objectReference: {fileID: 0} - target: {fileID: 3651592998252321242, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} @@ -718,12 +718,12 @@ PrefabInstance: - target: {fileID: 3651592998252321242, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} propertyPath: m_LocalRotation.y - value: -0.000000022880894 + value: 0.00000002288009 objectReference: {fileID: 0} - target: {fileID: 3651592998252321242, guid: 148ea27cfb89dc0398835d59bed11cca, type: 3} propertyPath: m_LocalRotation.z - value: 0.000000008284025 + value: -0.000000008283735 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -955,7 +955,7 @@ PrefabInstance: - target: {fileID: 8488737342646939416, guid: 9415cb10a1bd579269301ca4f61a1554, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8717774532810144392, guid: 9415cb10a1bd579269301ca4f61a1554, type: 3} @@ -1813,7 +1813,7 @@ PrefabInstance: - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: -0.1380528 + value: -0.13805284 objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} @@ -1828,7 +1828,7 @@ PrefabInstance: - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.z - value: -0.13815574 + value: -0.13815573 objectReference: {fileID: 0} - target: {fileID: 8882344377078016156, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} @@ -2026,6 +2026,74 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1732242001} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2014351057 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1415246146501367120, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_Name + value: Gripper + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.2806312 + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.452 + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.97678995 + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1794726729777156074, guid: 91554800af50ec827822f376e2fc5f64, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 91554800af50ec827822f376e2fc5f64, type: 3} --- !u!1001 &667212637924654954 PrefabInstance: m_ObjectHideFlags: 0 @@ -2115,3 +2183,4 @@ SceneRoots: - {fileID: 1090335998} - {fileID: 1231481559} - {fileID: 100479262} + - {fileID: 2014351057} diff --git a/Assets/ScriptableObjects/TowerCollection.asset b/Assets/ScriptableObjects/TowerCollection.asset index a983a6a..2331f27 100644 --- a/Assets/ScriptableObjects/TowerCollection.asset +++ b/Assets/ScriptableObjects/TowerCollection.asset @@ -21,6 +21,13 @@ MonoBehaviour: price: 250 prefab: {fileID: 1415246146501367120, guid: 91554800af50ec827822f376e2fc5f64, type: 3} + - name: Mr Lazer + price: 500 + prefab: {fileID: 645933633211530419, guid: 4e5e3131ea2a78cfd93219be3806da6d, type: 3} + - name: Tesla + price: 500 + prefab: {fileID: 1328109535653931045, guid: 148ea27cfb89dc0398835d59bed11cca, + type: 3} - name: Black hole price: 500 prefab: {fileID: 4611178744751000815, guid: 1d7949721a9f0bc9ba1a8c49ca5fd099, diff --git a/Assets/Scripts/Camera/CameraController.cs b/Assets/Scripts/Camera/CameraController.cs index 67e610c..cd3d250 100644 --- a/Assets/Scripts/Camera/CameraController.cs +++ b/Assets/Scripts/Camera/CameraController.cs @@ -6,11 +6,11 @@ public class CameraController : MonoBehaviour { [SerializeField] private GameObject cam; - public float scrollSpeed; + public float scrollSpeed = 2.5f; [Range(5f, 30f)] public float stopAfterTime; public AnimationCurve curve = new AnimationCurve(new Keyframe(0f, 0f, 1f, 1f), new Keyframe(1f, 1f, 1f, 1f)); - public Vector2 sens; + public Vector2 sens = new Vector2(300f, 3f); private Vector2 defaultMaxSpeed; private float timer; @@ -49,6 +49,7 @@ public class CameraController : MonoBehaviour cam.GetComponent().m_Offset.z += scroll * scrollSpeed; + cam.GetComponent().m_Offset.z = Mathf.Clamp(cam.GetComponent().m_Offset.z, -20, 10); timer += Time.deltaTime; float evalTime = timer / stopAfterTime; diff --git a/Assets/Scripts/Camera/HideWall.cs b/Assets/Scripts/Camera/HideWall.cs index b2a3e0c..41a2e97 100644 --- a/Assets/Scripts/Camera/HideWall.cs +++ b/Assets/Scripts/Camera/HideWall.cs @@ -6,11 +6,13 @@ public class HideWall : MonoBehaviour [SerializeField] private GameObject target; [SerializeField] private GameObject origin; + [SerializeField] private TowerCam towerCamScript; + [Range(1f, 10f)] public float hideFadeSpeed; [Range(1f, 10f)] public float showFadeSpeed; public float sphereRadius; - [Range(0, 10)] public float sphereRange; + [Range(0, 100)] public float sphereRange; public Vector3 sphereOffset; float maxSphereRayDistance; @@ -18,6 +20,11 @@ public class HideWall : MonoBehaviour void Update() { + if (target == null && towerCamScript != null) + { + target = towerCamScript.newTarget; + } + maxSphereRayDistance = Vector3.Distance(origin.transform.position, target.transform.position) - (sphereRadius * 2) + sphereRange; Vector3 direction = ((target.transform.position + sphereOffset) - origin.transform.position).normalized; diff --git a/Assets/Scripts/Camera/TowerCam.cs b/Assets/Scripts/Camera/TowerCam.cs index e79de07..073f783 100644 --- a/Assets/Scripts/Camera/TowerCam.cs +++ b/Assets/Scripts/Camera/TowerCam.cs @@ -3,7 +3,9 @@ using UnityEngine; public class TowerCam : MonoBehaviour { - private GameObject m_gameObject; + [SerializeField] private GameObject m_gameObject; + + public GameObject newTarget; private void Start() { @@ -13,15 +15,27 @@ public class TowerCam : MonoBehaviour public void ChangeToTarget(GameObject target) { + float originalOffset = m_gameObject.GetComponent().m_Offset.z; + if (target != null) { + newTarget = target; + m_gameObject.GetComponent().m_LookAt = target.transform; m_gameObject.GetComponent().m_Follow = target.transform; m_gameObject.GetComponent().m_Priority = 11; + + m_gameObject.GetComponent().GetRig(0).LookAt = target.transform; + m_gameObject.GetComponent().GetRig(1).LookAt = target.transform; + m_gameObject.GetComponent().GetRig(2).LookAt = target.transform; + + m_gameObject.GetComponent().m_Offset.z = 0; } else { m_gameObject.GetComponent().m_Priority = 9; + + m_gameObject.GetComponent().m_Offset.z = originalOffset; } } } diff --git a/Assets/Scripts/Manager/GameManager.cs b/Assets/Scripts/Manager/GameManager.cs index 5a9132e..4a0d586 100644 --- a/Assets/Scripts/Manager/GameManager.cs +++ b/Assets/Scripts/Manager/GameManager.cs @@ -9,6 +9,11 @@ public class GameManager : MonoBehaviour public bool IsBuildMode = false; private Tower selectedTower; + /// + /// First param: isBuildMode + /// + public static event Action OnUpdateUIRequested; + public Tower SelectedTower { get { return selectedTower; } set { if (selectedTower != null) selectedTower.TowerSelected(false); @@ -40,10 +45,12 @@ public class GameManager : MonoBehaviour private void m_OnTowerShopSelected(TowerInfo info) { IsBuildMode = true; + OnUpdateUIRequested?.Invoke(IsBuildMode); } private void m_finishBuildmode(TowerInfo info) { IsBuildMode = false; + OnUpdateUIRequested?.Invoke(IsBuildMode); } } diff --git a/Assets/Scripts/PlacementSystem/CameraSlotClickDetect.cs b/Assets/Scripts/PlacementSystem/CameraSlotClickDetect.cs index 102acfb..cf7e2e0 100644 --- a/Assets/Scripts/PlacementSystem/CameraSlotClickDetect.cs +++ b/Assets/Scripts/PlacementSystem/CameraSlotClickDetect.cs @@ -17,6 +17,14 @@ public class CameraSlotClickDetect : MonoBehaviour { ShootClickRay(); } + if (Input.GetKeyDown(KeyCode.Escape)) + { + GameManager.Instance.SelectedTower = null; + if (towerCam != null) + towerCam.ChangeToTarget(null); + else + Debug.LogWarning("TowerCam scpritet is not assigned, assign in the inspector"); + } ShootHoverRay(); } @@ -51,6 +59,14 @@ public class CameraSlotClickDetect : MonoBehaviour else Debug.LogWarning("TowerCam scpritet is not assigned, assign in the inspector"); } + else + { + GameManager.Instance.SelectedTower = null; + if (towerCam != null) + towerCam.ChangeToTarget(null); + else + Debug.LogWarning("TowerCam scpritet is not assigned, assign in the inspector"); + } } void ShootHoverRay() diff --git a/Assets/Scripts/PlacementSystem/PlacementManager.cs b/Assets/Scripts/PlacementSystem/PlacementManager.cs index ff752b3..b7e678e 100644 --- a/Assets/Scripts/PlacementSystem/PlacementManager.cs +++ b/Assets/Scripts/PlacementSystem/PlacementManager.cs @@ -5,6 +5,8 @@ using System.Linq; using Unity.Mathematics; using Unity.VisualScripting; using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; public class TowerPlacementManager : MonoBehaviour { @@ -63,14 +65,21 @@ public class TowerPlacementManager : MonoBehaviour private void OnEnable() { + OnTowerPlaced += PlayPlaceSfx; MoneyManager.OnShopSelected += OnShopSelected; } private void OnDisable() { + OnTowerPlaced -= PlayPlaceSfx; MoneyManager.OnShopSelected -= OnShopSelected; } + private void PlayPlaceSfx(TowerInfo info) + { + AudioManager.PlaySound("BuildTower", Vector3.zero); + } + private void OnShopSelected(TowerInfo info) { SelectedTowerInfo = info; @@ -108,8 +117,7 @@ public class TowerPlacementManager : MonoBehaviour Quaternion newRotation = Quaternion.AngleAxis(CurrentRotation * 90f, transform.up); spawnedTower.transform.localRotation = newRotation; - Destroy(SilhouettedObject); - OnTowerPlaced?.Invoke(SelectedTowerInfo); + FinishBuild(); } public void OnSlotHovered(SlotManager slot, GridManager grid, int x, int y) @@ -133,6 +141,12 @@ public class TowerPlacementManager : MonoBehaviour Destroy(SilhouettedObject); } + public void FinishBuild() + { + Destroy(SilhouettedObject); + OnTowerPlaced?.Invoke(SelectedTowerInfo); + } + [Space(10)] public Material SilhouetteMaterial; @@ -149,7 +163,7 @@ public class TowerPlacementManager : MonoBehaviour { var comp = objScripts[i]; - if (comp is not Renderer && comp is not Transform && comp is not MeshFilter) + if (comp is not Renderer && comp is not Transform && comp is not MeshFilter && comp is not UIBehaviour) { Destroy(comp); } diff --git a/Assets/Scripts/Tower/GravityTower.cs b/Assets/Scripts/Tower/GravityTower.cs index a024b49..4f87ed0 100644 --- a/Assets/Scripts/Tower/GravityTower.cs +++ b/Assets/Scripts/Tower/GravityTower.cs @@ -16,6 +16,7 @@ public class GravityTower : Tower [SerializeField] private string audioName; + private AudioSource audioSc; public override void TowerSelected(bool selected) { @@ -33,8 +34,7 @@ public class GravityTower : Tower if (!string.IsNullOrEmpty(audioName)) { - Debug.Log("play"); - AudioManager.PlaySound(audioName, transform.position); + audioSc = AudioManager.PlaySound(audioName, transform.position, false, true, true); } } @@ -53,6 +53,8 @@ public class GravityTower : Tower protected override void OnDestroy() { base.OnDestroy(); + + audioSc.Stop(); } protected override void Update() diff --git a/Assets/Scripts/Tower/Projectile.cs b/Assets/Scripts/Tower/Projectile.cs index 6157677..ed54230 100644 --- a/Assets/Scripts/Tower/Projectile.cs +++ b/Assets/Scripts/Tower/Projectile.cs @@ -1,5 +1,6 @@ using UnityEngine; using UnityEngine.Assertions; +using UnityEngine.Events; [RequireComponent(typeof(Collider))] public class Projectile : MonoBehaviour @@ -19,6 +20,8 @@ public class Projectile : MonoBehaviour public HealthComponent comingFrom; + public UnityEvent OnReflect; + private Vector3 prevVel; private void Awake() @@ -59,6 +62,8 @@ public class Projectile : MonoBehaviour } Vector3 newVel = Vector3.Reflect(prevVel.normalized, collision.contacts[0].normal.normalized); body.velocity = newVel.normalized * prevVel.magnitude * bounciness; + OnReflect?.Invoke(); + AudioManager.PlaySound("BulletBounce", transform.position); } } } diff --git a/Assets/Scripts/UI/UIBuildModeManager.cs b/Assets/Scripts/UI/UIBuildModeManager.cs new file mode 100644 index 0000000..2281d29 --- /dev/null +++ b/Assets/Scripts/UI/UIBuildModeManager.cs @@ -0,0 +1,36 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class UIBuildModeManager : MonoBehaviour +{ + [SerializeField] private GameObject ShopUI; + [SerializeField] private GameObject ConstructionUI; + + [SerializeField] private Button CancelButton; + + private void Start() + { + GameManager.OnUpdateUIRequested += UpdateBuildModeUI; + + UpdateBuildModeUI(false); + CancelButton.onClick.AddListener(OnBuildCancel); + } + + private void OnDisable() + { + GameManager.OnUpdateUIRequested -= UpdateBuildModeUI; + } + + void UpdateBuildModeUI(bool isBuildMode) + { + ShopUI.SetActive(!GameManager.Instance.IsBuildMode); + ConstructionUI.SetActive(GameManager.Instance.IsBuildMode); + } + + public void OnBuildCancel() + { + TowerPlacementManager.Instance.FinishBuild(); + } +} diff --git a/Assets/Scripts/UI/UIBuildModeManager.cs.meta b/Assets/Scripts/UI/UIBuildModeManager.cs.meta new file mode 100644 index 0000000..17ca239 --- /dev/null +++ b/Assets/Scripts/UI/UIBuildModeManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 345b869fb2a87d048b4d3297670ca10f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Symbol_1.png b/Assets/Sprites/Symbol_1.png new file mode 100644 index 0000000..18dbf9f Binary files /dev/null and b/Assets/Sprites/Symbol_1.png differ diff --git a/Assets/Sprites/Symbol_1.png.meta b/Assets/Sprites/Symbol_1.png.meta new file mode 100644 index 0000000..8b0b9d6 --- /dev/null +++ b/Assets/Sprites/Symbol_1.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: fa8f31dc92661784a9c4bc994a7073d7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/builderzone.png b/Assets/Sprites/builderzone.png new file mode 100644 index 0000000..77a762e Binary files /dev/null and b/Assets/Sprites/builderzone.png differ diff --git a/Assets/Sprites/builderzone.png.meta b/Assets/Sprites/builderzone.png.meta new file mode 100644 index 0000000..7cbfae0 --- /dev/null +++ b/Assets/Sprites/builderzone.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 98c95a575adf2f648a18d729b173789a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/delete.png b/Assets/Sprites/delete.png new file mode 100644 index 0000000..bac8462 Binary files /dev/null and b/Assets/Sprites/delete.png differ diff --git a/Assets/Sprites/delete.png.meta b/Assets/Sprites/delete.png.meta new file mode 100644 index 0000000..8c8ff20 --- /dev/null +++ b/Assets/Sprites/delete.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 65f4785c1fd93dc45b06d111c6e5f70e +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: