diff --git a/Forest/Assets/Art/Texture/MainPanel.meta b/Forest/Assets/Art/Texture/Main.meta similarity index 77% rename from Forest/Assets/Art/Texture/MainPanel.meta rename to Forest/Assets/Art/Texture/Main.meta index 663de56..e7ccdd6 100644 --- a/Forest/Assets/Art/Texture/MainPanel.meta +++ b/Forest/Assets/Art/Texture/Main.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 55c0ac33751d59d46a2d426f3bde7812 +guid: d4c66fce152d848a69ec55cb35379c40 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Forest/Assets/Art/Texture/Main/Main_Bg.png b/Forest/Assets/Art/Texture/Main/Main_Bg.png new file mode 100644 index 0000000..c83d565 Binary files /dev/null and b/Forest/Assets/Art/Texture/Main/Main_Bg.png differ diff --git a/Forest/Assets/Art/Texture/MainPanel/UI_Shop.png.meta b/Forest/Assets/Art/Texture/Main/Main_Bg.png.meta similarity index 98% rename from Forest/Assets/Art/Texture/MainPanel/UI_Shop.png.meta rename to Forest/Assets/Art/Texture/Main/Main_Bg.png.meta index cecdabc..1a5e2ca 100644 --- a/Forest/Assets/Art/Texture/MainPanel/UI_Shop.png.meta +++ b/Forest/Assets/Art/Texture/Main/Main_Bg.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1d2db4e9846d05d419defbf06567458d +guid: f741e594ad95a4237a9bd72507ca5f74 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Forest/Assets/Art/Texture/Main/Main_Bg2.png b/Forest/Assets/Art/Texture/Main/Main_Bg2.png new file mode 100644 index 0000000..b3ee52d Binary files /dev/null and b/Forest/Assets/Art/Texture/Main/Main_Bg2.png differ diff --git a/Forest/Assets/Art/Texture/MainPanel/UI_Title_CN.png.meta b/Forest/Assets/Art/Texture/Main/Main_Bg2.png.meta similarity index 98% rename from Forest/Assets/Art/Texture/MainPanel/UI_Title_CN.png.meta rename to Forest/Assets/Art/Texture/Main/Main_Bg2.png.meta index 84792e1..7a81c64 100644 --- a/Forest/Assets/Art/Texture/MainPanel/UI_Title_CN.png.meta +++ b/Forest/Assets/Art/Texture/Main/Main_Bg2.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6f21603ec67808046b2b56e44c30e626 +guid: e701fe54462544c438e958c18d6f1288 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Forest/Assets/Art/Texture/Main/Main_Btn.png b/Forest/Assets/Art/Texture/Main/Main_Btn.png new file mode 100644 index 0000000..ff55560 Binary files /dev/null and b/Forest/Assets/Art/Texture/Main/Main_Btn.png differ diff --git a/Forest/Assets/Art/Texture/MainPanel/B_Main.png.meta b/Forest/Assets/Art/Texture/Main/Main_Btn.png.meta similarity index 98% rename from Forest/Assets/Art/Texture/MainPanel/B_Main.png.meta rename to Forest/Assets/Art/Texture/Main/Main_Btn.png.meta index 247ada1..a9ec061 100644 --- a/Forest/Assets/Art/Texture/MainPanel/B_Main.png.meta +++ b/Forest/Assets/Art/Texture/Main/Main_Btn.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0be1abd2b2aa75b49b1aabbe21a20a03 +guid: 41699e2fc30cd4afab26e41ce3a062f0 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Forest/Assets/Art/Texture/MainPanel/B_Main.png b/Forest/Assets/Art/Texture/MainPanel/B_Main.png deleted file mode 100644 index f37c82c..0000000 Binary files a/Forest/Assets/Art/Texture/MainPanel/B_Main.png and /dev/null differ diff --git a/Forest/Assets/Art/Texture/MainPanel/Btn_Main.png b/Forest/Assets/Art/Texture/MainPanel/Btn_Main.png deleted file mode 100644 index 38615b6..0000000 Binary files a/Forest/Assets/Art/Texture/MainPanel/Btn_Main.png and /dev/null differ diff --git a/Forest/Assets/Art/Texture/MainPanel/Btn_Main.png.meta b/Forest/Assets/Art/Texture/MainPanel/Btn_Main.png.meta deleted file mode 100644 index 23a97f4..0000000 --- a/Forest/Assets/Art/Texture/MainPanel/Btn_Main.png.meta +++ /dev/null @@ -1,166 +0,0 @@ -fileFormatVersion: 2 -guid: 293b722e32ae11745b657fe25cf81719 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Forest/Assets/Art/Texture/MainPanel/Bulwark_Left.png b/Forest/Assets/Art/Texture/MainPanel/Bulwark_Left.png deleted file mode 100644 index 6302c9f..0000000 Binary files a/Forest/Assets/Art/Texture/MainPanel/Bulwark_Left.png and /dev/null differ diff --git a/Forest/Assets/Art/Texture/MainPanel/Bulwark_Left.png.meta b/Forest/Assets/Art/Texture/MainPanel/Bulwark_Left.png.meta deleted file mode 100644 index 2437c19..0000000 --- a/Forest/Assets/Art/Texture/MainPanel/Bulwark_Left.png.meta +++ /dev/null @@ -1,166 +0,0 @@ -fileFormatVersion: 2 -guid: 46b972a7c48619f418e887ab9bd68d63 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Forest/Assets/Art/Texture/MainPanel/Bulwark_Right.png b/Forest/Assets/Art/Texture/MainPanel/Bulwark_Right.png deleted file mode 100644 index 3215c54..0000000 Binary files a/Forest/Assets/Art/Texture/MainPanel/Bulwark_Right.png and /dev/null differ diff --git a/Forest/Assets/Art/Texture/MainPanel/Bulwark_Right.png.meta b/Forest/Assets/Art/Texture/MainPanel/Bulwark_Right.png.meta deleted file mode 100644 index f19f0d3..0000000 --- a/Forest/Assets/Art/Texture/MainPanel/Bulwark_Right.png.meta +++ /dev/null @@ -1,166 +0,0 @@ -fileFormatVersion: 2 -guid: ec9d318fd93e9144b814ca478d613301 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Forest/Assets/Art/Texture/MainPanel/Character_IP.png b/Forest/Assets/Art/Texture/MainPanel/Character_IP.png deleted file mode 100644 index 2a93e63..0000000 Binary files a/Forest/Assets/Art/Texture/MainPanel/Character_IP.png and /dev/null differ diff --git a/Forest/Assets/Art/Texture/MainPanel/Character_IP.png.meta b/Forest/Assets/Art/Texture/MainPanel/Character_IP.png.meta deleted file mode 100644 index 83677d0..0000000 --- a/Forest/Assets/Art/Texture/MainPanel/Character_IP.png.meta +++ /dev/null @@ -1,166 +0,0 @@ -fileFormatVersion: 2 -guid: 0a3cd17cb7c649b4dafbc9268dadbec0 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Forest/Assets/Art/Texture/MainPanel/UI_Setting.png b/Forest/Assets/Art/Texture/MainPanel/UI_Setting.png deleted file mode 100644 index 4a98373..0000000 Binary files a/Forest/Assets/Art/Texture/MainPanel/UI_Setting.png and /dev/null differ diff --git a/Forest/Assets/Art/Texture/MainPanel/UI_Setting.png.meta b/Forest/Assets/Art/Texture/MainPanel/UI_Setting.png.meta deleted file mode 100644 index 70e459b..0000000 --- a/Forest/Assets/Art/Texture/MainPanel/UI_Setting.png.meta +++ /dev/null @@ -1,166 +0,0 @@ -fileFormatVersion: 2 -guid: 0e6d1897a5b72784a9b8912206bbed3e -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 1537655665 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Forest/Assets/Art/Texture/MainPanel/UI_Shop.png b/Forest/Assets/Art/Texture/MainPanel/UI_Shop.png deleted file mode 100644 index 00603f1..0000000 Binary files a/Forest/Assets/Art/Texture/MainPanel/UI_Shop.png and /dev/null differ diff --git a/Forest/Assets/Art/Texture/MainPanel/UI_Title_CN.png b/Forest/Assets/Art/Texture/MainPanel/UI_Title_CN.png deleted file mode 100644 index 85de7df..0000000 Binary files a/Forest/Assets/Art/Texture/MainPanel/UI_Title_CN.png and /dev/null differ diff --git a/Forest/Assets/Art/Texture/MainPanel/UI_Title_EN.png b/Forest/Assets/Art/Texture/MainPanel/UI_Title_EN.png deleted file mode 100644 index 4708351..0000000 Binary files a/Forest/Assets/Art/Texture/MainPanel/UI_Title_EN.png and /dev/null differ diff --git a/Forest/Assets/Art/Texture/Other/Title_CN.png b/Forest/Assets/Art/Texture/Other/Title_CN.png new file mode 100644 index 0000000..79bc081 Binary files /dev/null and b/Forest/Assets/Art/Texture/Other/Title_CN.png differ diff --git a/Forest/Assets/Art/Texture/MainPanel/UI_Title_EN.png.meta b/Forest/Assets/Art/Texture/Other/Title_CN.png.meta similarity index 98% rename from Forest/Assets/Art/Texture/MainPanel/UI_Title_EN.png.meta rename to Forest/Assets/Art/Texture/Other/Title_CN.png.meta index 1faec44..77fe101 100644 --- a/Forest/Assets/Art/Texture/MainPanel/UI_Title_EN.png.meta +++ b/Forest/Assets/Art/Texture/Other/Title_CN.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3c7c717687eede34db684ef4e2e35b07 +guid: 50a04592501344405948b77d73a61b91 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Forest/Assets/Art/Texture/Other/Title_EN.png b/Forest/Assets/Art/Texture/Other/Title_EN.png new file mode 100644 index 0000000..80a7276 Binary files /dev/null and b/Forest/Assets/Art/Texture/Other/Title_EN.png differ diff --git a/Forest/Assets/Art/Texture/Other/Title_EN.png.meta b/Forest/Assets/Art/Texture/Other/Title_EN.png.meta new file mode 100644 index 0000000..015f4ba --- /dev/null +++ b/Forest/Assets/Art/Texture/Other/Title_EN.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: d5c87d6905cca4400ad7e2576a7bc679 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Forest/Assets/Art/Texture/Setting/Setting_Btn.png b/Forest/Assets/Art/Texture/Setting/Setting_Btn.png new file mode 100644 index 0000000..1b2aa4d Binary files /dev/null and b/Forest/Assets/Art/Texture/Setting/Setting_Btn.png differ diff --git a/Forest/Assets/Art/Texture/Setting/Setting_Btn.png.meta b/Forest/Assets/Art/Texture/Setting/Setting_Btn.png.meta new file mode 100644 index 0000000..12542f0 --- /dev/null +++ b/Forest/Assets/Art/Texture/Setting/Setting_Btn.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 1a0aef7d0b8bf42ebb926ee9cfbfb760 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Forest/Assets/Art/Texture/Shop/Shop_Btn.png b/Forest/Assets/Art/Texture/Shop/Shop_Btn.png new file mode 100644 index 0000000..0e49ffd Binary files /dev/null and b/Forest/Assets/Art/Texture/Shop/Shop_Btn.png differ diff --git a/Forest/Assets/Art/Texture/Shop/Shop_Btn.png.meta b/Forest/Assets/Art/Texture/Shop/Shop_Btn.png.meta new file mode 100644 index 0000000..87a4bf0 --- /dev/null +++ b/Forest/Assets/Art/Texture/Shop/Shop_Btn.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 0eb8324995d9a48268ee748a23e0231a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Forest/Assets/Art/Texture/Shop/UI_Shop.png b/Forest/Assets/Art/Texture/Shop/UI_Shop.png deleted file mode 100644 index e7d3865..0000000 Binary files a/Forest/Assets/Art/Texture/Shop/UI_Shop.png and /dev/null differ diff --git a/Forest/Assets/Art/Texture/Shop/UI_Shop.png.meta b/Forest/Assets/Art/Texture/Shop/UI_Shop.png.meta deleted file mode 100644 index 546ce11..0000000 --- a/Forest/Assets/Art/Texture/Shop/UI_Shop.png.meta +++ /dev/null @@ -1,153 +0,0 @@ -fileFormatVersion: 2 -guid: fc80a5aed3e2b194c87f962767b6b67f -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Forest/Assets/Art/UI/Prefab/UILoginPanel.prefab b/Forest/Assets/Art/UI/Prefab/UILoginPanel.prefab index 6ff6837..3cdf955 100644 --- a/Forest/Assets/Art/UI/Prefab/UILoginPanel.prefab +++ b/Forest/Assets/Art/UI/Prefab/UILoginPanel.prefab @@ -259,7 +259,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 556.37, y: 335} + m_SizeDelta: {x: 540, y: 408.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3257070473269010886 CanvasRenderer: @@ -289,7 +289,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6f21603ec67808046b2b56e44c30e626, type: 3} + m_Sprite: {fileID: 21300000, guid: 50a04592501344405948b77d73a61b91, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -334,7 +334,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 523.87, y: 335} + m_SizeDelta: {x: 540, y: 408.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4021833125208544639 CanvasRenderer: @@ -364,7 +364,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3c7c717687eede34db684ef4e2e35b07, type: 3} + m_Sprite: {fileID: 21300000, guid: d5c87d6905cca4400ad7e2576a7bc679, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Forest/Assets/Art/UI/Prefab/UIMainPanel.prefab b/Forest/Assets/Art/UI/Prefab/UIMainPanel.prefab index 192f54d..6ef3d82 100644 --- a/Forest/Assets/Art/UI/Prefab/UIMainPanel.prefab +++ b/Forest/Assets/Art/UI/Prefab/UIMainPanel.prefab @@ -36,81 +36,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &714968574757102203 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7881512454232404808} - - component: {fileID: 5112350422741508096} - - component: {fileID: 7590350714619176211} - m_Layer: 5 - m_Name: Img_Right - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7881512454232404808 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 714968574757102203} - 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: 5940626574529633915} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 304, y: 308} - m_Pivot: {x: 1.0000001, y: 0} ---- !u!222 &5112350422741508096 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 714968574757102203} - m_CullTransparentMesh: 1 ---- !u!114 &7590350714619176211 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 714968574757102203} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: ec9d318fd93e9144b814ca478d613301, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &1587541022406742309 GameObject: m_ObjectHideFlags: 0 @@ -123,7 +48,7 @@ GameObject: - component: {fileID: 6987987258047137632} - component: {fileID: 2551198965520345966} m_Layer: 5 - m_Name: Img_Left + m_Name: Img_BG m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -146,7 +71,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: -20, y: 0} - m_SizeDelta: {x: 304, y: 308} + m_SizeDelta: {x: 1080, y: 494} m_Pivot: {x: 0, y: 0} --- !u!222 &6987987258047137632 CanvasRenderer: @@ -176,7 +101,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 46b972a7c48619f418e887ab9bd68d63, type: 3} + m_Sprite: {fileID: 21300000, guid: e701fe54462544c438e958c18d6f1288, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -220,8 +145,8 @@ RectTransform: 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: 0, y: -525} - m_SizeDelta: {x: 1024, y: 623.5} + m_AnchoredPosition: {x: 0, y: -563} + m_SizeDelta: {x: 1080, y: 817} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6575208010741934435 CanvasRenderer: @@ -251,7 +176,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6f21603ec67808046b2b56e44c30e626, type: 3} + m_Sprite: {fileID: 21300000, guid: 50a04592501344405948b77d73a61b91, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -327,9 +252,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1901886252975893447} - - {fileID: 8676366860213342963} - {fileID: 4316519208730348209} - - {fileID: 7881512454232404808} - {fileID: 4923674628100320101} - {fileID: 5562081337808076743} - {fileID: 4730431326859452550} @@ -368,7 +291,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0be1abd2b2aa75b49b1aabbe21a20a03, type: 3} + m_Sprite: {fileID: 21300000, guid: f741e594ad95a4237a9bd72507ca5f74, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -414,8 +337,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 480} - m_SizeDelta: {x: 559, y: 169} + m_AnchoredPosition: {x: 0, y: 458} + m_SizeDelta: {x: 569, y: 182} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5051796452294842446 CanvasRenderer: @@ -445,7 +368,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 293b722e32ae11745b657fe25cf81719, type: 3} + m_Sprite: {fileID: 21300000, guid: 41699e2fc30cd4afab26e41ce3a062f0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -567,8 +490,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u9009\u62E9\u5173\u5361" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 7944e7f1ee22bb14fa3a310fd16e8092, type: 2} - m_sharedMaterial: {fileID: -5302180806271213227, guid: 7944e7f1ee22bb14fa3a310fd16e8092, + m_fontAsset: {fileID: 11400000, guid: 8ff78e797c9504c05b77b3ed521b84a6, type: 2} + m_sharedMaterial: {fileID: -6578629386010562579, guid: 8ff78e797c9504c05b77b3ed521b84a6, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -599,7 +522,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -716,8 +639,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u5F00\u59CB\u6E38\u620F" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 7944e7f1ee22bb14fa3a310fd16e8092, type: 2} - m_sharedMaterial: {fileID: -5302180806271213227, guid: 7944e7f1ee22bb14fa3a310fd16e8092, + m_fontAsset: {fileID: 11400000, guid: 8ff78e797c9504c05b77b3ed521b84a6, type: 2} + m_sharedMaterial: {fileID: -6578629386010562579, guid: 8ff78e797c9504c05b77b3ed521b84a6, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -748,7 +671,7 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -872,8 +795,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 260} - m_SizeDelta: {x: 559, y: 169} + m_AnchoredPosition: {x: 0, y: 238} + m_SizeDelta: {x: 569, y: 182} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1614995208389606824 CanvasRenderer: @@ -903,7 +826,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 293b722e32ae11745b657fe25cf81719, type: 3} + m_Sprite: {fileID: 21300000, guid: 41699e2fc30cd4afab26e41ce3a062f0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -957,81 +880,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &6451535289701091081 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8676366860213342963} - - component: {fileID: 4127481451569018157} - - component: {fileID: 3796697769551246254} - m_Layer: 5 - m_Name: Img_IP - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &8676366860213342963 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6451535289701091081} - 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: 5940626574529633915} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -100} - m_SizeDelta: {x: 774.144, y: 733.414} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4127481451569018157 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6451535289701091081} - m_CullTransparentMesh: 1 ---- !u!114 &3796697769551246254 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6451535289701091081} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 0a3cd17cb7c649b4dafbc9268dadbec0, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &7083752970861741234 GameObject: m_ObjectHideFlags: 0 @@ -1066,8 +914,8 @@ RectTransform: 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: 0, y: -525} - m_SizeDelta: {x: 1024, y: 623.5} + m_AnchoredPosition: {x: 0, y: -563} + m_SizeDelta: {x: 1080, y: 817} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2978644034181805563 CanvasRenderer: @@ -1097,7 +945,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3c7c717687eede34db684ef4e2e35b07, type: 3} + m_Sprite: {fileID: 21300000, guid: d5c87d6905cca4400ad7e2576a7bc679, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1173,7 +1021,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0e6d1897a5b72784a9b8912206bbed3e, type: 3} + m_Sprite: {fileID: 21300000, guid: 1a0aef7d0b8bf42ebb926ee9cfbfb760, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1263,7 +1111,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 430, y: -90} - m_SizeDelta: {x: 138, y: 143.06} + m_SizeDelta: {x: 155, y: 149} m_Pivot: {x: 0, y: 1} --- !u!222 &8614631914898852519 CanvasRenderer: @@ -1293,7 +1141,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1d2db4e9846d05d419defbf06567458d, type: 3} + m_Sprite: {fileID: 21300000, guid: 0eb8324995d9a48268ee748a23e0231a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Forest/Assets/Art/UI/Prefab/UIUserAgreement.prefab b/Forest/Assets/Art/UI/Prefab/UIUserAgreement.prefab index 7bb22e7..1b3b246 100644 --- a/Forest/Assets/Art/UI/Prefab/UIUserAgreement.prefab +++ b/Forest/Assets/Art/UI/Prefab/UIUserAgreement.prefab @@ -694,7 +694,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 51} - m_SizeDelta: {x: 300, y: 180} + m_SizeDelta: {x: 308.57, y: 233.42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4211210584494815950 CanvasRenderer: @@ -724,7 +724,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6f21603ec67808046b2b56e44c30e626, type: 3} + m_Sprite: {fileID: 21300000, guid: 50a04592501344405948b77d73a61b91, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -999,7 +999,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 51} - m_SizeDelta: {x: 300, y: 180} + m_SizeDelta: {x: 308.57, y: 233.42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2508857861759114309 CanvasRenderer: @@ -1029,7 +1029,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3c7c717687eede34db684ef4e2e35b07, type: 3} + m_Sprite: {fileID: 21300000, guid: d5c87d6905cca4400ad7e2576a7bc679, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Forest/Assets/Audio/Music/BGM1.mp3 b/Forest/Assets/Audio/Music/BGM1.mp3 index 8217057..975fb33 100644 Binary files a/Forest/Assets/Audio/Music/BGM1.mp3 and b/Forest/Assets/Audio/Music/BGM1.mp3 differ diff --git a/Forest/Assets/Audio/Music/BGM1.mp3.meta b/Forest/Assets/Audio/Music/BGM1.mp3.meta index 488c70d..10cc232 100644 --- a/Forest/Assets/Audio/Music/BGM1.mp3.meta +++ b/Forest/Assets/Audio/Music/BGM1.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6f782a2f073b10a468f727443298d839 +guid: 33fec89425ac54d318ce785642407892 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Forest/Assets/Audio/Music/BGM2.mp3 b/Forest/Assets/Audio/Music/BGM2.mp3 new file mode 100644 index 0000000..4716a21 Binary files /dev/null and b/Forest/Assets/Audio/Music/BGM2.mp3 differ diff --git a/Forest/Assets/Audio/Music/BGM2.mp3.meta b/Forest/Assets/Audio/Music/BGM2.mp3.meta new file mode 100644 index 0000000..8eff982 --- /dev/null +++ b/Forest/Assets/Audio/Music/BGM2.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 5e2a3222775e14fcf9737b1605454a21 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Forest/Assets/Scripts/Framework/Manager/AudioManager.cs b/Forest/Assets/Scripts/Framework/Manager/AudioManager.cs index 659a0b5..fa48aed 100644 --- a/Forest/Assets/Scripts/Framework/Manager/AudioManager.cs +++ b/Forest/Assets/Scripts/Framework/Manager/AudioManager.cs @@ -13,9 +13,13 @@ namespace Framework.Manager public float SoundVolume; public AudioClip BGM; + public AudioClip BGMInLevel; + + private Dictionary _soundDic; private SingleAudio _soundAudio; + private SingleAudio _bgmAudio; public void Start() { @@ -39,6 +43,8 @@ namespace Framework.Manager { BGM = await AssetManager.Instance.LoadAssetAsync( string.Format(Framework.Constants.Constants.MusicPath, "BGM1")); + BGMInLevel = await AssetManager.Instance.LoadAssetAsync( + string.Format(Framework.Constants.Constants.MusicPath, "BGM2")); PreLoadAudio("S_Btn", await AssetManager.Instance.LoadAssetAsync( string.Format(Framework.Constants.Constants.SoundPath, "S_Btn"))); @@ -116,12 +122,22 @@ namespace Framework.Manager { AudioUnityMgr.Instance.SetVolumeEnable(isEnable); } - - public int PlayMusic(AudioType type, AudioClip clip, UnityAudio audioData, + + + public void PlayMusic(AudioType type, AudioClip clip, UnityAudio audioData, Transform trans = null, Vector3 pos = new()) { - AudioUnityMgr.Instance.IgnoreDuplicateSounds = true; - return AudioUnityMgr.Instance.PlayAudio(type, clip, audioData, trans, pos); + if (_bgmAudio == null) + { + AudioUnityMgr.Instance.IgnoreDuplicateSounds = true; + var bgmID = AudioUnityMgr.Instance.PlayAudio(type, clip, audioData, trans, pos); + _bgmAudio = AudioUnityMgr.Instance.GetBgmAudio(bgmID); + } + else + { + _bgmAudio.audioSource.clip = clip; + _bgmAudio.Play(); + } } public SingleAudio PlaySound(AudioType type, string audio, UnityAudio audioData) diff --git a/Forest/Assets/Scripts/Gameplay/Game/GameStateStart.cs b/Forest/Assets/Scripts/Gameplay/Game/GameStateStart.cs index 38b6071..b7765f4 100644 --- a/Forest/Assets/Scripts/Gameplay/Game/GameStateStart.cs +++ b/Forest/Assets/Scripts/Gameplay/Game/GameStateStart.cs @@ -27,7 +27,7 @@ namespace Gameplay.Game { UIManager.Instance.CloseAllUI(true); //TODO 特效 - GfxManager.Instance.ReturnGfxObj("gfx_character", true); + //GfxManager.Instance.ReturnGfxObj("gfx_character", true); GfxManager.Instance.ReturnGfxObj("gfx_selectlevel", true); } } diff --git a/Forest/Assets/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs b/Forest/Assets/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs index 1316a83..e501f88 100644 --- a/Forest/Assets/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs +++ b/Forest/Assets/Scripts/Gameplay/LoadingExecutor/GameStartLoadingExecutor.cs @@ -47,7 +47,7 @@ namespace Gameplay.LoadingExecutor private async UniTask InitGfx() { //TODO 加载特效 - await GfxManager.Instance.PreLoadGfx("gfx_character"); + //await GfxManager.Instance.PreLoadGfx("gfx_character"); await GfxManager.Instance.PreLoadGfx("gfx_selectlevel"); } diff --git a/Forest/Assets/Scripts/Gameplay/LoadingExecutor/LevelLoadingExecutor.cs b/Forest/Assets/Scripts/Gameplay/LoadingExecutor/LevelLoadingExecutor.cs index 4bd158b..403349a 100644 --- a/Forest/Assets/Scripts/Gameplay/LoadingExecutor/LevelLoadingExecutor.cs +++ b/Forest/Assets/Scripts/Gameplay/LoadingExecutor/LevelLoadingExecutor.cs @@ -1,10 +1,13 @@ +using PhxhSDK; using Framework.UI; using Gameplay.Level; using Gameplay.Manager; +using Framework.Manager; using Framework.Constants; using Cysharp.Threading.Tasks; using UnityEngine.SceneManagement; using UnityEngine.AddressableAssets; +using Constants = Framework.Constants.Constants; namespace Gameplay.LoadingExecutor { @@ -53,6 +56,7 @@ namespace Gameplay.LoadingExecutor protected override void _OnEnd() { LevelManager.Instance.ReportEnterLevel(); + AudioManager.Instance.PlayMusic(AudioType.MUSIC, AudioManager.Instance.BGMInLevel, new UnityAudio(true)); } } } \ No newline at end of file diff --git a/Forest/Assets/Scripts/Gameplay/UI/StartPanel/UIMainPanelController.cs b/Forest/Assets/Scripts/Gameplay/UI/StartPanel/UIMainPanelController.cs index e25480e..2182386 100644 --- a/Forest/Assets/Scripts/Gameplay/UI/StartPanel/UIMainPanelController.cs +++ b/Forest/Assets/Scripts/Gameplay/UI/StartPanel/UIMainPanelController.cs @@ -53,7 +53,7 @@ public class UIMainPanelController : UIWindow private async void InitGfx() { - _gfxCharacter = await GfxManager.Instance.LoadGfx("gfx_character"); + //_gfxCharacter = await GfxManager.Instance.LoadGfx("gfx_character"); } private void HideGfx()