【七界试炼】战斗结束提交

dev_chengFeng
ZhangBiao 2021-09-10 18:36:39 +08:00
parent d6725f3320
commit 4eb8e566fe
7 changed files with 503 additions and 120 deletions

View File

@ -1279,6 +1279,85 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &398546227813404861
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4353242044045938866}
- component: {fileID: 2469963345403365470}
- component: {fileID: 8182882089433011108}
m_Layer: 5
m_Name: Text (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4353242044045938866
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 398546227813404861}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7931363699697377376}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 140, y: -80}
m_SizeDelta: {x: 280, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2469963345403365470
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 398546227813404861}
m_CullTransparentMesh: 0
--- !u!114 &8182882089433011108
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 398546227813404861}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 60
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u9635\u5BB9\u52A0\u6210: 45%\n\uFF083\u6761\uFF09"
--- !u!1 &423964185389460528
GameObject:
m_ObjectHideFlags: 0
@ -5376,6 +5455,7 @@ RectTransform:
- {fileID: 7688062164259211823}
- {fileID: 7790924946932124895}
- {fileID: 1820491450244357017}
- {fileID: 7931363699697377376}
- {fileID: 1609996456372680657}
m_Father: {fileID: 5744485977255746616}
m_RootOrder: 4
@ -8572,6 +8652,85 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &5280137189013959554
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5114714385197474922}
- component: {fileID: 1619564404937160144}
- component: {fileID: 5272998950290652192}
m_Layer: 5
m_Name: Text (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5114714385197474922
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5280137189013959554}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7931363699697377376}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 455, y: -80}
m_SizeDelta: {x: 280, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1619564404937160144
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5280137189013959554}
m_CullTransparentMesh: 0
--- !u!114 &5272998950290652192
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5280137189013959554}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 60
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u9057\u7269\u52A0\u6210: 45%\n\uFF083\u79CD\uFF09"
--- !u!1 &5286362474814992461
GameObject:
m_ObjectHideFlags: 0
@ -9910,6 +10069,78 @@ MonoBehaviour:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &5456725582626222625
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7931363699697377376}
- component: {fileID: 6501805168192935366}
- component: {fileID: 6407334048117848003}
m_Layer: 5
m_Name: qiJieInfo
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &7931363699697377376
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5456725582626222625}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 100}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4353242044045938866}
- {fileID: 5114714385197474922}
- {fileID: 1414186399449950369}
m_Father: {fileID: 6182422547957876774}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -100}
m_SizeDelta: {x: 910, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6501805168192935366
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5456725582626222625}
m_CullTransparentMesh: 0
--- !u!114 &6407334048117848003
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5456725582626222625}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 30
m_Bottom: 0
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 280, y: 100}
m_Spacing: {x: 35, y: 0}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!1 &5560773285675398196
GameObject:
m_ObjectHideFlags: 0
@ -10130,6 +10361,85 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5577906543759826041}
m_CullTransparentMesh: 0
--- !u!1 &5619497917716566031
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1414186399449950369}
- component: {fileID: 1083577264318959937}
- component: {fileID: 8413162804445151975}
m_Layer: 5
m_Name: Text (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1414186399449950369
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5619497917716566031}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7931363699697377376}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 770, y: -80}
m_SizeDelta: {x: 280, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1083577264318959937
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5619497917716566031}
m_CullTransparentMesh: 0
--- !u!114 &8413162804445151975
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5619497917716566031}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 60
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u56DE\u5408\u52A0\u6210: 45%\n\uFF085\u56DE\u5408\uFF09"
--- !u!1 &5651600672426435518
GameObject:
m_ObjectHideFlags: 0
@ -13574,7 +13884,7 @@ RectTransform:
m_Children:
- {fileID: 1037594439721301998}
m_Father: {fileID: 6182422547957876774}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@ -14202,26 +14512,6 @@ PrefabInstance:
propertyPath: m_Name
value: Fx_star_looping (2)
objectReference: {fileID: 0}
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.y
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.y
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 8592815991045299975, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalPosition.x
@ -14327,6 +14617,26 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.y
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.y
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 8727441500747869332, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
@ -14357,26 +14667,6 @@ PrefabInstance:
propertyPath: m_Name
value: Fx_star_looping (1)
objectReference: {fileID: 0}
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.y
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.y
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 8592815991045299975, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalPosition.x
@ -14482,6 +14772,26 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.y
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.y
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 8727441500747869332, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
@ -14512,26 +14822,6 @@ PrefabInstance:
propertyPath: m_Name
value: Fx_star_looping (3)
objectReference: {fileID: 0}
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.y
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.y
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 8592815991045299975, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalPosition.x
@ -14637,6 +14927,26 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 2633696800274351096, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.y
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 3949127358692396697, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.y
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 8727441500747869332, guid: f2a080c2754e7d04d88cb25748aae343,
type: 3}
propertyPath: m_LocalScale.x

