diff --git a/GoingHyper2021/Assets/Japanese Coin/Materials/DefaultMat.mat b/GoingHyper2021/Assets/Japanese Coin/Materials/DefaultMat.mat new file mode 100644 index 0000000..391ab20 --- /dev/null +++ b/GoingHyper2021/Assets/Japanese Coin/Materials/DefaultMat.mat @@ -0,0 +1,80 @@ +%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: DefaultMat + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + 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} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/GoingHyper2021/Assets/Japanese Coin/Materials/DefaultMat.mat.meta b/GoingHyper2021/Assets/Japanese Coin/Materials/DefaultMat.mat.meta new file mode 100644 index 0000000..0bfeded --- /dev/null +++ b/GoingHyper2021/Assets/Japanese Coin/Materials/DefaultMat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 29e1b7e595cdc184c9fbfda6d260f1ff +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/GoingHyper2021/Assets/Plugins/GameTemplate/Scripts/Input/PlayerInputActions.cs b/GoingHyper2021/Assets/Plugins/GameTemplate/Scripts/Input/PlayerInputActions.cs index 4bd6fd4..3a8fcde 100644 --- a/GoingHyper2021/Assets/Plugins/GameTemplate/Scripts/Input/PlayerInputActions.cs +++ b/GoingHyper2021/Assets/Plugins/GameTemplate/Scripts/Input/PlayerInputActions.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator -// version 1.1.0 +// version 1.3.0 // from Assets/ScriptableObjects/Input/PlayerInputActions.inputactions // // Changes to this file may cause incorrect behavior and will be lost if @@ -33,7 +33,8 @@ public @PlayerInputActions() ""id"": ""fee53e44-66a7-49c0-8d3a-53a5a20a4e2a"", ""expectedControlType"": ""Vector2"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": true }, { ""name"": ""Look"", @@ -41,7 +42,8 @@ public @PlayerInputActions() ""id"": ""15fcc27f-7476-491b-bf84-3fbc33a9605b"", ""expectedControlType"": ""Vector2"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": true }, { ""name"": ""Fire"", @@ -49,7 +51,8 @@ public @PlayerInputActions() ""id"": ""0e8bb055-53f6-44d8-a791-990bff3c66ec"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false } ], ""bindings"": [ @@ -219,7 +222,8 @@ public @PlayerInputActions() ""id"": ""c2506aac-a568-4497-b1b6-4497f4101498"", ""expectedControlType"": ""Vector2"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": true }, { ""name"": ""Submit"", @@ -227,7 +231,8 @@ public @PlayerInputActions() ""id"": ""059443ff-1df5-4ba4-8719-003e5e38da55"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Cancel"", @@ -235,7 +240,8 @@ public @PlayerInputActions() ""id"": ""5bc87ef4-04c2-4c6d-821e-9d826e3373c4"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Point"", @@ -243,7 +249,8 @@ public @PlayerInputActions() ""id"": ""53a7ff18-cdd6-4e66-a5ea-b61aa26d1da0"", ""expectedControlType"": ""Vector2"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""Click"", @@ -251,7 +258,8 @@ public @PlayerInputActions() ""id"": ""e177429c-a8b1-42cb-bec0-86ebf5030d80"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""ScrollWheel"", @@ -259,7 +267,8 @@ public @PlayerInputActions() ""id"": ""c1e2ef2f-91d7-49a4-818f-1ef4eccc4eab"", ""expectedControlType"": ""Vector2"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""MiddleClick"", @@ -267,7 +276,8 @@ public @PlayerInputActions() ""id"": ""e9c820f8-b26d-4f65-bd0c-a5624da3ba57"", ""expectedControlType"": """", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""RightClick"", @@ -275,7 +285,8 @@ public @PlayerInputActions() ""id"": ""d2e2e7d0-a415-4b8a-b354-0f3beb687bdd"", ""expectedControlType"": """", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""TabLeft"", @@ -283,7 +294,8 @@ public @PlayerInputActions() ""id"": ""127be72d-ac7a-4f75-a5fe-ce64595c55b1"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false }, { ""name"": ""TabRight"", @@ -291,7 +303,8 @@ public @PlayerInputActions() ""id"": ""97db5b17-6929-45a1-bd2f-53044ccfe227"", ""expectedControlType"": ""Button"", ""processors"": """", - ""interactions"": """" + ""interactions"": """", + ""initialStateCheck"": false } ], ""bindings"": [ diff --git a/GoingHyper2021/Assets/Plugins/GameTemplate/Sprites/Placeholders_UI/Shapes/Capsule.png.meta b/GoingHyper2021/Assets/Plugins/GameTemplate/Sprites/Placeholders_UI/Shapes/Capsule.png.meta index 280f33d..31aaa37 100644 --- a/GoingHyper2021/Assets/Plugins/GameTemplate/Sprites/Placeholders_UI/Shapes/Capsule.png.meta +++ b/GoingHyper2021/Assets/Plugins/GameTemplate/Sprites/Placeholders_UI/Shapes/Capsule.png.meta @@ -27,6 +27,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -36,8 +37,8 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -172,6 +173,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + Capsule: -9095717837082945937 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/GoingHyper2021/Assets/Plugins/GameTemplate/Sprites/Placeholders_UI/Shapes/HexagonFlat-Top.png.meta b/GoingHyper2021/Assets/Plugins/GameTemplate/Sprites/Placeholders_UI/Shapes/HexagonFlat-Top.png.meta index 5b20280..b0063f5 100644 --- a/GoingHyper2021/Assets/Plugins/GameTemplate/Sprites/Placeholders_UI/Shapes/HexagonFlat-Top.png.meta +++ b/GoingHyper2021/Assets/Plugins/GameTemplate/Sprites/Placeholders_UI/Shapes/HexagonFlat-Top.png.meta @@ -27,6 +27,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -36,8 +37,8 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -164,6 +165,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + Hexagon Flat-Top: 2747690628134850419 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/GoingHyper2021/Assets/Plugins/GameTemplate/Sprites/Placeholders_UI/Shapes/HexagonPointed-Top.png.meta b/GoingHyper2021/Assets/Plugins/GameTemplate/Sprites/Placeholders_UI/Shapes/HexagonPointed-Top.png.meta index b1d0472..ea60daa 100644 --- a/GoingHyper2021/Assets/Plugins/GameTemplate/Sprites/Placeholders_UI/Shapes/HexagonPointed-Top.png.meta +++ b/GoingHyper2021/Assets/Plugins/GameTemplate/Sprites/Placeholders_UI/Shapes/HexagonPointed-Top.png.meta @@ -27,6 +27,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -36,8 +37,8 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -164,6 +165,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + Hexagon Pointed-Top: -2135585597343286014 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/GoingHyper2021/Assets/Plugins/GameTemplate/Sprites/Placeholders_UI/Shapes/IsometricDiamond.png.meta b/GoingHyper2021/Assets/Plugins/GameTemplate/Sprites/Placeholders_UI/Shapes/IsometricDiamond.png.meta index 19c845f..cdb4c7e 100644 --- a/GoingHyper2021/Assets/Plugins/GameTemplate/Sprites/Placeholders_UI/Shapes/IsometricDiamond.png.meta +++ b/GoingHyper2021/Assets/Plugins/GameTemplate/Sprites/Placeholders_UI/Shapes/IsometricDiamond.png.meta @@ -27,6 +27,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -35,9 +36,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -164,6 +165,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + Isometric Diamond: 3625043607559282579 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/GoingHyper2021/Assets/Sprites/Barbarian_ArkRighy.png.meta b/GoingHyper2021/Assets/Sprites/Barbarian_ArkRighy.png.meta index d251375..11d2972 100644 --- a/GoingHyper2021/Assets/Sprites/Barbarian_ArkRighy.png.meta +++ b/GoingHyper2021/Assets/Sprites/Barbarian_ArkRighy.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,8 +34,8 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 0 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -142,7 +143,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 2d009a6b596c7d760800000000000000 - internalID: 7482667652216324306 + internalID: 2838681010091129302 vertices: [] indices: edges: [] @@ -161,6 +162,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + Square: 2838681010091129302 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/GoingHyper2021/Assets/Sprites/Barbarian_ArmLeft.png.meta b/GoingHyper2021/Assets/Sprites/Barbarian_ArmLeft.png.meta index b7bee7e..3230b37 100644 --- a/GoingHyper2021/Assets/Sprites/Barbarian_ArmLeft.png.meta +++ b/GoingHyper2021/Assets/Sprites/Barbarian_ArmLeft.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,8 +34,8 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 0 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -142,7 +143,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 2d009a6b596c7d760800000000000000 - internalID: 7482667652216324306 + internalID: 2838681010091129302 vertices: [] indices: edges: [] @@ -161,6 +162,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + Square: 2838681010091129302 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/GoingHyper2021/Assets/Sprites/Barbarian_Body.png.meta b/GoingHyper2021/Assets/Sprites/Barbarian_Body.png.meta index aff6094..efa8217 100644 --- a/GoingHyper2021/Assets/Sprites/Barbarian_Body.png.meta +++ b/GoingHyper2021/Assets/Sprites/Barbarian_Body.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,8 +34,8 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 0 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -142,7 +143,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 2d009a6b596c7d760800000000000000 - internalID: 7482667652216324306 + internalID: 2838681010091129302 vertices: [] indices: edges: [] @@ -161,6 +162,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + Square: 2838681010091129302 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/GoingHyper2021/Assets/Sprites/Barbarian_Fist.png.meta b/GoingHyper2021/Assets/Sprites/Barbarian_Fist.png.meta index a60b2fa..564dc4e 100644 --- a/GoingHyper2021/Assets/Sprites/Barbarian_Fist.png.meta +++ b/GoingHyper2021/Assets/Sprites/Barbarian_Fist.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,8 +34,8 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 0 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -142,7 +143,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 2d009a6b596c7d760800000000000000 - internalID: 7482667652216324306 + internalID: 2838681010091129302 vertices: [] indices: edges: [] @@ -161,6 +162,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + Square: 2838681010091129302 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/GoingHyper2021/Assets/Sprites/Barbarian_Head.png.meta b/GoingHyper2021/Assets/Sprites/Barbarian_Head.png.meta index 7893199..63cba54 100644 --- a/GoingHyper2021/Assets/Sprites/Barbarian_Head.png.meta +++ b/GoingHyper2021/Assets/Sprites/Barbarian_Head.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,8 +34,8 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 0 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -142,7 +143,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 2d009a6b596c7d760800000000000000 - internalID: 7482667652216324306 + internalID: 2838681010091129302 vertices: [] indices: edges: [] @@ -161,6 +162,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + Square: 2838681010091129302 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/GoingHyper2021/Assets/Sprites/idle 11.png.meta b/GoingHyper2021/Assets/Sprites/idle 11.png.meta index 5faea0a..f83b942 100644 --- a/GoingHyper2021/Assets/Sprites/idle 11.png.meta +++ b/GoingHyper2021/Assets/Sprites/idle 11.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,8 +34,8 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 0 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -142,7 +143,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 2d009a6b596c7d760800000000000000 - internalID: 7482667652216324306 + internalID: 2838681010091129302 vertices: [] indices: edges: [] @@ -161,6 +162,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + Square: 2838681010091129302 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/GoingHyper2021/Packages/manifest.json b/GoingHyper2021/Packages/manifest.json index 4ccfd87..7d95a62 100644 --- a/GoingHyper2021/Packages/manifest.json +++ b/GoingHyper2021/Packages/manifest.json @@ -26,17 +26,16 @@ "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", "com.unity.build-report-inspector": "0.2.2-preview", - "com.unity.cinemachine": "2.8.2", - "com.unity.connect.share": "4.2.2", - "com.unity.ide.rider": "3.0.7", - "com.unity.ide.visualstudio": "2.0.12", - "com.unity.inputsystem": "1.2.0", - "com.unity.memoryprofiler": "0.2.6-preview.1", + "com.unity.cinemachine": "2.8.4", + "com.unity.connect.share": "4.2.3", + "com.unity.ide.rider": "3.0.14", + "com.unity.ide.visualstudio": "2.0.15", + "com.unity.inputsystem": "1.3.0", "com.unity.performance.profile-analyzer": "1.1.1", - "com.unity.postprocessing": "3.2.0", + "com.unity.postprocessing": "3.2.2", "com.unity.recorder": "3.0.3", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.3", + "com.unity.timeline": "1.6.4", "com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.17-preview", "com.unity.ugui": "1.0.0", "com.unity.uiextensions": "https://github.com/JohannesDeml/unity-ui-extensions.git", diff --git a/GoingHyper2021/Packages/packages-lock.json b/GoingHyper2021/Packages/packages-lock.json index e1a1f79..dd3d601 100644 --- a/GoingHyper2021/Packages/packages-lock.json +++ b/GoingHyper2021/Packages/packages-lock.json @@ -185,14 +185,14 @@ "url": "https://packages.unity.com" }, "com.unity.cinemachine": { - "version": "2.8.2", + "version": "2.8.4", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.connect.share": { - "version": "4.2.2", + "version": "4.2.3", "depth": 0, "source": "registry", "dependencies": { @@ -216,7 +216,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.7", + "version": "3.0.14", "depth": 0, "source": "registry", "dependencies": { @@ -225,7 +225,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.12", + "version": "2.0.15", "depth": 0, "source": "registry", "dependencies": { @@ -234,7 +234,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.2.0", + "version": "1.3.0", "depth": 0, "source": "registry", "dependencies": { @@ -242,17 +242,8 @@ }, "url": "https://packages.unity.com" }, - "com.unity.memoryprofiler": { - "version": "0.2.6-preview.1", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.editorcoroutines": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.nuget.newtonsoft-json": { - "version": "2.0.0", + "version": "3.0.2", "depth": 1, "source": "registry", "dependencies": {}, @@ -266,7 +257,7 @@ "url": "https://packages.unity.com" }, "com.unity.postprocessing": { - "version": "3.2.0", + "version": "3.2.2", "depth": 0, "source": "registry", "dependencies": { @@ -307,7 +298,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.29", + "version": "1.1.31", "depth": 1, "source": "registry", "dependencies": { @@ -327,7 +318,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.3", + "version": "1.6.4", "depth": 0, "source": "registry", "dependencies": { diff --git a/GoingHyper2021/ProjectSettings/ProjectSettings.asset b/GoingHyper2021/ProjectSettings/ProjectSettings.asset index e679044..d97b9eb 100644 --- a/GoingHyper2021/ProjectSettings/ProjectSettings.asset +++ b/GoingHyper2021/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 22 + serializedVersion: 23 productGUID: ed8e90f108d8c8f48b8bee84bba66610 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -70,6 +70,12 @@ PlayerSettings: androidRenderOutsideSafeArea: 1 androidUseSwappy: 0 androidBlitType: 0 + androidResizableWindow: 0 + androidDefaultWindowWidth: 1920 + androidDefaultWindowHeight: 1080 + androidMinimumWindowWidth: 400 + androidMinimumWindowHeight: 300 + androidFullscreenMode: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -123,6 +129,7 @@ PlayerSettings: vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 + vulkanEnableCommandBufferRecycling: 1 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -146,11 +153,13 @@ PlayerSettings: enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 + enableOpenGLProfilerGPURecorders: 1 useHDRDisplay: 0 D3DHDRBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: @@ -161,7 +170,7 @@ PlayerSettings: tvOS: 0 overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 19 + AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 0 aotOptions: @@ -217,6 +226,7 @@ PlayerSettings: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + macOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 metalEditorSupport: 1 @@ -244,6 +254,7 @@ PlayerSettings: useCustomGradlePropertiesTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 + AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: Keystore/Template.keystore' @@ -260,6 +271,7 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + chromeosInputEmulation: 1 AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 @@ -417,7 +429,7 @@ PlayerSettings: m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 - m_Automatic: 0 + m_Automatic: 1 - m_BuildTarget: iOSSupport m_APIs: 10000000 m_Automatic: 1 @@ -447,6 +459,7 @@ PlayerSettings: m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] m_BuildTargetNormalMapEncoding: [] + m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -456,6 +469,7 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + bluetoothUsageDescription: switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -464,6 +478,7 @@ PlayerSettings: switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 switchUseGOLDLinker: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -594,7 +609,9 @@ PlayerSettings: switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -690,20 +707,21 @@ PlayerSettings: webGLThreadsSupport: 0 webGLDecompressionFallback: 0 scriptingDefineSymbols: - 1: UNITY_POST_PROCESSING_STACK_V2;TMP_PRESENT;ARABSUPPORT_ENABLED;POLYGLOT;GAME_TEMPLATE - 4: UNITY_POST_PROCESSING_STACK_V2;TMP_PRESENT;ARABSUPPORT_ENABLED - 7: UNITY_POST_PROCESSING_STACK_V2;TMP_PRESENT;ARABSUPPORT_ENABLED;POLYGLOT;GAME_TEMPLATE - 13: UNITY_POST_PROCESSING_STACK_V2;TMP_PRESENT;ARABSUPPORT_ENABLED;POLYGLOT;GAME_TEMPLATE - 14: UNITY_POST_PROCESSING_STACK_V2 - 19: UNITY_POST_PROCESSING_STACK_V2 - 21: UNITY_POST_PROCESSING_STACK_V2 - 25: UNITY_POST_PROCESSING_STACK_V2 - 27: UNITY_POST_PROCESSING_STACK_V2 - 28: UNITY_POST_PROCESSING_STACK_V2 - 29: UNITY_POST_PROCESSING_STACK_V2 - 30: UNITY_POST_PROCESSING_STACK_V2 - 32: UNITY_POST_PROCESSING_STACK_V2 - 33: UNITY_POST_PROCESSING_STACK_V2 + Android: UNITY_POST_PROCESSING_STACK_V2;TMP_PRESENT;ARABSUPPORT_ENABLED;POLYGLOT;GAME_TEMPLATE + CloudRendering: UNITY_POST_PROCESSING_STACK_V2 + EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2 + GameCoreXboxOne: UNITY_POST_PROCESSING_STACK_V2 + Lumin: UNITY_POST_PROCESSING_STACK_V2 + Nintendo Switch: UNITY_POST_PROCESSING_STACK_V2 + PS4: UNITY_POST_PROCESSING_STACK_V2 + PS5: UNITY_POST_PROCESSING_STACK_V2 + Stadia: UNITY_POST_PROCESSING_STACK_V2 + Standalone: UNITY_POST_PROCESSING_STACK_V2;TMP_PRESENT;ARABSUPPORT_ENABLED;POLYGLOT;GAME_TEMPLATE + WebGL: UNITY_POST_PROCESSING_STACK_V2;TMP_PRESENT;ARABSUPPORT_ENABLED;POLYGLOT;GAME_TEMPLATE + Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2 + XboxOne: UNITY_POST_PROCESSING_STACK_V2 + iPhone: UNITY_POST_PROCESSING_STACK_V2;TMP_PRESENT;ARABSUPPORT_ENABLED + tvOS: UNITY_POST_PROCESSING_STACK_V2 additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: @@ -721,7 +739,6 @@ PlayerSettings: suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - useReferenceAssemblies: 1 enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 @@ -761,6 +778,7 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: + vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -812,4 +830,6 @@ PlayerSettings: organizationId: team-on cloudEnabled: 0 legacyClampBlendShapeWeights: 0 + playerDataPath: + forceSRGBBlit: 1 virtualTexturingSupportEnabled: 0 diff --git a/GoingHyper2021/ProjectSettings/ProjectVersion.txt b/GoingHyper2021/ProjectSettings/ProjectVersion.txt index bbae793..501a25e 100644 --- a/GoingHyper2021/ProjectSettings/ProjectVersion.txt +++ b/GoingHyper2021/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.2.7f1 -m_EditorVersionWithRevision: 2021.2.7f1 (6bd9e232123f) +m_EditorVersion: 2021.3.4f1 +m_EditorVersionWithRevision: 2021.3.4f1 (cb45f9cae8b7)