增加扫荡体力校验

2024-09-29 14:38:21 +08:00 · 2024-09-29 14:38:21 +08:00 · 5e046fb33b
parent c9c83f9021
commit 5e046fb33b
11 changed files with 447 additions and 57 deletions
--- a/ProjectNLD/Assets/Art/UI/Fonts/SourceHanSansCN-Medium
+++ b/ProjectNLD/Assets/Art/UI/Fonts/SourceHanSansCN-Medium
--- a/ProjectNLD/Assets/Art/UI/Prefab/LevelSelect/UI_LevelDetail.prefab
+++ b/ProjectNLD/Assets/Art/UI/Prefab/LevelSelect/UI_LevelDetail.prefab
@ -6908,7 +6908,6 @@ GameObject:
  - component: {fileID: 4669421599876269449}
  - component: {fileID: 1186632043427858221}
  - component: {fileID: 6559928075005564977}
-  - component: {fileID: 7181289461838924674}
  m_Layer: 5
  m_Name: Text_StartFight
  m_TagString: Untagged
@ -7033,19 +7032,6 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_baseMaterial: {fileID: 0}
  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &7181289461838924674
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2770898699989442530}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4545b363802045e3a540e37e426a5df3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  text_key: BeforeFight_StartFight
 --- !u!1 &2802060713113826978
 GameObject:
  m_ObjectHideFlags: 0
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideManager.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideManager.cs
@ -133,7 +133,7 @@ namespace Gameplay.Guide
            }

            NetHelper.SaveGuideProgress((uint)curGroup.CurStep.Cfg.Id); // 完成引导步骤,保存服务器
-            DebugUtil.Log($"<color=#00FA9A>完成引导步骤，服务器保存引导id:{curGroup.GroupId}</color>");
+            DebugUtil.Log($"<color=#00FA9A>完成引导步骤，服务器保存引导id:{curGroup.CurStep.Cfg.Id}</color>");

            if (curGroup.IsComplete)
            {
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Energy/EnergyManager.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Energy/EnergyManager.cs
@ -237,6 +237,18 @@ public class EnergyManager : Singlenton<EnergyManager>
        return nowEnergy >= requireEnergy;
    }

+    /// <summary>
+    /// 获取最大战斗次数
+    /// </summary>
+    /// <param name="oneEnergy">一次战斗所需的体力</param>
+    /// <returns></returns>
+    public int GetMaxFightCount(int oneEnergy)
+    {
+        int nowEnergy = (int)GetNowEnergy();
+
+        return nowEnergy / oneEnergy;
+    }
+
    /// <summary>
    /// 兑换体力
    /// </summary>
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/SelectLevel/UI_LevelDetailController.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/SelectLevel/UI_LevelDetailController.cs
@ -684,8 +684,19 @@ public class UI_LevelDetailController : UIWindow
        /// </summary>
        private void OnPlus()
        {
-            if (SweepCount < levelInfo.Cfg.MaxSweepingNumbert)
-                ++SweepCount;
+            if (SweepCount >= levelInfo.Cfg.MaxSweepingNumbert)
+            {
+                UITipsManager.ShowTips("达到最大扫荡次数"); // ToDO 本地化
+                return;
+            }
+
+            if (!CommonUtils.CheckEnergy(levelInfo.Cfg, SweepCount + 1))
+            {
+                UITipsManager.ShowTips("体力不足"); // ToDO 本地化
+                return;
+            }
+
+            ++SweepCount;
        }

        /// <summary>
@ -710,7 +721,16 @@ public class UI_LevelDetailController : UIWindow
        /// </summary>
        private void OnMax()
        {
-            SweepCount = levelInfo.Cfg.MaxSweepingNumbert;
+            int count = CommonUtils.GetEnergyFightCount(levelInfo.Cfg);
+            if (SweepCount == count)
+                return;
+
+            if (count <= 0)
+            {
+                SweepCount = 1;
+            }
+
+            SweepCount = count;
        }

        /// <summary>
@ -810,6 +830,10 @@ public class UI_LevelDetailController : UIWindow
    /// </summary>
    private TMP_Text textPhysicalNum;
    /// <summary>
+    /// 战斗按钮文本
+    /// </summary>
+    private TMP_Text textStartFight;
+    /// <summary>
    /// Buff根节点
    /// </summary>
    private GameObject goBuff;
