black hole fix

This commit is contained in:
Sveske Juice 2024-04-21 05:12:01 +02:00
parent 5b46c1d3c3
commit bca62cdc01
10 changed files with 16218 additions and 508 deletions

Binary file not shown.

View File

@ -27,7 +27,7 @@ Transform:
m_GameObject: {fileID: 6831315981973066878} m_GameObject: {fileID: 6831315981973066878}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0.304, z: -0}
m_LocalScale: {x: 125.59105, y: 125.59105, z: 125.59105} m_LocalScale: {x: 125.59105, y: 125.59105, z: 125.59105}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -176,6 +176,11 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: -4368249141776341009, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15, - target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -219,7 +224,7 @@ PrefabInstance:
- target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15, - target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0.5 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15, - target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3} type: 3}
@ -336,6 +341,16 @@ PrefabInstance:
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: -3.6221226e-10 value: -3.6221226e-10
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5000648575824335922, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 1.238
objectReference: {fileID: 0}
- target: {fileID: 5565472806559733162, guid: f54a14318952c90c5b47a300aedb0d15, - target: {fileID: 5565472806559733162, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3} type: 3}
propertyPath: m_Size.x propertyPath: m_Size.x
@ -371,21 +386,6 @@ PrefabInstance:
propertyPath: m_Rigs.Array.size propertyPath: m_Rigs.Array.size
value: 3 value: 3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8326258332086092779, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_Rigs.Array.data[0]
value:
objectReference: {fileID: -3745119766553636202}
- target: {fileID: 8326258332086092779, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_Rigs.Array.data[1]
value:
objectReference: {fileID: 6546103457423750257}
- target: {fileID: 8326258332086092779, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_Rigs.Array.data[2]
value:
objectReference: {fileID: 8491602986908009028}
m_RemovedComponents: m_RemovedComponents:
- {fileID: 703045981101343854, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} - {fileID: 703045981101343854, guid: f54a14318952c90c5b47a300aedb0d15, type: 3}
- {fileID: 429639274105194281, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} - {fileID: 429639274105194281, guid: f54a14318952c90c5b47a300aedb0d15, type: 3}
@ -411,420 +411,13 @@ PrefabInstance:
type: 3} type: 3}
insertIndex: -1 insertIndex: -1
addedObject: {fileID: 36692134324172431} addedObject: {fileID: 36692134324172431}
- targetCorrespondingSourceObject: {fileID: 3558272651156871278, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
insertIndex: -1
addedObject: {fileID: -3745119766553636202}
- targetCorrespondingSourceObject: {fileID: 1829274643066236986, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
insertIndex: -1
addedObject: {fileID: 1489629340287155298}
- targetCorrespondingSourceObject: {fileID: 1829274643066236986, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
insertIndex: -1
addedObject: {fileID: 5658894504779697673}
- targetCorrespondingSourceObject: {fileID: 4474798581911876227, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
insertIndex: -1
addedObject: {fileID: 6546103457423750257}
- targetCorrespondingSourceObject: {fileID: 3352080502988888719, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
insertIndex: -1
addedObject: {fileID: 1968344670190303085}
- targetCorrespondingSourceObject: {fileID: 3352080502988888719, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
insertIndex: -1
addedObject: {fileID: 3568216235199852646}
- targetCorrespondingSourceObject: {fileID: 6616012430861705016, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
insertIndex: -1
addedObject: {fileID: 8491602986908009028}
- targetCorrespondingSourceObject: {fileID: 881819783351085137, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
insertIndex: -1
addedObject: {fileID: 8230042601417475119}
- targetCorrespondingSourceObject: {fileID: 881819783351085137, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
insertIndex: -1
addedObject: {fileID: -5460823079475232216}
m_SourcePrefab: {fileID: 100100000, guid: f54a14318952c90c5b47a300aedb0d15, type: 3} m_SourcePrefab: {fileID: 100100000, guid: f54a14318952c90c5b47a300aedb0d15, type: 3}
--- !u!1 &181797467179665740 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3558272651156871278, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
m_PrefabInstance: {fileID: 3739212318609641762}
m_PrefabAsset: {fileID: 0}
--- !u!114 &-3745119766553636202
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 181797467179665740}
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: 8515585331188365258}
--- !u!1 &1008230519965049761 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4474798581911876227, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
m_PrefabInstance: {fileID: 3739212318609641762}
m_PrefabAsset: {fileID: 0}
--- !u!114 &6546103457423750257
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1008230519965049761}
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: 6783638013035996559}
--- !u!4 &1864488023534541641 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3043206501377313387, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
m_PrefabInstance: {fileID: 3739212318609641762}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2116870770135419821 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3352080502988888719, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
m_PrefabInstance: {fileID: 3739212318609641762}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1968344670190303085
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2116870770135419821}
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 &3568216235199852646
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2116870770135419821}
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 &3064341459817308440 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1829274643066236986, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
m_PrefabInstance: {fileID: 3739212318609641762}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1489629340287155298
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3064341459817308440}
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 &5658894504779697673
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3064341459817308440}
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!4 &3798190417997420117 stripped --- !u!4 &3798190417997420117 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15, m_CorrespondingSourceObject: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3} type: 3}
m_PrefabInstance: {fileID: 3739212318609641762} m_PrefabInstance: {fileID: 3739212318609641762}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &4600571748364302707 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 881819783351085137, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
m_PrefabInstance: {fileID: 3739212318609641762}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8230042601417475119
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4600571748364302707}
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 &-5460823079475232216
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4600571748364302707}
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 &4611178744751000815 stripped --- !u!1 &4611178744751000815 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 872127579833310669, guid: f54a14318952c90c5b47a300aedb0d15, m_CorrespondingSourceObject: {fileID: 872127579833310669, guid: f54a14318952c90c5b47a300aedb0d15,
@ -877,73 +470,9 @@ MonoBehaviour:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
audioName: Black Hole audioName: Black Hole
--- !u!4 &6783638013035996559 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7908333169234343085, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
m_PrefabInstance: {fileID: 3739212318609641762}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7508790900104531482 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6616012430861705016, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
m_PrefabInstance: {fileID: 3739212318609641762}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8491602986908009028
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7508790900104531482}
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: 1864488023534541641}
--- !u!1 &8306284257086165764 stripped --- !u!1 &8306284257086165764 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15, m_CorrespondingSourceObject: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3} type: 3}
m_PrefabInstance: {fileID: 3739212318609641762} m_PrefabInstance: {fileID: 3739212318609641762}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!4 &8515585331188365258 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5028610344310564584, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
m_PrefabInstance: {fileID: 3739212318609641762}
m_PrefabAsset: {fileID: 0}

