多对塔修改
parent
b68b773060
commit
65f8ce53d1
|
|
@ -153,7 +153,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u514D\u8D39\u6B21\u6570:"
|
m_Text: "\u8D2D\u4E70\u6B21\u6570:"
|
||||||
--- !u!114 &1741733794
|
--- !u!114 &1741733794
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -68878,7 +68878,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 1, y: 0}
|
m_AnchorMin: {x: 1, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 0}
|
m_AnchorMax: {x: 1, y: 0}
|
||||||
m_AnchoredPosition: {x: 236.7, y: -10.5}
|
m_AnchoredPosition: {x: 236.69998, y: -10.5}
|
||||||
m_SizeDelta: {x: 327.4, y: 101.3}
|
m_SizeDelta: {x: 327.4, y: 101.3}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &7806638948486298780
|
--- !u!114 &7806638948486298780
|
||||||
|
|
@ -75304,31 +75304,6 @@ PrefabInstance:
|
||||||
propertyPath: m_LocalScale.y
|
propertyPath: m_LocalScale.y
|
||||||
value: 0.7
|
value: 0.7
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.x
|
|
||||||
value: 2.2999992
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 3.885
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_SizeDelta.x
|
|
||||||
value: 236
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_SizeDelta.y
|
|
||||||
value: 338.2
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 6890095432905919691, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Enabled
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Bones.Array.data[0]
|
propertyPath: m_Bones.Array.data[0]
|
||||||
|
|
@ -75439,6 +75414,31 @@ PrefabInstance:
|
||||||
propertyPath: m_RootBone
|
propertyPath: m_RootBone
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 6789526059838717039}
|
objectReference: {fileID: 6789526059838717039}
|
||||||
|
- target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 2.2999992
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 3.885
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_SizeDelta.x
|
||||||
|
value: 236
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_SizeDelta.y
|
||||||
|
value: 338.2
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6890095432905919691, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Enabled
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
|
||||||
--- !u!4 &3017694835917112368 stripped
|
--- !u!4 &3017694835917112368 stripped
|
||||||
|
|
@ -76064,31 +76064,6 @@ PrefabInstance:
|
||||||
propertyPath: m_LocalScale.y
|
propertyPath: m_LocalScale.y
|
||||||
value: 0.7
|
value: 0.7
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.x
|
|
||||||
value: -0.00050163
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_AnchoredPosition.y
|
|
||||||
value: 3.88
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_SizeDelta.x
|
|
||||||
value: 236
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_SizeDelta.y
|
|
||||||
value: 338.2
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 6890095432905919691, guid: e356d5948e4971f499cfe38db3551f59,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Enabled
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
|
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Bones.Array.data[0]
|
propertyPath: m_Bones.Array.data[0]
|
||||||
|
|
@ -76199,6 +76174,31 @@ PrefabInstance:
|
||||||
propertyPath: m_RootBone
|
propertyPath: m_RootBone
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 7472164165561955869}
|
objectReference: {fileID: 7472164165561955869}
|
||||||
|
- target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: -0.00050163
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 3.88
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_SizeDelta.x
|
||||||
|
value: 236
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5490285292067340312, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_SizeDelta.y
|
||||||
|
value: 338.2
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6890095432905919691, guid: e356d5948e4971f499cfe38db3551f59,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Enabled
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
|
||||||
--- !u!4 &6642132831306302100 stripped
|
--- !u!4 &6642132831306302100 stripped
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ function BattleFailPopup:InitComponent()
|
||||||
this.btnBattleBack = Util.GetGameObject(this.btnClose, "btnBattleBack")
|
this.btnBattleBack = Util.GetGameObject(this.btnClose, "btnBattleBack")
|
||||||
-- this.btnBattleBack:GetComponent("Image").sprite = this.spLoader:LoadSprite("s_silingshilian_huifanganniu_zh")
|
-- this.btnBattleBack:GetComponent("Image").sprite = this.spLoader:LoadSprite("s_silingshilian_huifanganniu_zh")
|
||||||
this.btnGrowUp = Util.GetGameObject(this.btnClose, "btnGrowUp")
|
this.btnGrowUp = Util.GetGameObject(this.btnClose, "btnGrowUp")
|
||||||
|
this.btnGrowUp:SetActive(false)
|
||||||
end
|
end
|
||||||
|
|
||||||
--绑定事件(用于子类重写)
|
--绑定事件(用于子类重写)
|
||||||
|
|
|
||||||
|
|
@ -264,8 +264,7 @@ function WorldArenaBattleInfoPanel:BindEvent()
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
-- 动画中不能再执行
|
|
||||||
state=2
|
|
||||||
if isAnim then
|
if isAnim then
|
||||||
LogError("正在播放动画")
|
LogError("正在播放动画")
|
||||||
return
|
return
|
||||||
|
|
@ -274,11 +273,24 @@ function WorldArenaBattleInfoPanel:BindEvent()
|
||||||
PopupTipPanel.ShowTip("编队为空,无法挑战")
|
PopupTipPanel.ShowTip("编队为空,无法挑战")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
local teamNum=0
|
||||||
|
if curType==1 then
|
||||||
|
teamNum=2
|
||||||
|
elseif curType==2 then
|
||||||
|
teamNum=3
|
||||||
|
end
|
||||||
|
for i=1,teamNum do
|
||||||
|
if not leftAllTeam[i] or #leftAllTeam[i]==0 then
|
||||||
|
PopupTipPanel.ShowTip("编队为空,无法挑战")
|
||||||
|
return
|
||||||
|
end
|
||||||
|
end
|
||||||
if isSame then
|
if isSame then
|
||||||
PopupTipPanel.ShowTip("检测到多个阵容使用相同英雄,无法开战")
|
PopupTipPanel.ShowTip("检测到多个阵容使用相同英雄,无法开战")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
-- 动画中不能再执行
|
||||||
|
state=2
|
||||||
floor=GodsWayTowerManager.GetTowerFloorByType(curType)
|
floor=GodsWayTowerManager.GetTowerFloorByType(curType)
|
||||||
NetManager.RequestDuoDuiChallenge(curType,floor+1,1,function(msg)
|
NetManager.RequestDuoDuiChallenge(curType,floor+1,1,function(msg)
|
||||||
resultList=msg.result
|
resultList=msg.result
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue