diff --git a/Unity-Files/Assets/Examples/Defender/Prefabs/Bomb.prefab b/Unity-Files/Assets/Examples/Defender/Prefabs/Bomb.prefab index c23f231..9a70b78 100644 --- a/Unity-Files/Assets/Examples/Defender/Prefabs/Bomb.prefab +++ b/Unity-Files/Assets/Examples/Defender/Prefabs/Bomb.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2095680581380159747} + - component: {fileID: -2546346225246118102} - component: {fileID: 2095680581380159746} - component: {fileID: 2095680581380159868} m_Layer: 0 @@ -28,80 +29,17 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.81, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2095680582245396512} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!58 &2095680581380159746 -CircleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2095680581380159745} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - serializedVersion: 2 - m_Radius: 0.5 ---- !u!114 &2095680581380159868 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2095680581380159745} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebaf7579139bd4145b3b8959a2a47c51, type: 3} - m_Name: - m_EditorClassIdentifier: - explosionRange: 5 - explosionEffect: {fileID: 1496494696399852, guid: e61802031429a4e2e8f547dbca07fe84, - type: 3} ---- !u!1 &2095680582245396519 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2095680582245396512} - - component: {fileID: 2095680582245396513} - m_Layer: 0 - m_Name: Circle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2095680582245396512 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2095680582245396519} - 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_Children: [] - m_Father: {fileID: 2095680581380159747} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &2095680582245396513 +--- !u!212 &-2546346225246118102 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2095680582245396519} + m_GameObject: {fileID: 2095680581380159745} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -135,15 +73,45 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, - type: 3} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Sprite: {fileID: 21300000, guid: a9ecf8c43684c9c4d86fa50c79bd2aae, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.64, y: 0.64} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!58 &2095680581380159746 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2095680581380159745} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!114 &2095680581380159868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2095680581380159745} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebaf7579139bd4145b3b8959a2a47c51, type: 3} + m_Name: + m_EditorClassIdentifier: + explosionRange: 5 + explosionEffect: {fileID: 1496494696399852, guid: e61802031429a4e2e8f547dbca07fe84, + type: 3} diff --git a/Unity-Files/Assets/Examples/Defender/Prefabs/Fishing Boat.prefab b/Unity-Files/Assets/Examples/Defender/Prefabs/Fishing Boat.prefab index ef3981d..ec50802 100644 --- a/Unity-Files/Assets/Examples/Defender/Prefabs/Fishing Boat.prefab +++ b/Unity-Files/Assets/Examples/Defender/Prefabs/Fishing Boat.prefab @@ -159,9 +159,11 @@ MonoBehaviour: rigidbody2D: {fileID: 0} normalSpeed: 5 returnSpeed: 5 - droppedObject: {fileID: 0} deathEffect: {fileID: 1496494696399852, guid: e61802031429a4e2e8f547dbca07fe84, type: 3} + droppables: + - {fileID: 2095680581380159745, guid: 437a8142fe505894fae2882aba31035b, type: 3} + - {fileID: 1044604232950715027, guid: 35d4c3c707316d94eafa98daa3a72231, type: 3} --- !u!114 &-59396174693911339 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Unity-Files/Assets/Examples/Defender/Prefabs/Nuke.prefab b/Unity-Files/Assets/Examples/Defender/Prefabs/Nuke.prefab index b47d409..e486ecf 100644 --- a/Unity-Files/Assets/Examples/Defender/Prefabs/Nuke.prefab +++ b/Unity-Files/Assets/Examples/Defender/Prefabs/Nuke.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5825771540101445476} + - component: {fileID: -7510794365626572550} - component: {fileID: 120331219440102199} - component: {fileID: 6646429219670702173} m_Layer: 0 @@ -28,80 +29,17 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.81, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 8738956478279360696} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!58 &120331219440102199 -CircleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1044604232950715027} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - serializedVersion: 2 - m_Radius: 0.5 ---- !u!114 &6646429219670702173 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1044604232950715027} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebaf7579139bd4145b3b8959a2a47c51, type: 3} - m_Name: - m_EditorClassIdentifier: - explosionRange: 100 - explosionEffect: {fileID: 1496494696399852, guid: e61802031429a4e2e8f547dbca07fe84, - type: 3} ---- !u!1 &7659859326401528660 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8738956478279360696} - - component: {fileID: 3744234215756885735} - m_Layer: 0 - m_Name: Circle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8738956478279360696 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7659859326401528660} - 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_Children: [] - m_Father: {fileID: 5825771540101445476} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &3744234215756885735 +--- !u!212 &-7510794365626572550 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7659859326401528660} + m_GameObject: {fileID: 1044604232950715027} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -135,15 +73,45 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, - type: 3} - m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Sprite: {fileID: 21300000, guid: 4b6cbdd69ac950a41a1e65b82bc20aa2, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.64, y: 0.64} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!58 &120331219440102199 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1044604232950715027} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!114 &6646429219670702173 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1044604232950715027} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebaf7579139bd4145b3b8959a2a47c51, type: 3} + m_Name: + m_EditorClassIdentifier: + explosionRange: 100 + explosionEffect: {fileID: 1496494696399852, guid: e61802031429a4e2e8f547dbca07fe84, + type: 3} diff --git a/Unity-Files/Assets/Examples/Defender/Scenes/Defender.unity b/Unity-Files/Assets/Examples/Defender/Scenes/Defender.unity index 2c21ce3..4ac8f5c 100644 --- a/Unity-Files/Assets/Examples/Defender/Scenes/Defender.unity +++ b/Unity-Files/Assets/Examples/Defender/Scenes/Defender.unity @@ -917,7 +917,7 @@ Transform: - {fileID: 213808747} - {fileID: 565676025} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &267901559 MonoBehaviour: @@ -2902,6 +2902,91 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 873720540} m_CullTransparentMesh: 1 +--- !u!1 &915811080 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 915811084} + - component: {fileID: 915811083} + - component: {fileID: 915811082} + - component: {fileID: 915811081} + m_Layer: 0 + m_Name: CollisionDetectorAlly + m_TagString: Allies + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &915811081 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915811080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bba26da02d9d0b540be9dee579836806, type: 3} + m_Name: + m_EditorClassIdentifier: + droppedItemAmount: 3 +--- !u!61 &915811082 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915811080} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 1 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0.19999999, y: 0.22, z: 0.19999999, w: 0.24} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1.28, y: 1.28} + newSize: {x: 17.75735, y: 1.2300253} + adaptiveTilingThreshold: 0.5 + drawMode: 2 + adaptiveTiling: 0 + m_AutoTiling: 1 + serializedVersion: 2 + m_Size: {x: 1.28, y: 1.28} + m_EdgeRadius: 0 +--- !u!114 &915811083 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915811080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fb970c45b40bb4652a8310660a03dfb2, type: 3} + m_Name: + m_EditorClassIdentifier: + health: 3 +--- !u!4 &915811084 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915811080} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -1.08, z: 0} + m_LocalScale: {x: 1, y: 1, z: 2} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &950081911 GameObject: m_ObjectHideFlags: 0 @@ -3021,7 +3106,7 @@ Transform: - {fileID: 1530896881} - {fileID: 353042925} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &990867867 GameObject: @@ -3137,7 +3222,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &1004702651 AudioSource: @@ -3253,7 +3338,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1011785960 Transform: m_ObjectHideFlags: 0 @@ -3381,7 +3466,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 2} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1059183746 GameObject: @@ -4513,7 +4598,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1618268317 GameObject: @@ -6720,80 +6805,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1001 &29537929135736811 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1044604232950715027, guid: 35d4c3c707316d94eafa98daa3a72231, - type: 3} - propertyPath: m_Name - value: Nuke - objectReference: {fileID: 0} - - target: {fileID: 1044604232950715027, guid: 35d4c3c707316d94eafa98daa3a72231, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5825771540101445476, guid: 35d4c3c707316d94eafa98daa3a72231, - type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5825771540101445476, guid: 35d4c3c707316d94eafa98daa3a72231, - type: 3} - propertyPath: m_LocalPosition.x - value: 4.57 - objectReference: {fileID: 0} - - target: {fileID: 5825771540101445476, guid: 35d4c3c707316d94eafa98daa3a72231, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5825771540101445476, guid: 35d4c3c707316d94eafa98daa3a72231, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5825771540101445476, guid: 35d4c3c707316d94eafa98daa3a72231, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5825771540101445476, guid: 35d4c3c707316d94eafa98daa3a72231, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5825771540101445476, guid: 35d4c3c707316d94eafa98daa3a72231, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5825771540101445476, guid: 35d4c3c707316d94eafa98daa3a72231, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5825771540101445476, guid: 35d4c3c707316d94eafa98daa3a72231, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5825771540101445476, guid: 35d4c3c707316d94eafa98daa3a72231, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5825771540101445476, guid: 35d4c3c707316d94eafa98daa3a72231, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 35d4c3c707316d94eafa98daa3a72231, type: 3} --- !u!114 &114000009163615921 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6875,77 +6886,3 @@ RectTransform: m_AnchoredPosition: {x: 0.5, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1001 &2095680581666778940 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2095680581380159745, guid: 437a8142fe505894fae2882aba31035b, - type: 3} - propertyPath: m_Name - value: Bomb - objectReference: {fileID: 0} - - target: {fileID: 2095680581380159745, guid: 437a8142fe505894fae2882aba31035b, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2095680581380159747, guid: 437a8142fe505894fae2882aba31035b, - type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 2095680581380159747, guid: 437a8142fe505894fae2882aba31035b, - type: 3} - propertyPath: m_LocalPosition.x - value: -1.81 - objectReference: {fileID: 0} - - target: {fileID: 2095680581380159747, guid: 437a8142fe505894fae2882aba31035b, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2095680581380159747, guid: 437a8142fe505894fae2882aba31035b, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2095680581380159747, guid: 437a8142fe505894fae2882aba31035b, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2095680581380159747, guid: 437a8142fe505894fae2882aba31035b, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2095680581380159747, guid: 437a8142fe505894fae2882aba31035b, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2095680581380159747, guid: 437a8142fe505894fae2882aba31035b, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2095680581380159747, guid: 437a8142fe505894fae2882aba31035b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2095680581380159747, guid: 437a8142fe505894fae2882aba31035b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2095680581380159747, guid: 437a8142fe505894fae2882aba31035b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 437a8142fe505894fae2882aba31035b, type: 3} diff --git a/Unity-Files/Assets/Images/Asteroids/Nuke.png b/Unity-Files/Assets/Images/Asteroids/Nuke.png new file mode 100644 index 0000000..26b0e9e --- /dev/null +++ b/Unity-Files/Assets/Images/Asteroids/Nuke.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1fd20ee79f951450f7b4197fe4d817b9365a6457500f8c39accba3dc7bc07a99 +size 4351 diff --git a/Unity-Files/Assets/Images/Asteroids/Nuke.png.meta b/Unity-Files/Assets/Images/Asteroids/Nuke.png.meta new file mode 100644 index 0000000..1b6f04e --- /dev/null +++ b/Unity-Files/Assets/Images/Asteroids/Nuke.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 4b6cbdd69ac950a41a1e65b82bc20aa2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 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: 1 + 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/Images/Asteroids/Red_Barrel.png b/Unity-Files/Assets/Images/Asteroids/Red_Barrel.png new file mode 100644 index 0000000..acb40b4 --- /dev/null +++ b/Unity-Files/Assets/Images/Asteroids/Red_Barrel.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad31151b8d22bf11d96f15090f5c1a20b4025e1bd50be9f4b85311d15cd27a45 +size 2207 diff --git a/Unity-Files/Assets/Images/Asteroids/Red_Barrel.png.meta b/Unity-Files/Assets/Images/Asteroids/Red_Barrel.png.meta new file mode 100644 index 0000000..bf2c5ed --- /dev/null +++ b/Unity-Files/Assets/Images/Asteroids/Red_Barrel.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: a9ecf8c43684c9c4d86fa50c79bd2aae +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 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: 1 + 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-Files/Assets/Scripts/Movement/AlliedReturn.cs b/Unity-Files/Assets/Scripts/Movement/AlliedReturn.cs index 62aef78..f526847 100644 --- a/Unity-Files/Assets/Scripts/Movement/AlliedReturn.cs +++ b/Unity-Files/Assets/Scripts/Movement/AlliedReturn.cs @@ -12,8 +12,11 @@ public class AlliedReturn : Physics2DObject public float returnSpeed = 5f; [Header("Death Effect When Shot")] public GameObject deathEffect; - //[Header("Has Droppable Object")] + public GameObject[] droppables; + + private bool isReturning = false; + private bool hasDroppableObject = true; private Vector2 movement = new Vector2(0f, 0f); // Update is called once per frame @@ -30,21 +33,15 @@ public class AlliedReturn : Physics2DObject void OnTriggerEnter2D(Collider2D otherCollider) { string playerTag = otherCollider.gameObject.tag; - if (playerTag == "Player" || playerTag == "Player2") + if (otherCollider.gameObject.name == "CollisionDetectorAlly") { this.GetComponent().flipY = false; isReturning = true; + dropObject(); } if (playerTag == "Bullet") { DestroyShip(); - // HealthSystemAttribute healthScript = GameObject.Find("CollisionDetector").gameObject.GetComponent(); - // if (healthScript != null) - // { - // // subtract health from the player - // healthScript.ModifyHealth(-1); - // } - // Destroy(gameObject); } else if (playerTag == "Finish" && isReturning) { @@ -60,4 +57,12 @@ public class AlliedReturn : Physics2DObject } Destroy(gameObject); } + + private void dropObject() + { + if (hasDroppableObject) + { + Instantiate(droppables[Random.Range(0, droppables.Length)]).transform.position = this.transform.position; + } + } } \ No newline at end of file diff --git a/Unity-Files/UserSettings/EditorUserSettings.asset b/Unity-Files/UserSettings/EditorUserSettings.asset index 9be5a57..26c57fe 100644 --- a/Unity-Files/UserSettings/EditorUserSettings.asset +++ b/Unity-Files/UserSettings/EditorUserSettings.asset @@ -32,6 +32,9 @@ EditorUserSettings: RecentlyUsedScenePath-8: value: 224247031146467e150f01321c264c5f32121e2f222c2322620d1835e7ee303df0a923e7ee2e26 flags: 0 + RecentlyUsedScenePath-9: + value: 224247031146467e150f01321c264c5f32121e2f222c2322621a1e36ece52777c6e230ece93e3a2e7717e1351027 + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0