diff --git a/Assets/ManagedResources/Atlas/FaXiangAltas.meta b/Assets/ManagedResources/Atlas/FaXiangAltas.meta new file mode 100644 index 0000000000..c9521f4431 --- /dev/null +++ b/Assets/ManagedResources/Atlas/FaXiangAltas.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 684f80fdf31c6d34db6f872707957f97 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont.meta b/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont.meta new file mode 100644 index 0000000000..47dad4ee04 --- /dev/null +++ b/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 98dfe015db1c6f346a3fecf15e37e66d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont/fx_yang_zh.png b/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont/fx_yang_zh.png new file mode 100644 index 0000000000..d7f75b2479 Binary files /dev/null and b/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont/fx_yang_zh.png differ diff --git a/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont/fx_yang_zh.png.meta b/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont/fx_yang_zh.png.meta new file mode 100644 index 0000000000..9720f4d05e --- /dev/null +++ b/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont/fx_yang_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 0f4dc674fb64b10469d3bc9ec4a3f1a8 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 61c363665c250c74eac793e42f6906a2 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FaXiangAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont/fx_yin_zh.png b/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont/fx_yin_zh.png new file mode 100644 index 0000000000..1c93549896 Binary files /dev/null and b/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont/fx_yin_zh.png differ diff --git a/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont/fx_yin_zh.png.meta b/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont/fx_yin_zh.png.meta new file mode 100644 index 0000000000..06faf2b2ca --- /dev/null +++ b/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont/fx_yin_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: f4f24b01c820e6249994bac79d240702 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 8797364121a87bf48b94cdc68ea91a52 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FaXiangAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont/fx_yugao_btn_zh.png b/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont/fx_yugao_btn_zh.png new file mode 100644 index 0000000000..b4d3da6fa8 Binary files /dev/null and b/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont/fx_yugao_btn_zh.png differ diff --git a/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont/fx_yugao_btn_zh.png.meta b/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont/fx_yugao_btn_zh.png.meta new file mode 100644 index 0000000000..5c9ec9325b --- /dev/null +++ b/Assets/ManagedResources/Atlas/FaXiangAltas/ArtFont/fx_yugao_btn_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 8983a34663606b14399acf3e01abc9e2 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 0ff335974b77d45409a2308da439567f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FaXiangAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintHandBook.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintHandBook.lua index a15cddb49c..e2b658e971 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintHandBook.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintHandBook.lua @@ -102,19 +102,19 @@ function this.GetAllData() local allCurSoulPrintData= ConfigManager.GetAllConfigsDataByKey(ConfigName.EquipConfig,"Position",5) for i = 1, #allCurSoulPrintData do local curSpiritAnimalBook - for _, configInfo in ConfigPairs(ConfigManager.GetConfig(ConfigName.SpiritAnimalBook)) do - if configInfo.FetterType == 2 and configInfo.Teamers and configInfo.Teamers[1] and configInfo.Teamers[1][1] == allCurSoulPrintData[i].Id then - curSpiritAnimalBook = configInfo - break - end - end - if curSpiritAnimalBook then--表里只有高品质 所以低品质直接添加 - if PlayerManager.level >= curSpiritAnimalBook.OpenLevel then - table.insert(allSoulPrintData,allCurSoulPrintData[i]) - end - else + -- for _, configInfo in ConfigPairs(ConfigManager.GetConfig(ConfigName.SpiritAnimalBook)) do + -- if configInfo.FetterType == 2 and configInfo.Teamers and configInfo.Teamers[1] and configInfo.Teamers[1][1] == allCurSoulPrintData[i].Id then + -- curSpiritAnimalBook = configInfo + -- break + -- end + -- end + -- if curSpiritAnimalBook then--表里只有高品质 所以低品质直接添加 + -- if PlayerManager.level >= curSpiritAnimalBook.OpenLevel then + -- table.insert(allSoulPrintData,allCurSoulPrintData[i]) + -- end + -- else table.insert(allSoulPrintData,allCurSoulPrintData[i]) - end + --end end end --特殊的开启条件