diff --git a/Assets/Scenes/Battle Scene.unity b/Assets/Scenes/Battle Scene.unity index 054d0f2..e0c87d6 100644 --- a/Assets/Scenes/Battle Scene.unity +++ b/Assets/Scenes/Battle Scene.unity @@ -1125,7 +1125,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 29 + m_RootOrder: 30 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &457258234 GameObject: @@ -2709,7 +2709,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 30 + m_RootOrder: 31 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1181772760 MonoBehaviour: @@ -2967,7 +2967,7 @@ Transform: m_LocalScale: {x: 0.3, y: 0.4, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 28 + m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1300204711 GameObject: @@ -3830,6 +3830,7 @@ MonoBehaviour: Shield: {fileID: 1797600398} EnemyShield: {fileID: 66290714} Victory: {fileID: 1300204711} + WeakPointVictory: {fileID: 2088125081} GameOver: {fileID: 1580165922} AttackStopSign: {fileID: 822731490} ShieldHit: {fileID: 1928466015} @@ -4406,7 +4407,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 24 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1635882673 GameObject: @@ -4855,7 +4856,7 @@ Transform: m_LocalScale: {x: 0.5, y: 0.5, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 27 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1789541041 GameObject: @@ -4936,7 +4937,7 @@ Transform: m_LocalScale: {x: 0.5, y: 0.5, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 26 + m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1797600398 GameObject: @@ -5338,7 +5339,7 @@ Transform: m_LocalScale: {x: 0.5, y: 0.5, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 25 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1935397210 GameObject: @@ -6020,6 +6021,87 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 5, y: 5} m_EdgeRadius: 0 +--- !u!1 &2088125081 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2088125083} + - component: {fileID: 2088125082} + m_Layer: 0 + m_Name: WeakPointVictory + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!212 &2088125082 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2088125081} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 2135489387 + m_SortingLayer: 4 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: c86294b11fc3ea545bd45fe044c966eb, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.12, y: 5.12} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &2088125083 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2088125081} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 3.25, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 24 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2090725431 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GMScript.cs b/Assets/Scripts/GMScript.cs index 7170639..5346ac2 100644 --- a/Assets/Scripts/GMScript.cs +++ b/Assets/Scripts/GMScript.cs @@ -22,6 +22,7 @@ public class GMScript : MonoBehaviour public GameObject EnemyShield; public GameObject Victory; + public GameObject WeakPointVictory; public GameObject GameOver; public GameObject AttackStopSign; public GameObject ShieldHit; @@ -1194,10 +1195,12 @@ public class GMScript : MonoBehaviour { display.SetActive(true); + if(victory || enemyHealth > 0) WeakPointVictory.SetActive(true); yield return new WaitForSeconds(3); display.SetActive(false); + WeakPointVictory.SetActive(false); level++; PlayerPrefs.SetInt("Level", level); diff --git a/Assets/Textures/WeakPointTitle.png b/Assets/Textures/WeakPointTitle.png new file mode 100644 index 0000000..f7de3b6 Binary files /dev/null and b/Assets/Textures/WeakPointTitle.png differ diff --git a/Assets/Textures/WeakPointTitle.png.meta b/Assets/Textures/WeakPointTitle.png.meta new file mode 100644 index 0000000..e16e9c7 --- /dev/null +++ b/Assets/Textures/WeakPointTitle.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: c86294b11fc3ea545bd45fe044c966eb +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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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/Assets/Textures/WeakPointTitle.xcf b/Assets/Textures/WeakPointTitle.xcf new file mode 100644 index 0000000..ece2481 Binary files /dev/null and b/Assets/Textures/WeakPointTitle.xcf differ diff --git a/Assets/Textures/WeakPointTitle.xcf.meta b/Assets/Textures/WeakPointTitle.xcf.meta new file mode 100644 index 0000000..c2f6edf --- /dev/null +++ b/Assets/Textures/WeakPointTitle.xcf.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5c061d5806316ce418415ed3f9fd96ec +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: