From b0a0566f192bfd51e632659b4d75c1d2b70e5ce4 Mon Sep 17 00:00:00 2001 From: Plotnikov Date: Wed, 6 Jul 2022 12:36:49 +0300 Subject: [PATCH] 06.07.2022 --- .../Assets/Fusel/scripts/ChangeSystem.cs | 270 - Heli_with_panels/Assets/MFI/mfiArrowNumber.cs | 114 - .../Assets/Prefab/MFIScreen.prefab | 26 +- Heli_with_panels/Assets/Scenes/Heli.unity | 2 +- Heli_with_panels/Assets/Scripts/Manager.cs | 763 - .../Assets/Scripts/Panel2D/0112/drCol112.cs | 98 - .../Assets/Scripts/Panel2D/ButtonCheckable.cs | 84 - .../Assets/Scripts/Panel2D/Switch.cs | 50 - .../Assets/Scripts/Panel3D/MakeActive.cs | 259 - Heli_with_panels/Assets/Scripts/Player.cs | 1535 - .../Assets/Scripts/ScEditor/Mi38Objects.cs | 1704 - .../Assets/Scripts/ScEditor/ScEditor.cs | 763 +- .../Assets/Scripts/UI/ClickGruzCube2.cs | 107 - .../Assets/Scripts/UI/MFIScript.cs | 1180 - .../Assets/Scripts/UI/Switch2view.cs | 47 - Heli_with_panels/Assets/Scripts/UI/hint.cs | 89 - .../StreamingAssets/Objects/Objects.xml | 31990 ---------------- .../Assets/StreamingAssets/Scenario/1212.xml | 28 - .../Assets/StreamingAssets/Scenario/123.xml | 35 - .../Assets/StreamingAssets/Scenario/1234.xml | 42 - .../Assets/StreamingAssets/Scenario/hhh.xml | 32 - .../Assets/StreamingAssets/Scenario/qwe.xml | 91 - .../com.unity.connect.share/Settings.json | 2 +- .../ProjectSettings/ProjectSettings.asset | 2 +- ...Pivot.Editor.csprojAssemblyReference.cache | Bin 394512 -> 0 bytes ...Sharp-Editor.csprojAssemblyReference.cache | Bin 413448 -> 0 bytes ...embly-CSharp.csprojAssemblyReference.cache | Bin 429596 -> 0 bytes ...gnTimeResolveAssemblyReferencesInput.cache | Bin 34678 -> 0 bytes ...prite.Editor.csprojAssemblyReference.cache | Bin 156127 -> 0 bytes ...lemap.Editor.csprojAssemblyReference.cache | Bin 90742 -> 0 bytes ...ityEditor.UI.csprojAssemblyReference.cache | Bin 156127 -> 0 bytes ...ityEngine.UI.csprojAssemblyReference.cache | Bin 152741 -> 0 bytes 32 files changed, 5 insertions(+), 39308 deletions(-) delete mode 100644 Heli_with_panels/obj/Debug/AdjustPivot.Editor.csprojAssemblyReference.cache delete mode 100644 Heli_with_panels/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache delete mode 100644 Heli_with_panels/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache delete mode 100644 Heli_with_panels/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache delete mode 100644 Heli_with_panels/obj/Debug/Unity.2D.Sprite.Editor.csprojAssemblyReference.cache delete mode 100644 Heli_with_panels/obj/Debug/Unity.2D.Tilemap.Editor.csprojAssemblyReference.cache delete mode 100644 Heli_with_panels/obj/Debug/UnityEditor.UI.csprojAssemblyReference.cache delete mode 100644 Heli_with_panels/obj/Debug/UnityEngine.UI.csprojAssemblyReference.cache diff --git a/Heli_with_panels/Assets/Fusel/scripts/ChangeSystem.cs b/Heli_with_panels/Assets/Fusel/scripts/ChangeSystem.cs index a25223a..7a2ed54 100644 --- a/Heli_with_panels/Assets/Fusel/scripts/ChangeSystem.cs +++ b/Heli_with_panels/Assets/Fusel/scripts/ChangeSystem.cs @@ -1,4 +1,3 @@ -<<<<<<< HEAD using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -266,273 +265,4 @@ public class ChangeSystem : MonoBehaviour //}).catch ((message) => { // alert(message); //}); -======= -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.SceneManagement; -using UnityEngine.EventSystems; -using UnityEngine.UI; - -public class ChangeSystem : MonoBehaviour -{ - public GameObject AllSystemsBtn; - public GameObject ButtonMainBack; - - public GameObject MasloBtn; - public GameObject MasloBtnBackOff; - - public GameObject OstanovBtn; - public GameObject OstanovBtnBackOff; - - public GameObject TormozBtn; - public GameObject TormozBtnBackOff; - - public GameObject DrenazhDvigBtn; - public GameObject DrenazhDvigBtnBackOff; - - public GameObject ToplBtn; - public GameObject ToplBtnBackOff; - - public GameObject GidroBtn; - public GameObject GidroBtnBackOff; - - public GameObject TransBtn; - public GameObject TransBtnBackOff; - - public GameObject PozharBtn; - public GameObject PozharBtnBackOff; - - public GameObject POSBtn; - public GameObject POSBtnBackOff; - - public GameObject UprDvigBtn; - public GameObject UprDvigBtnBackOff; - - public GameObject ZapuskDvigBtn; - public GameObject ZapuskDvigBtnBackOff; - - public GameObject TV117VBtn; - public GameObject TV117VBtnBackOff; - - public GameObject TA14Btn; - public GameObject TA14BtnBackOff; - - public GameObject UPRStabBtn; - public GameObject UPRStabBtnBackOff; - - public GameObject SKVBtn; - public GameObject SKVBtnBackOff; - - public GameObject PutevBtn; - public GameObject PutevBtnBackOff; - - public GameObject ProdolBtn; - public GameObject ProdolBtnBackOff; - - public GameObject OSHBtn; - public GameObject OSHBtnBackOff; - - public GameObject OhlAgrBtn; - public GameObject OhlAgrBtnBackOff; - - public GameObject KislorodBtn; - public GameObject KislorodBtnBackOff; - - public Camera MainCamera; - public Camera CamMasloSystem, CamOstanov, CamUpravDvig, CamPOS, CamTrans, CamFire, CamTopl, CamTormoz, - CamGidro, CamZapuskDvig, CamDrenazhDvig, CamTV117V, CamTA14, CamUPRStab, CamSKV, CamPutev, CamProdol, CamOSH, CamOhlAgr, CamKislorod; - - //string Maslo = "CamMasloSystem"; - - public void ChooseSys(string MySystem) - { - if (!MySystem.ToLower().StartsWith("system_")) return; - int N = 0; - if (!int.TryParse(MySystem.ToLower().Replace("system_", ""), out N)) return; - if (N == 1) //"AllSystems" - { - AllSystemsBtn.GetComponent