View File

@ -2439,6 +2439,7 @@ BATTLE_TYPE = {
FIGHT_ASSISTANT_LEVEL = 21, --山河社稷图副关卡战斗
BACK_BATTLE = 1000, -- 系统战斗回放
EndlessMpaFight = 22, -- 无尽副本
QIJIE_FIGHT = 23, --七界试炼
}
--isRankingMainPanelShow_1 本服 _2 跨服 3_跨服不显示在排行主界面 4 用于十绝阵特殊判断 --0非跨服界面内排行榜(达人)
--本服排行

View File

@ -78,7 +78,23 @@ end
-- 开始战斗
function this.StartFight()
this.spLoader:Destroy()
PopupTipPanel.ShowTip("开始战斗")
if this.root.order>=1 then
--保存编队
FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList,
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
else
hadClick = false
PopupTipPanel.ShowTip(string.format(Language[10699], 1))
return
end
NetManager.SevenWorldChallengeRequest(this.nodeData.Id,function (msg)
this.root:ClosePanel()
local fightData = BattleManager.GetBattleServerData(msg)
QiJieShiLianManager.battleResult = msg
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.QIJIE_FIGHT)
end)
end
return this

View File

@ -5531,6 +5531,7 @@ end
--七界试炼请求界面信息
function NetManager.SevenWorldInfoRequest(_tierId,func)
local data = PlayerInfoProto_pb.SevenWorldInfoRequest()
data.tierId = _tierId
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.SevenWorldInfoRequest, MessageTypeProto_pb.SevenWorldInfoResponse, msg, function(buffer)
local data = buffer:DataByte()
@ -5546,6 +5547,7 @@ end
--七界试炼请求遗物信息
function NetManager.SevenWorldRelicRequest(_relicId,func)
local data = PlayerInfoProto_pb.SevenWorldRelicRequest()
data.relicId = _relicId
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.SevenWorldRelicRequest, MessageTypeProto_pb.SevenWorldRelicResponse, msg, function(buffer)
local data = buffer:DataByte()
@ -5561,6 +5563,7 @@ end
--七界试炼请求战斗
function NetManager.SevenWorldChallengeRequest(_tierId,func)
local data = PlayerInfoProto_pb.SevenWorldChallengeRequest()
data.tierId = _tierId
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.SevenWorldChallengeRequest, MessageTypeProto_pb.SevenWorldChallengeResponse, msg, function(buffer)
local data = buffer:DataByte()

View File

