diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index b2dadbd..1be1972 100644 --- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml +++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml @@ -136,6 +136,7 @@ + diff --git a/FlufflParty/Assets/Adaptive Performance/AdaptivePerformanceGeneralSettings.asset b/FlufflParty/Assets/Adaptive Performance/AdaptivePerformanceGeneralSettings.asset index ea99c3d..dfd7604 100644 --- a/FlufflParty/Assets/Adaptive Performance/AdaptivePerformanceGeneralSettings.asset +++ b/FlufflParty/Assets/Adaptive Performance/AdaptivePerformanceGeneralSettings.asset @@ -14,8 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_AutomaticLoading: 0 m_AutomaticRunning: 0 - m_Loaders: - - {fileID: 11400000, guid: ebbee8f4856e7594aa30a82de3fc1802, type: 2} + m_Loaders: [] --- !u!114 &-9122106138398806907 MonoBehaviour: m_ObjectHideFlags: 2 @@ -58,7 +57,7 @@ MonoBehaviour: m_Name: Standalone Settings m_EditorClassIdentifier: m_LoaderManagerInstance: {fileID: -1709759129339249241} - m_InitManagerOnStart: 1 + m_InitManagerOnStart: 0 --- !u!114 &-4057550686527060365 MonoBehaviour: m_ObjectHideFlags: 2 @@ -72,7 +71,7 @@ MonoBehaviour: m_Name: iPhone Settings m_EditorClassIdentifier: m_LoaderManagerInstance: {fileID: -9122106138398806907} - m_InitManagerOnStart: 1 + m_InitManagerOnStart: 0 --- !u!114 &-1709759129339249241 MonoBehaviour: m_ObjectHideFlags: 2 diff --git a/FlufflParty/Assets/BlenderFiles/Textures/CactusSpikes.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/CactusSpikes.png.meta index 8e99000..5e73642 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/CactusSpikes.png.meta +++ b/FlufflParty/Assets/BlenderFiles/Textures/CactusSpikes.png.meta @@ -50,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 @@ -125,6 +125,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Cactus_2Spikes.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/Cactus_2Spikes.png.meta index 30d43db..7245ded 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/Cactus_2Spikes.png.meta +++ b/FlufflParty/Assets/BlenderFiles/Textures/Cactus_2Spikes.png.meta @@ -50,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 3 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/FlufflParty/Assets/BlenderFiles/Textures/DriedGrassTexture.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/DriedGrassTexture.png.meta index d47837f..8af05d3 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/DriedGrassTexture.png.meta +++ b/FlufflParty/Assets/BlenderFiles/Textures/DriedGrassTexture.png.meta @@ -50,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 3 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -125,6 +125,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/FlufflParty/Assets/BlenderFiles/Textures/DriedTree.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/DriedTree.png.meta index 8749cf3..6a5a1c3 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/DriedTree.png.meta +++ b/FlufflParty/Assets/BlenderFiles/Textures/DriedTree.png.meta @@ -50,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 diff --git a/FlufflParty/Assets/BlenderFiles/Textures/EventField.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/EventField.png.meta index caa07cf..7475554 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/EventField.png.meta +++ b/FlufflParty/Assets/BlenderFiles/Textures/EventField.png.meta @@ -50,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 @@ -125,6 +125,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Mushroom_Item.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/Mushroom_Item.png.meta index eb76200..989a830 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/Mushroom_Item.png.meta +++ b/FlufflParty/Assets/BlenderFiles/Textures/Mushroom_Item.png.meta @@ -50,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 diff --git a/FlufflParty/Assets/BlenderFiles/Textures/PalmTreeLeaf.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/PalmTreeLeaf.png.meta index bf78cf0..aa43c5f 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/PalmTreeLeaf.png.meta +++ b/FlufflParty/Assets/BlenderFiles/Textures/PalmTreeLeaf.png.meta @@ -50,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 3 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -125,6 +125,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/FlufflParty/Assets/BlenderFiles/Textures/PalmTrunk.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/PalmTrunk.png.meta index 68fded3..be9e223 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/PalmTrunk.png.meta +++ b/FlufflParty/Assets/BlenderFiles/Textures/PalmTrunk.png.meta @@ -50,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 3 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -125,6 +125,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Rock/Rock050_2K_Color.jpg.meta b/FlufflParty/Assets/BlenderFiles/Textures/Rock/Rock050_2K_Color.jpg.meta index 7bbb3a1..a8feff6 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/Rock/Rock050_2K_Color.jpg.meta +++ b/FlufflParty/Assets/BlenderFiles/Textures/Rock/Rock050_2K_Color.jpg.meta @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 3 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Rock/Rock050_2K_NormalGL.jpg.meta b/FlufflParty/Assets/BlenderFiles/Textures/Rock/Rock050_2K_NormalGL.jpg.meta index 0ed1b81..da44592 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/Rock/Rock050_2K_NormalGL.jpg.meta +++ b/FlufflParty/Assets/BlenderFiles/Textures/Rock/Rock050_2K_NormalGL.jpg.meta @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 3 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Sand/Ground055L_2K_Color.jpg.meta b/FlufflParty/Assets/BlenderFiles/Textures/Sand/Ground055L_2K_Color.jpg.meta index 7208618..5f554f6 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/Sand/Ground055L_2K_Color.jpg.meta +++ b/FlufflParty/Assets/BlenderFiles/Textures/Sand/Ground055L_2K_Color.jpg.meta @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 3 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Sand/NewLayer 2.terrainlayer b/FlufflParty/Assets/BlenderFiles/Textures/Sand/NewLayer 2.terrainlayer new file mode 100644 index 0000000..a5dbc97 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Textures/Sand/NewLayer 2.terrainlayer @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1953259897 &8574412962073106934 +TerrainLayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NewLayer 2 + m_DiffuseTexture: {fileID: 2800000, guid: 9f089a3813cfa44458b1f9eedd28765b, type: 3} + m_NormalMapTexture: {fileID: 0} + m_MaskMapTexture: {fileID: 0} + m_TileSize: {x: 50, y: 50} + m_TileOffset: {x: 0, y: 0} + m_Specular: {r: 0, g: 0, b: 0, a: 0} + m_Metallic: 0 + m_Smoothness: 0 + m_NormalScale: 1 + m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} + m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Sand/NewLayer 2.terrainlayer.meta b/FlufflParty/Assets/BlenderFiles/Textures/Sand/NewLayer 2.terrainlayer.meta new file mode 100644 index 0000000..8561a54 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Textures/Sand/NewLayer 2.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 32ef1074d123fce4a87114490411a985 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8574412962073106934 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Sand/Sand 1.jpg b/FlufflParty/Assets/BlenderFiles/Textures/Sand/Sand 1.jpg new file mode 100644 index 0000000..d4cac3d Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/Textures/Sand/Sand 1.jpg differ diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Sand/Sand 1.jpg.meta b/FlufflParty/Assets/BlenderFiles/Textures/Sand/Sand 1.jpg.meta new file mode 100644 index 0000000..d2407fc --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Textures/Sand/Sand 1.jpg.meta @@ -0,0 +1,159 @@ +fileFormatVersion: 2 +guid: 30f4383b85dda53458fb367f3bdd3e7d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + 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: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 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 + 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + 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: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Sand/Sand.jpg.meta b/FlufflParty/Assets/BlenderFiles/Textures/Sand/Sand.jpg.meta index 306637c..4c7c6aa 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/Sand/Sand.jpg.meta +++ b/FlufflParty/Assets/BlenderFiles/Textures/Sand/Sand.jpg.meta @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 3 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Sand/SandDarker.jpg.meta b/FlufflParty/Assets/BlenderFiles/Textures/Sand/SandDarker.jpg.meta index 10f2196..8ac2708 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/Sand/SandDarker.jpg.meta +++ b/FlufflParty/Assets/BlenderFiles/Textures/Sand/SandDarker.jpg.meta @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 3 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Sand/SandNormal.jpg.meta b/FlufflParty/Assets/BlenderFiles/Textures/Sand/SandNormal.jpg.meta index fa5ba6f..43765db 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/Sand/SandNormal.jpg.meta +++ b/FlufflParty/Assets/BlenderFiles/Textures/Sand/SandNormal.jpg.meta @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 3 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/FlufflParty/Assets/BlenderFiles/Textures/VSField.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/VSField.png.meta index 0911c24..e7e5e71 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/VSField.png.meta +++ b/FlufflParty/Assets/BlenderFiles/Textures/VSField.png.meta @@ -50,7 +50,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 @@ -125,6 +125,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Water1.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/Water1.png.meta index 6293b0a..0377f2d 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/Water1.png.meta +++ b/FlufflParty/Assets/BlenderFiles/Textures/Water1.png.meta @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 3 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -125,6 +125,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/FlufflParty/Assets/Materials/Coin.mat b/FlufflParty/Assets/Materials/Coin.mat index 71dc805..0e011ce 100644 --- a/FlufflParty/Assets/Materials/Coin.mat +++ b/FlufflParty/Assets/Materials/Coin.mat @@ -9,10 +9,12 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Coin m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: [] + m_ValidKeywords: + - _GLOSSYREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF m_InvalidKeywords: [] m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} @@ -64,13 +66,13 @@ Material: - _DstBlend: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - - _GlossyReflections: 1 + - _GlossyReflections: 0 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 + - _SpecularHighlights: 0 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 diff --git a/FlufflParty/Assets/Materials/PalmTree/PalmTreeLeaf.mat b/FlufflParty/Assets/Materials/PalmTree/PalmTreeLeaf.mat index ea95e32..c46d70d 100644 --- a/FlufflParty/Assets/Materials/PalmTree/PalmTreeLeaf.mat +++ b/FlufflParty/Assets/Materials/PalmTree/PalmTreeLeaf.mat @@ -9,7 +9,9 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: PalmTreeLeaf m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: [] + m_ValidKeywords: + - _GLOSSYREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -64,13 +66,13 @@ Material: - _DstBlend: 0 - _GlossMapScale: 1 - _Glossiness: 0 - - _GlossyReflections: 1 + - _GlossyReflections: 0 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 + - _SpecularHighlights: 0 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 diff --git a/FlufflParty/Assets/Materials/PalmTree/PalmTreeTrunk.mat b/FlufflParty/Assets/Materials/PalmTree/PalmTreeTrunk.mat index 5eff13a..8394151 100644 --- a/FlufflParty/Assets/Materials/PalmTree/PalmTreeTrunk.mat +++ b/FlufflParty/Assets/Materials/PalmTree/PalmTreeTrunk.mat @@ -9,7 +9,9 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: PalmTreeTrunk m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: [] + m_ValidKeywords: + - _GLOSSYREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -64,13 +66,13 @@ Material: - _DstBlend: 0 - _GlossMapScale: 1 - _Glossiness: 0 - - _GlossyReflections: 1 + - _GlossyReflections: 0 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 + - _SpecularHighlights: 0 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 diff --git a/FlufflParty/Assets/Materials/PlayerFields/EventField.mat b/FlufflParty/Assets/Materials/PlayerFields/EventField.mat index 94211cd..2a5850e 100644 --- a/FlufflParty/Assets/Materials/PlayerFields/EventField.mat +++ b/FlufflParty/Assets/Materials/PlayerFields/EventField.mat @@ -11,6 +11,7 @@ Material: m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _GLOSSYREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -71,7 +72,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 + - _SpecularHighlights: 0 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 diff --git a/FlufflParty/Assets/Materials/PlayerFields/ItemField.mat b/FlufflParty/Assets/Materials/PlayerFields/ItemField.mat index 18b3c6a..2c83622 100644 --- a/FlufflParty/Assets/Materials/PlayerFields/ItemField.mat +++ b/FlufflParty/Assets/Materials/PlayerFields/ItemField.mat @@ -11,6 +11,7 @@ Material: m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _GLOSSYREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -71,7 +72,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 + - _SpecularHighlights: 0 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 diff --git a/FlufflParty/Assets/Materials/PlayerFields/VSFIeld.mat b/FlufflParty/Assets/Materials/PlayerFields/VSFIeld.mat index acadff7..497ff61 100644 --- a/FlufflParty/Assets/Materials/PlayerFields/VSFIeld.mat +++ b/FlufflParty/Assets/Materials/PlayerFields/VSFIeld.mat @@ -11,6 +11,7 @@ Material: m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _GLOSSYREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -71,7 +72,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 + - _SpecularHighlights: 0 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 diff --git a/FlufflParty/Assets/Materials/Star.mat b/FlufflParty/Assets/Materials/Star.mat index 2694618..71827c3 100644 --- a/FlufflParty/Assets/Materials/Star.mat +++ b/FlufflParty/Assets/Materials/Star.mat @@ -11,9 +11,11 @@ Material: m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _EMISSION + - _GLOSSYREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF m_InvalidKeywords: [] m_LightmapFlags: 2 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} @@ -65,13 +67,13 @@ Material: - _DstBlend: 0 - _GlossMapScale: 1 - _Glossiness: 0.484 - - _GlossyReflections: 1 + - _GlossyReflections: 0 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 + - _SpecularHighlights: 0 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 diff --git a/FlufflParty/Assets/Materials/Terrain/Sand.mat b/FlufflParty/Assets/Materials/Terrain/Sand.mat index ec70c42..f5b71f7 100644 --- a/FlufflParty/Assets/Materials/Terrain/Sand.mat +++ b/FlufflParty/Assets/Materials/Terrain/Sand.mat @@ -15,7 +15,7 @@ Material: - _SPECULARHIGHLIGHTS_OFF m_InvalidKeywords: [] m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} diff --git a/FlufflParty/Assets/Materials/Terrain/TerrainMiniMap.mat b/FlufflParty/Assets/Materials/Terrain/TerrainMiniMap.mat index 319244f..3bd5436 100644 --- a/FlufflParty/Assets/Materials/Terrain/TerrainMiniMap.mat +++ b/FlufflParty/Assets/Materials/Terrain/TerrainMiniMap.mat @@ -12,7 +12,7 @@ Material: m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} diff --git a/FlufflParty/Assets/Materials/Tiles/TilesTextured.mat b/FlufflParty/Assets/Materials/Tiles/TilesTextured.mat index d3566e2..45eed3d 100644 --- a/FlufflParty/Assets/Materials/Tiles/TilesTextured.mat +++ b/FlufflParty/Assets/Materials/Tiles/TilesTextured.mat @@ -14,7 +14,7 @@ Material: - _SPECULARHIGHLIGHTS_OFF m_InvalidKeywords: [] m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} diff --git a/FlufflParty/Assets/Materials/Wheel/WheelMetal.mat b/FlufflParty/Assets/Materials/Wheel/WheelMetal.mat index 297d01b..4b8848a 100644 --- a/FlufflParty/Assets/Materials/Wheel/WheelMetal.mat +++ b/FlufflParty/Assets/Materials/Wheel/WheelMetal.mat @@ -9,7 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: WheelMetal m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: [] + m_ValidKeywords: + - _GLOSSYREFLECTIONS_OFF m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -64,7 +65,7 @@ Material: - _DstBlend: 0 - _GlossMapScale: 1 - _Glossiness: 0.64 - - _GlossyReflections: 1 + - _GlossyReflections: 0 - _Metallic: 1 - _Mode: 0 - _OcclusionStrength: 1 diff --git a/FlufflParty/Assets/Materials/WorldTextBackground.mat b/FlufflParty/Assets/Materials/WorldTextBackground.mat index e69cf6e..265e824 100644 --- a/FlufflParty/Assets/Materials/WorldTextBackground.mat +++ b/FlufflParty/Assets/Materials/WorldTextBackground.mat @@ -11,9 +11,11 @@ Material: m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _ALPHAPREMULTIPLY_ON + - _GLOSSYREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF m_InvalidKeywords: [] m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 + m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 stringTagMap: @@ -66,13 +68,13 @@ Material: - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0 - - _GlossyReflections: 1 + - _GlossyReflections: 0 - _Metallic: 0 - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 + - _SpecularHighlights: 0 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 0 diff --git a/FlufflParty/Assets/New Terrain.asset b/FlufflParty/Assets/New Terrain.asset index 7554a9a..317b537 100644 Binary files a/FlufflParty/Assets/New Terrain.asset and b/FlufflParty/Assets/New Terrain.asset differ diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity index 886bab6..c22712e 100644 --- a/FlufflParty/Assets/Scenes/WesternMap.unity +++ b/FlufflParty/Assets/Scenes/WesternMap.unity @@ -586,6 +586,7 @@ MonoBehaviour: - {fileID: 1021992538} - {fileID: 250767832} - {fileID: 996982154} + fpsText: {fileID: 2010829642} --- !u!114 &47812149 MonoBehaviour: m_ObjectHideFlags: 0 @@ -13539,6 +13540,7 @@ RectTransform: - {fileID: 451186232} - {fileID: 829669649} - {fileID: 936968710} + - {fileID: 2010829641} m_Father: {fileID: 335464105} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -17322,13 +17324,13 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1801910447} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} m_Name: m_EditorClassIdentifier: sharedProfile: {fileID: 11400000, guid: 3fc0d8b96f091a4499b415f9f40c7381, type: 2} - isGlobal: 1 + isGlobal: 0 blendDistance: 0 weight: 1 priority: 0 @@ -18666,6 +18668,141 @@ RectTransform: m_AnchoredPosition: {x: -0.0001, y: -55.240005} m_SizeDelta: {x: 204.7661, y: 59.140015} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2010829640 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2010829641} + - component: {fileID: 2010829643} + - component: {fileID: 2010829642} + m_Layer: 5 + m_Name: TempFPS + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2010829641 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2010829640} + 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: 1462787853} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 225, y: -56.759995} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2010829642 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2010829640} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &2010829643 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2010829640} + m_CullTransparentMesh: 1 --- !u!1001 &2019848015 PrefabInstance: m_ObjectHideFlags: 0 @@ -19158,7 +19295,7 @@ TerrainCollider: m_Material: {fileID: 0} m_Enabled: 1 m_TerrainData: {fileID: 15600000, guid: 6081cd83a95b3e74e91cfc8aed41826c, type: 2} - m_EnableTreeColliders: 1 + m_EnableTreeColliders: 0 --- !u!218 &2085245914 Terrain: m_ObjectHideFlags: 0 @@ -19173,14 +19310,14 @@ Terrain: m_TreeBillboardDistance: 50 m_TreeCrossFadeLength: 5 m_TreeMaximumFullLODCount: 50 - m_DetailObjectDistance: 46 - m_DetailObjectDensity: 1 + m_DetailObjectDistance: 35 + m_DetailObjectDensity: 0.966 m_HeightmapPixelError: 5 m_SplatMapDistance: 1000 m_HeightmapMaximumLOD: 0 m_ShadowCastingMode: 1 m_DrawHeightmap: 1 - m_DrawInstanced: 0 + m_DrawInstanced: 1 m_DrawTreesAndFoliage: 1 m_StaticShadowCaster: 0 m_ReflectionProbeUsage: 0 diff --git a/FlufflParty/Assets/Scenes/WesternMap_Profiles/PostProcess Profile.asset b/FlufflParty/Assets/Scenes/WesternMap_Profiles/PostProcess Profile.asset index 58adad2..98d0297 100644 --- a/FlufflParty/Assets/Scenes/WesternMap_Profiles/PostProcess Profile.asset +++ b/FlufflParty/Assets/Scenes/WesternMap_Profiles/PostProcess Profile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: adb84e30e02715445aeb9959894e3b4d, type: 3} m_Name: ColorGrading m_EditorClassIdentifier: - active: 1 + active: 0 enabled: overrideState: 1 value: 1 diff --git a/FlufflParty/Assets/Scripts/Client.cs b/FlufflParty/Assets/Scripts/Client.cs index cf6cf17..90824c4 100644 --- a/FlufflParty/Assets/Scripts/Client.cs +++ b/FlufflParty/Assets/Scripts/Client.cs @@ -32,6 +32,8 @@ public class Client : MonoBehaviour [SerializeField] private Item[] items; [SerializeField] private Button[] itemButtons; + [SerializeField] private TMP_Text fpsText; + private int playerAmount = 0; private static Client thisClient; @@ -43,6 +45,8 @@ public class Client : MonoBehaviour private void Start() { + Application.targetFrameRate = 100; + thisClient = this; foreach(Image img in uiItems) @@ -125,6 +129,8 @@ public class Client : MonoBehaviour private void Update() { + fpsText.text = "" + Time.frameCount / Time.time + ""; + if (jobs.Count > 0) { Job job = jobs.Dequeue(); diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset index bebd33d..d43a9cf 100644 --- a/FlufflParty/ProjectSettings/ProjectSettings.asset +++ b/FlufflParty/ProjectSettings/ProjectSettings.asset @@ -125,7 +125,7 @@ PlayerSettings: switchNVNMaxPublicSamplerIDCount: 0 stadiaPresentMode: 0 stadiaTargetFramerate: 0 - vulkanNumSwapchainBuffers: 3 + vulkanNumSwapchainBuffers: 2 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 1 vulkanEnableLateAcquireNextImage: 0 @@ -149,7 +149,7 @@ PlayerSettings: enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 - enableOpenGLProfilerGPURecorders: 1 + enableOpenGLProfilerGPURecorders: 0 useHDRDisplay: 0 D3DHDRBitDepth: 0 m_ColorGamuts: 00000000 @@ -167,14 +167,14 @@ PlayerSettings: tvOS: 0 overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 31 - AndroidTargetSdkVersion: 0 - AndroidPreferredInstallLocation: 1 + AndroidMinSdkVersion: 26 + AndroidTargetSdkVersion: 31 + AndroidPreferredInstallLocation: 2 aotOptions: stripEngineCode: 1 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 - ForceInternetPermission: 0 + ForceInternetPermission: 1 ForceSDCardPermission: 0 CreateWallpaper: 0 APKExpansionFiles: 0 @@ -251,7 +251,7 @@ PlayerSettings: useCustomGradlePropertiesTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 3 - AndroidTargetDevices: 0 + AndroidTargetDevices: 1 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: D:/Unity/flufflparty/user.keystore @@ -481,7 +481,7 @@ PlayerSettings: m_DynamicBatching: 0 - m_BuildTarget: Android m_StaticBatching: 1 - m_DynamicBatching: 0 + m_DynamicBatching: 1 - m_BuildTarget: iPhone m_StaticBatching: 1 m_DynamicBatching: 0 @@ -524,7 +524,7 @@ PlayerSettings: m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 - m_Automatic: 1 + m_Automatic: 0 - m_BuildTarget: iOSSupport m_APIs: 10000000 m_Automatic: 1 @@ -552,7 +552,7 @@ PlayerSettings: tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: - m_BuildTarget: Android - m_EncodingQuality: 1 + m_EncodingQuality: 0 - m_BuildTarget: iPhone m_EncodingQuality: 1 - m_BuildTarget: tvOS