diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity5/y_yunchouweiwo_banner1.png b/Assets/ManagedResources/Atlas/DyAct_Activity5/y_yunchouweiwo_banner1.png new file mode 100644 index 0000000000..63eb418d21 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DyAct_Activity5/y_yunchouweiwo_banner1.png differ diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity5/y_yunchouweiwo_banner1.png.meta b/Assets/ManagedResources/Atlas/DyAct_Activity5/y_yunchouweiwo_banner1.png.meta new file mode 100644 index 0000000000..d438e1cb6b --- /dev/null +++ b/Assets/ManagedResources/Atlas/DyAct_Activity5/y_yunchouweiwo_banner1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: deb8f4dabc9cc2b449889b4edb0b77af +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: 1dab23ef86f4a5646b55a62bfd795ebd + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DyAct_Activity5 + 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 ab4e1d6062..70a910a296 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua @@ -29,7 +29,7 @@ local bannerType = { [21] = {compent = "bg1",titilebg1 = "d_danxinbixue_banner2"}, [22] = {compent = "bg1",titilebg1 = "s_shibukedang_banner01"}, [23] = {compent = "bg1",titilebg1 = "s_yongwangzhiqian_banner1"}, - [24] = {compent = "bg1",titilebg1 = "y_yunchouweiwo_banner"}, + [24] = {compent = "bg1",titilebg1 = "y_yunchouweiwo_banner1"}, [25] = {compent = "bg1",titilebg1 = "y_yishandaohai_banner"}, [26] = {compent = "bg1",titilebg1 = "x_xuanjimiaosuan_banner"}, [27] = {compent = "bg1",titilebg1 = "x_xianglongfuhu_banner"}, diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index d3a6cf6616..a235b57a8a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -157,7 +157,7 @@ local activityType = { hero = { [1]={name="Bg2/hero1",id=10008,hero="b_bowenduoshi_shenjiang1"}, ----精卫 [2]={name="Bg2/hero2",id=10014,hero="c_ccfy_kuang01"}, ---哪吒 - [3]={name="Bg2/hero3",id=10002,hero="y_yishandaohai_shenjiang2"}, --吕洞宾 + [3]={name="Bg2/hero3",id=10013,hero="y_yishandaohai_shenjiang2"}, --吕洞宾 }, title = "b_bowenduoshi_zi", helptype = HELP_TYPE.TimeLimitedCall @@ -283,6 +283,28 @@ local activityType = { title = "s_yongwangzhiqian_zi", helptype = HELP_TYPE.TimeLimitedCall }, + --勇冠三军 限时召唤 + [4324] = { + bg = "Bg2", + hero = { + [1]={name="Bg2/hero1",id=10003,hero="d_danxinbixue_shenjiang1"}, --猪八戒 + [2]={name="Bg2/hero2",id=10023,hero="x_xuanjimiaosuan_shenjiang2"}, --孙悟空 + [3]={name="Bg2/hero3",id=10041,hero="x_xuanjimiaosuan_shenjiang3"}, --通天教主 + }, + title = "y_yunchouweiwo_zi", + helptype = HELP_TYPE.TimeLimitedCall + }, + --勇冠三军 限时召唤 + [4325] = { + bg = "Bg2", + hero = { + [1]={name="Bg2/hero1",id=10013,hero="y_yishandaohai_shenjiang2"}, ----吕洞宾 + [2]={name="Bg2/hero2",id=10014,hero="c_ccfy_kuang01"}, --哪吒 + [3]={name="Bg2/hero3",id=10033,hero="t_tianxiangjiren_shenjiang3"}, --净光天女 + }, + title = "y_yishandaohai_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]}}