diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue.meta new file mode 100644 index 0000000000..0e05c05a6c --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7dfb6605fed569e48a81bf1d0a509eb9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_banner.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_banner.png new file mode 100644 index 0000000000..5bebcbb5d2 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_banner.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_banner.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_banner.png.meta new file mode 100644 index 0000000000..b6b7b7a689 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_banner.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 82cc2dfe504171547b5de78f44d58b4f +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 4cafcc09fae03a149990427ce454309b + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_bicon1.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_bicon1.png new file mode 100644 index 0000000000..a3b9439c4b Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_bicon1.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_bicon1.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_bicon1.png.meta new file mode 100644 index 0000000000..16ca34db23 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_bicon1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 7d48b620b1a13834eaa985f08874ee41 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 83e250a7caccd1440b9d7c0dc08d8190 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_icon2.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_icon2.png new file mode 100644 index 0000000000..0f89c02992 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_icon2.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_icon2.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_icon2.png.meta new file mode 100644 index 0000000000..94577c98fa --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_icon2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 3e9c3ff14674bd34b87b0a25c6c4782b +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 7d6a30cf8b4c8ed41bd186eb1c3d69e8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_shenjiang1.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_shenjiang1.png new file mode 100644 index 0000000000..02407e5b8f Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_shenjiang1.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_shenjiang1.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_shenjiang1.png.meta new file mode 100644 index 0000000000..e052108938 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_shenjiang1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: b1de465749929d64b8b75fdd6276bcd7 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 34b88553fe09e9f4da4c1dd933fdf0ba + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_shenjiang2.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_shenjiang2.png new file mode 100644 index 0000000000..d00f2a634c Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_shenjiang2.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_shenjiang2.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_shenjiang2.png.meta new file mode 100644 index 0000000000..1e72cd85fe --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_shenjiang2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: fa45d525a2f743f45b5ac6571145308a +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: ae04e324d63cf39428af3cbe15dc9884 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_shenjiang3.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_shenjiang3.png new file mode 100644 index 0000000000..ae87836ed2 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_shenjiang3.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_shenjiang3.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_shenjiang3.png.meta new file mode 100644 index 0000000000..039f07e2f7 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/DanXinBiXue/d_danxinbixue_shenjiang3.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 30be9fcb3f784b9489e9af935d5d51d9 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2dadcd5ac5e75a741bbc98be9ee954a4 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua index 696b84bae5..c1bab7fc30 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua @@ -9,6 +9,7 @@ local bannerType = { [1] = "bg1", [2] = "bg2", [3] = "bg3", + [3] = "bg4", } local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity) function DynamicTaskPage:ctor(mainPanel, gameObject) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index c5396dbd26..073c1c4fc7 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -52,6 +52,17 @@ local activityType = { title = "c_ccfy_slogan", helptype = HELP_TYPE.TimeLimitedCall }, + --叱咤风云 限时召唤 + [4304] = { + bg = "Bg2", + hero = { + [1]={name="Bg2/hero1",id=10003,hero="d_danxinbixue_shenjiang1"}, + [2]={name="Bg2/hero3",id=10024,hero="d_danxinbixue_shenjiang2"}, + [3]={name="Bg2/hero2",id=10089,hero="d_danxinbixue_shenjiang3"}, + }, + title = "c_ccfy_slogan", + helptype = HELP_TYPE.TimeLimitedCall + }, } --type与lotterySetting表中的id对应 local btns={ [bType.Btn1]={name="btngroup/once",isInfo=Language[10644]}, [bType.Btn10]={name="btngroup/ten",isInfo=Language[12182]}} diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index f3535910b1..2273592674 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -53,6 +53,7 @@ local mainDynamicActivityIcon = { [1] = "r_zjm_huodongicon-pozhenzhuxian", --破阵诛仙 [2] = "r_zjm_huodongicon-yongguansanjun", -- 勇冠三军 [3] = "r_zjm_huodongicon-chichafenyun", --叱咤风云 + [4] = "r_zjm_huodongicon-chichafenyun", --碧血丹心 } function this:AddFuncItem(btnGO, pos) return {go = btnGO, open = Util.GetGameObject(btnGO, "open"), lock = Util.GetGameObject(btnGO, "lock"), pos = pos}