From 87c415e13127a7a714ed2809fd2ea60c7fb783e1 Mon Sep 17 00:00:00 2001 From: Joshua Date: Sun, 5 Feb 2023 21:55:18 +1100 Subject: [PATCH] FINAL PUSH --- Assets/Data/Tiles/Bend_Right 1.asset | 3 +++ Assets/Data/Tiles/Bend_Right 1.asset.meta | 8 ++++++ Assets/Data/Tiles/Bend_Right.asset | 2 +- .../Textures/Sky_LowPoly_02_Night_a.png.meta | 25 ++++++++++++++++--- Assets/Materials/New Material.mat | 4 +-- Assets/Prefab/PlayerController.prefab | 4 +-- Assets/Prefab/Tile_01_env.prefab | 4 +-- Assets/Prefab/Tile_02 1.prefab | 4 +-- Assets/Prefab/Tile_03_env.prefab | 4 +-- Assets/Scenes/Main.unity | 4 +-- Assets/Scripts/BoatController.cs | 8 +++--- .../LiberationSans SDF - Fallback.asset | 4 +-- .../BurstAotSettings_StandaloneWindows.json | 7 +++--- ProjectSettings/CommonBurstAotSettings.json | 2 +- 14 files changed, 57 insertions(+), 26 deletions(-) create mode 100644 Assets/Data/Tiles/Bend_Right 1.asset create mode 100644 Assets/Data/Tiles/Bend_Right 1.asset.meta diff --git a/Assets/Data/Tiles/Bend_Right 1.asset b/Assets/Data/Tiles/Bend_Right 1.asset new file mode 100644 index 0000000..fd6a30f --- /dev/null +++ b/Assets/Data/Tiles/Bend_Right 1.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d49dd4604f707fe32928400635040462a332790a137d2a46dd0ac684569e4971 +size 504 diff --git a/Assets/Data/Tiles/Bend_Right 1.asset.meta b/Assets/Data/Tiles/Bend_Right 1.asset.meta new file mode 100644 index 0000000..0da3a25 --- /dev/null +++ b/Assets/Data/Tiles/Bend_Right 1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e0837635cf06a7a459501c8171f34e96 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Tiles/Bend_Right.asset b/Assets/Data/Tiles/Bend_Right.asset index 1f2878d..0b6f217 100644 --- a/Assets/Data/Tiles/Bend_Right.asset +++ b/Assets/Data/Tiles/Bend_Right.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddacc12ccd68acdd806c5170abbe70beb9df51cc458aeff966044fd09d0dcb82 +oid sha256:41992f50731374e1782679b74ca553a9a6ead8aefa0de026ad54efa15abd08e8 size 502 diff --git a/Assets/Free Stylized Skybox/CubeMap/Textures/Sky_LowPoly_02_Night_a.png.meta b/Assets/Free Stylized Skybox/CubeMap/Textures/Sky_LowPoly_02_Night_a.png.meta index 3b69033..6a87721 100644 --- a/Assets/Free Stylized Skybox/CubeMap/Textures/Sky_LowPoly_02_Night_a.png.meta +++ b/Assets/Free Stylized Skybox/CubeMap/Textures/Sky_LowPoly_02_Night_a.png.meta @@ -3,7 +3,7 @@ guid: b4503954fd147c94180872808dde9eb3 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,6 +23,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,9 +33,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 2 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -54,10 +56,14 @@ TextureImporter: textureType: 0 textureShape: 2 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 2 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -119,6 +125,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -132,6 +150,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Materials/New Material.mat b/Assets/Materials/New Material.mat index 0bdf1b4..f264e29 100644 --- a/Assets/Materials/New Material.mat +++ b/Assets/Materials/New Material.mat @@ -119,8 +119,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.041586675, g: 0.7264151, b: 0, a: 1} - - _Color: {r: 0.041586652, g: 0.7264151, b: 0, a: 1} + - _BaseColor: {r: 0.5239635, g: 0.6415094, b: 0.25720897, a: 1} + - _Color: {r: 0.52396345, g: 0.6415094, b: 0.25720894, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Prefab/PlayerController.prefab b/Assets/Prefab/PlayerController.prefab index d41516d..fff5f80 100644 --- a/Assets/Prefab/PlayerController.prefab +++ b/Assets/Prefab/PlayerController.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:085084d72bb04099824ed788d05e72e012248b66dec77318c22644255679b5ac -size 46689 +oid sha256:7fdb7f174b2dd02bc4ef55b4b6fcb93bd29f9eb80ef7d865d089b746d293de38 +size 46690 diff --git a/Assets/Prefab/Tile_01_env.prefab b/Assets/Prefab/Tile_01_env.prefab index df3b8e4..b1c3703 100644 --- a/Assets/Prefab/Tile_01_env.prefab +++ b/Assets/Prefab/Tile_01_env.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1875d046f3c3876cab4eb2e4192b2109c5deefea8569c23d110489b4d42bd7ad -size 250009 +oid sha256:750f7e5eeea09babf81fa89e5cda0fca6d25fbf680622ef183760e45d0673f07 +size 252686 diff --git a/Assets/Prefab/Tile_02 1.prefab b/Assets/Prefab/Tile_02 1.prefab index 2a20b7b..eb29bab 100644 --- a/Assets/Prefab/Tile_02 1.prefab +++ b/Assets/Prefab/Tile_02 1.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07758c2e2ce4bd471af8f023d3d3d43a4692eadcb6b54b7de45ca02186efddfa -size 181601 +oid sha256:ffa73b555a15ff6f2f835a960c8ab3ae54244b3c226d66d7a2c9f3d004023e50 +size 184282 diff --git a/Assets/Prefab/Tile_03_env.prefab b/Assets/Prefab/Tile_03_env.prefab index a759d44..84d969e 100644 --- a/Assets/Prefab/Tile_03_env.prefab +++ b/Assets/Prefab/Tile_03_env.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f438075bc0266a9e6f0b5027e5fbc444cfdb431e3213ee06a28c4a7c696aa0e -size 282952 +oid sha256:1a68d9fa88ec437b410878c564553d742dad12b4d58644519658126c76e598b4 +size 282529 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 95d5365..1b49533 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27fddbc768764d975dcb43d7312cc59e195b549af74f247a739eeb2aa1714142 -size 84015 +oid sha256:4a05ec957d8b4fbb145f13aad8467c55b0481d9ac0153881dcecdc38ec9ded8d +size 84087 diff --git a/Assets/Scripts/BoatController.cs b/Assets/Scripts/BoatController.cs index e76683f..507ef70 100644 --- a/Assets/Scripts/BoatController.cs +++ b/Assets/Scripts/BoatController.cs @@ -53,20 +53,20 @@ public class BoatController : MonoBehaviour { //print(transform.rotation.eulerAngles.y); //constrain rotation - if (transform.rotation.eulerAngles.y > 180 && transform.rotation.eulerAngles.y < 270) + /*if (transform.rotation.eulerAngles.y > 180 && transform.rotation.eulerAngles.y < 270) { print("under"); transform.rotation = Quaternion.Euler(new Vector3(0f, 270f, 0f)); rigidBody.angularVelocity = Vector3.zero; - } + }*/ //constrain rotation - if (transform.rotation.eulerAngles.y < 180 && transform.rotation.eulerAngles.y > 90f) + /*if (transform.rotation.eulerAngles.y < 180 && transform.rotation.eulerAngles.y > 90f) { print("over"); transform.rotation = Quaternion.Euler(new Vector3(0f, 90f, 0f)); rigidBody.angularVelocity = Vector3.zero; - } + }*/ } public void RowLeft() diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset index 3308850..246ed23 100644 --- a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2757658bece040726962b569f64bbbc92960b45e9aea2faba23f440a6536b30 -size 537679 +oid sha256:7d04bdf4e43b9d681455e1241126fa5321ae08d7fcc097ad60095972a0f545d5 +size 9525 diff --git a/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/ProjectSettings/BurstAotSettings_StandaloneWindows.json index 2144f6d..8e6a74e 100644 --- a/ProjectSettings/BurstAotSettings_StandaloneWindows.json +++ b/ProjectSettings/BurstAotSettings_StandaloneWindows.json @@ -1,16 +1,17 @@ { "MonoBehaviour": { - "Version": 3, + "Version": 4, "EnableBurstCompilation": true, "EnableOptimisations": true, "EnableSafetyChecks": false, "EnableDebugInAllBuilds": false, - "UsePlatformSDKLinker": false, + "EnableArmv9SecurityFeatures": false, "CpuMinTargetX32": 0, "CpuMaxTargetX32": 0, "CpuMinTargetX64": 0, "CpuMaxTargetX64": 0, "CpuTargetsX32": 6, - "CpuTargetsX64": 72 + "CpuTargetsX64": 72, + "OptimizeFor": 0 } } diff --git a/ProjectSettings/CommonBurstAotSettings.json b/ProjectSettings/CommonBurstAotSettings.json index 3dffdba..0293daf 100644 --- a/ProjectSettings/CommonBurstAotSettings.json +++ b/ProjectSettings/CommonBurstAotSettings.json @@ -1,6 +1,6 @@ { "MonoBehaviour": { - "Version": 3, + "Version": 4, "DisabledWarnings": "" } }