diff --git a/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png new file mode 100644 index 0000000000..2028f0291e Binary files /dev/null and b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png.meta b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png.meta new file mode 100644 index 0000000000..59838dc1c6 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 72188a62ffaa78e499bce62be1ba7c62 +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: 6593317ac6952f64e949fb880925bed9 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DyAct_XiangYaoDuoBao + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_banner_zh.jpg b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_banner_zh.jpg new file mode 100644 index 0000000000..85f35b9fb5 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_banner_zh.jpg differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_banner_zh.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_banner_zh.jpg.meta similarity index 95% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_banner_zh.png.meta rename to Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_banner_zh.jpg.meta index 8c3367005b..4f540c2d33 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_banner_zh.png.meta +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_banner_zh.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a066a3a17a13ed94a827b20848877798 +guid: 370bf0ddade0ea34281a01908e8f5ad5 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: f009c8f7adedf5446904b898e6d8bab0 + spriteID: 3776f162a43b33b4ab10b0668e934563 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_banner_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_banner_zh.png deleted file mode 100644 index 621d58b203..0000000000 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_banner_zh.png and /dev/null differ diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index bcbff755bd..44fa8b88d6 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -115,46 +115,46 @@ local tabs = { default = "x_xianglongfuhu_icon2_zh", lock = "x_xianglongfuhu_icon2_zh", select = "x_xianglongfuhu_icon1_zh", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, - [28] = { --第十二周 旗开得胜 - default = "q_qikaidesheng_icon2_zh", lock = "q_qikaidesheng_icon2_zh", select = "q_qikaidesheng_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [29] = { --第十三周 变幻莫测 - default = "b_bianhuanmoce_icon2_zh", lock = "b_bianhuanmoce_icon2_zh", select = "b_bianhuanmoce_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [30] = { --第十四周 博闻强识 + [28] = { --第十四周 博闻强识 default = "b_bowenduoshi_icon2_zh", lock = "b_bowenduoshi_icon2_zh", select = "b_bowenduoshi_icon1_zh", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, - [31] = { --第十五周 天相几人 + [29] = { --第十五周 天相几人 default = "t_tianxiangjiren_icon2_zh", lock = "t_tianxiangjiren_icon2_zh", select = "t_tianxiangjiren_icon1_zh", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, - [32] = { --第十六周 所向披靡 + [30] = { --第十六周 所向披靡 default = "s_suoxiangpimi_icon2_zh", lock = "s_suoxiangpimi_icon2_zh", select = "s_suoxiangpimi_icon1_zh", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, - [33] = { --第十七周 狭路相逢 + [31] = { --第十七周 狭路相逢 default = "x_xialuxiangfeng_icon2_zh", lock = "x_xialuxiangfeng_icon2_zh", select = "x_xialuxiangfeng_icon1_zh", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, - [34] = { --第十八周 铜墙铁壁 + [32] = { --第十八周 铜墙铁壁 default = "t_tongqiangtiebi_icon2_zh", lock = "t_tongqiangtiebi_icon2_zh", select = "t_tongqiangtiebi_icon1_zh", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, - [35] = { --第二周 破阵诛仙 + [33] = { --第二周 破阵诛仙 default = "p_pozhengzhuxian_anniu_02_zh", lock = "p_pozhengzhuxian_anniu_02_zh", select = "p_pozhengzhuxian_anniu_01_zh", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, - [36] = { --第三周 勇冠三军 + [34] = { --第三周 勇冠三军 default = "c_ydsj_anniu_02_zh", lock = "c_ydsj_anniu_02_zh", select = "c_ydsj_anniu_01_zh", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, - [37] = { --第四周 叱咤风云 + [35] = { --第四周 叱咤风云 default = "c_ccfy_icon2_zh", lock = "c_ccfy_icon2_zh", select = "c_ccfy_icon1_zh", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, + [36] = { --第五周 丹心碧血 + default = "d_danxinbixue_icon2_zh", lock = "d_danxinbixue_icon2_zh", select = "d_danxinbixue_bicon1_zh", + rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + }, + [37] = { --第五周 丹心碧血 + default = "d_danxinbixue_icon2_zh", lock = "d_danxinbixue_icon2_zh", select = "d_danxinbixue_bicon1_zh", + rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + }, [38] = { --第五周 丹心碧血 default = "d_danxinbixue_icon2_zh", lock = "d_danxinbixue_icon2_zh", select = "d_danxinbixue_bicon1_zh", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua index 8b8a4683d6..af002e4bb5 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua @@ -33,9 +33,9 @@ local bannerType = { [25] = {compent = "bg1",titilebg1 = "y_yishandaohai_banner_zh"}, [26] = {compent = "bg1",titilebg1 = "x_xuanjimiaosuan_banner_zh"}, [27] = {compent = "bg1",titilebg1 = "x_xianglongfuhu_banner2_zh"}, - [28] = {compent = "bg1",titilebg1 = "q_qikaidesheng_banner_zh"}, - [29] = {compent = "bg1",titilebg1 = "b_bianhuanmoce_banner_zh"}, - [30] = {compent = "bg1",titilebg1 = "b_bowenduoshi_banner_zh"}, + [28] = {compent = "bg1",titilebg1 = "b_bowenduoshi_banner_zh"}, + [29] = {compent = "bg1",titilebg1 = "t_tianxiangjiren_banner_zh"}, + [30] = {compent = "bg1",titilebg1 = "q_qikaidesheng_banner_zh"}, [31] = {compent = "bg1",titilebg1 = "t_tianxiangjiren_banner_zh"}, [32] = {compent = "bg1",titilebg1 = "s_suoxiangpimi_banner_zh"}, [33] = {compent = "bg1",titilebg1 = "x_xialuxiangfeng_banner_zh"}, diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua index bdf75583dc..6c860f7bf0 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua @@ -126,7 +126,7 @@ local PositionList = { [20006] = {pos = 70,title = "l_lingshou_baize_zh"}, [20005] = {pos = 70,title = "l_lingshou_pixiu_zh"}, [20008] = {pos = 70,title = "l_lingshou_jinwu_zh"}, - [20009] = {pos = 70,title = "l_lingshou_jinwu_zh"}, + [20009] = {pos = 70,title = "l_lingshou_jukun_zh"}, } function LingShouBaoGe:SetData() rewardData={} diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index 80f7d3ca97..45dcc26ba4 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -331,22 +331,22 @@ local activityType = { [4328] = { bg = "Bg2", hero = { - [1]={name="Bg2/hero1",id=10026,hero="y_yishandaohai_shenjiang1"}, ----东华帝君 - [2]={name="Bg2/hero2",id=10013,hero="q_qikaidesheng_shenjiang2"}, ---吕洞宾 - [3]={name="Bg2/hero3",id=10023,hero="c_ccfy_kuang03"}, --孙悟空 + [1]={name="Bg2/hero1",id=10040,hero="d_danxinbixue_shenjiang11"}, + [2]={name="Bg2/hero2",id=10092,hero="s_shibukedang_shenjiang11"}, + [3]={name="Bg2/hero3",id=10026,hero="y_yishandaohai_shenjiang1"}, }, - title = "q_qikaidesheng_zi_zh", + title = "b_bowenduoshi_zi_zh", helptype = HELP_TYPE.TimeLimitedCall }, --变幻莫测 限时召唤 [4329] = { bg = "Bg2", hero = { - [1]={name="Bg2/hero1",id=10002,hero="b_bianhuanmoce_shenjiang1"}, ----洛神 - [2]={name="Bg2/hero2",id=10033,hero="b_bianhuanmoce_shenjiang2"}, ---净光天女 - [3]={name="Bg2/hero3",id=10015,hero="s_yongwangzhiqian_shenjiang3"}, --伏虎罗汉 + [1]={name="Bg2/hero1",id=10003,hero="d_danxinbixue_shenjiang1"}, ----洛神 + [2]={name="Bg2/hero2",id=10041,hero="y_yunchouweiwo_shenjiang2"}, ---净光天女 + [3]={name="Bg2/hero3",id=10011,hero="y_yunchouweiwo_shenjiang1"}, --伏虎罗汉 }, - title = "b_bianhuanmoce_zi_zh", + title = "t_tianxiangjiren_zi_zh", helptype = HELP_TYPE.TimeLimitedCall }, --博文多识 限时召唤 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 9a57918184..9c31304705 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -77,13 +77,11 @@ local mainDynamicActivityIcon = { [25] = "r_zjm_huodongicon-yishandaohai_zh", ----移山倒海 [26] = "r_zjm_huodongicon-xuanjimiaosuan_zh", ----玄机妙算 [27] = "r_zjm_huodongicon-xianglongfuhu_zh", ----降龙伏虎 - [28] = "r_zjm_huodongicon-qikaidesheng_zh", ----旗开得胜 - [29] = "r_zjm_huodongicon-bianhuanmoce_zh", ----变幻莫测 - [30] = "r_zjm_huodongicon-bowenduoshi_zh", ----博文多识 - [31] = "r_zjm_huodongicon-tianxiangjiren_zh", ----天相吉人 - [32] = "r_zjm_huodongicon-suoxiangpimi_zh", ----所向披靡 - [33] = "r_zjm_huodongicon-xialuxiangfeng_zh", ----狭路相逢 - [34] = "r_zjm_huodongicon-tongqiangtiebi_zh", ----铜墙铁壁 + [28] = "r_zjm_huodongicon-bowenduoshi_zh", ----博文多识 + [29] = "r_zjm_huodongicon-tianxiangjiren_zh", ----天相吉人 + [30] = "r_zjm_huodongicon-suoxiangpimi_zh", ----所向披靡 + [31] = "r_zjm_huodongicon-xialuxiangfeng_zh", ----狭路相逢 + [32] = "r_zjm_huodongicon-tongqiangtiebi_zh", ----铜墙铁壁 } function this:AddFuncItem(btnGO, pos) return {go = btnGO, open = Util.GetGameObject(btnGO, "open"), lock = Util.GetGameObject(btnGO, "lock"), pos = pos}