场景

想定
2024-03-14 15:11:23 +08:00 · 2024-03-14 14:34:58 +08:00
6 changed files with 94 additions and 114 deletions
--- a/Assets/Resources/UIPanel/Valuerangepanl.prefab
+++ b/Assets/Resources/UIPanel/Valuerangepanl.prefab
@ -269,7 +269,6 @@ GameObject:
  - component: {fileID: 4723123646134104045}
  - component: {fileID: 4723123646134104035}
  - component: {fileID: 4723123646134104044}
-  - component: {fileID: 2556990734553169851}
  m_Layer: 5
  m_Name: Valuerangepanl
  m_TagString: Untagged
@ -345,29 +344,6 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
--- !u!114 &2556990734553169851
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4723123646134104046}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bc58d6fa99d4eac4ab6dc73912d26cba, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  stored: {fileID: 4723123646559606038}
-  injure: {fileID: 4723123646174311031}
-  disturb: {fileID: 4723123646946089641}
-  angle: {fileID: 4723123646364206457}
-  stored_text: {fileID: 4723123647215699982}
-  injure_text: {fileID: 4723123647056567040}
-  disturb_text: {fileID: 4723123647318733699}
-  angle_text: {fileID: 4723123646884053970}
-  cancel1_btn: {fileID: 4723123646925232090}
-  cancel2_btn: {fileID: 4723123646698657968}
-  queren_btn: {fileID: 4723123647256361776}
 --- !u!1 &4723123646174311025
 GameObject:
  m_ObjectHideFlags: 0
@ -617,7 +593,7 @@ GameObject:
  - component: {fileID: 4723123646364206458}
  - component: {fileID: 4723123646364206457}
  m_Layer: 5
-  m_Name: SliderAngle
+  m_Name: SliderAngle1
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -708,7 +684,7 @@ GameObject:
  - component: {fileID: 4723123646374192124}
  - component: {fileID: 4723123646374192125}
  m_Layer: 5
-  m_Name: Text
+  m_Name: Text2
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -1440,7 +1416,7 @@ GameObject:
  - component: {fileID: 4723123646884053969}
  - component: {fileID: 4723123646884053970}
  m_Layer: 5
-  m_Name: Text
+  m_Name: angle1_text
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -1505,7 +1481,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: "\u6C34\u5E73\u65B9\u5411\u5168\u5411\uFF0C\u4FEF\u4EF0\u65B9\u54110~60\u5EA6"
+  m_Text: 
 --- !u!1 &4723123646925232068
 GameObject:
  m_ObjectHideFlags: 0
@ -1726,7 +1702,7 @@ GameObject:
  - component: {fileID: 4723123647038005809}
  - component: {fileID: 4723123647038005810}
  m_Layer: 5
-  m_Name: Text
+  m_Name: Text1
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -1804,7 +1780,7 @@ GameObject:
  - component: {fileID: 4723123647056567047}
  - component: {fileID: 4723123647056567040}
  m_Layer: 5
-  m_Name: Text
+  m_Name: accumulate_text
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -1869,7 +1845,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: 3~10s
+  m_Text: 
 --- !u!1 &4723123647113957533
 GameObject:
  m_ObjectHideFlags: 0
@ -1918,7 +1894,7 @@ GameObject:
  - component: {fileID: 4723123647148398507}
  - component: {fileID: 4723123647148398484}
  m_Layer: 5
-  m_Name: Text
+  m_Name: Text4
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -1983,7 +1959,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: "\u5E72\u6270\u89D2\u5EA6\uFF1A"
+  m_Text: "\u77AC\u65F6\u89C6\u573A\uFF1A"
 --- !u!1 &4723123647174647711
 GameObject:
  m_ObjectHideFlags: 0
@ -1996,7 +1972,7 @@ GameObject:
  - component: {fileID: 4723123647174647708}
  - component: {fileID: 4723123647174647709}
  m_Layer: 5
-  m_Name: Text
+  m_Name: Text3
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -2074,7 +2050,7 @@ GameObject:
  - component: {fileID: 4723123647215699981}
  - component: {fileID: 4723123647215699982}
  m_Layer: 5
-  m_Name: Text
+  m_Name: stored_text
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -2139,7 +2115,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: 5s
+  m_Text: 
 --- !u!1 &4723123647256361778
 GameObject:
  m_ObjectHideFlags: 0
@ -2344,7 +2320,7 @@ GameObject:
  - component: {fileID: 4723123647318733698}
  - component: {fileID: 4723123647318733699}
  m_Layer: 5
-  m_Name: Text
+  m_Name: dis_text
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -2409,7 +2385,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: 0.1~1km
+  m_Text: 
 --- !u!1 &4723123647376878727
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Temp/Scripts/Scenariopage.cs
+++ b/Assets/Temp/Scripts/Scenariopage.cs
@ -1,20 +1,15 @@
-using DataModel.Model;
-using LitJson;
+using LitJson;
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics.SymbolStore;
-using System.Reflection;
 using Tenkoku.Core;

 using UnityEngine;
-using UnityEngine.Experimental.GlobalIllumination;
 using UnityEngine.Networking;
-using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 using UnityTemplateProjects;

-    using static InterfaceManager;
+using static InterfaceManager;


 public class Scenariopage : MonoBehaviour
@ -26,7 +21,7 @@ public class Scenariopage : MonoBehaviour
    public Image Radius_panl;//值范围面板
    public Image mianban;//
    public Button object_list_btn;//对象列表按钮
-    public Button basic_info_btn;//基本信息按钮
+    //public Button basic_info_btn;//基本信息按钮
    public Image basic_information_iamg;//基本信息面板
    public Button off4_btn;//基本信息关闭按钮
    public Button model_list_btn;//模型按钮
@ -37,7 +32,7 @@ public class Scenariopage : MonoBehaviour
    public Button Fork_off_btn;//设备详情叉掉面板
    public Button queren_btn;//设备详情确认按钮
    public Button quxiao_btn;//设备详情取消按钮
-    public Image model_panl;//模型页面按钮
+    public Image model_panl;//模型页面
    public Button off_btn;//选择设备的关闭按钮
    public RectTransform environment_configuration1;//环境页面
    public Button environment_setting_btn;//环境按钮
@ -53,6 +48,9 @@ public class Scenariopage : MonoBehaviour
    public Button kong_btn;//空
    public Button qita_btn;//其他
    public Image moxin_yemian;//显示模型框
+    public RectTransform Model_template;//设备模型和场景模型面板
+    public Button Device_button;//设备模型
+    public Button Scene_button;//场景模型
    public Image moyin_yemian1;
    public Image moyin_yemian2;
    public Image moyin_yemian3;
@ -217,7 +215,7 @@ public class Scenariopage : MonoBehaviour
    //public Dropdown Dropdown_frequency;//无线电干扰的频率选项框
    public string frequ;//接收选项框文本id
    public Text frequency_text;//无线电选项框显示文本
-    public string drive ="0";
+    public string drive = "0";
    public Toggle Toggle_Drive;//驱离选项
    //public Text drive_text;//驱离文本
    public Toggle Toggle_Crash;//迫降选项