@ -882,6 +906,7 @@ public class UI_LevelDetailController : UIWindow
        textLevelName = GetComponent<TMP_Text>("ImageBG/Text_LevelName");
        textPhysicalNum = GetComponent<TMP_Text>("ImageBG/ButtonStartFight/Image_physicalBG/Text_PhysicalNum");
        textBuff = GetComponent<TMP_Text>("ImageBG/Image_Buff/Text_Buff");
+        textStartFight = GetComponent<TMP_Text>("ImageBG/ButtonStartFight/Text_StartFight");
        goBuff = FindObj("ImageBG/Image_Buff");

        UIButtonEx buttonExDayOrNight = imageDayOrNight.GetComponent<UIButtonEx>();
@ -1018,9 +1043,9 @@ public class UI_LevelDetailController : UIWindow
    {
        this.isSweep = isSweep;

-
        if (this.isSweep)
        {
+            textStartFight.text = CommonUtils.GetLocalizeText("BeforeFight_StartSweep"); // 准备扫荡
            this.sweepCount = sweepCount;
            if (null != curLevelInfo && curLevelInfo.Cfg.CostItems.Count > 0)
                textPhysicalNum.text = (curLevelInfo.Cfg.CostItems[0].Count * this.sweepCount).ToString();
@ -1029,6 +1054,7 @@ public class UI_LevelDetailController : UIWindow
        }
        else
        {
+            textStartFight.text = CommonUtils.GetLocalizeText("BeforeFight_StartFight"); // 准备战斗
            if (null != curLevelInfo && curLevelInfo.Cfg.CostItems.Count > 0)
                textPhysicalNum.text = curLevelInfo.Cfg.CostItems[0].Count.ToString();
            else
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Utils/CommonUtils.Item.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Utils/CommonUtils.Item.cs
@ -164,5 +164,20 @@ namespace Gameplay

            return EnergyManager.Instance.EnergyCheck(costEnergy);
        }
+
+        /// <summary>
+        /// 获取体力最大战斗次数
+        /// </summary>
+        /// <returns></returns>
+        public static int GetEnergyFightCount(DataLevel dataLevel)
+        {
+            if (dataLevel.CostItems.Count <= 0)
+            {
+                DebugUtil.LogError($"关卡消耗配置错误，关卡id:{dataLevel.Id}");
+                return 0;
+            }
+
+            return EnergyManager.Instance.GetMaxFightCount(dataLevel.CostItems[0].Count);
+        }
    }
 }
--- a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/VehicleCfg/DataVehicle.cs
+++ b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/VehicleCfg/DataVehicle.cs
@ -174,7 +174,7 @@ public sealed partial class DataVehicle :  Bright.Config.BeanBase
    /// </summary>
    public int PerShootCount { get; private set; }
    /// <summary>
-    /// 武器Id
+    /// 炮台Id
    /// </summary>
    public int WeaponId { get; private set; }
    /// <summary>
--- a/ProjectNLD/Assets/Config/Data/actorcfg_item.json
+++ b/ProjectNLD/Assets/Config/Data/actorcfg_item.json
@ -60,9 +60,9 @@
    "Selections": [],
    "MaxUseCount": 0,
    "ExpireTransfor": 0,
