diff --git a/AssetBundles/config.txt b/AssetBundles/config.txt index 09a798b511..3de95809c0 100644 --- a/AssetBundles/config.txt +++ b/AssetBundles/config.txt @@ -1 +1 @@ -{"Setting":{"LanguagePackager":{"desc":"\u672c\u5730\u5316\u5904\u7406", "versionCode":"26", "isActive":"1"}, "ServerVersion":{"desc":"\u7528\u4e8e\u5207\u6362\u6b63\u5f0f\u670d\u548c\u63d0\u5ba1\u670d", "value":"0", "versionCode":"26", "isActive":"1"}, "ThinkAnalysis_GetDeviceID":{"desc":"\u6570\u6570\u83b7\u53d6DeviceID\u65b9\u6cd5", "versionCode":"24", "isActive":"1"}, "LayoutBuilderWrap":{"desc":"\u5f3a\u5236\u5237\u65b0layout\u7ec4\u4ef6\u5927\u5c0f\u7684\u65b9\u6cd5\u4fee\u6539\u5230lua\u4e2d\u8c03\u7528", "versionCode":"25", "isActive":"1"}, "IS_PLAY_VOICE":{"desc":"", "versionCode":"1", "isActive":"1"}, "IS_TITLE_EFFECT_SCALE":{"desc":"", "versionCode":"1", "isActive":"1"}}} \ No newline at end of file +{"Setting":{"LanguagePackager":{"desc":"\u672c\u5730\u5316\u5904\u7406", "versionCode":"26", "isActive":"1"}, "ServerVersion":{"desc":"\u7528\u4e8e\u5207\u6362\u6b63\u5f0f\u670d\u548c\u63d0\u5ba1\u670d", "value":"0", "versionCode":"26", "isActive":"1"}, "ThinkAnalysis_GetDeviceID":{"desc":"\u6570\u6570\u83b7\u53d6DeviceID\u65b9\u6cd5", "versionCode":"24", "isActive":"1"}, "LayoutBuilderWrap":{"desc":"\u5f3a\u5236\u5237\u65b0layout\u7ec4\u4ef6\u5927\u5c0f\u7684\u65b9\u6cd5\u4fee\u6539\u5230lua\u4e2d\u8c03\u7528", "versionCode":"25", "isActive":"1"}, "IS_PLAY_VOICE":{"desc":"", "versionCode":"1", "isActive":"1"}, "IS_TITLE_EFFECT_SCALE":{"desc":"", "versionCode":"1", "isActive":"1"}, "IS_PLAY_LOGIN_VIDEO":{"desc":"", "versionCode":"1", "isActive":"1"}}} \ No newline at end of file diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_chechidoufa_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_chechidoufa_zh.png new file mode 100644 index 0000000000..62325fdb02 Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_chechidoufa_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_chechidoufa_zh.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_chechidoufa_zh.png.meta new file mode 100644 index 0000000000..4198fb0ca4 --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_chechidoufa_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 510a80ea6a69815428701c486f70c213 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 1770beb98edfad34184af7faaea38cd3 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_chengjiu_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_chengjiu_zh.png new file mode 100644 index 0000000000..8eedf2ab31 Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_chengjiu_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_chengjiu_zh.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_chengjiu_zh.png.meta new file mode 100644 index 0000000000..5a829945b1 --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_chengjiu_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 9bb19caa6175d184f96fe277d87fb8e8 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: e51322af0322bc940a8121d450a3edab + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_luofuzhengfang_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_luofuzhengfang_zh.png new file mode 100644 index 0000000000..bb5ece56a3 Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_luofuzhengfang_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_luofuzhengfang_zh.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_luofuzhengfang_zh.png.meta new file mode 100644 index 0000000000..8dc95dc82c --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_luofuzhengfang_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 9180cc3e2b236f446b9e3802176739c0 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 69fb8c4296fae5440aed82ff6c7980d8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_paihangbang_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_paihangbang_zh.png new file mode 100644 index 0000000000..3d3859a550 Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_paihangbang_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_paihangbang_zh.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_paihangbang_zh.png.meta new file mode 100644 index 0000000000..502f1a31d3 --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_paihangbang_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 6884a74cda518254293dfc7f7d2db18d +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 10a26c5e1635263409c56ba446d1576a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_richangfuben_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_richangfuben_zh.png new file mode 100644 index 0000000000..78762653a8 Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_richangfuben_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_richangfuben_zh.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_richangfuben_zh.png.meta new file mode 100644 index 0000000000..b449e84288 --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_richangfuben_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 515568a3d8707fd479537fbd44d79cbc +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 67e1877a9e21c5241976e9cfb537a8d7 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_tiangongxunbao_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_tiangongxunbao_zh.png new file mode 100644 index 0000000000..01ef989095 Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_tiangongxunbao_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_tiangongxunbao_zh.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_tiangongxunbao_zh.png.meta new file mode 100644 index 0000000000..d6049aec76 --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_tiangongxunbao_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: bbf32eb65af01b746aff0e73234d9f4c +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: dc7a462d6764cb14fbb5a020561848f8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xingyuntan_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xingyuntan_zh.png new file mode 100644 index 0000000000..b700de45a5 Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xingyuntan_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xingyuntan_zh.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xingyuntan_zh.png.meta new file mode 100644 index 0000000000..a19ae34009 --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xingyuntan_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 0222188652194144fae0250254b7410c +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 288e65666ec46384998ad07721f8c763 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xingyuntanbao_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xingyuntanbao_zh.png new file mode 100644 index 0000000000..59bef569a4 Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xingyuntanbao_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xingyuntanbao_zh.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xingyuntanbao_zh.png.meta new file mode 100644 index 0000000000..fc93e47b7d --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xingyuntanbao_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 80559e9e0f907794a88f0d22736546cd +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: cbd1b30acd0e185479146e2a1b7f94bb + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xunbao_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xunbao_zh.png new file mode 100644 index 0000000000..e74eb9ed0a Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xunbao_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xunbao_zh.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xunbao_zh.png.meta new file mode 100644 index 0000000000..4ca40c1d2e --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xunbao_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: ab0b2122b65aff2488724801df8648d2 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: f737118b3f796504a8ed730f4892cd1c + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_zhushengzhidian_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_zhushengzhidian_zh.png new file mode 100644 index 0000000000..dd4ecc0b84 Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_zhushengzhidian_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_zhushengzhidian_zh.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_zhushengzhidian_zh.png.meta new file mode 100644 index 0000000000..c6be2d53bf --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_zhushengzhidian_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 637c659eac5782d4badf0d5399a7f660 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: d035737abf53a91499e52dcfcdd634b3 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/EditorConfigs/BuildConfigs.asset b/Assets/ManagedResources/EditorConfigs/BuildConfigs.asset index 7f5b120b2a..0a8855121f 100644 --- a/Assets/ManagedResources/EditorConfigs/BuildConfigs.asset +++ b/Assets/ManagedResources/EditorConfigs/BuildConfigs.asset @@ -57,5 +57,3 @@ MonoBehaviour: compressType: 1 - asset: {fileID: 102900000, guid: ddfa1c1ffb0ca1e4db51985fcba257e4, type: 3} compressType: 1 - - asset: {fileID: 102900000, guid: 3b6575c2eea8cfe418e6ba16cddf2d9f, type: 3} - compressType: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab index cd960d0c58..e92aed64fd 100644 --- a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab @@ -1872,7 +1872,7 @@ VideoPlayer: m_AspectRatio: 2 m_DataSource: 0 m_PlaybackSpeed: 1 - m_AudioOutputMode: 2 + m_AudioOutputMode: 0 m_TargetAudioSources: - {fileID: 0} m_DirectAudioVolumes: @@ -6490,7 +6490,7 @@ ParticleSystem: --- !u!199 &8490762427165167817 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -11323,7 +11323,7 @@ ParticleSystem: --- !u!199 &8490762427297531630 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -16820,7 +16820,7 @@ ParticleSystem: --- !u!199 &8490762427821104763 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -21804,7 +21804,7 @@ ParticleSystem: --- !u!199 &8490762428035569255 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -26595,7 +26595,7 @@ ParticleSystem: --- !u!199 &8490762428074860618 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -31534,7 +31534,7 @@ ParticleSystem: --- !u!199 &8490762428351855326 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -36361,7 +36361,7 @@ ParticleSystem: --- !u!199 &8490762428588085446 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -41223,7 +41223,7 @@ ParticleSystem: --- !u!199 &8490762428872251531 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -46336,7 +46336,7 @@ ParticleSystem: --- !u!199 &8490762429003853987 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Video.meta b/Assets/ManagedResources/Video.meta deleted file mode 100644 index a42703e236..0000000000 --- a/Assets/ManagedResources/Video.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3b6575c2eea8cfe418e6ba16cddf2d9f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Video/Login.meta b/Assets/ManagedResources/Video/Login.meta deleted file mode 100644 index 97c9ceaba7..0000000000 --- a/Assets/ManagedResources/Video/Login.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d070fbf9a38fa7843b79f0499b298d99 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Video/Login/video_login_xipu.mp4 b/Assets/ManagedResources/Video/Login/video_login_xipu.mp4 deleted file mode 100644 index efd244a7a1..0000000000 Binary files a/Assets/ManagedResources/Video/Login/video_login_xipu.mp4 and /dev/null differ diff --git a/Assets/ManagedResources/Video/Login/video_login_xipu.mp4.meta b/Assets/ManagedResources/Video/Login/video_login_xipu.mp4.meta deleted file mode 100644 index cbd27e82ef..0000000000 --- a/Assets/ManagedResources/Video/Login/video_login_xipu.mp4.meta +++ /dev/null @@ -1,39 +0,0 @@ -fileFormatVersion: 2 -guid: bc6a8b55358ba6a43ba3a9256dbc9d41 -VideoClipImporter: - externalObjects: {} - serializedVersion: 2 - useLegacyImporter: 0 - quality: 0.5 - isColorLinear: 0 - frameRange: 0 - startFrame: -1 - endFrame: -1 - colorSpace: 0 - deinterlace: 0 - encodeAlpha: 0 - flipVertical: 0 - flipHorizontal: 0 - importAudio: 1 - targetSettings: - 0: - enableTranscoding: 1 - codec: 0 - resizeFormat: 0 - aspectRatio: 0 - customWidth: 1080 - customHeight: 1920 - bitrateMode: 0 - spatialQuality: 0 - 7: - enableTranscoding: 1 - codec: 0 - resizeFormat: 0 - aspectRatio: 0 - customWidth: 1080 - customHeight: 1920 - bitrateMode: 0 - spatialQuality: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index f166d59b9f..631ba32fe6 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -883,6 +883,8 @@ RedPointType = { QinglongSerectTreasureTrail = 10008, XiaoYaoYouRedPoint=10009, + --显示祈愿 + TimeLimitWish = 10010, --灵兽 PokemonMainCity = 790,--灵兽主界面 Pokemon_UpLv = 791,--灵兽升级 diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua index c9b534b88e..d02d288bcb 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua @@ -31,6 +31,12 @@ function PackageManager.GetLoginPanelBg() return this.config.LoginPanelBg end end +-- 获取登录Logo +function PackageManager.GetLoginPanelLogo() + if this.config then + return this.config.LoginLogo + end +end -- 获取充值计费点字段 function PackageManager.GetCustomEventField() if this.config then @@ -46,18 +52,23 @@ function PackageManager.GetLoadingList() end function PackageManager.SetVideo(obj,Image) + Image:SetActive(false) if this.config.VideoName then - local video = obj:GetComponent("VideoPlayer") - Log("加载视频："..tostring(this.config.VideoName)) if ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.IS_PLAY_LOGIN_VIDEO) then - video.url = ServerConfigManager.GetVersionInfo("resUrl") .. AppConst.PlatformPath .."/"..tostring(this.config.VideoName) ..".mp4" - -- video.clip = resMgr:LoadAsset(this.config.VideoName) - video:Play() + Log("加载视频："..tostring(this.config.VideoName)) + resMgr:PreLoadAssetAsync(this.config.VideoName, function() + if UIManager.IsOpen(UIName.LoginPanel) then + local video = obj:GetComponent("VideoPlayer") + -- video.url = ServerConfigManager.GetVersionInfo("resUrl") .. AppConst.PlatformPath .."/"..tostring(this.config.VideoName) ..".mp4" + -- video.clip = resMgr:LoadAsset(this.config.VideoName) + video.url = AppConst.PersistentDataPath .."/"..tostring(this.config.VideoName) + video:Play() + Image:SetActive(true) + end + end) end - Image:SetActive(true) else LogError("包名:"..tostring(this.config.PackageName).."登录视频为空！") - Image:SetActive(false) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index 5f5c67d036..9d634b7e7f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -50,9 +50,9 @@ local UpdateBtnGMFunc = { if not BattleManager.IsUnlockBattlePass() then return SKIP_STATE.LOCK, Language[12237] end - if FightPointPassManager.GetCurOpenFightIdIsBoss() then - return SKIP_STATE.NOUSE, "首领关卡无法跳过！" - end + -- if FightPointPassManager.GetCurOpenFightIdIsBoss() then + -- return SKIP_STATE.NOUSE, "首领关卡无法跳过！" + -- end return SKIP_STATE.UNLOCK end, } diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index 5c679e4c99..3d3c408f87 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -291,7 +291,7 @@ function TimeLimitUpHero:Recruit(actId,type,itemId) if msg.drop.Hero[1] then UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],actId,1,{RecruitType.PrayerSingle,RecruitType.PrayerTen},oneFunc2) end - CheckRedPointStatus(RedPointType.TimeLimited) + CheckRedPointStatus(RedPointType.TimeLimitWish) end,self.freeTimesId) end diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index a65190643b..76de989f5c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -64,8 +64,16 @@ function this:InitComponent() this.versionText.text = Language[11136]..LoginRoot_Version - this.logo = Util.GetGameObject(this.gameObject, "logo") - this.logo:GetComponent("Image"):SetNativeSize() + this.logo = Util.GetGameObject(this.gameObject, "logo"):GetComponent("Image") + local logoStr = PackageManager.GetLoginPanelLogo() + if logoStr then + this.logo.gameObject:SetActive(true) + this.logo.sprite = this.spLoader:LoadSprite(logoStr) + this.logo:SetNativeSize() + else + this.logo.gameObject:SetActive(false) + end + -- BindLightFlash(Util.GetGameObject(this.logo, "saoguang"), this.logo) this.healthTip = Util.GetGameObject(this.gameObject, "healthTip") diff --git a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua index 6001bae3ac..c48e1da225 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua @@ -58,7 +58,7 @@ function MainPlayerView.New(isSelf, root, rect, pos,_NpvData,sortingOrder) else Util.GetGameObject(instance.leader, "name").transform.localPosition = Vector3.New(0,176.1,0) end - instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,2, PlayerLiveViewData,sortingOrder) + instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,2, PlayerLiveViewData,sortingOrder,NPCPosType.maincity) end -- instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,1, nil) --instance.NpcGO:SetNameHeight(3) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 03f729ab58..185a9fc7b9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -769,6 +769,28 @@ function this.GetTimeLimitRedPointStatus() end end +--检测心愿抽卡活动红点 +function this.GetWishDrawRedPointStatus() + local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LimitUpHero) + if not activityId then + return false + end + local wish=ConfigManager.TryGetConfigData(ConfigName.WishActivitySetting,1) + if not wish then + return false + end + local freeTimesId=wish.FreeTimes + local freeTime= 0 + if freeTimesId>0 then + freeTime= PrivilegeManager.GetPrivilegeRemainValue(freeTimesId) + RecruitManager.freeUseTimeList[freeTimesId]=freeTime + return freeTime and freeTime >= 1 + end +end + + + + function this.GetQiankunBoxRedPointStatus() local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting) local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index ccabb17b75..cc8e02c863 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -197,6 +197,7 @@ function this.InitRedPointAllRelate() --主题活动 RPData:SetParent(RedPointType.TimeLimited, RedPointType.DynamicActivity) + RPData:SetParent(RedPointType.TimeLimitWish, RedPointType.DynamicActivity) RPData:SetParent(RedPointType.QianKunBox, RedPointType.DynamicActivity) RPData:SetParent(RedPointType.DynamicActTask, RedPointType.DynamicActivity) RPData:SetParent(RedPointType.DynamicActRecharge, RedPointType.DynamicActivity) @@ -466,6 +467,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Expedition_Treasure,TreasureOfHeavenManger.RedPoint) --主题活动 RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus) + RPData:AddCheckFunc(RedPointType.TimeLimitWish,OperatingManager.GetWishDrawRedPointStatus) RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus) RPData:AddCheckFunc(RedPointType.DynamicActTask, OperatingManager.CheckDynamicActTaskRed) RPData:AddCheckFunc(RedPointType.DynamicActRecharge, OperatingManager.CheckLeiJiChongZhiRedData) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index b72da14913..e2aa7bdcb7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -48,6 +48,7 @@ function this.RecruitRequest(recruitType, func, privilegeId,_itemId,_itemNum) this.freeUseTimeList[privilegeId] = PrivilegeManager.GetPrivilegeRemainValue(privilegeId) -- CheckRedPointStatus(RedPointType.Recruit_Red) CheckRedPointStatus(RedPointType.TimeLimited) + CheckRedPointStatus(RedPointType.TimeLimitWish) CheckRedPointStatus(RedPointType.QianKunBox) CheckRedPointStatus(RedPointType.Pokemon_Recruit) end @@ -71,6 +72,7 @@ function this.RefreshFreeTime() -- CheckRedPointStatus(RedPointType.Recruit_Red) CheckRedPointStatus(RedPointType.Recruit_Normal) CheckRedPointStatus(RedPointType.TimeLimited) + CheckRedPointStatus(RedPointType.TimeLimitWish) CheckRedPointStatus(RedPointType.QianKunBox) end Game.GlobalEvent:DispatchEvent(GameEvent.Recruit.OnRecruitRefreshData) diff --git a/Assets/Scripts/Bridge/ResourcesManager.cs b/Assets/Scripts/Bridge/ResourcesManager.cs index c3033a9511..3e753b02d7 100644 --- a/Assets/Scripts/Bridge/ResourcesManager.cs +++ b/Assets/Scripts/Bridge/ResourcesManager.cs @@ -4,6 +4,9 @@ using UnityEngine; using UnityEngine.Events; using LuaInterface; using GameCore; +using System.IO; +using ResUpdate; + namespace GameLogic { /// /// 资源管理器 @@ -100,6 +103,34 @@ namespace GameLogic { }); } + public void PreLoadAssetAsync(string assetName, LuaFunction luaFunc) + { + Debug.Log("预加载资源：" + assetName); + if (File.Exists(AppConst.PersistentDataPath + assetName) && PlayerPrefs.GetInt(assetName + "_IsPreLoad", 0) == 1) + { + Debug.Log("预加载资源已存在"); + if (luaFunc != null) + { + luaFunc.Call(true); + } + }else + { + string downLoadURL = VersionManager.Instance.GetVersionInfo("resUrl") + AppConst.PlatformPath + "/"; + Debug.Log("预加载资源路径："+downLoadURL); + ResourceDownloadManager.Instance.StartDownload(assetName, downLoadURL, "", (string name, DownLoadProgress dp) => { + Debug.LogFormat("预加载资源进度：{0}/{1}", dp.Size, dp.TotalSize); + }, (string name, bool isOk) => + { + Debug.Log("预加载资源完成：" + isOk); + PlayerPrefs.SetInt(assetName + "_IsPreLoad", 1); + if (luaFunc != null) + { + luaFunc.Call(isOk); + } + }); + } + } + /// /// 卸载资源 /// diff --git a/Assets/Scripts/GameInit/GameStart.cs b/Assets/Scripts/GameInit/GameStart.cs index 0757c37c88..a75dce283d 100644 --- a/Assets/Scripts/GameInit/GameStart.cs +++ b/Assets/Scripts/GameInit/GameStart.cs @@ -26,6 +26,7 @@ public class GameStart : MonoBehaviour if (Application.isEditor) { StartCoroutine(StartGame()); + //playSplash(); } else { @@ -48,7 +49,7 @@ public class GameStart : MonoBehaviour void playSplash() { - bool isShowSplash = false; + bool isShowSplash = true; if (isShowSplash) { string path = AppConst.PersistentDataPath + "lz4/splashpanel.unity3d"; @@ -63,7 +64,7 @@ public class GameStart : MonoBehaviour Image image2 = gameObj2.transform.Find("Canvas/image2").GetComponent(); image2.DOFade(1, 0).OnComplete(() => { - image2.DOFade(0, 0).SetDelay(2).OnComplete(() => { + image2.DOFade(0, 0).SetDelay(0).OnComplete(() => { image.color = new Color(image.color.r, image.color.g, image.color.b, 0); image.DOFade(1, 1).OnComplete(() => { image.DOFade(0, 1).SetDelay(2).OnComplete(() => { diff --git a/Assets/Source/Generate/DelegateFactory.cs b/Assets/Source/Generate/DelegateFactory.cs index dd6e7d039e..670240d0f4 100644 --- a/Assets/Source/Generate/DelegateFactory.cs +++ b/Assets/Source/Generate/DelegateFactory.cs @@ -71,7 +71,6 @@ public class DelegateFactory dict.Add(typeof(UnityEngine.Application.AdvertisingIdentifierCallback), factory.UnityEngine_Application_AdvertisingIdentifierCallback); dict.Add(typeof(UnityEngine.Application.LowMemoryCallback), factory.UnityEngine_Application_LowMemoryCallback); dict.Add(typeof(UnityEngine.Application.LogCallback), factory.UnityEngine_Application_LogCallback); - dict.Add(typeof(System.Action), factory.System_Action_bool); dict.Add(typeof(System.Func), factory.System_Func_bool); dict.Add(typeof(UnityEngine.AudioClip.PCMReaderCallback), factory.UnityEngine_AudioClip_PCMReaderCallback); dict.Add(typeof(UnityEngine.AudioClip.PCMSetPositionCallback), factory.UnityEngine_AudioClip_PCMSetPositionCallback); @@ -158,7 +157,6 @@ public class DelegateFactory DelegateTraits.Init(factory.UnityEngine_Application_AdvertisingIdentifierCallback); DelegateTraits.Init(factory.UnityEngine_Application_LowMemoryCallback); DelegateTraits.Init(factory.UnityEngine_Application_LogCallback); - DelegateTraits>.Init(factory.System_Action_bool); DelegateTraits>.Init(factory.System_Func_bool); DelegateTraits.Init(factory.UnityEngine_AudioClip_PCMReaderCallback); DelegateTraits.Init(factory.UnityEngine_AudioClip_PCMSetPositionCallback); @@ -245,7 +243,6 @@ public class DelegateFactory TypeTraits.Init(factory.Check_UnityEngine_Application_AdvertisingIdentifierCallback); TypeTraits.Init(factory.Check_UnityEngine_Application_LowMemoryCallback); TypeTraits.Init(factory.Check_UnityEngine_Application_LogCallback); - TypeTraits>.Init(factory.Check_System_Action_bool); TypeTraits>.Init(factory.Check_System_Func_bool); TypeTraits.Init(factory.Check_UnityEngine_AudioClip_PCMReaderCallback); TypeTraits.Init(factory.Check_UnityEngine_AudioClip_PCMSetPositionCallback); @@ -332,7 +329,6 @@ public class DelegateFactory StackTraits.Push = factory.Push_UnityEngine_Application_AdvertisingIdentifierCallback; StackTraits.Push = factory.Push_UnityEngine_Application_LowMemoryCallback; StackTraits.Push = factory.Push_UnityEngine_Application_LogCallback; - StackTraits>.Push = factory.Push_System_Action_bool; StackTraits>.Push = factory.Push_System_Func_bool; StackTraits.Push = factory.Push_UnityEngine_AudioClip_PCMReaderCallback; StackTraits.Push = factory.Push_UnityEngine_AudioClip_PCMSetPositionCallback; @@ -3603,63 +3599,6 @@ public class DelegateFactory ToLua.Push(L, o); } - class System_Action_bool_Event : LuaDelegate - { - public System_Action_bool_Event(LuaFunction func) : base(func) { } - public System_Action_bool_Event(LuaFunction func, LuaTable self) : base(func, self) { } - - public void Call(bool param0) - { - func.BeginPCall(); - func.Push(param0); - func.PCall(); - func.EndPCall(); - } - - public void CallWithSelf(bool param0) - { - func.BeginPCall(); - func.Push(self); - func.Push(param0); - func.PCall(); - func.EndPCall(); - } - } - - public System.Action System_Action_bool(LuaFunction func, LuaTable self, bool flag) - { - if (func == null) - { - System.Action fn = delegate(bool param0) { }; - return fn; - } - - if(!flag) - { - System_Action_bool_Event target = new System_Action_bool_Event(func); - System.Action d = target.Call; - target.method = d.Method; - return d; - } - else - { - System_Action_bool_Event target = new System_Action_bool_Event(func, self); - System.Action d = target.CallWithSelf; - target.method = d.Method; - return d; - } - } - - bool Check_System_Action_bool(IntPtr L, int pos) - { - return TypeChecker.CheckDelegateType(typeof(System.Action), L, pos); - } - - void Push_System_Action_bool(IntPtr L, System.Action o) - { - ToLua.Push(L, o); - } - class System_Func_bool_Event : LuaDelegate { public System_Func_bool_Event(LuaFunction func) : base(func) { } diff --git a/Assets/Source/Generate/GameLogic_ResourcesManagerWrap.cs b/Assets/Source/Generate/GameLogic_ResourcesManagerWrap.cs index d8fb6ed2d8..2367a7777e 100644 --- a/Assets/Source/Generate/GameLogic_ResourcesManagerWrap.cs +++ b/Assets/Source/Generate/GameLogic_ResourcesManagerWrap.cs @@ -11,6 +11,7 @@ public class GameLogic_ResourcesManagerWrap L.RegFunction("LoadAsset", LoadAsset); L.RegFunction("LoadSpriteAsset", LoadSpriteAsset); L.RegFunction("LoadAssetAsync", LoadAssetAsync); + L.RegFunction("PreLoadAssetAsync", PreLoadAssetAsync); L.RegFunction("UnLoadAsset", UnLoadAsset); L.RegFunction("UnLoadGame", UnLoadGame); L.RegFunction("UnLoadUnUseAssetAndAssetBundle", UnLoadUnUseAssetAndAssetBundle); @@ -118,6 +119,24 @@ public class GameLogic_ResourcesManagerWrap } } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int PreLoadAssetAsync(IntPtr L) + { + try + { + ToLua.CheckArgsCount(L, 3); + GameLogic.ResourcesManager obj = (GameLogic.ResourcesManager)ToLua.CheckObject(L, 1); + string arg0 = ToLua.CheckString(L, 2); + LuaFunction arg1 = ToLua.CheckLuaFunction(L, 3); + obj.PreLoadAssetAsync(arg0, arg1); + return 0; + } + catch (Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int UnLoadAsset(IntPtr L) { diff --git a/Assets/Source/Generate/LuaBinder.cs b/Assets/Source/Generate/LuaBinder.cs index 1b1df626bb..a056b25e2b 100644 --- a/Assets/Source/Generate/LuaBinder.cs +++ b/Assets/Source/Generate/LuaBinder.cs @@ -399,7 +399,6 @@ public static class LuaBinder L.RegFunction("Action_int", System_Action_int); L.RegFunction("Comparison_int", System_Comparison_int); L.RegFunction("Func_int_int", System_Func_int_int); - L.RegFunction("Action_bool", System_Action_bool); L.RegFunction("Func_bool", System_Func_bool); L.RegFunction("Action_UnityEngine_AsyncOperation", System_Action_UnityEngine_AsyncOperation); L.RegFunction("Action_string", System_Action_string); @@ -2532,33 +2531,6 @@ public static class LuaBinder } } - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] - static int System_Action_bool(IntPtr L) - { - try - { - int count = LuaDLL.lua_gettop(L); - LuaFunction func = ToLua.CheckLuaFunction(L, 1); - - if (count == 1) - { - Delegate arg1 = DelegateTraits>.Create(func); - ToLua.Push(L, arg1); - } - else - { - LuaTable self = ToLua.CheckLuaTable(L, 2); - Delegate arg1 = DelegateTraits>.Create(func, self); - ToLua.Push(L, arg1); - } - return 1; - } - catch(Exception e) - { - return LuaDLL.toluaL_exception(L, e); - } - } - [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int System_Func_bool(IntPtr L) {