diff --git a/Assets/Editor/AutoPack.cs b/Assets/Editor/AutoPack.cs index 1b8a77bc27..da2354ef5c 100644 --- a/Assets/Editor/AutoPack.cs +++ b/Assets/Editor/AutoPack.cs @@ -295,7 +295,10 @@ public class AutoPack : EditorWindow static string[] ReplaceDir = new string[] { "/src/main/assets/Android", - "/src/main/assets/bin", + "/src/main/assets/bin" + }; + static string[] CopyDir = new string[] + { "/src/main/jniLibs" }; @@ -308,14 +311,22 @@ public class AutoPack : EditorWindow { string dir = ReplaceDir[i]; string to = toPath + dir; - if (Directory.Exists(to)) Directory.Delete(to, true); - Directory.CreateDirectory(to); - GameCore.FileUtils.CopyDir(fromPath + dir, to, (string dirName, string fileName, float progress)=> + GameCore.FileUtils.ReplaceDir(fromPath + dir, to, (string dirName, string fileName, float progress)=> { EditorUtility.DisplayProgressBar("正在复制："+ dirName, fileName, progress); }); EditorUtility.ClearProgressBar(); } + for (int i = 0; i < CopyDir.Length; i++) + { + string dir = CopyDir[i]; + string to = toPath + dir; + GameCore.FileUtils.CopyDir(fromPath + dir, to, (string dirName, string fileName, float progress) => + { + EditorUtility.DisplayProgressBar("正在复制：" + dirName, fileName, progress); + }); + EditorUtility.ClearProgressBar(); + } Debug.Log(PackConfig[index][0] + "：母包工程资源替换完成"); // 替换build-id @@ -372,7 +383,7 @@ public class AutoPack : EditorWindow string toPath = _MomPackPath + PackConfig[index][2] + "/src/main/assets/Android"; if (Directory.Exists(toPath)) Directory.Delete(toPath, true); Directory.CreateDirectory(toPath); - GameCore.FileUtils.CopyDir(ABPath, toPath, (string dirName, string fileName, float progress) => + GameCore.FileUtils.ReplaceDir(ABPath, toPath, (string dirName, string fileName, float progress) => { EditorUtility.DisplayProgressBar("正在复制：" + dirName, fileName, progress); }); diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meirirenwu_anniu_01.png b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meirirenwu_anniu_01.png new file mode 100644 index 0000000000..e0d6a6362c Binary files /dev/null and b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meirirenwu_anniu_01.png differ diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meirirenwu_anniu_01.png.meta b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meirirenwu_anniu_01.png.meta new file mode 100644 index 0000000000..75a77914d5 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meirirenwu_anniu_01.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: eb772f6561ddcfa458fb18712fcd6573 +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - 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: 54bdc69d9aed7314ca21895fe72870bb + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DyAct_Activity4 + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meirirenwu_anniu_02.png b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meirirenwu_anniu_02.png new file mode 100644 index 0000000000..abac0b6e46 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meirirenwu_anniu_02.png differ diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meirirenwu_anniu_02.png.meta b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meirirenwu_anniu_02.png.meta new file mode 100644 index 0000000000..32729a1b51 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meirirenwu_anniu_02.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 022d89a89126746498a4ba6df94d242e +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - 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: 430a22426bcc88046b39ba820ae5f32b + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DyAct_Activity4 + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meizhourenwu_anniu_01.png b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meizhourenwu_anniu_01.png new file mode 100644 index 0000000000..74dc038a23 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meizhourenwu_anniu_01.png differ diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meizhourenwu_anniu_01.png.meta b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meizhourenwu_anniu_01.png.meta new file mode 100644 index 0000000000..fcc1dfdc42 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meizhourenwu_anniu_01.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: d4ca55a757515914aac233d5be5614cc +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - 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: 40030655b5af9b74a8b51d3f608ac63a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DyAct_Activity4 + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meizhourenwu_anniu_02.png b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meizhourenwu_anniu_02.png new file mode 100644 index 0000000000..339f8db8d1 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meizhourenwu_anniu_02.png differ diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meizhourenwu_anniu_02.png.meta b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meizhourenwu_anniu_02.png.meta new file mode 100644 index 0000000000..be4aeda65d --- /dev/null +++ b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_meizhourenwu_anniu_02.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: a82a1b6df9103834ba13d627d7112ed8 +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - 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: 81966576658b6d24b994bb04d74e299c + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DyAct_Activity4 + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity4/p_pozhengzhuxian_banner_meiri.png b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_pozhengzhuxian_banner_meiri.png new file mode 100644 index 0000000000..c9e6c91127 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_pozhengzhuxian_banner_meiri.png differ diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity4/p_pozhengzhuxian_banner_meiri.png.meta b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_pozhengzhuxian_banner_meiri.png.meta new file mode 100644 index 0000000000..920f7b3558 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_pozhengzhuxian_banner_meiri.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: b1341a939166a664198be0958072bbdf +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - 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: 06f76d74dd7119c4ba42d42259f594a4 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DyAct_Activity4 + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity4/p_pozhengzhuxian_banner_meizhou.png b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_pozhengzhuxian_banner_meizhou.png new file mode 100644 index 0000000000..e2b9182651 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_pozhengzhuxian_banner_meizhou.png differ diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity4/p_pozhengzhuxian_banner_meizhou.png.meta b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_pozhengzhuxian_banner_meizhou.png.meta new file mode 100644 index 0000000000..e66793fe07 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DyAct_Activity4/p_pozhengzhuxian_banner_meizhou.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 0b0e770b15c296d49b140e7da9dec1a3 +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - 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: ebf22d9d2d286ca46af064386c5b71d2 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DyAct_Activity4 + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/r_zjm_xiaobanner_zh.png b/Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/r_zjm_xiaobanner_zh.png new file mode 100644 index 0000000000..fcbd442295 Binary files /dev/null and b/Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/r_zjm_xiaobanner_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/r_zjm_xiaobanner_zh.png.meta b/Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/r_zjm_xiaobanner_zh.png.meta new file mode 100644 index 0000000000..3631b2a584 --- /dev/null +++ b/Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/r_zjm_xiaobanner_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 50c76289cf0d44a4eaa222e91389ca7e +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: d2296dc11d38c5f4f9cf5e16ed68785a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TimeLimitSkinAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildMainCityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildMainCityPanel.prefab index 70fc77167d..284c7d5362 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildMainCityPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildMainCityPanel.prefab @@ -473,8 +473,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 211.1, y: 4} - m_SizeDelta: {x: 324.3, y: 303.1} + m_AnchoredPosition: {x: -212, y: 619} + m_SizeDelta: {x: 150, y: 303.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &427977002 CanvasRenderer: @@ -2770,7 +2770,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 323, y: -744} + m_AnchoredPosition: {x: 145, y: -24} m_SizeDelta: {x: 248.2, y: 277.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2030871931 @@ -4180,7 +4180,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 36} + m_AnchoredPosition: {x: -89, y: 7} m_SizeDelta: {x: 71, y: 290} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082977241631064926 @@ -5516,7 +5516,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -126.65, y: -99} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 71, y: 221} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082977242554950423 diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index c44718a27a..81a7f5b5cb 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -33244,8 +33244,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 165, y: 472} - m_SizeDelta: {x: 325.5, y: 100} + m_AnchoredPosition: {x: 233, y: 416} + m_SizeDelta: {x: 436, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8417690811195369441 CanvasRenderer: @@ -33275,7 +33275,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 50c76289cf0d44a4eaa222e91389ca7e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -55485,7 +55485,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 119.1, y: -0.8} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4012076166443334565 @@ -55509,7 +55509,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 0.96862745, b: 0.9372549, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -55517,19 +55517,19 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 30 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 0 + m_MaxSize: 42 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "2\u5929\u540E\u501F\u5BBF" + m_Text: "3\u5929\u540E\u5F00\u542F" --- !u!1 &4704518155788007146 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index c476c718e5..576edbd81c 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1239,6 +1239,7 @@ ActivityTypeDef = { ChaoFanRuSheng = 500, --超凡入圣 JourneyWithWind = 72, --缥缈之旅 FifteenDayGiftNotice = 80,--15日登陆预告 + DynamicActShop = 81,--主题活动商店 } --活动结束需要处理面板关闭类型 ActivityTypePanel = { diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 442ce80b4f..16f53c01c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -141,7 +141,7 @@ function this.InitActivityServerData(msg, isUpdate) this.CheckMoneyProgress(v) this.mission[v.activityId] = v - --LogYellow("刷新活动数据activityId：" .. v.activityId .. " value：" .. v.value) + -- LogYellow("刷新活动数据activityId：" .. v.activityId .. " value：" .. v.value) for n, m in ipairs(v.mission) do --LogGreen(" 刷新活动数据missionId：" .. m.missionId .. " state：" .. m.state .. " progress：" .. m.progress) if (v.activityId == ActivityTypeDef.OnlineGift) then diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua index fb3629f031..cda5313d09 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua @@ -2,6 +2,14 @@ require("Base/BasePanel") local CarbonsPanel = Inherit(BasePanel) local systemConfig = ConfigManager.GetConfig(ConfigName.GlobalSystemConfig) +local expeditionLevel = { + [1] = 1, + [2] = 2, + [3] = 3, + [-1] = 2, + [4] = 3, +} + local carbonData = { [FUNCTION_OPEN_TYPE.EXPEDITION] = { id = FUNCTION_OPEN_TYPE.EXPEDITION, --大闹天宫 @@ -113,8 +121,16 @@ function CarbonsPanel:OnShow(...) SoundManager.PlayMusic(SoundConfig.BGM_Carbon) -- 刷新一次编队战斗力 FormationManager.RefreshMainFormationPower() - self:ShowMap() - self:SetTime() + self:DoRequest(function () + self:ShowMap() + self:SetTime() + end) +end + +--界面开启前的请求信息 +function CarbonsPanel:DoRequest(func) + NetManager.GetExpeditionRequest(ExpeditionManager.expeditionLeve) + func() end function CarbonsPanel:ShowMap() @@ -155,6 +171,9 @@ function CarbonsPanel:ShowMap() Util.AddOnceClick(selfObj,function () self:BtnClick(key) end) + Util.AddOnceClick(go,function () + self:BtnClick(key) + end) end end @@ -164,6 +183,7 @@ function CarbonsPanel:TipShow(_go,_value) local time = Util.GetGameObject(_go,"Grid/time") local freetimes = Util.GetGameObject(_go,"Grid/freetimes") local buytimes = Util.GetGameObject(_go,"Grid/buytimes") + local redPoint = Util.GetGameObject(_go,"redPoint") local openLevelText = Util.GetGameObject(openLevel,"Text"):GetComponent("Text") local timeText = Util.GetGameObject(time,"Text"):GetComponent("Text") @@ -179,7 +199,7 @@ function CarbonsPanel:TipShow(_go,_value) if _value.id == FUNCTION_OPEN_TYPE.MONSTER_COMING then freetimes:SetActive(true) buytimes:SetActive(true) - freetimesText.text = string.format("免费挑战次数：%s",MonsterCampManager.GetCanBattleCount()) + freetimesText.text = string.format("免费扫荡次数：%s",MonsterCampManager.GetCanBattleCount()) buytimesText.text = string.format("剩余购买次数：%s",MonsterCampManager.GetCanBuyBattleCount()) elseif _value.id == FUNCTION_OPEN_TYPE.PEOPLE_MIRROR then freetimes:SetActive(true) @@ -187,33 +207,27 @@ function CarbonsPanel:TipShow(_go,_value) local free,buy = XuanYuanMirrorManager.RetrunFreeAndBuyTimes() freetimesText.text = string.format("免费挑战次数：%s",free) buytimesText.text = string.format("剩余购买次数：%s",buy) + elseif _value.id == FUNCTION_OPEN_TYPE.EXPEDITION then + freetimes:SetActive(true) + buytimes:SetActive(false) + local free = ExpeditionManager.GetCurNodeInfo().lay-1+(expeditionLevel[ExpeditionManager.expeditionLeve]-1)*10 + local num = free <= 30 and free or 30 + freetimesText.text = string.format("进度：%s/%s",num,30) end --刷新时间 if _value.id == FUNCTION_OPEN_TYPE.EXPEDITION then--大闹天宫 time:SetActive(true) local expeditionData = systemConfig[JumpType.Expedition] self.timeList[_value.id] = {} - if ExpeditionManager.ExpeditionState == 2 or ExpeditionManager.ExpeditionState == 3 then--大闹天宫重置阶段 - self.timeList[_value.id].TextObj = timeText - self.timeList[_value.id].Text = "重置时间：" - self.timeList[_value.id].time = CalculateSecondsNowTo_N_OClock(24) - else--正常阶段 - self.timeList[_value.id].TextObj = timeText - self.timeList[_value.id].Text = "剩余时间：" - self.timeList[_value.id].time = ExpeditionManager.startTime + tonumber(expeditionData.SeasonEnd) - GetTimeStamp() + expeditionData.SeasonInterval * 60 - end - elseif _value.id == FUNCTION_OPEN_TYPE.ENDLESS then--无尽副本 + self.timeList[_value.id].TextObj = timeText + self.timeList[_value.id].Text = "剩余时间：" + self.timeList[_value.id].time = ExpeditionManager.startTime + tonumber(expeditionData.SeasonEnd) - GetTimeStamp() + expeditionData.SeasonInterval * 60 - 300 + elseif _value.id == FUNCTION_OPEN_TYPE.ENDLESS or _value.id == FUNCTION_OPEN_TYPE.TRIAL then--无尽副本\森罗幻境 time:SetActive(true) self.timeList[_value.id] = {} self.timeList[_value.id].TextObj = timeText self.timeList[_value.id].Text = "剩余时间：" - self.timeList[_value.id].time = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.ENDLESS).endTime - GetTimeStamp() - elseif _value.id == FUNCTION_OPEN_TYPE.TRIAL then--森罗幻境 - time:SetActive(true) - self.timeList[_value.id] = {} - self.timeList[_value.id].TextObj = timeText - self.timeList[_value.id].Text = "剩余时间：" - self.timeList[_value.id].time = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.TRIAL).endTime - GetTimeStamp() + self.timeList[_value.id].time = ActTimeCtrlManager.GetSerDataByTypeId(_value.id).endTime - GetTimeStamp() end if self.timeList[_value.id] then timeText.text = string.format("%s%s",self.timeList[_value.id].Text,TimeToFelaxible(self.timeList[_value.id].time)) @@ -221,8 +235,9 @@ function CarbonsPanel:TipShow(_go,_value) else openLevel:SetActive(true) openLevelText.text = string.format("%s级开启",systemConfig[_value.id].OpenRules[2]) - if (_value.id == FUNCTION_OPEN_TYPE.ENDLESS or _value.id == FUNCTION_OPEN_TYPE.TRIAL) and ActTimeCtrlManager.IsQualifiled(_value.id) then--无尽副本、森罗幻境 + if (_value.id == FUNCTION_OPEN_TYPE.EXPEDITION or _value.id == FUNCTION_OPEN_TYPE.ENDLESS or _value.id == FUNCTION_OPEN_TYPE.TRIAL) and ActTimeCtrlManager.IsQualifiled(_value.id) then--无尽副本、森罗幻境 openLevel:SetActive(false) + redPoint:SetActive(false) self.timeList[_value.id] = {} self.timeList[_value.id].TextObj = timeText self.timeList[_value.id].Text = "重置时间：" @@ -265,7 +280,7 @@ end function CarbonsPanel:BtnClick(id) if id == FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN then if ActTimeCtrlManager.SingleFuncState(id) == false then --如果未解锁 - PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN)) + PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(id)) return end UIManager.OpenPanel(UIName.DailyCarbonPanel) @@ -287,13 +302,13 @@ function CarbonsPanel:BtnClick(id) JumpManager.GoJump(64001) end NetManager.TreasureOfHeavenScoreRequest() - PlayerPrefs.SetInt(PlayerManager.uid.."ExpeditionRed",ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.EXPEDITION).endTime) + PlayerPrefs.SetInt(PlayerManager.uid.."ExpeditionRed",ActTimeCtrlManager.GetSerDataByTypeId(id).endTime) CheckRedPointStatus(RedPointType.OrdinaryExplore) else if ActTimeCtrlManager.IsQualifiled(id) then PopupTipPanel.ShowTip(Language[12183]) else - PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.EXPEDITION)) + PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(id)) end end -- elseif id == FUNCTION_OPEN_TYPE.CARDELAY then @@ -324,7 +339,7 @@ function CarbonsPanel:BtnClick(id) end) else if not ActTimeCtrlManager.IsQualifiled(id) then - local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.TRIAL) + local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,id) PopupTipPanel.ShowTip(string.format(Language[10279],config.OpenRules[2])) else PopupTipPanel.ShowTip(Language[10280]) @@ -335,26 +350,30 @@ function CarbonsPanel:BtnClick(id) CarbonManager.difficulty = 1 UIManager.OpenPanel(UIName.XuanYuanMirrorPanel) else - local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.PEOPLE_MIRROR) + local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,id) PopupTipPanel.ShowTip(string.format(Language[10279],config.OpenRules[2])) end elseif id == FUNCTION_OPEN_TYPE.ENDLESS then - if ActTimeCtrlManager.SingleFuncState(id) then - local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.ENDLESS) - PlayerPrefs.SetInt("WuJin1"..PlayerManager.uid,serData.endTime) - CheckRedPointStatus(RedPointType.EndlessPanel) - MapManager.curCarbonType = CarBonTypeId.ENDLESS - MapManager.SetViewSize(3)--设置视野范围（明雷形式） - MapManager.isTimeOut = false - UIManager.OpenPanel(UIName.EndLessCarbonPanel) + if ActTimeCtrlManager.IsQualifiled(id) then + if ActTimeCtrlManager.SingleFuncState(id) then + local serData = ActTimeCtrlManager.GetSerDataByTypeId(id) + PlayerPrefs.SetInt("WuJin1"..PlayerManager.uid,serData.endTime) + CheckRedPointStatus(RedPointType.EndlessPanel) + MapManager.curCarbonType = CarBonTypeId.ENDLESS + MapManager.SetViewSize(3)--设置视野范围（明雷形式） + MapManager.isTimeOut = false + UIManager.OpenPanel(UIName.EndLessCarbonPanel) + else + PopupTipPanel.ShowTip(Language[10281]) + end else - PopupTipPanel.ShowTip(Language[10281]) + PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(id)) end elseif id == FUNCTION_OPEN_TYPE.FIGHTLEVEL then if ActTimeCtrlManager.SingleFuncState(id) then UIManager.OpenPanel(UIName.FightLevelChapterPanel) else - PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(FUNCTION_OPEN_TYPE.FIGHTLEVEL)) + PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(id)) end end end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 391cef24ec..a2d4816621 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -70,7 +70,7 @@ function ActivityMainPanel:CheckActOpen(_index) local id = ActivityGiftManager.IsActivityTypeOpen(tabs[_index].ActiveType) if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[_index].ActiveType) then if GlobalActConfig[id].ShowArt and GlobalActConfig[id].ShowArt > 0 then - if tabs[_index].ActiveType == ActivityTypeDef.DynamicAct or tabs[_index].ActiveType == ActivityTypeDef.LimitUpHero then + if tabs[_index].ActiveType == ActivityTypeDef.DynamicAct or tabs[_index].ActiveType == ActivityTypeDef.LimitUpHero or tabs[_index].ActiveType == ActivityTypeDef.DynamicActShop then _CurPageIndex = _index elseif GlobalActConfig[id].ShowArt == this.activityType then _CurPageIndex = _index @@ -216,7 +216,7 @@ function this.PageTabAdapter(tab, index, status) local id = ActivityGiftManager.IsActivityTypeOpen(tabs[index].ActiveType) if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[index].ActiveType) then if GlobalActConfig[id].ShowArt and GlobalActConfig[id].ShowArt > 0 then - if tabs[index].ActiveType == ActivityTypeDef.DynamicAct or tabs[index].ActiveType == ActivityTypeDef.LimitUpHero then + if tabs[index].ActiveType == ActivityTypeDef.DynamicAct or tabs[index].ActiveType == ActivityTypeDef.LimitUpHero or tabs[index].ActiveType == ActivityTypeDef.DynamicActShop then isshow = true elseif GlobalActConfig[id].ShowArt == this.activityType then isshow = true diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index b7a5793603..4e0e0c6690 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -456,8 +456,9 @@ function this.GetActivityTableDataByPageInde(pageIndex) table.insert(activityGroupsData,configs[i]) end elseif configs[i].ShopData and configs[i].ShopData[1][1] == -9999 then - if not activityDic[configs[i].ShopData[1][1]] then - activityDic[configs[i].ShopData[1][1]] = configs[i] + local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct) + -- Log(GlobalActConfig[id].ShowArt.." "..tabs[index].ActId) + if id and id > 0 and ActivityGiftManager.IsQualifiled(ActivityTypeDef.DynamicAct) and GlobalActivity[id].ShowArt == configs[i].ActId then table.insert(activityGroupsData,configs[i]) end elseif configs[i].ActiveType == 0 and configs[i].FunType == 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index a6de116ae3..5bf6253141 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -230,8 +230,9 @@ function FightPointPassMainPanel:InitComponent() Util.GetGameObject(self.gameObject, "Bg/btnDown/battleUpLvTip/Text"):GetComponent("Text").text = Language[10610] --山河社稷图 this.btnFightLevel = Util.GetGameObject(self.gameObject, "Bg/LeftUp/box/btnFightLevel") - this.funcBtnList[FUNCTION_OPEN_TYPE.FIGHTLEVEL] = this.btnFightLevel - this.btnFightLevelRedPoint = Util.GetGameObject(this.btnFightLevel, "redPoint") + this.btnFightLevel:SetActive(false) + -- this.funcBtnList[FUNCTION_OPEN_TYPE.FIGHTLEVEL] = this.btnFightLevel + -- this.btnFightLevelRedPoint = Util.GetGameObject(this.btnFightLevel, "redPoint") end @@ -297,9 +298,9 @@ function FightPointPassMainPanel:BindEvent() UIManager.OpenPanel(UIName.OpenSeverWelfarePanel) end) - Util.AddClick(this.btnFightLevel, function() - UIManager.OpenPanel(UIName.FightLevelChapterPanel) - end) + -- Util.AddClick(this.btnFightLevel, function() + -- UIManager.OpenPanel(UIName.FightLevelChapterPanel) + -- end) Util.AddClick(this.goVipButton, function() UIManager.OpenPanel(UIName.VipPanelV2) diff --git a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua index 738f20f34c..48dfc4e3ba 100644 --- a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua @@ -251,7 +251,7 @@ function this.GetFuncTip(id) if rules[1] == 1 then tip = string.format(Language[10769], GetLanguageStrById(censorshipConfig[rules[2]].Name)) elseif rules[1] == 2 then - tip = string.format(Language[10770], rules[2]) + tip = string.format(Language[10279], rules[2]) elseif rules[1] == 3 then tip = string.format(Language[10771], rules[2]) end diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 5481cf2183..3f1f267617 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1580,6 +1580,7 @@ function this.RefreshEightGiftPreview() else this.sgBtn:SetActive(false) end + this.FifteenNoticeShow() --十五日 if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FifteenDayGift) then FifteenDayGiftManager.InitRewardData() @@ -1597,6 +1598,7 @@ function this.RefreshEightGiftPreview() this.fgBtn:SetActive(false) this.rpFifteenDayEffect:SetActive(false) end + end -- 八日登陆奖励预览 diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua index cc97365d87..f451b61d86 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua @@ -164,10 +164,9 @@ function this.QuickStartMonsterFightRequest() } BattleManager.SetLastBattleResult(this.lastBattleResult,BATTLE_TYPE.MONSTER_CAMP) if msg.result == 0 then - UIManager.OpenPanel(UIName.BattleFailPopup, nil, true, UIName.MonsterCampNewPanel) + UIManager.OpenPanel(UIName.BattleFailPopup, nil, true, UIName.MonsterCampNewPanel,BATTLE_TYPE.MONSTER_CAMP) isClick = false else - Timer.New(function () isClick = false end,1):Start() diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index ad3a8fdfc3..868eb7a033 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -223,8 +223,14 @@ function CommonActPage:RefreshTime() end time:SetActive(true) local freshTime - if self.actType == ActivityTypeDef.AccumulativeRechargeExper or self.actConfig.ActiveType == ActivityTypeDef.DynamicAct then + if self.actType == ActivityTypeDef.AccumulativeRechargeExper then freshTime = CalculateSecondsNowTo_N_OClock(24) + elseif self.actConfig.ActiveType == ActivityTypeDef.DynamicAct then + if (self.ActData.endTime - GetTimeStamp()) <= 86280 then + freshTime = CalculateSecondsNowTo_N_OClock(24) - 120 + else + freshTime = CalculateSecondsNowTo_N_OClock(24) + end else freshTime = self.ActData.endTime - GetTimeStamp() end diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index cd8c751609..b8012cecf1 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -250,7 +250,7 @@ function this.InitTaskData(curData,taskType,configName) } data.type = allListData[i].Type data.jump = allListData[i].Jump[1] - LogGreen("missionId:"..tostring(data.missionId).." taskType:"..tostring(data.taskType).." itemName:"..tostring(data.itemName)) + -- LogGreen("missionId:"..tostring(data.missionId).." taskType:"..tostring(data.taskType).." itemName:"..tostring(data.itemName)) table.insert(curData.rewards,data) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua index a09721ac57..3f96232fc5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua @@ -123,6 +123,7 @@ function this:LoseJump(id) end end function this.ClosePanelRefreshData() + LogRed("fightType:"..tostring(fightType)) if fightType then if fightType == BATTLE_TYPE.EXECUTE_FIGHT then--远征 this.ShowBattleResultByExpedition() diff --git a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua index ec029357a1..aa4bcd95d6 100644 --- a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua @@ -156,6 +156,7 @@ function ShopViewNew:OnShow(_sortingOrder) end end self.ShopType = self.actConfig.ShopData[1][1] + -- LogYellow("self.ShopType:"..tostring(self.ShopType)) if self.ShopType == SHOP_TYPE.QIANKUNBOX_SHOP then self.parent.tabbox.gameObject:SetActive(false) else diff --git a/Assets/Scripts/Core/Core/Utils/FileUtils.cs b/Assets/Scripts/Core/Core/Utils/FileUtils.cs index f583598890..b85797eccb 100644 --- a/Assets/Scripts/Core/Core/Utils/FileUtils.cs +++ b/Assets/Scripts/Core/Core/Utils/FileUtils.cs @@ -76,11 +76,11 @@ namespace GameCore { } /// - /// 拷贝文件夹 + /// 替换文件夹 /// /// /// - public static void CopyDir(string fromDir, string toDir, Action callBack = null) + public static void ReplaceDir(string fromDir, string toDir, Action callBack = null) { if (!Directory.Exists(fromDir)) return; @@ -100,6 +100,37 @@ namespace GameCore { } string[] fromDirs = Directory.GetDirectories(fromDir); foreach (string fromDirName in fromDirs) + { + string dirName = Path.GetFileName(fromDirName); + string toDirName = Path.Combine(toDir, dirName); + ReplaceDir(fromDirName, toDirName, callBack); + } + } + + /// + /// 拷贝并覆盖文件夹 + /// + /// + /// + public static void CopyDir(string fromDir, string toDir, Action callBack = null) + { + if (!Directory.Exists(fromDir)) + return; + if (!Directory.Exists(toDir)) + { + Directory.CreateDirectory(toDir); + } + string[] files = Directory.GetFiles(fromDir); + int i = 0; + foreach (string formFileName in files) + { + string fileName = Path.GetFileName(formFileName); + string toFileName = Path.Combine(toDir, fileName); + File.Copy(formFileName, toFileName, true); + if (callBack != null) callBack(fromDir, fileName, (float)++i / files.Length); + } + string[] fromDirs = Directory.GetDirectories(fromDir); + foreach (string fromDirName in fromDirs) { string dirName = Path.GetFileName(fromDirName); string toDirName = Path.Combine(toDir, dirName); diff --git a/Assets/Scripts/Editor/GameEditor/FrameTool/FrameTool.cs b/Assets/Scripts/Editor/GameEditor/FrameTool/FrameTool.cs index 10689a5519..c34dcafaad 100644 --- a/Assets/Scripts/Editor/GameEditor/FrameTool/FrameTool.cs +++ b/Assets/Scripts/Editor/GameEditor/FrameTool/FrameTool.cs @@ -209,7 +209,7 @@ namespace GameEditor.FrameTool //Debug.LogError(streamingPath); if (Directory.Exists(streamingPath)) Directory.Delete(streamingPath,true); Directory.CreateDirectory(streamingPath); - FileUtils.CopyDir(exportPath, streamingPath); + FileUtils.ReplaceDir(exportPath, streamingPath); //CopyResourceFiles(); }