From 871594462e82d6bc1341918d39e11ab036d59563 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 18 九月 2025 19:26:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Battle/BattleField/StoryBossBattleField.cs | 38 ++------------------------------------
1 files changed, 2 insertions(+), 36 deletions(-)
diff --git a/Main/System/Battle/BattleField/StoryBossBattleField.cs b/Main/System/Battle/BattleField/StoryBossBattleField.cs
index 4719ed4..637590d 100644
--- a/Main/System/Battle/BattleField/StoryBossBattleField.cs
+++ b/Main/System/Battle/BattleField/StoryBossBattleField.cs
@@ -77,50 +77,16 @@
protected override void OnSettlement(JsonData turnFightStateData)
{
base.OnSettlement(turnFightStateData);
-
-
}
- private void WhaleFall()
+ public override void WhaleFall()
{
- // YYL TODO 搴旇闇�瑕佷竴涓粨绠楃晫闈㈡潵鍋氳繖浜涘唴瀹�
UIManager.Instance.CloseWindow<FullScreenBattleWin>();
AutoFightModel.Instance.isPause = false;
Destroy();
}
- public override void OnBattleEnd(JsonData turnFightStateData)
- {
- BattleEndAction battleEndAction = new BattleEndAction(this, turnFightStateData, () =>
- {
- BattleDebug.LogError(turnFightStateData.ToJson());
- // 杩欓噷鍙互娣诲姞鎴樻枟缁撴潫鐨勫叿浣撻�昏緫
- OnSettlement(turnFightStateData);
-
- int winFaction = (int)turnFightStateData["winFaction"];
- //鑾疯儨闃佃惀: 涓�鑸负1鎴栬��2锛屽綋鐜╁鍙戣捣鐨勬垬鏂楁椂锛屽鏋滆幏鑳滈樀钀ヤ笉绛変簬1浠ｈ〃鐜╁澶辫触浜�
-
- if (winFaction == 1)
- {
- Debug.LogError(guid + " : 鎴樻枟鑳滃埄");
- // 鎴樻枟鑳滃埄
- }
- else
- {
- // 鎴樻枟澶辫触
- Debug.LogError(guid + " : 鎴樻枟澶辫触");
- }
-
- IsBattleFinish = true;
-
-
- //鎻愪緵澶栭儴 鑳滃埄绛夊鍔辨樉绀�
- EventBroadcast.Instance.Broadcast<string, JsonData>(EventName.BATTLE_END, guid, turnFightStateData);
- WhaleFall();
-
- });
- recordPlayer.PlayRecord(battleEndAction);
- }
+
public override void HaveRest()
{
--
Gitblit v1.8.0