File diff suppressed because it is too large Load Diff

View File

@ -27,7 +27,7 @@ Transform:
m_GameObject: {fileID: 364065824138311607} m_GameObject: {fileID: 364065824138311607}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0.867805, z: 0} m_LocalPosition: {x: 0, y: 0.867805, z: -0.35}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -237,6 +237,38 @@ MeshRenderer:
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0} m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1251972359794871609
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6739452420080725862}
m_Layer: 8
m_Name: BarrelHolder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6739452420080725862
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1251972359794871609}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 736879862187274409}
m_Father: {fileID: 1812052588934623903}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!1 &2914369357363013690 --- !u!1 &2914369357363013690
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1003,7 +1035,7 @@ Transform:
m_GameObject: {fileID: 6479124460100259331} m_GameObject: {fileID: 6479124460100259331}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0.00477}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -1036,13 +1068,13 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6765939044632598195} m_GameObject: {fileID: 6765939044632598195}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 2.0246425, z: 0} m_LocalPosition: {x: 0, y: 2.0246425, z: 0}
m_LocalScale: {x: 81.980095, y: 81.980095, z: 81.980095} m_LocalScale: {x: 81.980095, y: 81.980095, z: 81.980095}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 3277162081463500042} - {fileID: 3277162081463500042}
m_Father: {fileID: 1812052588934623903} m_Father: {fileID: 6739452420080725862}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &7913117734498658720 --- !u!33 &7913117734498658720
MeshFilter: MeshFilter:
@ -1615,10 +1647,6 @@ PrefabInstance:
type: 3} type: 3}
insertIndex: -1 insertIndex: -1
addedObject: {fileID: 7654231471686583793} addedObject: {fileID: 7654231471686583793}
- targetCorrespondingSourceObject: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
insertIndex: -1
addedObject: {fileID: 736879862187274409}
- targetCorrespondingSourceObject: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15, - targetCorrespondingSourceObject: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3} type: 3}
insertIndex: -1 insertIndex: -1
@ -1647,6 +1675,10 @@ PrefabInstance:
type: 3} type: 3}
insertIndex: -1 insertIndex: -1
addedObject: {fileID: 7748121075213627311} addedObject: {fileID: 7748121075213627311}
- targetCorrespondingSourceObject: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
insertIndex: -1
addedObject: {fileID: 6739452420080725862}
m_AddedComponents: m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 872127579833310669, guid: f54a14318952c90c5b47a300aedb0d15, - targetCorrespondingSourceObject: {fileID: 872127579833310669, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3} type: 3}