@ -367,7 +365,7 @@ public class Scenariopage : MonoBehaviour
    {
        xuexiao = GameObject.Find("主席台场景");
        caodi = GameObject.Find("Background");
-        
+
        //调用接口
        //Debug.Log("Url_Action..:" + Url_Action);
        StartCoroutine(Post1(Url_Action, (bol, str) =>
@ -1510,8 +1508,9 @@ public class Scenariopage : MonoBehaviour
        });
        verify_bton2.onClick.AddListener(() =>
        {
-            //Scenariofile_panl.gameObject.SetActive(false);
-            basic_information_iamg1.gameObject.SetActive(false);
+            Scenariofile_panl.gameObject.SetActive(false);//失活科目列表
+            basic_information_iamg1.gameObject.SetActive(false);//失活基本信息按钮
+            environment_setting_btn.gameObject.SetActive(true);//激活环境按钮
        });
        cancel_bton2.onClick.AddListener(() =>
        {
@ -1564,7 +1563,7 @@ public class Scenariopage : MonoBehaviour
            for (int i = 0; i < scen.data.Count; i++)
            {
                if (Id == (scen.data[i].Id))
-                {   
+                {
                    if (scen.data[i].EnvRain == "" || scen.data[i].EnvRain == "")
                    {
                        weather1.isOn = true;
@ -1831,6 +1830,8 @@ public class Scenariopage : MonoBehaviour
        {
            if (duixiang == true)
            {
+                environment_configuration1.gameObject.SetActive(false);
+                Model_template.gameObject.SetActive(false);//场景模型和设备模型
                model_panl.gameObject.SetActive(false);
                Scenariofile_panl.gameObject.SetActive(false);
                object_list_panl.gameObject.SetActive(true);
@ -2058,6 +2059,7 @@ public class Scenariopage : MonoBehaviour
        //想定文件下的打开按钮
        unpack_btn.onClick.AddListener(() =>
        {
+            Model_template.gameObject.SetActive(false);//场景模型和设备模型
            model_panl.gameObject.SetActive(false);
            ScrollView_unpack.gameObject.SetActive(false);
            object_list_panl.gameObject.SetActive(false);
@ -2109,11 +2111,20 @@ public class Scenariopage : MonoBehaviour
                }

            }
+            Model_template.gameObject.SetActive(false);//场景模型和设备模型
+            model_panl.gameObject.SetActive(false);//场景模型页面
+            select_device_iamg.gameObject.SetActive(false);//环境模型页面
+            environment_configuration1.gameObject.SetActive(false);//环境面板
+            object_list_panl.gameObject.SetActive(false);//设备参数面板
+            environment_setting_btn.gameObject.SetActive(false);//环境按钮
+            model_list_btn.gameObject.SetActive(false);//模型按钮
+            object_list_btn.gameObject.SetActive(false);//对象列表按钮
            ScrollView_unpack.gameObject.SetActive(false);
        });
        //想定文件下的退出按钮
        quit.onClick.AddListener(() =>
        {
+            Model_template.gameObject.SetActive(false);
            ScrollView_unpack.gameObject.SetActive(false);
        });

@ -2130,6 +2141,8 @@ public class Scenariopage : MonoBehaviour
                Preservation();//修改接口
            }
            select_device_iamg.gameObject.SetActive(false);
+            model_panl.gameObject.SetActive(false);
+            object_list_btn.gameObject.SetActive(true);
        });
        //选择设备取消按钮
        Cancel_btnn.onClick.AddListener(() =>
@ -2590,14 +2603,14 @@ public class Scenariopage : MonoBehaviour

    private void Topographicdetermination(string str)
    {
-        if (str=="学校")
+        if (str == "学校")
        {
            xuexiao.gameObject.SetActive(true);
            caodi.gameObject.SetActive(true);
            shandi.gameObject.SetActive(false);
            SimpleCameraController game = hipotcamera.GetComponent<SimpleCameraController>();
            game.gameObject.SetActive(false);
-            hipotcamera.transform.position = new Vector3(-404,200,5);
+            hipotcamera.transform.position = new Vector3(-404, 200, 5);
            game.gameObject.SetActive(true);
        }
        else if (str == "山地")
@ -2629,6 +2642,7 @@ public class Scenariopage : MonoBehaviour
        time_txt.text = _time;
        mode_text.text = _trainModel;
        post_txt.text = deviceCount;
+        environment_configuration1.gameObject.SetActive(false);
        basic_information_iamg1.gameObject.SetActive(true);
    }

@ -2712,25 +2726,54 @@ public class Scenariopage : MonoBehaviour
    {
        model_list_btn.onClick.AddListener(() =>
        {
+            Modelbutton();//模型按钮调用
+            environment_configuration1.gameObject.SetActive(false);//环境页面失活
+            object_list_panl.gameObject.SetActive(false);//设备参数面板
+            Model_template.gameObject.SetActive(true);
+            //if (model == true)
+            //{ 
+            //    Inquire();//查询设备想定接口

+            //    environment_configuration1.gameObject.SetActive(false);
+            //    object_list_panl.gameObject.SetActive(false);
+            //    basic_information_iamg1.gameObject.SetActive(false);
+            //    Scenariofile_panl.gameObject.SetActive(false);
+            //    model_panl.gameObject.SetActive(true);
+            //    select_device_iamg.gameObject.SetActive(true);
+
+            //}
+        });
+    }
+
+    private void Modelbutton()
+    {
+        Device_button.onClick.AddListener(() =>
+        {
            if (model == true)
            {
-
-
                Inquire();//查询设备想定接口
-
+                Model_template.gameObject.SetActive(false);
                environment_configuration1.gameObject.SetActive(false);
                object_list_panl.gameObject.SetActive(false);
                basic_information_iamg1.gameObject.SetActive(false);
                Scenariofile_panl.gameObject.SetActive(false);
-                model_panl.gameObject.SetActive(true);
+                model_panl.gameObject.SetActive(false);
                select_device_iamg.gameObject.SetActive(true);

            }
-
-
+        });
+        Scene_button.onClick.AddListener(() =>
+        {
+            Model_template.gameObject.SetActive(false);
+            environment_configuration1.gameObject.SetActive(false);
+            object_list_panl.gameObject.SetActive(false);
+            basic_information_iamg1.gameObject.SetActive(false);
+            Scenariofile_panl.gameObject.SetActive(false);
+            model_panl.gameObject.SetActive(true);
+            select_device_iamg.gameObject.SetActive(false);
        });
    }
+
    private void Inquire()
    {
        string url = Url_Querydevice;
@ -2811,7 +2854,7 @@ public class Scenariopage : MonoBehaviour
                //Debug.LogError(tenkokuModule.weather_WindAmt);
                //tmie = year_text.text + " " + month_text.text + " " + day_text.text + " " + when_text.text;

-
+                model_list_btn.gameObject.SetActive(true);
                environment_configuration1.gameObject.SetActive(false);
            }
            else
@ -3038,10 +3081,15 @@ public class Scenariopage : MonoBehaviour
    {
        environment_setting_btn.onClick.AddListener(() =>
        {
-            environment_configuration1.gameObject.SetActive(true);
+            Model_template.gameObject.SetActive(false);//场景模型和设备模型
+            object_list_panl.gameObject.SetActive(false);//设备参数面板
+            model_panl.gameObject.SetActive(false);//场景模型页面
+            select_device_iamg.gameObject.SetActive(false);//环境模型页面
+            Scenariofile_panl.gameObject.SetActive(false);
            basic_information_iamg.gameObject.SetActive(false);
            select_device_iamg.gameObject.SetActive(false);
-
+            basic_information_iamg1.gameObject.SetActive(false);
+            environment_configuration1.gameObject.SetActive(true);
        });
        fork_off_btn.onClick.AddListener(() =>
        {
@ -3057,12 +3105,12 @@ public class Scenariopage : MonoBehaviour
    /// </summary>
    private void Basic()
    {
-        basic_info_btn.onClick.AddListener(() =>
-        {
-            basic_information_iamg.gameObject.SetActive(true);
-            environment_configuration1.gameObject.SetActive(false);
-            select_device_iamg.gameObject.SetActive(false);
-        });
+        //basic_info_btn.onClick.AddListener(() =>
+        //{
+        //    basic_information_iamg.gameObject.SetActive(true);
+        //    environment_configuration1.gameObject.SetActive(false);
+        //    select_device_iamg.gameObject.SetActive(false);
+        //});
        off4_btn.onClick.AddListener(() =>
        {
            basic_information_iamg.gameObject.SetActive(false);
--- a/Assets/Temp/Scripts/Underneath.cs
+++ b/Assets/Temp/Scripts/Underneath.cs
@ -15,7 +15,7 @@ public class Underneath : MonoBehaviour
        subjectName.text = name;
        settingBtn.onClick.AddListener(() =>
        {
-            //Debug.Log("ewewewew");
+
            callback?.Invoke();
        });
    }
--- a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity
+++ b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity
--- a/Assets/Zion/Scripts/Adam/Components/ExtendedSlider.cs
+++ b/Assets/Zion/Scripts/Adam/Components/ExtendedSlider.cs
@ -1,33 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.Events;
-using UnityEngine.EventSystems;
-using UnityEngine.UI;
-
-[Serializable]
-public class ExtendedEvent : UnityEvent<float> { } //定义拓展的事件 
-public class ExtendedSlider : Slider, IBeginDragHandler, IEndDragHandler
-{
-    public ExtendedEvent DragStart = new ExtendedEvent();
-
-    public ExtendedEvent DragStop = new ExtendedEvent();
-
-    public ExtendedEvent PointerDown = new ExtendedEvent();
-    public void OnBeginDrag(PointerEventData eventData)
-    {
-        DragStart.Invoke(m_Value);
-    }
-
-    public void OnEndDrag(PointerEventData eventData)
-    {
-        DragStop.Invoke(m_Value);
-    }
-
-    public override void OnPointerDown(PointerEventData eventData)
-    {
-        base.OnPointerDown(eventData);
-        PointerDown.Invoke(m_Value);
-    }
-}
--- a/Assets/Zion/Scripts/Adam/Components/ExtendedSlider.cs.meta
+++ b/Assets/Zion/Scripts/Adam/Components/ExtendedSlider.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 354647e2aa8b3e84a9705a7d1b14bfc9
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant:
Author	SHA1	Message	Date
yulong	bf92e54eb4	场景	2024-03-14 15:11:23 +08:00
yulong	ae9becbb5a	想定	2024-03-14 14:34:58 +08:00