diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/Assembly-CSharp.dll b/Build/GAM110_3D_GAMEA_Data/Managed/Assembly-CSharp.dll index e35b426..437cba4 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/Assembly-CSharp.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/Assembly-CSharp.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/Purchasing.Common.dll b/Build/GAM110_3D_GAMEA_Data/Managed/Purchasing.Common.dll index bf49efc..72918d5 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/Purchasing.Common.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/Purchasing.Common.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Addressables.dll b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Addressables.dll index 2c16be8..cae44b9 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Addressables.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Addressables.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Analytics.DataPrivacy.dll b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Analytics.DataPrivacy.dll index 41d9908..a1bf51f 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Analytics.DataPrivacy.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Analytics.DataPrivacy.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ResourceManager.dll b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ResourceManager.dll index db0d7bd..21490d9 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ResourceManager.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ResourceManager.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ScriptableBuildPipeline.dll b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ScriptableBuildPipeline.dll index 86d75d4..4ebda6e 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ScriptableBuildPipeline.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ScriptableBuildPipeline.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.TextMeshPro.dll b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.TextMeshPro.dll index 981e0b4..9e2d182 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.TextMeshPro.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.TextMeshPro.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Timeline.dll b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Timeline.dll index 2428b2c..f18806d 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Timeline.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Timeline.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Advertisements.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Advertisements.dll index 9f08bce..2ef6fe4 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Advertisements.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Advertisements.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Monetization.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Monetization.dll index 6f085ad..d78d347 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Monetization.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Monetization.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleCore.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleCore.dll index f627038..59a65ca 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleCore.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleCore.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleMacosStub.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleMacosStub.dll index 58abd26..bdc96d4 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleMacosStub.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleMacosStub.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleStub.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleStub.dll index a3b4db1..ce18a30 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleStub.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleStub.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Codeless.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Codeless.dll index fbacb79..b52768a 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Codeless.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Codeless.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityCore.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityCore.dll index 728b053..3f4d94c 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityCore.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityCore.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityStub.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityStub.dll index 755335c..630b6d9 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityStub.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityStub.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Stores.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Stores.dll index 630ea51..b12a7dc 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Stores.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Stores.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTCore.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTCore.dll index dcba79a..9423657 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTCore.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTCore.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTStub.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTStub.dll index 3bcbf3e..d94e018 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTStub.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTStub.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.dll index 5253e3b..7409be6 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.SpatialTracking.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.SpatialTracking.dll index ffe109e..59ab0ec 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.SpatialTracking.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.SpatialTracking.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.UI.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.UI.dll index 6c68491..80f3678 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.UI.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.UI.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll index 4a38d1b..2f3fa53 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/com.ben-w.erp.dll b/Build/GAM110_3D_GAMEA_Data/Managed/com.ben-w.erp.dll index 82e25be..20e80a7 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/com.ben-w.erp.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/com.ben-w.erp.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/com.unity.multiplayer-hlapi.Runtime.dll b/Build/GAM110_3D_GAMEA_Data/Managed/com.unity.multiplayer-hlapi.Runtime.dll index b8aa8fb..7f77b46 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/com.unity.multiplayer-hlapi.Runtime.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/com.unity.multiplayer-hlapi.Runtime.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/globalgamemanagers b/Build/GAM110_3D_GAMEA_Data/globalgamemanagers index 7ebce4f..51011bd 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/globalgamemanagers and b/Build/GAM110_3D_GAMEA_Data/globalgamemanagers differ diff --git a/Build/GAM110_3D_GAMEA_Data/globalgamemanagers.assets b/Build/GAM110_3D_GAMEA_Data/globalgamemanagers.assets index 7c94b63..eb5052d 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/globalgamemanagers.assets and b/Build/GAM110_3D_GAMEA_Data/globalgamemanagers.assets differ diff --git a/Build/GAM110_3D_GAMEA_Data/level0 b/Build/GAM110_3D_GAMEA_Data/level0 index 2acafd7..726be2d 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/level0 and b/Build/GAM110_3D_GAMEA_Data/level0 differ diff --git a/Build/GAM110_3D_GAMEA_Data/level1 b/Build/GAM110_3D_GAMEA_Data/level1 index fec4195..c47f6b7 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/level1 and b/Build/GAM110_3D_GAMEA_Data/level1 differ diff --git a/Build/GAM110_3D_GAMEA_Data/sharedassets0.assets b/Build/GAM110_3D_GAMEA_Data/sharedassets0.assets index 4d725f1..a061138 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/sharedassets0.assets and b/Build/GAM110_3D_GAMEA_Data/sharedassets0.assets differ diff --git a/Build/GAM110_3D_GAMEA_Data/sharedassets0.assets.resS b/Build/GAM110_3D_GAMEA_Data/sharedassets0.assets.resS index e3a22ec..eb25c87 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/sharedassets0.assets.resS and b/Build/GAM110_3D_GAMEA_Data/sharedassets0.assets.resS differ diff --git a/Build/GAM110_3D_GAMEA_Data/sharedassets1.assets b/Build/GAM110_3D_GAMEA_Data/sharedassets1.assets index 1633616..1e677eb 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/sharedassets1.assets and b/Build/GAM110_3D_GAMEA_Data/sharedassets1.assets differ diff --git a/Build/GAM110_3D_GAMEA_Data/sharedassets1.assets.resS b/Build/GAM110_3D_GAMEA_Data/sharedassets1.assets.resS index 004cc78..d171cb3 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/sharedassets1.assets.resS and b/Build/GAM110_3D_GAMEA_Data/sharedassets1.assets.resS differ diff --git a/Unity-Files/Assets/Examples/Defender/Defender.unity b/Unity-Files/Assets/Examples/Defender/Defender.unity index 16eb799..7af63f5 100644 --- a/Unity-Files/Assets/Examples/Defender/Defender.unity +++ b/Unity-Files/Assets/Examples/Defender/Defender.unity @@ -387,9 +387,9 @@ RectTransform: m_Father: {fileID: 1059183747} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 500, y: -125} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &204554430 @@ -514,9 +514,9 @@ RectTransform: m_Father: {fileID: 1059183747} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 500, y: -430} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &222835919 @@ -547,7 +547,7 @@ MonoBehaviour: m_MinSize: 0 m_MaxSize: 249 m_Alignment: 3 - m_AlignByGeometry: 0 + m_AlignByGeometry: 1 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -775,9 +775,9 @@ RectTransform: m_Father: {fileID: 1059183747} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 500, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &289906080 @@ -854,9 +854,9 @@ RectTransform: m_Father: {fileID: 1059183747} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 500, y: -510} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &303121901 @@ -887,7 +887,7 @@ MonoBehaviour: m_MinSize: 0 m_MaxSize: 249 m_Alignment: 3 - m_AlignByGeometry: 0 + m_AlignByGeometry: 1 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -1544,9 +1544,9 @@ RectTransform: m_Father: {fileID: 1059183747} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 500, y: -350} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &615826098 @@ -1577,7 +1577,7 @@ MonoBehaviour: m_MinSize: 0 m_MaxSize: 249 m_Alignment: 3 - m_AlignByGeometry: 0 + m_AlignByGeometry: 1 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -2440,8 +2440,8 @@ RectTransform: 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: -441} - m_SizeDelta: {x: 1000, y: 468.97998} + m_AnchoredPosition: {x: 0, y: -532.15} + m_SizeDelta: {x: 1000, y: 650} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1059183748 MonoBehaviour: @@ -2948,9 +2948,9 @@ RectTransform: m_Father: {fileID: 1059183747} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 500, y: -190} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1433312461 @@ -2981,7 +2981,7 @@ MonoBehaviour: m_MinSize: 0 m_MaxSize: 249 m_Alignment: 3 - m_AlignByGeometry: 0 + m_AlignByGeometry: 1 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -4151,7 +4151,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!210 &1891273396 SortingGroup: m_ObjectHideFlags: 0 @@ -4668,9 +4668,9 @@ RectTransform: m_Father: {fileID: 1059183747} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 500, y: -270} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2084735052 @@ -4701,7 +4701,7 @@ MonoBehaviour: m_MinSize: 0 m_MaxSize: 249 m_Alignment: 3 - m_AlignByGeometry: 0 + m_AlignByGeometry: 1 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 diff --git a/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab b/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab index ff7367d..8a582f1 100644 --- a/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab +++ b/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab @@ -179,6 +179,7 @@ MonoBehaviour: type: 3} deathEffect: {fileID: 1496494696399852, guid: e61802031429a4e2e8f547dbca07fe84, type: 3} + shipWithPasties: {fileID: 21300000, guid: 1e6561e946c90b94895946b3cfb12f82, type: 3} --- !u!114 &114000011533140650 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Unity-Files/Assets/Examples/Defender/Main Menu.unity b/Unity-Files/Assets/Examples/Defender/Main Menu.unity index 5a49598..7627b00 100644 --- a/Unity-Files/Assets/Examples/Defender/Main Menu.unity +++ b/Unity-Files/Assets/Examples/Defender/Main Menu.unity @@ -550,6 +550,159 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 631058860} m_CullTransparentMesh: 1 +--- !u!1 &741179645 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 741179646} + - component: {fileID: 741179650} + - component: {fileID: 741179649} + - component: {fileID: 741179648} + - component: {fileID: 741179647} + m_Layer: 0 + m_Name: Back Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &741179646 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741179645} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.99971884, y: 0.99971884, z: 0.99971884} + m_Children: + - {fileID: 948977406} + m_Father: {fileID: 753814770} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -285} + m_SizeDelta: {x: 300.976, y: 86.8201} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &741179647 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741179645} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: e0d3da99f351daa4290570e49a4774e5, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &741179648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741179645} + 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: 3 + 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: 741179649} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 271190048} + m_TargetAssemblyTypeName: MainMenuHandler, Assembly-CSharp + m_MethodName: BackToMenu + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &741179649 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741179645} + 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: 451d58ab615e5394ba2611932d8e3a35, 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!222 &741179650 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741179645} + m_CullTransparentMesh: 1 --- !u!1 &753814769 GameObject: m_ObjectHideFlags: 0 @@ -580,7 +733,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1835426312} - - {fileID: 2036433124} + - {fileID: 741179646} - {fileID: 80755783} m_Father: {fileID: 271190044} m_RootOrder: 3 @@ -707,6 +860,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 779675789} m_CullTransparentMesh: 1 +--- !u!1 &948977405 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 948977406} + - component: {fileID: 948977408} + - component: {fileID: 948977407} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &948977406 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948977405} + 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: 741179646} + m_RootOrder: 0 + 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!114 &948977407 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948977405} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: + m_Font: {fileID: 12800000, guid: 2fb810d2f9fc27b4eb7693fd3f9f158c, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 9 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 1 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Back +--- !u!222 &948977408 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948977405} + m_CullTransparentMesh: 1 --- !u!1 &1015652468 GameObject: m_ObjectHideFlags: 0 @@ -1305,85 +1537,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1578951840} m_CullTransparentMesh: 1 ---- !u!1 &1661249102 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1661249103} - - component: {fileID: 1661249105} - - component: {fileID: 1661249104} - m_Layer: 0 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1661249103 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1661249102} - 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: 2036433124} - m_RootOrder: 0 - 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!114 &1661249104 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1661249102} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Back ---- !u!222 &1661249105 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1661249102} - m_CullTransparentMesh: 1 --- !u!1 &1775893496 GameObject: m_ObjectHideFlags: 0 @@ -1616,139 +1769,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1835426311} m_CullTransparentMesh: 1 ---- !u!1 &2036433123 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2036433124} - - component: {fileID: 2036433127} - - component: {fileID: 2036433126} - - component: {fileID: 2036433125} - m_Layer: 0 - m_Name: BackButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2036433124 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2036433123} - 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: - - {fileID: 1661249103} - m_Father: {fileID: 753814770} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.000015259, y: -284} - m_SizeDelta: {x: 410.22, y: 66.25} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2036433125 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2036433123} - 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: 2036433126} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 271190048} - m_TargetAssemblyTypeName: MainMenuHandler, Assembly-CSharp - m_MethodName: BackToMenu - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &2036433126 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2036433123} - 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: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - 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!222 &2036433127 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2036433123} - m_CullTransparentMesh: 1 --- !u!1 &2067754503 GameObject: m_ObjectHideFlags: 0 diff --git a/Unity-Files/Assets/Images/Asteroids/ship with pasties.png.meta b/Unity-Files/Assets/Images/Asteroids/ship with pasties.png.meta index 5b4cdc3..d48d9ae 100644 --- a/Unity-Files/Assets/Images/Asteroids/ship with pasties.png.meta +++ b/Unity-Files/Assets/Images/Asteroids/ship with pasties.png.meta @@ -75,6 +75,18 @@ TextureImporter: overridden: 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs index bf52d62..eed482e 100644 --- a/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs +++ b/Unity-Files/Assets/Scripts/Movement/EnemyReturn.cs @@ -16,7 +16,7 @@ public class EnemyReturn : Physics2DObject [Header("Death Effect When Shot")] public GameObject deathEffect; //[Header("Has Droppable Object")] - private Sprite shipWithPasties; + public Sprite shipWithPasties; private bool hasDroppableObject = false; private bool isReturning = false; private Vector2 movement = new Vector2(0f, 0f); @@ -24,7 +24,7 @@ public class EnemyReturn : Physics2DObject // Start is called before the first frame update void Start() { - Addressables.LoadAssetAsync("pastieShip").Completed += handle => { shipWithPasties = handle.Result; }; + //Addressables.LoadAssetAsync("pastieShip").Completed += handle => { shipWithPasties = handle.Result; }; } // Update is called once per frame diff --git a/Unity-Files/UserSettings/EditorUserSettings.asset b/Unity-Files/UserSettings/EditorUserSettings.asset index 18fce41..9be5a57 100644 --- a/Unity-Files/UserSettings/EditorUserSettings.asset +++ b/Unity-Files/UserSettings/EditorUserSettings.asset @@ -27,10 +27,10 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6c3338282b2b21382a35633c133af6f9 flags: 0 RecentlyUsedScenePath-7: - value: 224247031146467e150f01321c264c5f32121e2f222c2322620d1835e7ee303df0a923e7ee2e26 + value: 224247031146467e150f01321c264c5f32121e2f222c232262041c3aeca0193decf278fce9332b25 flags: 0 RecentlyUsedScenePath-8: - value: 224247031146467e150f01321c264c5f32121e2f222c232262041c3aeca0193decf278fce9332b25 + value: 224247031146467e150f01321c264c5f32121e2f222c2322620d1835e7ee303df0a923e7ee2e26 flags: 0 vcSharedLogLevel: value: 0d5e400f0650