段位重置界面修改提交
parent
b743ccd296
commit
652beb7c5d
|
|
@ -36,8 +36,8 @@ 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: -0.00000095367, y: -388.9}
|
||||
m_SizeDelta: {x: 847.3, y: 201.6}
|
||||
m_AnchoredPosition: {x: -0.00000095367, y: -375.6}
|
||||
m_SizeDelta: {x: 847.3, y: 228.8}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7368018991282595720
|
||||
CanvasRenderer:
|
||||
|
|
@ -388,9 +388,9 @@ RectTransform:
|
|||
m_Father: {fileID: 693492061662913202}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 184, y: -50}
|
||||
m_SizeDelta: {x: 66, y: 66}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4965636513362044306
|
||||
|
|
@ -757,7 +757,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0.00005340576}
|
||||
m_AnchoredPosition: {x: 0, y: 0.000022888184}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &5343069358979546458
|
||||
|
|
@ -830,9 +830,9 @@ RectTransform:
|
|||
m_Father: {fileID: 693492061662913202}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 316, y: -50}
|
||||
m_SizeDelta: {x: 66, y: 66}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2985940535899182505
|
||||
|
|
@ -1063,9 +1063,9 @@ RectTransform:
|
|||
m_Father: {fileID: 693492061662913202}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 250, y: -50}
|
||||
m_SizeDelta: {x: 66, y: 66}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7104302519570059375
|
||||
|
|
@ -1160,7 +1160,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 2642435127394197597}
|
||||
- component: {fileID: 4803123704542731706}
|
||||
- component: {fileID: 6292389172146394786}
|
||||
- component: {fileID: 7967398261769058922}
|
||||
m_Layer: 5
|
||||
m_Name: tipImage
|
||||
m_TagString: Untagged
|
||||
|
|
@ -1195,7 +1195,7 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3922155073451694762}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6292389172146394786
|
||||
--- !u!114 &7967398261769058922
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -1204,7 +1204,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 3922155073451694762}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
|
|
@ -1215,15 +1215,20 @@ 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: b532724b009a85a468348fd70baf8c7e, 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
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
|
||||
m_FontSize: 42
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 42
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u70B9\u51FB\u4EFB\u610F\u4F4D\u7F6E\u7EE7\u7EED"
|
||||
--- !u!1 &3971405333770730619
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1930,9 +1935,9 @@ RectTransform:
|
|||
m_Father: {fileID: 693492061662913202}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 118, y: -50}
|
||||
m_SizeDelta: {x: 66, y: 66}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6989470406627322593
|
||||
|
|
@ -1959,7 +1964,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &693492061662913202
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2543,9 +2548,9 @@ RectTransform:
|
|||
m_Father: {fileID: 693492061662913202}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 382, y: -50}
|
||||
m_SizeDelta: {x: 66, y: 66}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &909641898749362434
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ function this.ReceiveBaseArenaData(msg)
|
|||
this.ArenaInfo.lvScore=msg.lvScore
|
||||
this.ArenaInfo.successNums=msg.fightNum
|
||||
this.ArenaInfo.failNums=msg.fightNum
|
||||
|
||||
this.MyRank.rank = msg.ranking
|
||||
this.MyRank.score = msg.score
|
||||
LogError("msg.fightNum=============="..msg.fightNum.." msg.score=="..msg.score.." msg.ranking=="..msg.ranking)
|
||||
|
|
@ -61,6 +62,7 @@ function this.ReceiveBaseArenaData(msg)
|
|||
for k,v in ConfigPairs(arenaLevel) do
|
||||
if msg.lvScore>=v.ArenaLevelIntegral[1] then
|
||||
this.ArenaInfo.rankName=v.ArenaLevelName
|
||||
this.ArenaInfo.ArenaLevelIntegral=v.ArenaLevelIntegral
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -7860,7 +7860,22 @@ function NetManager.NewArenaResetRequest(_func)
|
|||
local msg = ArenaInfoProto_pb.NewArenaResetResponse()
|
||||
msg:ParseFromString(data)
|
||||
--首次打开显示重置/有奖励则为升段
|
||||
LogError("111111111111111111111111111112222222222222222")
|
||||
--LogError("111111111111111111111111111112222222222222222")
|
||||
-- local data={}
|
||||
-- data.isFirst=1
|
||||
-- data.drop={}
|
||||
-- data.drop.itemlist={}
|
||||
-- local item1={}
|
||||
-- item1.itemId = 5100006
|
||||
-- item1.itemNum = 10
|
||||
-- local item2={}
|
||||
-- item2.itemId = 16
|
||||
-- item2.itemNum=100
|
||||
-- data.drop.itemlist[1]=item1
|
||||
-- data.drop.itemlist[2]=item2
|
||||
-- table.insert(data.drop.itemlist,item1)
|
||||
-- table.insert(data.drop.itemlist,item2)
|
||||
|
||||
if msg.isFirst==1 or #msg.drop>0 then
|
||||
UIManager.OpenPanel(UIName.ArenaNewUpRankPanel,msg)
|
||||
if _func then
|
||||
|
|
|
|||
|
|
@ -18,6 +18,9 @@ function ArenaNewUpRankPanel:InitComponent()
|
|||
this.titleImg=Util.GetGameObject(self.gameObject, "Bg/bg/title"):GetComponent("Text")
|
||||
this.titleObj=Util.GetGameObject(self.gameObject, "Bg/bg")
|
||||
this.titleImg.text="段位重置为"
|
||||
|
||||
this.jifenTxt=Util.GetGameObject(self.gameObject, "Bg/jifenTxt"):GetComponent("Text")
|
||||
this.jifenTxt.text="段位积分"
|
||||
this.rankName=Util.GetGameObject(self.gameObject, "Bg/rankName"):GetComponent("Text")
|
||||
this.rankImg=Util.GetGameObject(self.gameObject, "Bg/RankImg")
|
||||
this.scoreTxt=Util.GetGameObject(self.gameObject, "Bg/hangOnTime"):GetComponent("Text")
|
||||
|
|
@ -58,30 +61,39 @@ function ArenaNewUpRankPanel:OnOpen(data)
|
|||
this.titleImg.text="段位提升为"
|
||||
end
|
||||
lastScore=PlayerPrefs.GetInt(PlayerManager.uid.."yuxulundaoScore")
|
||||
aaa, rankData=WorldArenaManager.GetRankImgByScore(lastScore)
|
||||
--aaa, rankData=WorldArenaManager.GetRankImgByScore(lastScore)
|
||||
currScore=WorldArenaManager.GetNewScore()
|
||||
lastRankId=rankData.Id
|
||||
newResore=WorldArenaManager.GetNewScore()
|
||||
LogError("upwindow lastScore=="..lastScore.." newScore=="..newResore)
|
||||
local grade, newRankData=WorldArenaManager.GetRankImgByScore(WorldArenaManager.GetNewScore())
|
||||
currRankId=newRankData.Id
|
||||
--lastRankId=rankData.Id
|
||||
--newResore=WorldArenaManager.GetNewScore()
|
||||
--LogError("upwindow lastScore=="..lastScore.." newScore=="..newResore)
|
||||
--local grade, newRankData=WorldArenaManager.GetRankImgByScore(WorldArenaManager.GetNewScore())
|
||||
local baseData=ArenaManager.GetArenaBaseData()
|
||||
--currRankId=newRankData.Id
|
||||
--rankData=RankConfig[lastRankId]
|
||||
minScore=rankData.ScoreLow
|
||||
maxScore=rankData.ScoreUp
|
||||
currRank= rankData.RankGrade+1
|
||||
titleLive = poolManager:LoadAsset("fx_duanwei_0"..currRank, PoolManager.AssetType.GameObject)
|
||||
titleLive.transform:SetParent(this.rankImg.transform)
|
||||
titleLive.transform.localPosition=Vector3.New(0,-600,0)
|
||||
titleLive.transform.localScale =Vector3.New(1,1,1)
|
||||
SetParticleSortLayer(titleLive,self.sortingOrder)
|
||||
if not rankData then
|
||||
return
|
||||
end
|
||||
this.rankName.text=rankData.RankName
|
||||
this.scoreTxt.text=lastScore.."/"..rankData.ScoreUp
|
||||
this.progress.fillAmount=(lastScore-minScore)/(maxScore-minScore)
|
||||
-- minScore=rankData.ScoreLow
|
||||
-- maxScore=rankData.ScoreUp
|
||||
-- currRank= rankData.RankGrade+1
|
||||
-- titleLive = poolManager:LoadAsset("fx_duanwei_0"..currRank, PoolManager.AssetType.GameObject)
|
||||
-- titleLive.transform:SetParent(this.rankImg.transform)
|
||||
-- titleLive.transform.localPosition=Vector3.New(0,-600,0)
|
||||
-- titleLive.transform.localScale =Vector3.New(1,1,1)
|
||||
-- SetParticleSortLayer(titleLive,self.sortingOrder)
|
||||
-- if not rankData then
|
||||
-- return
|
||||
-- end
|
||||
this.rankName.text=ArenaManager.GetArenaMyRankName() --rankData.RankName
|
||||
this.scoreTxt.text=baseData.lvScore.."/"..baseData.ArenaLevelIntegral[2] --lastScore.."/"..rankData.ScoreUp
|
||||
this.progress.fillAmount=(baseData.lvScore-baseData.ArenaLevelIntegral[1])/(baseData.ArenaLevelIntegral[2]-baseData.ArenaLevelIntegral[1]) --(lastScore-minScore)/(maxScore-minScore)
|
||||
--currRank=rankData.RankGrade
|
||||
this.SetStarShow(rankData.RankLevel,rankData.RankGrade+1,self.sortingOrder)
|
||||
local itemRandomDataList={}
|
||||
aaa=data.drop
|
||||
if aaa.itemlist and #aaa.itemlist>0 then
|
||||
itemRandomDataList=BagManager.GetTableByBackDropDataNew(aaa)
|
||||
local callList2 = Stack.New()
|
||||
local baseContentList2={}
|
||||
this.SetItemShow(aaa,itemRandomDataList,this.grid.transform,callList2,baseContentList2)
|
||||
end
|
||||
--this.SetStarShow(rankData.RankLevel,rankData.RankGrade+1,self.sortingOrder)
|
||||
-- this.StartProgressChange(function()
|
||||
-- local callList2 = Stack.New()
|
||||
-- local itemRandomDataList={}
|
||||
|
|
@ -120,7 +132,7 @@ function this.SetStarShow(star,grade,layer)
|
|||
end
|
||||
SetParticleSortLayer(titleLive,layer)
|
||||
end
|
||||
this.rankName.text=rankData.RankName
|
||||
--this.rankName.text=rankData.RankName
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue