Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-04-02 10:45:54 +08:00
commit 223afd4c57
6 changed files with 60 additions and 49 deletions

View File

@ -352,7 +352,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 60, y: 60}
m_SizeDelta: {x: 70, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1186369652684328741
CanvasRenderer:
@ -467,7 +467,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: 0, y: -59.2}
m_AnchoredPosition: {x: 5, y: -68}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9033237079126216486
@ -548,8 +548,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: 13, y: -24}
m_SizeDelta: {x: 48, y: 28}
m_AnchoredPosition: {x: 23, y: -31}
m_SizeDelta: {x: 58, y: 38}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7348054879377270933
CanvasRenderer:
@ -627,7 +627,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 388.5, y: -1}
m_SizeDelta: {x: 70, y: 70}
m_SizeDelta: {x: 110, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8807554857087550762
CanvasRenderer:
@ -701,8 +701,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: 13, y: -24}
m_SizeDelta: {x: 48, y: 28}
m_AnchoredPosition: {x: 23, y: -31}
m_SizeDelta: {x: 58, y: 38}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7291068274538925133
CanvasRenderer:
@ -855,7 +855,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: 0, y: -59.2}
m_AnchoredPosition: {x: 0, y: -64.000046}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7724585595045447681
@ -1084,7 +1084,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: 0, y: -59.2}
m_AnchoredPosition: {x: 0, y: -64.000046}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2491799782164736383
@ -1197,10 +1197,10 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 20
m_FontSize: 28
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
@ -1724,7 +1724,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 60, y: 60}
m_SizeDelta: {x: 90, y: 90}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7463882071309610157
CanvasRenderer:
@ -2143,8 +2143,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: 13, y: -24}
m_SizeDelta: {x: 48, y: 28}
m_AnchoredPosition: {x: 23, y: -31}
m_SizeDelta: {x: 58, y: 38}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &874345007403795766
CanvasRenderer:
@ -2250,10 +2250,10 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 20
m_FontSize: 28
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
@ -2376,7 +2376,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -187, y: -1}
m_SizeDelta: {x: 70, y: 70}
m_SizeDelta: {x: 85, y: 85}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6593822347612327707
CanvasRenderer:
@ -2705,7 +2705,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -282.4, y: -1}
m_SizeDelta: {x: 70, y: 70}
m_SizeDelta: {x: 85, y: 85}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6155460562505848349
CanvasRenderer:
@ -2927,8 +2927,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: 13, y: -24}
m_SizeDelta: {x: 48, y: 28}
m_AnchoredPosition: {x: 23, y: -31}
m_SizeDelta: {x: 58, y: 38}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &148006940477409204
CanvasRenderer:
@ -3001,7 +3001,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: 0, y: -59.2}
m_AnchoredPosition: {x: 0, y: -64.000046}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9057421449727051825
@ -3222,7 +3222,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 60, y: 60}
m_SizeDelta: {x: 70, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2965847692438137990
CanvasRenderer:
@ -3342,7 +3342,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -56.5, y: -1}
m_SizeDelta: {x: 70, y: 70}
m_SizeDelta: {x: 85, y: 85}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6669675671607311579
CanvasRenderer:
@ -3417,7 +3417,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 60, y: 60}
m_SizeDelta: {x: 70, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1817447885196626512
CanvasRenderer:
@ -3707,7 +3707,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 92.7, y: -1}
m_SizeDelta: {x: 70, y: 70}
m_SizeDelta: {x: 85, y: 85}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4295345761131377981
CanvasRenderer:
@ -3813,10 +3813,10 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 20
m_FontSize: 28
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
@ -4008,7 +4008,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: 0, y: -59.2}
m_AnchoredPosition: {x: 0, y: -64}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6885250616833936565
@ -4090,7 +4090,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 60, y: 60}
m_SizeDelta: {x: 70, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1493813415071284517
CanvasRenderer:
@ -4243,7 +4243,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: 25, y: 25}
m_AnchoredPosition: {x: 38, y: 35}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6533681491035842026
@ -4392,8 +4392,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: 13, y: -24}
m_SizeDelta: {x: 48, y: 28}
m_AnchoredPosition: {x: 23, y: -31}
m_SizeDelta: {x: 58, y: 38}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4710708006811601622
CanvasRenderer:
@ -4499,10 +4499,10 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 20
m_FontSize: 28
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
@ -4579,10 +4579,10 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 20
m_FontSize: 28
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0

View File

@ -370,6 +370,7 @@ GameEvent = {
OnGuessDataUpdate = "TopMatch.OnGuessDataUpdate",
OnGuessRateUpdate = "TopMatch.OnGuessRateUpdate",
OnGuessDataUpdateShowTip = "TopMatch.OnGuessDataUpdateShowTip",
CommonInfoRefreshTitle = "TopMatch.CommonInfoRefreshTitle",
},
FindFairy={
RefreshRedPoint="FindFairy.RefreshRedPoint",

View File

@ -3,6 +3,7 @@ local this = ArenaTopMatchManager
this.CurTabIndex = 0
this.curIsShowDoGuessPopup = false
local isChange = false
this.panelType = 1
local stageNameTable = {
[1] = 32 .. Language[10089],--强
[2] = 16 .. Language[10089],--强
@ -218,13 +219,13 @@ end
-- 获取巅峰战基础信息
function this.GetBaseData()
this.ChangeData(this.CurTabIndex)
-- this.ChangeData(this.CurTabIndex)
return this.baseInfo
end
-- 获取对战信息
function this.GetBattleInfo()
this.ChangeData(this.CurTabIndex)
-- this.ChangeData(this.CurTabIndex)
return this.myBattleInfo
end
@ -371,7 +372,7 @@ end
--- 获取竞猜战斗信息
function this.GetBetBattleInfo()
this.ChangeData(this.CurTabIndex)
-- this.ChangeData(this.CurTabIndex)
return this.betBattleInfo
end
--- 获取赔率信息

View File

@ -162,10 +162,10 @@ end
--
function this.OpenView(index)
ArenaTopMatchManager.panelType = index
this._CurLogicIndex = index
ArenaTopMatchManager.SetCurTabIndex(index)
this._CurTabIndex = index
local logic = this.ViewLogicList[index]
if not logic then
this.ViewLogicList[index] = reimport(_ViewData[index].script)

View File

@ -134,6 +134,7 @@ function this.SetInfoData(panelType, blueData, redData, textType, showScore,batt
elseif this.panelType == 2 then
this.awaitText.transform.localPosition = Vector3.New(0,515,0)
end
Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.CommonInfoRefreshTitle)
end
-- 设置显隐
@ -196,9 +197,13 @@ function this.RefreshData(showScore, textType)
this.myScore.gameObject:SetActive(false)
end
-- this.textImg.sprite = Util.LoadSprite(imgRes[textType].resPath)
this.textImg.sprite = Util.LoadSprite(imgRes[textType].resPath)
this.textImg.gameObject.transform.localPosition = imgRes[textType].pos
this.textImg.gameObject.transform.sizeDelta = imgRes[textType].size
local imageTextType = textType
if ArenaTopMatchManager.GetIsBattleEndState(this.panelType) then
imageTextType = 1
end
this.textImg.sprite = Util.LoadSprite(imgRes[imageTextType].resPath)
this.textImg.gameObject.transform.localPosition = imgRes[imageTextType].pos
this.textImg.gameObject.transform.sizeDelta = imgRes[imageTextType].size
-- this.textImg:SetNativeSize()
-- 设置编队按钮状态

View File

@ -8,6 +8,8 @@ function ATM_Title:InitComponent(root)
this.matchName = Util.GetGameObject(this.stagePanel, "name"):GetComponent("Text")
this.freshTime = Util.GetGameObject(this.stagePanel, "time"):GetComponent("Text")
this.timeType = Util.GetGameObject(this.stagePanel, "timelab"):GetComponent("Text")
this.freshTimeGo = Util.GetGameObject(this.stagePanel, "time")
this.timeTypeGO = Util.GetGameObject(this.stagePanel, "timelab")
this.integralPanel = Util.GetGameObject(root.transform, "ImgIntegral")
this.score = Util.GetGameObject(this.integralPanel, "integral"):GetComponent("Text")
@ -37,11 +39,13 @@ end
--添加事件监听(用于子类重写)
function ATM_Title:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.TopMatch.OnTopMatchDataUpdate, this.RefreshBaseShow)
Game.GlobalEvent:AddEvent(GameEvent.TopMatch.CommonInfoRefreshTitle, this.RefreshBaseShow)
end
--移除事件监听(用于子类重写)
function ATM_Title:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.TopMatch.OnTopMatchDataUpdate, this.RefreshBaseShow)
Game.GlobalEvent:RemoveEvent(GameEvent.TopMatch.CommonInfoRefreshTitle, this.RefreshBaseShow)
end
@ -90,12 +94,12 @@ function this.RefreshBaseShow()
local tmData = ArenaTopMatchManager.GetBaseData()
local isJoin = tmData.joinState == 1
local titleName, stageName, stateName = ArenaTopMatchManager.GetCurTopMatchName()
-- this.freshTimeGo:SetActive(true)
-- this.timeTypeGO:SetActive(true)
-- if ArenaTopMatchManager.panelType <= 2 then
-- this.freshTimeGo:SetActive(not ArenaTopMatchManager.GetIsBattleEndState(ArenaTopMatchManager.panelType))
-- this.timeTypeGO:SetActive(not ArenaTopMatchManager.GetIsBattleEndState(ArenaTopMatchManager.panelType))
-- end
this.freshTimeGo:SetActive(true)
this.timeTypeGO:SetActive(true)
if ArenaTopMatchManager.panelType <= 2 then
this.freshTimeGo:SetActive(not ArenaTopMatchManager.GetIsBattleEndState(ArenaTopMatchManager.panelType))
this.timeTypeGO:SetActive(not ArenaTopMatchManager.GetIsBattleEndState(ArenaTopMatchManager.panelType))
end
if not isOpen then
if tmData.progress == -2 then
this.matchName.text = " "..titleName