diff --git a/Assets/Levels/GameJolt/GameJoltUI.unity b/Assets/Levels/GameJolt/GameJoltUI.unity index dc73be0..263fba7 100644 --- a/Assets/Levels/GameJolt/GameJoltUI.unity +++ b/Assets/Levels/GameJolt/GameJoltUI.unity @@ -1137,7 +1137,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.14150941, g: 0.14150941, b: 0.14150941, a: 0.019607844} + m_BackGroundColor: {r: 0.22745098, g: 0.17254902, b: 0.21568628, a: 0.019607844} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 diff --git a/Assets/Levels/Intro/Intro.unity b/Assets/Levels/Intro/Intro.unity index 8e8994e..0be55ed 100644 --- a/Assets/Levels/Intro/Intro.unity +++ b/Assets/Levels/Intro/Intro.unity @@ -159,7 +159,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 diff --git a/Assets/Levels/TestLevel/TestLevel.unity b/Assets/Levels/TestLevel/TestLevel.unity index e1e2f86..4908305 100644 --- a/Assets/Levels/TestLevel/TestLevel.unity +++ b/Assets/Levels/TestLevel/TestLevel.unity @@ -444,7 +444,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 192975206} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.054, y: -0.464, z: 0} + m_LocalPosition: {x: 0, y: -0.45, z: 0} m_LocalScale: {x: 10, y: 10, z: 1} m_Children: [] m_Father: {fileID: 203718494} @@ -557,7 +557,7 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.0012732744, y: 0.0004940629} + m_Offset: {x: -0.00080758333, y: -0.025516555} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} @@ -568,7 +568,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 0.72619045, y: 0.9147258} + m_Size: {x: 0.62630963, y: 0.8627045} m_EdgeRadius: 0 --- !u!95 &203718493 Animator: @@ -597,12 +597,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 203718489} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -3, z: 0} - m_LocalScale: {x: 1.8, y: 1.8, z: -1} + m_LocalPosition: {x: 0, y: -3, z: 1} + m_LocalScale: {x: 1.8, y: 1.8, z: 1} m_Children: - {fileID: 192975207} - {fileID: 207929065} - - {fileID: 714853234} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5965,7 +5964,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0.21106264, g: 0.47017765, b: 0.8773585, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -6006,7 +6005,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.00000047683716, y: -3, z: -10} + m_LocalPosition: {x: -0.00000047683716, y: -3, z: -9} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -6282,12 +6281,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 714853233} - m_LocalRotation: {x: 0, y: 0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.6666667, z: 0} - m_LocalScale: {x: 0.5555556, y: 0.5555556, z: -1} + 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: 203718494} - m_RootOrder: 2 + m_Father: {fileID: 0} + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &714853235 MonoBehaviour: @@ -6301,7 +6300,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6546985c3298745409b7e49445a4225f, type: 3} m_Name: m_EditorClassIdentifier: - playerJump: {fileID: 714853236} --- !u!82 &714853236 AudioSource: m_ObjectHideFlags: 0 @@ -6313,7 +6311,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: ea9ce53e23dab5746a17566750318ed0, type: 3} - m_PlayOnAwake: 1 + m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 Loop: 0 @@ -10660,6 +10658,26 @@ Tilemap: dummyAlignment: 0 m_AllTileFlags: 1073741825 - first: {x: -4, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 14 + m_TileSpriteIndex: 14 + m_TileMatrixIndex: 0 + m_TileColorIndex: 6 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -3, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 14 + m_TileSpriteIndex: 14 + m_TileMatrixIndex: 0 + m_TileColorIndex: 6 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -2, y: -1, z: 0} second: serializedVersion: 2 m_TileIndex: 13 @@ -10770,6 +10788,16 @@ Tilemap: dummyAlignment: 0 m_AllTileFlags: 1073741825 - first: {x: -4, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 14 + m_TileSpriteIndex: 14 + m_TileMatrixIndex: 0 + m_TileColorIndex: 6 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -3, y: 8, z: 0} second: serializedVersion: 2 m_TileIndex: 13 @@ -10809,7 +10837,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 0fa7c3777b6b72547a8a338278f3c28c, type: 2} - m_RefCount: 5 m_Data: {fileID: 11400000, guid: f991f32a9dd71754e8c514c804e0fc2c, type: 2} - - m_RefCount: 9 + - m_RefCount: 12 m_Data: {fileID: 11400000, guid: 3dcac8800d1721e42a3979fc3b627b5c, type: 2} m_TileSpriteArray: - m_RefCount: 261 @@ -10840,10 +10868,10 @@ Tilemap: m_Data: {fileID: 423579421183749727, guid: ce8706a4e8b62ba40bc5f48ed927420c, type: 3} - m_RefCount: 5 m_Data: {fileID: 8254441489430768909, guid: ce8706a4e8b62ba40bc5f48ed927420c, type: 3} - - m_RefCount: 9 + - m_RefCount: 12 m_Data: {fileID: -7438091772680066426, guid: ce8706a4e8b62ba40bc5f48ed927420c, type: 3} m_TileMatrixArray: - - m_RefCount: 360 + - m_RefCount: 363 m_Data: e00: 1 e01: 0 @@ -10874,7 +10902,7 @@ Tilemap: m_Data: {r: 2.7622e-41, g: 2.7622e-41, b: 2.7622e-41, a: 2.7622e-41} - m_RefCount: 0 m_Data: {r: 2.7622e-41, g: 2.7622e-41, b: 2.7622e-41, a: 2.7622e-41} - - m_RefCount: 360 + - m_RefCount: 363 m_Data: {r: 1, g: 1, b: 1, a: 1} - m_RefCount: 0 m_Data: {r: NaN, g: NaN, b: NaN, a: NaN} @@ -10926,15 +10954,15 @@ CompositeCollider2D: m_ColliderPaths: - m_Collider: {fileID: 972855871} m_ColliderPaths: - - - X: -30624943 + - - X: -20624943 Y: 79999915 - - X: -29999915 + - X: -19999915 Y: 80624943 - - X: -29999900 + - X: -19999900 Y: 80624980 - - X: -29999900 + - X: -19999900 Y: 90000041 - - X: -29999959 + - X: -19999959 Y: 90000100 - X: -60000041 Y: 90000100 @@ -10948,7 +10976,7 @@ CompositeCollider2D: Y: 79999915 - X: -59375020 Y: 79999900 - - X: -30624980 + - X: -20624980 Y: 79999900 - - X: 119375057 Y: 69999915 @@ -10998,15 +11026,15 @@ CompositeCollider2D: Y: 39999900 - X: 69375020 Y: 39999900 - - - X: -30624943 + - - X: -10624943 Y: -10000085 - - X: -29999915 + - X: -9999915 Y: -9375057 - - X: -29999900 + - X: -9999900 Y: -9375020 - - X: -29999900 + - X: -9999900 Y: 41 - - X: -29999959 + - X: -9999959 Y: 100 - X: -70000041 Y: 100 @@ -11020,7 +11048,7 @@ CompositeCollider2D: Y: -10000085 - X: -69375020 Y: -10000100 - - X: -30624980 + - X: -10624980 Y: -10000100 - - X: 99375057 Y: -20000085 @@ -11080,9 +11108,9 @@ CompositeCollider2D: Y: -150000100 m_CompositePaths: m_Paths: - - - {x: -3.0625088, y: 7.9999905} - - {x: -2.99999, y: 8.062509} - - {x: -3.0000253, y: 9.00001} + - - {x: -2.0625088, y: 7.9999905} + - {x: -1.99999, y: 8.062509} + - {x: -2.0000253, y: 9.00001} - {x: -6.00001, y: 8.999974} - {x: -6.000001, y: 8.062487} - {x: -5.9374914, y: 7.9999905} @@ -11098,9 +11126,9 @@ CompositeCollider2D: - {x: 1.99999, y: 4.9999747} - {x: 1.9999992, y: 4.0624866} - {x: 2.0625088, y: 3.99999} - - - {x: -3.0625088, y: -1.00001} - - {x: -2.99999, y: -0.93749124} - - {x: -3.0000253, y: 0.00001} + - - {x: -1.0625088, y: -1.00001} + - {x: -0.99999, y: -0.93749124} + - {x: -1.0000252, y: 0.00001} - {x: -7.0000095, y: -0.0000252} - {x: -7.000001, y: -0.9375133} - {x: -6.9374914, y: -1.00001} @@ -12803,7 +12831,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2098098309} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.00000047683716, y: -3, z: -10} + m_LocalPosition: {x: -0.00000047683716, y: -3, z: -9} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1057187206} diff --git a/Assets/Test.meta b/Assets/Resources.meta similarity index 77% rename from Assets/Test.meta rename to Assets/Resources.meta index 262f9c2..32e2f3d 100644 --- a/Assets/Test.meta +++ b/Assets/Resources.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a88756be51890544b9459c2016179ace +guid: 1a05cd2ec7cf2c04d89de1a5f44ca0d4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Resources/player_jump.wav b/Assets/Resources/player_jump.wav new file mode 100644 index 0000000..6146c30 Binary files /dev/null and b/Assets/Resources/player_jump.wav differ diff --git a/Assets/Sounds/Effects/player_jump.wav.meta b/Assets/Resources/player_jump.wav.meta similarity index 100% rename from Assets/Sounds/Effects/player_jump.wav.meta rename to Assets/Resources/player_jump.wav.meta diff --git a/Assets/Resources/player_jump_sec.wav b/Assets/Resources/player_jump_sec.wav new file mode 100644 index 0000000..e9aa0ba Binary files /dev/null and b/Assets/Resources/player_jump_sec.wav differ diff --git a/Assets/Resources/player_jump_sec.wav.meta b/Assets/Resources/player_jump_sec.wav.meta new file mode 100644 index 0000000..b403fb8 --- /dev/null +++ b/Assets/Resources/player_jump_sec.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c2a41f087a2ca4f498ad3c9b82b6cde4 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index ee13ada..a38f61b 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -27,6 +27,7 @@ public class Player : MonoBehaviour { public static bool fly_mode = false; private int extraJumps; public int extraJumpsValue; + private int jumps; public static float gravity = 2.0f; public static Rigidbody2D rb; @@ -79,6 +80,7 @@ private void FixedUpdate() { if (Input.GetKey(KeyCode.LeftShift) || Input.GetKey("joystick button 4")) { rb.velocity = new Vector2(moveInput * (speed * 1.55f), rb.velocity.y); + jumpForce = jumpForceVar * 1.05f; } } else @@ -100,6 +102,7 @@ private void FixedUpdate() { private void Update() { if (isGrounded == true) { extraJumps = extraJumpsValue; + jumps = (extraJumps + 1); } if ( (Input.GetKeyDown(KeyCode.UpArrow) || Input.GetKeyDown("joystick button 0")) && extraJumps > 0 && canMove) { @@ -111,7 +114,13 @@ private void Update() { CreateDust(); rb.velocity = Vector2.up * jumpForce; extraJumps--; - soundMan.PlaySoundEffect("jump"); + if (jumps == 2) { + jumps--; + soundMan.PlaySoundEffect("jump"); + } else if (jumps == 1) { + jumps--; + soundMan.PlaySoundEffect("jump2"); + } } } else if ( (Input.GetKeyDown(KeyCode.UpArrow) || Input.GetKeyDown("joystick button 0")) && extraJumps == 0 && isGrounded && canMove) { if (unlimitedJumpMode) { diff --git a/Assets/Sounds/Effects/player_jump.wav b/Assets/Sounds/Effects/player_jump.wav deleted file mode 100644 index af94cc1..0000000 Binary files a/Assets/Sounds/Effects/player_jump.wav and /dev/null differ diff --git a/Assets/Sounds/Effects/player_jump2.wav b/Assets/Sounds/Effects/player_jump2.wav deleted file mode 100644 index 1ee6e66..0000000 Binary files a/Assets/Sounds/Effects/player_jump2.wav and /dev/null differ diff --git a/Assets/Sounds/SoundManager.cs b/Assets/Sounds/SoundManager.cs index 098eb64..76cafdc 100644 --- a/Assets/Sounds/SoundManager.cs +++ b/Assets/Sounds/SoundManager.cs @@ -4,11 +4,22 @@ public class SoundManager : MonoBehaviour { - public AudioSource playerJump; + static AudioSource audioSrc; + + public static AudioClip playerJump; + public static AudioClip playerJumpSec; + + void Start() { + playerJump = Resources.Load("player_jump"); + playerJumpSec = Resources.Load("player_jump_sec"); + audioSrc = GetComponent(); + } public void PlaySoundEffect(string effect) { if (effect == "jump") { - playerJump.Play(); + audioSrc.PlayOneShot(playerJump); + } else if (effect == "jump2") { + audioSrc.PlayOneShot(playerJumpSec); } } -} +} \ No newline at end of file diff --git a/Assets/Test/PlayerMat.physicsMaterial2D b/Assets/Sprites/Characters/PlayerMat.physicMaterial similarity index 93% rename from Assets/Test/PlayerMat.physicsMaterial2D rename to Assets/Sprites/Characters/PlayerMat.physicMaterial index 1d1ddd0..ee3e90a 100644 --- a/Assets/Test/PlayerMat.physicsMaterial2D +++ b/Assets/Sprites/Characters/PlayerMat.physicMaterial @@ -8,4 +8,4 @@ PhysicsMaterial2D: m_PrefabAsset: {fileID: 0} m_Name: PlayerMat friction: 0 - bounciness: 0 + bounciness: 0 \ No newline at end of file diff --git a/Assets/Test/PlayerMat.physicsMaterial2D.meta b/Assets/Sprites/Characters/PlayerMat.physicMaterial.meta similarity index 87% rename from Assets/Test/PlayerMat.physicsMaterial2D.meta rename to Assets/Sprites/Characters/PlayerMat.physicMaterial.meta index 4a233dc..ca797d9 100644 --- a/Assets/Test/PlayerMat.physicsMaterial2D.meta +++ b/Assets/Sprites/Characters/PlayerMat.physicMaterial.meta @@ -5,4 +5,4 @@ NativeFormatImporter: mainObjectFileID: 6200000 userData: assetBundleName: - assetBundleVariant: + assetBundleVariant: \ No newline at end of file diff --git a/Assets/Sprites/Characters/Player_Move.anim b/Assets/Sprites/Characters/Player_Move.anim index 74444c4..d601133 100644 --- a/Assets/Sprites/Characters/Player_Move.anim +++ b/Assets/Sprites/Characters/Player_Move.anim @@ -21,17 +21,17 @@ AnimationClip: - curve: - time: 0 value: {fileID: 4334783836991956000, guid: 53746882566d4b344a588c0ae7a4728a, type: 3} - - time: 0.2 + - time: 0.16666667 value: {fileID: 7388399842426930641, guid: 53746882566d4b344a588c0ae7a4728a, type: 3} - - time: 0.4 + - time: 0.33333334 value: {fileID: 6757282713640645180, guid: 53746882566d4b344a588c0ae7a4728a, type: 3} - - time: 0.6 + - time: 0.5 value: {fileID: -6781412095145881161, guid: 53746882566d4b344a588c0ae7a4728a, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} - m_SampleRate: 5 + m_SampleRate: 6 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -55,7 +55,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.8 + m_StopTime: 0.6666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Sprites/Characters/player.png b/Assets/Sprites/Characters/player.png index 8b4dc25..518c2c6 100644 Binary files a/Assets/Sprites/Characters/player.png and b/Assets/Sprites/Characters/player.png differ diff --git a/Assets/Sprites/GameLogo.png b/Assets/Sprites/GameLogo.png new file mode 100644 index 0000000..2851e9a Binary files /dev/null and b/Assets/Sprites/GameLogo.png differ diff --git a/Assets/Test/testFloor.png.meta b/Assets/Sprites/GameLogo.png.meta similarity index 65% rename from Assets/Test/testFloor.png.meta rename to Assets/Sprites/GameLogo.png.meta index 4108184..edcd227 100644 --- a/Assets/Test/testFloor.png.meta +++ b/Assets/Sprites/GameLogo.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0250693361827044a8a8f93962ce310d +guid: 11dcff3a727bf6748b6907c263ea1562 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,7 +32,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -46,7 +46,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 88 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -68,7 +68,43 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Test/testFloor.png b/Assets/Test/testFloor.png deleted file mode 100644 index ffb735c..0000000 Binary files a/Assets/Test/testFloor.png and /dev/null differ diff --git a/Assets/Test/testPlayer.png b/Assets/Test/testPlayer.png deleted file mode 100644 index 64aad7b..0000000 Binary files a/Assets/Test/testPlayer.png and /dev/null differ diff --git a/Assets/Test/testPlayer.png.meta b/Assets/Test/testPlayer.png.meta deleted file mode 100644 index e1e7cb0..0000000 --- a/Assets/Test/testPlayer.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 1ba7a5fc6aefd2e48bb08786a27188fc -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/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3ac5616..83056df 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -276,7 +276,14 @@ PlayerSettings: AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 - m_BuildTargetIcons: [] + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 2800000, guid: 11dcff3a727bf6748b6907c263ea1562, type: 3} + m_Width: 128 + m_Height: 128 + m_Kind: 0 m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: [] m_BuildTargetGraphicsJobs: