diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang4.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang4.png new file mode 100644 index 0000000000..827f1508fb Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang4.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang4.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang4.png.meta new file mode 100644 index 0000000000..3beac2f2ad --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShiBuKeDang/s_shibukedang_shenjiang4.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: f30aeb15f715b214695aaf3ced5c7536 +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: 90d5a06eecf63d541a6bd0b90a705428 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 53b4154822..3e3a26b5ad 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -906,6 +906,7 @@ JumpType = { GuildAid = 10011, --公会援助 GuildSkill = 10012, --公会技能 GuildFete = 10013, --公会祭祀 + EndlessShop = 10014, --无尽商店 } YaoHunFrame = { diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index b94ca9cb45..9ca2690586 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -64,12 +64,12 @@ local activityType = { helptype = HELP_TYPE.TimeLimitedCall }, --势不可挡 限时召唤 - [4304] = { + [4305] = { bg = "Bg2", hero = { [1]={name="Bg2/hero1",id=10014,hero="s_shibukedang_shenjiang1"}, ----哪吒 [2]={name="Bg2/hero3",id=10090,hero="s_shibukedang_shenjiang3"}, --阎罗王 - [3]={name="Bg2/hero2",id=10009,hero="s_shibukedang_shenjiang2"}, ----龙吉公主 + [3]={name="Bg2/hero2",id=10085,hero="s_shibukedang_shenjiang4"}, ----敖丙 }, title = "s_shibukedang_zi", helptype = HELP_TYPE.TimeLimitedCall diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 54bcdeef63..4eda072e73 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -534,6 +534,14 @@ local jumpDic = { end, [JumpType.XuanYuanMirror] = function()--轩辕 UIManager.OpenPanel(UIName.XuanYuanMirrorPanel) + end, + [JumpType.EndlessShop] = function()--无尽商店 + local isActive, tips = ShopManager.IsActive(13) + if not isActive then + PopupTipPanel.ShowTip(tips or Language[10528]) + return + end + UIManager.OpenPanel(UIName.MainShopPanel,13) end, --Compound=66, --锻造炉 --DailyCarbon_Gold=67, --每日金币副本