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/BattleField.cs | 70 +++++++----------------------------
1 files changed, 14 insertions(+), 56 deletions(-)
diff --git a/Main/System/Battle/BattleField/BattleField.cs b/Main/System/Battle/BattleField/BattleField.cs
index da5622d..bb0f762 100644
--- a/Main/System/Battle/BattleField/BattleField.cs
+++ b/Main/System/Battle/BattleField/BattleField.cs
@@ -3,7 +3,7 @@
using System;
using LitJson;
using DG.Tweening;
-using Codice.Client.BaseCommands;
+
public class BattleField
{
@@ -452,18 +452,25 @@
}
}
+ //鍚勪釜鎴樺満娌℃湁鍦烘櫙姒傚康锛屼笖鍙互鍏卞瓨锛屽悓鏃跺瓨鍦ㄦ垬鍦哄拰缁撶畻鐨勬儏鍐�
+ //鍐呴儴缁撶畻闇�瑕佸鐞嗙殑閫昏緫锛屼笉鍚玌I
protected virtual void OnSettlement(JsonData turnFightStateData)
{
}
+ //UI缁撶畻鍚庡洖璋冮渶瑕佸鐞嗙殑閫昏緫
+ public virtual void WhaleFall()
+ {
+ Destroy();
+ }
public virtual void OnBattleEnd(JsonData turnFightStateData)
{
BattleEndAction battleEndAction = new BattleEndAction(this, turnFightStateData, () =>
{
BattleDebug.LogError(turnFightStateData.ToJson());
- // 杩欓噷鍙互娣诲姞鎴樻枟缁撴潫鐨勫叿浣撻�昏緫
+ // 鎴樺満鑷韩鐨勭粨鏉熼�昏緫锛屼笉鍚粨绠楃瓑澶栭儴閫昏緫
OnSettlement(turnFightStateData);
int winFaction = (int)turnFightStateData["winFaction"];
@@ -482,63 +489,14 @@
IsBattleFinish = true;
-
- //鎻愪緵澶栭儴 鑳滃埄绛夊鍔辨樉绀�
- EventBroadcast.Instance.Broadcast<string, JsonData>(EventName.BATTLE_END, guid, turnFightStateData);
-
+ //鎻愪緵澶栭儴 鑳滃埄绛夊鍔辨樉绀�
+ if (guid != "")
+ EventBroadcast.Instance.Broadcast<string, JsonData>(EventName.BATTLE_END, guid, turnFightStateData);
+
+
});
recordPlayer.PlayRecord(battleEndAction);
- // 澶勭悊鎴樻枟缁撴潫閫昏緫
- // IsBattleFinish = true;
- // 缁撶畻閫昏緫
-
- // {
- // "itemInfo": [],
- // "winFaction": 1,//鑾疯儨闃佃惀: 涓�鑸负1鎴栬��2锛屽綋鐜╁鍙戣捣鐨勬垬鏂楁椂锛屽鏋滆幏鑳滈樀钀ヤ笉绛変簬1浠ｈ〃鐜╁澶辫触浜�
- // "statInfo": {
- // "1": {
- // "1": {
- // "5": {
- // "NPCID": 0,
- // "DefHurt": 633,
- // "CureHP": 0,
- // "AtkHurt": 169247,
- // "ObjID": 1,
- // "HeroID": 510006
- // }
- // }
- // },
- // "2": {
- // "1": {
- // "2": {
- // "NPCID": 10101001,
- // "DefHurt": 169246,
- // "CureHP": 143096,
- // "AtkHurt": 999952,
- // "ObjID": 2,
- // "HeroID": 0
- // },
- // "4": {
- // "NPCID": 10101001,
- // "DefHurt": 0,
- // "CureHP": 0,
- // "AtkHurt": 0,
- // "ObjID": 3,
- // "HeroID": 0
- // },
- // "6": {
- // "NPCID": 10101001,
- // "DefHurt": 1,
- // "CureHP": 0,
- // "AtkHurt": 0,
- // "ObjID": 4,
- // "HeroID": 0
- // }
- // }
- // }
- // }
- // }
}
public virtual void HaveRest()
--
Gitblit v1.8.0