diff --git a/Assets/arts/spines/characters/m10001/m10001.png.meta b/Assets/arts/spines/characters/m10001/m10001.png.meta index cd58224f5..d68724a9f 100644 --- a/Assets/arts/spines/characters/m10001/m10001.png.meta +++ b/Assets/arts/spines/characters/m10001/m10001.png.meta @@ -89,18 +89,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 47 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server maxTextureSize: 2048 @@ -113,6 +101,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone maxTextureSize: 2048 diff --git a/Assets/arts/spines/characters/m10001/m10001.skel.bytes b/Assets/arts/spines/characters/m10001/m10001.skel.bytes index 12397e411..4eabc22cc 100644 Binary files a/Assets/arts/spines/characters/m10001/m10001.skel.bytes and b/Assets/arts/spines/characters/m10001/m10001.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10001/m10001_material.mat b/Assets/arts/spines/characters/m10001/m10001_material.mat index c35c1ddbf..e73c62eb7 100644 --- a/Assets/arts/spines/characters/m10001/m10001_material.mat +++ b/Assets/arts/spines/characters/m10001/m10001_material.mat @@ -9,8 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: m10001_material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT + m_ValidKeywords: [] m_InvalidKeywords: - _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 @@ -37,7 +36,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 1 + - _StraightAlphaInput: 0 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 - _UseScreenSpaceOutlineWidth: 0 diff --git a/Assets/arts/spines/characters/m10002/m10002.skel.bytes b/Assets/arts/spines/characters/m10002/m10002.skel.bytes index 9b6ac314d..32dee3dea 100644 Binary files a/Assets/arts/spines/characters/m10002/m10002.skel.bytes and b/Assets/arts/spines/characters/m10002/m10002.skel.bytes differ diff --git a/Assets/arts/spines/characters/m20001/m20001.atlas.txt b/Assets/arts/spines/characters/m20001/m20001.atlas.txt index c5167bcdb..c4c25a7ed 100644 --- a/Assets/arts/spines/characters/m20001/m20001.atlas.txt +++ b/Assets/arts/spines/characters/m20001/m20001.atlas.txt @@ -1,40 +1,115 @@ m20001.png -size:512,512 +size:1024,1024 filter:Linear,Linear -clothes_1 -bounds:364,423,110,81 -hair -bounds:2,84,62,51 +eye_death +bounds:111,457,22,17 rotate:90 -hand_L -bounds:154,186,42,44 -hand_R -bounds:2,9,73,61 +eye_hit +bounds:81,341,37,46 +eye_l +bounds:326,699,38,41 +offsets:1,1,40,43 +eye_r +bounds:247,544,34,41 +offsets:1,1,36,43 rotate:90 -head_1 -bounds:244,410,118,94 -head_2 -bounds:55,133,97,97 -hit_yan3 -bounds:476,476,28,28 -leg_L -bounds:203,294,39,54 -leg_R -bounds:130,232,38,55 +eye_yun +bounds:247,580,43,47 +guan_l +bounds:195,550,50,77 +guan_r +bounds:552,970,46,77 rotate:90 -pelvis -bounds:129,350,105,43 +hand_l_1 +bounds:631,975,41,72 +rotate:90 +hand_l_2 +bounds:380,975,84,41 +offsets:1,1,86,43 +hand_l_3 +bounds:203,696,121,93 +offsets:1,1,123,95 +hand_r_1 +bounds:705,975,41,72 +rotate:90 +hand_r_2 +bounds:466,975,84,41 +offsets:1,1,86,43 +hand_r_3 +bounds:2,389,107,90 +offsets:1,1,109,92 +hand_r_4 +bounds:779,977,66,39 +offsets:1,1,68,41 +head +bounds:2,481,127,153 +offsets:1,1,129,155 +jian_l +bounds:131,534,100,62 +offsets:1,1,102,64 +rotate:90 +jian_r +bounds:2,199,100,62 +offsets:1,1,102,64 +rotate:90 +kou_l +bounds:81,300,39,39 +offsets:1,1,41,41 +kou_r +bounds:292,603,36,36 +offsets:1,1,38,38 +leg_l_1 +bounds:2,301,77,86 +offsets:1,1,79,88 +leg_l_2 +bounds:961,971,53,45 +offsets:1,1,55,47 +leg_l_3 +bounds:847,975,55,41 +offsets:1,1,57,43 +leg_r_1 +bounds:2,111,76,86 +offsets:1,1,78,88 +leg_r_2 +bounds:286,641,53,45 +offsets:1,1,55,47 +rotate:90 +leg_r_3 +bounds:904,975,55,41 +offsets:1,1,57,43 +mei_l +bounds:326,742,47,39 +offsets:1,1,49,41 +rotate:90 +mei_r +bounds:333,657,40,36 +offsets:1,1,42,38 +rotate:90 +nengliang +bounds:131,479,53,53 +offsets:1,1,55,55 +pifeng_l_1 +bounds:2,28,81,65 +offsets:1,1,83,67 +rotate:90 +pifeng_l_2 +bounds:2,636,199,166 +offsets:1,1,201,168 +pifeng_r_1 +bounds:203,629,81,65 +offsets:1,1,83,67 +pifeng_r_2 +bounds:2,804,199,167 +offsets:1,1,201,169 spine -bounds:129,395,113,109 -upperarm_L_1 -bounds:130,272,71,76 -upperarm_R_2 -bounds:55,232,73,104 -weapon_1 -bounds:2,148,188,51 -offsets:0,0,189,51 -rotate:90 -weapon_2 -bounds:2,338,125,166 -yinying -bounds:55,109,93,22 +bounds:203,791,159,180 +offsets:1,1,161,182 +tong_l +bounds:2,2,20,24 +offsets:1,1,22,26 +tong_r +bounds:2,2,20,24 +offsets:1,1,22,26 +yingzi +bounds:2,973,376,43 +offsets:1,1,378,45 diff --git a/Assets/arts/spines/characters/m20001/m20001.atlas.txt.meta b/Assets/arts/spines/characters/m20001/m20001.atlas.txt.meta index 9ca2e2a66..5085c5959 100644 --- a/Assets/arts/spines/characters/m20001/m20001.atlas.txt.meta +++ b/Assets/arts/spines/characters/m20001/m20001.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 411a57363366771428bde72d56b458cb TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20001/m20001.png b/Assets/arts/spines/characters/m20001/m20001.png index 95476419b..eae3d7b11 100644 Binary files a/Assets/arts/spines/characters/m20001/m20001.png and b/Assets/arts/spines/characters/m20001/m20001.png differ diff --git a/Assets/arts/spines/characters/m20001/m20001.png.meta b/Assets/arts/spines/characters/m20001/m20001.png.meta index 7ca947d47..36b9c2ebd 100644 --- a/Assets/arts/spines/characters/m20001/m20001.png.meta +++ b/Assets/arts/spines/characters/m20001/m20001.png.meta @@ -36,9 +36,9 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -63,20 +63,44 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -101,30 +125,6 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/characters/m20001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20001/m20001.skel.bytes b/Assets/arts/spines/characters/m20001/m20001.skel.bytes index 6714afef7..6378f48c5 100644 Binary files a/Assets/arts/spines/characters/m20001/m20001.skel.bytes and b/Assets/arts/spines/characters/m20001/m20001.skel.bytes differ diff --git a/Assets/arts/spines/characters/m20001/m20001.skel.bytes.meta b/Assets/arts/spines/characters/m20001/m20001.skel.bytes.meta index 8ce3e65d3..d30ac7808 100644 --- a/Assets/arts/spines/characters/m20001/m20001.skel.bytes.meta +++ b/Assets/arts/spines/characters/m20001/m20001.skel.bytes.meta @@ -3,5 +3,5 @@ guid: e976b037742e6034f9750ab97c5ec032 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20001/m20001_atlas.asset.meta b/Assets/arts/spines/characters/m20001/m20001_atlas.asset.meta index 4b497668a..0f4a8f938 100644 --- a/Assets/arts/spines/characters/m20001/m20001_atlas.asset.meta +++ b/Assets/arts/spines/characters/m20001/m20001_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20001/m20001_material.mat b/Assets/arts/spines/characters/m20001/m20001_material.mat index 34c9844fa..c4084e72c 100644 --- a/Assets/arts/spines/characters/m20001/m20001_material.mat +++ b/Assets/arts/spines/characters/m20001/m20001_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m20001_material - m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_ValidKeywords: - _STRAIGHT_ALPHA_INPUT m_InvalidKeywords: @@ -29,6 +29,7 @@ Material: m_Ints: [] m_Floats: - _Cutoff: 0.1 + - _Fill: 0 - _OutlineMipLevel: 0 - _OutlineOpaqueAlpha: 1 - _OutlineReferenceTexWidth: 1024 @@ -39,6 +40,7 @@ Material: - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 m_Colors: - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/arts/spines/characters/m20001/m20001_material.mat.meta b/Assets/arts/spines/characters/m20001/m20001_material.mat.meta index 086f4acb4..eec19bdaa 100644 --- a/Assets/arts/spines/characters/m20001/m20001_material.mat.meta +++ b/Assets/arts/spines/characters/m20001/m20001_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m20001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20001/m20001_skeletondata.asset.meta b/Assets/arts/spines/characters/m20001/m20001_skeletondata.asset.meta index 5452424f5..2bd531fe6 100644 --- a/Assets/arts/spines/characters/m20001/m20001_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m20001/m20001_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20001.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20002/m20002.atlas.txt b/Assets/arts/spines/characters/m20002/m20002.atlas.txt index 7f1d4718d..0aa84fe89 100644 --- a/Assets/arts/spines/characters/m20002/m20002.atlas.txt +++ b/Assets/arts/spines/characters/m20002/m20002.atlas.txt @@ -1,40 +1,101 @@ m20002.png size:512,512 filter:Linear,Linear -clothes_1 -bounds:55,228,109,81 +biao +bounds:368,248,89,53 +offsets:1,1,91,55 +cy +bounds:2,200,319,310 +eye +bounds:370,2,20,13 +offsets:1,1,22,15 rotate:90 -hair -bounds:138,234,63,51 -hand_L -bounds:77,46,42,45 -hand_R -bounds:138,287,74,62 -head_1 -bounds:245,411,117,94 -head_2 -bounds:364,409,96,97 +eye_death +bounds:370,24,21,21 +eye_yun +bounds:459,248,43,47 rotate:90 -hit_yan3 -bounds:214,321,28,28 -leg_L -bounds:77,93,38,55 -leg_R -bounds:2,2,39,55 +face1 +bounds:400,59,52,34 +offsets:1,1,54,36 rotate:90 -pelvis -bounds:129,351,105,43 +face2 +bounds:90,4,76,46 +offsets:1,1,78,48 +gaoguang +bounds:495,237,9,9 +offsets:1,1,11,11 +hand_l_1 +bounds:368,165,61,81 +offsets:1,1,63,83 +hand_l_2 +bounds:2,3,86,103 +offsets:1,1,88,105 +hand_l_3 +bounds:431,169,77,62 +offsets:1,1,79,64 +rotate:90 +hand_r_1 +bounds:168,15,35,85 +offsets:1,1,37,87 +rotate:90 +hand_r_2 +bounds:368,303,96,68 +offsets:1,1,98,70 +hand_r_3 +bounds:368,113,50,67 +offsets:1,1,52,69 +rotate:90 +jian_l +bounds:90,52,99,54 +offsets:1,1,101,56 +jian_r +bounds:191,52,83,54 +offsets:1,1,85,56 +leg_l_1 +bounds:297,12,37,32 +offsets:1,1,39,34 +leg_l_2 +bounds:400,19,38,50 +offsets:1,1,40,52 +rotate:90 +leg_l_3 +bounds:437,110,70,57 +leg_l_4 +bounds:487,61,47,21 +offsets:1,1,49,23 +rotate:90 +leg_r_1 +bounds:336,12,32,32 +offsets:1,1,34,34 +leg_r_2 +bounds:452,10,41,47 +leg_r_3 +bounds:276,46,75,60 +leg_r_4 +bounds:303,111,47,21 +offsets:1,1,49,23 spine -bounds:129,396,114,109 -upperarm_L_1 -bounds:55,150,71,76 -upperarm_R_2 -bounds:2,43,73,104 -weapon_1 -bounds:2,149,188,51 +bounds:368,373,136,137 +offsets:1,1,138,139 +tong +bounds:255,4,40,40 +offsets:1,1,42,42 +wuqi +bounds:2,108,90,299 +offsets:1,1,92,301 rotate:90 -weapon_2 -bounds:2,339,125,166 -yinying -bounds:463,412,93,22 +yao +bounds:466,293,78,41 +offsets:1,1,80,43 rotate:90 +yingzi +bounds:323,134,376,43 +offsets:1,1,378,45 +rotate:90 +zhuzi +bounds:436,59,49,49 +offsets:1,1,51,51 +zhuzixian +bounds:353,47,45,64 +offsets:1,1,47,66 diff --git a/Assets/arts/spines/characters/m20002/m20002.atlas.txt.meta b/Assets/arts/spines/characters/m20002/m20002.atlas.txt.meta index ffa846b40..0e1e8ca6f 100644 --- a/Assets/arts/spines/characters/m20002/m20002.atlas.txt.meta +++ b/Assets/arts/spines/characters/m20002/m20002.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 0fda9436b594a7c47b2e246bf17b387b TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20002/m20002.png b/Assets/arts/spines/characters/m20002/m20002.png index 0e81bb47c..92537390c 100644 Binary files a/Assets/arts/spines/characters/m20002/m20002.png and b/Assets/arts/spines/characters/m20002/m20002.png differ diff --git a/Assets/arts/spines/characters/m20002/m20002.png.meta b/Assets/arts/spines/characters/m20002/m20002.png.meta index 58a42ee00..b3ced10db 100644 --- a/Assets/arts/spines/characters/m20002/m20002.png.meta +++ b/Assets/arts/spines/characters/m20002/m20002.png.meta @@ -36,9 +36,9 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -63,20 +63,44 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -101,30 +125,6 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/characters/m20002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20002/m20002.skel.bytes b/Assets/arts/spines/characters/m20002/m20002.skel.bytes index 674fea920..ef5a56a88 100644 Binary files a/Assets/arts/spines/characters/m20002/m20002.skel.bytes and b/Assets/arts/spines/characters/m20002/m20002.skel.bytes differ diff --git a/Assets/arts/spines/characters/m20002/m20002.skel.bytes.meta b/Assets/arts/spines/characters/m20002/m20002.skel.bytes.meta index 7dbc67731..8ebf55d0b 100644 --- a/Assets/arts/spines/characters/m20002/m20002.skel.bytes.meta +++ b/Assets/arts/spines/characters/m20002/m20002.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 7516595ab56e6f34db2c1144a4135501 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20002/m20002_atlas.asset.meta b/Assets/arts/spines/characters/m20002/m20002_atlas.asset.meta index 6e3f338f3..31d5b65ef 100644 --- a/Assets/arts/spines/characters/m20002/m20002_atlas.asset.meta +++ b/Assets/arts/spines/characters/m20002/m20002_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20002/m20002_material.mat b/Assets/arts/spines/characters/m20002/m20002_material.mat index 29dc9b2fa..1bd3b6cee 100644 --- a/Assets/arts/spines/characters/m20002/m20002_material.mat +++ b/Assets/arts/spines/characters/m20002/m20002_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m20002_material - m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_ValidKeywords: - _STRAIGHT_ALPHA_INPUT m_InvalidKeywords: @@ -29,6 +29,7 @@ Material: m_Ints: [] m_Floats: - _Cutoff: 0.1 + - _Fill: 0 - _OutlineMipLevel: 0 - _OutlineOpaqueAlpha: 1 - _OutlineReferenceTexWidth: 1024 @@ -39,6 +40,7 @@ Material: - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 m_Colors: - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/arts/spines/characters/m20002/m20002_material.mat.meta b/Assets/arts/spines/characters/m20002/m20002_material.mat.meta index e9bc8b44c..d015030d5 100644 --- a/Assets/arts/spines/characters/m20002/m20002_material.mat.meta +++ b/Assets/arts/spines/characters/m20002/m20002_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m20002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20002/m20002_skeletondata.asset.meta b/Assets/arts/spines/characters/m20002/m20002_skeletondata.asset.meta index ad299437e..cf5229faa 100644 --- a/Assets/arts/spines/characters/m20002/m20002_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m20002/m20002_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20002.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20003/m20003.atlas.txt b/Assets/arts/spines/characters/m20003/m20003.atlas.txt index f2ffa24e0..d7ea09633 100644 --- a/Assets/arts/spines/characters/m20003/m20003.atlas.txt +++ b/Assets/arts/spines/characters/m20003/m20003.atlas.txt @@ -1,61 +1,67 @@ m20003.png -size:1024,1024 +size:512,512 filter:Linear,Linear -clothes -bounds:911,963,62,47 -clothes_1 -bounds:2,594,184,131 -eye_L_1 -bounds:71,239,23,20 +chilun +bounds:2,99,191,195 +offsets:1,1,193,197 +cy +bounds:2,296,302,214 +offsets:1,0,304,214 +eye_l +bounds:242,30,30,22 +offsets:1,1,32,24 rotate:90 -eye_L_2 -bounds:481,895,14,16 -eye_R_1 -bounds:104,462,29,25 -eye_R_2 -bounds:2,2,15,19 -eye_xuanyun -bounds:322,734,22,22 -gutou -bounds:409,858,70,53 -hand_L -bounds:2,88,68,66 +eye_r +bounds:467,302,30,22 +offsets:1,1,32,24 +eye_yun +bounds:288,188,22,24 +hand_l_1 +bounds:467,368,43,62 +offsets:1,1,45,64 +hand_l_2 +bounds:195,214,103,80 +offsets:1,1,105,82 +hand_l_3 +bounds:2,19,88,53 +offsets:1,1,90,55 +hand_pao +bounds:92,20,52,77 rotate:90 -hand_R -bounds:764,943,75,67 -head_1 -bounds:322,758,96,78 +hand_r_1 +bounds:273,73,38,62 +offsets:1,1,40,64 +hand_r_2 +bounds:195,137,91,75 +offsets:1,1,93,77 +hand_r_3 +bounds:461,432,78,48 +offsets:1,1,80,50 rotate:90 -head_3 -bounds:841,947,68,63 -head_R -bounds:2,23,66,63 -hit_yan3 -bounds:290,697,28,28 -leg_L -bounds:188,606,100,119 -leg_R -bounds:2,368,100,119 -mouth -bounds:2,158,104,67 +head +bounds:393,304,92,72 +offsets:1,1,94,74 rotate:90 -spine_1 -bounds:2,727,318,283 -spine_2 -bounds:2,489,133,103 -spine_3 -bounds:409,913,136,97 -upperarm_L_1 -bounds:547,919,91,117 +jianjia_l +bounds:306,307,85,89 +offsets:1,1,87,91 +jianjia_r +bounds:195,62,73,76 +offsets:1,1,75,78 rotate:90 -upperarm_L_2 -bounds:666,933,77,96 +leg_l +bounds:171,22,38,69 rotate:90 -upperarm_R_1 -bounds:322,856,85,154 -upperarm_R_2 -bounds:2,264,102,90 -rotate:90 -yinying -bounds:137,499,93,22 +leg_r +bounds:171,22,38,69 rotate:90 +spine +bounds:306,398,153,112 +xiong1 +bounds:467,326,43,40 +offsets:1,1,45,42 +xiong2 +bounds:467,326,43,40 +offsets:1,1,45,42 +yingzi +bounds:2,74,189,23 diff --git a/Assets/arts/spines/characters/m20003/m20003.atlas.txt.meta b/Assets/arts/spines/characters/m20003/m20003.atlas.txt.meta index cfa7634f1..2846b6c73 100644 --- a/Assets/arts/spines/characters/m20003/m20003.atlas.txt.meta +++ b/Assets/arts/spines/characters/m20003/m20003.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 26ee8dc73c6113847ae08a781d3e8e7d TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20003.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20003/m20003.png b/Assets/arts/spines/characters/m20003/m20003.png index 73f62037c..d56bc0af4 100644 Binary files a/Assets/arts/spines/characters/m20003/m20003.png and b/Assets/arts/spines/characters/m20003/m20003.png differ diff --git a/Assets/arts/spines/characters/m20003/m20003.png.meta b/Assets/arts/spines/characters/m20003/m20003.png.meta index 3dd9f77e1..80b5199cb 100644 --- a/Assets/arts/spines/characters/m20003/m20003.png.meta +++ b/Assets/arts/spines/characters/m20003/m20003.png.meta @@ -36,9 +36,9 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -63,20 +63,44 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -101,30 +125,6 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/characters/m20003.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20003/m20003.skel.bytes b/Assets/arts/spines/characters/m20003/m20003.skel.bytes index f4e0db9dc..23f9e69f3 100644 Binary files a/Assets/arts/spines/characters/m20003/m20003.skel.bytes and b/Assets/arts/spines/characters/m20003/m20003.skel.bytes differ diff --git a/Assets/arts/spines/characters/m20003/m20003.skel.bytes.meta b/Assets/arts/spines/characters/m20003/m20003.skel.bytes.meta index 1fc259e5c..d0d084605 100644 --- a/Assets/arts/spines/characters/m20003/m20003.skel.bytes.meta +++ b/Assets/arts/spines/characters/m20003/m20003.skel.bytes.meta @@ -3,5 +3,5 @@ guid: c7b88c3603349174dbb15d77d95eec98 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20003.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20003/m20003_atlas.asset.meta b/Assets/arts/spines/characters/m20003/m20003_atlas.asset.meta index fc4c0de68..84ea94150 100644 --- a/Assets/arts/spines/characters/m20003/m20003_atlas.asset.meta +++ b/Assets/arts/spines/characters/m20003/m20003_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20003.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20003/m20003_material.mat b/Assets/arts/spines/characters/m20003/m20003_material.mat index 0d5eda1d6..7d95a8dd5 100644 --- a/Assets/arts/spines/characters/m20003/m20003_material.mat +++ b/Assets/arts/spines/characters/m20003/m20003_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m20003_material - m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_ValidKeywords: - _STRAIGHT_ALPHA_INPUT m_InvalidKeywords: @@ -29,6 +29,7 @@ Material: m_Ints: [] m_Floats: - _Cutoff: 0.1 + - _Fill: 0 - _OutlineMipLevel: 0 - _OutlineOpaqueAlpha: 1 - _OutlineReferenceTexWidth: 1024 @@ -39,6 +40,7 @@ Material: - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 m_Colors: - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/arts/spines/characters/m20003/m20003_material.mat.meta b/Assets/arts/spines/characters/m20003/m20003_material.mat.meta index f1af7d6ee..ec90814e0 100644 --- a/Assets/arts/spines/characters/m20003/m20003_material.mat.meta +++ b/Assets/arts/spines/characters/m20003/m20003_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m20003.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20003/m20003_skeletondata.asset.meta b/Assets/arts/spines/characters/m20003/m20003_skeletondata.asset.meta index dd4765a07..a43340cb8 100644 --- a/Assets/arts/spines/characters/m20003/m20003_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m20003/m20003_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20003.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20004/m20004.atlas.txt b/Assets/arts/spines/characters/m20004/m20004.atlas.txt index df9d8e5ad..059d5e37b 100644 --- a/Assets/arts/spines/characters/m20004/m20004.atlas.txt +++ b/Assets/arts/spines/characters/m20004/m20004.atlas.txt @@ -1,73 +1,97 @@ m20004.png -size:512,512 +size:1024,1024 filter:Linear,Linear -eye_xuanyun -bounds:137,254,22,22 -gutou -bounds:228,324,70,53 -hand_L_1 -bounds:164,265,45,41 -offsets:1,1,47,43 -hand_L_2 -bounds:211,276,29,30 -offsets:1,1,31,32 -hand_R_1 -bounds:353,397,49,49 +ci_1 +bounds:839,932,49,49 offsets:1,1,51,51 -hand_R_2 -bounds:316,378,33,22 -offsets:1,1,35,24 -head_1 -bounds:2,291,136,80 -head_2 -bounds:316,402,45,35 -offsets:1,1,47,37 +ci_2 +bounds:145,503,54,73 +offsets:1,1,56,75 rotate:90 -hit_yan1 -bounds:137,214,16,18 +cy +bounds:2,665,354,316 +offsets:0,0,358,316 +eye_death +bounds:773,895,22,17 rotate:90 -hit_yan2 -bounds:137,232,20,20 -kulou -bounds:355,448,77,62 -offsets:0,1,77,63 -leg_L -bounds:62,154,59,72 +eye_hit +bounds:727,886,31,44 rotate:90 -leg_R -bounds:434,449,61,72 +eye_l +bounds:231,562,36,27 +offsets:1,1,38,29 +eye_r +bounds:2,46,33,24 +offsets:1,1,35,26 +eye_yun +bounds:438,703,43,47 +gutou +bounds:2,127,39,60 +hand_l_1 +bounds:643,883,82,98 +offsets:1,1,84,100 +hand_l_2 +bounds:358,813,128,168 +hand_l_3 +bounds:2,72,53,36 +offsets:1,1,55,38 rotate:90 +hand_r_1 +bounds:47,311,85,76 +offsets:1,1,87,78 +hand_r_2 +bounds:47,498,96,165 +hand_r_3 +bounds:727,919,63,62 +offsets:1,1,65,64 +hand_r_4 +bounds:294,608,46,55 +offsets:1,1,48,57 +head +bounds:488,878,153,103 +offsets:1,1,155,105 +jian_r_1 +bounds:231,591,61,72 +offsets:0,0,61,75 +jian_r_2 +bounds:438,672,30,29 +offsets:1,1,32,31 +jiao_l +bounds:47,389,86,107 +offsets:1,1,88,109 +jiao_r +bounds:145,559,84,104 +offsets:1,1,86,106 +leg_l_1 +bounds:792,925,45,56 +offsets:1,1,47,58 +leg_l_2 +bounds:438,752,59,43 +rotate:90 +leg_l_3 +bounds:943,957,38,24 +offsets:1,1,40,26 +leg_r_1 +bounds:567,824,52,64 +rotate:90 +leg_r_2 +bounds:890,936,51,45 +leg_r_3 +bounds:47,291,32,18 +offsets:1,1,34,20 mouth -bounds:2,60,90,44 -offsets:1,1,92,46 -rotate:90 -pelvis -bounds:2,152,137,58 +bounds:2,189,96,42 +offsets:1,1,98,44 rotate:90 spine -bounds:2,373,160,137 -upperarm_L_1 -bounds:164,308,62,70 -offsets:1,1,64,72 -upperarm_L_2 -bounds:2,2,56,64 -offsets:1,1,58,66 +bounds:358,670,141,78 +offsets:1,1,143,80 rotate:90 -upperarm_R_1 -bounds:237,379,68,77 -offsets:1,1,70,79 +yao +bounds:488,814,62,77 +offsets:1,1,64,79 rotate:90 -upperarm_R_2 -bounds:62,215,73,74 -offsets:1,1,75,76 -upperarm_R_3 -bounds:404,397,20,49 -offsets:1,1,22,51 -weapon_1 -bounds:237,449,116,61 -offsets:1,1,118,63 -weapon_2 -bounds:164,380,71,130 -yinying -bounds:140,278,93,22 +yingzi +bounds:2,287,376,43 +offsets:1,1,378,45 rotate:90 diff --git a/Assets/arts/spines/characters/m20004/m20004.atlas.txt.meta b/Assets/arts/spines/characters/m20004/m20004.atlas.txt.meta index 2fe16f11b..6345c2a2f 100644 --- a/Assets/arts/spines/characters/m20004/m20004.atlas.txt.meta +++ b/Assets/arts/spines/characters/m20004/m20004.atlas.txt.meta @@ -3,5 +3,5 @@ guid: f6d09aea9e85e4641a491ee81d09e668 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20004.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20004/m20004.png b/Assets/arts/spines/characters/m20004/m20004.png index bec2eea84..134b8e7d0 100644 Binary files a/Assets/arts/spines/characters/m20004/m20004.png and b/Assets/arts/spines/characters/m20004/m20004.png differ diff --git a/Assets/arts/spines/characters/m20004/m20004.png.meta b/Assets/arts/spines/characters/m20004/m20004.png.meta index 3c7711bb7..2e857dc9c 100644 --- a/Assets/arts/spines/characters/m20004/m20004.png.meta +++ b/Assets/arts/spines/characters/m20004/m20004.png.meta @@ -63,7 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -89,6 +89,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -113,18 +125,6 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/characters/m20004.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20004/m20004.skel.bytes b/Assets/arts/spines/characters/m20004/m20004.skel.bytes index c724545ca..91896eeba 100644 Binary files a/Assets/arts/spines/characters/m20004/m20004.skel.bytes and b/Assets/arts/spines/characters/m20004/m20004.skel.bytes differ diff --git a/Assets/arts/spines/characters/m20004/m20004.skel.bytes.meta b/Assets/arts/spines/characters/m20004/m20004.skel.bytes.meta index eb488c5ae..eb80f0cba 100644 --- a/Assets/arts/spines/characters/m20004/m20004.skel.bytes.meta +++ b/Assets/arts/spines/characters/m20004/m20004.skel.bytes.meta @@ -3,5 +3,5 @@ guid: f733cbcb9e78304408ed92d53ca46085 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20004.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20004/m20004_atlas.asset.meta b/Assets/arts/spines/characters/m20004/m20004_atlas.asset.meta index f1c2506de..03ec771fa 100644 --- a/Assets/arts/spines/characters/m20004/m20004_atlas.asset.meta +++ b/Assets/arts/spines/characters/m20004/m20004_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20004.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20004/m20004_material.mat b/Assets/arts/spines/characters/m20004/m20004_material.mat index caee7b5ff..882d46a61 100644 --- a/Assets/arts/spines/characters/m20004/m20004_material.mat +++ b/Assets/arts/spines/characters/m20004/m20004_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m20004_material - m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_ValidKeywords: - _STRAIGHT_ALPHA_INPUT m_InvalidKeywords: @@ -29,6 +29,7 @@ Material: m_Ints: [] m_Floats: - _Cutoff: 0.1 + - _Fill: 0 - _OutlineMipLevel: 0 - _OutlineOpaqueAlpha: 1 - _OutlineReferenceTexWidth: 1024 @@ -39,6 +40,7 @@ Material: - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 m_Colors: - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/arts/spines/characters/m20004/m20004_material.mat.meta b/Assets/arts/spines/characters/m20004/m20004_material.mat.meta index cc85a76bd..8cf924312 100644 --- a/Assets/arts/spines/characters/m20004/m20004_material.mat.meta +++ b/Assets/arts/spines/characters/m20004/m20004_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m20004.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20004/m20004_skeletondata.asset.meta b/Assets/arts/spines/characters/m20004/m20004_skeletondata.asset.meta index 49d27a318..c7f082327 100644 --- a/Assets/arts/spines/characters/m20004/m20004_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m20004/m20004_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20004.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20005/m20005.atlas.txt b/Assets/arts/spines/characters/m20005/m20005.atlas.txt index d61d945e3..aa7c5a3bf 100644 --- a/Assets/arts/spines/characters/m20005/m20005.atlas.txt +++ b/Assets/arts/spines/characters/m20005/m20005.atlas.txt @@ -1,81 +1,73 @@ m20005.png size:512,512 filter:Linear,Linear -eye -bounds:278,372,26,18 -offsets:1,1,28,20 -eye_xuanyun -bounds:102,257,22,22 -gutou -bounds:157,197,52,58 -hand_L -bounds:117,377,98,133 -offsets:1,1,100,135 -hand_R -bounds:2,240,98,134 -offsets:1,1,100,136 -head_1 -bounds:217,392,100,118 -offsets:1,1,102,120 -head_2 -bounds:446,419,61,91 -offsets:1,1,63,93 -head_3 -bounds:2,115,98,123 -offsets:1,1,100,125 -hit_yan1 -bounds:259,318,16,18 -hit_yan2 -bounds:259,338,20,20 -kulou -bounds:126,313,77,62 -offsets:0,1,77,63 -leg_L -bounds:102,111,50,67 -offsets:1,1,52,69 -leg_R -bounds:100,41,49,68 -offsets:1,1,51,70 -pelvis -bounds:205,310,48,52 -offsets:1,1,50,54 +eye_hit +bounds:469,402,31,44 +eye_l +bounds:152,138,27,21 +offsets:1,1,29,23 +eye_r +bounds:197,187,27,21 +offsets:1,1,29,23 +eye_yun +bounds:152,161,43,47 +gua_1 +bounds:2,87,114,74 rotate:90 -pelvis_L -bounds:100,2,44,37 -offsets:1,1,46,39 -pelvis_R -bounds:204,265,52,43 -offsets:1,1,54,45 +gua_2 +bounds:241,439,109,69 +hand_l +bounds:171,243,67,82 +hand_l_2 +bounds:2,203,103,105 +offsets:1,1,105,107 +hand_r +bounds:241,370,67,82 +rotate:90 +hand_r_2 +bounds:142,408,97,100 +offsets:1,1,99,102 +head +bounds:142,327,90,79 +offsets:1,1,92,81 +jian_l_1 +bounds:234,328,76,40 +jian_l_2 +bounds:171,210,71,31 +jian_r_1 +bounds:78,82,76,40 +jian_r_2 +bounds:325,366,71,31 +rotate:90 +leg_l_1 +bounds:358,397,56,52 +leg_l_2 +bounds:2,7,72,78 +leg_r_1 +bounds:469,448,60,39 +rotate:90 +leg_r_2 +bounds:240,248,72,78 spine -bounds:2,7,106,96 -offsets:1,1,108,98 +bounds:2,310,138,198 +y1 +bounds:78,124,77,72 rotate:90 -upperarm_L_1 -bounds:416,351,66,86 -offsets:1,1,68,88 +y2 +bounds:107,216,92,62 rotate:90 -upperarm_L_2 -bounds:319,426,84,125 -offsets:1,1,86,127 -rotate:90 -upperarm_L_3 -bounds:217,360,30,59 -offsets:1,1,32,61 -rotate:90 -upperarm_L_4 -bounds:102,180,53,75 -offsets:1,1,55,77 -upperarm_R_1 -bounds:319,356,68,95 -offsets:1,1,70,97 -rotate:90 -upperarm_R_2 -bounds:2,376,113,134 -offsets:1,1,115,136 -upperarm_R_3 -bounds:126,257,54,76 -offsets:1,1,56,78 -rotate:90 -yingzi -bounds:102,281,93,22 +y3 +bounds:416,403,46,51 rotate:90 +ya1 +bounds:244,212,67,34 +offsets:1,1,69,36 +ya2 +bounds:352,451,115,57 +offsets:1,1,117,59 +zhi1 +bounds:76,20,60,60 +offsets:1,1,62,62 +zhi2 +bounds:358,364,54,31 +offsets:1,1,56,33 diff --git a/Assets/arts/spines/characters/m20005/m20005.atlas.txt.meta b/Assets/arts/spines/characters/m20005/m20005.atlas.txt.meta index 50de82e28..8b166f6b6 100644 --- a/Assets/arts/spines/characters/m20005/m20005.atlas.txt.meta +++ b/Assets/arts/spines/characters/m20005/m20005.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 2beb9d35be70dde408113ab777c358aa TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20005.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20005/m20005.png b/Assets/arts/spines/characters/m20005/m20005.png index 07a951975..43253e7bc 100644 Binary files a/Assets/arts/spines/characters/m20005/m20005.png and b/Assets/arts/spines/characters/m20005/m20005.png differ diff --git a/Assets/arts/spines/characters/m20005/m20005.png.meta b/Assets/arts/spines/characters/m20005/m20005.png.meta index 30e06e4c3..d37d7c1b4 100644 --- a/Assets/arts/spines/characters/m20005/m20005.png.meta +++ b/Assets/arts/spines/characters/m20005/m20005.png.meta @@ -63,7 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -89,6 +89,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -113,18 +125,6 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/characters/m20005.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20005/m20005.skel.bytes b/Assets/arts/spines/characters/m20005/m20005.skel.bytes index 8ceae6049..c0c399094 100644 Binary files a/Assets/arts/spines/characters/m20005/m20005.skel.bytes and b/Assets/arts/spines/characters/m20005/m20005.skel.bytes differ diff --git a/Assets/arts/spines/characters/m20005/m20005.skel.bytes.meta b/Assets/arts/spines/characters/m20005/m20005.skel.bytes.meta index dd2879e5d..dbe70b62f 100644 --- a/Assets/arts/spines/characters/m20005/m20005.skel.bytes.meta +++ b/Assets/arts/spines/characters/m20005/m20005.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 87e1cbc3f9be6a24fb995d3ef90cf715 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/characters/m20005.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20005/m20005_atlas.asset.meta b/Assets/arts/spines/characters/m20005/m20005_atlas.asset.meta index b6a2bf30b..55b663056 100644 --- a/Assets/arts/spines/characters/m20005/m20005_atlas.asset.meta +++ b/Assets/arts/spines/characters/m20005/m20005_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20005.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20005/m20005_material.mat b/Assets/arts/spines/characters/m20005/m20005_material.mat index 8e5ade3d0..6bacb7499 100644 --- a/Assets/arts/spines/characters/m20005/m20005_material.mat +++ b/Assets/arts/spines/characters/m20005/m20005_material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: m20005_material - m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_ValidKeywords: - _STRAIGHT_ALPHA_INPUT m_InvalidKeywords: @@ -29,6 +29,7 @@ Material: m_Ints: [] m_Floats: - _Cutoff: 0.1 + - _Fill: 0 - _OutlineMipLevel: 0 - _OutlineOpaqueAlpha: 1 - _OutlineReferenceTexWidth: 1024 @@ -39,6 +40,7 @@ Material: - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 m_Colors: - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/arts/spines/characters/m20005/m20005_material.mat.meta b/Assets/arts/spines/characters/m20005/m20005_material.mat.meta index 13f37bb91..9c9720f1d 100644 --- a/Assets/arts/spines/characters/m20005/m20005_material.mat.meta +++ b/Assets/arts/spines/characters/m20005/m20005_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/characters/m20005.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/m20005/m20005_skeletondata.asset.meta b/Assets/arts/spines/characters/m20005/m20005_skeletondata.asset.meta index 7e3143c73..6c756f64f 100644 --- a/Assets/arts/spines/characters/m20005/m20005_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/m20005/m20005_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/characters/m20005.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/characters/p13001/p13001.skel.bytes b/Assets/arts/spines/characters/p13001/p13001.skel.bytes index e8a658c4a..625f182bc 100644 Binary files a/Assets/arts/spines/characters/p13001/p13001.skel.bytes and b/Assets/arts/spines/characters/p13001/p13001.skel.bytes differ diff --git a/Assets/arts/spines/characters/p13001/p13001_skeletondata.asset b/Assets/arts/spines/characters/p13001/p13001_skeletondata.asset index 71a1d09a8..d60587ead 100644 --- a/Assets/arts/spines/characters/p13001/p13001_skeletondata.asset +++ b/Assets/arts/spines/characters/p13001/p13001_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/p14001/p14001_skeletondata.asset b/Assets/arts/spines/characters/p14001/p14001_skeletondata.asset index 971297bff..492fb55a4 100644 --- a/Assets/arts/spines/characters/p14001/p14001_skeletondata.asset +++ b/Assets/arts/spines/characters/p14001/p14001_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/p15001/p15001_skeletondata.asset b/Assets/arts/spines/characters/p15001/p15001_skeletondata.asset index 86111f073..fc861b16f 100644 --- a/Assets/arts/spines/characters/p15001/p15001_skeletondata.asset +++ b/Assets/arts/spines/characters/p15001/p15001_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/p15002/p15002_skeletondata.asset b/Assets/arts/spines/characters/p15002/p15002_skeletondata.asset index 56f7f880d..19b4241af 100644 --- a/Assets/arts/spines/characters/p15002/p15002_skeletondata.asset +++ b/Assets/arts/spines/characters/p15002/p15002_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/p16001/p16001_skeletondata.asset b/Assets/arts/spines/characters/p16001/p16001_skeletondata.asset index 2c83ee5e5..928e31f4b 100644 --- a/Assets/arts/spines/characters/p16001/p16001_skeletondata.asset +++ b/Assets/arts/spines/characters/p16001/p16001_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/p23001/p23001_skeletondata.asset b/Assets/arts/spines/characters/p23001/p23001_skeletondata.asset index 549b20344..4000f4e1b 100644 --- a/Assets/arts/spines/characters/p23001/p23001_skeletondata.asset +++ b/Assets/arts/spines/characters/p23001/p23001_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/p25002/p25002_skeletondata.asset b/Assets/arts/spines/characters/p25002/p25002_skeletondata.asset index ec67fcb69..2f2261c4e 100644 --- a/Assets/arts/spines/characters/p25002/p25002_skeletondata.asset +++ b/Assets/arts/spines/characters/p25002/p25002_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/p33001/p33001_skeletondata.asset b/Assets/arts/spines/characters/p33001/p33001_skeletondata.asset index db4b5f646..8d76599d0 100644 --- a/Assets/arts/spines/characters/p33001/p33001_skeletondata.asset +++ b/Assets/arts/spines/characters/p33001/p33001_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/p34001/p34001_skeletondata.asset b/Assets/arts/spines/characters/p34001/p34001_skeletondata.asset index b2786b3f6..f2b694bfb 100644 --- a/Assets/arts/spines/characters/p34001/p34001_skeletondata.asset +++ b/Assets/arts/spines/characters/p34001/p34001_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/p45002/p45002.skel.bytes b/Assets/arts/spines/characters/p45002/p45002.skel.bytes index 7df30cf08..f366eac1e 100644 Binary files a/Assets/arts/spines/characters/p45002/p45002.skel.bytes and b/Assets/arts/spines/characters/p45002/p45002.skel.bytes differ diff --git a/Assets/arts/spines/characters/p45002/p45002_skeletondata.asset b/Assets/arts/spines/characters/p45002/p45002_skeletondata.asset index c603117e0..24cdbf4d5 100644 --- a/Assets/arts/spines/characters/p45002/p45002_skeletondata.asset +++ b/Assets/arts/spines/characters/p45002/p45002_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/p54001/p54001_skeletondata.asset b/Assets/arts/spines/characters/p54001/p54001_skeletondata.asset index 2d0dc6082..1991d59f1 100644 --- a/Assets/arts/spines/characters/p54001/p54001_skeletondata.asset +++ b/Assets/arts/spines/characters/p54001/p54001_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/p55001/p55001_skeletondata.asset b/Assets/arts/spines/characters/p55001/p55001_skeletondata.asset index c267e6750..febae2629 100644 --- a/Assets/arts/spines/characters/p55001/p55001_skeletondata.asset +++ b/Assets/arts/spines/characters/p55001/p55001_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0} diff --git a/Assets/prefabs/spine/ui/characters/m20001.prefab b/Assets/prefabs/spine/ui/characters/m20001.prefab index 57e09c58b..d50fde0c9 100644 --- a/Assets/prefabs/spine/ui/characters/m20001.prefab +++ b/Assets/prefabs/spine/ui/characters/m20001.prefab @@ -27,6 +27,7 @@ RectTransform: 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: 2663275627370592771} m_Father: {fileID: 0} @@ -81,6 +82,7 @@ RectTransform: 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: 110436067314948100} m_Father: {fileID: 2951863086470196126} @@ -119,6 +121,7 @@ RectTransform: 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: 2663275627370592771} m_RootOrder: 0 @@ -160,6 +163,7 @@ MonoBehaviour: additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} initialSkinName: initialFlipX: 0 initialFlipY: 0 @@ -167,6 +171,13 @@ MonoBehaviour: startingLoop: 0 timeScale: 1 freeze: 0 + layoutScaleMode: 0 + referenceSize: {x: 0, y: 0} + pivotOffset: {x: 0, y: 0} + referenceScale: 1 + layoutScale: 1 + rectTransformSize: {x: 0, y: 0} + editReferenceRect: 0 updateWhenInvisible: 3 allowMultipleCanvasRenderers: 0 canvasRenderers: [] @@ -174,16 +185,20 @@ MonoBehaviour: enableSeparatorSlots: 0 separatorParts: [] updateSeparatorPartLocation: 1 + updateSeparatorPartScale: 0 disableMeshAssignmentOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} meshGenerator: settings: useClipping: 1 zSpacing: 0 - pmaVertexColors: 1 tintBlack: 0 - canvasGroupTintBlack: 0 - calculateTangents: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 addNormals: 0 + calculateTangents: 0 immutableTriangles: 0 updateTiming: 1 unscaledTime: 0 diff --git a/Assets/prefabs/spine/ui/characters/m20002.prefab b/Assets/prefabs/spine/ui/characters/m20002.prefab index 9725dc7d7..2e2b982e1 100644 --- a/Assets/prefabs/spine/ui/characters/m20002.prefab +++ b/Assets/prefabs/spine/ui/characters/m20002.prefab @@ -27,6 +27,7 @@ RectTransform: 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: 2663275627370592771} m_Father: {fileID: 0} @@ -81,6 +82,7 @@ RectTransform: 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: 110436067314948100} m_Father: {fileID: 2951863086470196126} @@ -119,6 +121,7 @@ RectTransform: 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: 2663275627370592771} m_RootOrder: 0 @@ -160,6 +163,7 @@ MonoBehaviour: additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} initialSkinName: initialFlipX: 0 initialFlipY: 0 @@ -167,6 +171,13 @@ MonoBehaviour: startingLoop: 0 timeScale: 1 freeze: 0 + layoutScaleMode: 0 + referenceSize: {x: 0, y: 0} + pivotOffset: {x: 0, y: 0} + referenceScale: 1 + layoutScale: 1 + rectTransformSize: {x: 0, y: 0} + editReferenceRect: 0 updateWhenInvisible: 3 allowMultipleCanvasRenderers: 0 canvasRenderers: [] @@ -174,16 +185,20 @@ MonoBehaviour: enableSeparatorSlots: 0 separatorParts: [] updateSeparatorPartLocation: 1 + updateSeparatorPartScale: 0 disableMeshAssignmentOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} meshGenerator: settings: useClipping: 1 zSpacing: 0 - pmaVertexColors: 1 tintBlack: 0 - canvasGroupTintBlack: 0 - calculateTangents: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 addNormals: 0 + calculateTangents: 0 immutableTriangles: 0 updateTiming: 1 unscaledTime: 0 diff --git a/Assets/prefabs/spine/ui/characters/m20003.prefab b/Assets/prefabs/spine/ui/characters/m20003.prefab index 48e07aae2..cef376512 100644 --- a/Assets/prefabs/spine/ui/characters/m20003.prefab +++ b/Assets/prefabs/spine/ui/characters/m20003.prefab @@ -27,6 +27,7 @@ RectTransform: 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: 2663275627370592771} m_Father: {fileID: 0} @@ -81,6 +82,7 @@ RectTransform: 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: 110436067314948100} m_Father: {fileID: 2951863086470196126} @@ -119,6 +121,7 @@ RectTransform: 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: 2663275627370592771} m_RootOrder: 0 @@ -160,6 +163,7 @@ MonoBehaviour: additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} initialSkinName: initialFlipX: 0 initialFlipY: 0 @@ -167,6 +171,13 @@ MonoBehaviour: startingLoop: 0 timeScale: 1 freeze: 0 + layoutScaleMode: 0 + referenceSize: {x: 0, y: 0} + pivotOffset: {x: 0, y: 0} + referenceScale: 1 + layoutScale: 1 + rectTransformSize: {x: 0, y: 0} + editReferenceRect: 0 updateWhenInvisible: 3 allowMultipleCanvasRenderers: 0 canvasRenderers: [] @@ -174,16 +185,20 @@ MonoBehaviour: enableSeparatorSlots: 0 separatorParts: [] updateSeparatorPartLocation: 1 + updateSeparatorPartScale: 0 disableMeshAssignmentOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} meshGenerator: settings: useClipping: 1 zSpacing: 0 - pmaVertexColors: 1 tintBlack: 0 - canvasGroupTintBlack: 0 - calculateTangents: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 addNormals: 0 + calculateTangents: 0 immutableTriangles: 0 updateTiming: 1 unscaledTime: 0 diff --git a/Assets/prefabs/spine/ui/characters/m20004.prefab b/Assets/prefabs/spine/ui/characters/m20004.prefab index a0a311efb..f0612c688 100644 --- a/Assets/prefabs/spine/ui/characters/m20004.prefab +++ b/Assets/prefabs/spine/ui/characters/m20004.prefab @@ -27,6 +27,7 @@ RectTransform: 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: 2663275627370592771} m_Father: {fileID: 0} @@ -81,6 +82,7 @@ RectTransform: 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: 110436067314948100} m_Father: {fileID: 2951863086470196126} @@ -119,6 +121,7 @@ RectTransform: 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: 2663275627370592771} m_RootOrder: 0 @@ -160,6 +163,7 @@ MonoBehaviour: additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} initialSkinName: initialFlipX: 0 initialFlipY: 0 @@ -167,6 +171,13 @@ MonoBehaviour: startingLoop: 0 timeScale: 1 freeze: 0 + layoutScaleMode: 0 + referenceSize: {x: 0, y: 0} + pivotOffset: {x: 0, y: 0} + referenceScale: 1 + layoutScale: 1 + rectTransformSize: {x: 0, y: 0} + editReferenceRect: 0 updateWhenInvisible: 3 allowMultipleCanvasRenderers: 0 canvasRenderers: [] @@ -174,16 +185,20 @@ MonoBehaviour: enableSeparatorSlots: 0 separatorParts: [] updateSeparatorPartLocation: 1 + updateSeparatorPartScale: 0 disableMeshAssignmentOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} meshGenerator: settings: useClipping: 1 zSpacing: 0 - pmaVertexColors: 1 tintBlack: 0 - canvasGroupTintBlack: 0 - calculateTangents: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 addNormals: 0 + calculateTangents: 0 immutableTriangles: 0 updateTiming: 1 unscaledTime: 0 diff --git a/Assets/prefabs/ui/company.meta b/Assets/prefabs/ui/company.meta new file mode 100644 index 000000000..410480dcf --- /dev/null +++ b/Assets/prefabs/ui/company.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 31a1a56dba5ba46e7b77b7722531c2dd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/prefabs/ui/company/company_comp.prefab b/Assets/prefabs/ui/company/company_comp.prefab new file mode 100644 index 000000000..6da60274b --- /dev/null +++ b/Assets/prefabs/ui/company/company_comp.prefab @@ -0,0 +1,221 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3159066360753299526 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5232304874814648913} + - component: {fileID: 8278069963945656264} + - component: {fileID: 7897178238889376411} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5232304874814648913 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3159066360753299526} + 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: 239166571354106532} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 55} + m_SizeDelta: {x: 1280, y: 1800} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8278069963945656264 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3159066360753299526} + m_CullTransparentMesh: 1 +--- !u!114 &7897178238889376411 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3159066360753299526} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + 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_Texture: {fileID: 2800000, guid: 6fdb003cb9ba1e14bb77b744b5bb6c7c, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!1 &7559908242410879023 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1425640888523418454} + - component: {fileID: 604983039931983421} + - component: {fileID: 4788054750295960110} + - component: {fileID: 9106919206972882683} + m_Layer: 0 + m_Name: talent_btn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1425640888523418454 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7559908242410879023} + 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: 239166571354106532} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 156, y: 68} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &604983039931983421 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7559908242410879023} + m_CullTransparentMesh: 1 +--- !u!114 &4788054750295960110 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7559908242410879023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 1a4363e1856808e4ea0a078472b03c75, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &9106919206972882683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7559908242410879023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 +--- !u!1 &8409091105670566433 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 239166571354106532} + - component: {fileID: 3286775221739226234} + m_Layer: 5 + m_Name: company_comp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &239166571354106532 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8409091105670566433} + 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: 5232304874814648913} + - {fileID: 1425640888523418454} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3286775221739226234 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8409091105670566433} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3} + m_Name: + m_EditorClassIdentifier: + prefabList: + - name: company_comp.talent_btn + hashName: 2712584454 + objectType: 0 + gameObject: {fileID: 7559908242410879023} diff --git a/Assets/prefabs/ui/company/company_comp.prefab.meta b/Assets/prefabs/ui/company/company_comp.prefab.meta new file mode 100644 index 000000000..56092c1e1 --- /dev/null +++ b/Assets/prefabs/ui/company/company_comp.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cc0ec147a17b64b2cb56d43e0fabb473 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/prefabs/ui/main_city/main_ui.prefab b/Assets/prefabs/ui/main_city/main_ui.prefab index f9cb5de41..f7e52f0f5 100644 --- a/Assets/prefabs/ui/main_city/main_ui.prefab +++ b/Assets/prefabs/ui/main_city/main_ui.prefab @@ -4753,6 +4753,7 @@ RectTransform: - {fileID: 2195415561721556952} - {fileID: 2888305924262629196} - {fileID: 502275081594006781} + - {fileID: 3545957270834314268} - {fileID: 745977305505643715} m_Father: {fileID: 4165930251451731960} m_RootOrder: 0 @@ -5251,6 +5252,10 @@ MonoBehaviour: hashName: 1483471400 objectType: 1 gameObject: {fileID: 9059158996597539910} + - name: main_ui.sub_ui_node.company_comp + hashName: 1406597701 + objectType: 1 + gameObject: {fileID: 5104656650981819545} --- !u!114 &6214590949040345325 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5485,7 +5490,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 239166571354106532, guid: 7f81772dff012e24487ca260793a9744, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 239166571354106532, guid: 7f81772dff012e24487ca260793a9744, type: 3} propertyPath: m_AnchorMax.x @@ -6269,6 +6274,113 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5471507407041762851, guid: 3432548e889deee4f9bb96253a139feb, type: 3} m_PrefabInstance: {fileID: 3481764838941797089} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3631156817444165304 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4830373999101852056} + m_Modifications: + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8409091105670566433, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + propertyPath: m_Name + value: company_comp + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} +--- !u!224 &3545957270834314268 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 239166571354106532, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + m_PrefabInstance: {fileID: 3631156817444165304} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5104656650981819545 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8409091105670566433, guid: cc0ec147a17b64b2cb56d43e0fabb473, type: 3} + m_PrefabInstance: {fileID: 3631156817444165304} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4995549557732434771 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/talent.meta b/Assets/prefabs/ui/talent.meta new file mode 100644 index 000000000..1744f45c0 --- /dev/null +++ b/Assets/prefabs/ui/talent.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: be5ad608987584a81b9b39da69c1de1c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/prefabs/ui/talent/cell.meta b/Assets/prefabs/ui/talent/cell.meta new file mode 100644 index 000000000..b57226b38 --- /dev/null +++ b/Assets/prefabs/ui/talent/cell.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd5eff516ad1245d6a0e61f5da5530aa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/prefabs/ui/talent/cell/talent_cell.prefab b/Assets/prefabs/ui/talent/cell/talent_cell.prefab new file mode 100644 index 000000000..69eadacfb --- /dev/null +++ b/Assets/prefabs/ui/talent/cell/talent_cell.prefab @@ -0,0 +1,470 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &217410162925782685 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1106958158553028947} + - component: {fileID: 8553546457501264313} + - component: {fileID: 632243346558370112} + m_Layer: 0 + m_Name: desc_tx_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1106958158553028947 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 217410162925782685} + 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: 3891146818159484927} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -44} + m_SizeDelta: {x: 160, y: 24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8553546457501264313 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 217410162925782685} + m_CullTransparentMesh: 1 +--- !u!114 &632243346558370112 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 217410162925782685} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + 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_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3271783488240858936 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2550558642015126864} + - component: {fileID: 557009035372355343} + - component: {fileID: 7575575527704020492} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2550558642015126864 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3271783488240858936} + 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: 3891146818159484927} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 166, y: 216} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &557009035372355343 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3271783488240858936} + m_CullTransparentMesh: 1 +--- !u!114 &7575575527704020492 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3271783488240858936} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 1bf9c73960324d3439e0db7c0390d805, type: 3} + 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!1 &4457103454302141893 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6186608537558105873} + - component: {fileID: 7331632183612981236} + - component: {fileID: 1100561641411532870} + m_Layer: 0 + m_Name: desc_tx_2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6186608537558105873 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4457103454302141893} + 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: 3891146818159484927} + m_RootOrder: 2 + 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: -78} + m_SizeDelta: {x: 160, y: 28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7331632183612981236 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4457103454302141893} + m_CullTransparentMesh: 1 +--- !u!114 &1100561641411532870 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4457103454302141893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + 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_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 0.8666667, b: 0.13725491, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4692731834399831388 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3891146818159484927} + - component: {fileID: 8853493035119981677} + - component: {fileID: 754072199706501517} + - component: {fileID: 374964887133036783} + - component: {fileID: 3630788701447914569} + - component: {fileID: 3561112501677931829} + m_Layer: 5 + m_Name: talent_cell + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3891146818159484927 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4692731834399831388} + 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: 2550558642015126864} + - {fileID: 1106958158553028947} + - {fileID: 6186608537558105873} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 869} + m_SizeDelta: {x: 166, y: 216} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8853493035119981677 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4692731834399831388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3} + m_Name: + m_EditorClassIdentifier: + prefabList: + - name: talent_cell.bg + hashName: 2415380478 + objectType: 0 + gameObject: {fileID: 3271783488240858936} + - name: talent_cell.desc_tx_1 + hashName: 3255371851 + objectType: 0 + gameObject: {fileID: 217410162925782685} + - name: talent_cell.desc_tx_2 + hashName: 3255371852 + objectType: 0 + gameObject: {fileID: 4457103454302141893} +--- !u!114 &754072199706501517 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4692731834399831388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f2ff04a05639f474f85820cdf1f47de0, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &374964887133036783 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4692731834399831388} + m_CullTransparentMesh: 1 +--- !u!114 &3630788701447914569 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4692731834399831388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + 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: [] +--- !u!114 &3561112501677931829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4692731834399831388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 0 diff --git a/Assets/prefabs/ui/talent/cell/talent_cell.prefab.meta b/Assets/prefabs/ui/talent/cell/talent_cell.prefab.meta new file mode 100644 index 000000000..8803e5e15 --- /dev/null +++ b/Assets/prefabs/ui/talent/cell/talent_cell.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 71db5312f753f48abbb89d4ec29e37dd +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/prefabs/ui/talent/talent_ui.prefab b/Assets/prefabs/ui/talent/talent_ui.prefab new file mode 100644 index 000000000..67aae39d7 --- /dev/null +++ b/Assets/prefabs/ui/talent/talent_ui.prefab @@ -0,0 +1,855 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &496410164707164677 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4615284462064543554} + - component: {fileID: 7536285474859755272} + - component: {fileID: 8655679638251378739} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4615284462064543554 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 496410164707164677} + 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: 8461932745927490369} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1280, y: 1600} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7536285474859755272 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 496410164707164677} + m_CullTransparentMesh: 1 +--- !u!114 &8655679638251378739 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 496410164707164677} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + 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_Texture: {fileID: 2800000, guid: 6fdb003cb9ba1e14bb77b744b5bb6c7c, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!1 &2385785411406814515 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 332100636639920940} + - component: {fileID: 7141566688789457768} + - component: {fileID: 1393051824602579190} + - component: {fileID: 5716647224053079932} + - component: {fileID: 7759312509310423841} + m_Layer: 5 + m_Name: scrollrect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &332100636639920940 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2385785411406814515} + 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: 3607581344977099942} + m_Father: {fileID: 5468779054327621916} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -88} + m_SizeDelta: {x: 720, y: -238} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &7141566688789457768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2385785411406814515} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 4919397710858056522} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 3607581344977099942} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!222 &1393051824602579190 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2385785411406814515} + m_CullTransparentMesh: 1 +--- !u!114 &5716647224053079932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2385785411406814515} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + 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: [] +--- !u!114 &7759312509310423841 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2385785411406814515} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e290255ba1add4ababd574322a0843c7, type: 3} + m_Name: + m_EditorClassIdentifier: + isDrag: 0 + contentTrans: {fileID: 3607581344977099942} + bfCell: {fileID: 5054905268533832767} + topRecoveryOffset: 0 + downRecoveryOffset: 0 + direction: 0 + reverse: 0 + cellWidth: 166 + cellHeight: 216 + perLineNum: 4 +--- !u!1 &5997397792976241942 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8461932745927490369} + - component: {fileID: 4700839527353464480} + - component: {fileID: 2459416726653635175} + - component: {fileID: 1652254950293225014} + - component: {fileID: 1399017322653974631} + m_Layer: 5 + m_Name: talent_ui + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8461932745927490369 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5997397792976241942} + 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: 4615284462064543554} + - {fileID: 6759090222824278340} + - {fileID: 5468779054327621916} + - {fileID: 4645955944217573486} + - {fileID: 8290202944170257985} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4700839527353464480 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5997397792976241942} + m_CullTransparentMesh: 1 +--- !u!223 &2459416726653635175 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5997397792976241942} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &1652254950293225014 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5997397792976241942} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1399017322653974631 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5997397792976241942} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3} + m_Name: + m_EditorClassIdentifier: + prefabList: + - name: talent_ui.bottom_bg.scrollrect + hashName: 1059283245 + objectType: 0 + gameObject: {fileID: 2385785411406814515} + - name: talent_ui.close_btn + hashName: 2290786606 + objectType: 0 + gameObject: {fileID: 6122632468757565545} +--- !u!1 &6112171584820915872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4645955944217573486} + - component: {fileID: 2557693087982117678} + - component: {fileID: 9209938248906711318} + m_Layer: 5 + m_Name: bg1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4645955944217573486 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6112171584820915872} + 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: 8461932745927490369} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 136} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &2557693087982117678 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6112171584820915872} + m_CullTransparentMesh: 1 +--- !u!114 &9209938248906711318 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6112171584820915872} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 6e494c792605640bdbdf9379172d9404, type: 3} + 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!1 &6122632468757565545 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8290202944170257985} + - component: {fileID: 7536917236859962665} + - component: {fileID: 8838796473989699554} + - component: {fileID: 434529433206437907} + m_Layer: 0 + m_Name: close_btn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8290202944170257985 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6122632468757565545} + 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: 8461932745927490369} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 104, y: 65} + m_SizeDelta: {x: 132, y: 96} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7536917236859962665 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6122632468757565545} + m_CullTransparentMesh: 1 +--- !u!114 &8838796473989699554 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6122632468757565545} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: bd3cdfd63768e3442ab4908a5f300e19, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &434529433206437907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6122632468757565545} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 +--- !u!1 &6610133400071158306 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5468779054327621916} + - component: {fileID: 4340914525094036941} + - component: {fileID: 1124255404348056371} + m_Layer: 5 + m_Name: bottom_bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5468779054327621916 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6610133400071158306} + 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: 332100636639920940} + m_Father: {fileID: 8461932745927490369} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 930} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &4340914525094036941 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6610133400071158306} + m_CullTransparentMesh: 1 +--- !u!114 &1124255404348056371 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6610133400071158306} + 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: 21300000, guid: 4b4d73ac48dffca4fa760e7a48e51ad2, type: 3} + 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!1 &6672300083937388673 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6759090222824278340} + - component: {fileID: 175397954408035054} + - component: {fileID: 3120974128816982699} + m_Layer: 5 + m_Name: bg1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6759090222824278340 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6672300083937388673} + 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: 8461932745927490369} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1280, y: 360} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &175397954408035054 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6672300083937388673} + m_CullTransparentMesh: 1 +--- !u!114 &3120974128816982699 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6672300083937388673} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 88ef3ee019adc4061ac52d534ba10987, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!1 &7701579831426425270 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4919397710858056522} + - component: {fileID: 3231478445068643713} + - component: {fileID: 7223405109964705802} + - component: {fileID: 3934694165360483038} + m_Layer: 5 + m_Name: content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4919397710858056522 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7701579831426425270} + 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: 8813967022262899277} + m_Father: {fileID: 3607581344977099942} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 720, y: 1954} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &3231478445068643713 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7701579831426425270} + m_CullTransparentMesh: 1 +--- !u!114 &7223405109964705802 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7701579831426425270} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + 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: [] +--- !u!114 &3934694165360483038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7701579831426425270} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 0 +--- !u!1 &8828537705071452128 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3607581344977099942} + m_Layer: 5 + m_Name: viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3607581344977099942 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8828537705071452128} + 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: 4919397710858056522} + m_Father: {fileID: 332100636639920940} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 720, y: 510} + m_Pivot: {x: 0.5, y: 1} +--- !u!1001 &5499353799589186994 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4919397710858056522} + m_Modifications: + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_SizeDelta.x + value: 166 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_SizeDelta.y + value: 216 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_AnchoredPosition.y + value: 869 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4692731834399831388, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + propertyPath: m_Name + value: talent_cell + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} +--- !u!114 &5054905268533832767 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 754072199706501517, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + m_PrefabInstance: {fileID: 5499353799589186994} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f2ff04a05639f474f85820cdf1f47de0, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &8813967022262899277 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3891146818159484927, guid: 71db5312f753f48abbb89d4ec29e37dd, type: 3} + m_PrefabInstance: {fileID: 5499353799589186994} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/prefabs/ui/talent/talent_ui.prefab.meta b/Assets/prefabs/ui/talent/talent_ui.prefab.meta new file mode 100644 index 000000000..48f5c3796 --- /dev/null +++ b/Assets/prefabs/ui/talent/talent_ui.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b3a998495f6274ef2ac42a82520c5225 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: