diff --git a/Assets/arts/effects/models/daoguang_df_0002.FBX.meta b/Assets/arts/effects/models/daoguang_df_0002.FBX.meta index b73e84605..16408d676 100644 --- a/Assets/arts/effects/models/daoguang_df_0002.FBX.meta +++ b/Assets/arts/effects/models/daoguang_df_0002.FBX.meta @@ -1,65 +1,120 @@ fileFormatVersion: 2 guid: 75644445689bf894a9d9ca8c216dcd56 ModelImporter: - serializedVersion: 16 - fileIDToRecycleName: - 100000: //RootNode - 400000: //RootNode - 2300000: //RootNode - 3300000: //RootNode - 4300000: daoguang_df_0002 - 9500000: //RootNode + serializedVersion: 20200 + internalIDToNameTable: + - first: + 1: 100000 + second: //RootNode + - first: + 4: 400000 + second: //RootNode + - first: + 23: 2300000 + second: //RootNode + - first: + 33: 3300000 + second: //RootNode + - first: + 43: 4300000 + second: daoguang_df_0002 + - first: + 95: 9500000 + second: //RootNode + externalObjects: {} materials: - importMaterials: 1 + materialImportMode: 0 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 + resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 animationCompression: 1 - animationRotationError: .5 - animationPositionError: .5 - animationScaleError: .5 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: lODScreenPercentages: [] - globalScale: .00999999978 + globalScale: 0.01 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 + fileIdsGeneration: 1 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 - optimizeMeshForGPU: 1 + keepQuads: 0 weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 1 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 0 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 + useFileScale: 0 tangentSpace: normalSmoothAngle: 60 - splitTangentsAcrossUV: 1 normalImportMode: 0 - tangentImportMode: 1 - importAnimation: 1 - copyAvatar: 0 + tangentImportMode: 4 + normalCalculationMode: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 0 humanDescription: + serializedVersion: 3 human: [] skeleton: [] - armTwist: .5 - foreArmTwist: .5 - upperLegTwist: .5 - legTwist: .5 - armStretch: .0500000007 - legStretch: .0500000007 + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 feetSpacing: 0 + globalScale: 0.01 rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 0 lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 animationType: 2 + humanoidOversampling: 1 + avatarSetup: 1 + addHumanoidExtraRootOnlyWhenUsingAvatar: 0 additionalBone: 0 userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/effects/models/ring_df_0003.FBX.meta b/Assets/arts/effects/models/ring_df_0003.FBX.meta index 6c027cb61..bfeaaec5c 100644 --- a/Assets/arts/effects/models/ring_df_0003.FBX.meta +++ b/Assets/arts/effects/models/ring_df_0003.FBX.meta @@ -1,65 +1,120 @@ fileFormatVersion: 2 guid: 126af95f5b629454c896f71bf99acb37 ModelImporter: - serializedVersion: 16 - fileIDToRecycleName: - 100000: //RootNode - 400000: //RootNode - 2300000: //RootNode - 3300000: //RootNode - 4300000: ring_df_0003 - 9500000: //RootNode + serializedVersion: 20200 + internalIDToNameTable: + - first: + 1: 100000 + second: //RootNode + - first: + 4: 400000 + second: //RootNode + - first: + 23: 2300000 + second: //RootNode + - first: + 33: 3300000 + second: //RootNode + - first: + 43: 4300000 + second: ring_df_0003 + - first: + 95: 9500000 + second: //RootNode + externalObjects: {} materials: - importMaterials: 0 + materialImportMode: 0 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 + resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 animationCompression: 1 - animationRotationError: .5 - animationPositionError: .5 - animationScaleError: .5 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: lODScreenPercentages: [] - globalScale: .00999999978 + globalScale: 0.01 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 + fileIdsGeneration: 1 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 - optimizeMeshForGPU: 1 + keepQuads: 0 weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 1 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 0 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 + useFileScale: 0 tangentSpace: normalSmoothAngle: 60 - splitTangentsAcrossUV: 1 normalImportMode: 0 - tangentImportMode: 1 - importAnimation: 1 - copyAvatar: 0 + tangentImportMode: 4 + normalCalculationMode: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 0 humanDescription: + serializedVersion: 3 human: [] skeleton: [] - armTwist: .5 - foreArmTwist: .5 - upperLegTwist: .5 - legTwist: .5 - armStretch: .0500000007 - legStretch: .0500000007 + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 feetSpacing: 0 + globalScale: 0.01 rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 0 lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 animationType: 2 + humanoidOversampling: 1 + avatarSetup: 1 + addHumanoidExtraRootOnlyWhenUsingAvatar: 0 additionalBone: 0 userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/effects/models/smoke_txy_0006.FBX.meta b/Assets/arts/effects/models/smoke_txy_0006.FBX.meta index ceaf79a00..8ab3dee21 100644 --- a/Assets/arts/effects/models/smoke_txy_0006.FBX.meta +++ b/Assets/arts/effects/models/smoke_txy_0006.FBX.meta @@ -1,65 +1,120 @@ fileFormatVersion: 2 guid: 4a97072b65a45c1479bd9b1aa54b8db1 ModelImporter: - serializedVersion: 16 - fileIDToRecycleName: - 100000: //RootNode - 400000: //RootNode - 2300000: //RootNode - 3300000: //RootNode - 4300000: smoke_txy_0006 - 9500000: //RootNode + serializedVersion: 20200 + internalIDToNameTable: + - first: + 1: 100000 + second: //RootNode + - first: + 4: 400000 + second: //RootNode + - first: + 23: 2300000 + second: //RootNode + - first: + 33: 3300000 + second: //RootNode + - first: + 43: 4300000 + second: smoke_txy_0006 + - first: + 95: 9500000 + second: //RootNode + externalObjects: {} materials: - importMaterials: 1 + materialImportMode: 0 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 + resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 animationCompression: 1 - animationRotationError: .5 - animationPositionError: .5 - animationScaleError: .5 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: lODScreenPercentages: [] - globalScale: .00999999978 + globalScale: 0.01 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 + fileIdsGeneration: 1 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 - optimizeMeshForGPU: 1 + keepQuads: 0 weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 1 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 0 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 + useFileScale: 0 tangentSpace: normalSmoothAngle: 60 - splitTangentsAcrossUV: 1 normalImportMode: 0 - tangentImportMode: 1 - importAnimation: 1 - copyAvatar: 0 + tangentImportMode: 4 + normalCalculationMode: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 0 humanDescription: + serializedVersion: 3 human: [] skeleton: [] - armTwist: .5 - foreArmTwist: .5 - upperLegTwist: .5 - legTwist: .5 - armStretch: .0500000007 - legStretch: .0500000007 + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 feetSpacing: 0 + globalScale: 0.01 rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 0 lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 animationType: 2 + humanoidOversampling: 1 + avatarSetup: 1 + addHumanoidExtraRootOnlyWhenUsingAvatar: 0 additionalBone: 0 userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/effects/models/sphere_txy_0003.FBX.meta b/Assets/arts/effects/models/sphere_txy_0003.FBX.meta index 088536c08..0241646bf 100644 --- a/Assets/arts/effects/models/sphere_txy_0003.FBX.meta +++ b/Assets/arts/effects/models/sphere_txy_0003.FBX.meta @@ -1,65 +1,120 @@ fileFormatVersion: 2 guid: 527ff218660c0444ebeb15567a826c3c ModelImporter: - serializedVersion: 16 - fileIDToRecycleName: - 100000: //RootNode - 400000: //RootNode - 2300000: //RootNode - 3300000: //RootNode - 4300000: sphere_txy_0003 - 9500000: //RootNode + serializedVersion: 20200 + internalIDToNameTable: + - first: + 1: 100000 + second: //RootNode + - first: + 4: 400000 + second: //RootNode + - first: + 23: 2300000 + second: //RootNode + - first: + 33: 3300000 + second: //RootNode + - first: + 43: 4300000 + second: sphere_txy_0003 + - first: + 95: 9500000 + second: //RootNode + externalObjects: {} materials: - importMaterials: 1 + materialImportMode: 0 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 + resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 animationCompression: 1 - animationRotationError: .5 - animationPositionError: .5 - animationScaleError: .5 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: lODScreenPercentages: [] - globalScale: .00999999978 + globalScale: 0.01 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 + fileIdsGeneration: 1 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 - optimizeMeshForGPU: 1 + keepQuads: 0 weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 1 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 0 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 + useFileScale: 0 tangentSpace: normalSmoothAngle: 60 - splitTangentsAcrossUV: 1 normalImportMode: 0 - tangentImportMode: 1 - importAnimation: 1 - copyAvatar: 0 + tangentImportMode: 4 + normalCalculationMode: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 0 humanDescription: + serializedVersion: 3 human: [] skeleton: [] - armTwist: .5 - foreArmTwist: .5 - upperLegTwist: .5 - legTwist: .5 - armStretch: .0500000007 - legStretch: .0500000007 + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 feetSpacing: 0 + globalScale: 0.01 rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 0 lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 animationType: 2 + humanoidOversampling: 1 + avatarSetup: 1 + addHumanoidExtraRootOnlyWhenUsingAvatar: 0 additionalBone: 0 userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/effects/texture/circle/guard03_gurple.png.meta b/Assets/arts/effects/texture/circle/guard03_gurple.png.meta index 3fe7f7116..45dd1bb9c 100644 --- a/Assets/arts/effects/texture/circle/guard03_gurple.png.meta +++ b/Assets/arts/effects/texture/circle/guard03_gurple.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -87,6 +87,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/effects/texture/circle/shandian_df_0010.png.meta b/Assets/arts/effects/texture/circle/shandian_df_0010.png.meta index 25b19dd44..2c4538620 100644 --- a/Assets/arts/effects/texture/circle/shandian_df_0010.png.meta +++ b/Assets/arts/effects/texture/circle/shandian_df_0010.png.meta @@ -1,33 +1,43 @@ fileFormatVersion: 2 guid: f29df222012cca348802b51bbde91139 TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 + cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 512 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -35,13 +45,76 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 1 - textureType: 5 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/effects/texture/fire/eff_lzj_012.png.meta b/Assets/arts/effects/texture/fire/eff_lzj_012.png.meta index dd2a04d03..73e5dd77f 100644 --- a/Assets/arts/effects/texture/fire/eff_lzj_012.png.meta +++ b/Assets/arts/effects/texture/fire/eff_lzj_012.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 19a84e28b085e154c80d77b56d5b925f TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 9 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,12 +32,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -54,11 +55,15 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -69,7 +74,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,6 +86,31 @@ TextureImporter: allowsAlphaSplitting: 0 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 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -87,10 +118,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/arts/effects/texture/fire/fire_df_0028_01.png.meta b/Assets/arts/effects/texture/fire/fire_df_0028_01.png.meta index dc49bb26a..237ae27c5 100644 --- a/Assets/arts/effects/texture/fire/fire_df_0028_01.png.meta +++ b/Assets/arts/effects/texture/fire/fire_df_0028_01.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -91,24 +91,24 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 50 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Assets/arts/effects/texture/fire/fire_exhaust_1_sheet 1.png.meta b/Assets/arts/effects/texture/fire/fire_exhaust_1_sheet 1.png.meta index 4e8ed22a6..4a706a902 100644 --- a/Assets/arts/effects/texture/fire/fire_exhaust_1_sheet 1.png.meta +++ b/Assets/arts/effects/texture/fire/fire_exhaust_1_sheet 1.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -91,24 +91,24 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 50 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Assets/arts/effects/texture/glow/glow_b02.png.meta b/Assets/arts/effects/texture/glow/glow_b02.png.meta index ca9912e1f..b0bd88784 100644 --- a/Assets/arts/effects/texture/glow/glow_b02.png.meta +++ b/Assets/arts/effects/texture/glow/glow_b02.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -91,24 +91,24 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 50 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Assets/arts/effects/texture/glow/light_yjs_0056_b01.png.meta b/Assets/arts/effects/texture/glow/light_yjs_0056_b01.png.meta index f62cc7014..5d9725303 100644 --- a/Assets/arts/effects/texture/glow/light_yjs_0056_b01.png.meta +++ b/Assets/arts/effects/texture/glow/light_yjs_0056_b01.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -87,6 +87,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/effects/texture/glow/light_yjs_0056_b03.png.meta b/Assets/arts/effects/texture/glow/light_yjs_0056_b03.png.meta index 41e90f7d6..f10ae8181 100644 --- a/Assets/arts/effects/texture/glow/light_yjs_0056_b03.png.meta +++ b/Assets/arts/effects/texture/glow/light_yjs_0056_b03.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -87,6 +87,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/effects/texture/lightning/shandian_df_0018.png.meta b/Assets/arts/effects/texture/lightning/shandian_df_0018.png.meta index 0c9cae1a2..d3c8a5d1a 100644 --- a/Assets/arts/effects/texture/lightning/shandian_df_0018.png.meta +++ b/Assets/arts/effects/texture/lightning/shandian_df_0018.png.meta @@ -1,33 +1,43 @@ fileFormatVersion: 2 guid: 9e8207113f0cc9c459befa2cb6f20c95 TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 + cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 256 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -35,13 +45,76 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 1 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/effects/texture/mask/cmn_trail_mask.tga.meta b/Assets/arts/effects/texture/mask/cmn_trail_mask.tga.meta index 5e97e01d8..f022c23fb 100644 --- a/Assets/arts/effects/texture/mask/cmn_trail_mask.tga.meta +++ b/Assets/arts/effects/texture/mask/cmn_trail_mask.tga.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -91,24 +91,24 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 50 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Assets/arts/effects/texture/mask/mask34.png.meta b/Assets/arts/effects/texture/mask/mask34.png.meta index 5275e2c8e..1ce397e37 100644 --- a/Assets/arts/effects/texture/mask/mask34.png.meta +++ b/Assets/arts/effects/texture/mask/mask34.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,12 +32,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -54,9 +55,12 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 @@ -71,6 +75,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/effects/texture/noise/chunbai_dzh_0001.png.meta b/Assets/arts/effects/texture/noise/chunbai_dzh_0001.png.meta index b44ed7882..a7c6d3cc3 100644 --- a/Assets/arts/effects/texture/noise/chunbai_dzh_0001.png.meta +++ b/Assets/arts/effects/texture/noise/chunbai_dzh_0001.png.meta @@ -1,33 +1,43 @@ fileFormatVersion: 2 guid: a0a98256c8b31bb469d5d0c286cba30f TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 - isReadable: 1 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 + cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 32 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -35,13 +45,76 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 0 - textureType: 5 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 32 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/effects/texture/noise/fx_d_noise_004_1.png.meta b/Assets/arts/effects/texture/noise/fx_d_noise_004_1.png.meta index dbfcd286f..ff5c6be9a 100644 --- a/Assets/arts/effects/texture/noise/fx_d_noise_004_1.png.meta +++ b/Assets/arts/effects/texture/noise/fx_d_noise_004_1.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -91,24 +91,24 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 50 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Assets/arts/effects/texture/other/fazhen_dzh_0016.png.meta b/Assets/arts/effects/texture/other/fazhen_dzh_0016.png.meta index f288b9779..b1e876993 100644 --- a/Assets/arts/effects/texture/other/fazhen_dzh_0016.png.meta +++ b/Assets/arts/effects/texture/other/fazhen_dzh_0016.png.meta @@ -1,33 +1,43 @@ fileFormatVersion: 2 guid: 3441996852435a34bbad7df04c2865cc TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 + cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 256 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -35,13 +45,76 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 1 - textureType: 5 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/effects/texture/other/fuwen_df_0003.png.meta b/Assets/arts/effects/texture/other/fuwen_df_0003.png.meta index 04f1634e8..db90530af 100644 --- a/Assets/arts/effects/texture/other/fuwen_df_0003.png.meta +++ b/Assets/arts/effects/texture/other/fuwen_df_0003.png.meta @@ -1,33 +1,43 @@ fileFormatVersion: 2 guid: 9a58e5e803614914b85228188d7b080f TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 + cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 256 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -35,13 +45,76 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 1 - textureType: 5 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/effects/texture/other/star_b01.tga.meta b/Assets/arts/effects/texture/other/star_b01.tga.meta index 11f452627..ef1ae8f21 100644 --- a/Assets/arts/effects/texture/other/star_b01.tga.meta +++ b/Assets/arts/effects/texture/other/star_b01.tga.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -87,6 +87,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/effects/texture/other/tex_02_xz_b01.png.meta b/Assets/arts/effects/texture/other/tex_02_xz_b01.png.meta index f30ba492a..ba8b15ae4 100644 --- a/Assets/arts/effects/texture/other/tex_02_xz_b01.png.meta +++ b/Assets/arts/effects/texture/other/tex_02_xz_b01.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -87,6 +87,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/effects/texture/other/tex_02_xz_b02.png.meta b/Assets/arts/effects/texture/other/tex_02_xz_b02.png.meta index 9ad2a321a..d29a50409 100644 --- a/Assets/arts/effects/texture/other/tex_02_xz_b02.png.meta +++ b/Assets/arts/effects/texture/other/tex_02_xz_b02.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -87,6 +87,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/effects/texture/path/path_bo_0268_b01.png.meta b/Assets/arts/effects/texture/path/path_bo_0268_b01.png.meta index 59c617761..cdd7e300b 100644 --- a/Assets/arts/effects/texture/path/path_bo_0268_b01.png.meta +++ b/Assets/arts/effects/texture/path/path_bo_0268_b01.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -87,6 +87,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/effects/texture/smoke/08.png.meta b/Assets/arts/effects/texture/smoke/08.png.meta index 58694bb3a..f7bee2357 100644 --- a/Assets/arts/effects/texture/smoke/08.png.meta +++ b/Assets/arts/effects/texture/smoke/08.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 51f969a76b4c41c46b01db2340d7276c TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 9 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,12 +32,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -54,11 +55,15 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -69,7 +74,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,17 +86,31 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 34 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -98,10 +118,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/arts/effects/texture/smoke/bretto_smoke_1_sheet_purple.png.meta b/Assets/arts/effects/texture/smoke/bretto_smoke_1_sheet_purple.png.meta index 41630bc2d..344dfd51a 100644 --- a/Assets/arts/effects/texture/smoke/bretto_smoke_1_sheet_purple.png.meta +++ b/Assets/arts/effects/texture/smoke/bretto_smoke_1_sheet_purple.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -91,24 +91,24 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 50 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Assets/arts/effects/texture/smoke/noise_ypl_004.png.meta b/Assets/arts/effects/texture/smoke/noise_ypl_004.png.meta index a75d9fb4a..1957c0136 100644 --- a/Assets/arts/effects/texture/smoke/noise_ypl_004.png.meta +++ b/Assets/arts/effects/texture/smoke/noise_ypl_004.png.meta @@ -89,26 +89,26 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 256 + maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 50 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 256 + maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Assets/arts/effects/texture/smoke/smoke_004.png.meta b/Assets/arts/effects/texture/smoke/smoke_004.png.meta index c2a97373d..8ea9bac69 100644 --- a/Assets/arts/effects/texture/smoke/smoke_004.png.meta +++ b/Assets/arts/effects/texture/smoke/smoke_004.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: aceed21bac9429742afb13b4748a5db4 TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 9 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,12 +32,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -54,11 +55,15 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -69,7 +74,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,17 +86,31 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: 47 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -98,10 +118,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/arts/effects/texture/smoke/smoke_txy_0002.png.meta b/Assets/arts/effects/texture/smoke/smoke_txy_0002.png.meta index b6f15407e..f4e9e0b93 100644 --- a/Assets/arts/effects/texture/smoke/smoke_txy_0002.png.meta +++ b/Assets/arts/effects/texture/smoke/smoke_txy_0002.png.meta @@ -91,26 +91,26 @@ TextureImporter: buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 50 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/effects/texture/splash/ci_yjs_0001_hong.png.meta b/Assets/arts/effects/texture/splash/ci_yjs_0001_hong.png.meta index 417ff09de..0618658d8 100644 --- a/Assets/arts/effects/texture/splash/ci_yjs_0001_hong.png.meta +++ b/Assets/arts/effects/texture/splash/ci_yjs_0001_hong.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 444d9c71a6e56a0459d7cf2ef8cea1f2 TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 9 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,12 +32,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -54,11 +55,15 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -69,7 +74,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,17 +86,31 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -98,10 +118,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/arts/effects/texture/splash/eff_yz_021.png.meta b/Assets/arts/effects/texture/splash/eff_yz_021.png.meta index f39a9c4af..233780762 100644 --- a/Assets/arts/effects/texture/splash/eff_yz_021.png.meta +++ b/Assets/arts/effects/texture/splash/eff_yz_021.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: fbfbb6126b7b21b4eb004fb921cfa9de TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 9 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,12 +32,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -54,11 +55,15 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -69,7 +74,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,6 +86,31 @@ TextureImporter: allowsAlphaSplitting: 0 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 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -87,10 +118,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/arts/effects/texture/splash/eff_zq_2208_gai 2.png.meta b/Assets/arts/effects/texture/splash/eff_zq_2208_gai 2.png.meta index 2643fde16..1961cfc44 100644 --- a/Assets/arts/effects/texture/splash/eff_zq_2208_gai 2.png.meta +++ b/Assets/arts/effects/texture/splash/eff_zq_2208_gai 2.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 16c27e356255a1543a0bb99b8d81932c TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 9 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,9 +32,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -54,11 +55,15 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -69,7 +74,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,6 +86,31 @@ TextureImporter: allowsAlphaSplitting: 0 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 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -87,10 +118,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/arts/effects/texture/splash/light_hx_0006.tga.meta b/Assets/arts/effects/texture/splash/light_hx_0006.tga.meta index 17dfb80fb..a51c18a54 100644 --- a/Assets/arts/effects/texture/splash/light_hx_0006.tga.meta +++ b/Assets/arts/effects/texture/splash/light_hx_0006.tga.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 4441ffc0df14c5c4bb08903d3ba0f072 TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 9 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 1 generateCubemap: 6 cubemapConvolution: 0 @@ -31,12 +32,12 @@ TextureImporter: maxTextureSize: 256 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -54,11 +55,15 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 256 resizeAlgorithm: 0 @@ -69,7 +74,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 256 resizeAlgorithm: 0 @@ -80,17 +86,31 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android - maxTextureSize: 256 + maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -98,10 +118,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/arts/effects/texture/splash/smoke_dzh_0018_shi.png.meta b/Assets/arts/effects/texture/splash/smoke_dzh_0018_shi.png.meta index fe3d31468..79756484b 100644 --- a/Assets/arts/effects/texture/splash/smoke_dzh_0018_shi.png.meta +++ b/Assets/arts/effects/texture/splash/smoke_dzh_0018_shi.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 304bde1d4f9f6ea428d0476535f46c3b TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 9 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,12 +32,12 @@ TextureImporter: maxTextureSize: 1024 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -54,11 +55,15 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 @@ -69,7 +74,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 1024 resizeAlgorithm: 0 @@ -80,17 +86,31 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android - maxTextureSize: 1024 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: 47 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -98,10 +118,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/arts/effects/texture/stripe/ctl_430_line.tga.meta b/Assets/arts/effects/texture/stripe/ctl_430_line.tga.meta index cf5cb47d5..082c5957b 100644 --- a/Assets/arts/effects/texture/stripe/ctl_430_line.tga.meta +++ b/Assets/arts/effects/texture/stripe/ctl_430_line.tga.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -91,24 +91,24 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 50 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Assets/arts/effects/texture/stripe/light_dzh_0055_hhq.png.meta b/Assets/arts/effects/texture/stripe/light_dzh_0055_hhq.png.meta index f067c32de..2ec199326 100644 --- a/Assets/arts/effects/texture/stripe/light_dzh_0055_hhq.png.meta +++ b/Assets/arts/effects/texture/stripe/light_dzh_0055_hhq.png.meta @@ -1,33 +1,43 @@ fileFormatVersion: 2 guid: be1a155c5a98bca418176796c9c167b6 TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 + sRGBTexture: 1 linearTexture: 0 - correctGamma: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 - generateCubemap: 0 + generateCubemap: 6 + cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 256 textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -35,13 +45,76 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 alphaIsTransparency: 1 - textureType: -1 - buildTargetSettings: [] + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button.meta b/Assets/arts/spines/ui/ui_main_button_1.meta similarity index 77% rename from Assets/arts/spines/ui/ui_main_button.meta rename to Assets/arts/spines/ui/ui_main_button_1.meta index ac58205b4..7b506ff8e 100644 --- a/Assets/arts/spines/ui/ui_main_button.meta +++ b/Assets/arts/spines/ui/ui_main_button_1.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9dfdf7e0b4465204e83a268b9b356b76 +guid: d1951f2cc6d57ef4e8f6597eb49639a4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.atlas.txt b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.atlas.txt new file mode 100644 index 000000000..9faea24c5 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.atlas.txt @@ -0,0 +1,7 @@ +ui_main_button_1.png +size:256,256 +filter:Linear,Linear +1 +bounds:2,75,108,67 +2 +bounds:2,2,103,71 diff --git a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.skel.bytes.meta b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.atlas.txt.meta similarity index 52% rename from Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.skel.bytes.meta rename to Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.atlas.txt.meta index e1ce28527..4009176fc 100644 --- a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.skel.bytes.meta +++ b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.atlas.txt.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: a763fbfae54f9314a843e00b2592edd6 +guid: 96b3bffd80b0e77479f28565b73997ab TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_main_button.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.png b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.png new file mode 100644 index 000000000..8c9c81911 Binary files /dev/null and b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.png differ diff --git a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.png.meta b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.png.meta similarity index 96% rename from Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.png.meta rename to Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.png.meta index 0d4dcd3ae..6d0803e12 100644 --- a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.png.meta +++ b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1e17c10146241234ea8f9d3a6cdd88fe +guid: 14730019da3d09b4eab985a7b234e38d TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -116,5 +116,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/ui/ui_main_button.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.skel.bytes b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.skel.bytes new file mode 100644 index 000000000..1e2e16efb Binary files /dev/null and b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.atlas.txt.meta b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.skel.bytes.meta similarity index 52% rename from Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.atlas.txt.meta rename to Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.skel.bytes.meta index 04751af06..ad65abd9c 100644 --- a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.atlas.txt.meta +++ b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.skel.bytes.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 955fd16eb1122b44bbe86e74433169b4 +guid: 9b0b7202af54ac14da3d22be095b6e20 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_main_button.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1_atlas.asset b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_atlas.asset similarity index 69% rename from Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1_atlas.asset rename to Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_atlas.asset index 77121f56b..568a4f6b8 100644 --- a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1_atlas.asset +++ b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_atlas.asset @@ -10,8 +10,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: ui_main_buttn_1_atlas + m_Name: ui_main_button_1_atlas m_EditorClassIdentifier: - atlasFile: {fileID: 4900000, guid: 955fd16eb1122b44bbe86e74433169b4, type: 3} + atlasFile: {fileID: 4900000, guid: 96b3bffd80b0e77479f28565b73997ab, type: 3} materials: - - {fileID: 2100000, guid: c7d51e08fb4ce7442ade204f6b23853c, type: 2} + - {fileID: 2100000, guid: 6db07b364f2ce2c44a8489ab6db29beb, type: 2} diff --git a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_atlas.asset.meta similarity index 58% rename from Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1_skeletondata.asset.meta rename to Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_atlas.asset.meta index d512df30c..481a0968c 100644 --- a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1_skeletondata.asset.meta +++ b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_atlas.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 2ca4456d9bff9a045a7ecc78c6fdd076 +guid: eb737806f005b31488fa6f4f6ba1fdd6 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_main_button.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1_material.mat b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_material.mat similarity index 89% rename from Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1_material.mat rename to Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_material.mat index fcd6094c7..25d991723 100644 --- a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1_material.mat +++ b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ui_main_buttn_1_material + m_Name: ui_main_button_1_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 @@ -20,7 +20,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 1e17c10146241234ea8f9d3a6cdd88fe, type: 3} + m_Texture: {fileID: 2800000, guid: 14730019da3d09b4eab985a7b234e38d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1_material.mat.meta b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_material.mat.meta similarity index 58% rename from Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1_material.mat.meta rename to Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_material.mat.meta index 2dadd5745..3cf7f8ae3 100644 --- a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1_material.mat.meta +++ b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_material.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: c7d51e08fb4ce7442ade204f6b23853c +guid: 6db07b364f2ce2c44a8489ab6db29beb NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/ui/ui_main_button.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_skeletondata.asset b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_skeletondata.asset similarity index 79% rename from Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_skeletondata.asset rename to Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_skeletondata.asset index 4279efad5..c41dcd43c 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_skeletondata.asset +++ b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_skeletondata.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: ui_common_dec_2_skeletondata + m_Name: ui_main_button_1_skeletondata m_EditorClassIdentifier: atlasAssets: - - {fileID: 11400000, guid: c8061e76cb1ee1445867befd24305153, type: 2} + - {fileID: 11400000, guid: eb737806f005b31488fa6f4f6ba1fdd6, type: 2} scale: 0.01 - skeletonJSON: {fileID: 4900000, guid: 77a9433d7c777af49960f2bfc9a8037d, type: 3} + skeletonJSON: {fileID: 4900000, guid: 9b0b7202af54ac14da3d22be095b6e20, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: requiresBlendModeMaterials: 0 diff --git a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1_atlas.asset.meta b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_skeletondata.asset.meta similarity index 58% rename from Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1_atlas.asset.meta rename to Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_skeletondata.asset.meta index e33ffe4b4..2d5c6ff98 100644 --- a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1_atlas.asset.meta +++ b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1_skeletondata.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 44fa2569b0db1d345b4d6bcf270a49c7 +guid: 234507584d8c82347a60a064dd7827a1 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_main_button.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.skel.bytes.meta b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.skel.bytes.meta deleted file mode 100644 index 44bbee4f3..000000000 --- a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.skel.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 77a9433d7c777af49960f2bfc9a8037d -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: arts/spines/ui/ui_main_button_2.ab - assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.atlas.txt b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2.atlas.txt similarity index 84% rename from Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.atlas.txt rename to Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2.atlas.txt index 40fec647c..764a627fa 100644 --- a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.atlas.txt +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2.atlas.txt @@ -1,4 +1,4 @@ -ui_main_buttn_1.png +ui_main_button_2.png size:256,256 filter:Linear,Linear 1 diff --git a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.atlas.txt.meta b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2.atlas.txt.meta similarity index 51% rename from Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.atlas.txt.meta rename to Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2.atlas.txt.meta index f7d274c6b..0a04ed589 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.atlas.txt.meta +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2.atlas.txt.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 49bf18802f6c8ba43b054b77095aa57d +guid: 6eb4ba170710c874e8af307aefced28e TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_main_button_2.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.png b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2.png similarity index 100% rename from Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.png rename to Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2.png diff --git a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.png.meta b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2.png.meta similarity index 96% rename from Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.png.meta rename to Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2.png.meta index 0e26f139c..73c1954d0 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.png.meta +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3da4af725c6267044a1e80fb6bf4cff8 +guid: 24dd3f0c37cd4394fac578c17874c069 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -116,5 +116,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/ui/ui_main_button_2.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.skel.bytes b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2.skel.bytes similarity index 63% rename from Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.skel.bytes rename to Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2.skel.bytes index 48688107b..4e5319fe1 100644 Binary files a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.skel.bytes and b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2.skel.bytes.meta b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2.skel.bytes.meta new file mode 100644 index 000000000..bb1028411 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8a5aba99a1fde664eb6a960ce7bb506b +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_atlas.asset b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_atlas.asset similarity index 69% rename from Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_atlas.asset rename to Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_atlas.asset index 372d85389..d98516f5f 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_atlas.asset +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_atlas.asset @@ -10,8 +10,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: ui_common_dec_2_atlas + m_Name: ui_main_button_2_atlas m_EditorClassIdentifier: - atlasFile: {fileID: 4900000, guid: 49bf18802f6c8ba43b054b77095aa57d, type: 3} + atlasFile: {fileID: 4900000, guid: 6eb4ba170710c874e8af307aefced28e, type: 3} materials: - - {fileID: 2100000, guid: 049da500b8b3c9145b4a8d3d6b8b3868, type: 2} + - {fileID: 2100000, guid: 74a0eefb72afcec4e9e89962ce20840c, type: 2} diff --git a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_atlas.asset.meta similarity index 58% rename from Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_skeletondata.asset.meta rename to Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_atlas.asset.meta index e7f010430..f7f753489 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_skeletondata.asset.meta +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_atlas.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 04f2fbf456dd7df4f95972fcc8dc69ef +guid: 0cc3a5fea9b88254989dbb270afc55c0 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_main_button_2.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_material.mat b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_material.mat similarity index 89% rename from Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_material.mat rename to Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_material.mat index e8a46d264..b1687d586 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_material.mat +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ui_common_dec_2_material + m_Name: ui_main_button_2_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 @@ -20,7 +20,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 3da4af725c6267044a1e80fb6bf4cff8, type: 3} + m_Texture: {fileID: 2800000, guid: 24dd3f0c37cd4394fac578c17874c069, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_material.mat.meta b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_material.mat.meta similarity index 58% rename from Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_material.mat.meta rename to Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_material.mat.meta index 60698dc30..f6bbcd077 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_material.mat.meta +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_material.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 049da500b8b3c9145b4a8d3d6b8b3868 +guid: 74a0eefb72afcec4e9e89962ce20840c NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/ui/ui_main_button_2.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1_skeletondata.asset b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_skeletondata.asset similarity index 77% rename from Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1_skeletondata.asset rename to Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_skeletondata.asset index d3323d62f..e5b6a3743 100644 --- a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1_skeletondata.asset +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_skeletondata.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: ui_main_buttn_1_skeletondata + m_Name: ui_main_button_2_skeletondata m_EditorClassIdentifier: atlasAssets: - - {fileID: 11400000, guid: 44fa2569b0db1d345b4d6bcf270a49c7, type: 2} + - {fileID: 11400000, guid: 0cc3a5fea9b88254989dbb270afc55c0, type: 2} scale: 0.01 - skeletonJSON: {fileID: 4900000, guid: a763fbfae54f9314a843e00b2592edd6, type: 3} + skeletonJSON: {fileID: 4900000, guid: 8a5aba99a1fde664eb6a960ce7bb506b, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: requiresBlendModeMaterials: 0 @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0 + defaultMix: 0.2 controller: {fileID: 0} diff --git a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_atlas.asset.meta b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_skeletondata.asset.meta similarity index 58% rename from Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_atlas.asset.meta rename to Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_skeletondata.asset.meta index 1aa6b81e7..5d60aad0c 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_atlas.asset.meta +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_main_button_2_skeletondata.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: c8061e76cb1ee1445867befd24305153 +guid: 4989a4c057c89ff4da77d5168a96ecc7 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_main_button_2.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button_3.meta b/Assets/arts/spines/ui/ui_main_button_3.meta new file mode 100644 index 000000000..8a4853d83 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_3.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 105f076467146d849ba22d1e54aa0124 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.atlas.txt b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.atlas.txt similarity index 91% rename from Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.atlas.txt rename to Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.atlas.txt index 78a752e79..742e97fd0 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.atlas.txt +++ b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.atlas.txt @@ -1,4 +1,4 @@ -ui_common_dec_2.png +ui_main_button_3.png size:256,256 filter:Linear,Linear 1 diff --git a/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.atlas.txt.meta b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.atlas.txt.meta new file mode 100644 index 000000000..52b1f6c78 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 72580cce0e2c11043856bce298757361 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.png b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.png similarity index 100% rename from Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.png rename to Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.png diff --git a/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.png.meta b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.png.meta new file mode 100644 index 000000000..2568d20a2 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: cbe6156010ec2ce4d9ae429ee6d7fda8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.skel.bytes b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.skel.bytes similarity index 82% rename from Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.skel.bytes rename to Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.skel.bytes index 239e4868a..3999c1cf6 100644 Binary files a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.skel.bytes and b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.skel.bytes.meta b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.skel.bytes.meta new file mode 100644 index 000000000..941ac0aaa --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cb3aeff8034630349a26fd994ed10d07 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_atlas.asset b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_atlas.asset new file mode 100644 index 000000000..65441f02e --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_atlas.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: ui_main_button_3_atlas + m_EditorClassIdentifier: + atlasFile: {fileID: 4900000, guid: 72580cce0e2c11043856bce298757361, type: 3} + materials: + - {fileID: 2100000, guid: 761feb0ebab18a34e8803e9e125b226f, type: 2} diff --git a/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_atlas.asset.meta b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_atlas.asset.meta new file mode 100644 index 000000000..556db015c --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6c8038d8d105e934391bfaab89a287bb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_material.mat b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_material.mat new file mode 100644 index 000000000..e92873997 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_material.mat @@ -0,0 +1,40 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ui_main_button_3_material + m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: cbe6156010ec2ce4d9ae429ee6d7fda8, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.1 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 1 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + m_Colors: + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_material.mat.meta b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_material.mat.meta new file mode 100644 index 000000000..0d0f91fda --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 761feb0ebab18a34e8803e9e125b226f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_skeletondata.asset b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_skeletondata.asset new file mode 100644 index 000000000..a9f3a573d --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_skeletondata.asset @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: ui_main_button_3_skeletondata + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: 6c8038d8d105e934391bfaab89a287bb, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: cb3aeff8034630349a26fd994ed10d07, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 0 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_skeletondata.asset.meta new file mode 100644 index 000000000..fa2a1addb --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3_skeletondata.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 95dc39d6bc747aa44b75b095a1170f00 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/common/data_manager.lua.bytes b/Assets/lua/app/common/data_manager.lua.bytes index 81e6f6c57..a048011c3 100644 Binary files a/Assets/lua/app/common/data_manager.lua.bytes and b/Assets/lua/app/common/data_manager.lua.bytes differ diff --git a/Assets/lua/app/config/localization/localization_global_const.lua.bytes b/Assets/lua/app/config/localization/localization_global_const.lua.bytes index 4a7e48cce..671590521 100644 Binary files a/Assets/lua/app/config/localization/localization_global_const.lua.bytes and b/Assets/lua/app/config/localization/localization_global_const.lua.bytes differ diff --git a/Assets/lua/app/config/strings/cn/global.lua.bytes b/Assets/lua/app/config/strings/cn/global.lua.bytes index 46aa1a1a6..470d69ae1 100644 Binary files a/Assets/lua/app/config/strings/cn/global.lua.bytes and b/Assets/lua/app/config/strings/cn/global.lua.bytes differ diff --git a/Assets/lua/app/global/global_func.lua.bytes b/Assets/lua/app/global/global_func.lua.bytes index 036eea1ea..b7a18d0f6 100644 Binary files a/Assets/lua/app/global/global_func.lua.bytes and b/Assets/lua/app/global/global_func.lua.bytes differ diff --git a/Assets/lua/app/module/fund/fund_manager.lua.bytes b/Assets/lua/app/module/fund/fund_manager.lua.bytes index ec3979c88..31ff775e7 100644 Binary files a/Assets/lua/app/module/fund/fund_manager.lua.bytes and b/Assets/lua/app/module/fund/fund_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/fund/cell/level_fund_cell.lua.bytes b/Assets/lua/app/ui/fund/cell/level_fund_cell.lua.bytes index 3a450d590..1cb5fa5ca 100644 Binary files a/Assets/lua/app/ui/fund/cell/level_fund_cell.lua.bytes and b/Assets/lua/app/ui/fund/cell/level_fund_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/fund/cell/level_fund_reward_cell.lua.bytes b/Assets/lua/app/ui/fund/cell/level_fund_reward_cell.lua.bytes index 2ef3c988f..4b9b3dea1 100644 Binary files a/Assets/lua/app/ui/fund/cell/level_fund_reward_cell.lua.bytes and b/Assets/lua/app/ui/fund/cell/level_fund_reward_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/fund/level_fund_ui.lua.bytes b/Assets/lua/app/ui/fund/level_fund_ui.lua.bytes index 78563e39c..4cc4f94e5 100644 Binary files a/Assets/lua/app/ui/fund/level_fund_ui.lua.bytes and b/Assets/lua/app/ui/fund/level_fund_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/cell/side_bar_base_cell.lua.bytes b/Assets/lua/app/ui/main_city/cell/side_bar_base_cell.lua.bytes index 7ab70cfaa..7a86d7f16 100644 Binary files a/Assets/lua/app/ui/main_city/cell/side_bar_base_cell.lua.bytes and b/Assets/lua/app/ui/main_city/cell/side_bar_base_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/cell/side_bar_gold_pig_cell.lua.bytes b/Assets/lua/app/ui/main_city/cell/side_bar_gold_pig_cell.lua.bytes index 1198420b0..4c251955c 100644 Binary files a/Assets/lua/app/ui/main_city/cell/side_bar_gold_pig_cell.lua.bytes and b/Assets/lua/app/ui/main_city/cell/side_bar_gold_pig_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/cell/side_bar_level_fund_cell.lua.bytes b/Assets/lua/app/ui/main_city/cell/side_bar_level_fund_cell.lua.bytes index c35ff0a5e..2db8139b9 100644 Binary files a/Assets/lua/app/ui/main_city/cell/side_bar_level_fund_cell.lua.bytes and b/Assets/lua/app/ui/main_city/cell/side_bar_level_fund_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes index ec4802a8c..95ebb3540 100644 Binary files a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes and b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes differ diff --git a/Assets/lua/app/userdata/fund/fund_data.lua.bytes b/Assets/lua/app/userdata/fund/fund_data.lua.bytes index 74669da23..4a51e0745 100644 Binary files a/Assets/lua/app/userdata/fund/fund_data.lua.bytes and b/Assets/lua/app/userdata/fund/fund_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/shop/shop_data.lua.bytes b/Assets/lua/app/userdata/shop/shop_data.lua.bytes index 4092cb08a..b945e9d0a 100644 Binary files a/Assets/lua/app/userdata/shop/shop_data.lua.bytes and b/Assets/lua/app/userdata/shop/shop_data.lua.bytes differ diff --git a/Assets/prefabs/ui/main_city/main_ui.prefab b/Assets/prefabs/ui/main_city/main_ui.prefab index 940830cf1..717061358 100644 --- a/Assets/prefabs/ui/main_city/main_ui.prefab +++ b/Assets/prefabs/ui/main_city/main_ui.prefab @@ -4412,7 +4412,7 @@ PrefabInstance: - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: 04f2fbf456dd7df4f95972fcc8dc69ef, type: 2} + objectReference: {fileID: 11400000, guid: 95dc39d6bc747aa44b75b095a1170f00, type: 2} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -4523,7 +4523,7 @@ PrefabInstance: - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: 2ca4456d9bff9a045a7ecc78c6fdd076, type: 2} + objectReference: {fileID: 11400000, guid: 234507584d8c82347a60a064dd7827a1, type: 2} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -4801,7 +4801,7 @@ PrefabInstance: - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: 2ca4456d9bff9a045a7ecc78c6fdd076, type: 2} + objectReference: {fileID: 11400000, guid: 4989a4c057c89ff4da77d5168a96ecc7, type: 2} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5