diff --git a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab index 1a245c42ac..20ab34e4f0 100644 --- a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab @@ -879,6 +879,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u672C\u5468\u6392\u540D\uFF1A\u672A\u4E0A\u699C \u672C\u5468\u79EF\u5206\uFF1A236489" LanguageIndex: 0 +--- !u!1 &2470792709832488926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8648591679292913338} + - component: {fileID: 1240833141015611540} + - component: {fileID: 3770870939288089077} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8648591679292913338 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2470792709832488926} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1343722299391274059} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 40, y: 40} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1240833141015611540 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2470792709832488926} + m_CullTransparentMesh: 0 +--- !u!114 &3770870939288089077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2470792709832488926} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &2739825067753896380 GameObject: m_ObjectHideFlags: 0 @@ -1949,7 +2023,8 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 8648591679292913338} m_Father: {fileID: 8620339975984362873} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index becbb1ef22..c1771d3620 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -977,6 +977,9 @@ RedPointType = { linglongBaojing = 671, TaiChuMiJuan = 670, + --七界试炼 + QiJieShiLian = 860,--入口 + QiJieTreasure = 8601,--秘宝 } RedPointStatus = { diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua index eb7326f6de..04f221892a 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua @@ -40,7 +40,7 @@ local type = { tipBg = "r_Dungeon_juqingdian", resetTime = string.format("%s",specialConfig[127].Value), tip = "", - redPointType = RedPointType.JumpServer_HightLadder, + redPointType = RedPointType.QiJieShiLian, tipStr = "", state = 1 }, diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 5ef22554d2..b17ced5f66 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -302,6 +302,9 @@ function this.InitRedPointAllRelate() --主界面右上角 RPData:SetParent(RedPointType.FirstRecharge,RedPointType.RightUp2) RPData:SetParent(RedPointType.DailyRecharge,RedPointType.RightUp2) + --七界试炼 + RPData:SetParent(RedPointType.QiJieShiLian, RedPointType.JumpServer_MainCity) + for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.ActivityGroups)) do if v.RpType > 0 and v.RpTypeParent > 0 then RPData:SetParent(v.RpType,v.RpTypeParent) @@ -566,6 +569,8 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.linglongBaojing,LingLongBaoJingManager.CheckRedPointLingLong) RPData:AddCheckFunc(RedPointType.TaiChuMiJuan,DynamicActivityManager.CheckRedPointTaiChu) + --七界试炼 + RPData:AddCheckFunc(RedPointType.QiJieShiLian,QiJieShiLianManager.CheckQiJieRedPoint) end -- 向红点绑定物体 diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua index 95bd2bf5de..f5f7cdd42d 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua @@ -312,4 +312,27 @@ function this.SwitchBtnCheck(num,func) end) end +function this.CheckQiJieTreasureRedPoint() + local bool1 = false + local actInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.QiJieTreasure) + if not actInfo then + bool1 = false + else + local data = GeneralTreasureMangaer.GetTreasureData(ActivityTypeDef.QiJieTreasure) + for i = 1, #data.dataList do + if data.dataList[i].State == 3 or data.dataList[i].State == 2 then + bool1 = true + end + end + end + return bool1 +end + +function this.CheckQiJieRedPoint() + local bool1 = this.CheckQiJieTreasureRedPoint() + local bool2 = PrivilegeManager.GetPrivilegeRemainValue(3201) > 0 and true or false + LogWarn("bool1 or bool2:"..tostring(bool1 or bool2)) + return bool1 or bool2 +end + return QiJieShiLianManager \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua index dc3a426515..cb589b120a 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua @@ -21,6 +21,7 @@ function QiJieShiLianPanel:InitComponent() self.goalBtn = Util.GetGameObject(self.leftBtns,"goalBtn") self.giftBtn = Util.GetGameObject(self.leftBtns,"giftBtn") self.treasureBtn = Util.GetGameObject(self.leftBtns,"treasureBtn") + self.treasureRed = Util.GetGameObject(self.treasureBtn,"redPoint") --右侧按钮 self.rightBtns = Util.GetGameObject(self.gameObject,"rightBtns") self.rewardBtn = Util.GetGameObject(self.rightBtns,"rewardBtn") @@ -72,7 +73,6 @@ function QiJieShiLianPanel:InitComponent() --左右切换按钮 self.lastBtn = Util.GetGameObject(self.gameObject,"lastBtn") self.nextBtn = Util.GetGameObject(self.gameObject,"nextBtn") - self.tempId = 10030 self.itemViewList = {} end @@ -93,7 +93,12 @@ function QiJieShiLianPanel:BindEvent() end) end) Util.AddClick(self.treasureBtn,function() - UIManager.OpenPanel(UIName.GeneralTreasurePanel,ActivityTypeDef.QiJieTreasure) + local actInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.QiJieTreasure) + if not actInfo then + PopupTipPanel.ShowTip("活动暂未开启。") + else + UIManager.OpenPanel(UIName.GeneralTreasurePanel,ActivityTypeDef.QiJieTreasure) + end end) Util.AddClick(self.rewardBtn,function() UIManager.OpenPanel(UIName.GeneralRankRewardPanel,4,QiJieShiLianManager.curRank)--需要活动id,和我的排名 @@ -187,6 +192,7 @@ function QiJieShiLianPanel:Refresh() self.giftBtn:SetActive(self.qijieData.curProgress >= num) self.lastBtn:SetActive(not not QijieStage[QiJieShiLianManager.curLevelId-1]) self.nextBtn:SetActive(QiJieShiLianManager.curMaxStage~=QiJieShiLianManager.curLevelId) + self.treasureRed:SetActive(QiJieShiLianManager.CheckQiJieTreasureRedPoint()) self:SetTabBox() self:SetTopBar() self:SetBottomBar() @@ -195,6 +201,7 @@ function QiJieShiLianPanel:Refresh() if self.Live then poolManager:UnLoadLive(self.bgName, self.Live) end + self.tempId = self.configData.BossId if not heroConfig[self.tempId] then return end