【七界试炼】提交
parent
fc03b71b84
commit
016f0159e5
|
@ -10881,7 +10881,7 @@ MonoBehaviour:
|
||||||
m_Top: 0
|
m_Top: 0
|
||||||
m_Bottom: 0
|
m_Bottom: 0
|
||||||
m_ChildAlignment: 4
|
m_ChildAlignment: 4
|
||||||
m_Spacing: 0
|
m_Spacing: -13
|
||||||
m_ChildForceExpandWidth: 0
|
m_ChildForceExpandWidth: 0
|
||||||
m_ChildForceExpandHeight: 1
|
m_ChildForceExpandHeight: 1
|
||||||
m_ChildControlWidth: 0
|
m_ChildControlWidth: 0
|
||||||
|
|
|
@ -9025,8 +9025,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 40, y: -25}
|
m_AnchoredPosition: {x: 32.5, y: -25}
|
||||||
m_SizeDelta: {x: 80, y: 100}
|
m_SizeDelta: {x: 65, y: 80}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &7558685581109309511
|
--- !u!222 &7558685581109309511
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -23517,7 +23517,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: -160.2}
|
m_AnchoredPosition: {x: 0, y: -160.2}
|
||||||
m_SizeDelta: {x: 241, y: 50}
|
m_SizeDelta: {x: 188, y: 50}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1738108596221402211
|
--- !u!222 &1738108596221402211
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -33402,8 +33402,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 160.5, y: -25}
|
m_AnchoredPosition: {x: 126.5, y: -25}
|
||||||
m_SizeDelta: {x: 161, y: 64.41}
|
m_SizeDelta: {x: 123, y: 64.41}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1690593810971012593
|
--- !u!222 &1690593810971012593
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -33435,10 +33435,10 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 45
|
m_FontSize: 35
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 4
|
m_MinSize: 0
|
||||||
m_MaxSize: 50
|
m_MaxSize: 50
|
||||||
m_Alignment: 4
|
m_Alignment: 4
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
|
|
|
@ -1113,6 +1113,7 @@ JumpType = {
|
||||||
firstRecharge = 30001,
|
firstRecharge = 30001,
|
||||||
ZhiZunJiangShi = 30002,
|
ZhiZunJiangShi = 30002,
|
||||||
SurpriseBox = 40001,--惊喜礼盒
|
SurpriseBox = 40001,--惊喜礼盒
|
||||||
|
QiJieShiLian = 40026,--七界试炼
|
||||||
|
|
||||||
linglongShangShi = 20005,
|
linglongShangShi = 20005,
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@ local this = GeneralTreasureMangaer
|
||||||
|
|
||||||
function this.Initialize()
|
function this.Initialize()
|
||||||
this.TreasureList = {
|
this.TreasureList = {
|
||||||
[ActivityTypeDef.QiJieTreasure] = {ActId = 0,endTime = 0,dataList = {},configName = ConfigName.QijieTreasure,itemId = 1240},
|
[ActivityTypeDef.QiJieTreasure] = {ActId = 0,endTime = 0,dataList = {},configName = ConfigName.QijieTreasure,itemId = 1242},
|
||||||
}
|
}
|
||||||
this.InitConfigData()
|
this.InitConfigData()
|
||||||
end
|
end
|
||||||
|
|
|
@ -776,6 +776,15 @@ local jumpDic = {
|
||||||
[JumpType.linglongShangShi] = function(data)
|
[JumpType.linglongShangShi] = function(data)
|
||||||
this.JumpActivity(JumpType.linglongShangShi,data[1])
|
this.JumpActivity(JumpType.linglongShangShi,data[1])
|
||||||
end,
|
end,
|
||||||
|
[JumpType.QiJieShiLian] = function(data)
|
||||||
|
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.QIJIESHILIAN) then
|
||||||
|
UIManager.OpenPanel(UIName.QiJieShiLianPanel)
|
||||||
|
else
|
||||||
|
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.QIJIESHILIAN))
|
||||||
|
this.isOpen = false
|
||||||
|
return
|
||||||
|
end
|
||||||
|
end,
|
||||||
}
|
}
|
||||||
|
|
||||||
function this.JumpActivity(data,skipfactor)
|
function this.JumpActivity(data,skipfactor)
|
||||||
|
|
|
@ -356,7 +356,7 @@ function this.AddPlayerInfoClick(root,uid,serverName)
|
||||||
elseif sData.rankType == RANK_TYPE.WORLDARENA then
|
elseif sData.rankType == RANK_TYPE.WORLDARENA then
|
||||||
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, uid,2)
|
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, uid,2)
|
||||||
elseif sData.rankType == RANK_TYPE.QIJIESHILIAN_RANK then--七界试炼
|
elseif sData.rankType == RANK_TYPE.QIJIESHILIAN_RANK then--七界试炼
|
||||||
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.QIJIESHILIAN,serverName and serverName or nil)
|
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.NORMAL,serverName and serverName or nil)
|
||||||
else
|
else
|
||||||
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid)
|
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue