diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/JianTou.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/JianTou.meta new file mode 100644 index 00000000..6c274c2e --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/JianTou.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab8eab0f13146d94f93cd8ea4eb76d90 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/JianTou/JiantouBody.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/JianTou/JiantouBody.png new file mode 100644 index 00000000..9d5687a2 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/JianTou/JiantouBody.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/JianTou/JiantouBody.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/JianTou/JiantouBody.png.meta new file mode 100644 index 00000000..dd291a07 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/JianTou/JiantouBody.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 76a14179dc0c83c4690b2a66ccbe8ebc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/JianTou/Sslx_Ui_ Fight_JianTou_v02.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/JianTou/Sslx_Ui_ Fight_JianTou_v02.png new file mode 100644 index 00000000..248627fb Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/JianTou/Sslx_Ui_ Fight_JianTou_v02.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/JianTou/Sslx_Ui_ Fight_JianTou_v02.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/JianTou/Sslx_Ui_ Fight_JianTou_v02.png.meta new file mode 100644 index 00000000..fc8a445e --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/JianTou/Sslx_Ui_ Fight_JianTou_v02.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: 638643acd29586349b577e6539dc5035 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Sslx_Ui_ Fight_JianTou_v02_0 + rect: + serializedVersion: 2 + x: 1519 + y: 1919 + width: 209 + height: 175 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 83bb6ab8567271c448f6ce1816bece27 + internalID: -1395943400 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2d212b6d357d45f4fbd18f8bf66ebefd + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Sslx_Ui_ Fight_JianTou_v02_0: -1395943400 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/PaiKu/Sslx_Card_Ui_PaiKu_JianTou2_v01.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/PaiKu/Sslx_Card_Ui_PaiKu_JianTou2_v01.png.meta index 3990e9fb..5fbb2735 100644 --- a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/PaiKu/Sslx_Card_Ui_PaiKu_JianTou2_v01.png.meta +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/PaiKu/Sslx_Card_Ui_PaiKu_JianTou2_v01.png.meta @@ -114,9 +114,9 @@ TextureImporter: rect: serializedVersion: 2 x: 1544 - y: 950 + y: 1075 width: 152 - height: 248 + height: 121 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -130,6 +130,27 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: Sslx_Card_Ui_PaiKu_JianTou2_v01_1 + rect: + serializedVersion: 2 + x: 1544 + y: 958 + width: 152 + height: 117 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 87076a9e222d2f64baf9680c4f7a5133 + internalID: 1760380913 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -142,6 +163,7 @@ TextureImporter: secondaryTextures: [] nameFileIdTable: Sslx_Card_Ui_PaiKu_JianTou2_v01_0: -971874114 + Sslx_Card_Ui_PaiKu_JianTou2_v01_1: 1760380913 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI.meta new file mode 100644 index 00000000..c2e8be2e --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3192921662cdc2b489eb86497dddcb37 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/1B157082170CF3A5C34BB83B0846C815.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/1B157082170CF3A5C34BB83B0846C815.png new file mode 100644 index 00000000..49d3b27a Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/1B157082170CF3A5C34BB83B0846C815.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/1B157082170CF3A5C34BB83B0846C815.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/1B157082170CF3A5C34BB83B0846C815.png.meta new file mode 100644 index 00000000..bc35c81f --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/1B157082170CF3A5C34BB83B0846C815.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: c20ff97590e1a274c99aa441b08a233f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: 1B157082170CF3A5C34BB83B0846C815_0 + rect: + serializedVersion: 2 + x: 2069 + y: 3917 + width: 4052 + height: 520 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fa357462b118eeb41955bb8a4cc83303 + internalID: 534632625 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: e704b941f493938449390f89e5e2152a + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + 1B157082170CF3A5C34BB83B0846C815_0: 534632625 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/20AC3E7CC5691F13FE52682FE30CA982.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/20AC3E7CC5691F13FE52682FE30CA982.png new file mode 100644 index 00000000..020b826e Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/20AC3E7CC5691F13FE52682FE30CA982.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/20AC3E7CC5691F13FE52682FE30CA982.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/20AC3E7CC5691F13FE52682FE30CA982.png.meta new file mode 100644 index 00000000..c7633a17 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/20AC3E7CC5691F13FE52682FE30CA982.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: 2f6f49c224dce554f8fcb735f8fa94de +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: 20AC3E7CC5691F13FE52682FE30CA982_0 + rect: + serializedVersion: 2 + x: 45 + y: 4036 + width: 746 + height: 376 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4b3660bc907fad24999e6e9af036683d + internalID: 1657679903 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 68786cd06ae8f7f43872da14e497253a + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + 20AC3E7CC5691F13FE52682FE30CA982_0: 1657679903 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/3B5364BCB92207EC429F0B5EFDC66557.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/3B5364BCB92207EC429F0B5EFDC66557.png new file mode 100644 index 00000000..76c7a2cb Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/3B5364BCB92207EC429F0B5EFDC66557.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/3B5364BCB92207EC429F0B5EFDC66557.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/3B5364BCB92207EC429F0B5EFDC66557.png.meta new file mode 100644 index 00000000..a5a576db --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/3B5364BCB92207EC429F0B5EFDC66557.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: ea9f5ff9aa2e02441be79e3c668dc9dd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: 3B5364BCB92207EC429F0B5EFDC66557_0 + rect: + serializedVersion: 2 + x: 579 + y: 4069 + width: 1602 + height: 308 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c880931f6bffe09449384ebab0a610bd + internalID: 594789301 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 9a537ba3254242b4f8b4b426df80226e + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + 3B5364BCB92207EC429F0B5EFDC66557_0: 594789301 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/89FBBC1FF43F9418C799D793268E8EEB.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/89FBBC1FF43F9418C799D793268E8EEB.png new file mode 100644 index 00000000..34245e3e Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/89FBBC1FF43F9418C799D793268E8EEB.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/89FBBC1FF43F9418C799D793268E8EEB.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/89FBBC1FF43F9418C799D793268E8EEB.png.meta new file mode 100644 index 00000000..2639f716 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/89FBBC1FF43F9418C799D793268E8EEB.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: 421b33209800a2d4296144dbe840cf38 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: 89FBBC1FF43F9418C799D793268E8EEB_0 + rect: + serializedVersion: 2 + x: 0 + y: 3176 + width: 7927 + height: 1261 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d94664cabf53b514e870e6806c0349d5 + internalID: -1959308350 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: bce830a74a7b88249babb391ae1c5932 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + 89FBBC1FF43F9418C799D793268E8EEB_0: -1959308350 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/920002107B5A23C7FD3C979AB2CC1404.png b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/920002107B5A23C7FD3C979AB2CC1404.png new file mode 100644 index 00000000..812a9377 Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/920002107B5A23C7FD3C979AB2CC1404.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/920002107B5A23C7FD3C979AB2CC1404.png.meta b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/920002107B5A23C7FD3C979AB2CC1404.png.meta new file mode 100644 index 00000000..f96c4c39 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Fight/TopUI/920002107B5A23C7FD3C979AB2CC1404.png.meta @@ -0,0 +1,149 @@ +fileFormatVersion: 2 +guid: 5575f0a71ed2f6745b4b3906298ec8ce +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: 920002107B5A23C7FD3C979AB2CC1404_0 + rect: + serializedVersion: 2 + x: 5920 + y: 4077 + width: 1869 + height: 305 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 822bb5355c0a0354bb3acb91f2a61961 + internalID: 137135877 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 972e17153afb74f468cd6886632371de + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + 920002107B5A23C7FD3C979AB2CC1404_0: 137135877 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/RelicList.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/RelicList.asset new file mode 100644 index 00000000..7bc0f0ad --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/RelicList.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 904fb4225c416d84e891fac047459035, type: 3} + m_Name: RelicList + m_EditorClassIdentifier: + relicClassNameList: + - LegacyNode_FireHeart diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/RelicList.asset.meta b/ColorlessWorld-2024-4-2/Assets/GameDate/RelicList.asset.meta new file mode 100644 index 00000000..fefdb282 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/RelicList.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0ccbda8ca8e9a4146aebd15491d3b067 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/LineMaterial/Arrow.mat b/ColorlessWorld-2024-4-2/Assets/Image/LineMaterial/Arrow.mat new file mode 100644 index 00000000..d72421aa --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/LineMaterial/Arrow.mat @@ -0,0 +1,143 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7603846690958700338 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Arrow + m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _EMISSION + - _ENVIRONMENTREFLECTIONS_OFF + - _GLOSSYREFLECTIONS_OFF + - _RECEIVE_SHADOWS_OFF + - _SPECULARHIGHLIGHTS_OFF + - _SPECULAR_SETUP + - _SURFACE_TYPE_TRANSPARENT + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - DepthOnly + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 76a14179dc0c83c4690b2a66ccbe8ebc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: -0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 76a14179dc0c83c4690b2a66ccbe8ebc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 1 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 10 + - _EnvironmentReflections: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 0 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0.0009765625, g: 0.0009765625, b: 0.0009765625, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/ColorlessWorld-2024-4-2/Assets/Image/LineMaterial/Arrow.mat.meta b/ColorlessWorld-2024-4-2/Assets/Image/LineMaterial/Arrow.mat.meta new file mode 100644 index 00000000..891be630 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/LineMaterial/Arrow.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c819cf7343aee804e813e0e416cd74f5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIconInUIBar.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIconInUIBar.prefab index 5007ef08..99ce9215 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIconInUIBar.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/BuffPrefab/BuffIconInUIBar.prefab @@ -32,11 +32,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 7957164916501873808} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 5.2, y: -4.9} - m_SizeDelta: {x: 30.003, y: 29.992} - m_Pivot: {x: 0, y: 1} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 3.88, y: -2.89} + m_SizeDelta: {x: 30.002998, y: 29.992} + m_Pivot: {x: 1, y: 0} --- !u!222 &8024669248513866792 CanvasRenderer: m_ObjectHideFlags: 0 @@ -185,7 +185,7 @@ RectTransform: m_GameObject: {fileID: 8664123997041071156} 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_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 3111096710439815476} @@ -195,7 +195,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4202242118663527483 CanvasRenderer: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForUse/ArrowHead.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForUse/ArrowHead.prefab new file mode 100644 index 00000000..b714eaba --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForUse/ArrowHead.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4106926250085604372 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5693795209727617443} + - component: {fileID: 5678038120669733031} + - component: {fileID: 4551448948175320899} + m_Layer: 5 + m_Name: ArrowHead + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5693795209727617443 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4106926250085604372} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 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: 60, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5678038120669733031 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4106926250085604372} + m_CullTransparentMesh: 1 +--- !u!114 &4551448948175320899 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4106926250085604372} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1395943400, guid: 638643acd29586349b577e6539dc5035, 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/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForUse/ArrowHead.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForUse/ArrowHead.prefab.meta new file mode 100644 index 00000000..615c20e4 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForUse/ArrowHead.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bba96dcfa1764264db01c5ffddd7f70e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForUse/Card_v01-PuTong.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForUse/Card_v01-PuTong.prefab index f37e51a7..30c7f352 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForUse/Card_v01-PuTong.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForUse/Card_v01-PuTong.prefab @@ -719,6 +719,8 @@ GameObject: - component: {fileID: 5304992815847150061} - component: {fileID: 1230043771585378953} - component: {fileID: 4530502908829594795} + - component: {fileID: 4951825135322603472} + - component: {fileID: 1538732622801911325} m_Layer: 5 m_Name: AimPanel m_TagString: Untagged @@ -790,7 +792,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5174392397216232880} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2dea2a5cfc33ee743a3afdfa030e52bc, type: 3} m_Name: @@ -801,6 +803,129 @@ MonoBehaviour: type: 3} arrowNodeNum: 10 scaleFactor: 0.3 +--- !u!114 &4951825135322603472 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5174392397216232880} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0783a22dd58dfc49bcaebf4f88b8c82, type: 3} + m_Name: + m_EditorClassIdentifier: + arrowHeadPrefab: {fileID: 4106926250085604372, guid: bba96dcfa1764264db01c5ffddd7f70e, + type: 3} + arrowNodePrefab: {fileID: 8460418545197081843, guid: 3d423db417406c447b5b43b4a3d7819c, + type: 3} + arrowNodeNum: 20 + scaleFactor: 1 + lineRenderer: {fileID: 1538732622801911325} +--- !u!120 &1538732622801911325 +LineRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5174392397216232880} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: c819cf7343aee804e813e0e416cd74f5, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1637390125 + m_SortingLayer: 1 + m_SortingOrder: -1 + m_Positions: + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 1} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.51836777 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + textureScale: {x: 1, y: 1} + shadowBias: 0.5 + generateLightingData: 0 + m_MaskInteraction: 0 + m_UseWorldSpace: 1 + m_Loop: 0 + m_ApplyActiveColorSpace: 1 --- !u!1 &5247884972612715378 GameObject: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForUse/EmptyNode.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForUse/EmptyNode.prefab new file mode 100644 index 00000000..a860a9fc --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForUse/EmptyNode.prefab @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8460418545197081843 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8128326907243822396} + m_Layer: 5 + m_Name: EmptyNode + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8128326907243822396 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8460418545197081843} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForUse/EmptyNode.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForUse/EmptyNode.prefab.meta new file mode 100644 index 00000000..55be527d --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForUse/EmptyNode.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3d423db417406c447b5b43b4a3d7819c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index 8f838f36..30ba49c2 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -379,15 +379,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 5 m_Right: 0 - m_Top: 0 + m_Top: 6 m_Bottom: 0 m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 20, y: 20} - m_Spacing: {x: 0, y: 0} + m_Spacing: {x: 12, y: 10} m_Constraint: 0 m_ConstraintCount: 2 --- !u!1 &24216561 @@ -426,6 +426,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &37792742 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 37792743} + - component: {fileID: 37792745} + - component: {fileID: 37792744} + m_Layer: 5 + m_Name: BackGround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &37792743 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 37792742} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 846544929} + 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: 390.5} + m_SizeDelta: {x: 1920, y: 299.02} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &37792744 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 37792742} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1959308350, guid: 421b33209800a2d4296144dbe840cf38, 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!222 &37792745 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 37792742} + m_CullTransparentMesh: 1 --- !u!1 &60998406 GameObject: m_ObjectHideFlags: 0 @@ -525,13 +600,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 60998406} serializedVersion: 2 - m_LocalRotation: {x: 0.4694715, y: 0, z: 0, w: 0.8829476} + m_LocalRotation: {x: 0.5224985, y: 0, z: 0, w: 0.8526402} m_LocalPosition: {x: 0.082, y: 0.13, z: 0.359} m_LocalScale: {x: 0.17, y: 0.17, z: 0.17} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1809205616} - m_LocalEulerAnglesHint: {x: 56, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 63, y: 0, z: 0} --- !u!1 &78419876 GameObject: m_ObjectHideFlags: 0 @@ -618,6 +693,7 @@ GameObject: - component: {fileID: 83788479} - component: {fileID: 83788481} - component: {fileID: 83788480} + - component: {fileID: 83788482} m_Layer: 5 m_Name: Money m_TagString: Untagged @@ -683,6 +759,20 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 83788478} m_CullTransparentMesh: 1 +--- !u!114 &83788482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 83788478} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e047e05c093a0674c931932f08547152, type: 3} + m_Name: + m_EditorClassIdentifier: + text: {fileID: 506890230} + textType: 0 --- !u!1 &90854702 GameObject: m_ObjectHideFlags: 0 @@ -1793,10 +1883,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 637486498} + - {fileID: 413879017} - {fileID: 467535682} - - {fileID: 345108945} - - {fileID: 1755253524} - - {fileID: 1317009332} m_Father: {fileID: 846544929} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1817,14 +1905,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 1455608431, guid: 8a00988947059b248a002975e072227b, type: 3} + m_Sprite: {fileID: -1959308350, guid: 421b33209800a2d4296144dbe840cf38, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2136,17 +2224,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 218472041} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 674273954} m_Father: {fileID: 1803518538} 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: -601, y: -207} - m_SizeDelta: {x: 234.5, y: 66.95} + m_AnchoredPosition: {x: -592, y: -306} + m_SizeDelta: {x: 491.36, y: 140.29} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &218472043 MonoBehaviour: @@ -2217,14 +2305,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.690566, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 0.83584905, b: 0.83584905, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 1455173944, guid: 92a9d55810cbdb940bd3e76071d61172, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2425,17 +2513,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 253958914} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000014892} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00001480478} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1793415342} + m_Father: {fileID: 1277422389} 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: -4.2075, y: 0.16752} - m_SizeDelta: {x: 969.54, y: 890.33} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -4.482483, y: -0.16751099} + m_SizeDelta: {x: 27.010029, y: 0.33996582} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &253958916 MonoBehaviour: @@ -2554,6 +2642,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 263387096} m_CullTransparentMesh: 1 +--- !u!1 &278825959 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 278825960} + - component: {fileID: 278825962} + - component: {fileID: 278825961} + m_Layer: 5 + m_Name: Down + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &278825960 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 278825959} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0009835, y: 1.0009835, z: 1.0009835} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 552008217} + 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: 291, y: -26.699898} + m_SizeDelta: {x: 70.7, y: 57.33} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &278825961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 278825959} + 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: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 1760380913, guid: 6d779d4bfb58a7748853f39a1aea011a, 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!222 &278825962 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 278825959} + m_CullTransparentMesh: 1 --- !u!1 &282261046 GameObject: m_ObjectHideFlags: 0 @@ -2778,7 +2941,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.9137255} + m_Color: {r: 0, g: 0, b: 0, a: 0.96862745} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3071,8 +3234,8 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 345108944} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000018043325} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00002960956} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -3080,11 +3243,11 @@ RectTransform: - {fileID: 734247258} - {fileID: 1833978458} - {fileID: 144591442} - m_Father: {fileID: 197216736} + m_Father: {fileID: 1293189437} 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: 15.76, y: 54.680008} + m_AnchoredPosition: {x: -16.400011, y: 5.630024} m_SizeDelta: {x: 640.25, y: 30.59} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &345108946 @@ -3626,7 +3789,7 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 1 ---- !u!1 &427957700 +--- !u!1 &413879016 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3634,78 +3797,75 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 427957701} - - component: {fileID: 427957703} - - component: {fileID: 427957702} - m_Layer: 0 - m_Name: HP + - component: {fileID: 413879017} + - component: {fileID: 413879019} + - component: {fileID: 413879018} + m_Layer: 5 + m_Name: Name m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &427957701 +--- !u!224 &413879017 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 427957700} + m_GameObject: {fileID: 413879016} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.005} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 1817435586} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1549458908} + m_Father: {fileID: 197216736} 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.0009994507} - m_SizeDelta: {x: 559.5, y: 143.72} + m_AnchoredPosition: {x: -860.87, y: 53.87} + m_SizeDelta: {x: 173.48, y: 87.9} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &427957702 +--- !u!114 &413879018 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 427957700} + m_GameObject: {fileID: 413879016} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 100 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 108 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u751F\u547D\u503C\uFF1A" ---- !u!222 &427957703 + m_Sprite: {fileID: 1657679903, guid: 2f6f49c224dce554f8fcb735f8fa94de, 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!222 &413879019 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 427957700} + m_GameObject: {fileID: 413879016} m_CullTransparentMesh: 1 ---- !u!1 &442538737 +--- !u!1 &419147790 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3713,59 +3873,57 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 442538738} - - component: {fileID: 442538740} - - component: {fileID: 442538739} + - component: {fileID: 419147791} + - component: {fileID: 419147793} + - component: {fileID: 419147792} m_Layer: 5 - m_Name: EndTurnAndCardPanle + m_Name: Down m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &442538738 + m_IsActive: 0 +--- !u!224 &419147791 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 442538737} + m_GameObject: {fileID: 419147790} 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_LocalScale: {x: 1.0009835, y: 1.0009835, z: 1.0009835} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 216708360} - - {fileID: 1755393221} - m_Father: {fileID: 846544929} + m_Children: [] + m_Father: {fileID: 752502469} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 38, y: 0} - m_SizeDelta: {x: 419.27014, y: 334.6635} - m_Pivot: {x: 1, y: 0} ---- !u!114 &442538739 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 296.99988, y: -26.699799} + m_SizeDelta: {x: 70.7, y: 57.33} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &419147792 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 442538737} + m_GameObject: {fileID: 419147790} 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: 0} - m_RaycastTarget: 0 + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 1760380913, guid: 6d779d4bfb58a7748853f39a1aea011a, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3774,15 +3932,246 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &442538740 +--- !u!222 &419147793 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 442538737} + m_GameObject: {fileID: 419147790} m_CullTransparentMesh: 1 ---- !u!1 &449271697 +--- !u!1 &427957700 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 427957701} + - component: {fileID: 427957703} + - component: {fileID: 427957702} + m_Layer: 0 + m_Name: HP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &427957701 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 427957700} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.005} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1817435586} + 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.0009994507} + m_SizeDelta: {x: 559.5, y: 143.72} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &427957702 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 427957700} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 100 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 108 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u751F\u547D\u503C\uFF1A" +--- !u!222 &427957703 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 427957700} + m_CullTransparentMesh: 1 +--- !u!1 &442538737 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 442538738} + - component: {fileID: 442538740} + - component: {fileID: 442538739} + m_Layer: 5 + m_Name: EndTurnAndCardPanle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &442538738 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 442538737} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 216708360} + - {fileID: 1755393221} + m_Father: {fileID: 846544929} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 38, y: 0} + m_SizeDelta: {x: 419.27014, y: 334.6635} + m_Pivot: {x: 1, y: 0} +--- !u!114 &442538739 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 442538737} + 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: 0} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!222 &442538740 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 442538737} + m_CullTransparentMesh: 1 +--- !u!1 &444645837 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 444645838} + - component: {fileID: 444645840} + - component: {fileID: 444645839} + m_Layer: 5 + m_Name: Down + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &444645838 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 444645837} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1786742915} + 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: 295.00006, y: -26.699858} + m_SizeDelta: {x: 70.7, y: 57.33} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &444645839 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 444645837} + 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: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 1760380913, guid: 6d779d4bfb58a7748853f39a1aea011a, 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!222 &444645840 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 444645837} + m_CullTransparentMesh: 1 +--- !u!1 &449271697 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3853,19 +4242,18 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 467535681} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalPosition: {x: 0, y: 0, z: 0.00000023132} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1549458908} - {fileID: 115507089} - {fileID: 83788479} m_Father: {fileID: 197216736} 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: -696.13, y: 57} - m_SizeDelta: {x: 486.23, y: 28.39} + m_AnchoredPosition: {x: -625.72, y: 59.000034} + m_SizeDelta: {x: 388.13, y: 65.11} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &467535683 MonoBehaviour: @@ -3880,15 +4268,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 594789301, guid: ea9f5ff9aa2e02441be79e3c668dc9dd, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4207,7 +4595,7 @@ RectTransform: 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: 6, y: 0.00000047683716} + m_AnchoredPosition: {x: -32, y: 0.00000047683716} m_SizeDelta: {x: 28.399994, y: 28.49} m_Pivot: {x: 1, y: 0.5} --- !u!114 &471985939 @@ -4820,7 +5208,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 1191452197} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.534446} + m_AnchorMin: {x: 0, y: 0.5587516} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} @@ -4972,8 +5360,9 @@ RectTransform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1584687989} - - {fileID: 1346482991} - - {fileID: 1769821349} + - {fileID: 910259997} + - {fileID: 813012071} + - {fileID: 278825960} m_Father: {fileID: 809894446} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -5027,23 +5416,23 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1086901269} m_TargetAssemblyTypeName: LookCardManager, Assembly-CSharp - m_MethodName: SortWithType - m_Mode: 1 + m_MethodName: SetSortArrow + m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 1 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 1086901269} m_TargetAssemblyTypeName: LookCardManager, Assembly-CSharp - m_MethodName: SetDefaultSortBool - m_Mode: 2 + m_MethodName: SortWithType + m_Mode: 1 m_Arguments: - m_ObjectArgument: {fileID: 1769821348} - m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: @@ -5292,7 +5681,7 @@ GameObject: - component: {fileID: 599605975} - component: {fileID: 599605974} m_Layer: 5 - m_Name: Image (1) + m_Name: UP m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5305,8 +5694,8 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 599605972} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00011843824} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5314,8 +5703,8 @@ RectTransform: 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: 295, y: -0.15993} - m_SizeDelta: {x: 70.7, y: 115.3} + m_AnchoredPosition: {x: 295.00006, y: 28.665102} + m_SizeDelta: {x: 70.7, y: 57.65} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &599605974 MonoBehaviour: @@ -5534,7 +5923,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 637486497} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalPosition: {x: 0, y: 0, z: 0.000034236} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -5545,8 +5934,8 @@ RectTransform: 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: 703, y: 58} - m_SizeDelta: {x: 381.21, y: 28.39} + m_AnchoredPosition: {x: 699.73, y: 59.00001} + m_SizeDelta: {x: 452.26, y: 65.11} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &637486499 MonoBehaviour: @@ -5561,15 +5950,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 137135877, guid: 5575f0a71ed2f6745b4b3906298ec8ce, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5688,16 +6077,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 674273953} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 218472042} 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_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -31, y: 15} + m_SizeDelta: {x: 492, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &674273955 MonoBehaviour: @@ -5721,11 +6110,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 30 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 50 + m_MaxSize: 60 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -5939,6 +6328,81 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d344126aa8082fa48b7e5f19eff09202, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &704929075 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 704929076} + - component: {fileID: 704929078} + - component: {fileID: 704929077} + m_Layer: 5 + m_Name: UnderGround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &704929076 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 704929075} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0009835, y: 1.0009835, z: 1.0009835} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 752502469} + 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: 297, y: -0.16003418} + m_SizeDelta: {x: 70.7, y: 115.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &704929077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 704929075} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1304708788, guid: bb90636bf6490f94288d41a94dee3f44, 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!222 &704929078 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 704929075} + m_CullTransparentMesh: 1 --- !u!1 &734247257 GameObject: m_ObjectHideFlags: 0 @@ -6279,8 +6743,9 @@ RectTransform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 993436076} - - {fileID: 1618689995} - - {fileID: 835622303} + - {fileID: 704929076} + - {fileID: 1266461970} + - {fileID: 419147791} m_Father: {fileID: 809894446} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -6334,23 +6799,23 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1086901269} m_TargetAssemblyTypeName: LookCardManager, Assembly-CSharp - m_MethodName: SortWithCost - m_Mode: 1 + m_MethodName: SetSortArrow + m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 2 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 1086901269} m_TargetAssemblyTypeName: LookCardManager, Assembly-CSharp - m_MethodName: SetDefaultSortBool - m_Mode: 2 + m_MethodName: SortWithCost + m_Mode: 1 m_Arguments: - m_ObjectArgument: {fileID: 835622302} - m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: @@ -6420,7 +6885,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 752834681} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -6428,12 +6893,12 @@ RectTransform: - {fileID: 1263372811} - {fileID: 1659862524} - {fileID: 1586291466} - m_Father: {fileID: 893839549} + m_Father: {fileID: 1111149034} 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: 11.24, y: -94.66} - m_SizeDelta: {x: 851, y: 890.67} + m_AnchoredPosition: {x: 3.6899762, y: -23.249962} + m_SizeDelta: {x: 851, y: 844.17} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &752834683 MonoBehaviour: @@ -6478,7 +6943,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -6951,7 +7416,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1793415342} + - {fileID: 1277422389} - {fileID: 1786742915} - {fileID: 552008217} - {fileID: 752502469} @@ -6976,7 +7441,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.9137255} + m_Color: {r: 0, g: 0, b: 0, a: 0.96862745} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -7001,6 +7466,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 809894445} m_CullTransparentMesh: 1 +--- !u!1 &813012068 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 813012071} + - component: {fileID: 813012070} + - component: {fileID: 813012069} + m_Layer: 5 + m_Name: UP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &813012069 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 813012068} + 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: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -971874114, guid: 6d779d4bfb58a7748853f39a1aea011a, 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!222 &813012070 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 813012068} + m_CullTransparentMesh: 1 +--- !u!224 &813012071 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 813012068} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00023687648} + m_LocalScale: {x: 1.0009835, y: 1.0009835, z: 1.0009835} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 552008217} + 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: 291, y: 28.66517} + m_SizeDelta: {x: 70.7, y: 57.65} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &816979500 GameObject: m_ObjectHideFlags: 0 @@ -7036,7 +7576,7 @@ RectTransform: 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: -71, y: 0} + m_AnchoredPosition: {x: -120, y: 0} m_SizeDelta: {x: 41.100006, y: 28.07} m_Pivot: {x: 1, y: 0.5} --- !u!114 &816979502 @@ -7233,109 +7773,34 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 0% ---- !u!222 &834322865 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 834322863} - m_CullTransparentMesh: 1 ---- !u!224 &834322866 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 834322863} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 548608356} - 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: -350} - m_SizeDelta: {x: 1000, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &835622302 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 835622303} - - component: {fileID: 835622305} - - component: {fileID: 835622304} - m_Layer: 5 - m_Name: Image (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &835622303 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 835622302} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 752502469} - 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: 295, y: 0} - m_SizeDelta: {x: 70.7, y: 115.3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &835622304 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 835622302} - 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: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: -971874114, guid: 6d779d4bfb58a7748853f39a1aea011a, 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!222 &835622305 + m_Text: 0% +--- !u!222 &834322865 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 835622302} + m_GameObject: {fileID: 834322863} m_CullTransparentMesh: 1 +--- !u!224 &834322866 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 834322863} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 548608356} + 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: -350} + m_SizeDelta: {x: 1000, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &846544928 GameObject: m_ObjectHideFlags: 0 @@ -7366,9 +7831,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 37792743} - {fileID: 1504140803} - {fileID: 442538738} - {fileID: 1748859174} + - {fileID: 1317009332} + - {fileID: 1293189437} - {fileID: 1998717001} - {fileID: 809894446} - {fileID: 1803518538} @@ -7703,7 +8171,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 752834682} + - {fileID: 1111149034} - {fileID: 1792619720} m_Father: {fileID: 846544929} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7725,7 +8193,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.9137255} + m_Color: {r: 0, g: 0, b: 0, a: 0.96862745} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -7858,6 +8326,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 898728703} m_CullTransparentMesh: 1 +--- !u!1 &910259996 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 910259997} + - component: {fileID: 910259999} + - component: {fileID: 910259998} + m_Layer: 5 + m_Name: UnderGround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &910259997 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 910259996} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0009835, y: 1.0009835, z: 1.0009835} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 552008217} + 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: 291, y: -0.15992641} + m_SizeDelta: {x: 70.7, y: 115.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &910259998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 910259996} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1304708788, guid: bb90636bf6490f94288d41a94dee3f44, 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!222 &910259999 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 910259996} + m_CullTransparentMesh: 1 --- !u!1 &919678623 GameObject: m_ObjectHideFlags: 0 @@ -8540,7 +9083,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6309\u83B7\u5F97\u987A\u5E8F\u6392\u5E8F" + m_Text: "\u6309\u8D39\u7528\u6392\u5E8F" --- !u!222 &993436078 CanvasRenderer: m_ObjectHideFlags: 0 @@ -9018,7 +9561,7 @@ MonoBehaviour: m_Padding: m_Left: 28 m_Right: 0 - m_Top: 76 + m_Top: 30 m_Bottom: 0 m_ChildAlignment: 0 m_StartCorner: 0 @@ -9044,6 +9587,14 @@ MonoBehaviour: lookCardPrefab: {fileID: 1620241905568773253, guid: 5537996c2537a6d4daacc1d4ff899078, type: 3} cardScale: {x: 1.15, y: 1.15, z: 1.15} + arrowListDown: + - {fileID: 444645837} + - {fileID: 278825959} + - {fileID: 419147790} + arrowListUp: + - {fileID: 599605972} + - {fileID: 813012068} + - {fileID: 1266461967} --- !u!1 &1093559904 GameObject: m_ObjectHideFlags: 0 @@ -9187,7 +9738,7 @@ MonoBehaviour: m_Padding: m_Left: 45 m_Right: 0 - m_Top: 60 + m_Top: 30 m_Bottom: 0 m_ChildAlignment: 0 m_StartCorner: 0 @@ -9252,6 +9803,82 @@ Transform: m_Children: [] m_Father: {fileID: 952604643} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1111149033 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1111149034} + - component: {fileID: 1111149036} + - component: {fileID: 1111149035} + m_Layer: 5 + m_Name: MainViewGround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1111149034 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1111149033} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 752834682} + m_Father: {fileID: 893839549} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 7.549988, y: -94.660034} + m_SizeDelta: {x: -1042.86, y: -189.33002} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1111149035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1111149033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1040661376, guid: cde2eb21897fa2946b340fe7d4a43111, 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!222 &1111149036 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1111149033} + m_CullTransparentMesh: 1 --- !u!1 &1136505122 GameObject: m_ObjectHideFlags: 0 @@ -9913,7 +10540,6 @@ MonoBehaviour: cardPrefabPuTong: {fileID: 4169693119190854323, guid: 6c7404c0eeccf0442b1a9ddea8878459, type: 3} cardList: - cardDeck: {fileID: 11400000, guid: 1126a56dae0a1ab40821c18c251900ef, type: 2} --- !u!4 &1190351098 Transform: m_ObjectHideFlags: 0 @@ -10000,7 +10626,7 @@ RectTransform: 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: -163, y: 0} + m_AnchoredPosition: {x: -226, y: 0} m_SizeDelta: {x: 33.240005, y: 28.1} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1225743232 @@ -10390,7 +11016,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -31, y: 0} + m_SizeDelta: {x: -29.2, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1263372812 MonoBehaviour: @@ -10576,6 +11202,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1265058007} m_CullTransparentMesh: 1 +--- !u!1 &1266461967 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1266461970} + - component: {fileID: 1266461969} + - component: {fileID: 1266461968} + m_Layer: 5 + m_Name: UP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &1266461968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1266461967} + 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: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -971874114, guid: 6d779d4bfb58a7748853f39a1aea011a, 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!222 &1266461969 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1266461967} + m_CullTransparentMesh: 1 +--- !u!224 &1266461970 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1266461967} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00023687648} + m_LocalScale: {x: 1.0009835, y: 1.0009835, z: 1.0009835} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 752502469} + 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: 296.99988, y: 28.66513} + m_SizeDelta: {x: 70.7, y: 57.65} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1271583135 GameObject: m_ObjectHideFlags: 0 @@ -10670,7 +11371,84 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1271583135} + m_GameObject: {fileID: 1271583135} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!222 &1271583139 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271583135} + m_CullTransparentMesh: 1 +--- !u!1 &1277422388 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1277422389} + - component: {fileID: 1277422391} + - component: {fileID: 1277422390} + m_Layer: 5 + m_Name: MainVieGround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1277422389 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1277422388} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00001480478} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1793415342} + - {fileID: 253958915} + m_Father: {fileID: 809894446} + 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: 15.482502, y: -94.4925} + m_SizeDelta: {x: 969.54, y: 890.33} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1277422390 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1277422388} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -10678,14 +11456,14 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: -1040661376, guid: cde2eb21897fa2946b340fe7d4a43111, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -10694,13 +11472,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1271583139 +--- !u!222 &1277422391 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1271583135} + m_GameObject: {fileID: 1277422388} m_CullTransparentMesh: 1 --- !u!1 &1278694492 GameObject: @@ -10933,6 +11711,82 @@ Transform: m_Children: [] m_Father: {fileID: 1819238997} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1293189436 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1293189437} + - component: {fileID: 1293189439} + - component: {fileID: 1293189438} + m_Layer: 5 + m_Name: MiddleFloorsBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1293189437 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1293189436} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00002960956} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 345108945} + m_Father: {fileID: 846544929} + 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: 32.16, y: 484.83002} + m_SizeDelta: {x: 982.13, y: 109.91} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1293189438 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1293189436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 534632625, guid: c20ff97590e1a274c99aa441b08a233f, 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!222 &1293189439 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1293189436} + m_CullTransparentMesh: 1 --- !u!1 &1294001697 GameObject: m_ObjectHideFlags: 0 @@ -11292,7 +12146,7 @@ GameObject: - component: {fileID: 1317009334} - component: {fileID: 1317009333} m_Layer: 5 - m_Name: EnemySortPanel (1) + m_Name: EnemySortPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -11306,15 +12160,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1317009331} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000014689} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 197216736} + m_Children: + - {fileID: 1755253524} + m_Father: {fileID: 846544929} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -49, y: -68.37} + m_AnchoredPosition: {x: -49, y: -68.369995} m_SizeDelta: {x: 409.37, y: 166.66} m_Pivot: {x: 1, y: 1} --- !u!114 &1317009333 @@ -11454,81 +12309,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1322671365} m_CullTransparentMesh: 1 ---- !u!1 &1346482990 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1346482991} - - component: {fileID: 1346482993} - - component: {fileID: 1346482992} - m_Layer: 5 - m_Name: Image (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1346482991 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1346482990} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 552008217} - 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: 295, y: 0} - m_SizeDelta: {x: 70.7, y: 115.3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1346482992 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1346482990} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: -1304708788, guid: bb90636bf6490f94288d41a94dee3f44, 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!222 &1346482993 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1346482990} - m_CullTransparentMesh: 1 --- !u!1 &1373007394 GameObject: m_ObjectHideFlags: 0 @@ -12141,7 +12921,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1457874388} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: @@ -12150,8 +12930,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 92.379974, y: 0} - m_SizeDelta: {x: 83.6, y: 325.33} + m_AnchoredPosition: {x: 68.00003, y: -22} + m_SizeDelta: {x: 73.04, y: 325.33} m_Pivot: {x: 1, y: 1} --- !u!114 &1457874390 MonoBehaviour: @@ -12197,7 +12977,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1728580657} m_Direction: 2 m_Value: 1 - m_Size: 0.46555403 + m_Size: 0.44010368 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -12998,19 +13778,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1549458907} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 742474144} - m_Father: {fileID: 467535682} + m_Father: {fileID: 413879017} 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: -381.3, y: -0.1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -24.9, y: 0} m_SizeDelta: {x: 103.66, y: 31.79} - m_Pivot: {x: 1, y: 0.5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1549458909 MonoBehaviour: m_ObjectHideFlags: 0 @@ -13320,7 +14100,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6309\u83B7\u5F97\u987A\u5E8F\u6392\u5E8F" + m_Text: "\u6309\u79CD\u7C7B\u6392\u5E8F" --- !u!222 &1584687991 CanvasRenderer: m_ObjectHideFlags: 0 @@ -13433,8 +14213,8 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1586291465} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -13442,8 +14222,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -3.6900024, y: 0} - m_SizeDelta: {x: 26.14, y: 0} + m_AnchoredPosition: {x: -6.860016, y: 23.24997} + m_SizeDelta: {x: 50.570007, y: 46.500015} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1586291467 MonoBehaviour: @@ -13822,94 +14602,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1612911696} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 548608356} - m_Father: {fileID: 1601052150} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!1 &1618689994 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1618689995} - - component: {fileID: 1618689997} - - component: {fileID: 1618689996} - m_Layer: 5 - m_Name: Image (4) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1618689995 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1618689994} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 752502469} - 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: 295, y: 0} - m_SizeDelta: {x: 70.7, y: 115.3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1618689996 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1618689994} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: -1304708788, guid: bb90636bf6490f94288d41a94dee3f44, 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!222 &1618689997 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1618689994} - m_CullTransparentMesh: 1 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 548608356} + m_Father: {fileID: 1601052150} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &1622334930 GameObject: m_ObjectHideFlags: 0 @@ -14254,8 +14959,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 80, y: -49} - m_SizeDelta: {x: 34, y: -413.18} + m_AnchoredPosition: {x: 75.20001, y: -66} + m_SizeDelta: {x: 32.2, y: -413.18} m_Pivot: {x: 1, y: 1} --- !u!114 &1659862525 MonoBehaviour: @@ -14301,7 +15006,7 @@ MonoBehaviour: m_HandleRect: {fileID: 546655270} m_Direction: 2 m_Value: 1 - m_Size: 0.46555403 + m_Size: 0.44124842 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -14459,6 +15164,54 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1685999706} m_CullTransparentMesh: 1 +--- !u!1 &1690695888 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1690695890} + - component: {fileID: 1690695889} + m_Layer: 0 + m_Name: PlayerStatsManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1690695889 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1690695888} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f47edfc6a4071b418c9f81b172bb82f, type: 3} + m_Name: + m_EditorClassIdentifier: + playerState: {fileID: 11400000, guid: afd7daa84e9985b45bd00c91505acb37, type: 2} + levelDevelopData: {fileID: 11400000, guid: 587726a845a2bc7498172485a1bd194b, type: 2} + cardDeck: {fileID: 11400000, guid: 1126a56dae0a1ab40821c18c251900ef, type: 2} + relicList: {fileID: 11400000, guid: 0ccbda8ca8e9a4146aebd15491d3b067, type: 2} +--- !u!4 &1690695890 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1690695888} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.730608, y: 2.4630485, z: 0.39050776} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1704571197 GameObject: m_ObjectHideFlags: 0 @@ -14704,7 +15457,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -80.6, y: 0} + m_SizeDelta: {x: -70.04, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1728455097 MonoBehaviour: @@ -14789,7 +15542,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 24216562} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.534446} + m_AnchorMin: {x: 0, y: 0.55989635} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} @@ -15394,15 +16147,15 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1755253523} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000014689} + m_LocalPosition: {x: 0, y: 0, z: 0.000014689} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 197216736} + m_Father: {fileID: 1317009332} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -49, y: -68.37} + m_AnchoredPosition: {x: 0.000034332275, y: 0} m_SizeDelta: {x: 409.37, y: 166.66} m_Pivot: {x: 1, y: 1} --- !u!114 &1755253525 @@ -15593,94 +16346,8 @@ MonoBehaviour: legacyPrefab: {fileID: 912575536458647953, guid: f7ef34fd26f50174ca53d4e5fc78e237, type: 3} legacyFather: {fileID: 1748859173} - relicClassNameList: - - LegacyNode_FireHeart - - LegacyNode_StrongBody - - LegacyNode_MechanicalBoots - - LegacyNode_Scope - - LegacyNode_BoxLock - - LegacyNode_DamagedBag - - LegacyNode_LavaHeart - - LegacyNode_MagicGloves - - LegacyNode_FireSpark - - LegacyNode_GoldVines - - LegacyNode_Extractor + relicClassNameList: [] legacyNodesList: [] ---- !u!1 &1769821348 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1769821349} - - component: {fileID: 1769821351} - - component: {fileID: 1769821350} - m_Layer: 5 - m_Name: Image (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1769821349 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1769821348} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 552008217} - 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: 295, y: 0} - m_SizeDelta: {x: 70.7, y: 115.3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1769821350 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1769821348} - 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: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: -971874114, guid: 6d779d4bfb58a7748853f39a1aea011a, 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!222 &1769821351 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1769821348} - m_CullTransparentMesh: 1 --- !u!1 &1774587053 GameObject: m_ObjectHideFlags: 0 @@ -15970,8 +16637,9 @@ RectTransform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 90854703} - - {fileID: 2126011727} + - {fileID: 1875180084} - {fileID: 599605973} + - {fileID: 444645838} m_Father: {fileID: 809894446} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -16025,8 +16693,8 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1086901269} m_TargetAssemblyTypeName: LookCardManager, Assembly-CSharp - m_MethodName: SortWithGetTime - m_Mode: 1 + m_MethodName: SetSortArrow + m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -16037,11 +16705,11 @@ MonoBehaviour: m_CallState: 2 - m_Target: {fileID: 1086901269} m_TargetAssemblyTypeName: LookCardManager, Assembly-CSharp - m_MethodName: SetDefaultSortBool - m_Mode: 2 + m_MethodName: SortWithGetTime + m_Mode: 1 m_Arguments: - m_ObjectArgument: {fileID: 599605972} - m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: @@ -16193,7 +16861,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.690566, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 0.8886792, b: 0.8886792, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -16244,20 +16912,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1793415341} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1728455096} - {fileID: 1457874389} - - {fileID: 253958915} - m_Father: {fileID: 809894446} + m_Father: {fileID: 1277422389} 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: 19.69, y: -94.66} - m_SizeDelta: {x: 943.57, y: 890.67} + m_AnchoredPosition: {x: 4.2075167, y: -24.51} + m_SizeDelta: {x: 943.57, y: 841.98} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1793415343 MonoBehaviour: @@ -16302,7 +16969,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -16440,7 +17107,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.9137255} + m_Color: {r: 0, g: 0, b: 0, a: 0.96862745} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -16947,6 +17614,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1848107655} m_CullTransparentMesh: 1 +--- !u!1 &1875180083 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1875180084} + - component: {fileID: 1875180086} + - component: {fileID: 1875180085} + m_Layer: 5 + m_Name: UnderGround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1875180084 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1875180083} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1786742915} + 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: 295, y: -0.15993} + m_SizeDelta: {x: 70.7, y: 115.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1875180085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1875180083} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1304708788, guid: bb90636bf6490f94288d41a94dee3f44, 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!222 &1875180086 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1875180083} + m_CullTransparentMesh: 1 --- !u!1 &1915587653 GameObject: m_ObjectHideFlags: 0 @@ -17179,7 +17921,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: BackMainMenu + m_Text: BackChooseMenu --- !u!222 &1931945940 CanvasRenderer: m_ObjectHideFlags: 0 @@ -18445,81 +19187,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2096369103} m_CullTransparentMesh: 1 ---- !u!1 &2126011726 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2126011727} - - component: {fileID: 2126011729} - - component: {fileID: 2126011728} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2126011727 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2126011726} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1786742915} - 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: 295, y: -0.15993} - m_SizeDelta: {x: 70.7, y: 115.3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2126011728 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2126011726} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: -1304708788, guid: bb90636bf6490f94288d41a94dee3f44, 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!222 &2126011729 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2126011726} - m_CullTransparentMesh: 1 --- !u!1 &2131355444 GameObject: m_ObjectHideFlags: 0 @@ -20465,3 +21132,4 @@ SceneRoots: - {fileID: 890519216} - {fileID: 1601052150} - {fileID: 993262479} + - {fileID: 1690695890} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/Arrow.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/Arrow.meta new file mode 100644 index 00000000..c9845b8f --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/Arrow.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5c72d134781db1e4aa14556681011825 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/Arrow/ArrowLineManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/Arrow/ArrowLineManager.cs new file mode 100644 index 00000000..24855492 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/Arrow/ArrowLineManager.cs @@ -0,0 +1,93 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ArrowLineManager : MonoBehaviour +{ + + public GameObject arrowHeadPrefab; + public GameObject arrowNodePrefab; + public int arrowNodeNum; + public float scaleFactor = 1f;//节点缩放 + + private Transform origin;//起点 + private List arrowNodes = new List();//每个节点位置 + private List controlPoints = new List();//贝塞尔曲线控制节点p0-p3 + private readonly List controlPointFactors = new List() { new Vector2(-0.3f, 0.8f), new Vector2(0.1f, 1.4f) };//决定p1和p2位置的向量因子 + + public LineRenderer lineRenderer; + + private void Awake() + { + this.origin = this.transform; + + for (int i = 0; i < this.arrowNodeNum; ++i) + { + this.arrowNodes.Add(Instantiate(this.arrowNodePrefab, this.transform).transform); + } + + this.arrowNodes.Add(Instantiate(this.arrowHeadPrefab, this.transform).transform); + + //todo-隐藏？ + + for (int i = 0; i < 4; ++i) + { + this.controlPoints.Add(Vector2.zero); + } + } + + public void Update() + { + //p0是起始位置 + + // Vector3 worldstart = transform.parent.position ; + // Debug.Log(transform.parent.name + transform.parent.position ); + this.controlPoints[0] = new Vector2(0, 0); + + // Vector3 worldstart = transform.parent.TransformPoint(transform.position); + // this.controlPoints[0] = new Vector2(worldstart.x, worldstart.y); + //Debug.Log(controlPoints[0]); + //p3是鼠标位置-------鼠标在ui平面上的位置 + + Vector3 position = new Vector3(Input.mousePosition.x, Input.mousePosition.y, 10f); + Vector3 worldPoint = Camera.main.ScreenToWorldPoint(position); + Vector3 localPoint = transform.InverseTransformPoint(worldPoint); + this.controlPoints[3] = new Vector2(localPoint.x, localPoint.y); + + //p1p2通过p0p3计算 + this.controlPoints[1] = this.controlPoints[0] + (this.controlPoints[3] - this.controlPoints[0]) * this.controlPointFactors[0]; + this.controlPoints[2] = this.controlPoints[0] + (this.controlPoints[3] - this.controlPoints[0]) * this.controlPointFactors[1]; + + for (int i = 0; i < this.arrowNodes.Count; ++i) + { + var t = Mathf.Log(1f * i / (this.arrowNodes.Count - 1) + 1f, 2f); + + Vector3 currentPoint = + Mathf.Pow(1 - t, 3) * this.controlPoints[0] + + 3 * Mathf.Pow(1 - t, 2) * t * this.controlPoints[1] + + 3 * (1 - t) * Mathf.Pow(t, 2) * this.controlPoints[2] + + Mathf.Pow(t, 3) * this.controlPoints[3]; + + this.arrowNodes[i].localPosition = currentPoint; + // this.arrowNodes[i].localPosition -= new Vector3(0, 0, this.arrowNodes[i].localPosition.z); + + if (i > 0) + { + var euler = new Vector3(0, 0, Vector2.SignedAngle(CardActiveSort.Instance.transform.InverseTransformDirection(transform.up), this.arrowNodes[i].localPosition - this.arrowNodes[i - 1].localPosition)); + this.arrowNodes[i].localRotation = Quaternion.Euler(euler); + } + + var scale = this.scaleFactor * (1f - 0.03f * (this.arrowNodes.Count - 1 - i)); + this.arrowNodes[i].localScale = new Vector3(scale, scale, 1f); + + } + + lineRenderer.positionCount = arrowNodeNum+1; + for (int i = 0; i < this.arrowNodes.Count; ++i) + { + lineRenderer.SetPosition(i, this.arrowNodes[i].position); + } + //this.arrowNodes[0].transform.rotation = this.arrowNodes[1].transform.rotation; + + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/Arrow/ArrowLineManager.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/Arrow/ArrowLineManager.cs.meta new file mode 100644 index 00000000..26a4afe1 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/Arrow/ArrowLineManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b0783a22dd58dfc49bcaebf4f88b8c82 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/ArrowManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/Arrow/ArrowManager.cs similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Scripts/Card/ArrowManager.cs rename to ColorlessWorld-2024-4-2/Assets/Scripts/Card/Arrow/ArrowManager.cs diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/ArrowManager.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/Arrow/ArrowManager.cs.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Scripts/Card/ArrowManager.cs.meta rename to ColorlessWorld-2024-4-2/Assets/Scripts/Card/Arrow/ArrowManager.cs.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDataForChooseUI.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDataForChooseUI.cs index e86a0f22..7ef3ed7c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDataForChooseUI.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDataForChooseUI.cs @@ -66,7 +66,7 @@ public class CardDataForChooseUI : MonoBehaviour //奖励界面 public void RewardCardToDeck() { - TurnMaster.Instance.cardDeck.cardDeck.cardDeckList.Add(this .cardId); + PlayerStatsManager .Instance.cardDeck.cardDeckList.Add(this .cardId); RewardManager.Instance.DeleteRewardTip(currentRewardCardTip); currentRewardCardTip.GetComponent ().cardChoosePanle . SetActive(false); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDeck.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDeck.cs index 68fd75c8..7c2722fb 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDeck.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDeck.cs @@ -9,14 +9,20 @@ public class CardDeck : MonoBehaviour public List cardList = new List();//局内使用卡组 - public CardDeck_SO cardDeck;//标准卡组 - - private void OnEnable() + private void Awake() + { + + } + private void Start() { - foreach (var card in cardDeck .cardDeckList ) + foreach (var card in PlayerStatsManager.Instance.cardDeck.cardDeckList) { cardList.Add(card); - } + } cardList.Shuffle(); } + private void OnEnable() + { + + } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/LookCard/LookCardManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/LookCard/LookCardManager.cs index 660c0a3a..872c7996 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/LookCard/LookCardManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/LookCard/LookCardManager.cs @@ -9,10 +9,16 @@ public class LookCardManager : MonoBehaviour public List cardGameObjectList = new List(); public GameObject lookCardPrefab; - bool defaultSort =true;//(升序) + public Vector3 cardScale;//卡牌大小缩放 + [Header("排序")] + public List arrowListDown; + public List arrowListUp; + int currentIndex =-1; + bool defaultSort = true;//(升序) + public void ShowCard() { @@ -22,7 +28,7 @@ public class LookCardManager : MonoBehaviour } cardGameObjectList.Clear(); cardList.Clear(); - foreach (var card in TurnMaster .Instance .cardDeck.cardDeck.cardDeckList ) + foreach (var card in PlayerStatsManager .Instance .cardDeck.cardDeckList ) { cardList.Add(card); } @@ -56,13 +62,11 @@ public class LookCardManager : MonoBehaviour if(defaultSort == true ) { cardEntities = cardEntities.OrderBy(classInfo => classInfo.cardOriginalData.Cost).ToList(); - defaultSort = false; } else { cardEntities = cardEntities.OrderByDescending(classInfo => classInfo.cardOriginalData.Cost).ToList(); - defaultSort = true; } // cardEntities.Sort((a, b) => { return int.Parse ( a.cost) > int.Parse(b.cost) ? 1 : -1; }); @@ -89,13 +93,11 @@ public class LookCardManager : MonoBehaviour if (defaultSort == true) { cardEntities = cardEntities.OrderBy(classInfo => classInfo.cardOriginalData.CarType).ToList(); - defaultSort = false; } else { cardEntities = cardEntities.OrderByDescending(classInfo => classInfo.cardOriginalData.CarType).ToList(); - defaultSort = true; } // cardEntities.Sort((a, b) => { return int.Parse ( a.cost) > int.Parse(b.cost) ? 1 : -1; }); @@ -114,7 +116,7 @@ public class LookCardManager : MonoBehaviour } cardGameObjectList.Clear(); cardList.Clear(); - foreach (var card in TurnMaster.Instance.cardDeck.cardDeck.cardDeckList) + foreach (var card in PlayerStatsManager.Instance.cardDeck.cardDeckList) { cardList.Add(card); } @@ -130,7 +132,6 @@ public class LookCardManager : MonoBehaviour currentCard.transform.localScale = cardScale; cardGameObjectList.Add(currentCard); } - defaultSort = false; } else { @@ -141,14 +142,37 @@ public class LookCardManager : MonoBehaviour currentCard.transform.localScale = cardScale; cardGameObjectList.Add(currentCard); } - defaultSort = true; } } - public void SetDefaultSortBool(GameObject gameObject ) + public void SetSortArrow(int index ) { - gameObject.SetActive(defaultSort); + for(int i=0;i< arrowListDown.Count;i++) + { + if(i!= index ) + { + arrowListDown[i].SetActive(false); + arrowListUp[i].SetActive(false); + } + else + { + if (currentIndex != index )//从别的按钮切过来 + { + currentIndex = index; + defaultSort = true; + arrowListUp[i].SetActive(true); + arrowListDown[i].SetActive(false); + } + else//点击相同按钮 + { + defaultSort = !defaultSort ; + arrowListUp[i].SetActive(defaultSort); + arrowListDown[i].SetActive(!defaultSort); + } + } + } + } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs index e101df93..0a8148d0 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs @@ -24,14 +24,14 @@ public class LegacyManager : Singleton private void OnEnable() { ReadRelicExcel(filePath); + + relicClassNameList = PlayerStatsManager.Instance.relicList.relicClassNameList; } private void Start() { ShowLegacyClassAsOwned(); // CreateLegacyClassAsNew("LegacyNode_StrongBody"); - Debug.Log(legacyNodesList[0].name); - Debug.Log(legacyNodesList[1].name); } public void CreateLegacyClassAsNew(string className) { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager.meta new file mode 100644 index 00000000..4ca3a1a6 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c6925039235c374886880f2ca8e0c88 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs new file mode 100644 index 00000000..56814b0f --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs @@ -0,0 +1,98 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerStatsManager : Singleton +{ + [Header ("玩家数据")] + //玩家数据 + public PlayerState_SO playerState; + //关卡数据 + public LevelDevelopData_SO levelDevelopData; + //卡组数据 + public CardDeck_SO cardDeck; + //遗物数据 + public RelicData_SO relicList; + + private void Start() + { + + DontDestroyOnLoad(this.gameObject); + + StartCoroutine(e123()); + } + + IEnumerator e123 () + { + while (true ) + { + EffectFunction(1, 10); + yield return new WaitForSeconds(2f); + } + + } + //选项效果==加一个同步UI的订阅系统 + public void EffectFunction(int functionIndex, int amount) + { + switch (functionIndex) + { + //加钱 + case 1: + gainMoney(amount); + BroadCastSyncMoneyText();//同步UI + break; + //加血 + case 2: + playerState.currentHP += amount; + if (playerState.currentHP > playerState.maxHP) + { + playerState.currentHP = playerState.maxHP; + } + + break; + //加牌 + case 3: + Debug.Log("获得卡牌:" + amount); + break; + //加遗物 + case 4: + Debug.Log("获得遗物:发光藤曼" + amount); + break; + } + } + + public void gainMoney(int value) + { + playerState.money += value; + MathTool.keepNature(playerState.money); + if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_GoldVines)) + { + Usermanager.Instance.recoverHp(2); + } + } + + + //战斗场景结束先销毁手卡 + public void DeleteHandCard() + { + List cardIndex = new List(); + foreach (var card in TurnMaster.Instance.handCard.cardEntityList) + { + cardIndex.Add(card.cardId); + } + for (int j = cardIndex.Count - 1; j > -1; j--) + { + TurnMaster.Instance.disCard(j); + } + + } + + //广播同步文本（在UI上添加synctextMono来订阅事件） + public event Action syncMoneyText; + public void BroadCastSyncMoneyText() + { + if (syncMoneyText != null) + syncMoneyText(); + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs.meta new file mode 100644 index 00000000..fcbaf795 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4f47edfc6a4071b418c9f81b172bb82f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 12 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/RelicData_SO.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/RelicData_SO.cs new file mode 100644 index 00000000..2a8712d7 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/RelicData_SO.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu(fileName = "New State", menuName = "Relic/RelicList")] + +public class RelicData_SO : ScriptableObject +{ + [Header("遗物类名表")] + public List relicClassNameList = new List(); +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/RelicData_SO.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/RelicData_SO.cs.meta new file mode 100644 index 00000000..f0bd51e8 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/RelicData_SO.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 904fb4225c416d84e891fac047459035 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EventChooseButtonData.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EventChooseButtonData.cs index 37dc5f2d..55eda61b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EventChooseButtonData.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EventChooseButtonData.cs @@ -20,7 +20,7 @@ public class EventChooseButtonData : MonoBehaviour for (int i = 0;i return null; } - //选项效果 - public void EffectFunction(int functionIndex, int amount) - { - switch (functionIndex) - { - //加钱 - case 1: - gainMoney(amount); - break; - //加血 - case 2: - playerState.currentHP += amount; - if (playerState.currentHP > playerState.maxHP) - { - playerState.currentHP = playerState.maxHP; - } - - break; - //加牌 - case 3: - Debug.Log("获得卡牌:"+amount); - break; - //加遗物 - case 4: - Debug.Log("获得遗物:发光藤曼" + amount); - break; - } - } + //选项效果--移动到playerStatsManager统一出入口 + // public void EffectFunction(int functionIndex, int amount) + public void ShowBackButton() { backButton.SetActive(true); } - public void gainMoney(int value) - { - playerState.money += value; - MathTool.keepNature(playerState.money); - if (LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_GoldVines)) - { - Usermanager.Instance.recoverHp(2); - } - } + } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/RewardManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/RewardManager.cs index 73a0927f..adf3ee44 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/RewardManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/RewardManager.cs @@ -54,7 +54,10 @@ public class RewardManager : Singleton { if (EnemyManager.Instance.enemySpeedSortingList.Count <= 1) { - rewardPanle.SetActive(true); + rewardPanle.SetActive(true); + + //销毁手卡 + PlayerStatsManager.Instance.DeleteHandCard(); } } public void AddRewardTips(RewardManager.RewardType rewardType,int amount)//生成奖励 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs index 578ed22d..a27d054b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs @@ -38,6 +38,8 @@ public class ScenceLoadManager : Singleton } } + + public void QuitGame() { Application.Quit();