-    "ShowInStorage": true,
-    "StorageType": 3,
-    "IntroductionKey": "ItemIntroduction_chaExp",
+    "ShowInStorage": false,
+    "StorageType": 0,
+    "IntroductionKey": "",
    "JumpToPos": 1,
    "JumpToParam": 0,
    "Acquisition": [
@ -140,8 +140,8 @@
    "Selections": [],
    "MaxUseCount": 0,
    "ExpireTransfor": 0,
-    "ShowInStorage": true,
-    "StorageType": 2,
+    "ShowInStorage": false,
+    "StorageType": 0,
    "IntroductionKey": "",
    "JumpToPos": 0,
    "JumpToParam": 0,
@ -216,14 +216,7 @@
    "IntroductionKey": "ItemIntroduction_PieceExchange",
    "JumpToPos": 0,
    "JumpToParam": 0,
-    "Acquisition": [
-      101001,
-      101002,
-      101003,
-      101004,
-      101005,
-      101006
-    ],
+    "Acquisition": [],
    "ExchangeParam": []
  },
  {
@ -11811,8 +11804,8 @@
    "Selections": [],
    "MaxUseCount": 0,
    "ExpireTransfor": 0,
-    "ShowInStorage": false,
-    "StorageType": 0,
+    "ShowInStorage": true,
+    "StorageType": 3,
    "IntroductionKey": "",
    "JumpToPos": 0,
    "JumpToParam": 0,
@ -11834,8 +11827,8 @@
    "Selections": [],
    "MaxUseCount": 0,
    "ExpireTransfor": 0,
-    "ShowInStorage": false,
-    "StorageType": 0,
+    "ShowInStorage": true,
+    "StorageType": 3,
    "IntroductionKey": "",
    "JumpToPos": 0,
    "JumpToParam": 0,
@ -11857,8 +11850,8 @@
    "Selections": [],
    "MaxUseCount": 0,
    "ExpireTransfor": 0,
-    "ShowInStorage": false,
-    "StorageType": 0,
+    "ShowInStorage": true,
+    "StorageType": 3,
    "IntroductionKey": "",
    "JumpToPos": 0,
    "JumpToParam": 0,
--- a/ProjectNLD/Assets/Config/Data/fightcfg_batteryconfig.json
+++ b/ProjectNLD/Assets/Config/Data/fightcfg_batteryconfig.json
@ -1,6 +1,6 @@
 [
  {
-    "ID": 1,
+    "ID": 10000101,
    "NameRead": "炮台1",
    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00001_01.prefab",
    "TurnSpeed": 400,
@ -14,7 +14,7 @@
    "FlyEffectId": 15
  },
  {
-    "ID": 2,
+    "ID": 10000201,
    "NameRead": "炮台2",
    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00002_01.prefab",
    "TurnSpeed": 400,
@ -28,7 +28,7 @@
    "FlyEffectId": 15
  },
  {
-    "ID": 3,
+    "ID": 10000301,
    "NameRead": "炮台3",
    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00003_01.prefab",
    "TurnSpeed": 400,
@ -42,7 +42,7 @@
    "FlyEffectId": 15
  },
  {
-    "ID": 4,
+    "ID": 10000401,
    "NameRead": "炮台4",
    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00004_01.prefab",
    "TurnSpeed": 400,
@ -56,7 +56,7 @@
    "FlyEffectId": 15
  },
  {
-    "ID": 5,
+    "ID": 10000501,
    "NameRead": "炮台5",
    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00005_01.prefab",
    "TurnSpeed": 400,
@ -70,8 +70,22 @@
    "FlyEffectId": 15
  },
  {
-    "ID": 6,
+    "ID": 10000502,
    "NameRead": "炮台6",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00005_02.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_4"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10000601,
+    "NameRead": "炮台7",
    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00006_01.prefab",
    "TurnSpeed": 400,
    "BulletFlySpeed": 120,
@ -84,8 +98,8 @@
    "FlyEffectId": 15
  },
  {
-    "ID": 7,
-    "NameRead": "炮台7",
+    "ID": 10000701,
+    "NameRead": "炮台8",
    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00007_01.prefab",
    "TurnSpeed": 400,
    "BulletFlySpeed": 120,
@ -98,8 +112,8 @@
    "FlyEffectId": 15
  },
  {
-    "ID": 8,
-    "NameRead": "炮台8",
+    "ID": 10000801,
+    "NameRead": "炮台9",
    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00008_01.prefab",
    "TurnSpeed": 400,
    "BulletFlySpeed": 120,
@ -112,8 +126,8 @@
    "FlyEffectId": 15
  },
  {
-    "ID": 9,
-    "NameRead": "炮台9",
+    "ID": 10000901,
+    "NameRead": "炮台10",
    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00009_01.prefab",
    "TurnSpeed": 400,
    "BulletFlySpeed": 120,
@ -124,5 +138,341 @@
    "HitEffectId": 10,
    "CriticalHitEffectId": 7,
    "FlyEffectId": 15
+  },
+  {
+    "ID": 10001001,
+    "NameRead": "炮台11",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00010_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_4"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10001101,
+    "NameRead": "炮台12",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00011_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_5"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10001201,
+    "NameRead": "炮台13",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00012_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_4"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10001301,
+    "NameRead": "炮台14",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00013_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_5"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10001401,
+    "NameRead": "炮台15",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00014_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_4"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10001501,
+    "NameRead": "炮台16",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00015_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_5"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10001601,
+    "NameRead": "炮台17",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00016_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_4"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10001701,
+    "NameRead": "炮台18",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00017_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_5"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10001801,
+    "NameRead": "炮台19",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00018_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_4"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10001802,
+    "NameRead": "炮台20",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00018_02.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_4"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10001901,
+    "NameRead": "炮台21",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00019_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_4"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10002001,
+    "NameRead": "炮台22",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00020_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_5"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10002101,
+    "NameRead": "炮台23",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00021_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_4"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10002201,
+    "NameRead": "炮台24",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00022_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_5"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10002301,
+    "NameRead": "炮台25",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00023_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_4"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10002401,
+    "NameRead": "炮台26",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00024_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_5"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10002501,
+    "NameRead": "炮台27",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00025_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_4"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10002601,
+    "NameRead": "炮台28",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00026_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_5"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10002701,
+    "NameRead": "炮台29",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00027_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_4"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10002801,
+    "NameRead": "炮台30",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00028_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_4"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10002901,
+    "NameRead": "炮台31",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00029_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_5"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10003001,
+    "NameRead": "炮台32",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00030_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_4"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10003101,
+    "NameRead": "炮台33",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00031_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_5"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
+  },
+  {
+    "ID": 10003201,
+    "NameRead": "炮台34",
+    "ModelPath": "Assets/Art/Character/Prefabs/BatteryNew/P_R00032_01.prefab",
+    "TurnSpeed": 400,
+    "BulletFlySpeed": 120,
+    "FireAudioId": [
+      "Sound_Shoot_5"
+    ],
+    "FireEffectId": 4,
+    "HitEffectId": 10,
+    "CriticalHitEffectId": 7,
+    "FlyEffectId": 15
  }
 ]
--- a/ProjectNLD/Assets/Config/Data/stringcfg_stringconfig.json
+++ b/ProjectNLD/Assets/Config/Data/stringcfg_stringconfig.json
@ -62511,6 +62511,14 @@
    "Param2": "",
    "Value_En": ""
  },
