diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
index 82accc8c8e..a3d617e56b 100644
--- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
@@ -2856,7 +2856,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "\u6BCF\u8F6E\u53EF\u7ADE\u731C2\u628A\u5251\u7684\u80DC\u5229\uFF08\u7ADE\u731C\u5931\u8D25\u8FD4\u8FD8\u7075\u6C14\u4E39\uFF09"
+ m_Text: "\u6BCF\u8F6E\u53EF\u62BC\u6CE82\u628A\u5251\uFF08\u7ADE\u731C\u5931\u8D25\u8FD4\u8FD8\u5168\u90E8\u5FA1\u5251\u4EE4\uFF09"
LanguageIndex: 0
--- !u!1 &229268780954427967
GameObject:
diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
index d13a370ad6..facaff6cdb 100644
--- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
@@ -665,7 +665,7 @@ function this.ExecuteLoading()
--[[[36] =]]function() NetManager.GetFourElementGetInfo(LoadingPanel.OnStep) end, --四灵试炼
--[[[37] =]]function() MonsterCampManager.SetMyHelpHeroData(nil,nil,LoadingPanel.OnStep) end,--助战神将
--[[[38] =]]function() NetManager.HongMengInfoResponse(LoadingPanel.OnStep) end, --鸿蒙阵
- --[[[39] =]]function() NetManager.AllBookEnableResponse(LoadingPanel.OnStep) end, --
+ --[[[39] =]]--function() NetManager.AllBookEnableResponse(LoadingPanel.OnStep) end, --
--[[[40] =]]function() NetManager.AllEndLessHeroDataResponse(0, LoadingPanel.OnStep) end,--无尽英雄数据
--[[[41] =]]function() NetManager.GetEndlessTreasureInfoResponse(LoadingPanel.OnStep) end,--无尽密保
--[[[42] =]]function() MyGuildManager.ReuqsetRedPackage(LoadingPanel.OnStep) end, --请求红包
diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
index 2e6b2d656f..b7010159f6 100644
--- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
@@ -806,6 +806,15 @@ local jumpDic = {
UIManager.OpenPanel(UIName.PracticePanel)
UIManager.OpenPanel(UIName.FourQuadrantPopup)
end,
+ [JumpType.YuJianXingShangDian] = function (data) --御剑行商店
+ local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.YuJianXing)
+ if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(ActivityTypeDef.YuJianXing) then
+ this.JumpActivity(JumpType.YuJianXingShangDian,data[1])
+ else
+ PopupTipPanel.ShowTip("活动尚未开启")
+ this.isOpen = false
+ end
+ end,
}
function this.JumpActivity(data,skipfactor)
diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua
index 37115f5ff9..693f3a151f 100644
--- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua
@@ -75,7 +75,7 @@ function YuJianXingPanel:BindEvent()
PopupTipPanel.ShowTip("请比赛结束后前往~")
return
end
- JumpManager.GoJump(20003)
+ JumpManager.GoJump(40038)
end)
end