View File

@ -117,6 +117,7 @@ public class TowerPlacementManager : MonoBehaviour
Quaternion newRotation = Quaternion.AngleAxis(CurrentRotation * 90f, transform.up); Quaternion newRotation = Quaternion.AngleAxis(CurrentRotation * 90f, transform.up);
spawnedTower.transform.localRotation = newRotation; spawnedTower.transform.localRotation = newRotation;
spawnedTower.GetComponent<Tower>().Placed();
FinishBuild(); FinishBuild();
} }
@ -145,6 +146,7 @@ public class TowerPlacementManager : MonoBehaviour
{ {
Destroy(SilhouettedObject); Destroy(SilhouettedObject);
OnTowerPlaced?.Invoke(SelectedTowerInfo); OnTowerPlaced?.Invoke(SelectedTowerInfo);
} }

View File

@ -26,9 +26,9 @@ public class AimTower : Tower
public float HorizontalRotation => horizontalArc.Value; public float HorizontalRotation => horizontalArc.Value;
public float VerticalRotation => verticalArc.Value; public float VerticalRotation => verticalArc.Value;
protected override void Awake() public override void Placed()
{ {
base.Awake(); base.Placed();
horizontalArc.Value.AddListener(UpdateBarrelRotation); horizontalArc.Value.AddListener(UpdateBarrelRotation);
verticalArc.Value.AddListener(UpdateBarrelRotation); verticalArc.Value.AddListener(UpdateBarrelRotation);
@ -40,10 +40,6 @@ public class AimTower : Tower
UpdateTrajectory(); UpdateTrajectory();
UpdateBarrelRotation(); UpdateBarrelRotation();
// dont ask me why but this makes sure everything is initialized lol
TowerSelected(true);
TowerSelected(false);
} }
public override void TowerSelected(bool selected) public override void TowerSelected(bool selected)

View File

@ -15,6 +15,11 @@ public class BeamTower : AimTower
protected override void Awake() protected override void Awake()
{ {
base.Awake(); base.Awake();
}
public override void Placed()
{
base.Placed();
horizontalArc.Value.AddListener(UpdateBeam); horizontalArc.Value.AddListener(UpdateBeam);
verticalArc.Value.AddListener(UpdateBeam); verticalArc.Value.AddListener(UpdateBeam);

View File

@ -18,11 +18,6 @@ public class GravityTower : Tower
private string audioName; private string audioName;
private AudioSource audioSc; private AudioSource audioSc;
public override void TowerSelected(bool selected)
{
}
protected override void Awake() protected override void Awake()
{ {
base.Awake(); base.Awake();
@ -54,7 +49,8 @@ public class GravityTower : Tower
{ {
base.OnDestroy(); base.OnDestroy();
audioSc.Stop(); if (audioSc != null)
audioSc.Stop();
} }
protected override void Update() protected override void Update()

View File

@ -18,6 +18,12 @@ public class ProjectileTower : AimTower
projectileSpawner = GetComponent<ProjectileSpawner>(); projectileSpawner = GetComponent<ProjectileSpawner>();
Assert.IsNotNull(projectileSpawner); Assert.IsNotNull(projectileSpawner);
}
public override void Placed()
{
base.Placed();
StartCoroutine(AttackLoop()); StartCoroutine(AttackLoop());
} }

View File

@ -25,6 +25,13 @@ public abstract class Tower : MonoBehaviour
selectedUI.SetActive(selected); selectedUI.SetActive(selected);
} }
public virtual void Placed()
{
// dont ask me why but this makes sure everything is initialized lol
TowerSelected(true);
TowerSelected(false);
}
protected virtual void Awake() protected virtual void Awake()
{ {
healthComp = GetComponent<HealthComponent>(); healthComp = GetComponent<HealthComponent>();