diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 770610a8c7..9cd400cc03 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -982,6 +982,7 @@ RedPointType = { --七界试炼 QiJieShiLian = 860,--入口 QiJieTreasure = 8601,--秘宝 + WorldArena_reward = 672, --玉虚论道奖励 } RedPointStatus = { diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua index f1131ffd9c..9c107cbc68 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua @@ -31,7 +31,7 @@ local type = { tipBg = "r_Dungeon_juqingdian", resetTime = string.format("%s",specialConfig[127].Value), tip = string.format("%s",specialConfig[127].Value), - redPointType = RedPointType.JumpServer_HightLadder, + redPointType = RedPointType.WorldArena_reward, tipStr = "", state = 0, }, diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index e92f9445c8..5fb6dabbba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -671,6 +671,7 @@ function this.ExecuteLoading() function() NetManager.BeautyBagWishEquipRequest(nil,LoadingPanel.OnStep) end,--心愿魂印 function() LingLongBaoJingManager.InitData(LoadingPanel.OnStep) end, --玲珑宝镜 function() NetManager.IsCrossRequert(LoadingPanel.OnStep) end, --跨服 + function() NetManager.CrossYuXuLunDaoGetInfoRequest(LoadingPanel.OnStep) end, --玉虚论道红点 function() NetManager.TaiChuSecretvolumeRequest(LoadingPanel.OnStep) end, --太初密卷 --[[[35] =]] function() -- 登录请求最终接口,所有请求放在此接口之前 -- 登录成功确认 diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 98b6c694ef..dd10fa3805 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -5630,6 +5630,7 @@ function NetManager.CrossYuXuLunDaoGetInfoRequest(func) local data = buffer:DataByte() local msg = ArenaInfoProto_pb.CrossYuXuLunDaoGetInfoResponse() msg:ParseFromString(data) + WorldArenaManager.SetRewardData(msg.dailyRewardState,msg.changedTimes) if func then func(msg) end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 562feb7a27..eb9a94bac9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -304,7 +304,8 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.DailyRecharge,RedPointType.RightUp2) --七界试炼 RPData:SetParent(RedPointType.QiJieShiLian, RedPointType.JumpServer_MainCity) - + --玉虚论道 + RPData:SetParent(RedPointType.WorldArena_reward, 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) @@ -571,6 +572,8 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.TaiChuMiJuan,DynamicActivityManager.CheckRedPointTaiChu) --七界试炼 RPData:AddCheckFunc(RedPointType.QiJieShiLian,QiJieShiLianManager.CheckQiJieRedPoint,FUNCTION_OPEN_TYPE.QIJIESHILIAN) + --玉虚论道 + RPData:AddCheckFunc(RedPointType.WorldArena_reward,WorldArenaManager.CheckRewardPoint()) end -- 向红点绑定物体 diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua index 11c4fa6fff..537f9a5da6 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua @@ -350,7 +350,6 @@ function this:RefreshEnemyData(team) this.HeadList[i]:SetEffectScale(0.85) table.insert(enemyList,EnemyList[i].uid) Util.AddOnceClick(bg, function() - LogError("uid=="..EnemyList[i].uid) NetManager.GetPlayerCrossYxldOneTeamInfoRequest(EnemyList[i].uid,0,function(msg) UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, EnemyList[i].uid,1,msg) end) diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaManager.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaManager.lua index c0e9c93231..b5805615f4 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaManager.lua @@ -7,6 +7,7 @@ local oldScore=0 local newScore=0 local myRankId=0 local challengeTime=0 +local rewardState = nil local rewardList={} function this.Initialize() rewardList={} @@ -45,6 +46,15 @@ function this.SetMyData(rank,time) challengeTime=time end +function this.SetRewardData(data,time) + rewardState=data + challengeTime=time + for i = 1, #data do + LogError("宝箱状态========"..data[1]) + end +end + + function this.SetOldScore(num) oldScore=num end @@ -109,4 +119,25 @@ function this.SetStarShow(starList, starLv) end end +--设置奖励状态 +function this.SetRewardState(index,state) + if rewardState[index] then + rewardState[index]=state + end +end +--检测玉虚奖励的红点 +function this.CheckRewardPoint() + local config=ConfigManager.GetConfigDataByKey(ConfigName.MServerRankConfig,1) + local rewards=config.DailyReward + for i = 1, #rewards do + if rewards[i] then + if challengeTime>=rewards[i][1] and rewardState[i]~=2 then + return true + end + end + end + return false +end + + return this \ No newline at end of file