diff --git a/Assets/GadGame/Prefab/MiniGame/Bomb.prefab b/Assets/GadGame/Prefab/MiniGame/Bomb.prefab index 15405ed..c724cf1 100644 --- a/Assets/GadGame/Prefab/MiniGame/Bomb.prefab +++ b/Assets/GadGame/Prefab/MiniGame/Bomb.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &7869838380349165436 +--- !u!1 &98078057992520876 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,41 +8,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1031400425691494886} - - component: {fileID: 3253116021677228158} - - component: {fileID: 4161882844417404082} - - component: {fileID: 9129339961973675669} - - component: {fileID: 9094510377780948320} - m_Layer: 6 - m_Name: Bomb + - component: {fileID: 5131312940411862558} + - component: {fileID: 6244318180748585680} + m_Layer: 0 + m_Name: Sprite m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1031400425691494886 +--- !u!4 &5131312940411862558 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7869838380349165436} + m_GameObject: {fileID: 98078057992520876} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.024, y: 0.07, z: 0} - m_LocalScale: {x: 0.42, y: 0.42, z: 0.42} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 8679570863066357004} - m_Father: {fileID: 0} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1031400425691494886} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &3253116021677228158 +--- !u!212 &6244318180748585680 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7869838380349165436} + m_GameObject: {fileID: 98078057992520876} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -88,6 +84,42 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &7869838380349165436 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1031400425691494886} + - component: {fileID: 4161882844417404082} + - component: {fileID: 9129339961973675669} + - component: {fileID: 9094510377780948320} + m_Layer: 6 + m_Name: Bomb + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1031400425691494886 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7869838380349165436} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.42, y: 0.42, z: 0.42} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 5131312940411862558} + - {fileID: 8679570863066357004} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4161882844417404082 MonoBehaviour: m_ObjectHideFlags: 0 @@ -102,6 +134,8 @@ MonoBehaviour: m_EditorClassIdentifier: _reduceScore: 3 _rb: {fileID: 9129339961973675669} + _sprite: {fileID: 6244318180748585680} + _trail: {fileID: 5046750308458126215} --- !u!50 &9129339961973675669 Rigidbody2D: serializedVersion: 4 @@ -216,10 +250,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2692383457585442039, guid: 192ed0f6b6bdd9c4992c815d6ab73d26, type: 3} - propertyPath: m_Parameters.textureScale.x - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2692383457585442039, guid: 192ed0f6b6bdd9c4992c815d6ab73d26, type: 3} propertyPath: m_Parameters.widthMultiplier value: 4 @@ -245,6 +275,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 192ed0f6b6bdd9c4992c815d6ab73d26, type: 3} +--- !u!96 &5046750308458126215 stripped +TrailRenderer: + m_CorrespondingSourceObject: {fileID: 2692383457585442039, guid: 192ed0f6b6bdd9c4992c815d6ab73d26, type: 3} + m_PrefabInstance: {fileID: 7157606119336703856} + m_PrefabAsset: {fileID: 0} --- !u!4 &8679570863066357004 stripped Transform: m_CorrespondingSourceObject: {fileID: 1954821041849068156, guid: 192ed0f6b6bdd9c4992c815d6ab73d26, type: 3} diff --git a/Assets/GadGame/Scenes/Game.unity b/Assets/GadGame/Scenes/Game.unity index 465e743..84af631 100644 --- a/Assets/GadGame/Scenes/Game.unity +++ b/Assets/GadGame/Scenes/Game.unity @@ -4253,7 +4253,7 @@ MonoBehaviour: _basket: {fileID: 1254852293} _lerp: 10 _spawnTime: 0.5 - _bombChange: 0.1 + _bombChange: 0.15 _spawnArea: serializedVersion: 2 x: 0 diff --git a/Assets/GadGame/Scripts/MiniGame/Bomb.cs b/Assets/GadGame/Scripts/MiniGame/Bomb.cs index e602945..fabc4fa 100644 --- a/Assets/GadGame/Scripts/MiniGame/Bomb.cs +++ b/Assets/GadGame/Scripts/MiniGame/Bomb.cs @@ -9,6 +9,8 @@ namespace GadGame.MiniGame { [SerializeField] private int _reduceScore; [SerializeField] private Rigidbody2D _rb; + [SerializeField] private SpriteRenderer _sprite; + [SerializeField] private TrailRenderer _trail; private bool _inUsed; @@ -17,7 +19,7 @@ namespace GadGame.MiniGame public void Init(float gravityScale = 1) { _rb.gravityScale = gravityScale; - _tweener = transform.DORotate(new Vector3(0, 0, gravityScale * 50),0.1f).SetLoops(-1, LoopType.Incremental); + _tweener = _sprite.transform.DORotate(new Vector3(0, 0, gravityScale * 50),0.1f).SetLoops(-1, LoopType.Incremental); } private void LateUpdate() @@ -42,6 +44,7 @@ namespace GadGame.MiniGame public void OnRelease() { + _trail.Clear(); _inUsed = false; _tweener.Restart(); _tweener.Complete(); diff --git a/Assets/TA/Prefab/Sparks.prefab b/Assets/TA/Prefab/Sparks.prefab index a110067..7cc8b31 100644 --- a/Assets/TA/Prefab/Sparks.prefab +++ b/Assets/TA/Prefab/Sparks.prefab @@ -4869,7 +4869,7 @@ Transform: m_GameObject: {fileID: 5744787486499361490} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.63, y: -0.1, z: 0} + m_LocalPosition: {x: 0, y: -0.1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/TA/Texture/Radial Outline 256px - 7x.png b/Assets/TA/Texture/Radial Outline 256px - 7x.png new file mode 100644 index 0000000..a5b9a99 Binary files /dev/null and b/Assets/TA/Texture/Radial Outline 256px - 7x.png differ diff --git a/Assets/TA/Texture/Radial Outline 256px - 7x.png.meta b/Assets/TA/Texture/Radial Outline 256px - 7x.png.meta new file mode 100644 index 0000000..949c7cd --- /dev/null +++ b/Assets/TA/Texture/Radial Outline 256px - 7x.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: a5febafec42e1d24db4a2e330565a452 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: