Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
65794931b3
|
@ -129,7 +129,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
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: -209.615, y: 71.95}
|
m_AnchoredPosition: {x: -199.25002, y: 71.95}
|
||||||
m_SizeDelta: {x: 0, y: 144}
|
m_SizeDelta: {x: 0, y: 144}
|
||||||
m_Pivot: {x: 0, y: 1.0000001}
|
m_Pivot: {x: 0, y: 1.0000001}
|
||||||
--- !u!114 &8585533787268794185
|
--- !u!114 &8585533787268794185
|
||||||
|
@ -159,7 +159,7 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Padding:
|
m_Padding:
|
||||||
m_Left: 27
|
m_Left: 3
|
||||||
m_Right: 0
|
m_Right: 0
|
||||||
m_Top: 0
|
m_Top: 0
|
||||||
m_Bottom: 0
|
m_Bottom: 0
|
||||||
|
@ -15432,8 +15432,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
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: 48.62, y: -0.049988}
|
m_AnchoredPosition: {x: 59, y: -0.049988}
|
||||||
m_SizeDelta: {x: 419.23, y: 144.1}
|
m_SizeDelta: {x: 398.5, y: 144.1}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &2850623819429736862
|
--- !u!114 &2850623819429736862
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
|
|
@ -1042,6 +1042,8 @@ JumpType = {
|
||||||
SheJiDaDianShangDian = 20060, --社稷大典商店
|
SheJiDaDianShangDian = 20060, --社稷大典商店
|
||||||
XinJiangLaiXiShangDian = 20200, --社稷大典商店
|
XinJiangLaiXiShangDian = 20200, --社稷大典商店
|
||||||
XingChenShangDian = 20059, --星辰商店
|
XingChenShangDian = 20059, --星辰商店
|
||||||
|
|
||||||
|
ChaoFanRuSheng = 20061,
|
||||||
}
|
}
|
||||||
|
|
||||||
NPCPosType={
|
NPCPosType={
|
||||||
|
|
|
@ -242,13 +242,13 @@ function BuffManager:ClearBuff(target, func)
|
||||||
while idx <= list.size do
|
while idx <= list.size do
|
||||||
local buff = list.buffer[idx]
|
local buff = list.buffer[idx]
|
||||||
if buff.target == target and (not func or (func and buff.clear and func(buff))) then
|
if buff.target == target and (not func or (func and buff.clear and func(buff))) then
|
||||||
if func and func(buff) then
|
-- if func and func(buff) then
|
||||||
if buff.type== BuffName.Shield then
|
if buff.type== BuffName.Shield then
|
||||||
buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.Shield)
|
buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.Shield)
|
||||||
elseif buff.type== BuffName.DOT or buff.type==BuffName.Control or buff.type==BuffName.Immune then
|
elseif buff.type== BuffName.DOT or buff.type==BuffName.Control then
|
||||||
buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.clear)
|
buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.clear)
|
||||||
end
|
end
|
||||||
end
|
-- end
|
||||||
buff:OnEnd()
|
buff:OnEnd()
|
||||||
buff.target.Event:DispatchEvent(BattleEventName.BuffEnd, buff)
|
buff.target.Event:DispatchEvent(BattleEventName.BuffEnd, buff)
|
||||||
putBuff(buff)
|
putBuff(buff)
|
||||||
|
|
|
@ -5708,7 +5708,7 @@ local passivityList = {
|
||||||
BattleUtil.RandomAction(pro, function()
|
BattleUtil.RandomAction(pro, function()
|
||||||
BattleLogic.BuffMgr:ClearBuff(defRole, function(buff)
|
BattleLogic.BuffMgr:ClearBuff(defRole, function(buff)
|
||||||
if buff.type == BuffName.Immune and (buff.immuneType == 4 or buff.immuneType == 2) then
|
if buff.type == BuffName.Immune and (buff.immuneType == 4 or buff.immuneType == 2) then
|
||||||
-- buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.clear)
|
buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.clear)
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
|
|
|
@ -286,6 +286,12 @@ end
|
||||||
|
|
||||||
--界面关闭时调用(用于子类重写)
|
--界面关闭时调用(用于子类重写)
|
||||||
function ActivityMainPanel:OnClose()
|
function ActivityMainPanel:OnClose()
|
||||||
|
if UIManager.IsOpen(UIName.RewardItemSingleShowPopup) then
|
||||||
|
UIManager.ClosePanel(UIName.RewardItemSingleShowPopup)
|
||||||
|
end
|
||||||
|
if UIManager.IsOpen(UIName.HelpPopup) then
|
||||||
|
UIManager.ClosePanel(UIName.HelpPopup)
|
||||||
|
end
|
||||||
--清除红点
|
--清除红点
|
||||||
for k,v in pairs(redPointTypeList) do
|
for k,v in pairs(redPointTypeList) do
|
||||||
ClearRedPointObject(k,v)
|
ClearRedPointObject(k,v)
|
||||||
|
|
|
@ -785,6 +785,9 @@ function EndLessMapView:OnClose()
|
||||||
if UIManager.IsOpen(UIName.HelpPopup) then
|
if UIManager.IsOpen(UIName.HelpPopup) then
|
||||||
UIManager.ClosePanel(UIName.HelpPopup)
|
UIManager.ClosePanel(UIName.HelpPopup)
|
||||||
end
|
end
|
||||||
|
if UIManager.IsOpen(UIName.ShowEnemyInfoPanel) then
|
||||||
|
UIManager.ClosePanel(UIName.ShowEnemyInfoPanel)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function EndLessMapView:OnDestroy()
|
function EndLessMapView:OnDestroy()
|
||||||
|
|
|
@ -666,6 +666,9 @@ local jumpDic = {
|
||||||
[JumpType.EndlessXingDongliBuy] = function(data)
|
[JumpType.EndlessXingDongliBuy] = function(data)
|
||||||
UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = 1 })
|
UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = 1 })
|
||||||
end,
|
end,
|
||||||
|
[JumpType.ChaoFanRuSheng] = function(data)
|
||||||
|
this.JumpActivity(ActivityTypeDef.ChaoFanRuSheng,data[1])
|
||||||
|
end,
|
||||||
}
|
}
|
||||||
|
|
||||||
function this.JumpActivity(data,skipfactor)
|
function this.JumpActivity(data,skipfactor)
|
||||||
|
|
Loading…
Reference in New Issue