【罗浮争锋】国内提交+1

dev_chengFeng
zhangqiang 2021-07-13 17:40:25 +08:00
parent 60e6f0e186
commit f7932b9e8c
9 changed files with 59 additions and 43 deletions

View File

@ -1622,10 +1622,10 @@ RectTransform:
m_Father: {fileID: 7192441510342929614}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 539.95, y: -1313.8999}
m_SizeDelta: {x: 1079.9, y: 375.4}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4621768660934272770
GameObject:
@ -1959,10 +1959,10 @@ RectTransform:
m_Father: {fileID: 6901070332816326902}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 89.8, y: -468.9}
m_SizeDelta: {x: 126, y: 126}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1650392925381089377
CanvasRenderer:
@ -2989,10 +2989,10 @@ RectTransform:
m_Father: {fileID: 7192441510342929614}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 539.95, y: -938.5}
m_SizeDelta: {x: 1079.9, y: 375.4}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5973259858859165284
GameObject:
@ -3029,10 +3029,10 @@ RectTransform:
m_Father: {fileID: 7192441510342929614}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 539.95, y: -187.7}
m_SizeDelta: {x: 1079.9, y: 375.4}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5996200769212338270
GameObject:
@ -3931,10 +3931,10 @@ RectTransform:
m_Father: {fileID: 7192441510342929614}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 539.95, y: -563.1}
m_SizeDelta: {x: 1079.9, y: 375.4}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7197382918352075755
GameObject:
@ -3970,7 +3970,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: 1.8, y: 87.9}
m_AnchoredPosition: {x: -3, y: 87.9}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7197382918352075752
@ -4480,10 +4480,10 @@ RectTransform:
m_Father: {fileID: 6901070332816326902}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 89.8, y: -198.3}
m_SizeDelta: {x: 126, y: 126}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6282843123482655537
CanvasRenderer:
@ -9427,10 +9427,10 @@ RectTransform:
m_Father: {fileID: 6901070332816326902}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 89.8, y: -604.2}
m_SizeDelta: {x: 126, y: 126}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1449230760945282387
CanvasRenderer:
@ -9460,7 +9460,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 1da5a4a3854f87f4c83aa4dbcb6a0d43, type: 3}
m_Sprite: {fileID: 21300000, guid: 31331d004c1dffb46a564b185d164204, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -9621,10 +9621,10 @@ RectTransform:
m_Father: {fileID: 6901070332816326902}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 89.8, y: -63}
m_SizeDelta: {x: 126, y: 126}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2949949007295888706
CanvasRenderer:
@ -10366,10 +10366,10 @@ RectTransform:
m_Father: {fileID: 6901070332816326902}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 89.8, y: -333.6}
m_SizeDelta: {x: 126, y: 126}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2766708985732818898
CanvasRenderer:

View File

@ -445,7 +445,7 @@ function this.GetHeroFormationStr(teamId)
elseif teamId == FormationTypeDef.ARENA_TOM_MATCH then
return Language[11104]
elseif teamId == FormationTypeDef.JUMPSERVER_HIGHTLADDER then
return"该神将在罗浮争锋防守阵容中已上阵"
return"该神将在罗浮争锋阵容中已上阵"
end
end
return ""

View File

@ -90,6 +90,7 @@ function this.RankNodeAdapter(node, data)
warOrGuard = 2
curShowPersonInfo = data.redEnemy
end
curShowPersonInfo.personInfo.name = PracticeManager.SetNameColor(curShowPersonInfo.personInfo.name,curShowPersonInfo.personInfo.practiceLevel)
lv_name.text = curShowPersonInfo.personInfo.servername.." "..curShowPersonInfo.personInfo.name--
power.text = curShowPersonInfo.personInfo.totalForce--Language[10090]..
time.text = GetDeltaTimeStr(data.fightData.fightSeed)

View File

@ -49,6 +49,8 @@ function this.InithightLadderData(_msg)
for i = 1, #_msg.arenaInfo.arenaEnemys do
LogPink("_msg.arenaInfo.arenaEnemys[i].hadProud "..tostring(_msg.arenaInfo.arenaEnemys[i].hadProud) )
LogPink("_msg.arenaInfo.arenaEnemys[i].worshipTime ".._msg.arenaInfo.arenaEnemys[i].worshipTime)
LogYellow("_msg.arenaInfo.arenaEnemys[i].personInfo.practiceLevel ".._msg.arenaInfo.arenaEnemys[i].personInfo.practiceLevel)
_msg.arenaInfo.arenaEnemys[i].personInfo.name = PracticeManager.SetNameColor(_msg.arenaInfo.arenaEnemys[i].personInfo.name,_msg.arenaInfo.arenaEnemys[i].personInfo.practiceLevel)
end
LogPink("_msg.stage ".._msg.stage)
LogPink("_msg.endTime ".._msg.endTime)
@ -66,6 +68,9 @@ function this.InithightLadderData(_msg)
end
--推送更新
function this.IndicationHightLadderData(_msg)
for i = 1, #_msg.arenaInfo.arenaEnemys do
_msg.arenaInfo.arenaEnemys[i].personInfo.name = PracticeManager.SetNameColor(_msg.arenaInfo.arenaEnemys[i].personInfo.name,_msg.arenaInfo.arenaEnemys[i].personInfo.practiceLevel)
end
arenaInfo = _msg.arenaInfo
stage = _msg.stage
endTime = _msg.endTime
@ -74,10 +79,14 @@ function this.IndicationHightLadderData(_msg)
LogPink("_msg.stage ".._msg.stage)
LogPink("_msg.endTime ".._msg.endTime)
LogPink("_msg.arenaInfo.score ".._msg.arenaInfo.score)
Game.GlobalEvent:DispatchEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderPanel)
end
--战斗更新
function this.BattleHightLadderData(_msg)
if _msg.arenaInfo and _msg.arenaInfo.arenaEnemys and #_msg.arenaInfo.arenaEnemys > 0 then
for i = 1, #_msg.arenaInfo.arenaEnemys do
_msg.arenaInfo.arenaEnemys[i].personInfo.name = PracticeManager.SetNameColor(_msg.arenaInfo.arenaEnemys[i].personInfo.name,_msg.arenaInfo.arenaEnemys[i].personInfo.practiceLevel)
end
arenaInfo = _msg.arenaInfo
myRank =_msg.arenaInfo.score
end
@ -120,7 +129,7 @@ end
--天梯开始战斗
this.curBattleDrop = {}
function this.StarFightHightLadder(personInfo,skipFight,callBack)
NetManager.GetWorldArenaChallengeRequest(FormationTypeDef.FORMATION_NORMAL,personInfo,skipFight,function (msg)
NetManager.GetWorldArenaChallengeRequest(FormationTypeDef.JUMPSERVER_HIGHTLADDER,personInfo,skipFight,function (msg)
oldMyRank = myRank
-- if msg and msg.drop and msg.drop.itemlist and #msg.drop.itemlist > 0 then
-- LogPink(" #msg.drop.itemlist ".. #msg.drop.itemlist)

View File

@ -48,7 +48,7 @@ local _ViewConfig = {
},
[PLAYER_INFO_VIEW_TYPE.JUPMSERVER] = {
formationType = FormationTypeDef.JUMPSERVER_HIGHTLADDER,
tip = "罗浮争锋防守阵容:",
tip = "罗浮争锋阵容:",
btnType = {
{name = "挑战", func = 6},
}

View File

@ -295,7 +295,7 @@ function this.SetHeadsInfo(data,root,index,name,level)
if sData.rankType == RANK_TYPE.TASUILINGXIAO then
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.TSLX)
elseif sData.rankType == RANK_TYPE.JUMPSERVER_HIGHTLADDER then
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER,data.serverName and data.serverName or nil)
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER,"1")--data.serverName and data.serverName or nil)
else
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid)
end
@ -332,7 +332,7 @@ function this.AddPlayerInfoClick(root,uid,serverName)
if sData.rankType == RANK_TYPE.TASUILINGXIAO then
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.TSLX)
elseif sData.rankType == RANK_TYPE.JUMPSERVER_HIGHTLADDER then
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER,serverName and serverName or nil)
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER,"1")--serverName and serverName or nil)
else
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid)
end

View File

@ -173,6 +173,8 @@ function this.SingleHeroDataShow(go,_heroData)
elseif heroData.isFormations[1] == FormationTypeDef.ARENA_TOM_MATCH then
-- JumpManager.GoJump(57001)
UIManager.OpenPanel(UIName.ArenaTopMatchPanel)
elseif heroData.isFormations[1] == FormationTypeDef.JUMPSERVER_HIGHTLADDER then
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.JUMPSERVER_HIGHTLADDER)
end
end
end)

View File

@ -252,6 +252,8 @@ function this.SingleHeroDataShow(go,_heroData)
elseif heroData.isFormations[1] == FormationTypeDef.ARENA_TOM_MATCH then
-- JumpManager.GoJump(57001)
UIManager.OpenPanel(UIName.ArenaTopMatchPanel)
elseif heroData.isFormations[1] == FormationTypeDef.JUMPSERVER_HIGHTLADDER then
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.JUMPSERVER_HIGHTLADDER)
end
end
end)

View File

@ -192,6 +192,8 @@ function this.SingleHeroDataShow(go,_heroData)
elseif heroData.isFormations[1] == FormationTypeDef.ARENA_TOM_MATCH then
-- JumpManager.GoJump(57001)
UIManager.OpenPanel(UIName.ArenaTopMatchPanel)
elseif heroData.isFormations[1] == FormationTypeDef.JUMPSERVER_HIGHTLADDER then
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.JUMPSERVER_HIGHTLADDER)
end
end
end)