From 2df54ad3bba21deae9c96f0158f3d82c995506cb Mon Sep 17 00:00:00 2001 From: yulong <1838206582@qq.com> Date: Fri, 17 Nov 2023 11:13:12 +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 --- .../UIPanel/Training_pilot_panl.prefab | 125 +-------- Assets/Temp/Scripts/Judgmentstate.cs | 57 +++- Assets/Temp/Scripts/Scenariopage.cs | 11 +- .../Scenes/Contingenc_yediting_panl.unity | 263 +++++++++++++++++- Assets/Zion/Scenes/复盘回放.unity | 2 +- 5 files changed, 320 insertions(+), 138 deletions(-) diff --git a/Assets/Resources/UIPanel/Training_pilot_panl.prefab b/Assets/Resources/UIPanel/Training_pilot_panl.prefab index 28224d7c..7809214a 100644 --- a/Assets/Resources/UIPanel/Training_pilot_panl.prefab +++ b/Assets/Resources/UIPanel/Training_pilot_panl.prefab @@ -573,7 +573,7 @@ RectTransform: m_Children: - {fileID: 5855821741945453626} m_Father: {fileID: 5855821741515730287} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -775,7 +775,6 @@ RectTransform: - {fileID: 5855821741614971572} - {fileID: 5855821741812748369} - {fileID: 5855821741593404593} - - {fileID: 5855821741551620560} - {fileID: 5855821741361037919} m_Father: {fileID: 5855821741811488939} m_RootOrder: 1 @@ -822,124 +821,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5855821741551620563 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5855821741551620560} - - component: {fileID: 5855821741551620567} - - component: {fileID: 5855821741551620566} - - component: {fileID: 5855821741551620561} - m_Layer: 5 - m_Name: "\u505C\u6B62" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5855821741551620560 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5855821741551620563} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 5855821741515730287} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5855821741551620567 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5855821741551620563} - m_CullTransparentMesh: 0 ---- !u!114 &5855821741551620566 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5855821741551620563} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 47390e15134f347458cdb6364e799ffc, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5855821741551620561 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5855821741551620563} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 5855821741551620566} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &5855821741593404592 GameObject: m_ObjectHideFlags: 0 @@ -1382,7 +1263,11 @@ MonoBehaviour: m_EditorClassIdentifier: environment: {fileID: 5855821742633352629} weather_panl: {fileID: 5855821741208403612} + fanhui1: {fileID: 0} off_btn: {fileID: 783718136} + initiate_btn: {fileID: 0} + Pause_btn: {fileID: 0} + finish_btn: {fileID: 0} --- !u!1 &5855821741812748368 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Temp/Scripts/Judgmentstate.cs b/Assets/Temp/Scripts/Judgmentstate.cs index dda024e7..62cef343 100644 --- a/Assets/Temp/Scripts/Judgmentstate.cs +++ b/Assets/Temp/Scripts/Judgmentstate.cs @@ -1,4 +1,5 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; @@ -19,8 +20,18 @@ public class Judgmentstate : MonoBehaviour /// public Button fanhui1; public Button off_btn; + public Button initiate_btn;//开始按钮 + public Button Pause_btn;//暂停按钮 + public Button finish_btn;//结束按钮 + public Text countdown_text;//倒计时文本 + public bool isp=false;//判断游戏结束 + public float a=5; + + public bool UNITY_EDITOR { get; private set; } + void Start() { + Time.timeScale = 0; environment.onClick.AddListener(() => { weather_panl.gameObject.SetActive(true); @@ -34,9 +45,51 @@ public class Judgmentstate : MonoBehaviour GameMain.tiao = false; SceneManager.LoadScene("SampleScene"); }); + Operation();//开始暂停结束方法 } + + private void Operation() + { + initiate_btn.onClick.AddListener(() => + { + initiate_btn.gameObject.SetActive(false); + Pause_btn.gameObject.SetActive(true); + Time.timeScale = 1; + AudioListener.pause = true; + }); + Pause_btn.onClick.AddListener(() => + { + if (isp!=false) + { + initiate_btn.gameObject.SetActive(true); + Pause_btn.gameObject.SetActive(false); + Time.timeScale = 0; + AudioListener.pause = false; + } + }); + finish_btn.onClick.AddListener(() => + { + if (Time.timeScale!=0) + { + isp = true; + } + countdown_text.gameObject.SetActive(true); + }); + } + void Update() { - + if (isp==true) + { + a -= Time.deltaTime; + countdown_text.text=a.ToString("0"); + if (a<=0) + { + countdown_text.gameObject.SetActive(false); + UnityEditor.EditorApplication.isPlaying = false; + Application.Quit();//在可执行程序中结束运行 + isp = false; + } + } } } diff --git a/Assets/Temp/Scripts/Scenariopage.cs b/Assets/Temp/Scripts/Scenariopage.cs index a40ed3fe..0fc171e7 100644 --- a/Assets/Temp/Scripts/Scenariopage.cs +++ b/Assets/Temp/Scripts/Scenariopage.cs @@ -6,6 +6,7 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics.SymbolStore; using System.Linq; +using System.Runtime.ConstrainedExecution; using System.Security.Principal; using Tenkoku.Core; using UnityEditor.Animations; @@ -1406,7 +1407,7 @@ public class Scenariopage : MonoBehaviour } } Passbyvalue();//把场景中天气插件的值传给接口 - Modelitem();//把模型路径和对应的位置值传给接口 + //Modelitem();//把模型路径和对应的位置值传给接口 if (Id.Length > 1) { View();//添加想定的设备接口 @@ -1662,7 +1663,12 @@ public class Scenariopage : MonoBehaviour { Debug.Log(arg1); Debug.Log(arg2); + Clearlist(); + } + private void Clearlist() + { + stringlist.Clear(); } public static IEnumerator PostData2(string url, Dictionary keyValuePairs, System.Action action) @@ -2070,6 +2076,7 @@ public class Scenariopage : MonoBehaviour { Debug.LogError(b); Debug.LogError(s); + Modelitem();//把模型路径和对应的位置值传给接口 } @@ -2180,7 +2187,7 @@ public class Scenariopage : MonoBehaviour windamt = "10"; break; } - Debug.LogError(windamt); + } private void WindDir(float wind) { diff --git a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity index a7d8cd86..6da95e8b 100644 --- a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity +++ b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.1674825, g: 0.3072167, b: 0.6407015, a: 1} + m_IndirectSpecularColor: {r: 0.16302592, g: 0.30598372, b: 0.66365844, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -17901,7 +17901,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 250950117} - m_LocalRotation: {x: 0.34009627, y: 0.18404482, z: -0.06805869, w: 0.9196902} + m_LocalRotation: {x: 0.40205336, y: 0.16377541, z: -0.073337175, w: 0.8978599} m_LocalPosition: {x: -13.70872, y: 9.276348, z: -11.36977} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -50883,6 +50883,82 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 0 +--- !u!1 &759481781 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 759481782} + - component: {fileID: 759481784} + - component: {fileID: 759481783} + m_Layer: 8 + m_Name: Terrain + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!4 &759481782 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 759481781} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2890, y: -2.8, z: 229} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1754168346} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!154 &759481783 +TerrainCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 759481781} + m_Material: {fileID: 0} + m_Enabled: 1 + m_TerrainData: {fileID: 15600000, guid: ae3baf912bd3a1f46900b5147b8be4c5, type: 2} + m_EnableTreeColliders: 1 +--- !u!218 &759481784 +Terrain: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 759481781} + m_Enabled: 1 + serializedVersion: 6 + m_TerrainData: {fileID: 15600000, guid: ae3baf912bd3a1f46900b5147b8be4c5, type: 2} + m_TreeDistance: 5000 + m_TreeBillboardDistance: 50 + m_TreeCrossFadeLength: 5 + m_TreeMaximumFullLODCount: 50 + m_DetailObjectDistance: 80 + m_DetailObjectDensity: 1 + m_HeightmapPixelError: 5 + m_SplatMapDistance: 1000 + m_HeightmapMaximumLOD: 0 + m_ShadowCastingMode: 2 + m_DrawHeightmap: 1 + m_DrawInstanced: 0 + m_DrawTreesAndFoliage: 1 + m_ReflectionProbeUsage: 1 + m_MaterialTemplate: {fileID: 10652, guid: 0000000000000000f000000000000000, type: 0} + m_BakeLightProbesForTrees: 1 + m_PreserveTreePrototypeLayers: 0 + m_DeringLightProbesForTrees: 1 + m_ScaleInLightmap: 0.0256 + m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0} + m_GroupingID: 0 + m_RenderingLayerMask: 1 + m_AllowAutoConnect: 1 --- !u!114 &769388249 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 767881266625851591, guid: a573eabe79e49f740807bf8ae0ff45cc, @@ -51752,13 +51828,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 804135004} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalRotation: {x: 0.17364816, y: 0, z: 0, w: 0.9848078} + m_LocalPosition: {x: -277, y: 14, z: -514} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 20, y: 0, z: 0} --- !u!114 &804135008 MonoBehaviour: m_ObjectHideFlags: 0 @@ -70191,7 +70267,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1242063470} - m_LocalRotation: {x: -0.5309479, y: -0.10330634, z: -0.8163098, w: -0.20263344} + m_LocalRotation: {x: -0.55440897, y: -0.14873427, z: -0.803417, w: -0.15820812} m_LocalPosition: {x: 0.5529245, y: 0, z: 0} m_LocalScale: {x: 1.1074, y: 1.10745, z: 1.10745} m_Children: [] @@ -83148,6 +83224,26 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1512442045} m_CullTransparentMesh: 0 +--- !u!1 &1514573738 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7413945746087729120, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + m_PrefabInstance: {fileID: 1781643437} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1514573742 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1514573738} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -2463317007116204135, guid: 16a6ac691db1632448c10c4b509089fd, type: 3} --- !u!1 &1516834549 GameObject: m_ObjectHideFlags: 0 @@ -94664,6 +94760,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1752115129} m_CullTransparentMesh: 0 +--- !u!4 &1754168346 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 698992079258812568, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + m_PrefabInstance: {fileID: 1781643437} + m_PrefabAsset: {fileID: 0} --- !u!114 &1756889607 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4723123647056567040, guid: 2ac9048583d0af747848ea5faaf1843a, @@ -95613,6 +95715,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1780287750} m_CullTransparentMesh: 0 +--- !u!1001 &1781643437 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 698992079258812567, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_Name + value: "\u4E3B\u5E2D\u53F0\u573A\u666F" + objectReference: {fileID: 0} + - target: {fileID: 698992079258812567, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 698992079258812568, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_LocalPosition.x + value: 2204 + objectReference: {fileID: 0} + - target: {fileID: 698992079258812568, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_LocalPosition.y + value: -32 + objectReference: {fileID: 0} + - target: {fileID: 698992079258812568, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_LocalPosition.z + value: -1033 + objectReference: {fileID: 0} + - target: {fileID: 698992079258812568, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 698992079258812568, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 698992079258812568, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 698992079258812568, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 698992079258812568, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 698992079258812568, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 698992079258812568, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 698992079258812568, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 698992079431348513, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 698992079431348515, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_BackGroundColor.r + value: 0.39735296 + objectReference: {fileID: 0} + - target: {fileID: 698992079431348515, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_BackGroundColor.g + value: 0.46529412 + objectReference: {fileID: 0} + - target: {fileID: 698992079431348515, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_BackGroundColor.b + value: 0.52294123 + objectReference: {fileID: 0} + - target: {fileID: 698992079431348515, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_BackGroundColor.a + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 698992079842674932, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 698992079842674932, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 698992079842674935, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_TerrainData + value: + objectReference: {fileID: 0} + - target: {fileID: 698992079842674935, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_ScaleInLightmap + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 698992079842674935, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_AllowAutoConnect + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2577195966376579533, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 7413945746087729120, guid: 55335b6cb15262a40b7c18e7a167f904, + type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 55335b6cb15262a40b7c18e7a167f904, type: 3} --- !u!1 &1782995023 GameObject: m_ObjectHideFlags: 0 @@ -96041,7 +96277,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1791586740} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: @@ -96106,8 +96342,8 @@ RectTransform: - {fileID: 99605104} - {fileID: 1480739350} - {fileID: 309761634} - m_Father: {fileID: 0} - m_RootOrder: 9 + m_Father: {fileID: 1864715517} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -96975,8 +97211,8 @@ MonoBehaviour: sunlightObject: {fileID: 1242063471} sunSphereObject: {fileID: 198973213} moonlightObject: {fileID: 639984703} - moonLightAmt: 0.9705016 - moonPhase: 0.4852508 + moonLightAmt: 0.97970897 + moonPhase: 0.48985445 ambientCol: {r: 1, g: 1, b: 1, a: 1} colorSun: {r: 1, g: 0.99607843, b: 0.9843137, a: 1} colorMoon: {r: 0.4392157, g: 0.5921569, b: 0.69803923, a: 1} @@ -97324,7 +97560,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 1363670156 + randSeed: 1374790109 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 @@ -98773,6 +99009,7 @@ RectTransform: m_Children: - {fileID: 936705244} - {fileID: 943533374} + - {fileID: 1791586746} m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -127725,7 +127962,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4900298107138641668 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Zion/Scenes/复盘回放.unity b/Assets/Zion/Scenes/复盘回放.unity index aad34d7a..a66afeb8 100644 --- a/Assets/Zion/Scenes/复盘回放.unity +++ b/Assets/Zion/Scenes/复盘回放.unity @@ -342,7 +342,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1150735769, guid: 584a4bcfc3ca8ef4cab535ab045a9515, type: 3} propertyPath: m_AnchoredPosition.y - value: 192.90756 + value: 156.38412 objectReference: {fileID: 0} - target: {fileID: 1150735769, guid: 584a4bcfc3ca8ef4cab535ab045a9515, type: 3} propertyPath: m_SizeDelta.y