@ -45,28 +45,7 @@ function BattleWinPopup:NextStep()
return
end
if m_fightType == BATTLE_TYPE.MAP_FIGHT then --副本战斗结算
-- m_battlePanel:ClosePanel()
-- self:ClosePanel()
--UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function() m_battlePanel:ClosePanel() self:ClosePanel() end, 1, true)
local bestData, allDamage= BattleRecordManager.GetBattleBestData()
FightPointPassManager.oldLevel = PlayerManager.level
if bestData then
UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId, bestData.skinId,bestData.damage, allDamage, function(_BattleBestPopup)
-- 打开关卡奖励界面
UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function()
if _BattleBestPopup then
_BattleBestPopup:ClosePanel()
end
if m_battlePanel then
m_battlePanel:ClosePanel()
end
self:ClosePanel()
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold)
end, 0, true, true)
end)
end
-- end)
this.ShowBattleResultByMapFight()
elseif m_fightType == BATTLE_TYPE.ELITE_MONSTER then --限时怪战斗结算
UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function() m_battlePanel:ClosePanel() self:ClosePanel() end, 1, true)
elseif m_fightType == BATTLE_TYPE.MONSTER_CAMP then -- 兽潮来袭
@ -87,24 +66,10 @@ function BattleWinPopup:NextStep()
this.ShowBattleResultByFightLevelAssistantType(m_battleResult.drop)
elseif m_fightType == BATTLE_TYPE.JumpServerhightLadder then -- 跨服天梯的战斗
this.JumpServerHithtLadder()
elseif m_fightType == BATTLE_TYPE.EndlessMpaFight then
local bestData, allDamage= BattleRecordManager.GetBattleBestData()
FightPointPassManager.oldLevel = PlayerManager.level
if bestData then
UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId, bestData.skinId,bestData.damage, allDamage, function(_BattleBestPopup)
-- 打开关卡奖励界面
UIManager.OpenPanel(UIName.RewardItemPopup, EndLessMapManager.EndlessDrop, 1,function()
if _BattleBestPopup then
_BattleBestPopup:ClosePanel()
end
if m_battlePanel then
m_battlePanel:ClosePanel()
end
self:ClosePanel()
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold)
end,0, true, true)
end)
end
elseif m_fightType == BATTLE_TYPE.EndlessMpaFight then--无尽地图战斗
this.ShowBattleResultByEndless()
elseif m_fightType == BATTLE_TYPE.EndlessMpaFight then--七界试炼战斗
this.ShowBattleResultByQiJie()
--新回放功能
elseif m_fightType == BATTLE_TYPE.BACK_BATTLE then
if BattleManager.GetLastBattleType() == BATTLE_TYPE.STORY_FIGHT then-- 新关卡战斗
@ -127,6 +92,80 @@ function BattleWinPopup:NextStep()
end
end
end
--副本战斗结算
function this.ShowBattleResultByMapFight()
local bestData, allDamage= BattleRecordManager.GetBattleBestData()
FightPointPassManager.oldLevel = PlayerManager.level
if bestData then
UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId, bestData.skinId,bestData.damage, allDamage, function(_BattleBestPopup)
-- 打开关卡奖励界面
UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function()
if _BattleBestPopup then
_BattleBestPopup:ClosePanel()
end
if m_battlePanel then
m_battlePanel:ClosePanel()
end
self:ClosePanel()
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold)
end, 0, true, true)
end)
end
end
--七界试炼战斗界面特殊显示
function this.ShowBattleResultByQiJie()
local bestData, allDamage= BattleRecordManager.GetBattleBestData()
-- QiJieShiLianManager.battleResult = m_battleResult
if bestData then
-- 胜利显示本场比赛的表现最好的英雄
UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId,bestData.skinId, bestData.damage, allDamage, function(_BattleBestPopup)
-- 打开关卡奖励界面
UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function(isBackBattle)
if not isBackBattle then
if _BattleBestPopup then
_BattleBestPopup:ClosePanel()
end
if m_battlePanel then
m_battlePanel:ClosePanel()
end
this:ClosePanel()
end
end, 10, true, true)
end)
else
-- 打开关卡奖励界面
UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function()
if m_battlePanel then
m_battlePanel:ClosePanel()
end
this:ClosePanel()
end, 10, true)
end
end
--无尽副本战斗界面特殊显示
function this.ShowBattleResultByEndless()
local bestData, allDamage= BattleRecordManager.GetBattleBestData()
FightPointPassManager.oldLevel = PlayerManager.level
if bestData then
UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId, bestData.skinId,bestData.damage, allDamage, function(_BattleBestPopup)
-- 打开关卡奖励界面
UIManager.OpenPanel(UIName.RewardItemPopup, EndLessMapManager.EndlessDrop, 1,function()
if _BattleBestPopup then
_BattleBestPopup:ClosePanel()
end
if m_battlePanel then
m_battlePanel:ClosePanel()
end
self:ClosePanel()
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold)
end,0, true, true)
end)
end
end
-- 兽潮来袭结算界面特殊显示
function this.ShowBattleResultByMonsterCamp(drop)
local bestData, allDamage= BattleRecordManager.GetBattleBestData()
@ -154,23 +193,6 @@ function this.ShowBattleResultByMonsterCamp(drop)
end)
end
-- if m_battlePanel then
-- m_battlePanel:ClosePanel()
-- end
-- this:ClosePanel()
-- if m_backPanel then
-- UIManager.OpenPanel(m_backPanel)
-- end
-- UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1,function(isBackBattle)--isBackBattle true时 为回放不走回调
-- LogPink("isBackBattle "..tostring(isBackBattle))
-- if not isBackBattle then
-- if m_callBack then m_callBack() end
-- --内容优化 心魔试炼推送
-- Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSend,FacePanelType.MonsterWave)
-- end
-- end, nil, not m_notShowRecord)
end
-- 新关卡战斗结算界面特殊显示
function this.ShowBattleResultByStoryFight(drop)
@ -380,10 +402,11 @@ function this.ShowBattleResultByFightLevelAssistantType(drop)
end
end, 9,true,true)
end
end)
end
end
--跨服天梯
function this.JumpServerHithtLadder()
local bestData, allDamage= BattleRecordManager.GetBattleBestData()
if bestData then

