diff --git a/Assets/Resources/Images/home/btn_qxmenu_battle_n 1.png b/Assets/Resources/Images/home/btn_qxmenu_battle_n 1.png new file mode 100644 index 00000000..9e9835c1 Binary files /dev/null and b/Assets/Resources/Images/home/btn_qxmenu_battle_n 1.png differ diff --git a/Assets/Resources/Images/home/btn_qxmenu_training_n.png.meta b/Assets/Resources/Images/home/btn_qxmenu_battle_n 1.png.meta similarity index 95% rename from Assets/Resources/Images/home/btn_qxmenu_training_n.png.meta rename to Assets/Resources/Images/home/btn_qxmenu_battle_n 1.png.meta index 42c06924..709a3dc2 100644 --- a/Assets/Resources/Images/home/btn_qxmenu_training_n.png.meta +++ b/Assets/Resources/Images/home/btn_qxmenu_battle_n 1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 35f4ad505527ce64fb46c3c10274196b +guid: 4beffd148bef83342942f330fcea6ec0 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -61,7 +61,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -73,7 +73,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -85,7 +85,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -97,7 +97,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Resources/Images/home/btn_qxmenu_battle_n.png b/Assets/Resources/Images/home/btn_qxmenu_battle_n.png deleted file mode 100644 index 60c5f80b..00000000 Binary files a/Assets/Resources/Images/home/btn_qxmenu_battle_n.png and /dev/null differ diff --git a/Assets/Resources/Images/home/btn_qxmenu_battle_s 1.png b/Assets/Resources/Images/home/btn_qxmenu_battle_s 1.png new file mode 100644 index 00000000..98a3fd82 Binary files /dev/null and b/Assets/Resources/Images/home/btn_qxmenu_battle_s 1.png differ diff --git a/Assets/Resources/Images/home/btn_qxmenu_battle_n.png.meta b/Assets/Resources/Images/home/btn_qxmenu_battle_s 1.png.meta similarity index 95% rename from Assets/Resources/Images/home/btn_qxmenu_battle_n.png.meta rename to Assets/Resources/Images/home/btn_qxmenu_battle_s 1.png.meta index 85663511..6eb90c05 100644 --- a/Assets/Resources/Images/home/btn_qxmenu_battle_n.png.meta +++ b/Assets/Resources/Images/home/btn_qxmenu_battle_s 1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1e7f7d2e91777fb4499bee4ebfbafb61 +guid: 13fab43dee19bb048a6cf1654411b654 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -61,7 +61,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -73,7 +73,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -85,7 +85,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -97,7 +97,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Resources/Images/home/btn_qxmenu_match_n.png b/Assets/Resources/Images/home/btn_qxmenu_match_n 1.png similarity index 80% rename from Assets/Resources/Images/home/btn_qxmenu_match_n.png rename to Assets/Resources/Images/home/btn_qxmenu_match_n 1.png index 8ba28cc9..489ec2d4 100644 Binary files a/Assets/Resources/Images/home/btn_qxmenu_match_n.png and b/Assets/Resources/Images/home/btn_qxmenu_match_n 1.png differ diff --git a/Assets/Resources/Images/home/btn_qxmenu_training_s.png.meta b/Assets/Resources/Images/home/btn_qxmenu_match_n 1.png.meta similarity index 95% rename from Assets/Resources/Images/home/btn_qxmenu_training_s.png.meta rename to Assets/Resources/Images/home/btn_qxmenu_match_n 1.png.meta index ba41a909..00e9bb7a 100644 --- a/Assets/Resources/Images/home/btn_qxmenu_training_s.png.meta +++ b/Assets/Resources/Images/home/btn_qxmenu_match_n 1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1a34cd6348bc7044e9622fe9e1709310 +guid: 12ac4c950140be44db4bb91e7e703092 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -61,7 +61,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -73,7 +73,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -85,7 +85,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -97,7 +97,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Resources/Images/home/btn_qxmenu_match_s 1.png b/Assets/Resources/Images/home/btn_qxmenu_match_s 1.png new file mode 100644 index 00000000..7154a474 Binary files /dev/null and b/Assets/Resources/Images/home/btn_qxmenu_match_s 1.png differ diff --git a/Assets/Resources/Images/home/btn_qxmenu_match_n.png.meta b/Assets/Resources/Images/home/btn_qxmenu_match_s 1.png.meta similarity index 95% rename from Assets/Resources/Images/home/btn_qxmenu_match_n.png.meta rename to Assets/Resources/Images/home/btn_qxmenu_match_s 1.png.meta index b17eb6b9..53f36148 100644 --- a/Assets/Resources/Images/home/btn_qxmenu_match_n.png.meta +++ b/Assets/Resources/Images/home/btn_qxmenu_match_s 1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8f1b1698f872ea742b915f87ad5e5b8e +guid: 8b19615d7efc29d4ca15f25dfccbbd02 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -61,7 +61,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -73,7 +73,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -85,7 +85,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -97,7 +97,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Resources/Images/home/btn_qxmenu_routes_n 1.png b/Assets/Resources/Images/home/btn_qxmenu_routes_n 1.png new file mode 100644 index 00000000..412c02ce Binary files /dev/null and b/Assets/Resources/Images/home/btn_qxmenu_routes_n 1.png differ diff --git a/Assets/Resources/Images/home/btn_qxmenu_routes_n 1.png.meta b/Assets/Resources/Images/home/btn_qxmenu_routes_n 1.png.meta new file mode 100644 index 00000000..c5268db7 --- /dev/null +++ b/Assets/Resources/Images/home/btn_qxmenu_routes_n 1.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: c8bc661a09372e34984fcf6ef5fa67b1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + 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: 1024 + 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: 1024 + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/home/btn_qxmenu_routes_s 1.png b/Assets/Resources/Images/home/btn_qxmenu_routes_s 1.png new file mode 100644 index 00000000..744b353c Binary files /dev/null and b/Assets/Resources/Images/home/btn_qxmenu_routes_s 1.png differ diff --git a/Assets/Resources/Images/home/btn_qxmenu_routes_s 1.png.meta b/Assets/Resources/Images/home/btn_qxmenu_routes_s 1.png.meta new file mode 100644 index 00000000..4435c81e --- /dev/null +++ b/Assets/Resources/Images/home/btn_qxmenu_routes_s 1.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: c1b1f17a28c9ef04e8d3e93e363638ea +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + 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: 1024 + 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: 1024 + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/home/btn_qxmenu_training_n.png b/Assets/Resources/Images/home/btn_qxmenu_training_n 1.png similarity index 91% rename from Assets/Resources/Images/home/btn_qxmenu_training_n.png rename to Assets/Resources/Images/home/btn_qxmenu_training_n 1.png index 07fa647c..4e4432bb 100644 Binary files a/Assets/Resources/Images/home/btn_qxmenu_training_n.png and b/Assets/Resources/Images/home/btn_qxmenu_training_n 1.png differ diff --git a/Assets/Resources/Images/home/btn_qxmenu_training_n 1.png.meta b/Assets/Resources/Images/home/btn_qxmenu_training_n 1.png.meta new file mode 100644 index 00000000..35450a0f --- /dev/null +++ b/Assets/Resources/Images/home/btn_qxmenu_training_n 1.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 75fd1c73de89d8d4d95cf8f2ddd3a1b1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + 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: 1024 + 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: 1024 + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/home/btn_qxmenu_training_s.png b/Assets/Resources/Images/home/btn_qxmenu_training_s 1.png similarity index 93% rename from Assets/Resources/Images/home/btn_qxmenu_training_s.png rename to Assets/Resources/Images/home/btn_qxmenu_training_s 1.png index 9850f824..7620f796 100644 Binary files a/Assets/Resources/Images/home/btn_qxmenu_training_s.png and b/Assets/Resources/Images/home/btn_qxmenu_training_s 1.png differ diff --git a/Assets/Resources/Images/home/btn_qxmenu_training_s 1.png.meta b/Assets/Resources/Images/home/btn_qxmenu_training_s 1.png.meta new file mode 100644 index 00000000..b3b7f61e --- /dev/null +++ b/Assets/Resources/Images/home/btn_qxmenu_training_s 1.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 4cdad70a33ccc43499e25fba179cc14e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + 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: 1024 + 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: 1024 + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/icon_more.png b/Assets/Resources/Images/icon_more.png new file mode 100644 index 00000000..15c2f2ce Binary files /dev/null and b/Assets/Resources/Images/icon_more.png differ diff --git a/Assets/Resources/Images/icon_more.png.meta b/Assets/Resources/Images/icon_more.png.meta new file mode 100644 index 00000000..5e073535 --- /dev/null +++ b/Assets/Resources/Images/icon_more.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 0dc9bb5d6907b5e4895da242c930994c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + 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: 1024 + 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: 1024 + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/icon_more_left_pc.png b/Assets/Resources/Images/icon_more_left_pc.png new file mode 100644 index 00000000..36635b71 Binary files /dev/null and b/Assets/Resources/Images/icon_more_left_pc.png differ diff --git a/Assets/Resources/Images/icon_more_left_pc.png.meta b/Assets/Resources/Images/icon_more_left_pc.png.meta new file mode 100644 index 00000000..1cb7dff5 --- /dev/null +++ b/Assets/Resources/Images/icon_more_left_pc.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 7a067f8f2bf326f45bdd77e36622fdaa +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + 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: 1024 + 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: 1024 + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/icon_more_right_pc.png b/Assets/Resources/Images/icon_more_right_pc.png new file mode 100644 index 00000000..44974c03 Binary files /dev/null and b/Assets/Resources/Images/icon_more_right_pc.png differ diff --git a/Assets/Resources/Images/icon_more_right_pc.png.meta b/Assets/Resources/Images/icon_more_right_pc.png.meta new file mode 100644 index 00000000..2bbe1f0b --- /dev/null +++ b/Assets/Resources/Images/icon_more_right_pc.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: fda3e8841698762438cc9c81a7c66884 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + 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: 1024 + 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: 1024 + 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Control/PFUIPageHelper.prefab b/Assets/Resources/UI/Control/PFUIPageHelper.prefab index 58bea732..aa178ec9 100644 --- a/Assets/Resources/UI/Control/PFUIPageHelper.prefab +++ b/Assets/Resources/UI/Control/PFUIPageHelper.prefab @@ -76,6 +76,84 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &1021242704133852924 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4930729042556702771} + - component: {fileID: 5079657134785809181} + - component: {fileID: 1500518290561956110} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4930729042556702771 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1021242704133852924} + 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_Children: [] + m_Father: {fileID: 8700362363871923907} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5079657134785809181 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1021242704133852924} + m_CullTransparentMesh: 0 +--- !u!114 &1500518290561956110 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1021242704133852924} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: --- !u!1 &1257987411517951836 GameObject: m_ObjectHideFlags: 0 @@ -95,7 +173,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4107357031646952394 RectTransform: m_ObjectHideFlags: 0 @@ -110,11 +188,11 @@ RectTransform: - {fileID: 66053944925530399} - {fileID: 187019833656171477} m_Father: {fileID: 7516480307603888653} - m_RootOrder: 1 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -16, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 18, y: -17.5} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1266802645795648319 @@ -132,7 +210,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1257987411517951836} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -275,7 +353,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c7b4ee45d45bd564fb26b1f50cd259c8, type: 3} + m_Sprite: {fileID: 21300000, guid: 7a067f8f2bf326f45bdd77e36622fdaa, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -298,6 +376,140 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: radius: 6 +--- !u!1 &1992302861897772473 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8700362363871923907} + - component: {fileID: 1795165362771482403} + - component: {fileID: 8545000119509962194} + - component: {fileID: 871500630793306843} + - component: {fileID: 1637221364899166832} + m_Layer: 5 + m_Name: More + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8700362363871923907 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1992302861897772473} + 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_Children: + - {fileID: 6300682064666106192} + - {fileID: 4930729042556702771} + m_Father: {fileID: 7516480307603888653} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 18, y: -17.5} + m_SizeDelta: {x: 32, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1795165362771482403 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1992302861897772473} + m_CullTransparentMesh: 0 +--- !u!114 &8545000119509962194 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1992302861897772473} + 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: 0.25490198, g: 0.25882354, b: 0.31764707, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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!114 &871500630793306843 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1992302861897772473} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8545000119509962194} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1637221364899166832 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1992302861897772473} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 6 --- !u!1 &2051396510868188821 GameObject: m_ObjectHideFlags: 0 @@ -395,7 +607,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7212653897977481334 RectTransform: m_ObjectHideFlags: 0 @@ -410,11 +622,11 @@ RectTransform: - {fileID: 5047602277775650729} - {fileID: 4926110974669644413} m_Father: {fileID: 7516480307603888653} - m_RootOrder: 0 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 16, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 18, y: -17.5} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3958799833110988912 @@ -432,7 +644,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2646763052420762654} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -578,7 +790,7 @@ RectTransform: m_Children: - {fileID: 4394708383974968133} m_Father: {fileID: 7516480307603888653} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -702,12 +914,12 @@ RectTransform: m_Children: - {fileID: 4956049655466877929} m_Father: {fileID: 7516480307603888653} - m_RootOrder: 2 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 42.00003, y: 0} - m_SizeDelta: {x: -84.00003, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &6827586546191631464 CanvasRenderer: @@ -869,7 +1081,7 @@ RectTransform: m_Children: - {fileID: 9173309558647050282} m_Father: {fileID: 7516480307603888653} - m_RootOrder: 3 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -1210,7 +1422,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 170d3b125451c4a4099b2f16a84e9b60, type: 3} + m_Sprite: {fileID: 21300000, guid: fda3e8841698762438cc9c81a7c66884, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1264,18 +1476,19 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7212653897977481334} - - {fileID: 4107357031646952394} - {fileID: 4123486973270985093} - {fileID: 7093466502665988106} - {fileID: 7339168634898813708} + - {fileID: 7212653897977481334} + - {fileID: 4107357031646952394} + - {fileID: 8700362363871923907} m_Father: {fileID: 0} m_RootOrder: 0 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: 38} - m_SizeDelta: {x: 432, y: 36} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1332217918261500908 CanvasRenderer: @@ -1356,8 +1569,85 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 284f6a5c33c31f14da608779c7797369, type: 3} m_Name: m_EditorClassIdentifier: - content: {fileID: 0} - preBtn: {fileID: 2646763052420762654} - nextBtn: {fileID: 1257987411517951836} - btnPrefab: {fileID: 6498461380654085756, guid: abd1b6cac1faa6241a8080963f2b7c23, + content: {fileID: 4956049655466877929} + moreBtnPrefab: {fileID: 1992302861897772473} + preBtnPrefab: {fileID: 2646763052420762654} + nextBtnPrefab: {fileID: 1257987411517951836} + btnPrefab: {fileID: 2703115807415928270, guid: 64eb7866e1fcd6346a1599f0bf994ac1, type: 3} + _pageMaxTotal: 9 + _pageSpace: 4 +--- !u!1 &8980948388945807791 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6300682064666106192} + - component: {fileID: 8805982739088833149} + - component: {fileID: 8509565921328650516} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6300682064666106192 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8980948388945807791} + 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_Children: [] + m_Father: {fileID: 8700362363871923907} + m_RootOrder: 0 + 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: 0} + m_SizeDelta: {x: 20, y: 4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8805982739088833149 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8980948388945807791} + m_CullTransparentMesh: 0 +--- !u!114 &8509565921328650516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8980948388945807791} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0dc9bb5d6907b5e4895da242c930994c, 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 diff --git a/Assets/Resources/UI/Control/PFUIRoundButton.prefab b/Assets/Resources/UI/Control/PFUIRoundButton.prefab index b8bc4f0b..6e3573ca 100644 --- a/Assets/Resources/UI/Control/PFUIRoundButton.prefab +++ b/Assets/Resources/UI/Control/PFUIRoundButton.prefab @@ -91,6 +91,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &6238379916544863262 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Control/PFUIPageBtn.prefab b/Assets/Resources/UI/Control/PfUIPageButton.prefab similarity index 75% rename from Assets/Resources/UI/Control/PFUIPageBtn.prefab rename to Assets/Resources/UI/Control/PfUIPageButton.prefab index 45cddc69..9ea087d0 100644 --- a/Assets/Resources/UI/Control/PFUIPageBtn.prefab +++ b/Assets/Resources/UI/Control/PfUIPageButton.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4004685694961810270 +--- !u!1 &2703115807415928270 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,197 +8,32 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8677947232269612421} - - component: {fileID: 8458396860255552010} - - component: {fileID: 4317101118078111407} - - component: {fileID: 2070059875145325856} + - component: {fileID: 2731562967549943979} + - component: {fileID: 921012415008074364} + - component: {fileID: 6362874281019642143} + - component: {fileID: 4803893426726944522} + - component: {fileID: 9073948061142456915} + - component: {fileID: -2671517586371065505} m_Layer: 5 - m_Name: Image + m_Name: PfUIPageButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8677947232269612421 +--- !u!224 &2731562967549943979 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4004685694961810270} - 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_Children: [] - m_Father: {fileID: 6504393824051335961} - m_RootOrder: 0 - 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: 0} - m_SizeDelta: {x: 32, y: 32} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8458396860255552010 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4004685694961810270} - m_CullTransparentMesh: 0 ---- !u!114 &4317101118078111407 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4004685694961810270} - 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: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - 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!114 &2070059875145325856 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4004685694961810270} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} - m_Name: - m_EditorClassIdentifier: - radius: 6 ---- !u!1 &5233097001461701591 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7293663517835848793} - - component: {fileID: 4011317909851338225} - - component: {fileID: 1152582558003027818} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7293663517835848793 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5233097001461701591} - 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_Children: [] - m_Father: {fileID: 6504393824051335961} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4011317909851338225 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5233097001461701591} - m_CullTransparentMesh: 0 ---- !u!114 &1152582558003027818 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5233097001461701591} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 56ffaecccce0ae34fa083c91bcabecdb, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 1 ---- !u!1 &6498461380654085756 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6504393824051335961} - - component: {fileID: 8314874553444194766} - - component: {fileID: 2873632742725853869} - - component: {fileID: 4397362811858750648} - - component: {fileID: 162527733359028705} - m_Layer: 5 - m_Name: PFUIPageBtn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6504393824051335961 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6498461380654085756} + m_GameObject: {fileID: 2703115807415928270} 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_Children: - - {fileID: 8677947232269612421} - - {fileID: 7293663517835848793} + - {fileID: 559021075795379767} + - {fileID: 1915162202116644843} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -207,21 +42,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8314874553444194766 +--- !u!222 &921012415008074364 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6498461380654085756} + m_GameObject: {fileID: 2703115807415928270} m_CullTransparentMesh: 0 ---- !u!114 &2873632742725853869 +--- !u!114 &6362874281019642143 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6498461380654085756} + m_GameObject: {fileID: 2703115807415928270} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -244,13 +79,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &4397362811858750648 +--- !u!114 &4803893426726944522 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6498461380654085756} + m_GameObject: {fileID: 2703115807415928270} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} @@ -283,17 +118,197 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 2873632742725853869} + m_TargetGraphic: {fileID: 6362874281019642143} m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!114 &162527733359028705 +--- !u!114 &9073948061142456915 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6498461380654085756} + m_GameObject: {fileID: 2703115807415928270} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 6 +--- !u!114 &-2671517586371065505 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2703115807415928270} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c49931be379e5a448a6f107bb2bf94f3, type: 3} + m_Name: + m_EditorClassIdentifier: + pageIndexText: {fileID: 8093674457981971672} + clickImage: {fileID: 5206101626883361004} +--- !u!1 &3977795903027636325 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1915162202116644843} + - component: {fileID: 5190215852207097411} + - component: {fileID: 8093674457981971672} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1915162202116644843 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3977795903027636325} + 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_Children: [] + m_Father: {fileID: 2731562967549943979} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5190215852207097411 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3977795903027636325} + m_CullTransparentMesh: 0 +--- !u!114 &8093674457981971672 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3977795903027636325} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 56ffaecccce0ae34fa083c91bcabecdb, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 1 +--- !u!1 &5206101626883361004 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 559021075795379767} + - component: {fileID: 778571407955194296} + - component: {fileID: 4919379035689254173} + - component: {fileID: 7139927031628541586} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &559021075795379767 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5206101626883361004} + 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_Children: [] + m_Father: {fileID: 2731562967549943979} + m_RootOrder: 0 + 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: 0} + m_SizeDelta: {x: 32, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &778571407955194296 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5206101626883361004} + m_CullTransparentMesh: 0 +--- !u!114 &4919379035689254173 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5206101626883361004} + 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: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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!114 &7139927031628541586 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5206101626883361004} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} diff --git a/Assets/Resources/UI/Control/PFUIPageBtn.prefab.meta b/Assets/Resources/UI/Control/PfUIPageButton.prefab.meta similarity index 74% rename from Assets/Resources/UI/Control/PFUIPageBtn.prefab.meta rename to Assets/Resources/UI/Control/PfUIPageButton.prefab.meta index bd878a31..de555919 100644 --- a/Assets/Resources/UI/Control/PFUIPageBtn.prefab.meta +++ b/Assets/Resources/UI/Control/PfUIPageButton.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: abd1b6cac1faa6241a8080963f2b7c23 +guid: 64eb7866e1fcd6346a1599f0bf994ac1 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/UI/Prefab/Panel/GameRoomListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/GameRoomListPanel.prefab index 73edbe1a..7b0c09c0 100644 --- a/Assets/Resources/UI/Prefab/Panel/GameRoomListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/GameRoomListPanel.prefab @@ -5359,7 +5359,7 @@ RectTransform: - {fileID: 1308895345897497774} - {fileID: 1308895344764544953} m_Father: {fileID: 1308895345420789407} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5569,7 +5569,6 @@ GameObject: - component: {fileID: 1308895345420789378} - component: {fileID: 1308895345420789377} - component: {fileID: 1308895345420789376} - - component: {fileID: 2710460057686547184} m_Layer: 5 m_Name: GameRoom m_TagString: Untagged @@ -5588,6 +5587,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 8290794810840425983} - {fileID: 1308895344877653862} m_Father: {fileID: 7392823680698472122} m_RootOrder: 0 @@ -5659,22 +5659,6 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 ---- !u!114 &2710460057686547184 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1308895345420789406} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c114c143939361e41bd29f69f311e91c, type: 3} - m_Name: - m_EditorClassIdentifier: - _rectTransform: {fileID: 1308895344428235598} - _searchInputField: {fileID: 756626940907279346} - _searchBtn: {fileID: 8721557410508650352} - _dataLength: 0 --- !u!1 &1308895345897497773 GameObject: m_ObjectHideFlags: 0 @@ -8659,6 +8643,80 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 4672 +--- !u!1 &1892454092527100434 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7306599456082712020} + - component: {fileID: 5141775208382325956} + - component: {fileID: 2140108513240659661} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7306599456082712020 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1892454092527100434} + 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_Children: [] + m_Father: {fileID: 8290794810840425983} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 19.5} + m_SizeDelta: {x: 0, y: -39} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5141775208382325956 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1892454092527100434} + m_CullTransparentMesh: 0 +--- !u!114 &2140108513240659661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1892454092527100434} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 636f568c33e7a03409ae710a1e44e945, 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 &2001654673698708589 GameObject: m_ObjectHideFlags: 0 @@ -17067,6 +17125,98 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: radius: 5 +--- !u!1 &4446120132528940546 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4369751382005152061} + - component: {fileID: 4788990814177558079} + - component: {fileID: 2909229535520408958} + - component: {fileID: 2815372238255488121} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4369751382005152061 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4446120132528940546} + 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_Children: [] + m_Father: {fileID: 8290794810840425983} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -130} + m_SizeDelta: {x: 0, y: 19} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &4788990814177558079 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4446120132528940546} + m_CullTransparentMesh: 0 +--- !u!114 &2909229535520408958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4446120132528940546} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Found Nothing +--- !u!114 &2815372238255488121 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4446120132528940546} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1 &4456688333302464826 GameObject: m_ObjectHideFlags: 0 @@ -17988,6 +18138,52 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4686927349675230379 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8290794810840425983} + - component: {fileID: 3361694293504273285} + m_Layer: 5 + m_Name: Error + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8290794810840425983 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4686927349675230379} + 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_Children: + - {fileID: 7306599456082712020} + - {fileID: 4369751382005152061} + m_Father: {fileID: 1308895345420789407} + m_RootOrder: 0 + 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: 0} + m_SizeDelta: {x: 148, y: 149} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3361694293504273285 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4686927349675230379} + m_CullTransparentMesh: 0 --- !u!1 &4758154209360874641 GameObject: m_ObjectHideFlags: 0 @@ -19803,7 +19999,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -205.5, y: 192.7} + m_AnchoredPosition: {x: -205.5, y: 192.7002} m_SizeDelta: {x: 291, y: 265.32333} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &869953156436115466 @@ -32413,7 +32609,7 @@ MonoBehaviour: _rectTransform: {fileID: 1308895344428235598} _searchInputField: {fileID: 756626940907279346} _searchBtn: {fileID: 8721557410508650352} - _dataLength: 0 + _noDataFound: {fileID: 4686927349675230379} --- !u!1 &8135655826908012392 GameObject: m_ObjectHideFlags: 0 @@ -37296,11 +37492,21 @@ PrefabInstance: propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 4956049655466877929, guid: f1906df0b7fa2614abca6d1c34d78699, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4956049655466877929, guid: f1906df0b7fa2614abca6d1c34d78699, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 4956049655466877929, guid: f1906df0b7fa2614abca6d1c34d78699, + type: 3} + propertyPath: m_SizeDelta.y + value: -1 + objectReference: {fileID: 0} - target: {fileID: 5013205945664285046, guid: f1906df0b7fa2614abca6d1c34d78699, type: 3} propertyPath: m_Material @@ -37311,6 +37517,16 @@ PrefabInstance: propertyPath: m_Material value: objectReference: {fileID: 0} + - target: {fileID: 6728200308319686785, guid: f1906df0b7fa2614abca6d1c34d78699, + type: 3} + propertyPath: m_Vertical + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6728200308319686785, guid: f1906df0b7fa2614abca6d1c34d78699, + type: 3} + propertyPath: m_Horizontal + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7516480307603888653, guid: f1906df0b7fa2614abca6d1c34d78699, type: 3} propertyPath: m_Pivot.x @@ -37349,7 +37565,7 @@ PrefabInstance: - target: {fileID: 7516480307603888653, guid: f1906df0b7fa2614abca6d1c34d78699, type: 3} propertyPath: m_SizeDelta.x - value: 432 + value: 436 objectReference: {fileID: 0} - target: {fileID: 7516480307603888653, guid: f1906df0b7fa2614abca6d1c34d78699, type: 3} @@ -37416,11 +37632,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8003732075960221418, guid: f1906df0b7fa2614abca6d1c34d78699, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} - target: {fileID: 8271232128091925839, guid: f1906df0b7fa2614abca6d1c34d78699, type: 3} propertyPath: m_ChildAlignment value: 4 objectReference: {fileID: 0} + - target: {fileID: 8294129353665925864, guid: f1906df0b7fa2614abca6d1c34d78699, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 8545000119509962194, guid: f1906df0b7fa2614abca6d1c34d78699, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} - target: {fileID: 8918320416477131519, guid: f1906df0b7fa2614abca6d1c34d78699, type: 3} propertyPath: m_Name @@ -37428,15 +37659,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f1906df0b7fa2614abca6d1c34d78699, type: 3} ---- !u!224 &8659547187054224908 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7516480307603888653, guid: f1906df0b7fa2614abca6d1c34d78699, - type: 3} - m_PrefabInstance: {fileID: 1180791158023617537} - m_PrefabAsset: {fileID: 0} --- !u!224 &6099122571648147432 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4956049655466877929, guid: f1906df0b7fa2614abca6d1c34d78699, type: 3} m_PrefabInstance: {fileID: 1180791158023617537} m_PrefabAsset: {fileID: 0} +--- !u!224 &8659547187054224908 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7516480307603888653, guid: f1906df0b7fa2614abca6d1c34d78699, + type: 3} + m_PrefabInstance: {fileID: 1180791158023617537} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab b/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab index 3faaa2ee..4afc4988 100644 --- a/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab @@ -64,7 +64,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 35f4ad505527ce64fb46c3c10274196b, type: 3} + m_Sprite: {fileID: 21300000, guid: 75fd1c73de89d8d4d95cf8f2ddd3a1b1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -105,6 +105,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4724252519165528491} + - {fileID: 2081574943683038003} - {fileID: 9029656237557237746} m_Father: {fileID: 3931130817493022313} m_RootOrder: 2 @@ -629,6 +630,80 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u2014\u2014" +--- !u!1 &1392228245872996477 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 648703970238019564} + - component: {fileID: 7835552617317202405} + - component: {fileID: 5357189870693646909} + m_Layer: 5 + m_Name: ImageL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &648703970238019564 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1392228245872996477} + 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_Children: [] + m_Father: {fileID: 2115740915638175675} + m_RootOrder: 1 + 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: 0} + m_SizeDelta: {x: 258, y: 215} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &7835552617317202405 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1392228245872996477} + m_CullTransparentMesh: 0 +--- !u!114 &5357189870693646909 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1392228245872996477} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 13fab43dee19bb048a6cf1654411b654, 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 &1412990830084217592 GameObject: m_ObjectHideFlags: 0 @@ -1532,6 +1607,80 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1 &2749403928473386431 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3484991497697638175} + - component: {fileID: 1259719031892208028} + - component: {fileID: 6761480856601321833} + m_Layer: 5 + m_Name: ImageL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3484991497697638175 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2749403928473386431} + 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_Children: [] + m_Father: {fileID: 3931130818032720428} + m_RootOrder: 1 + 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: 0} + m_SizeDelta: {x: 258, y: 450} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &1259719031892208028 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2749403928473386431} + m_CullTransparentMesh: 0 +--- !u!114 &6761480856601321833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2749403928473386431} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c1b1f17a28c9ef04e8d3e93e363638ea, 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 &2769430191453697958 GameObject: m_ObjectHideFlags: 0 @@ -1610,7 +1759,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8344415755716207944 RectTransform: m_ObjectHideFlags: 0 @@ -1623,12 +1772,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4007984775395188520} - m_RootOrder: 1 + m_RootOrder: 2 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: -501} - m_SizeDelta: {x: 154, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 129, y: 37} + m_SizeDelta: {x: 218, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8557832133597349620 CanvasRenderer: @@ -1659,10 +1808,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} - m_FontSize: 36 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 2 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1754,6 +1903,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 742838098299125995} + - {fileID: 6293084362941955967} - {fileID: 8344415755716207944} m_Father: {fileID: 3931130817493022313} m_RootOrder: 1 @@ -2375,7 +2525,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3931130817687806827 RectTransform: m_ObjectHideFlags: 0 @@ -2388,11 +2538,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3931130818032720428} - m_RootOrder: 1 + m_RootOrder: 2 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: -501} + m_AnchoredPosition: {x: 0, y: -419} m_SizeDelta: {x: 154, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3931130817687806821 @@ -2424,10 +2574,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} - m_FontSize: 36 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 2 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -2480,6 +2630,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5373889390259051532} + - {fileID: 3484991497697638175} - {fileID: 3931130817687806827} m_Father: {fileID: 3931130817493022313} m_RootOrder: 0 @@ -2618,6 +2769,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4004284971853201955} m_CullTransparentMesh: 0 +--- !u!1 &4174585961340097453 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2081574943683038003} + - component: {fileID: 3631166882619842000} + - component: {fileID: 8879672753710591573} + m_Layer: 5 + m_Name: ImageL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2081574943683038003 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4174585961340097453} + 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_Children: [] + m_Father: {fileID: 4160894300255257250} + m_RootOrder: 1 + 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: 0} + m_SizeDelta: {x: 258, y: 450} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &3631166882619842000 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4174585961340097453} + m_CullTransparentMesh: 0 +--- !u!114 &8879672753710591573 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4174585961340097453} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 4cdad70a33ccc43499e25fba179cc14e, 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!114 &3162079688776335797 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3156,7 +3381,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1e7f7d2e91777fb4499bee4ebfbafb61, type: 3} + m_Sprite: {fileID: 21300000, guid: 4beffd148bef83342942f330fcea6ec0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3320,7 +3545,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8f1b1698f872ea742b915f87ad5e5b8e, type: 3} + m_Sprite: {fileID: 21300000, guid: 12ac4c950140be44db4bb91e7e703092, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3377,6 +3602,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6822465900279580562} m_CullTransparentMesh: 0 +--- !u!1 &6877522905663222601 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6293084362941955967} + - component: {fileID: 1976267087921497389} + - component: {fileID: 7476734879536282306} + m_Layer: 5 + m_Name: ImageL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6293084362941955967 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6877522905663222601} + 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_Children: [] + m_Father: {fileID: 4007984775395188520} + m_RootOrder: 1 + 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: 0} + m_SizeDelta: {x: 258, y: 215} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &1976267087921497389 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6877522905663222601} + m_CullTransparentMesh: 0 +--- !u!114 &7476734879536282306 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6877522905663222601} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 8b19615d7efc29d4ca15f25dfccbbd02, 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 &7211582742149926102 GameObject: m_ObjectHideFlags: 0 @@ -4009,7 +4308,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &9029656237557237746 RectTransform: m_ObjectHideFlags: 0 @@ -4022,12 +4321,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4160894300255257250} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -501} - m_SizeDelta: {x: 0, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 129, y: 37} + m_SizeDelta: {x: 218, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &379167247127675585 CanvasRenderer: @@ -4058,10 +4357,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} - m_FontSize: 36 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 2 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -4239,7 +4538,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d16015f83c5d7524fa3bc2e3b7b92d17, type: 3} + m_Sprite: {fileID: 21300000, guid: c8bc661a09372e34984fcf6ef5fa67b1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4406,12 +4705,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2115740915638175675} - m_RootOrder: 1 + m_RootOrder: 2 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: -501} - m_SizeDelta: {x: 154, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 129, y: 37} + m_SizeDelta: {x: 218, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5018981092144388648 CanvasRenderer: @@ -4442,10 +4741,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} - m_FontSize: 36 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 2 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -4453,7 +4752,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: RACE + m_Text: BATTLE --- !u!114 &7200811846564528182 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4686,6 +4985,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 150875807647852721} + - {fileID: 648703970238019564} - {fileID: 4910459164723374462} m_Father: {fileID: 3931130817493022313} m_RootOrder: 3 @@ -4722,7 +5022,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 4beffd148bef83342942f330fcea6ec0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5230,30 +5530,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 652cdefe0475dfd429e5a7e92bc3fa31, type: 3} ---- !u!1 &2878789241602269182 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4566599628729395000, guid: 652cdefe0475dfd429e5a7e92bc3fa31, - type: 3} - m_PrefabInstance: {fileID: 1777885815653005510} - m_PrefabAsset: {fileID: 0} ---- !u!1 &2878789241596989269 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4566599628726286227, guid: 652cdefe0475dfd429e5a7e92bc3fa31, - type: 3} - m_PrefabInstance: {fileID: 1777885815653005510} - m_PrefabAsset: {fileID: 0} ---- !u!1 &2878789242754722739 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4566599627569075061, guid: 652cdefe0475dfd429e5a7e92bc3fa31, - type: 3} - m_PrefabInstance: {fileID: 1777885815653005510} - m_PrefabAsset: {fileID: 0} ---- !u!1 &4277467338606038296 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2589794478743172574, guid: 652cdefe0475dfd429e5a7e92bc3fa31, - type: 3} - m_PrefabInstance: {fileID: 1777885815653005510} - m_PrefabAsset: {fileID: 0} --- !u!1 &4277467339516583034 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2589794477271639228, guid: 652cdefe0475dfd429e5a7e92bc3fa31, @@ -5266,12 +5542,36 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1777885815653005510} m_PrefabAsset: {fileID: 0} +--- !u!1 &4277467338606038296 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2589794478743172574, guid: 652cdefe0475dfd429e5a7e92bc3fa31, + type: 3} + m_PrefabInstance: {fileID: 1777885815653005510} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2878789241596989269 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4566599628726286227, guid: 652cdefe0475dfd429e5a7e92bc3fa31, + type: 3} + m_PrefabInstance: {fileID: 1777885815653005510} + m_PrefabAsset: {fileID: 0} --- !u!224 &4277467338018245799 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2589794478191162465, guid: 652cdefe0475dfd429e5a7e92bc3fa31, type: 3} m_PrefabInstance: {fileID: 1777885815653005510} m_PrefabAsset: {fileID: 0} +--- !u!1 &2878789241602269182 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4566599628729395000, guid: 652cdefe0475dfd429e5a7e92bc3fa31, + type: 3} + m_PrefabInstance: {fileID: 1777885815653005510} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2878789242754722739 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4566599627569075061, guid: 652cdefe0475dfd429e5a7e92bc3fa31, + type: 3} + m_PrefabInstance: {fileID: 1777885815653005510} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3055618140784683156 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/language.json b/Assets/Resources/UI/language.json index a9a123b0..495f471f 100644 --- a/Assets/Resources/UI/language.json +++ b/Assets/Resources/UI/language.json @@ -326,7 +326,8 @@ "Skin": "肤色", "Suit": "套装", "View": "预览", - "Capture": "截图" + "Capture": "截图", + "BATTLE": "对战" }, "en": { "HOT ROUTES": "HOT ROUTES", @@ -647,6 +648,7 @@ "Skin": "Skin", "Suit": "Suit", "View": "View", - "Capture": "Capture" + "Capture": "Capture", + "BATTLE": "BATTLE" } } diff --git a/Assets/Scripts/Apis/GameRoomApi.cs b/Assets/Scripts/Apis/GameRoomApi.cs index e2dff919..e38ca7f1 100644 --- a/Assets/Scripts/Apis/GameRoomApi.cs +++ b/Assets/Scripts/Apis/GameRoomApi.cs @@ -37,5 +37,10 @@ namespace Assets.Scripts.Apis { return await GetAsync>($"GameRoom/ConfirmRoomPwd?id={id}&pwd={pwd}"); } + + public JsonResult GetMapVideoURL(int routeId) + { + return Get>($"Map/GetMapVideoURL?id={routeId}"); + } } } diff --git a/Assets/Scripts/Apis/Models/GameRoomModel.cs b/Assets/Scripts/Apis/Models/GameRoomModel.cs index 3e44430b..b7c8a3a0 100644 --- a/Assets/Scripts/Apis/Models/GameRoomModel.cs +++ b/Assets/Scripts/Apis/Models/GameRoomModel.cs @@ -46,12 +46,12 @@ namespace Assets.Scripts.Apis.Models public List RoomPlayerList { get; set; } public static List Parse(string s) { - if (s.Equals("list")) + if (s.Equals("l")) return null; List list = new List(); try { - var arr = s.Replace("list[", "").Replace("[","").Split(']'); + var arr = s.Replace("l[", "").Replace("[","").Split(']'); foreach (var item in arr) { if (string.IsNullOrEmpty(item)) @@ -103,6 +103,7 @@ namespace Assets.Scripts.Apis.Models public int RoomId { get; set; } public string WxHeadImage { get; set; } public string Name { get; set; } + public string Country { get; set; } public int Sex { get; set; } public double Weight { get; set; } public int FTP { get; set; } @@ -151,6 +152,7 @@ namespace Assets.Scripts.Apis.Models item.Weight = user.Weight; item.Name = user.Name; item.Sex = user.Sex; + item.Country = user.Country; } } return list; diff --git a/Assets/Scripts/Scenes/Ride/Model/CyclingModels/BaseCycling.cs b/Assets/Scripts/Scenes/Ride/Model/CyclingModels/BaseCycling.cs index f8b7a920..82d1ea32 100644 --- a/Assets/Scripts/Scenes/Ride/Model/CyclingModels/BaseCycling.cs +++ b/Assets/Scripts/Scenes/Ride/Model/CyclingModels/BaseCycling.cs @@ -105,7 +105,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels MapUDPService.Send(route.RouteInstance.Id, recorderData.BelongUserId, new double[] { lastData._Lat, lastData._Lon }, recorderData.IsCompleted, false, recorderData.EndDistance, - true, 1, lastData._Speed, false, preDistance, weightKg, competitionId: recorderData.Competitionid, recorderData.Saved, 0, lastData._Power, lastData._Cadence, lastData.Ticks, (lastData._FrameRate??0),roomId: (recorderData.RoomId??0)); + true, 1, lastData._Speed, false, preDistance, weightKg, competitionId: recorderData.Competitionid, recorderData.Saved, 0, lastData._Power, lastData._Cadence, lastData.Ticks, (lastData._FrameRate??0),roomId: recorderData.RoomId); } else if (recorderData.EndDistance > 0)//没有骑，但是有初始位置的情况 { diff --git a/Assets/Scripts/Scenes/Ride/Model/CyclingModels/GameModel.cs b/Assets/Scripts/Scenes/Ride/Model/CyclingModels/GameModel.cs index 7e2f7e98..d3b8b892 100644 --- a/Assets/Scripts/Scenes/Ride/Model/CyclingModels/GameModel.cs +++ b/Assets/Scripts/Scenes/Ride/Model/CyclingModels/GameModel.cs @@ -29,8 +29,8 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels StartTime = DateTime.Now,//UIManager.Now.GetDateTime(),//DateTime.Now selectParam = param, RoomId = App.gameRoomDetail.RoomId, - }; - + }; + App.gameRoomDetail = null; if (param != null) { recorderData.EndDistance = param.EndDistance; @@ -55,7 +55,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels { #region 获取当前路线在线用户 riders.RemoveAll(r => r.IsSelf == false); - var onlineUsers = MapUDPService.GetOnlineUsers(recorderData.CurrentRoute.RouteInstance.Id,App.gameRoomDetail.RoomId).Where(d => d.IsSelf == false) + var onlineUsers = MapUDPService.GetOnlineUsers(recorderData.CurrentRoute.RouteInstance.Id, recorderData.RoomId).Where(d => d.IsSelf == false) .ToList(); foreach (var item in onlineUsers) { diff --git a/Assets/Scripts/Scenes/Ride/Model/OutModel.cs b/Assets/Scripts/Scenes/Ride/Model/OutModel.cs index c41ff648..45ebc6e8 100644 --- a/Assets/Scripts/Scenes/Ride/Model/OutModel.cs +++ b/Assets/Scripts/Scenes/Ride/Model/OutModel.cs @@ -44,7 +44,9 @@ namespace Assets.Scenes.Ride.Scripts.Model } public class ExtendInfo { + public int TotalTicks { get; set; } public int RoomId { get; set; } + public int FrameRate { get; set; } public int UserId { get; set; } public static ExtendInfo Parse(string s) { @@ -55,6 +57,8 @@ namespace Assets.Scenes.Ride.Scripts.Model { UserId = Convert.ToInt32(info[0]), RoomId = Convert.ToInt32(info[1]), + FrameRate = Convert.ToInt32(info[2]), + TotalTicks = Convert.ToInt32(info[3]), }; return ex; } @@ -576,8 +580,10 @@ namespace Assets.Scenes.Ride.Scripts.Model public string WatchIdList { get; set; } - public int? FrameRate { get; set; } + public int FrameRate { get; set; } public int? RoomId { get; set; } + + public int GameRoomTotal { get; set; } public List RoomList { get; set; } public GameRoomModel RoomDetail { get; set; } @@ -746,7 +752,7 @@ namespace Assets.Scenes.Ride.Scripts.Model public DateTime CreateTime { get; set; } - public int? FrameRate { get; set; } + public int FrameRate { get; set; } public int RoomId { get; set; } diff --git a/Assets/Scripts/Scenes/Ride/Model/RecorderDataModel.cs b/Assets/Scripts/Scenes/Ride/Model/RecorderDataModel.cs index b7ff6910..88d7cef1 100644 --- a/Assets/Scripts/Scenes/Ride/Model/RecorderDataModel.cs +++ b/Assets/Scripts/Scenes/Ride/Model/RecorderDataModel.cs @@ -107,7 +107,7 @@ namespace Assets.Scenes.Ride.Scripts.Model public int? LastFrame { get; set; } - public int? RoomId { get; set; } + public int RoomId { get; set; } /// /// 是否已经保存成功 /// diff --git a/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs b/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs index a47dd7e5..df0590f8 100644 --- a/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs +++ b/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs @@ -148,7 +148,7 @@ namespace Assets.Scenes.Ride.Scripts AverageGrade = averageGrade, AltitudeGraph = altitudeGraph, FileName = fileName, - FileUrl = fileUrl, + FileUrl = "",//url下载的时候查询 CommandType = 3, SubType = 0, V = 2, diff --git a/Assets/Scripts/Scenes/Ride/Network/TcpService1.cs b/Assets/Scripts/Scenes/Ride/Network/TcpService1.cs index 54497ec2..58b81a05 100644 --- a/Assets/Scripts/Scenes/Ride/Network/TcpService1.cs +++ b/Assets/Scripts/Scenes/Ride/Network/TcpService1.cs @@ -201,14 +201,27 @@ namespace Assets.Scenes.Ride.Scripts.Network if (t.IndexOf('g') == 0) { var x = t.Replace("g{", "").Replace("}", ""); - //list[0,0,321313,30,5,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,213,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,:][0,0,2131,30,4,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,313,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,:][20,16652,3213,30,3,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,2022/5/6 8:41:34:][19,16652,测试3d线路,30,2,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,2022/5/6 1:39:57:][18,16652,测试,61,2,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,2022/4/25 2:34:03:][17,16652,213,30,3,1217,翠屏山后山北向南,5.271609999999998,65.22760000000001,0.23308249282477278,False,False,True,,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=1217,0,2022/4/25 2:20:13:] - var li = GameRoomModel.Parse(x); - foreach (var i in list) + //l2[0,0,321313,30,5,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,213,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,:][0,0,2131,30,4,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,313,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,:][20,16652,3213,30,3,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,2022/5/6 8:41:34:][19,16652,测试3d线路,30,2,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,2022/5/6 1:39:57:][18,16652,测试,61,2,5492,福州化工路-鼓山峰爬坡线路,19.17906,815.9704000000002,4.0466336723489045,True,False,True,,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=5492,0,2022/4/25 2:34:03:][17,16652,213,30,3,1217,翠屏山后山北向南,5.271609999999998,65.22760000000001,0.23308249282477278,False,False,True,,,,http://192.168.0.102:5082/Map/AltitudeGraph?id=1217,0,2022/4/25 2:20:13:] + if (!string.IsNullOrEmpty(x)) { - i.RoomList = li; + var index = x.IndexOf("l"); + var total = 0; + if (index != -1) + { + var pageInfo = x.Substring(0, index); + if (!string.IsNullOrEmpty(pageInfo)) + total = Convert.ToInt32(pageInfo); + x = x.Substring(index); + } + var li = GameRoomModel.Parse(x); + foreach (var i in list) + { + i.RoomList = li; + i.GameRoomTotal = total; + } } } - //对战骑行场景中信息 + //附加信息 if (t.IndexOf('e') == 0) { var g = t.Replace("e{", "").Replace("}", ""); @@ -219,10 +232,11 @@ namespace Assets.Scenes.Ride.Scripts.Network if (string.IsNullOrEmpty(i)) continue; var extendInfo = ExtendInfo.Parse(i); - var owner = list.Where(c => c.MemberId == extendInfo.UserId).FirstOrDefault(); + var owner = list.Where(c => c.MemberId == extendInfo.UserId && c.TotoalTicks == extendInfo.TotalTicks).FirstOrDefault(); if (owner != null) { owner.RoomId = extendInfo.RoomId; + owner.FrameRate = extendInfo.FrameRate; } } } diff --git a/Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs b/Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs index 64474cb6..924316ae 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs @@ -34,7 +34,7 @@ namespace Assets.Scenes.Ride.Scripts } protected override void CreateList() { - var roomId = cyclingController.cyclingController == null ? 0 : (cyclingController.cyclingController.recorderData.RoomId ?? 0); + var roomId = cyclingController.cyclingController == null ? 0 : cyclingController.cyclingController.recorderData.RoomId; OnlineUserNum.text = " "+ MapUDPService.GetNearRiderCount(roomId).ToString(); LayoutRebuilder.ForceRebuildLayoutImmediate(OnlineUserNum.rectTransform); var nearList = MapUDPService.GetNearRiderData(pageIndex, pageSize, new double[] { playerController.Currentlatlong.x, playerController.Currentlatlong.y },roomId); diff --git a/Assets/Scripts/Scenes/VideoRide/NearVideoPlayerList.cs b/Assets/Scripts/Scenes/VideoRide/NearVideoPlayerList.cs index 3d371e1d..4e9d4f13 100644 --- a/Assets/Scripts/Scenes/VideoRide/NearVideoPlayerList.cs +++ b/Assets/Scripts/Scenes/VideoRide/NearVideoPlayerList.cs @@ -68,10 +68,8 @@ namespace Assets.Scripts.Scenes.VideoRide return; var totalDitance = manager.GetMapData().TotalDistance; var currentDistance = manager.CurrentPlayer.totalDistance; - - //var currenList = FindObjectsOfType();//当前列表 var currenList = GetComponentsInChildren(true); - var list = MapUDPService.GetOnlineUsers(App.RouteIdParam);//最新列表 + var list = MapUDPService.GetOnlineUsers(App.RouteIdParam,manager.cyclingController.recorderData.RoomId);//最新列表 var currentPlayerInfo = list.Where(c => c.Id.ToString() == manager.CurrentPlayer.UserId.ToString()).FirstOrDefault(); list = list.Where(c => c.Id != App.CurrentUser.Id).ToList(); if (currenList.Count() == 0 && list.Count() > 0) @@ -82,10 +80,8 @@ namespace Assets.Scripts.Scenes.VideoRide _recyclableScrollRect.ReloadData(); } } - //var currenList = FindObjectsOfType();//当前列表 - //var list = MapUDPService.GetOnlineUsers(App.RouteIdParam);//最新列表 + var currentPlayer = FindObjectOfType(); - foreach (ListItem o in currenList) { diff --git a/Assets/Scripts/Scenes/VideoRide/VideoGameManager.cs b/Assets/Scripts/Scenes/VideoRide/VideoGameManager.cs index 914c6e3b..580ee6e1 100644 --- a/Assets/Scripts/Scenes/VideoRide/VideoGameManager.cs +++ b/Assets/Scripts/Scenes/VideoRide/VideoGameManager.cs @@ -63,15 +63,6 @@ namespace Assets.Scripts.Scenes.VideoRide private void Awake() { base.Awake(); -#if UNITY_EDITOR - App.RouteIdParam = 12353; - //自动登录 - if (App.CurrentUser == null) - { - Login(); - UIManager.InitNow();//重置当前时间 - } -#endif mediaPlayer = FindObjectOfType(); DeviceCache.Init(PFConstants.DeviceCacheFolder); var check = CheckAnt();//初始化蓝牙设备 @@ -108,11 +99,7 @@ namespace Assets.Scripts.Scenes.VideoRide }; } endDistance = 0; - ////倒计时5s开始 - //SetCyclingModel(CyclingModel.Single); videoLoading = FindObjectOfType(); - - } private IEnumerator Init() { @@ -483,7 +470,6 @@ namespace Assets.Scripts.Scenes.VideoRide cyclingController.recorderData.ManufacturerName = ManufacturerName; cyclingController.recorderData.DeviceNumber = DeviceNumber; cyclingController.recorderData.LastFrame = GetCurrentFrame(); - cyclingController.recorderData.RoomId = App.gameRoomDetail?.RoomId;//房间ID RankingId = cyclingController.recorderData.SaveWithLocalRecordAysnc(cyclingModel, selectParamModel, imageFileName, recordId, path); } diff --git a/Assets/Scripts/Scenes/VideoRide/VideoLoading.cs b/Assets/Scripts/Scenes/VideoRide/VideoLoading.cs index 3e089f05..d346be2a 100644 --- a/Assets/Scripts/Scenes/VideoRide/VideoLoading.cs +++ b/Assets/Scripts/Scenes/VideoRide/VideoLoading.cs @@ -11,6 +11,7 @@ using UnityEngine.EventSystems; using Assets.Scenes.Ride.Scripts; using Assets.Scripts.Apis.Models; using System.Linq; +using Assets.Scenes.Ride.Scripts.Model; namespace Assets.Scripts.Scenes.VideoRide { @@ -222,7 +223,7 @@ namespace Assets.Scripts.Scenes.VideoRide var ui = manager.GetCanvasTransform(); canvasGroup.DOFade(0, 0).onComplete += () => { gameObject.SetActive(false); - manager.SetCyclingModel(Assets.Scenes.Ride.Scripts.Model.CyclingModel.GameRoom); + manager.SetCyclingModel(CyclingModel.GameRoom); manager.SetCurrentMode(VideoGameManager.ARMode.RIDE); ui.Find("Panel").gameObject.SetActive(true); }; @@ -243,12 +244,12 @@ namespace Assets.Scripts.Scenes.VideoRide , (p) => { if (!string.IsNullOrEmpty(p)) { - slider.value = 100; - manager.SetMedia(p); + Debug.LogError(p); } else { - Debug.LogError(""); + slider.value = 100; + manager.SetMedia(p); } } )); diff --git a/Assets/Scripts/UI/Control/PFUIPageButton.cs b/Assets/Scripts/UI/Control/PFUIPageButton.cs new file mode 100644 index 00000000..18d42ba5 --- /dev/null +++ b/Assets/Scripts/UI/Control/PFUIPageButton.cs @@ -0,0 +1,28 @@ +using System; +using UnityEngine; +using UnityEngine.UI; + +namespace Assets.Scripts.UI.Control +{ + public class PFUIPageButton : PFUIComponentBase + { + public Text pageIndexText; + public GameObject clickImage; + + public int PageIndex { get; set; } + + public void SetPageIndex(int pageIndex) + { + PageIndex = pageIndex; + pageIndexText.text = $"{pageIndex + 1}";//pageIndex 从0开始 + } + public void ShowLight() + { + clickImage.SetActive(true); + } + public void ShowShadow() + { + clickImage.SetActive(false); + } + } +} diff --git a/Assets/Scripts/UI/Prefab/GameRoom/GameRoomList.cs.meta b/Assets/Scripts/UI/Control/PFUIPageButton.cs.meta similarity index 83% rename from Assets/Scripts/UI/Prefab/GameRoom/GameRoomList.cs.meta rename to Assets/Scripts/UI/Control/PFUIPageButton.cs.meta index 454c019d..f291dd8b 100644 --- a/Assets/Scripts/UI/Prefab/GameRoom/GameRoomList.cs.meta +++ b/Assets/Scripts/UI/Control/PFUIPageButton.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c114c143939361e41bd29f69f311e91c +guid: c49931be379e5a448a6f107bb2bf94f3 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/UI/Control/PFUIPageHelper.cs b/Assets/Scripts/UI/Control/PFUIPageHelper.cs index 433207bb..058b8a5d 100644 --- a/Assets/Scripts/UI/Control/PFUIPageHelper.cs +++ b/Assets/Scripts/UI/Control/PFUIPageHelper.cs @@ -8,36 +8,105 @@ namespace Assets.Scripts.UI.Control public class PFUIPageHelper : PFUIComponentBase { public Transform content; - public GameObject preBtn; - public GameObject nextBtn; + public GameObject moreBtnPrefab; + public GameObject preBtnPrefab; + public GameObject nextBtnPrefab; public GameObject btnPrefab; public int PageIndex { get; set; } public int PageSize { get; set; } = 6; public int Total { get; set; } + public int _pageMaxTotal = 9; + + public int _pageSpace = 4; + private Action CallBack { get; set; } public void Register(Action refresh) { CallBack = refresh; + } + public void Build() + { + Utils.DestroyChildren(content); - UIManager.AddEvent(preBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, (e) => + RenderPreviousButton(); + + for (int i = 0; i < Total; i++) { - Previous(); + if (PageIndex - 0 >= 4 && i < PageIndex) + { + if (i == 0 || PageIndex -1 == i || PageIndex -2 == i) + { + RenderPageButton(i); + } + if (i == 1) + { + RenderMoreButton(); + } + continue; + } + + if (Total -PageIndex-1 >= 4 && i >= PageIndex) + { + if (i == Total-1 || PageIndex == i || PageIndex + 1 == i || PageIndex + 2 == i) + { + RenderPageButton(i); + } + if (i == Total - 2) + { + RenderMoreButton(); + } + continue; + } + RenderPageButton(i); + } + RenderNextButton(); + } + private void RenderMoreButton() + { + var moreBtn = Instantiate(moreBtnPrefab, content); + moreBtn.SetActive(true); + } + private void RenderPageButton(int pageIndex) + { + var btn = Instantiate(btnPrefab, content); + var script = btn.GetComponent(); + script.SetPageIndex(pageIndex); + + if (pageIndex == PageIndex) + { + script.ShowLight(); + } + else + { + script.ShowShadow(); + } + + UIManager.AddEvent(btn, UnityEngine.EventSystems.EventTriggerType.PointerClick, (e) => + { + Redirect(pageIndex); }); + } + private void RenderNextButton() + { + var nextBtn = Instantiate(nextBtnPrefab, content); + nextBtn.SetActive(true); + UIManager.AddEvent(nextBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, (e) => { Next(); }); } - public void Build() + private void RenderPreviousButton() { - Utils.DestroyChildren(content); - for (int i = 1; i <= Total; i++) + var preBtn = Instantiate(preBtnPrefab, content); + preBtn.SetActive(true); + + UIManager.AddEvent(preBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, (e) => { - var g = Instantiate(btnPrefab, content); - g.transform.Find("Text").GetComponent().text = i.ToString(); - } + Previous(); + }); } //上一页 private void Previous() @@ -48,6 +117,7 @@ namespace Assets.Scripts.UI.Control { PageIndex = index; CallBack?.Invoke(PageIndex); + Build(); } } //下一页 @@ -59,13 +129,27 @@ namespace Assets.Scripts.UI.Control { PageIndex = index; CallBack?.Invoke(PageIndex); + Build(); } } //指定到第几页 private void Redirect(int index) { + var list = FindObjectsOfType(); + foreach (var item in list) + { + if (item.PageIndex == index) + { + item.ShowLight(); + } + else + { + item.ShowShadow(); + } + } PageIndex = index; CallBack?.Invoke(PageIndex); + Build(); } } } diff --git a/Assets/Scripts/UI/Prefab/GameRoom/GameRoomCell.cs b/Assets/Scripts/UI/Prefab/GameRoom/GameRoomCell.cs index bc7aa782..dd4f74de 100644 --- a/Assets/Scripts/UI/Prefab/GameRoom/GameRoomCell.cs +++ b/Assets/Scripts/UI/Prefab/GameRoom/GameRoomCell.cs @@ -66,63 +66,17 @@ public class GameRoomCell : MonoBehaviour, ICell, IBeginDragHandler, IDragHandle private GameRoomListController manager; private GameRoomModel gameRoom; + private bool Enable2d { get; set; } + private bool Enable3d { get; set; } + private bool EnableAR { get; set; } + private void Start() { manager = FindObjectOfType(); Scroll = GetComponentInParent(); - UIManager.AddEvent(gameObject, EventTriggerType.PointerEnter, (e) => - { - LockL.SetActive(IsLock); - Lock.SetActive(false); - - D2.SetActive(false); - D2L.SetActive(Enable2d); - - D3.SetActive(false); - D3L.SetActive(Enable3d); - - AR.SetActive(false); - ARL.SetActive(EnableAR); - - - var list = GetComponentsInChildren(); - foreach (var item in list) - { - item.ShowLight(); - } - }); - UIManager.AddEvent(gameObject, EventTriggerType.PointerExit, (e) => - { - LockL.SetActive(false); - Lock.SetActive(IsLock); - - D2.SetActive(Enable2d); - D2L.SetActive(false); - - D3.SetActive(Enable3d); - D3L.SetActive(false); - - AR.SetActive(EnableAR); - ARL.SetActive(false); - - var list = GetComponentsInChildren(); - foreach (var item in list) - { - item.ShowShadow(); - } - }); - UIManager.AddEvent(JoinBtn, EventTriggerType.PointerClick, (e) => - { - manager.SelectRoom(gameRoom); - if (IsLock) - { - manager.ShowPwdConfirm(); - } - else - { - manager.ShowDownLoadConfirm(); - } - }); + UIManager.AddEvent(gameObject, EventTriggerType.PointerEnter,OnEnter); + UIManager.AddEvent(gameObject, EventTriggerType.PointerExit, OnExit); + UIManager.AddEvent(JoinBtn, EventTriggerType.PointerClick, JoinGameRoom); //对战正在进行 UIManager.AddEvent(CycingBtn, EventTriggerType.PointerClick, (e) => { @@ -134,18 +88,59 @@ public class GameRoomCell : MonoBehaviour, ICell, IBeginDragHandler, IDragHandle manager.ShowDonePanel(gameRoom.RoomId); }); } - private float timer = 1f; - private void Update() + private void OnEnter(BaseEventData baseEventData) { - timer -= Time.deltaTime; - while (timer < 0) + LockL.SetActive(IsLock); + Lock.SetActive(false); + + D2.SetActive(false); + D2L.SetActive(Enable2d); + + D3.SetActive(false); + D3L.SetActive(Enable3d); + + AR.SetActive(false); + ARL.SetActive(EnableAR); + + + var list = GetComponentsInChildren(); + foreach (var item in list) { - timer += 1f; + item.ShowLight(); + } + } + private void OnExit(BaseEventData baseEventData) + { + LockL.SetActive(false); + Lock.SetActive(IsLock); + + D2.SetActive(Enable2d); + D2L.SetActive(false); + + D3.SetActive(Enable3d); + D3L.SetActive(false); + + AR.SetActive(EnableAR); + ARL.SetActive(false); + + var list = GetComponentsInChildren(); + foreach (var item in list) + { + item.ShowShadow(); + } + } + private void JoinGameRoom(BaseEventData baseEventData) + { + manager.SelectRoom(gameRoom); + if (IsLock) + { + manager.ShowPwdConfirm(); + } + else + { + manager.ShowDownLoadConfirm(); } } - private bool Enable2d { get; set; } - private bool Enable3d { get; set; } - private bool EnableAR { get; set; } //This is called from the SetCell method in DataSource public void ConfigureCell(GameRoomModel cell, int cellIndex) { @@ -200,26 +195,18 @@ public class GameRoomCell : MonoBehaviour, ICell, IBeginDragHandler, IDragHandle } } } - public void UpdateItem(string name, string gender, string id) - { - - } - public void OnBeginDrag(PointerEventData eventData) { Scroll.OnBeginDrag(eventData); } - public void OnDrag(PointerEventData eventData) { Scroll.OnDrag(eventData); } - public void OnEndDrag(PointerEventData eventData) { Scroll.OnEndDrag(eventData); } - public void OnScroll(PointerEventData eventData) { Scroll.OnScroll(eventData); diff --git a/Assets/Scripts/UI/Prefab/GameRoom/GameRoomDownLoad.cs b/Assets/Scripts/UI/Prefab/GameRoom/GameRoomDownLoad.cs index 23d5e098..4d96bc6c 100644 --- a/Assets/Scripts/UI/Prefab/GameRoom/GameRoomDownLoad.cs +++ b/Assets/Scripts/UI/Prefab/GameRoom/GameRoomDownLoad.cs @@ -43,14 +43,14 @@ class GameRoomDownLoad : MonoBehaviour { gameObject.SetActive(false); downLoadList.SetActive(true); - var content = downLoadList.transform.Find("Scroll View/Viewport/Content"); + var content = downLoadList.transform.Find("Viewport/Content"); var list = FindObjectsOfType(); //新增 var obj = list.Where(c => c.RoomId == RoomId).FirstOrDefault(); if (obj == null) { var newtask = Instantiate(downLoadTask, content); - newtask.GetComponent().Init(RoomId, gameObject); + newtask.GetComponent().Init(RoomId, FileName); } }); @@ -96,22 +96,47 @@ class GameRoomDownLoad : MonoBehaviour step2.SetActive(true); + //新增 - var content = downLoadList.transform.Find("Scroll View/Viewport/Content"); + var content = downLoadList.transform.Find("Viewport/Content"); var newtask = Instantiate(downLoadTask, content); var currentTask = newtask.GetComponent(); - currentTask.Init(RoomId, gameObject); + currentTask.Init(RoomId, fileName); Loom.Current.StartCoroutine(Utils.DownloadVideo(fileName, url , (p, req) => { downloadSlider.value = p; currentTask.UpdateProcess(p); + if (Loom.DownLoadTaskList.ContainsKey(FileName)) + { + Loom.DownLoadTaskList[FileName] = p; + } + else + { + Loom.DownLoadTaskList.Add(FileName, p); + } } , (p) => { - currentTask.UpdateProcess(100f); - downloadSlider.value = 100f; - step3.SetActive(true); + if (string.IsNullOrEmpty(p)) + { + var process = 100f; + if (Loom.DownLoadTaskList.ContainsKey(FileName)) + { + Loom.DownLoadTaskList[FileName] = process; + } + else + { + Loom.DownLoadTaskList.Add(FileName, process); + } + currentTask.UpdateProcess(process); + downloadSlider.value = process; + step3.SetActive(true); + } + else + { + Utils.showToast(gameObject, p); + } } )); } diff --git a/Assets/Scripts/UI/Prefab/GameRoom/GameRoomDownloadTask.cs b/Assets/Scripts/UI/Prefab/GameRoom/GameRoomDownloadTask.cs index 434ef5d6..2d591ce2 100644 --- a/Assets/Scripts/UI/Prefab/GameRoom/GameRoomDownloadTask.cs +++ b/Assets/Scripts/UI/Prefab/GameRoom/GameRoomDownloadTask.cs @@ -2,33 +2,48 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; +using DG.Tweening; class GameRoomDownloadTask : MonoBehaviour { public GameObject btn; public Slider slider; public GameObject icon; - private GameObject modal; public GameObject done; public GameObject doneTxt; + public CanvasGroup canvasGroup; + + private GameObject modal; + private Text fileNameText; public int RoomId { get; set; } + public string FileName { get; set; } private void Start() { UIManager.AddEvent(btn, EventTriggerType.PointerClick, (e) => { modal.SetActive(true); - transform.parent.parent.parent.parent.gameObject.SetActive(false); - //TODO: + transform.parent.parent.parent.gameObject.SetActive(false); }); } - public void Init(int roomId,GameObject parent) + public void Init(int roomId,string fileName) { + modal = FindObjectOfType().gameObject; + fileNameText = transform.Find("Text").GetComponent(); RoomId = roomId; - modal = parent; + fileNameText.text = fileName; + FileName = fileName; + } + + private void Update() + { + if (Loom.DownLoadTaskList.ContainsKey(FileName)) + { + UpdateProcess(Loom.DownLoadTaskList[FileName]); + } } public void UpdateProcess(float process) @@ -39,7 +54,11 @@ class GameRoomDownloadTask : MonoBehaviour done.SetActive(true); doneTxt.SetActive(true); icon.SetActive(false); - slider.gameObject.SetActive(false); + canvasGroup.DOFade(0, 2).onComplete += () => + { + slider.gameObject.SetActive(false); + gameObject.Destroy(); + }; } } diff --git a/Assets/Scripts/UI/Prefab/GameRoom/GameRoomList.cs b/Assets/Scripts/UI/Prefab/GameRoom/GameRoomList.cs deleted file mode 100644 index 19703ae7..00000000 --- a/Assets/Scripts/UI/Prefab/GameRoom/GameRoomList.cs +++ /dev/null @@ -1,98 +0,0 @@ -using Assets.Scenes.Ride.Scripts; -using Assets.Scripts; -using Assets.Scripts.Apis.Models; -using Assets.Scripts.UI.Control; -using PolyAndCode.UI; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using UnityEngine; -using UnityEngine.EventSystems; -using UnityEngine.UI; - -class GameRoomList : MonoBehaviour -{ - [SerializeField] - RectTransform _rectTransform; - - [SerializeField] - InputField _searchInputField; - - [SerializeField] - GameObject _searchBtn; - - [SerializeField] - private int _dataLength; - private bool _isInit; - - private GameObject RoomCell { get; set; } - - //Dummy data List - private List _list = new List(); - - private string seachName = ""; - PFUIPageHelper pageHelper; - - //Recyclable scroll rect's data source must be assigned in Awake. - private void Awake() - { - RoomCell = Resources.Load("UI/Prefab/GameRoom/Room"); - //分页 - pageHelper = FindObjectOfType(); - pageHelper.PageIndex = 0; - pageHelper.PageSize = 6; - pageHelper.Register((e) => - { - _ = GetDataAsync(); - }); - - _ = GetDataAsync(); - _searchInputField.onValueChanged.AddListener((e) => { seachName = e; }); - _searchInputField.onEndEdit.AddListener((e) => { - if (!string.IsNullOrEmpty(name)) - { - _ = GetDataAsync(); - } - else - { - _ = GetDataAsync(); - } - }); - UIManager.AddEvent(_searchBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, Refreash); - } - private void Refreash(BaseEventData data) - { - _ = GetDataAsync(); - } - private async Task GetDataAsync() - { - if (_list != null) _list.Clear(); - var result = await ConfigHelper.GameRoomApi.GetList(pageHelper.PageIndex, pageHelper.PageSize, seachName); - if (result.result) - { - Utils.DestroyChildren(_rectTransform); - _list = result.data.List; - int index = 0; - foreach (var item in _list) - { - index++; - var g = Instantiate(RoomCell, _rectTransform); - g.GetComponent().ConfigureCell(item, index); - } - pageHelper.Total = result.data.Total; - pageHelper.Build(); - } - } - float timer = 1f; - private void Update() - { - timer -= Time.deltaTime; - while (timer < 0) - { - timer += 1f; - } - } -} - diff --git a/Assets/Scripts/UI/Prefab/GameRoom/GameRoomLoadingItem.cs b/Assets/Scripts/UI/Prefab/GameRoom/GameRoomLoadingItem.cs index b05c6cc3..653bd062 100644 --- a/Assets/Scripts/UI/Prefab/GameRoom/GameRoomLoadingItem.cs +++ b/Assets/Scripts/UI/Prefab/GameRoom/GameRoomLoadingItem.cs @@ -31,10 +31,6 @@ class GameRoomLoadingItem : MonoBehaviour loadingIcon.SetActive(process < 100); doneIcon.SetActive(process >= 100); - nameMyself.text = Name; - nameDone.text = Name; - nameLoading.text = Name; - if (UserId == App.CurrentUser.Id) { nameMyself.gameObject.SetActive(true); @@ -48,12 +44,20 @@ class GameRoomLoadingItem : MonoBehaviour timer += 1f; } } - public void Init(int userId,string name,int roomId,double process) + public void Init(int userId,string name,string head,string country,int roomId,double process) { UserId = userId; Name = name; RoomId = roomId; Process = process; + + nameMyself.text = Name; + nameDone.text = Name; + nameLoading.text = Name; + + countryImage.texture = UIManager.Instance.loginRegOptions.GetCountryImage(country); + Utils.DisplayHead(headImage, head); + } } diff --git a/Assets/Scripts/UI/Prefab/GameRoom/GameRoomMapItem.cs b/Assets/Scripts/UI/Prefab/GameRoom/GameRoomMapItem.cs index e94446de..d4d98c5c 100644 --- a/Assets/Scripts/UI/Prefab/GameRoom/GameRoomMapItem.cs +++ b/Assets/Scripts/UI/Prefab/GameRoom/GameRoomMapItem.cs @@ -82,9 +82,16 @@ public class GameRoomMapItem : MonoBehaviour, IPointerExitHandler, IPointerEnter } , (p) => { - slider.value = 100f; - ShowOutLine(); - transform.Find("DownLoadModal").gameObject.SetActive(false); + if (string.IsNullOrEmpty(p)) + { + slider.value = 100f; + ShowOutLine(); + transform.Find("DownLoadModal").gameObject.SetActive(false); + } + else + { + Utils.showToast(gameObject, p); + } })); }); diff --git a/Assets/Scripts/UI/Prefab/Panel/GameRoomDetailController.cs b/Assets/Scripts/UI/Prefab/Panel/GameRoomDetailController.cs index b764f006..7f5c4512 100644 --- a/Assets/Scripts/UI/Prefab/Panel/GameRoomDetailController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/GameRoomDetailController.cs @@ -134,7 +134,7 @@ public class GameRoomDetailController : PFUIPanel d3.SetActive(enable3d); ar.SetActive(GameRoom.EnableAR); - DataSourceChanged = true; + //DataSourceChanged = true; MapUDPService.SendQueryGameRoomList(App.CurrentUser.Id, 0, 1, GameRoom.RoomId.ToString()); readyBtn.SetActive(true); cancelBtn.SetActive(false); diff --git a/Assets/Scripts/UI/Prefab/Panel/GameRoomListController.cs b/Assets/Scripts/UI/Prefab/Panel/GameRoomListController.cs index cb410fbe..5b095450 100644 --- a/Assets/Scripts/UI/Prefab/Panel/GameRoomListController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/GameRoomListController.cs @@ -90,6 +90,12 @@ public class GameRoomListController : PFUIPanel [SerializeField] GameObject _searchBtn; + [SerializeField] + GameObject _noDataFound; + + [SerializeField] + GameObject _downLoadTask; + private GameObject RoomCell { get; set; } //Dummy data List @@ -104,7 +110,6 @@ public class GameRoomListController : PFUIPanel { base.Awake(); RoomRankItem = Resources.Load("UI/Prefab/GameRoom/RoomRankItem"); - RoomCell = Resources.Load("UI/Prefab/GameRoom/Room"); //分页 pageHelper = FindObjectOfType(); @@ -112,26 +117,35 @@ public class GameRoomListController : PFUIPanel pageHelper.PageSize = 6; pageHelper.Register((e) => { - + Query(); }); - - _searchInputField.onValueChanged.AddListener((e) => { seachName = e; }); _searchInputField.onEndEdit.AddListener((e) => { seachName = e; - MapUDPService.SendQueryGameRoomList(App.CurrentUser.Id, pageHelper.PageIndex, pageHelper.PageSize, seachName); + Query(); }); - UIManager.AddEvent(_searchBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, Search); + UIManager.AddEvent(_searchBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, SearchBtn_Click); } - private void Search(BaseEventData data) + private void SearchBtn_Click(BaseEventData data) + { + pageHelper.PageIndex = 0; + Query(); + } + private void Query() { MapUDPService.SendQueryGameRoomList(App.CurrentUser.Id, pageHelper.PageIndex, pageHelper.PageSize, seachName); } private void Refreash() { Utils.DestroyChildren(_rectTransform); + pageHelper.Total = Total; + pageHelper.Build(); if (list == null) + { + _noDataFound.SetActive(true); return; + } + _noDataFound.SetActive(false); int index = 0; foreach (var item in list) { @@ -139,23 +153,33 @@ public class GameRoomListController : PFUIPanel var g = Instantiate(RoomCell, _rectTransform); g.GetComponent().ConfigureCell(item, index); } - pageHelper.Total = 10; - pageHelper.Build(); + } List list; + private int Total { get; set; } + private bool CreateClicked { get; set; } private void ListenerHandler(List message) { try { + if (message.Count > 1) + return; //查询列表 var roomList = message.Where(c => c.RoomList != null).FirstOrDefault(); if (roomList != null) { list = roomList.RoomList; + Total = roomList.GameRoomTotal; + ListChanged = true; + } + else + { + list = null; + Total = 0; ListChanged = true; } //查询自己当前创建的房间信息并进入 - var info = message.Where(c => c.RoomList.Where(o => o.UserId == App.CurrentUser.Id).Any()).FirstOrDefault(); + var info = message.Where(c => c.RoomList != null && c.RoomList.Where(o => o.UserId == App.CurrentUser.Id && o.Status == 0).Any()).FirstOrDefault(); if (info != null) { GameRoom = info.RoomList[0]; @@ -186,33 +210,69 @@ public class GameRoomListController : PFUIPanel public override void Show() { base.Show(); + + //LOOM中取数据渲染下载当前下载进度 + var downLoadList = transform.Find("DownLoadList").gameObject; + var downloadPanel = transform.Find("DownloadPanel").gameObject; + if (!downLoadList.activeSelf && !downloadPanel.activeSelf) + { + foreach (var item in Loom.DownLoadTaskList) + { + var content = downLoadList.transform.Find("Viewport/Content"); + var newtask = Instantiate(_downLoadTask, content); + newtask.GetComponent().Init(0, item.Key); + } + } App.Model = "GameRoom"; MapUDPService.MessageListener = ListenerHandler; MapUDPService.SendQueryGameRoomList(App.CurrentUser.Id, pageHelper.PageIndex, pageHelper.PageSize, seachName); } - float timer = 1f; + private void Update() { - timer -= Time.deltaTime; + //房间已经进行骑行时间 if (cycingRoomModal.gameObject.activeSelf) { var s = UIManager.Now.GetDateTime() - modelGameRoom.StartTime.Value.ToLocalTime(); CyclingTimer.text = Helper.FormatTicks((int)s.TotalSeconds); } - while (timer < 0) + #region 搜索面板的滚轮监听 + if (scroll != null) { - if (ListChanged) + if (Input.GetAxis("Mouse ScrollWheel") != 0) { - Refreash(); - ListChanged = false; + if (scroll.GetComponent().verticalNormalizedPosition <= 0 || + scroll.GetComponent().verticalNormalizedPosition >= (pageIndex == 0 ? 1.2 : 1)) + { + startMouse = true; + } } - if (CreateRoomSuccessed & CreateClicked) + else { - CreateRoomSuccessed = false; - CreateClicked = false; - UIManager.ShowGameRoomDetailPanel(); + if (startMouse) + { + startMouse = false; + OnEndDrag(null); + } } - timer += 1f; + if (Input.GetKeyDown(KeyCode.KeypadEnter) || Input.GetKeyDown(KeyCode.Return)) + { + onEndEdit(); + } + } + #endregion + + if (ListChanged) + { + Refreash(); + ListChanged = false; + } + //对战房间创建事件监听 + if (CreateRoomSuccessed & CreateClicked) + { + CreateRoomSuccessed = false; + CreateClicked = false; + UIManager.ShowGameRoomDetailPanel(); } } private void InitStep1() @@ -416,11 +476,6 @@ public class GameRoomListController : PFUIPanel CreateClicked = true; }); } - private bool CreateClicked { get; set; } - private void ResetMapList() - { - - } private void InitStep2() { @@ -603,20 +658,23 @@ public class GameRoomListController : PFUIPanel var download = transform.Find("DownloadPanel").gameObject; if (GameRoom.EnableAR && !File.Exists(filepath)) { + //查询fileUrl + GameRoom.FileUrl = ConfigHelper.GameRoomApi.GetMapVideoURL(GameRoom.MapRouteId).data; download.SetActive(true); download.GetComponent().Init(RoomId, GameRoom.FileName, GameRoom.FileUrl, this); } - GetInRoom(); + else + { + GetInRoom(); + } } - private GameRoomModel modelGameRoom { get; set; } //private GameRoomModel modelGameRoom { get; set; } private Text CyclingTimer { get; set; } public void ShowCycingPanel(GameRoomModel gameRoomModel) { ShowStatusModal(cycingRoomModal, gameRoomModel); - //倒计时 - modelGameRoom = gameRoomModel; + modelGameRoom = gameRoomModel; //倒计时 CyclingTimer = cycingRoomModal.Find("Modal/Timer").GetComponent(); } public void ShowDonePanel(int roomId) @@ -651,21 +709,20 @@ public class GameRoomListController : PFUIPanel var bestHead = tr.Find("Modal/BestTab/Head").GetComponent(); var bestName = tr.Find("Modal/BestTab/NickName").GetComponent(); var bestTimer = tr.Find("Modal/BestTab/Timer").GetComponent(); - - bestName.text = data.BestNickName; - bestTimer.text = data.BestTotalTime; - + //查询某线路最佳 + var result = ConfigHelper.mapApi.GetMapBestInfo(data.MapRouteId); + if (result.result && !string.IsNullOrEmpty(result.data.BestNickName)) + { + bestName.text = result.data.BestNickName; + bestTimer.text = result.data.BestTotalTime; + Utils.DisplayImage(bestHead, result.data.BestWxHeadImg); + } Utils.DisplayImage(graph, data.AltitudeGraph); - Utils.DisplayImage(bestHead, data.BestWxHeadImg); tr.Find("Modal/Props/DistanceText").GetComponent().text = data.Distance.ToString("f1") + "KM"; tr.Find("Modal/Props/EleText").GetComponent().text = data.TotalClimb.ToString("f0") + "M"; tr.Find("Modal/Props/SlopeText").GetComponent().text = data.AverageGrade.ToString("f1") + "%"; tr.Find("Modal/StartTime").GetComponent().text = data.StartTime.Value.ToLocalTime().ToString(); - //var timegap = data.StartTime.Value.ToLocalTime() - UIManager.Now.GetDateTime(); - //if (timegap.Ticks > 0) - //{ - // tr.Find("Modal/StartTime").GetComponent().text = Helper.FormatTicks((int)timegap.Ticks); - //} + var close = tr.Find("Modal/Close").gameObject; var quit = tr.Find("Modal/Quit").gameObject; UIManager.AddEvent(close, EventTriggerType.PointerClick, (e) => { tr.gameObject.SetActive(false); }); diff --git a/Assets/Scripts/UI/Prefab/Panel/GameRoomLoadingController.cs b/Assets/Scripts/UI/Prefab/Panel/GameRoomLoadingController.cs index c5bf5961..83ef6f55 100644 --- a/Assets/Scripts/UI/Prefab/Panel/GameRoomLoadingController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/GameRoomLoadingController.cs @@ -47,7 +47,6 @@ public class GameRoomLoadingController : PFUIPanel videoLoading = FindObjectOfType(); playerLoading = FindObjectOfType(); videoManager = FindObjectOfType(); - videoManager?.SetCyclingModel(Assets.Scenes.Ride.Scripts.Model.CyclingModel.GameRoom); } private bool DataSourceChanged { get; set; } private void ListenerHandler(List message) @@ -103,7 +102,7 @@ public class GameRoomLoadingController : PFUIPanel { var detail = Instantiate(prefab, content); roomDetail = detail.GetComponent(); - roomDetail.Init(item.UserId, item.WxHeadImage, item.RoomId, item.Process); + roomDetail.Init(item.UserId, item.Name, item.WxHeadImage,item.Country,item.RoomId, item.Process); } } //判断是否进入骑行场景 diff --git a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs index 5ce371b5..284c61c2 100644 --- a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs @@ -40,7 +40,7 @@ public class HomeController : PFUIPanel { UIManager.ShowUserInfoPanel(); }); - + var BtnContainer = transform.Find("MainFuncContainer"); #if UNITY_ANDROID || UNITY_IOS var nav = transform.Find("MainNav-mobile").GetComponent(); nav.SetButtonActive(new List { 1, 3, 4, 6 }); @@ -61,12 +61,12 @@ public class HomeController : PFUIPanel { UIManager.ShowChangePlayerPanel(); }); - BtnBattle = transform.Find("MainFuncContainer/BtnBattle"); + BtnBattle = BtnContainer.Find("BtnBattle"); UIManager.AddEvent(BtnBattle.gameObject, EventTriggerType.PointerClick, GoGameRoom); UIManager.AddEvent(BtnBattle.gameObject, EventTriggerType.PointerEnter, OnHover); UIManager.AddEvent(BtnBattle.gameObject, EventTriggerType.PointerExit, OnExit); #endif - var BtnContainer = transform.Find("MainFuncContainer"); + UIManager.AddEvent(BtnRide.gameObject, EventTriggerType.PointerClick, GoRide); UIManager.AddEvent(BtnRide.gameObject, EventTriggerType.PointerEnter, OnHover); UIManager.AddEvent(BtnRide.gameObject, EventTriggerType.PointerExit, OnExit); @@ -130,7 +130,12 @@ public class HomeController : PFUIPanel } private void GoGameRoom(BaseEventData e) { +#if UNITY_STANDALONE_WIN + var pe = (PointerEventData)e; + var parent = pe.pointerEnter.transform.parent; UIManager.ShowGameRoomListPanel(); + OnExit(e); +#endif } private void GoRide(BaseEventData e) { @@ -207,6 +212,10 @@ public class HomeController : PFUIPanel //parent.Find("Text").GetComponent().color = Utils.HexToColorHtml("#ffffff"); parent.DOScale(new Vector3(1.05f, 1.05f, 0), 0.3f); //parent.GetComponent().localScale = ; + +#if UNITY_STANDALONE_WIN + parent.Find("ImageL").gameObject.SetActive(true); +#endif } private void OnExit(BaseEventData e) { @@ -220,6 +229,9 @@ public class HomeController : PFUIPanel } parent.DOScale(new Vector3(1f, 1f, 0), 0.3f); //parent.GetComponent().localScale = new Vector3(1f, 1f, 0); +#if UNITY_STANDALONE_WIN + parent.Find("ImageL").gameObject.SetActive(false); +#endif } void MoreFunc() { diff --git a/Assets/Scripts/Utils/Loom.cs b/Assets/Scripts/Utils/Loom.cs index ea44f950..8b4b40f8 100644 --- a/Assets/Scripts/Utils/Loom.cs +++ b/Assets/Scripts/Utils/Loom.cs @@ -14,6 +14,8 @@ public class Loom : MonoBehaviour public static int maxThreads = 8; static int numThreads; + public static Dictionary DownLoadTaskList = new Dictionary(); + private static Loom _current; public static Loom Current { diff --git a/Assets/Scripts/Utils/Utils.cs b/Assets/Scripts/Utils/Utils.cs index 744b056d..3cc283f2 100644 --- a/Assets/Scripts/Utils/Utils.cs +++ b/Assets/Scripts/Utils/Utils.cs @@ -9,6 +9,7 @@ using System.IO; using System.Net.NetworkInformation; using System.Net.Sockets; using System.Runtime.InteropServices; +using System.Threading.Tasks; using UnityEngine; using UnityEngine.Events; using UnityEngine.Networking; @@ -465,19 +466,14 @@ namespace Assets.Scripts //下载video public static IEnumerator DownloadVideo(string fileName,string url, UnityAction onProcessing = null, UnityAction onCompleted = null) { - string local = ""; + string error = ""; var path = PFConstants.VideoFolder; + var filepath = path + $"/{fileName}"; //根据id读取本地文件 if (!Directory.Exists(path)) { Directory.CreateDirectory(path); } - var filepath= path+$"/{fileName}"; - if (File.Exists(filepath)) - { - local = filepath; - - } //本地文件读取不到读取网络文件 else { @@ -493,21 +489,24 @@ namespace Assets.Scripts } if (request.isNetworkError || request.isHttpError) { + error = request.error; Debug.Log(request.error); } else { - var fs = File.Create(filepath); - fs.Write(request.downloadHandler.data, 0, request.downloadHandler.data.Length); - fs.Close(); - fs.Dispose(); - fs = null; - local = filepath; + Task.Run(() => + { + var fs = File.Create(filepath); + fs.Write(request.downloadHandler.data, 0, request.downloadHandler.data.Length); + fs.Close(); + fs.Dispose(); + fs = null; + }); } } if (onCompleted != null) { - onCompleted.Invoke(local); + onCompleted.Invoke(error); } } static IEnumerator DownloadImage(MaskableGraphic img,string MediaUrl, Action action = null,UnityAction callback = null) diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index c5b8a1b5..595c2954 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -11,6 +11,9 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/MainScene.unity guid: ab586a3c1bacd4a48a55178eb06fe0cc + - enabled: 1 + path: Assets/Scenes/VideoPlay.unity + guid: f25b9f482e27079448d130ae1ed0ea34 - enabled: 1 path: Assets/Scenes/Ride.unity guid: d9f6ee75d0d54714fb4d2f90016a28bc diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 33009962..aae43674 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -4,7 +4,7 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 5 + m_CurrentQuality: 3 m_QualitySettings: - serializedVersion: 2 name: Very Low @@ -89,7 +89,7 @@ QualitySettings: shadowNearPlaneOffset: 3 shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 + shadowmaskMode: 1 skinWeights: 2 textureQuality: 0 anisotropicTextures: 1 @@ -230,7 +230,7 @@ QualitySettings: PS4: 5 PSP2: 2 Stadia: 5 - Standalone: 5 + Standalone: 3 WebGL: 3 Windows Store Apps: 5 XboxOne: 5 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 60909d06..3aedfac4 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -16,12 +16,12 @@ TagManager: - - Terrain - Minimap - - - - - - - - - - - - + - GameRoom01 + - GameRoom02 + - GameRoom03 + - GameRoom04 + - GameRoom05 + - GameRoom06 - - -