diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRecordPopup.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRecordPopup.prefab index 672c71ea2b..d2b504978a 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRecordPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRecordPopup.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 223004754372590400} - component: {fileID: 114372824615027968} m_Layer: 0 - m_Name: ArenaRecordPopup + m_Name: WorldArenaRecordPopup m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -345,7 +345,7 @@ RectTransform: 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: 194.01, y: -2.9} + m_AnchoredPosition: {x: 350.1, y: 43.2} m_SizeDelta: {x: 130.79, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222929285231308004 @@ -383,13 +383,13 @@ MonoBehaviour: m_BestFit: 1 m_MinSize: 26 m_MaxSize: 34 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: +15 + m_Text: "\u79EF\u5206+15" --- !u!1 &1302819781731396 GameObject: m_ObjectHideFlags: 0 @@ -1087,7 +1087,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224170130709635840 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua index 8de9188dfd..477e10da3e 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua @@ -232,6 +232,10 @@ function WorldArenaBattleInfoPanel:BindEvent() this.btnText.text="确定" end end) + --添加奖励 -- + if msg.drop then + WorldArenaManager.AddReward(msg.drop) + end -- for i = 1, #this.playBacks do -- this.playBacks[i]:SetActive(true) -- end @@ -345,7 +349,9 @@ function WorldArenaBattleInfoPanel:OnOpen(msg,_type,closeFunc,list) if list then state=3 resultList=list + for i = 1, 3 do + this.playBacks[i]:SetActive(true) this.ShowBattleState(i,3) end end @@ -355,6 +361,9 @@ function this.ShowInfo(msg) --我的信息 myInfoData=msg.myTeamInfo enInfoData=msg.defTeamInfo + if msg.fightData then + fightDataList=msg.fightData + end this.myName.text= PracticeManager.SetNameColor(JingJiShouWeiToEn(PlayerManager.nickName),msg.myTeamInfo.practiceLevel) this.myServer.text= PracticeManager.SetNameColor(PlayerManager.serverInfo.name,1) this.myRankImg.sprite=this.spLoader:LoadSprite("y_yuxulundao_xiaobiao_0"..1) diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua index 67f427dde1..ff34b2a756 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua @@ -175,6 +175,7 @@ function WorldArenaMainPanel:OnOpen(...) local args = {...} NetManager.CrossYuXuLunDaoGetInfoRequest(function(msg) local currRankId=msg.newLevelId + LogError(" newMyscore=="..msg.newMyscore) grid, rankData=WorldArenaManager.GetRankImgByScore(msg.newMyscore) --rankData=ConfigManager.GetConfigData(ConfigName.MServerRankConfig,currRankId) battleTimes=msg.changedTimes @@ -327,11 +328,14 @@ function this:RefreshEnemyData(team) SecTorPlayAnim(prefab) end - +function WorldArenaMainPanel:OnFocus() + LogError("************//////") +end -- 打开,重新打开时回调 function WorldArenaMainPanel:OnShow() SoundManager.PlayMusic(SoundConfig.BGM_Arena) + LogError("**********") end function WorldArenaMainPanel:OnSortingOrderChange() diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaManager.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaManager.lua index 0051772ee9..ccc3ed2c50 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaManager.lua @@ -3,14 +3,55 @@ local this = WorldArenaManager local ArenaSetting = ConfigManager.GetConfig(ConfigName.MServerArenaSetting) local rankConfig = ConfigManager.GetConfig(ConfigName.MServerRankConfig) +local oldScore=0 +local newScore=0 +local freeTimes +local myRankId=0 +local challengeTime=0 +local rewardList={} function this.Initialize() - this.rank=0 - this.star=0 - + rewardList={} end -local freeTimes + +--添加奖励 +function this.AddReward(drop) + if drop.itemlist then + for i = 1, #drop do + for j = 1, #drop[i].itemlist do + local item={} + item.itemId=drop[i].itemlist[j].itemId + item.itemNum=drop[i].itemlist[j].itemNum + table.insert(rewardList,item) + end + end + end +end + + +function this.SetMyData(rank,free,time) + myRankId=rank + freeTimes=free + challengeTime=time +end + +function this.SetOldScore(num) + oldScore=num +end + +function this.GetOldScore() + return oldScore +end + +function this.SetNewScore(num) + newScore=num +end + +function this.GetNewScore() + return newScore +end + function this.SetFreeTime(num) freeTimes=num end @@ -42,7 +83,7 @@ function this.GetRankImgByScore(num) return v.RankGrade+1,v end end - return 1 + return 1,rankConfig[1] end local _StarShow = { diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaOtherTeamPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaOtherTeamPanel.lua index fd45a4b8cc..ff1a3fc428 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaOtherTeamPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaOtherTeamPanel.lua @@ -6,6 +6,7 @@ local type=0 --1:挑战 2:详情 local itemId, needNum local haveNum=0 local time=0 +local enemyId function WorldArenaOtherTeamPanel:InitComponent() self.spLoader = SpriteLoader.New() self.btnBack = Util.GetGameObject(self.gameObject, "Frame/BackBtn") @@ -62,6 +63,12 @@ function WorldArenaOtherTeamPanel:BindEvent() PopupTipPanel.ShowTip("邀请函不足!") return end + NetManager.CrossYuXuLunDaoChallengeBeforeRequest(PlayerManager.uid,self.playerId,function(msg) + LogError("open battleinfo ???") + UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel,msg,1, function() + --self:RefreshChallengeList() + end) + end) --显示挑战界面 self:ClosePanel() end) diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRecordPopup.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRecordPopup.lua index f0e1446230..a9059736f2 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRecordPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRecordPopup.lua @@ -201,8 +201,8 @@ function this.RankNodeAdapter(node, data) end windData.myTeamInfo=myTeamInfo windData.defTeamInfo=enTeamInfo - - UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel,windData,2,data.resultList) + windData.fightData=fightDataList + UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel,windData,2,nil,data.resultList) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaUpRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaUpRewardPanel.lua index 791b2af358..5e5ac404a4 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaUpRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaUpRewardPanel.lua @@ -3,14 +3,15 @@ WorldArenaUpRewardPanel = Inherit(BasePanel) local this = WorldArenaUpRewardPanel local RankConfig=ConfigManager.GetConfig(ConfigName.MServerRankConfig) local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) -local lastRankId=10 -local currRankId=12 -local lastScore=180 -local currScore=212 +local lastRankId=0 +local currRankId=0 +local lastScore=0 +local currScore=0 local rankData local maxScore local minScore local layer +local aaa --初始化组件(用于子类重写) function WorldArenaUpRewardPanel:InitComponent() this.spLoader = SpriteLoader.New() @@ -50,7 +51,12 @@ function WorldArenaUpRewardPanel:OnOpen(...) else this.titleObj.gameObject:SetActive(false) end - rankData=RankConfig[lastRankId] + lastScore=PlayerPrefs.GetInt(PlayerManager.uid.."yuxulundaoScore") + aaa, rankData=WorldArenaManager.GetRankImgByScore(lastScore) + lastRankId=rankData.Id + local grade, newRankData=WorldArenaManager.GetRankImgByScore(currScore) + currRankId=newRankData.Id + --rankData=RankConfig[lastRankId] minScore=rankData.ScoreLow maxScore=rankData.ScoreUp currRank= rankData.RankGrade+1 @@ -72,12 +78,7 @@ function WorldArenaUpRewardPanel:OnOpen(...) local itemRandomDataList={} local aaa={} aaa.itemlist={} - for i = 1, 10 do - local item={} - item.itemId=16 - item.itemNum=100 - table.insert(aaa.itemlist,item) - end + aaa.itemlist=WorldArenaManager.rewardList itemRandomDataList=BagManager.GetTableByBackDropData(aaa) local baseContentList2={} this.SetItemShow(aaa,itemRandomDataList,this.grid.transform,callList2,baseContentList2) @@ -89,7 +90,6 @@ end function this.SetStarShow(star,grade,layer) -- 设置星级 WorldArenaManager.SetStarShow(this.starList, rankData.RankLevel) - if currRank~=grade then if titleLive then destroy(titleLive) @@ -170,9 +170,7 @@ function this.StartProgressChange(func) if this.TimeCounter then this.TimeCounter=nil end - if lastRankId>currRankId then - num=lastRankId-currRankId - end + local function _TimeUpdate() --降低 if lastScore