View File

@ -90,6 +90,8 @@ function RewardItemPopup:InitComponent()
starListEffect[i] = Util.GetGameObject(this.FightLevel3, "isFirst/Fx_star_looping (" .. i ..")")
end
this.isFirstEffect = Util.GetGameObject(this.FightLevel3,"isFirst")
--七界试炼挑战条件信息
this.qiJieCondition = Util.GetGameObject(self.gameObject, "ScrollView/Content/bottom/qiJieInfo")
end
--绑定事件(用于子类重写)
@ -163,6 +165,7 @@ function RewardItemPopup:OnOpen(...)
this.FightLevel3:SetActive(compShowType == 8)--山河社稷图
this.FightLevel2:SetActive(compShowType == 8 and (not drop or (#drop.itemlist < 1 and #drop.equipId < 1 and #drop.Hero < 1 and #drop.soulEquip < 1 and #drop.pokemon < 1)))--山河社稷图
this.FightLevelAssistant:SetActive(compShowType == 9)--山河社稷图
this.qiJieCondition:SetActive(compShowType == 10)--七界试炼
this.dropGrid:SetActive(false)
this.dropGridArena:SetActive(false)
-- 设置背景遮罩的显隐
@ -181,6 +184,8 @@ function RewardItemPopup:OnOpen(...)
this.TaSuiLingXiaoShow()
elseif compShowType == 8 then--山河社稷图
this.FightLevelShow()
elseif compShowType == 10 then--七界试炼
this.QiJieShow()
end
--如果没有掉落就return
if not drop or (#drop.itemlist < 1 and #drop.equipId < 1 and #drop.Hero < 1 and #drop.soulEquip < 1 and #drop.pokemon < 1) then
@ -358,6 +363,15 @@ function this.GuildTranscriptShow()
this.guildTranscript_CurScore.text = GuildTranscriptManager.damage
end
end
--七界试炼挑战条件信息
function this.QiJieShow()
local data = QiJieShiLianManager.GetBattleResult()
for i = 1, 3 do
Util.GetGameObject(this.qiJieCondition,"Text ("..i..")"):GetComponent("Text").text = data[i]
end
end
--当前背包是否已满
function RewardItemPopup:SelectCanPopUpBagMaxMessage()
if(IndicationManager.canPopUpBagMaxMessage) then

View File

@ -17,6 +17,7 @@ function this.Initialize()
this.treasureList = {}
this.InitTreasureData()
this.battleResult = {}
end
function this.InitTreasureData()
@ -180,4 +181,19 @@ function this.FormatTreasureData(_tabNum)
return dataList
end
function this.GetBattleResult()
local config = QijieStage[this.curLevelId]
local data = {}
data[1] = string.format( "阵容加成: %s%\n(%s条)",(#this.battleResult.teamBuffIds)*(config.Addition[2]/100),#this.battleResult.teamBuffIds)
data[2] = string.format( "遗物加成: %s%\n(%s条)",(#this.battleResult.relicIds)*10,#this.battleResult.relicIds)
local bonue = config.RoundReward[1][2]
for i = 1, #config.RoundReward do
if this.battleResult.round > config.RoundReward[i][1] then
bonue = config.RoundReward[i][2]
end
end
data[3] = string.format( "回合加成: %s%\n(%s条)",bonue/100,this.battleResult.round)
return data
end
return QiJieShiLianManager