diff --git a/Assets/Fonts/NovaSquare-Bold SDF 1.mat b/Assets/Fonts/NovaSquare-Bold SDF 1.mat new file mode 100644 index 0000000..92f450a --- /dev/null +++ b/Assets/Fonts/NovaSquare-Bold SDF 1.mat @@ -0,0 +1,108 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NovaSquare-Bold SDF 1 + m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_ValidKeywords: + - UNDERLAY_ON + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Cube: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FaceTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 3996172845468620811, guid: 86a9875a210857b4483886b292270398, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Ambient: 0.5 + - _Bevel: 0.5 + - _BevelClamp: 0 + - _BevelOffset: 0 + - _BevelRoundness: 0 + - _BevelWidth: 0 + - _BumpFace: 0 + - _BumpOutline: 0 + - _ColorMask: 15 + - _CullMode: 0 + - _Diffuse: 0.5 + - _FaceDilate: 0 + - _FaceUVSpeedX: 0 + - _FaceUVSpeedY: 0 + - _GlowInner: 0.05 + - _GlowOffset: 0 + - _GlowOuter: 0.05 + - _GlowPower: 0.75 + - _GradientScale: 6 + - _LightAngle: 3.1416 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _OutlineSoftness: 0 + - _OutlineUVSpeedX: 0 + - _OutlineUVSpeedY: 0 + - _OutlineWidth: 0 + - _PerspectiveFilter: 0.875 + - _Reflectivity: 10 + - _ScaleRatioA: 0.8333333 + - _ScaleRatioB: 0.6770833 + - _ScaleRatioC: 0.6770833 + - _ScaleX: 1 + - _ScaleY: 1 + - _ShaderFlags: 0 + - _Sharpness: 0 + - _SpecularPower: 2 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _TextureHeight: 512 + - _TextureWidth: 512 + - _UnderlayDilate: -0.089 + - _UnderlayOffsetX: 0 + - _UnderlayOffsetY: 0 + - _UnderlaySoftness: 1 + - _VertexOffsetX: 0 + - _VertexOffsetY: 0 + - _WeightBold: 0.75 + - _WeightNormal: 0 + m_Colors: + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} + - _FaceColor: {r: 1, g: 1, b: 1, a: 1} + - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} + - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} + - _OutlineColor: {r: 0, g: 0.04956346, b: 0.41509432, a: 1} + - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} + - _UnderlayColor: {r: 0, g: 0.049706575, b: 0.4125427, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Fonts/NovaSquare-Bold SDF 1.mat.meta b/Assets/Fonts/NovaSquare-Bold SDF 1.mat.meta new file mode 100644 index 0000000..944db02 --- /dev/null +++ b/Assets/Fonts/NovaSquare-Bold SDF 1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2796209c55022094eadc4178b991652e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Clock.mat b/Assets/Materials/Clock.mat index e20bbde..e311ffa 100644 --- a/Assets/Materials/Clock.mat +++ b/Assets/Materials/Clock.mat @@ -69,7 +69,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Revealed: 0.9412786 + - _Revealed: 0.9582453 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Materials/Player.mat b/Assets/Materials/Player.mat index 731592b..da38e49 100644 --- a/Assets/Materials/Player.mat +++ b/Assets/Materials/Player.mat @@ -77,7 +77,7 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _DarkColor: {r: 0.764151, g: 0.764151, b: 0.764151, a: 1} + - _DarkColor: {r: 0.9, g: 0.9, b: 0.9, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _LightColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Prefabs/ScorePopup.prefab b/Assets/Prefabs/ScorePopup.prefab index d916d94..7627e10 100644 --- a/Assets/Prefabs/ScorePopup.prefab +++ b/Assets/Prefabs/ScorePopup.prefab @@ -59,7 +59,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 7736203359332322430, guid: 86a9875a210857b4483886b292270398, type: 2} + - {fileID: 2100000, guid: 2796209c55022094eadc4178b991652e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -101,10 +101,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: +1,100 x 2 + m_text: +1,100 x2 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 86a9875a210857b4483886b292270398, type: 2} - m_sharedMaterial: {fileID: 7736203359332322430, guid: 86a9875a210857b4483886b292270398, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2796209c55022094eadc4178b991652e, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -128,8 +128,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 9d3d86b..dff0425 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -821,7 +821,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 30 + orthographic size: 35 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -7390,7 +7390,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: press R to restart + m_text: press R or START to restart m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 86a9875a210857b4483886b292270398, type: 2} m_sharedMaterial: {fileID: 7736203359332322430, guid: 86a9875a210857b4483886b292270398, type: 2} diff --git a/Assets/Scripts/BlockScript.cs b/Assets/Scripts/BlockScript.cs index f850d0c..5041987 100644 --- a/Assets/Scripts/BlockScript.cs +++ b/Assets/Scripts/BlockScript.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using TMPro; using UnityEngine; +using UnityEngine.InputSystem; public class BlockScript : MonoBehaviour { @@ -68,6 +69,7 @@ void Update() { } connectVFX.Clear(); SFXHelper.instance.Snap(); + Invoke("SnapRumble", .1f); } } } @@ -107,4 +109,12 @@ public void QueueConnectVFX(Vector2Int direction) { } connectVFX.Add(direction); } + + void SnapRumble() { + Gamepad.current?.SetMotorSpeeds(1, 1); + Invoke("StopRumble", .066f); + } + void StopRumble() { + Gamepad.current?.SetMotorSpeeds(0, 0); + } } diff --git a/Assets/Scripts/DeliveryZoneScript.cs b/Assets/Scripts/DeliveryZoneScript.cs index 10024aa..14fac0e 100644 --- a/Assets/Scripts/DeliveryZoneScript.cs +++ b/Assets/Scripts/DeliveryZoneScript.cs @@ -67,7 +67,6 @@ void Update() { foreach (OminoScript omino in ominos) { if (omino.ID == targetID && omino.ContainsAll(colliders)) { GameHelper.instance.Deliver(omino); - PlayerScript.instance.boostSeconds += 2 + omino.Size() / 4f * 5; Destroy(omino.gameObject); Instantiate(prefabOminoDisappearVFX).GetComponent().Init(omino); GameObject scorePopup = Instantiate(prefabScorePopup); diff --git a/Assets/Scripts/GameHelper.cs b/Assets/Scripts/GameHelper.cs index da0354d..96e34ad 100644 --- a/Assets/Scripts/GameHelper.cs +++ b/Assets/Scripts/GameHelper.cs @@ -7,7 +7,7 @@ public class GameHelper : MonoBehaviour public static GameHelper instance; static float RADIUS_INITIAL = 100; - static float RADIUS_GROWTH_RATE = 4; + static float RADIUS_GROWTH_RATE = 3; public bool paused; public float timePassed; @@ -41,11 +41,12 @@ public void Deliver(OminoScript omino) { paused = false; int size = omino.Size(); float seconds = size * 5; - float timeMultiplier = 66 / (66 + timePassed * .1f); + float timeMultiplier = 30 / (30 + timePassed * .1f); float missingTime = 1 - timer.x / timer.y; timeMultiplier = Mathf.Lerp(timeMultiplier, 1, missingTime); seconds *= timeMultiplier; timer.x = Mathf.Min(timer.y, timer.x + seconds); score += size * 100 * omino.GetMultiplier(); + PlayerScript.instance.boostSeconds += 3 + omino.Size() / 4f * 5; } } diff --git a/Assets/Scripts/GameOverScript.cs b/Assets/Scripts/GameOverScript.cs index 4bb1d14..b01d632 100644 --- a/Assets/Scripts/GameOverScript.cs +++ b/Assets/Scripts/GameOverScript.cs @@ -16,7 +16,7 @@ void Start() { } void Update() { - if (GameHelper.instance.gameOver && Input.GetKeyDown(KeyCode.R)) { + if (GameHelper.instance.gameOver && (Input.GetKeyDown(KeyCode.R) || Input.GetButtonDown("Start"))) { Instantiate(prefabFadeOutScript, transform.parent); Destroy(this); } diff --git a/Assets/Scripts/GrabberScript.cs b/Assets/Scripts/GrabberScript.cs index 4a5f2b3..16fe01c 100644 --- a/Assets/Scripts/GrabberScript.cs +++ b/Assets/Scripts/GrabberScript.cs @@ -9,7 +9,7 @@ public class GrabberScript : MonoBehaviour public static GrabberScript instance; static float DISTANCE = 10; - static float STRENGTH = 1333; + static float STRENGTH = 1500; static Vector3 SCALE_INNER = new Vector3(.85f, .85f, 1); static Vector3 SCALE_OUTER = new Vector3(1.2f, 1.2f, 1); diff --git a/Assets/Scripts/OminoExampleScript.cs b/Assets/Scripts/OminoExampleScript.cs index e00cf69..8301f57 100644 --- a/Assets/Scripts/OminoExampleScript.cs +++ b/Assets/Scripts/OminoExampleScript.cs @@ -34,7 +34,7 @@ public void Init(IEnumerable coorsAndColors, bool canvas = false) { if (canvas) { Vector2Int dimensions = Util.GetCoorsDimensions(coors); float hypot = Mathf.Sqrt(dimensions.x * dimensions.x + dimensions.y * dimensions.y); - float scale = 10 / hypot; + float scale = 15 / hypot; transform.localScale = new Vector3(scale, scale, 1); } } diff --git a/Assets/Scripts/PlayerScript.cs b/Assets/Scripts/PlayerScript.cs index b016725..65eae4e 100644 --- a/Assets/Scripts/PlayerScript.cs +++ b/Assets/Scripts/PlayerScript.cs @@ -5,7 +5,8 @@ public class PlayerScript : MonoBehaviour { public static PlayerScript instance; - static float SPEED = 20; + static float SPEED = 30; + static float BOOST_MULT = 1.33f; public Rigidbody2D rb2d; public GrabberScript grabberScript; @@ -27,7 +28,7 @@ void FixedUpdate() { } void UpdateInput() { float speed = SPEED; - float boostMultiplier = Mathf.Lerp(1, 1.5f, Mathf.Clamp01(Mathf.InverseLerp(0, 2, boostSeconds))); + float boostMultiplier = Mathf.Lerp(1, BOOST_MULT, Mathf.Clamp01(Mathf.InverseLerp(0, 2, boostSeconds))); speed *= boostMultiplier; if (grabberScript.grabbedOmino != null) { float size = grabberScript.grabbedOmino.Size(); @@ -35,6 +36,9 @@ void UpdateInput() { speed *= Mathf.Lerp(multiplier, 1, .75f); } Vector3 desiredVelocity = GetMovementVector() * speed; + if (GrabberScript.instance.grabbedOmino?.combineEnabled == true) { + desiredVelocity *= .66f; + } rb2d.velocity = Vector3.Lerp(rb2d.velocity, desiredVelocity, .25f); } Vector2 GetMovementVector() { diff --git a/Assets/Scripts/ScorePopupScript.cs b/Assets/Scripts/ScorePopupScript.cs index 7c32ee4..6b86dd4 100644 --- a/Assets/Scripts/ScorePopupScript.cs +++ b/Assets/Scripts/ScorePopupScript.cs @@ -15,10 +15,13 @@ public class ScorePopupScript : MonoBehaviour Vector3 velocity; public void Init(OminoScript omino) { + Vector3 localPosition = transform.localPosition; + localPosition.z = -5; + transform.localPosition = localPosition; string text = "+" + (omino.Size() * 100).ToString("N0"); int multiplier = omino.GetMultiplier(); if (multiplier > 1) { - text += " x " + multiplier; + text += " x " + multiplier; } tmp.text = text; Color c = tmp.color; diff --git a/Assets/Scripts/SpawnerScript.cs b/Assets/Scripts/SpawnerScript.cs index 6dd1bce..e9fd39f 100644 --- a/Assets/Scripts/SpawnerScript.cs +++ b/Assets/Scripts/SpawnerScript.cs @@ -81,7 +81,7 @@ void TrySpawnZone() { if ((position - playerPosition).magnitude < GameHelper.instance.arenaRadius * .33f) { return; } - float maxSize = 4.5f + Mathf.Pow(GameHelper.instance.timePassed / 40, .6f); + float maxSize = 4.25f + Mathf.Pow(GameHelper.instance.timePassed / 40, .55f); int size = Mathf.RoundToInt(Random.Range(4, maxSize)); List coors = GetRandomOmino(size); Vector2Int dimensions = Util.GetCoorsDimensions(coors); @@ -104,11 +104,14 @@ void TrySpawnOmino() { return; } Vector2 position = Util.GetRandomPointWithinRadius(GameHelper.instance.arenaRadius); + int maxSize = Mathf.RoundToInt(3 + GameHelper.instance.timePassed * .01f); + /* int size = -1; - float max = 9; while (size <= 0) { - size = Mathf.RoundToInt(Random.Range(-max, max) + Random.Range(-max, max)); + size = Mathf.RoundToInt(Random.Range(-maxSize, maxSize) + Random.Range(-maxSize, maxSize)); } + */ + int size = Random.Range(1, maxSize + 1); List coors = GetRandomOmino(size); Vector2Int dimensions = Util.GetCoorsDimensions(coors); float hypot = Mathf.Sqrt(dimensions.x * dimensions.x + dimensions.y * dimensions.y); @@ -129,7 +132,7 @@ bool ZoneCanSpawnHere(Vector2 position, float checkRadius) { return c2d == null; } bool PieceCanSpawnHere(Vector2 position, float hypot) { - float checkRadius = hypot * OminoScript.INTERBLOCK_DISTANCE; + float checkRadius = hypot * OminoScript.INTERBLOCK_DISTANCE * .5f + 4; if (Util.IsPointOnCamera(position, checkRadius)) { return false; } @@ -164,7 +167,7 @@ static List GetRandomOmino(int n) { return omino.ToList(); } List AddOminoColors(IEnumerable coors) { - float goldChance = Mathf.Pow(Mathf.Max(0, GameHelper.instance.timePassed - 120) / 250, .5f) * .2f; + float goldChance = Mathf.Pow(Mathf.Max(0, GameHelper.instance.timePassed - 120) / 500, .4f) * .2f; int numGolds = 0; foreach (var c in coors) { numGolds += Random.value < goldChance ? 1 : 0; diff --git a/Assets/Scripts/ZoneIndicatorScript.cs b/Assets/Scripts/ZoneIndicatorScript.cs index b12e67c..7338ebc 100644 --- a/Assets/Scripts/ZoneIndicatorScript.cs +++ b/Assets/Scripts/ZoneIndicatorScript.cs @@ -38,15 +38,16 @@ void Update() { } Vector2 zonePos = deliveryZone.transform.position; Vector2 camPos = cam.transform.position; - bool show = !GameHelper.instance.paused && !Util.IsPointOnCamera(zonePos, radius); + float scale = 1 / Mathf.Max(1, (zonePos - camPos).magnitude / 100 + .01f); + bool show = !GameHelper.instance.paused && !Util.IsPointOnCamera(zonePos, radius) && scale > .4f; canvasGroup.alpha = Mathf.SmoothDamp(canvasGroup.alpha, show ? 1 : 0, ref vAlpha, .1f); - Vector2 normalizedDelta = (zonePos - camPos).normalized; Vector2 cornerVector = (rtCanvas.sizeDelta / 2) - MARGIN; float xScale = Mathf.Abs(cornerVector.x / normalizedDelta.x); float yScale = Mathf.Abs(cornerVector.y / normalizedDelta.y); - float scaleFactor = Mathf.Min(xScale, yScale); - rt.anchoredPosition = normalizedDelta * scaleFactor; + float canvasScaleFactor = Mathf.Min(xScale, yScale); + rt.anchoredPosition = normalizedDelta * canvasScaleFactor; rt.localRotation = Quaternion.Euler(0, 0, Mathf.Atan2(normalizedDelta.y, normalizedDelta.x) * Mathf.Rad2Deg); + rt.localScale = new Vector3(scale, scale, 1); } } diff --git a/Assets/Sprites/box_outline.png b/Assets/Sprites/box_outline.png index 5abac71..0887cec 100644 Binary files a/Assets/Sprites/box_outline.png and b/Assets/Sprites/box_outline.png differ diff --git a/Assets/WebGLTemplates.meta b/Assets/WebGLTemplates.meta new file mode 100644 index 0000000..66f19a5 --- /dev/null +++ b/Assets/WebGLTemplates.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6332c4cf2a4b537429c7c71d0098d8d1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/BetterMinimal.meta b/Assets/WebGLTemplates/BetterMinimal.meta new file mode 100644 index 0000000..02996b1 --- /dev/null +++ b/Assets/WebGLTemplates/BetterMinimal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0f68e9a5d9214264aaf097024f3c0f36 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/BetterMinimal/index.html b/Assets/WebGLTemplates/BetterMinimal/index.html new file mode 100644 index 0000000..3250942 --- /dev/null +++ b/Assets/WebGLTemplates/BetterMinimal/index.html @@ -0,0 +1,110 @@ + + + + + + + {{{ PRODUCT_NAME }}} + + + + +
+ + + +
+ + + diff --git a/Assets/WebGLTemplates/BetterMinimal/index.html.meta b/Assets/WebGLTemplates/BetterMinimal/index.html.meta new file mode 100644 index 0000000..8dc2e0d --- /dev/null +++ b/Assets/WebGLTemplates/BetterMinimal/index.html.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2c53c6ff964555e4499f703a13b14ffc +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/BetterMinimal/thumbnail.png b/Assets/WebGLTemplates/BetterMinimal/thumbnail.png new file mode 100644 index 0000000..7dfdad9 Binary files /dev/null and b/Assets/WebGLTemplates/BetterMinimal/thumbnail.png differ diff --git a/Assets/WebGLTemplates/BetterMinimal/thumbnail.png.meta b/Assets/WebGLTemplates/BetterMinimal/thumbnail.png.meta new file mode 100644 index 0000000..e5f1ec0 --- /dev/null +++ b/Assets/WebGLTemplates/BetterMinimal/thumbnail.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0be0e293804986d43a2be6252dff2783 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 27f794f..fab9483 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,6 +5,7 @@ "com.unity.ide.rider": "3.0.16", "com.unity.ide.visualstudio": "2.0.16", "com.unity.ide.vscode": "1.2.5", + "com.unity.inputsystem": "1.4.4", "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.4", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 3fcacac..deeae11 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -149,6 +149,15 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.inputsystem": { + "version": "1.4.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.mathematics": { "version": "1.2.6", "depth": 2, diff --git a/ProjectSettings/BurstAotSettings_StandaloneOSX.json b/ProjectSettings/BurstAotSettings_StandaloneOSX.json new file mode 100644 index 0000000..56f4abe --- /dev/null +++ b/ProjectSettings/BurstAotSettings_StandaloneOSX.json @@ -0,0 +1,16 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "UsePlatformSDKLinker": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsX64": 72, + "OptimizeFor": 0 + } +} diff --git a/ProjectSettings/BurstAotSettings_WebGL.json b/ProjectSettings/BurstAotSettings_WebGL.json new file mode 100644 index 0000000..771d37b --- /dev/null +++ b/ProjectSettings/BurstAotSettings_WebGL.json @@ -0,0 +1,14 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "OptimizeFor": 0 + } +} diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 383349d..f3707a4 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -149,4 +149,20 @@ InputManager: type: 0 axis: 0 joyNum: 0 + - serializedVersion: 3 + m_Name: Start + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: joystick button 7 + gravity: 10000 + dead: 0 + sensitivity: 1 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 m_UsePhysicalKeys: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 5343e0a..6dee27f 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -46,8 +46,8 @@ PlayerSettings: m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1920 defaultScreenHeight: 1080 - defaultScreenWidthWeb: 960 - defaultScreenHeightWeb: 600 + defaultScreenWidthWeb: 1280 + defaultScreenHeightWeb: 720 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 m_MTRendering: 1 @@ -323,7 +323,10 @@ PlayerSettings: openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 - m_TemplateCustomTags: {} + m_TemplateCustomTags: + BACKGROUND: + OPTIMIZE_FOR_PIXEL_ART: + SCALE_TO_FIT: mobileMTRendering: Android: 1 iPhone: 1 @@ -574,10 +577,10 @@ PlayerSettings: webGLDebugSymbols: 0 webGLEmscriptenArgs: webGLModulesDirectory: - webGLTemplate: APPLICATION:Default + webGLTemplate: PROJECT:BetterMinimal webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 - webGLCompressionFormat: 0 + webGLCompressionFormat: 2 webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 @@ -671,7 +674,7 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 - activeInputHandler: 0 + activeInputHandler: 2 windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0