+  {
+    "Key": "BeforeFight_StartSweep",
+    "Value": "准备扫荡",
+    "Param0": "",
+    "Param1": "",
+    "Param2": "",
+    "Value_En": ""
+  },
  {
    "Key": "BeforeFight_NoReward",
    "Value": "该关卡暂无奖励",
--- a/ProjectNLD/Assets/Config/Data/vehiclecfg_vehicleconfig.json
+++ b/ProjectNLD/Assets/Config/Data/vehiclecfg_vehicleconfig.json
@ -18,7 +18,7 @@
    "AttackHpScale": 1,
    "FirstShootTime": 0.1,
    "PerShootCount": 1,
-    "WeaponId": 1,
+    "WeaponId": 10000101,
    "ReloadTime": 4,
    "FireRate": 1,
    "MoveSpeed": 2,
@ -55,7 +55,7 @@
    "AttackHpScale": 1,
    "FirstShootTime": 0.1,
    "PerShootCount": 1,
-    "WeaponId": 2,
+    "WeaponId": 10000201,
    "ReloadTime": 4,
    "FireRate": 1,
    "MoveSpeed": 2,
@ -92,7 +92,7 @@
    "AttackHpScale": 1,
    "FirstShootTime": 0.1,
    "PerShootCount": 1,
-    "WeaponId": 6,
+    "WeaponId": 10000601,
    "ReloadTime": 4,
    "FireRate": 1,
    "MoveSpeed": 3,
@ -129,7 +129,7 @@
    "AttackHpScale": 1,
    "FirstShootTime": 0.1,
    "PerShootCount": 1,
-    "WeaponId": 8,
+    "WeaponId": 10000801,
    "ReloadTime": 4,
    "FireRate": 1,
    "MoveSpeed": 3,
@ -166,7 +166,7 @@
    "AttackHpScale": 1,
    "FirstShootTime": 0.1,
    "PerShootCount": 1,
-    "WeaponId": 12,
+    "WeaponId": 10001201,
    "ReloadTime": 4,
    "FireRate": 1,
    "MoveSpeed": 3,