diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity4.meta b/Assets/ManagedResources/Atlas/DyAct_Activity4.meta new file mode 100644 index 0000000000..5a8201543a --- /dev/null +++ b/Assets/ManagedResources/Atlas/DyAct_Activity4.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad5e090451363c744aebfe752a5cb791 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: lz4/atlas/dyact_xinjianglaixi + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity4/s_yongwangzhiqian_banner1.jpg b/Assets/ManagedResources/Atlas/DyAct_Activity4/s_yongwangzhiqian_banner1.jpg new file mode 100644 index 0000000000..53a7c527ab Binary files /dev/null and b/Assets/ManagedResources/Atlas/DyAct_Activity4/s_yongwangzhiqian_banner1.jpg differ diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity4/s_yongwangzhiqian_banner1.jpg.meta b/Assets/ManagedResources/Atlas/DyAct_Activity4/s_yongwangzhiqian_banner1.jpg.meta new file mode 100644 index 0000000000..d7a4e730d2 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DyAct_Activity4/s_yongwangzhiqian_banner1.jpg.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 82955df7cb9737c4d87591c686792fcb +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: 3c71735bd144a7b47b19d734f781b2ad + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DyAct_Activity4 + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity4/s_yongwangzhiqian_shenjiang33.png b/Assets/ManagedResources/Atlas/DyAct_Activity4/s_yongwangzhiqian_shenjiang33.png new file mode 100644 index 0000000000..757df480da Binary files /dev/null and b/Assets/ManagedResources/Atlas/DyAct_Activity4/s_yongwangzhiqian_shenjiang33.png differ diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity4/s_yongwangzhiqian_shenjiang33.png.meta b/Assets/ManagedResources/Atlas/DyAct_Activity4/s_yongwangzhiqian_shenjiang33.png.meta new file mode 100644 index 0000000000..118771f486 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DyAct_Activity4/s_yongwangzhiqian_shenjiang33.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: ea3f8471949a40d4c9b591a31b7cba9c +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: 5e279c49dccf3ea49b879ec1e7924623 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DyAct_Activity4 + 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 420729b45b..ab4e1d6062 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua @@ -28,7 +28,7 @@ local bannerType = { [20] = {compent = "bg1",titilebg1 = "c_ccfy_banner01"}, [21] = {compent = "bg1",titilebg1 = "d_danxinbixue_banner2"}, [22] = {compent = "bg1",titilebg1 = "s_shibukedang_banner01"}, - [23] = {compent = "bg1",titilebg1 = "s_yongwangzhiqian_banner"}, + [23] = {compent = "bg1",titilebg1 = "s_yongwangzhiqian_banner1"}, [24] = {compent = "bg1",titilebg1 = "y_yunchouweiwo_banner"}, [25] = {compent = "bg1",titilebg1 = "y_yishandaohai_banner"}, [26] = {compent = "bg1",titilebg1 = "x_xuanjimiaosuan_banner"}, diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index f150d46aac..d3a6cf6616 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -272,6 +272,17 @@ local activityType = { title = "s_shibukedang_zi", helptype = HELP_TYPE.TimeLimitedCall }, + --勇冠三军 限时召唤 + [4323] = { + bg = "Bg2", + hero = { + [1]={name="Bg2/hero1",id=10026,hero="y_yishandaohai_shenjiang1"}, ----东华帝君 + [2]={name="Bg2/hero2",id=10033,hero="b_bianhuanmoce_shenjiang2"}, ---净光天女 + [3]={name="Bg2/hero3",id=10091,hero="s_yongwangzhiqian_shenjiang33"}, ----白骨精 + }, + title = "s_yongwangzhiqian_zi", + 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 6d65a0df7c..4753732ab9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -72,6 +72,18 @@ local mainDynamicActivityIcon = { [20] = "r_zjm_huodongicon-chichafenyun", --叱咤风云 [21] = "r_zjm_huodongicon-danxinbixue", --碧血丹心 [22] = "r_zjm_huodongicon-shibukedang", ----势不可挡 + [23] = "r_zjm_huodongicon-yongwangzhiqian", ----勇往直前 + [24] = "r_zjm_huodongicon-yunchouweiwo", ----运筹帷幄 + [25] = "r_zjm_huodongicon-yishandaohai", ----移山倒海 + [26] = "r_zjm_huodongicon-xuanjimiaosuan", ----玄机妙算 + [27] = "r_zjm_huodongicon-xianglongfuhu", ----降龙伏虎 + [28] = "r_zjm_huodongicon-qikaidesheng", ----旗开得胜 + [29] = "r_zjm_huodongicon-bianhuanmoce", ----变幻莫测 + [30] = "r_zjm_huodongicon-bowenduoshi", ----博文多识 + [31] = "r_zjm_huodongicon-tianxiangjiren", ----天相吉人 + [32] = "r_zjm_huodongicon-suoxiangpimi", ----所向披靡 + [33] = "r_zjm_huodongicon-xialuxiangfeng", ----狭路相逢 + [34] = "r_zjm_huodongicon-tongqiangtiebi", ----铜墙铁壁 } function this:AddFuncItem(btnGO, pos) return {go = btnGO, open = Util.GetGameObject(btnGO, "open"), lock = Util.GetGameObject(btnGO, "lock"), pos = pos}