From 1b3c6cb8214ef2216fa922c95fadbbac08e19e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=90=8D?= <3077614386@qq.com> Date: Mon, 27 Nov 2023 11:15:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/moder/地面无线电干扰.prefab | 2 + .../Prefebs/Models/moder/激光火控平台.prefab | 3 + Assets/StreamingAssets/confing.txt | 2 +- Assets/Temp/Scripts/Login_panl.cs | 4 +- Assets/Temp/Scripts/View_Panel2.cs | 8 +- Assets/Zion/Scenes/SampleScene.unity | 3701 +++++++++++++++++ Assets/Zion/Scripts/Adam/UIBootstrap.cs | 4 +- Assets/Zion/Scripts/InterfaceManager.cs | 2 +- .../LaserFireControlPlatformManger.cs | 32 +- .../TerrestrialRadioInterferenceManger.cs | 48 +- .../UAV/UnmannedAerialVehicle.cs | 8 - .../UAV/UnmannedAerialVehicleManage.cs | 2 +- 12 files changed, 3793 insertions(+), 23 deletions(-) diff --git a/Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab b/Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab index 1ee8e400..7bd765ed 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab @@ -75,6 +75,8 @@ MonoBehaviour: InterferenceDistance: 1 detectionRadius: 1000 interval: 2 + explodePrefab: {fileID: 1000013462590818, guid: ecdd96beb7f93494880c052dfccf9dc1, + type: 3} --- !u!65 &7099352370737318148 BoxCollider: m_ObjectHideFlags: 0 diff --git a/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab b/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab index d8c31d6a..3a93fbbb 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab @@ -9959,6 +9959,7 @@ MonoBehaviour: deviceID: explodePrefab: {fileID: 1000013462590818, guid: ecdd96beb7f93494880c052dfccf9dc1, type: 3} + isMove: 1 --- !u!65 &7615181139496386334 BoxCollider: m_ObjectHideFlags: 0 @@ -10014,6 +10015,8 @@ MonoBehaviour: InnerLaserlineRenderer: {fileID: 0} OuterLaserlineRenderer: {fileID: 0} FireSpeed: 20 + explodePrefab: {fileID: 1000013462590818, guid: ecdd96beb7f93494880c052dfccf9dc1, + type: 3} --- !u!114 &7615181139496386323 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/StreamingAssets/confing.txt b/Assets/StreamingAssets/confing.txt index e56ea71e..58408a61 100644 --- a/Assets/StreamingAssets/confing.txt +++ b/Assets/StreamingAssets/confing.txt @@ -1 +1 @@ -127.0.0.1 \ No newline at end of file +192.168.6.15 \ No newline at end of file diff --git a/Assets/Temp/Scripts/Login_panl.cs b/Assets/Temp/Scripts/Login_panl.cs index f71ea690..b5cd66ac 100644 --- a/Assets/Temp/Scripts/Login_panl.cs +++ b/Assets/Temp/Scripts/Login_panl.cs @@ -6,7 +6,7 @@ using UnityEngine.UI; using static InterfaceManager; public class Login_panl : MonoBehaviour { - string url = UrlLogin;//wed端的地址 + //string url = UrlLogin;//wed端的地址 [SerializeField]//外界的类拿不到信息 public UserInfo user = new UserInfo(); @@ -59,7 +59,7 @@ public class Login_panl : MonoBehaviour string account = username_input.text; string password = password_input.text; - string url = this.url + "/Handler/User.ashx?action=login"; + string url = IpAddress + "/Handler/User.ashx?action=login"; url += "&login_name="; url += account; url += "&password="; diff --git a/Assets/Temp/Scripts/View_Panel2.cs b/Assets/Temp/Scripts/View_Panel2.cs index ba2d5ada..7155e60c 100644 --- a/Assets/Temp/Scripts/View_Panel2.cs +++ b/Assets/Temp/Scripts/View_Panel2.cs @@ -53,8 +53,8 @@ public class View_Panel2 : XUIPanel public List