diff --git a/Assets/Prefabs/Towers/Gripper.prefab b/Assets/Prefabs/Towers/Gripper.prefab index 0e3792f..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,46 @@ 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 @@ -1262,12 +1337,17 @@ 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} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 5565472806559733162, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1304,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} @@ -1372,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, @@ -1601,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} @@ -1619,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 @@ -1642,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/Turret.prefab b/Assets/Prefabs/Towers/Turret.prefab index e7be8b1..ea5a8bc 100644 --- a/Assets/Prefabs/Towers/Turret.prefab +++ b/Assets/Prefabs/Towers/Turret.prefab @@ -911,7 +911,7 @@ PrefabInstance: - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.y - value: -0.839 + value: -0.84 objectReference: {fileID: 0} - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1006,7 +1006,7 @@ PrefabInstance: - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.y - value: -0.839 + value: -0.84 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1021,7 +1021,7 @@ PrefabInstance: - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.x - value: 3.59e-43 + value: -1e-45 objectReference: {fileID: 0} - target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1041,7 +1041,7 @@ PrefabInstance: - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalPosition.y - value: -0.839 + value: -0.84 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} @@ -1061,12 +1061,12 @@ PrefabInstance: - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.y - value: -0.00000001785987 + value: -0.000000017203536 objectReference: {fileID: 0} - target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} propertyPath: m_LocalRotation.z - value: -3.2491562e-10 + value: -3.1297526e-10 objectReference: {fileID: 0} - target: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} diff --git a/Assets/Scenes/TowerTest.unity b/Assets/Scenes/TowerTest.unity index 03d57a7..5b6cd7f 100644 --- a/Assets/Scenes/TowerTest.unity +++ b/Assets/Scenes/TowerTest.unity @@ -1698,42 +1698,42 @@ PrefabInstance: - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 3.3133156 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.y - value: 3.339 + value: 2.95 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalPosition.z - value: 3 + value: 11.533513 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: -3e-45 + value: -0.13855627 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: -1e-45 + value: -0.015462777 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.y - value: 0.9402716 + value: 0.9841245 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.z - value: -0.34042525 + value: -0.10982757 objectReference: {fileID: 0} - target: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: field of view - value: 40 + value: 60 objectReference: {fileID: 0} - target: {fileID: 3665490202611795451, guid: fd9f9b61c0ebb324ebc9f929e26706bc, 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/Scripts/PlacementSystem/PlacementManager.cs b/Assets/Scripts/PlacementSystem/PlacementManager.cs index 2ebbee2..b7e678e 100644 --- a/Assets/Scripts/PlacementSystem/PlacementManager.cs +++ b/Assets/Scripts/PlacementSystem/PlacementManager.cs @@ -65,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;