diff --git a/.vs/Place/v16/.suo b/.vs/Place/v16/.suo index b535fa7..391e1e1 100644 Binary files a/.vs/Place/v16/.suo and b/.vs/Place/v16/.suo differ diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj index 12d6efb..4ca0cd6 100644 --- a/Assembly-CSharp-Editor.csproj +++ b/Assembly-CSharp-Editor.csproj @@ -265,16 +265,16 @@ C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll - C:/Users/20217/Desktop/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll + D:/UnityProject/Project/xf/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll - C:/Users/20217/Desktop/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll + D:/UnityProject/Project/xf/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll - C:/Users/20217/Desktop/Place/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll + D:/UnityProject/Project/xf/Place/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll - C:/Users/20217/Desktop/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll + D:/UnityProject/Project/xf/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll @@ -631,10 +631,10 @@ D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEngine.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEditor.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll diff --git a/Assembly-CSharp-firstpass.Player.csproj b/Assembly-CSharp-firstpass.Player.csproj index cda7437..8ed2625 100644 --- a/Assembly-CSharp-firstpass.Player.csproj +++ b/Assembly-CSharp-firstpass.Player.csproj @@ -267,7 +267,7 @@ Assets/Plugins/Demigiant/DOTween/DOTween.dll - C:/Users/20217/Desktop/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll + D:/UnityProject/Project/xf/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll D:\UnityHub\2019.4.17f1c1\Editor\Data\NetStandard\ref\2.0.0\netstandard.dll diff --git a/Assembly-CSharp-firstpass.csproj b/Assembly-CSharp-firstpass.csproj index 4497eee..2f48729 100644 --- a/Assembly-CSharp-firstpass.csproj +++ b/Assembly-CSharp-firstpass.csproj @@ -257,13 +257,13 @@ D:/UnityHub/2019.4.17f1c1/Editor/Data/Managed/UnityEditor.dll - C:/Users/20217/Desktop/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll + D:/UnityProject/Project/xf/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll - C:/Users/20217/Desktop/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll + D:/UnityProject/Project/xf/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll - C:/Users/20217/Desktop/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll + D:/UnityProject/Project/xf/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll D:/UnityHub/2019.4.17f1c1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll @@ -611,10 +611,10 @@ D:/UnityHub/2019.4.17f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEngine.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEditor.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll diff --git a/Assembly-CSharp.Player.csproj b/Assembly-CSharp.Player.csproj index 6051fd5..8778a5f 100644 --- a/Assembly-CSharp.Player.csproj +++ b/Assembly-CSharp.Player.csproj @@ -270,7 +270,7 @@ Assets/Plugins/Demigiant/DOTween/DOTween.dll - C:/Users/20217/Desktop/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll + D:/UnityProject/Project/xf/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll D:\UnityHub\2019.4.17f1c1\Editor\Data\NetStandard\ref\2.0.0\netstandard.dll @@ -632,8 +632,10 @@ + + diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 414fc21..0731620 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -77,8 +77,10 @@ + + @@ -283,13 +285,13 @@ D:/UnityHub/2019.4.17f1c1/Editor/Data/Managed/UnityEditor.dll - C:/Users/20217/Desktop/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll + D:/UnityProject/Project/xf/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll - C:/Users/20217/Desktop/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll + D:/UnityProject/Project/xf/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll - C:/Users/20217/Desktop/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll + D:/UnityProject/Project/xf/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll D:/UnityHub/2019.4.17f1c1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll @@ -637,10 +639,10 @@ D:/UnityHub/2019.4.17f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEngine.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEditor.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll diff --git a/Assets/BuildSystem/Data/PlaceObject_SO.cs b/Assets/BuildSystem/Data/PlaceObject_SO.cs index 5567772..da063c2 100644 --- a/Assets/BuildSystem/Data/PlaceObject_SO.cs +++ b/Assets/BuildSystem/Data/PlaceObject_SO.cs @@ -32,15 +32,20 @@ namespace BuildSystem private void OnEnable() { + roadGoInfo = new List(); - for (int i=0;i<4;i++) { - for (int j=0;j<3;j++) { + + + for (int i = 0; i < 4; i++) + { + for (int j = 0; j < 3; j++) + { object[] isCan = new object[4] { null, null, null, null }; //如果对应方向上有道路 进行特殊设置 if (isHaveRoad[i] == DirIsHaveRoad.Yes) { //遍历四个方向 如果方向有道路说明可以设置 - if (roadNumberType[i] == RoadNumberType.Two && j==2) + if (roadNumberType[i] == RoadNumberType.Two && j == 2) { roadGoInfo.Add(isCan); break; @@ -59,6 +64,340 @@ namespace BuildSystem } } + if (nameString == "T2Down") + { + roadGoInfo = null; + roadGoInfo = new List() { + new object[4]{null,null,null,null}, + new object[4]{null,null,null,null}, + new object[4]{null,null,null,null}, + + new object[4]{null,null,true,true}, + new object[4]{null,null, true, true}, + new object[4]{null,null,null,null}, + + new object[4]{null,true,null,null}, + new object[4]{null,null,null,true}, + new object[4]{null,null,null,null}, + + new object[4]{null,true,true,null}, + new object[4]{null,true,true,null}, + new object[4]{null,null,null,null}, + }; + } else if (nameString == "T2Left") { + roadGoInfo = null; + roadGoInfo = new List() { + new object[4]{null,null,true,true}, + new object[4]{null, null, true, true}, + new object[4]{null,null,null,null}, + + new object[4]{null,null,null,null}, + new object[4]{null,null, null, null}, + new object[4]{null,null,null,null}, + + new object[4]{true,null,null,true}, + new object[4]{ true, null, null,true}, + new object[4]{null,null,null,null}, + + new object[4]{null,null, true, null}, + new object[4]{true, null, null, null}, + new object[4]{null,null,null,null}, + }; + } + else if (nameString == "T2Right") + { + roadGoInfo = null; + roadGoInfo = new List() { + new object[4]{null,true,true,null}, + new object[4]{null, true, true, null}, + new object[4]{null,null,null,null}, + + new object[4]{true,null,null,null}, + new object[4]{null,null, true, null}, + new object[4]{null,null,null,null}, + + new object[4]{true,true,null,null}, + new object[4]{ true, true, null,null}, + new object[4]{null,null,null,null}, + + new object[4]{null,null, null, null}, + new object[4]{null, null, null, null}, + new object[4]{null,null,null,null}, + }; + } + else if (nameString == "T2Up") + { + roadGoInfo = null; + roadGoInfo = new List() { + new object[4]{null,null, null, true}, + new object[4]{null, true, null, null}, + new object[4]{null,null,null,null}, + + new object[4]{true,null,null,true}, + new object[4]{ true, null, null, true}, + new object[4]{null,null,null,null}, + + new object[4]{null, null, null,null}, + new object[4]{ null, null, null,null}, + new object[4]{null,null,null,null}, + + new object[4]{true, true, null, null}, + new object[4]{ true, true, null, null}, + new object[4]{null,null,null,null}, + }; + }else if (nameString == "T3Down") + { + roadGoInfo = null; + roadGoInfo = new List() { + new object[4]{null,null,null,null}, + new object[4]{null,null,null,null}, + new object[4]{null,null,null,null}, + + new object[4]{null,null,true,true}, + new object[4]{null,null, true, true}, + new object[4]{null,null, true, true}, + + new object[4]{null,true,null,null}, + new object[4]{null,true,null,true}, + new object[4]{null,null,null,true}, + + new object[4]{null,true,true,null}, + new object[4]{null,true,true,null}, + new object[4]{null, true, true, null}, + }; + } + else if (nameString == "T3Left") + { + roadGoInfo = null; + roadGoInfo = new List() { + new object[4]{null,null,true,true}, + new object[4]{null, null, true, true}, + new object[4]{null,null, true, true}, + + new object[4]{null,null,null,null}, + new object[4]{null,null, null, null}, + new object[4]{null,null,null,null}, + + new object[4]{true,null,null,true}, + new object[4]{ true, null, null,true}, + new object[4]{ true, null,null,true}, + + new object[4]{null,null, true, null}, + new object[4]{true, null, true, null}, + new object[4]{ true, null,null,null}, + }; + } + else if (nameString == "T3Right") + { + roadGoInfo = null; + roadGoInfo = new List() { + new object[4]{null,true,true,null}, + new object[4]{null, true, true, null}, + new object[4]{null, true, true, null}, + + new object[4]{true,null,null,null}, + new object[4]{ true, null, true, null}, + new object[4]{null,null, true, null}, + + new object[4]{true,true,null,null}, + new object[4]{ true, true, null,null}, + new object[4]{ true, true, null,null}, + + new object[4]{null,null, null, null}, + new object[4]{null, null, null, null}, + new object[4]{null,null,null,null}, + }; + } + else if (nameString == "T3Up") + { + roadGoInfo = null; + roadGoInfo = new List() { + new object[4]{null,null, null, true}, + new object[4]{null, true, null, true}, + new object[4]{null, true, null,null}, + + new object[4]{true,null,null,true}, + new object[4]{ true, null, null, true}, + new object[4]{ true, null,null,true}, + + new object[4]{null, null, null,null}, + new object[4]{ null, null, null,null}, + new object[4]{null,null,null,null}, + + new object[4]{true, true, null, null}, + new object[4]{ true, true, null, null}, + new object[4]{ true, true, null,null}, + }; + } + else if (nameString == "T23Down") + { + roadGoInfo = null; + roadGoInfo = new List() { + new object[4]{null,null,null,null}, + new object[4]{null,null,null,null}, + new object[4]{null,null,null,null}, + + new object[4]{null,null,true,true}, + new object[4]{null,null, true, true}, + new object[4]{null,null,null,null}, + + new object[4]{null,true,null,null}, + new object[4]{null, true, null,true}, + new object[4]{null,null,null,true}, + + new object[4]{null,true,true,null}, + new object[4]{null,true,true,null}, + new object[4]{null,null,null,null}, + }; + } + else if (nameString == "T23Left") + { + roadGoInfo = null; + roadGoInfo = new List() { + new object[4]{null,null,true,true}, + new object[4]{null, null, true, true}, + new object[4]{null,null,null,null}, + + new object[4]{null,null,null,null}, + new object[4]{null,null, null, null}, + new object[4]{null,null,null,null}, + + new object[4]{true,null,null,true}, + new object[4]{ true, null, null,true}, + new object[4]{null,null,null,null}, + + new object[4]{null,null, true, null}, + new object[4]{true, null, true, null}, + new object[4]{ true, null,null,null}, + }; + } + else if (nameString == "T23Right") + { + roadGoInfo = null; + roadGoInfo = new List() { + new object[4]{null,true,true,null}, + new object[4]{null, true, true, null}, + new object[4]{null,null,null,null}, + + new object[4]{true,null,null,null}, + new object[4]{ true, null, true, null}, + new object[4]{null,null, true, null}, + + new object[4]{true,true,null,null}, + new object[4]{ true, true, null,null}, + new object[4]{null,null,null,null}, + + new object[4]{null,null, null, null}, + new object[4]{null, null, null, null}, + new object[4]{null,null,null,null}, + }; + } + else if (nameString == "T23Up") + { + roadGoInfo = null; + roadGoInfo = new List() { + new object[4]{null,null, null, true}, + new object[4]{null, true, null, true}, + new object[4]{null, true, null,null}, + + new object[4]{true,null,null,true}, + new object[4]{ true, null, null, true}, + new object[4]{null,null,null,null}, + + new object[4]{null, null, null,null}, + new object[4]{ null, null, null,null}, + new object[4]{null,null,null,null}, + + new object[4]{true, true, null, null}, + new object[4]{ true, true, null, null}, + new object[4]{null,null,null,null}, + }; + } + else if (nameString == "T32Down") + { + roadGoInfo = null; + roadGoInfo = new List() { + new object[4]{null,null,null,null}, + new object[4]{null,null,null,null}, + new object[4]{null,null,null,null}, + + new object[4]{null,null,true,true}, + new object[4]{null,null, true, true}, + new object[4]{null,null, true, true}, + + new object[4]{null,true,null,null}, + new object[4]{null,null,null,true}, + new object[4]{null,null,null,null}, + + new object[4]{null,true,true,null}, + new object[4]{null,true,true,null}, + new object[4]{null, true, true, null}, + }; + } + else if (nameString == "T32Left") + { + roadGoInfo = null; + roadGoInfo = new List() { + new object[4]{null,null,true,true}, + new object[4]{null, null, true, true}, + new object[4]{null,null, true, true}, + + new object[4]{null,null,null,null}, + new object[4]{null,null, null, null}, + new object[4]{null,null,null,null}, + + new object[4]{true,null,null,true}, + new object[4]{ true, null, null,true}, + new object[4]{ true, null,null,true}, + + new object[4]{null,null, true, null}, + new object[4]{true, null, null, null}, + new object[4]{ null, null,null,null}, + }; + } + else if (nameString == "T32Right") + { + roadGoInfo = null; + roadGoInfo = new List() { + new object[4]{null,true,true,null}, + new object[4]{null, true, true, null}, + new object[4]{null, true, true, null}, + + new object[4]{true,null,null,null}, + new object[4]{ null, null, true, null}, + new object[4]{null,null, null, null}, + + new object[4]{true,true,null,null}, + new object[4]{ true, true, null,null}, + new object[4]{ true, true, null,null}, + + new object[4]{null,null, null, null}, + new object[4]{null, null, null, null}, + new object[4]{null,null,null,null}, + }; + } + else if (nameString == "T32Up") + { + roadGoInfo = null; + roadGoInfo = new List() { + new object[4]{null,null, null, true}, + new object[4]{null, true, null, null}, + new object[4]{null, null, null,null}, + + new object[4]{true,null,null,true}, + new object[4]{ true, null, null, true}, + new object[4]{ true, null,null,true}, + + new object[4]{null, null, null,null}, + new object[4]{ null, null, null,null}, + new object[4]{null,null,null,null}, + + new object[4]{true, true, null, null}, + new object[4]{ true, true, null, null}, + new object[4]{ true, true, null,null}, + }; + } + } } diff --git a/Assets/BuildSystem/Example/BuildExample.unity b/Assets/BuildSystem/Example/BuildExample.unity index 25a294a..af60736 100644 --- a/Assets/BuildSystem/Example/BuildExample.unity +++ b/Assets/BuildSystem/Example/BuildExample.unity @@ -268,6 +268,114 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5566531} m_Mesh: {fileID: 4300002, guid: 67bc2e6079f953043b020b35a78ad145, type: 3} +--- !u!1 &6651867 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6651868} + - component: {fileID: 6651872} + - component: {fileID: 6651871} + - component: {fileID: 6651870} + m_Layer: 5 + m_Name: render + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6651868 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6651867} + 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: + - {fileID: 2054870284} + - {fileID: 294382300} + - {fileID: 276738426} + m_Father: {fileID: 1671534114} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -175, y: -38} + m_SizeDelta: {x: 300, y: 1000} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6651870 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6651867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 1885335599} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 2054870284} + m_HorizontalScrollbar: {fileID: 294382301} + m_VerticalScrollbar: {fileID: 276738427} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &6651871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6651867} + 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: 0.392} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 52bf562767db9924e90c226c24317064, 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!222 &6651872 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6651867} + m_CullTransparentMesh: 0 --- !u!1 &17809807 GameObject: m_ObjectHideFlags: 0 @@ -303,9 +411,9 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: -17} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &17809809 MonoBehaviour: @@ -357,6 +465,136 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 17809807} m_CullTransparentMesh: 0 +--- !u!1 &28342270 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 28342271} + - component: {fileID: 28342274} + - component: {fileID: 28342273} + - component: {fileID: 28342272} + m_Layer: 5 + m_Name: I know + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &28342271 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 28342270} + 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: + - {fileID: 867624384} + m_Father: {fileID: 1415787196} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 160} + m_SizeDelta: {x: 250, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &28342272 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 28342270} + 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: 28342273} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1415787195} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &28342273 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 28342270} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!222 &28342274 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 28342270} + m_CullTransparentMesh: 0 --- !u!1 &32088576 GameObject: m_ObjectHideFlags: 0 @@ -518,87 +756,502 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1671534114} m_Modifications: - - target: {fileID: 4487359194139227728, guid: fa32fb98d866fa144b3b41414d1f799b, + - target: {fileID: 3635242881787025514, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} - propertyPath: m_Name - value: TraficWnd + propertyPath: m_AnchorMax.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + - target: {fileID: 3635242881787025514, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} - propertyPath: m_Pivot.x - value: 0.5 + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + - target: {fileID: 3635242881802783948, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} - propertyPath: m_Pivot.y - value: 0.5 + propertyPath: m_AnchorMax.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + - target: {fileID: 3635242881802783948, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} - propertyPath: m_RootOrder - value: 5 + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + - target: {fileID: 3635242882052063188, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + - target: {fileID: 3635242882052063188, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + - target: {fileID: 3635242882069930287, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} - propertyPath: m_AnchorMin.x + propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + - target: {fileID: 3635242882069930287, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} - propertyPath: m_AnchorMin.y + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + - target: {fileID: 3635242882130766117, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} - propertyPath: m_SizeDelta.x + propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + - target: {fileID: 3635242882130766117, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} - propertyPath: m_SizeDelta.y + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + - target: {fileID: 3635242882130766117, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} - propertyPath: m_LocalPosition.x + propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + - target: {fileID: 3635242882144609161, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} - propertyPath: m_LocalPosition.y + propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + - target: {fileID: 3635242882144609161, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} - propertyPath: m_LocalPosition.z + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + - target: {fileID: 3635242882144609161, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 + propertyPath: m_AnchorMin.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + - target: {fileID: 3635242882158999518, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} - propertyPath: m_LocalRotation.x + propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + - target: {fileID: 3635242882158999518, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} - propertyPath: m_LocalRotation.y + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + - target: {fileID: 3635242882158999518, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882247257927, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882247257927, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882247257927, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882247257927, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882497909143, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882497909143, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882497909143, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882497909143, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882593049151, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882593049151, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882593049151, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882635961540, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882635961540, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882635961540, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882661874226, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882661874226, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882661874226, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882661874226, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882700584137, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882700584137, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882700584137, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882700584137, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882854197988, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882854197988, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882854197988, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882854197988, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882918558441, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882918558441, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242882918558441, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883325767610, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883325767610, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883325767610, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883325767610, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883345772865, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883345772865, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883345772865, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883345772865, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883396083108, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883396083108, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883396083108, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883424179976, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883424179976, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883424179976, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883443213151, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883443213151, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883443213151, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883468205826, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883468205826, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883529052049, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883529052049, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883529052049, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883529052049, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883578417514, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883578417514, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883578417514, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883578417514, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883725375676, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883725375676, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883737940705, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883737940705, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883751536199, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883751536199, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883772460058, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635242883772460058, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4487359192800305660, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4487359194139227728, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_Name + value: TraficWnd + objectReference: {fileID: 0} + - target: {fileID: 4487359194139227728, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} propertyPath: m_LocalRotation.z value: 0 @@ -631,11 +1284,161 @@ PrefabInstance: - target: {fileID: 5533274112870970537, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5533274113210346291, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5533274113474029348, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5533274113474029348, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5533274113474029348, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 128 + objectReference: {fileID: 0} + - target: {fileID: 5576117237989743379, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117237989743379, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117237989743379, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117237989743379, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117238080907533, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117238080907533, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117238080907533, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117238242272707, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117238242272707, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117238242272707, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117238242272707, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117238418556488, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117238418556488, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117238436418286, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117238436418286, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117238901118342, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117238901118342, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117238940982668, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117238940982668, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117238940982668, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117239450509421, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117239450509421, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117239450509421, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117239511978080, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117239511978080, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117239511978080, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5576117239511978080, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] @@ -856,7 +1659,7 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -866,17 +1669,17 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -916,12 +1719,12 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.x - value: 2582.7 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.y - value: -170 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -968,6 +1771,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 23.898438 objectReference: {fileID: 0} + - target: {fileID: 2688360741066541054, guid: d1d8013ae57d5e44e8488f39b40a851c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7150356350685904613, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_Text @@ -1260,6 +2068,81 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 131822521} m_Mesh: {fileID: 4300000, guid: 46b724316b932be4c9467096e0677a0a, type: 3} +--- !u!1 &136427671 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 136427672} + - component: {fileID: 136427674} + - component: {fileID: 136427673} + m_Layer: 5 + m_Name: tip1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &136427672 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 136427671} + 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: + - {fileID: 1307781983} + m_Father: {fileID: 1637391349} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 174, y: 301} + m_SizeDelta: {x: 350, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &136427673 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 136427671} + 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: 0.990566, g: 0.35978103, b: 0.35978103, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e2e31c57d13b08b4fb7c831431dff1bf, 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!222 &136427674 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 136427671} + m_CullTransparentMesh: 0 --- !u!1 &137901423 GameObject: m_ObjectHideFlags: 0 @@ -1292,9 +2175,9 @@ MonoBehaviour: birth: [] carPrefabs: - {fileID: 7784768134556555210, guid: f7edd1ca06cddcc4783ee10929c068e2, type: 3} - carNumber: 1 + carNumber: 30 createTime: {x: 2, y: 4} - speed: {x: 30, y: 60} + speed: {x: 20, y: 20} --- !u!4 &137901425 Transform: m_ObjectHideFlags: 0 @@ -1309,6 +2192,80 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &138336216 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 138336217} + - component: {fileID: 138336219} + - component: {fileID: 138336218} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &138336217 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 138336216} + 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: 539217569} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.028333336, y: 0} + m_AnchorMax: {x: 0.9716667, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &138336218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 138336216} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!222 &138336219 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 138336216} + m_CullTransparentMesh: 0 --- !u!1 &146968576 GameObject: m_ObjectHideFlags: 0 @@ -1516,7 +2473,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1355420933} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1722,6 +2679,81 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5cd3b6c6cb7cb0a44975b1a96203c9c6, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &195826176 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 195826177} + - component: {fileID: 195826179} + - component: {fileID: 195826178} + m_Layer: 5 + m_Name: tip2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &195826177 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195826176} + 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: + - {fileID: 404695535} + m_Father: {fileID: 1637391349} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 778, y: -585} + m_SizeDelta: {x: 350, y: 1000} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &195826178 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195826176} + 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: 0.990566, g: 0.35978103, b: 0.35978103, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e2e31c57d13b08b4fb7c831431dff1bf, 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!222 &195826179 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195826176} + m_CullTransparentMesh: 0 --- !u!1001 &199627365 PrefabInstance: m_ObjectHideFlags: 0 @@ -1805,7 +2837,7 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -1815,17 +2847,17 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -1865,12 +2897,12 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.x - value: 2311.4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.y - value: -170 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -1962,7 +2994,7 @@ RectTransform: - {fileID: 1220851881} - {fileID: 1447911818} m_Father: {fileID: 1671534114} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -2887,8 +3919,132 @@ MeshFilter: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 276630056} - m_Mesh: {fileID: 4300000, guid: ac280b29cfcce58448e0b556c17e68fd, type: 3} + m_GameObject: {fileID: 276630056} + m_Mesh: {fileID: 4300000, guid: ac280b29cfcce58448e0b556c17e68fd, type: 3} +--- !u!1 &276738425 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 276738426} + - component: {fileID: 276738429} + - component: {fileID: 276738428} + - component: {fileID: 276738427} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &276738426 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 276738425} + 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: + - {fileID: 807184036} + m_Father: {fileID: 6651868} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: -17} + m_Pivot: {x: 1, y: 1} +--- !u!114 &276738427 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 276738425} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 1417791658} + m_HandleRect: {fileID: 1417791657} + m_Direction: 2 + m_Value: 1.0000005 + m_Size: 0.32766667 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &276738428 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 276738425} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!222 &276738429 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 276738425} + m_CullTransparentMesh: 0 --- !u!1001 &282139675 PrefabInstance: m_ObjectHideFlags: 0 @@ -2972,7 +4128,7 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -2982,17 +4138,17 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -3032,12 +4188,12 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.x - value: 2040.1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.y - value: -170 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -3185,7 +4341,7 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -3195,17 +4351,17 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -3245,12 +4401,12 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.x - value: 954.9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.y - value: -170 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -3310,6 +4466,130 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 283820979} m_PrefabAsset: {fileID: 0} +--- !u!1 &294382299 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 294382300} + - component: {fileID: 294382303} + - component: {fileID: 294382302} + - component: {fileID: 294382301} + m_Layer: 5 + m_Name: Scrollbar Horizontal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &294382300 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294382299} + 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: + - {fileID: 539217569} + m_Father: {fileID: 6651868} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -17, y: 20} + m_Pivot: {x: 0, y: 0} +--- !u!114 &294382301 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294382299} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 138336218} + m_HandleRect: {fileID: 138336217} + m_Direction: 0 + m_Value: 0.5 + m_Size: 0.9433333 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &294382302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294382299} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!222 &294382303 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294382299} + m_CullTransparentMesh: 0 --- !u!1 &308508680 GameObject: m_ObjectHideFlags: 0 @@ -3345,9 +4625,9 @@ RectTransform: m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 20} + m_SizeDelta: {x: 0, y: 20} m_Pivot: {x: 0, y: 0} --- !u!114 &308508682 MonoBehaviour: @@ -3463,7 +4743,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1671534114} - m_RootOrder: 8 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3514,7 +4794,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1355420933} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3975,7 +5255,8 @@ MonoBehaviour: grid: [] isUI: 0 flag: {fileID: 523532168} - isGameEnd: 0 + oneStageEnd: 0 + redGreenLightEnd: 0 t2up: {fileID: 11400000, guid: b23c1945520cf224983adf6101d9f50e, type: 2} t2down: {fileID: 11400000, guid: 4d14daf8a6aefb54db22812b28dafddf, type: 2} h2: {fileID: 11400000, guid: a8c03fa26591de3439bc8fdc6fee07b2, type: 2} @@ -4415,6 +5696,84 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 400145582} m_Mesh: {fileID: 4300008, guid: ad0c8422dbbc641408ec72a4e9d3ae48, type: 3} +--- !u!1 &404695534 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 404695535} + - component: {fileID: 404695537} + - component: {fileID: 404695536} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &404695535 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 404695534} + 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: 195826177} + m_RootOrder: 0 + 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: -331, y: 104} + m_SizeDelta: {x: 300, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &404695536 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 404695534} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 60 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 86 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u53F3\u4FA7\u53EF\u4EE5\u6EDA\u52A8\u67E5\u770B\u5404\u4E2A\u8DEF\u53E3\u7684\u76D1\u63A7\u5B9E\u51B5" +--- !u!222 &404695537 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 404695534} + m_CullTransparentMesh: 0 --- !u!1 &410372613 GameObject: m_ObjectHideFlags: 0 @@ -5289,6 +6648,42 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &539217568 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 539217569} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &539217569 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 539217568} + 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: + - {fileID: 138336217} + m_Father: {fileID: 294382300} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &539568124 GameObject: m_ObjectHideFlags: 0 @@ -5965,7 +7360,7 @@ GameObject: - component: {fileID: 629147188} - component: {fileID: 629147187} m_Layer: 5 - m_Name: "\u76F4\u884C" + m_Name: "\u4E0A" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -6291,7 +7686,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &654788397 RectTransform: m_ObjectHideFlags: 0 @@ -6306,7 +7701,7 @@ RectTransform: - {fileID: 191125214} - {fileID: 2129246429} m_Father: {fileID: 1671534114} - m_RootOrder: 4 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -6604,9 +7999,9 @@ RectTransform: m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: -17} + m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 1, y: 1} --- !u!114 &686767131 MonoBehaviour: @@ -7630,7 +9025,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.61307937, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -7750,6 +9145,42 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 804121783} m_Mesh: {fileID: 4300004, guid: ad0c8422dbbc641408ec72a4e9d3ae48, type: 3} +--- !u!1 &807184035 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 807184036} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &807184036 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 807184035} + 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: + - {fileID: 1417791657} + m_Father: {fileID: 276738426} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &820113292 GameObject: m_ObjectHideFlags: 0 @@ -7804,6 +9235,81 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 820113292} m_Mesh: {fileID: 4300002, guid: 4831d2ce2aa1d2649a2c891da219bf48, type: 3} +--- !u!1 &851271862 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 851271863} + - component: {fileID: 851271865} + - component: {fileID: 851271864} + m_Layer: 5 + m_Name: tip1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &851271863 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 851271862} + 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: + - {fileID: 1997611472} + m_Father: {fileID: 1415787196} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 174, y: 301} + m_SizeDelta: {x: 350, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &851271864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 851271862} + 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: 0.990566, g: 0.35978103, b: 0.35978103, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e2e31c57d13b08b4fb7c831431dff1bf, 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!222 &851271865 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 851271862} + m_CullTransparentMesh: 0 --- !u!1 &851834572 GameObject: m_ObjectHideFlags: 0 @@ -7976,6 +9482,84 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 861509709} m_Mesh: {fileID: 4300000, guid: 172699eecd3e19a4d8a3a7cea559c989, type: 3} +--- !u!1 &867624383 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 867624384} + - component: {fileID: 867624386} + - component: {fileID: 867624385} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &867624384 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 867624383} + 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: 28342271} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &867624385 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 867624383} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 31 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6211\u77E5\u9053\u4E86" +--- !u!222 &867624386 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 867624383} + m_CullTransparentMesh: 0 --- !u!1 &870950508 GameObject: m_ObjectHideFlags: 0 @@ -8134,7 +9718,7 @@ RectTransform: 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: -951.5, y: 141.49998} + m_AnchoredPosition: {x: -951.50006, y: 141.49998} m_SizeDelta: {x: 3104, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &875169250 @@ -8826,7 +10410,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -9401,14 +10985,170 @@ MeshFilter: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 981560260} - m_Mesh: {fileID: 4300002, guid: ceac1b6ce30c82f4092f1b298b41e446, type: 3} ---- !u!4 &998809370 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 0c0ec567b6bda4c4d874856c4f610c3a, - type: 3} - m_PrefabInstance: {fileID: 275781380} + m_GameObject: {fileID: 981560260} + m_Mesh: {fileID: 4300002, guid: ceac1b6ce30c82f4092f1b298b41e446, type: 3} +--- !u!4 &998809370 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 0c0ec567b6bda4c4d874856c4f610c3a, + type: 3} + m_PrefabInstance: {fileID: 275781380} + m_PrefabAsset: {fileID: 0} +--- !u!1 &999835335 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 999835336} + - component: {fileID: 999835338} + - component: {fileID: 999835337} + m_Layer: 5 + m_Name: target + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &999835336 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999835335} + 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: 1415787196} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 344} + m_SizeDelta: {x: 1400, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &999835337 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999835335} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 60 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 86 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u9636\u6BB5\u76EE\u6807\uFF1A\u5C06\u6240\u6709\u5341\u5B57\u6216T\u5F62\u8DEF\u53E3\u90FD\u5E03\u7F6E\u7EA2\u7EFF\u706F" +--- !u!222 &999835338 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999835335} + m_CullTransparentMesh: 0 +--- !u!1 &1008518081 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1008518082} + - component: {fileID: 1008518084} + - component: {fileID: 1008518083} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1008518082 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1008518081} + 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: 1291033757} + m_RootOrder: 0 + 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: 22, y: -210} + m_SizeDelta: {x: 300, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1008518083 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1008518081} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 60 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 86 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u70B9\u51FB\u5341\u5B57\u6216T\u5F62\u8DEF\u53E3\u653E\u7F6E\u7EA2\u7EFF\u706F" +--- !u!222 &1008518084 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1008518081} + m_CullTransparentMesh: 0 --- !u!1 &1015070524 GameObject: m_ObjectHideFlags: 0 @@ -10865,7 +12605,7 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -10875,17 +12615,17 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -10925,12 +12665,12 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.x - value: 1497.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.y - value: -170 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -10982,6 +12722,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 23.898438 objectReference: {fileID: 0} + - target: {fileID: 2688360741066541054, guid: d1d8013ae57d5e44e8488f39b40a851c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7150356350685904613, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_Text @@ -11078,7 +12823,7 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -11088,17 +12833,17 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -11138,12 +12883,12 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.x - value: 1768.8 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.y - value: -170 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -12121,6 +13866,81 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1278259072} m_Mesh: {fileID: 4300004, guid: ad0c8422dbbc641408ec72a4e9d3ae48, type: 3} +--- !u!1 &1291033756 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1291033757} + - component: {fileID: 1291033759} + - component: {fileID: 1291033758} + m_Layer: 5 + m_Name: tip2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1291033757 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1291033756} + 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: + - {fileID: 1008518082} + m_Father: {fileID: 1415787196} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 304, y: -148} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1291033758 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1291033756} + 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: 0.990566, g: 0.35978103, b: 0.35978103, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e2e31c57d13b08b4fb7c831431dff1bf, 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!222 &1291033759 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1291033756} + m_CullTransparentMesh: 0 --- !u!1 &1297235553 GameObject: m_ObjectHideFlags: 0 @@ -12238,22 +14058,230 @@ MeshCollider: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1304876083} - m_Material: {fileID: 0} - m_IsTrigger: 0 + m_GameObject: {fileID: 1304876083} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: fd3ae6a9328b474489d665a96cc729d5, type: 3} +--- !u!33 &1304876086 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1304876083} + m_Mesh: {fileID: 4300002, guid: fd3ae6a9328b474489d665a96cc729d5, type: 3} +--- !u!1 &1307781982 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1307781983} + - component: {fileID: 1307781985} + - component: {fileID: 1307781984} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1307781983 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1307781982} + 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: 136427672} + m_RootOrder: 0 + 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: -264.9} + m_SizeDelta: {x: 300, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1307781984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1307781982} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 60 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 86 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u70B9\u51FB\u6309\u94AE\u8FDB\u884C\u901A\u8F66" +--- !u!222 &1307781985 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1307781982} + m_CullTransparentMesh: 0 +--- !u!1 &1322957645 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1322957646} + - component: {fileID: 1322957649} + - component: {fileID: 1322957648} + - component: {fileID: 1322957647} + m_Layer: 5 + m_Name: I know + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1322957646 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1322957645} + 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: + - {fileID: 1966865815} + m_Father: {fileID: 1637391349} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 160} + m_SizeDelta: {x: 250, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1322957647 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1322957645} + 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: 1322957648} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1637391348} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1322957648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1322957645} m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: fd3ae6a9328b474489d665a96cc729d5, type: 3} ---- !u!33 &1304876086 -MeshFilter: + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!222 &1322957649 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1304876083} - m_Mesh: {fileID: 4300002, guid: fd3ae6a9328b474489d665a96cc729d5, type: 3} + m_GameObject: {fileID: 1322957645} + m_CullTransparentMesh: 0 --- !u!1 &1323982475 GameObject: m_ObjectHideFlags: 0 @@ -12581,12 +14609,13 @@ RectTransform: - {fileID: 1616747958} - {fileID: 64549339} - {fileID: 629147186} + - {fileID: 1770834830} - {fileID: 179007460} - {fileID: 318447454} - {fileID: 1998924200} - {fileID: 1960992696} m_Father: {fileID: 1671534114} - m_RootOrder: 7 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -12647,6 +14676,7 @@ MonoBehaviour: dir: - {fileID: 629147186} - {fileID: 318447454} + - {fileID: 1770834830} - {fileID: 179007460} cansetPre: {fileID: 3212732853964452016, guid: 1d277cd0a125e0a449bc26abe5ada54b, type: 3} @@ -12721,6 +14751,158 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1402043056} m_Mesh: {fileID: 4300002, guid: e1aade440a5acca468189de0511081e7, type: 3} +--- !u!1 &1415787195 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1415787196} + - component: {fileID: 1415787198} + - component: {fileID: 1415787197} + m_Layer: 5 + m_Name: LightTip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1415787196 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1415787195} + 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: + - {fileID: 851271863} + - {fileID: 1291033757} + - {fileID: 28342271} + - {fileID: 999835336} + m_Father: {fileID: 1671534114} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1415787197 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1415787195} + 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: 0.6320754, g: 0.6320754, b: 0.6320754, a: 0.4627451} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!222 &1415787198 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1415787195} + m_CullTransparentMesh: 0 +--- !u!1 &1417791656 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1417791657} + - component: {fileID: 1417791659} + - component: {fileID: 1417791658} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1417791657 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417791656} + 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: 807184036} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.67233336} + m_AnchorMax: {x: 1, y: 0.99999976} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1417791658 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417791656} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!222 &1417791659 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417791656} + m_CullTransparentMesh: 0 --- !u!1 &1427380569 GameObject: m_ObjectHideFlags: 0 @@ -12814,12 +14996,12 @@ GameObject: - component: {fileID: 1431439164} - component: {fileID: 1431439167} m_Layer: 5 - m_Name: Scroll View + m_Name: RoadPlace m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1431439163 RectTransform: m_ObjectHideFlags: 0 @@ -12835,7 +15017,7 @@ RectTransform: - {fileID: 308508681} - {fileID: 686767130} m_Father: {fileID: 1671534114} - m_RootOrder: 0 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -12951,11 +15133,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1671534114} - m_RootOrder: 2 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -39} + m_AnchoredPosition: {x: 0, y: -48} m_SizeDelta: {x: 1920, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1441128241 @@ -13414,7 +15596,7 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -13424,17 +15606,17 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -13474,12 +15656,12 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.x - value: 141 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.y - value: -170 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -13531,6 +15713,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 23.898438 objectReference: {fileID: 0} + - target: {fileID: 2688360741066541054, guid: d1d8013ae57d5e44e8488f39b40a851c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7150356350685904613, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_Text @@ -14277,7 +16464,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 76668314} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 1799700989} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d3544f91e6932984aafdddcc0640c63e, type: 3} @@ -14294,25 +16481,25 @@ PrefabInstance: type: 3} propertyPath: sprites.Array.data[0] value: - objectReference: {fileID: 21300000, guid: 8e3de15b7fde91d47abec487d1ebeb35, + objectReference: {fileID: 21300000, guid: 87638aa781db231458062855c574f5bd, type: 3} - target: {fileID: 2166234202111407024, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: sprites.Array.data[1] value: - objectReference: {fileID: 21300000, guid: 8e3de15b7fde91d47abec487d1ebeb35, + objectReference: {fileID: 21300000, guid: 87638aa781db231458062855c574f5bd, type: 3} - target: {fileID: 2166234202111407024, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: sprites.Array.data[2] value: - objectReference: {fileID: 21300000, guid: 8e3de15b7fde91d47abec487d1ebeb35, + objectReference: {fileID: 21300000, guid: 87638aa781db231458062855c574f5bd, type: 3} - target: {fileID: 2166234202111407024, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: sprites.Array.data[3] value: - objectReference: {fileID: 21300000, guid: 8e3de15b7fde91d47abec487d1ebeb35, + objectReference: {fileID: 21300000, guid: 87638aa781db231458062855c574f5bd, type: 3} - target: {fileID: 2166234202111407024, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -14338,6 +16525,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 9cf2fb6307a20704ea0006a89885b259, type: 2} + - target: {fileID: 2166234202111407026, guid: d1d8013ae57d5e44e8488f39b40a851c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 0} - target: {fileID: 2166234202111407028, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_Name @@ -14366,7 +16558,7 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -14376,17 +16568,17 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -14426,12 +16618,12 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.x - value: 683.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.y - value: -170 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -14780,7 +16972,42 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1619188692 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1619188693} + m_Layer: 5 + m_Name: "---\u7EA2\u7EFF\u706F\u653E\u7F6Eui" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1619188693 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1619188692} + 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: 1671534114} + m_RootOrder: 5 + 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: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1633125378 GameObject: @@ -14863,6 +17090,83 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1633125378} m_Mesh: {fileID: 6914849694665848085, guid: d90c450aba0ef964f9df263fdbeb23c3, type: 3} +--- !u!1 &1637391348 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1637391349} + - component: {fileID: 1637391351} + - component: {fileID: 1637391350} + m_Layer: 5 + m_Name: CarTip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1637391349 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1637391348} + 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: + - {fileID: 136427672} + - {fileID: 195826177} + - {fileID: 1322957646} + m_Father: {fileID: 1671534114} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1637391350 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1637391348} + 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: 0.6320754, g: 0.6320754, b: 0.6320754, a: 0.4627451} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!222 &1637391351 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1637391348} + m_CullTransparentMesh: 0 --- !u!1 &1652340022 GameObject: m_ObjectHideFlags: 0 @@ -15047,6 +17351,7 @@ GameObject: - component: {fileID: 1671534113} - component: {fileID: 1671534112} - component: {fileID: 1671534111} + - component: {fileID: 1671534115} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -15125,14 +17430,20 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 1441128240} + - {fileID: 1974106280} - {fileID: 1431439163} - {fileID: 202321946} - - {fileID: 1441128240} + - {fileID: 1355420933} + - {fileID: 1619188693} - {fileID: 1686403367} - - {fileID: 654788397} - {fileID: 1565805092} + - {fileID: 1415787196} + - {fileID: 1964243345} - {fileID: 2065607436} - - {fileID: 1355420933} + - {fileID: 6651868} + - {fileID: 1637391349} + - {fileID: 654788397} - {fileID: 313295614} m_Father: {fileID: 0} m_RootOrder: 4 @@ -15142,6 +17453,29 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &1671534115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1671534110} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 87cc54d562d5f80478b3ee95aef2d161, type: 3} + m_Name: + m_EditorClassIdentifier: + roadPlacePanel: {fileID: 1431439162} + tip: {fileID: 202321945} + placeLight: {fileID: 1686403366} + traficWnd: {fileID: 1799700989} + lightTip: {fileID: 1415787195} + carRun: {fileID: 2065607437} + render: {fileID: 6651867} + renderGrid: {fileID: 1885335599} + rawImagePre: {fileID: 5858967844998762963, guid: c2351bcd41cf8864c92888faa66b39a9, + type: 3} + carTip: {fileID: 1637391348} --- !u!1 &1686403366 GameObject: m_ObjectHideFlags: 0 @@ -15160,7 +17494,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1686403367 RectTransform: m_ObjectHideFlags: 0 @@ -15174,11 +17508,11 @@ RectTransform: m_Children: - {fileID: 1256659072} m_Father: {fileID: 1671534114} - m_RootOrder: 3 + m_RootOrder: 6 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: 789, y: -187} + m_AnchoredPosition: {x: -787, y: 303} m_SizeDelta: {x: 160, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1686403368 @@ -15597,6 +17931,75 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1749035831} m_Mesh: {fileID: 4300002, guid: e4aafaf7056bfc14d88ac105dee3c9fa, type: 3} +--- !u!1 &1770834829 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1770834830} + - component: {fileID: 1770834832} + - component: {fileID: 1770834831} + m_Layer: 5 + m_Name: "\u4E0B" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1770834830 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1770834829} + 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: 1355420933} + m_RootOrder: 3 + 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: 40, y: -47} + m_SizeDelta: {x: 80, y: 900} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1770834831 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1770834829} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 1 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 50, y: 50} + m_Spacing: {x: 0, y: 25.46} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!222 &1770834832 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1770834829} + m_CullTransparentMesh: 0 --- !u!1 &1771528457 GameObject: m_ObjectHideFlags: 0 @@ -15690,6 +18093,12 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1771528457} m_Mesh: {fileID: 4300018, guid: e4aafaf7056bfc14d88ac105dee3c9fa, type: 3} +--- !u!1 &1799700989 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4487359194139227728, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + m_PrefabInstance: {fileID: 76668314} + m_PrefabAsset: {fileID: 0} --- !u!1 &1818592518 GameObject: m_ObjectHideFlags: 0 @@ -15920,6 +18329,66 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1858516566} m_Mesh: {fileID: 4300000, guid: 68db2fbb8cf9af2478afb78161043d51, type: 3} +--- !u!1 &1885335598 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1885335599} + - component: {fileID: 1885335600} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1885335599 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1885335598} + 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: 2054870284} + m_RootOrder: 0 + 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: -150, y: 491.49902} + m_SizeDelta: {x: 300, y: 3000} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1885335600 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1885335598} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 1 + m_CellSize: {x: 300, y: 300} + m_Spacing: {x: 0, y: 13.8} + m_Constraint: 0 + m_ConstraintCount: 2 --- !u!1 &1910863715 GameObject: m_ObjectHideFlags: 0 @@ -16313,25 +18782,25 @@ PrefabInstance: type: 3} propertyPath: sprites.Array.data[0] value: - objectReference: {fileID: 21300000, guid: 7dc311123ff202d4d8bd0e138437ca4f, + objectReference: {fileID: 21300000, guid: e9e2b6dc8cb03fc4e8e13fa6ce057cd1, type: 3} - target: {fileID: 2166234202111407024, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: sprites.Array.data[1] value: - objectReference: {fileID: 21300000, guid: 71340e16471f23a4297b4f02e5e46b4d, + objectReference: {fileID: 21300000, guid: 3a7929edf91aa6440b36ab42c138cf9e, type: 3} - target: {fileID: 2166234202111407024, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: sprites.Array.data[2] value: - objectReference: {fileID: 21300000, guid: 68f5ed70927e56743bdd1afcf30acb80, + objectReference: {fileID: 21300000, guid: f7c0fb8f79de474469dca6eb72592fc0, type: 3} - target: {fileID: 2166234202111407024, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: sprites.Array.data[3] value: - objectReference: {fileID: 21300000, guid: 8e586aba425be0c4db31482dcd6980ea, + objectReference: {fileID: 21300000, guid: be5e9e97c06ab4a4bb1b11e0a063e398, type: 3} - target: {fileID: 2166234202111407024, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -16385,7 +18854,7 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -16395,17 +18864,17 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -16445,12 +18914,12 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.x - value: 412.3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.y - value: -170 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -16542,7 +19011,7 @@ RectTransform: m_Children: - {fileID: 793436537} m_Father: {fileID: 1355420933} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -16707,8 +19176,121 @@ MeshFilter: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1961138571} - m_Mesh: {fileID: 4300006, guid: e4aafaf7056bfc14d88ac105dee3c9fa, type: 3} + m_GameObject: {fileID: 1961138571} + m_Mesh: {fileID: 4300006, guid: e4aafaf7056bfc14d88ac105dee3c9fa, type: 3} +--- !u!1 &1964243344 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1964243345} + m_Layer: 5 + m_Name: "---\u901A\u8F66" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1964243345 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1964243344} + 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: 1671534114} + m_RootOrder: 9 + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1966865814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1966865815} + - component: {fileID: 1966865817} + - component: {fileID: 1966865816} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1966865815 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1966865814} + 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: 1322957646} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1966865816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1966865814} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 31 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6211\u77E5\u9053\u4E86" +--- !u!222 &1966865817 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1966865814} + m_CullTransparentMesh: 0 --- !u!1 &1967867922 GameObject: m_ObjectHideFlags: 0 @@ -16867,6 +19449,41 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1971039481} m_Mesh: {fileID: 4300002, guid: ad0c8422dbbc641408ec72a4e9d3ae48, type: 3} +--- !u!1 &1974106279 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1974106280} + m_Layer: 5 + m_Name: "---\u90E8\u7F72\u9636\u6BB5ui" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1974106280 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1974106279} + 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: 1671534114} + m_RootOrder: 1 + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1996874199 PrefabInstance: m_ObjectHideFlags: 0 @@ -16950,7 +19567,7 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -16960,17 +19577,17 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.x - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_SizeDelta.y - value: 200 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -17010,12 +19627,12 @@ PrefabInstance: - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.x - value: 1226.2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_AnchoredPosition.y - value: -170 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2166234202111407029, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} @@ -17062,6 +19679,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 23.898438 objectReference: {fileID: 0} + - target: {fileID: 2688360741066541054, guid: d1d8013ae57d5e44e8488f39b40a851c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7150356350685904613, guid: d1d8013ae57d5e44e8488f39b40a851c, type: 3} propertyPath: m_Text @@ -17075,6 +19697,84 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1996874199} m_PrefabAsset: {fileID: 0} +--- !u!1 &1997611471 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1997611472} + - component: {fileID: 1997611474} + - component: {fileID: 1997611473} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1997611472 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1997611471} + 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: 851271863} + m_RootOrder: 0 + 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: -264.9} + m_SizeDelta: {x: 300, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1997611473 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1997611471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 60 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 86 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u70B9\u51FB\u6309\u94AE\u8FDB\u884C\u7EA2\u7EFF\u706F\u653E\u7F6E" +--- !u!222 &1997611474 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1997611471} + m_CullTransparentMesh: 0 --- !u!1 &1998924199 GameObject: m_ObjectHideFlags: 0 @@ -17107,7 +19807,7 @@ RectTransform: m_Children: - {fileID: 1039269575} m_Father: {fileID: 1355420933} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -17407,6 +20107,95 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2054002118} m_Mesh: {fileID: 4300008, guid: e4aafaf7056bfc14d88ac105dee3c9fa, type: 3} +--- !u!1 &2054870283 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2054870284} + - component: {fileID: 2054870287} + - component: {fileID: 2054870286} + - component: {fileID: 2054870285} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2054870284 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2054870283} + 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: + - {fileID: 1885335599} + m_Father: {fileID: 6651868} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -17, y: -17} + m_Pivot: {x: 0, y: 1} +--- !u!114 &2054870285 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2054870283} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &2054870286 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2054870283} + 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: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!222 &2054870287 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2054870283} + m_CullTransparentMesh: 0 --- !u!1 &2065607435 GameObject: m_ObjectHideFlags: 0 @@ -17426,7 +20215,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2065607436 RectTransform: m_ObjectHideFlags: 0 @@ -17440,11 +20229,11 @@ RectTransform: m_Children: - {fileID: 2132431871} m_Father: {fileID: 1671534114} - m_RootOrder: 6 + m_RootOrder: 10 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: -826, y: -32} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 175.70001, y: 303.4} m_SizeDelta: {x: 160, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2065607437 @@ -17489,29 +20278,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2065607438} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 137901424} - m_MethodName: StartCreateCar - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 2065607435} - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!114 &2065607438 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/BuildSystem/Prefab/RawImage.prefab b/Assets/BuildSystem/Prefab/RawImage.prefab new file mode 100644 index 0000000..4bab571 --- /dev/null +++ b/Assets/BuildSystem/Prefab/RawImage.prefab @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5858967844998762963 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5285218890535125230} + - component: {fileID: 721110323562821214} + - component: {fileID: 5221919708469253406} + - component: {fileID: 2667437057891868812} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5285218890535125230 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5858967844998762963} + 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: 0} + m_RootOrder: 0 + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &721110323562821214 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5858967844998762963} + m_CullTransparentMesh: 0 +--- !u!114 &5221919708469253406 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5858967844998762963} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &2667437057891868812 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5858967844998762963} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4030622c8cb72fa43ab9e50883003f6a, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/BuildSystem/Prefab/RawImage.prefab.meta b/Assets/BuildSystem/Prefab/RawImage.prefab.meta new file mode 100644 index 0000000..7682c94 --- /dev/null +++ b/Assets/BuildSystem/Prefab/RawImage.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c2351bcd41cf8864c92888faa66b39a9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BuildSystem/Prefab/grid.prefab b/Assets/BuildSystem/Prefab/grid.prefab index f421664..ddac566 100644 --- a/Assets/BuildSystem/Prefab/grid.prefab +++ b/Assets/BuildSystem/Prefab/grid.prefab @@ -223,7 +223,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5207\u6362" + m_Text: "\u65CB\u8F6C" --- !u!1 &2166234203221984362 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/BuildSystem/Prefab/img.prefab b/Assets/BuildSystem/Prefab/img.prefab index 42de195..355866c 100644 --- a/Assets/BuildSystem/Prefab/img.prefab +++ b/Assets/BuildSystem/Prefab/img.prefab @@ -58,8 +58,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.5283019, g: 0.5283019, b: 0.5283019, a: 1} - m_RaycastTarget: 1 + m_Color: {r: 0.5283019, g: 0.5283019, b: 0.5283019, a: 0} + m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/BuildSystem/Scripts/BuildSystemManager.cs b/Assets/BuildSystem/Scripts/BuildSystemManager.cs index 525c4f0..6c72dc1 100644 --- a/Assets/BuildSystem/Scripts/BuildSystemManager.cs +++ b/Assets/BuildSystem/Scripts/BuildSystemManager.cs @@ -33,8 +33,10 @@ namespace BuildSystem [Header("放置标识")] public GameObject flag; - [Header("游戏是否结束")] - public bool isGameEnd = false; + [Header("部署阶段状态")] + public bool oneStageEnd = false; + [Header("红绿灯放置阶段状态")] + public bool redGreenLightEnd = false; [Header("用于初始化地图")] public PlaceObject_SO t2up; @@ -54,6 +56,39 @@ namespace BuildSystem CreateTerrain(); DontDestroyOnLoad(gameObject); //地图初始化 + MapInit(); + } + + /// + /// 创建地形 + /// + void CreateTerrain() + { + //创建地图 + gridMap = new Grid[mapSize.x][]; + for (int i = 0; i < mapSize.x; i++) + { + gridMap[i] = new Grid[mapSize.y]; + for (int j = 0; j < mapSize.y; j++) + { + Grid grid = new Grid(i, 0, j); + gridMap[i][j] = grid; + if (i > 0) + { + grid.BindLeftAndThis(gridMap[i - 1][j]); + } + if (j > 0) + { + grid.BindDownAndThis(gridMap[i][j - 1]); + } + } + } + } + + /// + /// 地图初始化 + /// + void MapInit() { CreatePlaceSpecial(w[0], 0, 0); CreatePlaceSpecial(h2, 1, 0); CreatePlaceSpecial(h2, 2, 0); @@ -114,34 +149,23 @@ namespace BuildSystem gridMap[8][2].gridType = GridType.Special; gridMap[11][4].gridType = GridType.Special; - + + + AddGridInfo(3, 0); + AddGridInfo(10, 0); + AddGridInfo(3, 7); + AddGridInfo(10, 7); + AddGridInfo(0, 2); + AddGridInfo(13, 5); } - /// - /// 创建地形 - /// - void CreateTerrain() + void AddGridInfo(int x, int y) { - //创建地图 - gridMap = new Grid[mapSize.x][]; - for (int i = 0; i < mapSize.x; i++) - { - gridMap[i] = new Grid[mapSize.y]; - for (int j = 0; j < mapSize.y; j++) - { - Grid grid = new Grid(i, 0, j); - gridMap[i][j] = grid; - if (i > 0) - { - grid.BindLeftAndThis(gridMap[i - 1][j]); - } - if (j > 0) - { - grid.BindDownAndThis(gridMap[i][j - 1]); - } - } - } + var gridinfo = gridMap[x][y].placeObject.gameObject.AddComponent(); + grid.Add(gridinfo); + gridinfo.TransData(gridMap[x][y]); } + /// /// 创建一个当前选择的物体,用于指示器的更换 /// @@ -173,42 +197,12 @@ namespace BuildSystem gridMap[x][y].roadType = place.roadType; gridMap[x][y].placeObject = obj; + //转换红绿灯需要的信息 if (gridMap[x][y].roadType != RoadType.T && gridMap[x][y].roadType != RoadType.Ten) return; var gridinfo = trans.gameObject.AddComponent(); grid.Add(gridinfo); - - if (gridMap[x][y].isPlace) - { - if (gridMap[x][y].roadType == RoadType.Ten) - { - gridinfo.roadType = TraficRoadType.十; - } - else if (gridMap[x][y].roadType == RoadType.T) - { - if (gridMap[x][y].isHaves[0] != DirIsHaveRoad.Yes) - { - gridinfo.roadType = TraficRoadType.downT; - } - else if (gridMap[x][y].isHaves[2] != DirIsHaveRoad.Yes) - { - gridinfo.roadType = TraficRoadType.upT; - } - else if (gridMap[x][y].isHaves[3] != DirIsHaveRoad.Yes) - { - gridinfo.roadType = TraficRoadType.rightT; - } - else if (gridMap[x][y].isHaves[1] != DirIsHaveRoad.Yes) - { - gridinfo.roadType = TraficRoadType.leftT; - } - } - gridinfo.up = gridMap[x][y].placeObject.transform.GetChild(0).position; - gridinfo.down = gridMap[x][y].placeObject.transform.GetChild(1).position; - gridinfo.left = gridMap[x][y].placeObject.transform.GetChild(2).position; - gridinfo.right = gridMap[x][y].placeObject.transform.GetChild(3).position; - } - + gridinfo.TransData(gridMap[x][y]); } /// @@ -233,7 +227,7 @@ namespace BuildSystem { Transform trans = Instantiate(place.prefab, transform); PlaceObject obj = trans.gameObject.AddComponent(); - obj.Init(place.nameString, place.width, place.height, place.roadNumberType, place.isHaveRoad, place.roadType,place.roadGoInfo); + obj.Init(place.nameString, place.width, place.height, place.roadNumberType, place.isHaveRoad, place.roadType,Instantiate(place).roadGoInfo); obj.SetPosition(GetGridPos(new Vector3Int(x, 0, y))); gridMap[x][y].isPlace = true; @@ -376,60 +370,96 @@ namespace BuildSystem private void Update() { - //物体跟随鼠标 - if (placeObj && isCanPlace) { - if (mouseClick.MouseInGrid() != new Vector3Int(-1,-1,-1)) + if (!oneStageEnd) + { + //物体跟随鼠标 + if (placeObj && isCanPlace) { - placeObj.SetPosition(GetGridPos(mouseClick.MouseInGrid())); + if (mouseClick.MouseInGrid() != new Vector3Int(-1, -1, -1)) + { + placeObj.SetPosition(GetGridPos(mouseClick.MouseInGrid())); + } } - } - ////创建物体 - if (Input.GetMouseButtonDown(0) && placeObj && isCanPlace && isCanCreate()) - { - CreatePlace(placeObject_SO, mouseClick.MouseInGrid().x, mouseClick.MouseInGrid().z); - } - else if (Input.GetMouseButtonDown(1) && mouseClick.MouseInGrid()!=new Vector3Int(-1,-1,-1)) - { - if (gridMap[mouseClick.MouseInGrid().x][mouseClick.MouseInGrid().z].placeObject) { - if (gridMap[mouseClick.MouseInGrid().x][mouseClick.MouseInGrid().z].gridType == GridType.General) { - RemovePlace(mouseClick.MouseInGrid().x, mouseClick.MouseInGrid().z); - buildTip.ShowTip("拆除提示"); - + ////创建物体 + if (Input.GetMouseButtonDown(0) && placeObj && isCanPlace && isCanCreate()) + { + CreatePlace(placeObject_SO, mouseClick.MouseInGrid().x, mouseClick.MouseInGrid().z); + } + else if (Input.GetMouseButtonDown(1) && mouseClick.MouseInGrid() != new Vector3Int(-1, -1, -1)) + { + if (gridMap[mouseClick.MouseInGrid().x][mouseClick.MouseInGrid().z].placeObject) + { + if (gridMap[mouseClick.MouseInGrid().x][mouseClick.MouseInGrid().z].gridType == GridType.General) + { + RemovePlace(mouseClick.MouseInGrid().x, mouseClick.MouseInGrid().z); + buildTip.ShowTip("拆除提示"); + + } } } - } - //变色提示 - if (placeObj) - { - flag.transform.position = placeObj.transform.position - new Vector3(0,0.5f,0); - if (isCanCreateToTip()) + //变色提示 + if (placeObj) { - flag.GetComponent().material.SetColor("_Color", new Color32(48,255,30,128)); + flag.transform.position = placeObj.transform.position - new Vector3(0, 0.5f, 0); + if (isCanCreateToTip()) + { + flag.GetComponent().material.SetColor("_Color", new Color32(48, 255, 30, 128)); + } + else + { + flag.GetComponent().material.SetColor("_Color", new Color32(255, 41, 0, 128)); + } } - else + + //判断通关 + if (IsGameEnd() && !oneStageEnd) { - flag.GetComponent().material.SetColor("_Color", new Color32(255, 41, 0, 128)); + oneStageEnd = true; + flag.SetActive(false); + UIManager.Instance.OneStageEnd(); + Debug.Log("部署阶段结束"); + + //更新格子的相邻道路 + for (int i = 0; i < mapSize.x; i++) + { + for (int j = 0; j < mapSize.y; j++) + { + gridMap[i][j].InitGround(); + } + } + Debug.Log(grid.Count); } } - //判断通关 - if (IsGameEnd() && !isGameEnd) - { - isGameEnd = true; - EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true); - } + if (!redGreenLightEnd && oneStageEnd) { + bool flag = true; + foreach (GridInfo info in grid) { + if (!info.isPlaceLight) { + flag = false; + break; + } + } - //更新格子的相邻道路 - for (int i = 0; i < mapSize.x; i++) - { - for (int j = 0; j < mapSize.y; j++) - { - gridMap[i][j].InitGround(); + //红绿灯放置阶段结束 + if (flag) { + redGreenLightEnd = true; + Debug.Log("红绿灯放置阶段结束"); + UIManager.Instance.TwoStageEnd(); + + StartCoroutine(Wait(()=> { + EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true); + },2f)); } } } + IEnumerator Wait(Action action,float t) + { + yield return new WaitForSeconds(t); + action(); + } + } } diff --git a/Assets/BuildSystem/Scripts/Car.cs b/Assets/BuildSystem/Scripts/Car.cs index b352353..7b0c3cc 100644 --- a/Assets/BuildSystem/Scripts/Car.cs +++ b/Assets/BuildSystem/Scripts/Car.cs @@ -77,20 +77,18 @@ namespace BuildSystem isCanMove = true; } - if (raycastHit.collider.tag == "TraficLight") { - isCanMove = false; - } - else + if (raycastHit.collider.tag == "TraficLight") { - isCanMove = true; + isCanMove = false; } + } else { isCanMove = true; } //停止运动销毁 - if (stupT > 30) + if (stupT > 15) { CarController.Instance.number--; Destroy(gameObject); @@ -129,6 +127,7 @@ namespace BuildSystem final.Add(ground[i]); } } + int rand = Random.Range(0, final.Count); canGrid = final[rand]; //确保格子不是已经行走过的格子 @@ -150,13 +149,16 @@ namespace BuildSystem id = 3; } enterRoadID = Random.Range(0,id); + roadId = enterRoadID; } else if (outRoadID == -1) { + outRoadID = enterRoadID; RoadNumberType road = canGrid.placeObject.roadNumberType[(int)curDir]; if (road == RoadNumberType.Two && id==3) { id = 2; + outRoadID = 2; } - outRoadID = Random.Range(0, id); + } isFindEnd = true; canGrid = null; @@ -188,7 +190,7 @@ namespace BuildSystem /// /// IEnumerator StartMove() { - yield return new WaitUntil(()=> { return moveRoad.Count >= 2; }); + yield return new WaitUntil(()=> { return moveRoad.Count >= 2 && enterRoadID!=-1 && outRoadID!=-1; }); while (moveRoad.Count != 0) { yield return new WaitUntil(() => { return isMoveEnd;}); isMoveEnd = false; diff --git a/Assets/BuildSystem/Scripts/PlaceObject.cs b/Assets/BuildSystem/Scripts/PlaceObject.cs index 71150d7..bb62734 100644 --- a/Assets/BuildSystem/Scripts/PlaceObject.cs +++ b/Assets/BuildSystem/Scripts/PlaceObject.cs @@ -37,5 +37,13 @@ namespace BuildSystem (float)(height * BuildSystemManager.Instance.gridSize) / 2 - (float)(BuildSystemManager.Instance.gridSize * 0.5f)); transform.position = pos + target; } + + private void Update() + { + //if (nameString == "T2Right") + //{ + // Debug.Log(canGoinfo[7][0]); + //} + } } } diff --git a/Assets/BuildSystem/Scripts/RoadInfo.cs b/Assets/BuildSystem/Scripts/RoadInfo.cs index 8d76bf0..ee709ee 100644 --- a/Assets/BuildSystem/Scripts/RoadInfo.cs +++ b/Assets/BuildSystem/Scripts/RoadInfo.cs @@ -3,31 +3,6 @@ using System.Collections.Generic; using UnityEngine; namespace BuildSystem { - public class CarData{ - public List transforms; - public int id; - public Dir dir; - - public CarData(List transforms, int id, Dir dir) { - this.transforms = transforms; - this.id = id; - this.dir = dir; - if (dir == Dir.up) { - this.dir = Dir.down; - } - else if(dir == Dir.down) { - this.dir = Dir.up; - } - else if (dir == Dir.left) - { - this.dir = Dir.right; - } - else if (dir == Dir.right) - { - this.dir = Dir.left; - } - } - } public class RoadInfo : MonoBehaviour { public List enterUp1; @@ -69,6 +44,16 @@ namespace BuildSystem public Transform leftPos; public Transform rightPos; + [Header("camera")] + public Camera camera; + + private void Awake() + { + if (camera != null) { + camera.gameObject.SetActive(false); + } + + } /// /// 根据给出的路径获取进入方向,出去方向和车道 diff --git a/Assets/BuildSystem/Scripts/UI/GridUI.cs b/Assets/BuildSystem/Scripts/UI/GridUI.cs index 9bbb6ee..c488149 100644 --- a/Assets/BuildSystem/Scripts/UI/GridUI.cs +++ b/Assets/BuildSystem/Scripts/UI/GridUI.cs @@ -65,6 +65,7 @@ namespace BuildSystem public void SetData(List info) { placeObject_SO[dataIndex].roadGoInfo = info; + BuildSystemManager.Instance.ChangeChoose(placeObject_SO[dataIndex]); BuildSystemManager.Instance.buildTip.ShowTip("设置成功"); } diff --git a/Assets/BuildSystem/Scripts/UI/RenderRawImg.cs b/Assets/BuildSystem/Scripts/UI/RenderRawImg.cs new file mode 100644 index 0000000..355bdba --- /dev/null +++ b/Assets/BuildSystem/Scripts/UI/RenderRawImg.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; + +public class RenderRawImg : MonoBehaviour, IPointerClickHandler +{ + public Transform renderGrid; + bool isBig = false; + public void OnPointerClick(PointerEventData eventData) + { + + if (!isBig) { + transform.SetParent(FindObjectOfType().transform); + transform.GetComponent().position = new Vector2(1920 * 0.5f, 1080 * 0.5f); + transform.GetComponent().sizeDelta = new Vector2(1920 * 0.8f, 1080 * 0.8f); + } + else{ + transform.SetParent(renderGrid); + } + isBig = !isBig; + } +} diff --git a/Assets/BuildSystem/Scripts/UI/RenderRawImg.cs.meta b/Assets/BuildSystem/Scripts/UI/RenderRawImg.cs.meta new file mode 100644 index 0000000..5c5bad6 --- /dev/null +++ b/Assets/BuildSystem/Scripts/UI/RenderRawImg.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4030622c8cb72fa43ab9e50883003f6a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BuildSystem/Scripts/UI/SetPanel.cs b/Assets/BuildSystem/Scripts/UI/SetPanel.cs index 607b920..e35f7f2 100644 --- a/Assets/BuildSystem/Scripts/UI/SetPanel.cs +++ b/Assets/BuildSystem/Scripts/UI/SetPanel.cs @@ -2,7 +2,8 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -namespace BuildSystem { +namespace BuildSystem +{ public class SetPanel : MonoBehaviour { @@ -27,7 +28,7 @@ namespace BuildSystem { sure.onClick.AddListener(SetData); } - public void Init(GridUI grid,PlaceObject_SO placeObject_SO,Sprite sprite) + public void Init(GridUI grid, PlaceObject_SO placeObject_SO, Sprite sprite) { this.grid = grid; placeObject = placeObject_SO; @@ -35,48 +36,81 @@ namespace BuildSystem { CreatePanel(); } - void CreatePanel() { + void CreatePanel() + { + List jilu = new List(); // - int i = 1; - foreach (object[] r in placeObject.roadGoInfo) { + int roadID = 1; + for (int i = 0; i < placeObject.roadGoInfo.Count; i++) + { + object[] curRoadGoInfo = placeObject.roadGoInfo[i]; //判断该车道是否存在 bool flag = false; - foreach (object o in r) + foreach (object o in curRoadGoInfo) { - if (o != null) { + if (o != null) + { flag = true; break; } } //对存在车道的道路进行ui创建 - if (flag) { + if (flag) + { GameObject text = Instantiate(roadPre, road); - text.GetComponent().text = i.ToString(); - for (int l=0;l().text = roadID.ToString(); + int nonullnumber = 0; + jilu.Clear(); + for (int l = 0; l < curRoadGoInfo.Length; l++) + { + int transID = 0; + if (i < 3) { //-2 <0 +4 + transID = l - 2; + if (transID < 0) + { + transID += 4; } - GameObject toggle = Instantiate(cansetPre, dir[0]); - toggle.GetComponent().isOn = isCanStraight; } - - //奇数 左右 - if (l % 2 != 0) { - if (r[l] == null) + else if (i < 6) //+3 >0 -4 + { + transID = 3 + l; + if (transID > 3) { - Instantiate(notsetPre, dir[l]); + transID -= 4; } - else + } + else if (i < 9) + { + transID = l; + } + else + { + transID = l + 1; + if (transID > 3) { - GameObject toggle = Instantiate(cansetPre, dir[l]); - toggle.GetComponent().isOn = (bool)r[l]; + transID -= 4; } } + + + if (curRoadGoInfo[transID] == null) + { + Instantiate(notsetPre, dir[l]); + } + else + { + nonullnumber++; + GameObject toggle = Instantiate(cansetPre, dir[l]); + toggle.GetComponent().isOn = (bool)curRoadGoInfo[transID]; + jilu.Add(toggle.GetComponent()); + } + } + if (nonullnumber == 1) { + jilu[0].interactable = false; } - i++; + jilu.Clear(); + roadID++; } } } @@ -84,12 +118,13 @@ namespace BuildSystem { void SetData() { - int i = 0; - foreach (object[] r in placeObject.roadGoInfo) + int roadID = 0; + for(int i=0;i< placeObject.roadGoInfo.Count;i++) { + object[] curRoadGoInfo = placeObject.roadGoInfo[i]; //判断车道是否存在 bool flag = false; - foreach (object o in r) + foreach (object o in curRoadGoInfo) { if (o != null) { @@ -101,34 +136,56 @@ namespace BuildSystem { if (flag) { - for (int d = 0;d < 4;d++) { - //对左右进行数据写入 - if (d % 2 != 0) - { - if (dir[d].GetChild(i).GetComponent()) + for (int d = 0; d < 4; d++) + { + int transID = 0; + if (i < 3) + { //-2 <0 +4 + transID = d + 2; + if (transID > 03) { - r[d] = dir[d].GetChild(i).GetComponent().isOn; - + transID -= 4; } - else + } + else if (i < 6) //+3 >0 -4 + { + transID = d + 1; + if (transID > 3) { - r[d] = null; + transID -= 4; } - } - //对上下数据进行写入 - else { - if (r[d] != null) { - r[d] = dir[0].GetChild(i).GetComponent().isOn; + } + else if (i < 9) + { + transID = d; + } + else + { + transID = d - 1; + if (transID < 0) + { + transID += 4; } } + + if (dir[transID].GetChild(roadID).GetComponent()) + { + curRoadGoInfo[d] = dir[transID].GetChild(roadID).GetComponent().isOn; + } + else + { + curRoadGoInfo[d] = null; + } } - i++; + roadID++; } } grid.SetData(placeObject.roadGoInfo); } + + private void OnDisable() { //清空之前设置的显示 @@ -144,6 +201,14 @@ namespace BuildSystem { Destroy(trans.GetChild(t).gameObject); } } + BuildSystemManager.Instance.isCanPlace = true; } + + private void OnEnable() + { + BuildSystemManager.Instance.isCanPlace = false; + } + + } } diff --git a/Assets/BuildSystem/Scripts/UI/UIManager.cs b/Assets/BuildSystem/Scripts/UI/UIManager.cs new file mode 100644 index 0000000..047ecc2 --- /dev/null +++ b/Assets/BuildSystem/Scripts/UI/UIManager.cs @@ -0,0 +1,74 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +namespace BuildSystem +{ + public class UIManager : MonoSingleton + { + [Header("道路部署阶段")] + public GameObject roadPlacePanel; + public GameObject tip; + + [Header("红绿灯放置阶段")] + public GameObject placeLight; + public GameObject traficWnd; + public GameObject lightTip; + + [Header("通车阶段")] + public Button carRun; + public GameObject render; + public Transform renderGrid; + public GameObject rawImagePre; + public GameObject carTip; + + protected override void Awake() + { + base.Awake(); + carRun.onClick.AddListener(()=> { + CarController.Instance.StartCreateCar(); + carRun.gameObject.SetActive(false); + }); + } + + /// + /// 道路部署阶段完成的ui更改 + /// + public void OneStageEnd() { + roadPlacePanel.SetActive(false); + tip.SetActive(false); + + placeLight.SetActive(true); + traficWnd.SetActive(true); + lightTip.SetActive(true); + } + + /// + /// 红绿灯部署阶段完成 + /// + public void TwoStageEnd() { + placeLight.SetActive(false); + traficWnd.SetActive(false); + + carRun.gameObject.SetActive(true); + render.SetActive(true); + carTip.SetActive(true); + + foreach (GridInfo info in BuildSystemManager.Instance.grid) { + GameObject obj = Instantiate(rawImagePre,renderGrid); + RenderTexture renderTexture = new RenderTexture(300,200,0); + obj.GetComponent().texture = renderTexture; + info.placeObject.GetComponent().camera.gameObject.SetActive(true); + info.placeObject.GetComponent().camera.targetTexture = renderTexture; + obj.GetComponent().renderGrid = renderGrid; + } + } + + private void Update() + { + if (Input.GetKeyDown(KeyCode.Space)) { + TwoStageEnd(); + } + } + } +} diff --git a/Assets/BuildSystem/Scripts/UI/UIManager.cs.meta b/Assets/BuildSystem/Scripts/UI/UIManager.cs.meta new file mode 100644 index 0000000..fd41793 --- /dev/null +++ b/Assets/BuildSystem/Scripts/UI/UIManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 87cc54d562d5f80478b3ee95aef2d161 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Changjing/Prefabs/Ding/T2Down.prefab b/Assets/Changjing/Prefabs/Ding/T2Down.prefab index 9c99f30..501cb44 100644 --- a/Assets/Changjing/Prefabs/Ding/T2Down.prefab +++ b/Assets/Changjing/Prefabs/Ding/T2Down.prefab @@ -24,12 +24,86 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 294996151442396084} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 14.87, y: 1.56, z: -0} + m_LocalPosition: {x: 12.28, y: 1.56, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4523910976041991032} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &565794205994741744 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1781731921633688660} + - component: {fileID: 8550231283188781767} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1781731921633688660 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565794205994741744} + m_LocalRotation: {x: -0, y: 0.92387956, z: 0.3826834, w: 0} + m_LocalPosition: {x: 0, y: -25.04, z: 18.18} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8339950437086525092} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0} +--- !u!20 &8550231283188781767 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 565794205994741744} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &681660664601739283 GameObject: m_ObjectHideFlags: 0 @@ -178,7 +252,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1723464434968376251} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -18.23, y: -4.68, z: 0} + m_LocalPosition: {x: -11.82, y: -4.68, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1351230263859948204} @@ -391,7 +465,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3593481038717312697} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 15.89, y: 4.76, z: -0} + m_LocalPosition: {x: 12.74, y: 4.76, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5221060033376255250} @@ -708,7 +782,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5900826672171397676} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -16.27, y: -1.55, z: 0} + m_LocalPosition: {x: -11.77, y: -1.55, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4785405425276251019} @@ -799,7 +873,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6581003556712326071} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.58, y: -17.93, z: 0} + m_LocalPosition: {x: 4.58, y: -12.33, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1245791880227199324} @@ -950,7 +1024,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8451560354117843924} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.58, y: -16.15, z: 0} + m_LocalPosition: {x: 1.58, y: -12.42, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3929997606952691080} @@ -991,6 +1065,7 @@ Transform: - {fileID: 76326592186176352} - {fileID: 6138328955338118975} - {fileID: 6194102936137923593} + - {fileID: 1781731921633688660} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 180} @@ -1096,6 +1171,7 @@ MonoBehaviour: downPos: {fileID: 0} leftPos: {fileID: 683543327642807039} rightPos: {fileID: 6326459644571844927} + camera: {fileID: 8550231283188781767} --- !u!1 &9162126810763398049 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/Ding/T2Left.prefab b/Assets/Changjing/Prefabs/Ding/T2Left.prefab index 60bdf89..920004f 100644 --- a/Assets/Changjing/Prefabs/Ding/T2Left.prefab +++ b/Assets/Changjing/Prefabs/Ding/T2Left.prefab @@ -151,6 +151,80 @@ Transform: m_Father: {fileID: 1658141951919552006} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2923023152416124511 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7765138599782378272} + - component: {fileID: 1359540515956652407} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7765138599782378272 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2923023152416124511} + m_LocalRotation: {x: 0.6743797, y: -0.6743797, z: -0.21263112, w: 0.21263112} + m_LocalPosition: {x: 23.24, y: -0.1, z: 22.63} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8339950437086525092} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: -145, z: -90.00001} +--- !u!20 &1359540515956652407 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2923023152416124511} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &3047698346392255575 GameObject: m_ObjectHideFlags: 0 @@ -992,6 +1066,7 @@ Transform: - {fileID: 8220158498852504502} - {fileID: 8535007929614287798} - {fileID: 2994332919232889235} + - {fileID: 7765138599782378272} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 270} @@ -1097,6 +1172,7 @@ MonoBehaviour: downPos: {fileID: 4996509578760909455} leftPos: {fileID: 0} rightPos: {fileID: 560928947540567509} + camera: {fileID: 1359540515956652407} --- !u!1 &8852152479835973334 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/Ding/T2Right.prefab b/Assets/Changjing/Prefabs/Ding/T2Right.prefab index 9e16632..0c6e0c9 100644 --- a/Assets/Changjing/Prefabs/Ding/T2Right.prefab +++ b/Assets/Changjing/Prefabs/Ding/T2Right.prefab @@ -213,6 +213,80 @@ Transform: m_Father: {fileID: 7940525485704781851} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2916235016141029188 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1926975948842599881} + - component: {fileID: 1552269047401256851} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1926975948842599881 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2916235016141029188} + m_LocalRotation: {x: 0.6865373, y: 0.6865373, z: 0.1693119, w: 0.1693119} + m_LocalPosition: {x: -18.3, y: -0.7, z: 28.7} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8339950437086525092} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 180, y: -27.70697, z: -90} +--- !u!20 &1552269047401256851 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2916235016141029188} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &2981252669039295397 GameObject: m_ObjectHideFlags: 0 @@ -961,6 +1035,7 @@ Transform: - {fileID: 7183640936154015715} - {fileID: 267773995120736685} - {fileID: 7940525485704781851} + - {fileID: 1926975948842599881} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 90} @@ -1066,6 +1141,7 @@ MonoBehaviour: downPos: {fileID: 6061283497755499385} leftPos: {fileID: 239960794980504523} rightPos: {fileID: 0} + camera: {fileID: 1552269047401256851} --- !u!1 &8769482433422548174 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/Ding/T2UP.prefab b/Assets/Changjing/Prefabs/Ding/T2UP.prefab index c97718e..f3da209 100644 --- a/Assets/Changjing/Prefabs/Ding/T2UP.prefab +++ b/Assets/Changjing/Prefabs/Ding/T2UP.prefab @@ -242,6 +242,80 @@ Transform: m_Father: {fileID: 7795126722585373248} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3369620998242781864 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6881944651763930934} + - component: {fileID: 7520351714247184291} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6881944651763930934 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3369620998242781864} + m_LocalRotation: {x: 0.93906343, y: -0, z: -0, w: 0.34374398} + m_LocalPosition: {x: 0, y: 17.94, z: 22.24} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8339950437086525092} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 139.79, y: -0.000015258789, z: -0.000015258789} +--- !u!20 &7520351714247184291 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3369620998242781864} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &3469296356807113153 GameObject: m_ObjectHideFlags: 0 @@ -992,6 +1066,7 @@ Transform: - {fileID: 6575636396576832399} - {fileID: 6122558190428188718} - {fileID: 3985219066560287243} + - {fileID: 6881944651763930934} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1101,6 +1176,7 @@ MonoBehaviour: downPos: {fileID: 7773358600117388589} leftPos: {fileID: 6260547399384066494} rightPos: {fileID: 6212148230672188719} + camera: {fileID: 7520351714247184291} --- !u!1 &9131841974535946381 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/Ding/T3Down.prefab b/Assets/Changjing/Prefabs/Ding/T3Down.prefab index 2cde416..24e6299 100644 --- a/Assets/Changjing/Prefabs/Ding/T3Down.prefab +++ b/Assets/Changjing/Prefabs/Ding/T3Down.prefab @@ -303,6 +303,80 @@ Transform: m_Father: {fileID: 1842923172466724395} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1745079079142653092 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6327105817674863579} + - component: {fileID: 6368642379756668788} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6327105817674863579 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1745079079142653092} + m_LocalRotation: {x: -0, y: 0.92387956, z: 0.3826834, w: 0} + m_LocalPosition: {x: 0, y: -25.04, z: 18.18} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1158122193222068242} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0} +--- !u!20 &6368642379756668788 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1745079079142653092} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &1901613657848609724 GameObject: m_ObjectHideFlags: 0 @@ -398,6 +472,7 @@ Transform: - {fileID: 8248985313256814401} - {fileID: 5737265357576029951} - {fileID: 3835587251844450753} + - {fileID: 6327105817674863579} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 180} @@ -509,6 +584,7 @@ MonoBehaviour: downPos: {fileID: 0} leftPos: {fileID: 6922738517308467537} rightPos: {fileID: 4369283421183075718} + camera: {fileID: 6368642379756668788} --- !u!1 &1976361211392576807 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/Ding/T3Left.prefab b/Assets/Changjing/Prefabs/Ding/T3Left.prefab index 7656196..600957f 100644 --- a/Assets/Changjing/Prefabs/Ding/T3Left.prefab +++ b/Assets/Changjing/Prefabs/Ding/T3Left.prefab @@ -371,6 +371,7 @@ Transform: - {fileID: 149013525884695405} - {fileID: 693370193805265985} - {fileID: 4543149366215786196} + - {fileID: 1544002383513439544} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 270} @@ -482,6 +483,7 @@ MonoBehaviour: downPos: {fileID: 6259706910834506354} leftPos: {fileID: 0} rightPos: {fileID: 2544006769500084701} + camera: {fileID: 5390977667922214845} --- !u!1 &1994812508411109454 GameObject: m_ObjectHideFlags: 0 @@ -1142,6 +1144,80 @@ Transform: m_Father: {fileID: 4543149366215786196} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6281267581717460011 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1544002383513439544} + - component: {fileID: 5390977667922214845} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1544002383513439544 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6281267581717460011} + m_LocalRotation: {x: 0.6743797, y: -0.6743797, z: -0.21263112, w: 0.21263112} + m_LocalPosition: {x: 23.24, y: -0.1, z: 22.63} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1158122193222068242} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: -145, z: -90.00001} +--- !u!20 &5390977667922214845 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6281267581717460011} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &6567474214587288315 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/Ding/T3Right.prefab b/Assets/Changjing/Prefabs/Ding/T3Right.prefab index 86f082e..f432f59 100644 --- a/Assets/Changjing/Prefabs/Ding/T3Right.prefab +++ b/Assets/Changjing/Prefabs/Ding/T3Right.prefab @@ -309,6 +309,7 @@ Transform: - {fileID: 5971216333119329530} - {fileID: 5451696835700800936} - {fileID: 6545418337859143864} + - {fileID: 4849785412879156011} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 90} @@ -420,6 +421,7 @@ MonoBehaviour: downPos: {fileID: 2093439896176558010} leftPos: {fileID: 9075036939669922856} rightPos: {fileID: 0} + camera: {fileID: 3159202730400035084} --- !u!1 &2105777213632218057 GameObject: m_ObjectHideFlags: 0 @@ -1324,6 +1326,80 @@ Transform: m_Father: {fileID: 6165738032568713222} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7773330595004360803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4849785412879156011} + - component: {fileID: 3159202730400035084} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4849785412879156011 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7773330595004360803} + m_LocalRotation: {x: 0.6865373, y: 0.6865373, z: 0.1693119, w: 0.1693119} + m_LocalPosition: {x: -18.3, y: -0.7, z: 28.7} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1158122193222068242} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 180, y: -27.70697, z: -90} +--- !u!20 &3159202730400035084 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7773330595004360803} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &8052245046934131181 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/Ding/T3UP.prefab b/Assets/Changjing/Prefabs/Ding/T3UP.prefab index 5911194..fbff596 100644 --- a/Assets/Changjing/Prefabs/Ding/T3UP.prefab +++ b/Assets/Changjing/Prefabs/Ding/T3UP.prefab @@ -186,6 +186,7 @@ Transform: - {fileID: 6837415424425338143} - {fileID: 5717092477221628793} - {fileID: 881932905107705741} + - {fileID: 18350818634937844} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -297,6 +298,7 @@ MonoBehaviour: downPos: {fileID: 7544215823446974913} leftPos: {fileID: 6720849451219955578} rightPos: {fileID: 8638343251423993009} + camera: {fileID: 5962452551469353535} --- !u!1 &1978785091043631996 GameObject: m_ObjectHideFlags: 0 @@ -836,6 +838,80 @@ Transform: m_Father: {fileID: 5168262425803682169} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4931335390262973461 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 18350818634937844} + - component: {fileID: 5962452551469353535} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &18350818634937844 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4931335390262973461} + m_LocalRotation: {x: 0.93906343, y: -0, z: -0, w: 0.34374398} + m_LocalPosition: {x: 0, y: 17.94, z: 22.24} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1158122193222068242} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 139.79, y: -0.000015258789, z: -0.000015258789} +--- !u!20 &5962452551469353535 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4931335390262973461} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &5034501678850856316 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/T2-3/T23Down.prefab b/Assets/Changjing/Prefabs/T2-3/T23Down.prefab index 8679582..202229e 100644 --- a/Assets/Changjing/Prefabs/T2-3/T23Down.prefab +++ b/Assets/Changjing/Prefabs/T2-3/T23Down.prefab @@ -852,6 +852,80 @@ Transform: m_Father: {fileID: 1586263615184305307} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7093442639050047573 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1402279569213851795} + - component: {fileID: 5445184227832020411} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1402279569213851795 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7093442639050047573} + m_LocalRotation: {x: -0, y: 0.92387956, z: 0.3826834, w: 0} + m_LocalPosition: {x: 0, y: -25.04, z: 18.18} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8189192162428827414} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0} +--- !u!20 &5445184227832020411 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7093442639050047573} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &7511653477409773145 GameObject: m_ObjectHideFlags: 0 @@ -1116,6 +1190,7 @@ Transform: - {fileID: 6340092016454028400} - {fileID: 1441299800810922932} - {fileID: 1586263615184305307} + - {fileID: 1402279569213851795} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 180} @@ -1223,6 +1298,7 @@ MonoBehaviour: downPos: {fileID: 0} leftPos: {fileID: 1894600256226028402} rightPos: {fileID: 112394290151151798} + camera: {fileID: 5445184227832020411} --- !u!1 &8964634807860035332 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/T2-3/T23Left.prefab b/Assets/Changjing/Prefabs/T2-3/T23Left.prefab index fae2b17..228ed61 100644 --- a/Assets/Changjing/Prefabs/T2-3/T23Left.prefab +++ b/Assets/Changjing/Prefabs/T2-3/T23Left.prefab @@ -606,6 +606,80 @@ Transform: m_Father: {fileID: 8189192162428827414} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5513644421096537175 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8807773060094911336} + - component: {fileID: 5939893672695256205} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8807773060094911336 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5513644421096537175} + m_LocalRotation: {x: 0.6743797, y: -0.6743797, z: -0.21263112, w: 0.21263112} + m_LocalPosition: {x: 23.24, y: -0.1, z: 22.63} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8189192162428827414} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: -145, z: -90.00001} +--- !u!20 &5939893672695256205 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5513644421096537175} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &5767038477823602640 GameObject: m_ObjectHideFlags: 0 @@ -1007,6 +1081,7 @@ Transform: - {fileID: 5329618604996381251} - {fileID: 4798499295363573484} - {fileID: 5913935530719171493} + - {fileID: 8807773060094911336} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 270} @@ -1114,6 +1189,7 @@ MonoBehaviour: downPos: {fileID: 6280387748659140698} leftPos: {fileID: 0} rightPos: {fileID: 4781358712736690105} + camera: {fileID: 5939893672695256205} --- !u!1 &8858956509746008751 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/T2-3/T23Right.prefab b/Assets/Changjing/Prefabs/T2-3/T23Right.prefab index fb83a1d..3dfb093 100644 --- a/Assets/Changjing/Prefabs/T2-3/T23Right.prefab +++ b/Assets/Changjing/Prefabs/T2-3/T23Right.prefab @@ -1,5 +1,79 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &6328083012439963 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3106936839264086300} + - component: {fileID: 2312110882661350167} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3106936839264086300 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6328083012439963} + m_LocalRotation: {x: 0.6865373, y: 0.6865373, z: 0.1693119, w: 0.1693119} + m_LocalPosition: {x: -18.3, y: -0.7, z: 28.7} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8189192162428827414} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 180, y: -27.70697, z: -90} +--- !u!20 &2312110882661350167 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6328083012439963} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &313616832489607573 GameObject: m_ObjectHideFlags: 0 @@ -1146,6 +1220,7 @@ Transform: - {fileID: 9135091558369902199} - {fileID: 3765228553522080402} - {fileID: 6948506814759501766} + - {fileID: 3106936839264086300} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 90} @@ -1253,3 +1328,4 @@ MonoBehaviour: downPos: {fileID: 5790104452336859542} leftPos: {fileID: 5032373774764612468} rightPos: {fileID: 0} + camera: {fileID: 2312110882661350167} diff --git a/Assets/Changjing/Prefabs/T2-3/T23Up.prefab b/Assets/Changjing/Prefabs/T2-3/T23Up.prefab index 4031233..3b2fef4 100644 --- a/Assets/Changjing/Prefabs/T2-3/T23Up.prefab +++ b/Assets/Changjing/Prefabs/T2-3/T23Up.prefab @@ -139,6 +139,80 @@ Transform: m_Father: {fileID: 6893721724841146440} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1651161659585500214 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8873894875015307037} + - component: {fileID: 3533160865722374693} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8873894875015307037 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1651161659585500214} + m_LocalRotation: {x: 0.93906343, y: -0, z: -0, w: 0.34374398} + m_LocalPosition: {x: 0, y: 17.94, z: 22.24} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8189192162428827414} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 139.79, y: -0.000015258789, z: -0.000015258789} +--- !u!20 &3533160865722374693 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1651161659585500214} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &2564822745984029106 GameObject: m_ObjectHideFlags: 0 @@ -1146,6 +1220,7 @@ Transform: - {fileID: 7297927552608673688} - {fileID: 1203137295022362927} - {fileID: 6893721724841146440} + - {fileID: 8873894875015307037} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 0} @@ -1253,3 +1328,4 @@ MonoBehaviour: downPos: {fileID: 565192943612027706} leftPos: {fileID: 8807909907279212588} rightPos: {fileID: 144952523232961850} + camera: {fileID: 3533160865722374693} diff --git a/Assets/Changjing/Prefabs/T3-2/T32Down.prefab b/Assets/Changjing/Prefabs/T3-2/T32Down.prefab index a44b03f..bbe8d9b 100644 --- a/Assets/Changjing/Prefabs/T3-2/T32Down.prefab +++ b/Assets/Changjing/Prefabs/T3-2/T32Down.prefab @@ -1,5 +1,79 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &32467516885840350 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7491731375654143179} + - component: {fileID: 6638919422374302353} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7491731375654143179 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32467516885840350} + m_LocalRotation: {x: -0, y: 0.92387956, z: 0.3826834, w: 0} + m_LocalPosition: {x: 0, y: -25.04, z: 18.18} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7741631901276769502} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0} +--- !u!20 &6638919422374302353 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32467516885840350} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &260095818042978291 GameObject: m_ObjectHideFlags: 0 @@ -903,6 +977,7 @@ Transform: - {fileID: 6836594490658705030} - {fileID: 9197945325815604486} - {fileID: 8895442210107781154} + - {fileID: 7491731375654143179} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 180} @@ -1012,6 +1087,7 @@ MonoBehaviour: downPos: {fileID: 0} leftPos: {fileID: 4444223198336848744} rightPos: {fileID: 890027562306647427} + camera: {fileID: 6638919422374302353} --- !u!1 &7140648431836127754 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/T3-2/T32Left.prefab b/Assets/Changjing/Prefabs/T3-2/T32Left.prefab index a445c00..33b2e77 100644 --- a/Assets/Changjing/Prefabs/T3-2/T32Left.prefab +++ b/Assets/Changjing/Prefabs/T3-2/T32Left.prefab @@ -213,6 +213,80 @@ Transform: m_Father: {fileID: 2184397404922513485} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2058929069930257101 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4406595736713743741} + - component: {fileID: 4125975049468457189} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4406595736713743741 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2058929069930257101} + m_LocalRotation: {x: 0.6743797, y: -0.6743797, z: -0.21263112, w: 0.21263112} + m_LocalPosition: {x: 23.24, y: -0.1, z: 22.63} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7741631901276769502} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: -145, z: -90.00001} +--- !u!20 &4125975049468457189 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2058929069930257101} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &2720741275522014075 GameObject: m_ObjectHideFlags: 0 @@ -968,6 +1042,7 @@ Transform: - {fileID: 9214335354106651463} - {fileID: 3148968837113393107} - {fileID: 1319354259547126310} + - {fileID: 4406595736713743741} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 270} @@ -1077,6 +1152,7 @@ MonoBehaviour: downPos: {fileID: 2740746111268300064} leftPos: {fileID: 0} rightPos: {fileID: 9089824064808665963} + camera: {fileID: 4125975049468457189} --- !u!1 &7067900224691610942 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/T3-2/T32Right.prefab b/Assets/Changjing/Prefabs/T3-2/T32Right.prefab index a82be34..ea82c86 100644 --- a/Assets/Changjing/Prefabs/T3-2/T32Right.prefab +++ b/Assets/Changjing/Prefabs/T3-2/T32Right.prefab @@ -30,6 +30,80 @@ Transform: m_Father: {fileID: 5513452999884715498} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &177851526906199808 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 306510083891111738} + - component: {fileID: 2518910771958135393} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &306510083891111738 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 177851526906199808} + m_LocalRotation: {x: 0.6865373, y: 0.6865373, z: 0.1693119, w: 0.1693119} + m_LocalPosition: {x: -18.3, y: -0.7, z: 28.7} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7741631901276769502} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 180, y: -27.70697, z: -90} +--- !u!20 &2518910771958135393 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 177851526906199808} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &331430221402973887 GameObject: m_ObjectHideFlags: 0 @@ -1089,6 +1163,7 @@ Transform: - {fileID: 2557915033237587606} - {fileID: 8576711210156279719} - {fileID: 6026978885756907115} + - {fileID: 306510083891111738} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 90} @@ -1198,6 +1273,7 @@ MonoBehaviour: downPos: {fileID: 3578106936632892032} leftPos: {fileID: 3543981289668548043} rightPos: {fileID: 0} + camera: {fileID: 2518910771958135393} --- !u!1 &7443478964802125265 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/T3-2/T32Up.prefab b/Assets/Changjing/Prefabs/T3-2/T32Up.prefab index 17a9bec..08db75d 100644 --- a/Assets/Changjing/Prefabs/T3-2/T32Up.prefab +++ b/Assets/Changjing/Prefabs/T3-2/T32Up.prefab @@ -872,6 +872,80 @@ Transform: m_Father: {fileID: 2581757321806823073} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6848229616954530794 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8509263532078103898} + - component: {fileID: 2364304341641887933} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8509263532078103898 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6848229616954530794} + m_LocalRotation: {x: 0.93906343, y: -0, z: -0, w: 0.34374398} + m_LocalPosition: {x: 0, y: 17.94, z: 22.24} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7741631901276769502} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 139.79, y: -0.000015258789, z: -0.000015258789} +--- !u!20 &2364304341641887933 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6848229616954530794} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &6909620678032980806 GameObject: m_ObjectHideFlags: 0 @@ -937,6 +1011,7 @@ Transform: - {fileID: 8584658522211786049} - {fileID: 5888505581242036035} - {fileID: 2861086237578247037} + - {fileID: 8509263532078103898} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 0} @@ -1046,6 +1121,7 @@ MonoBehaviour: downPos: {fileID: 2433690933499699349} leftPos: {fileID: 4484813041790212111} rightPos: {fileID: 3375729637111137080} + camera: {fileID: 2364304341641887933} --- !u!1 &6950251169566955844 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/Ten/shizilu_2.prefab b/Assets/Changjing/Prefabs/Ten/shizilu_2.prefab index c0f5f04..f3240f1 100644 --- a/Assets/Changjing/Prefabs/Ten/shizilu_2.prefab +++ b/Assets/Changjing/Prefabs/Ten/shizilu_2.prefab @@ -522,6 +522,7 @@ Transform: - {fileID: 3273995590237864629} - {fileID: 3277399072273346961} - {fileID: 3965995739625899752} + - {fileID: 3207336756189232527} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -631,6 +632,7 @@ MonoBehaviour: downPos: {fileID: 3993379305456766488} leftPos: {fileID: 8091704708208421334} rightPos: {fileID: 5893431933547507464} + camera: {fileID: 2316662900429030375} --- !u!1 &3357694901846522357 GameObject: m_ObjectHideFlags: 0 @@ -1287,6 +1289,80 @@ Transform: m_Father: {fileID: 5799382221003316321} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7891112723378039802 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3207336756189232527} + - component: {fileID: 2316662900429030375} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3207336756189232527 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7891112723378039802} + m_LocalRotation: {x: -0, y: 0.92387956, z: 0.3826834, w: 0} + m_LocalPosition: {x: 0, y: -27, z: 16.62} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2804172998402099574} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0} +--- !u!20 &2316662900429030375 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7891112723378039802} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &8054583730522622774 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/Ten/shizilu_3.prefab b/Assets/Changjing/Prefabs/Ten/shizilu_3.prefab index b5dcf5a..5f6f21c 100644 --- a/Assets/Changjing/Prefabs/Ten/shizilu_3.prefab +++ b/Assets/Changjing/Prefabs/Ten/shizilu_3.prefab @@ -305,6 +305,80 @@ Transform: m_Father: {fileID: 8349374938429843482} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1583085288982468816 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5264294483708157798} + - component: {fileID: 5920075478076797701} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5264294483708157798 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1583085288982468816} + m_LocalRotation: {x: -0, y: 0.92387956, z: 0.3826834, w: 0} + m_LocalPosition: {x: 0, y: -27, z: 16.62} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3109782483930183191} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0} +--- !u!20 &5920075478076797701 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1583085288982468816} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &1654737414450135938 GameObject: m_ObjectHideFlags: 0 @@ -493,6 +567,7 @@ Transform: - {fileID: 9052887623359106888} - {fileID: 5169463045836499760} - {fileID: 8280170000059117167} + - {fileID: 5264294483708157798} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -610,6 +685,7 @@ MonoBehaviour: downPos: {fileID: 8834431211996280575} leftPos: {fileID: 1088190018925019494} rightPos: {fileID: 4405317126864700222} + camera: {fileID: 5920075478076797701} --- !u!1 &2474297325354914860 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Ding/TDown.png b/Assets/Resources/Ding/TDown.png new file mode 100644 index 0000000..e8b97ea Binary files /dev/null and b/Assets/Resources/Ding/TDown.png differ diff --git a/Assets/Resources/Ding/TDown.png.meta b/Assets/Resources/Ding/TDown.png.meta new file mode 100644 index 0000000..336b1e1 --- /dev/null +++ b/Assets/Resources/Ding/TDown.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: f7c0fb8f79de474469dca6eb72592fc0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Ding/TLeft.png b/Assets/Resources/Ding/TLeft.png new file mode 100644 index 0000000..03f28a3 Binary files /dev/null and b/Assets/Resources/Ding/TLeft.png differ diff --git a/Assets/Resources/Ding/TLeft.png.meta b/Assets/Resources/Ding/TLeft.png.meta new file mode 100644 index 0000000..8279b44 --- /dev/null +++ b/Assets/Resources/Ding/TLeft.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: be5e9e97c06ab4a4bb1b11e0a063e398 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Ding/TRight.png b/Assets/Resources/Ding/TRight.png new file mode 100644 index 0000000..8f3f698 Binary files /dev/null and b/Assets/Resources/Ding/TRight.png differ diff --git a/Assets/Resources/Ding/TRight.png.meta b/Assets/Resources/Ding/TRight.png.meta new file mode 100644 index 0000000..4c18247 --- /dev/null +++ b/Assets/Resources/Ding/TRight.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: 3a7929edf91aa6440b36ab42c138cf9e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Ding/TUp.png b/Assets/Resources/Ding/TUp.png new file mode 100644 index 0000000..45e6112 Binary files /dev/null and b/Assets/Resources/Ding/TUp.png differ diff --git a/Assets/Resources/Ding/TUp.png.meta b/Assets/Resources/Ding/TUp.png.meta new file mode 100644 index 0000000..209f5ea --- /dev/null +++ b/Assets/Resources/Ding/TUp.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: e9e2b6dc8cb03fc4e8e13fa6ce057cd1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefab/TraficLight.prefab b/Assets/Resources/Prefab/TraficLight.prefab new file mode 100644 index 0000000..8c188b4 --- /dev/null +++ b/Assets/Resources/Prefab/TraficLight.prefab @@ -0,0 +1,224 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &35222676758498441 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7787072399931835231} + - component: {fileID: 6167617564208727393} + - component: {fileID: 7919009303635242487} + m_Layer: 0 + m_Name: TraficLight (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &7787072399931835231 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 35222676758498441} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.53, y: 0, z: 0} + m_LocalScale: {x: -1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8688085298500249924} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &6167617564208727393 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 35222676758498441} + m_Mesh: {fileID: 111300429738314964, guid: e6af66d881ffc584cb5e0aa9c6ddce41, type: 3} +--- !u!23 &7919009303635242487 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 35222676758498441} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 08b78baae16735c4598e8954fcb002e6, type: 2} + - {fileID: 2100000, guid: 072fd929080b3a94696ec525221f97e7, type: 2} + - {fileID: 2100000, guid: bcade0e94da92db4b9fad2ea94571af3, type: 2} + - {fileID: 2100000, guid: fddc8111bae6110499074ee93741c306, type: 2} + - {fileID: 2100000, guid: f58977357e6a17b419fd653dec4eb7a8, type: 2} + - {fileID: 2100000, guid: f3c60b6ef102e4a409a5a28e7984cc55, type: 2} + - {fileID: 2100000, guid: 5057ced8b1f421a40b589b2641da49ef, type: 2} + - {fileID: 2100000, guid: 2b652952ad02bd841a44de0fe3f676fc, type: 2} + - {fileID: 2100000, guid: b4974d8135ed82145851b2f293ef349f, type: 2} + - {fileID: 2100000, guid: 4a05d1732cb1cdb4d8fe39632a08eecd, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!1 &35222677031101557 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7787072400204442531} + - component: {fileID: 6167617564481400221} + - component: {fileID: 7919009303907894539} + m_Layer: 0 + m_Name: TraficLight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &7787072400204442531 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 35222677031101557} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 6.5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8688085298500249924} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &6167617564481400221 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 35222677031101557} + m_Mesh: {fileID: 111300429738314964, guid: e6af66d881ffc584cb5e0aa9c6ddce41, type: 3} +--- !u!23 &7919009303907894539 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 35222677031101557} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 08b78baae16735c4598e8954fcb002e6, type: 2} + - {fileID: 2100000, guid: 072fd929080b3a94696ec525221f97e7, type: 2} + - {fileID: 2100000, guid: bcade0e94da92db4b9fad2ea94571af3, type: 2} + - {fileID: 2100000, guid: fddc8111bae6110499074ee93741c306, type: 2} + - {fileID: 2100000, guid: f58977357e6a17b419fd653dec4eb7a8, type: 2} + - {fileID: 2100000, guid: f3c60b6ef102e4a409a5a28e7984cc55, type: 2} + - {fileID: 2100000, guid: 5057ced8b1f421a40b589b2641da49ef, type: 2} + - {fileID: 2100000, guid: 2b652952ad02bd841a44de0fe3f676fc, type: 2} + - {fileID: 2100000, guid: b4974d8135ed82145851b2f293ef349f, type: 2} + - {fileID: 2100000, guid: 4a05d1732cb1cdb4d8fe39632a08eecd, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!1 &8688085298500249927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8688085298500249924} + - component: {fileID: 4564333465746107363} + m_Layer: 0 + m_Name: TraficLight + m_TagString: CarFr + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8688085298500249924 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8688085298500249927} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7787072400204442531} + - {fileID: 7787072399931835231} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &4564333465746107363 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8688085298500249927} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 0 + serializedVersion: 2 + m_Size: {x: 11.103569, y: 1, z: 3} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Prefab/TraficLight.prefab.meta b/Assets/Resources/Prefab/TraficLight.prefab.meta new file mode 100644 index 0000000..6bdae26 --- /dev/null +++ b/Assets/Resources/Prefab/TraficLight.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 78ba24f5d5844364db73026d126ce8f4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefab/TraficLightUI.prefab b/Assets/Resources/Prefab/TraficLightUI.prefab index 244b391..6fc9ec2 100644 --- a/Assets/Resources/Prefab/TraficLightUI.prefab +++ b/Assets/Resources/Prefab/TraficLightUI.prefab @@ -28,7 +28,7 @@ RectTransform: m_GameObject: {fileID: 7445011578887662815} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -90,8 +90,4 @@ MonoBehaviour: red: {fileID: 21300000, guid: 256cd4396474ca94ab1d67a19a865705, type: 3} yellow: {fileID: 21300000, guid: 4ffcc34a96712534ba1e715a213e5b4c, type: 3} green: {fileID: 21300000, guid: a7042f4b99105b8499060e85631231cb, type: 3} - _target: {fileID: 0} - redTime: 0 - yellowTime: 0 - greenTime: 0 - timer: 0 + target: {fileID: 0} diff --git a/Assets/Resources/UI/Simple Outline Square.png b/Assets/Resources/UI/Simple Outline Square.png new file mode 100644 index 0000000..7e7bb90 Binary files /dev/null and b/Assets/Resources/UI/Simple Outline Square.png differ diff --git a/Assets/Resources/UI/Simple Outline Square.png.meta b/Assets/Resources/UI/Simple Outline Square.png.meta new file mode 100644 index 0000000..727b2e7 --- /dev/null +++ b/Assets/Resources/UI/Simple Outline Square.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: e2e31c57d13b08b4fb7c831431dff1bf +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/ten/ten.png b/Assets/Resources/ten/ten.png new file mode 100644 index 0000000..5374459 Binary files /dev/null and b/Assets/Resources/ten/ten.png differ diff --git a/Assets/Resources/ten/ten.png.meta b/Assets/Resources/ten/ten.png.meta new file mode 100644 index 0000000..4e6baae --- /dev/null +++ b/Assets/Resources/ten/ten.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: 87638aa781db231458062855c574f5bd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GridInfo.cs b/Assets/Scripts/GridInfo.cs index 5295458..764541f 100644 --- a/Assets/Scripts/GridInfo.cs +++ b/Assets/Scripts/GridInfo.cs @@ -1,10 +1,48 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; - public class GridInfo : MonoBehaviour { public TraficRoadType roadType = TraficRoadType.十; - public Vector3 up,down,left,right = Vector3.zero; + public Vector3 up, down, left, right = Vector3.zero; + + public bool isPlaceLight = false; + + public BuildSystem.PlaceObject placeObject = null; + + public void TransData(BuildSystem.Grid grid) + { + if (grid.isPlace) + { + if (grid.roadType == BuildSystem.RoadType.Ten) + { + roadType = TraficRoadType.十; + } + else if (grid.roadType == BuildSystem.RoadType.T) + { + if (grid.isHaves[0] != BuildSystem.DirIsHaveRoad.Yes) + { + roadType = TraficRoadType.downT; + } + else if (grid.isHaves[2] != BuildSystem.DirIsHaveRoad.Yes) + { + roadType = TraficRoadType.upT; + } + else if (grid.isHaves[3] != BuildSystem.DirIsHaveRoad.Yes) + { + roadType = TraficRoadType.rightT; + } + else if (grid.isHaves[1] != BuildSystem.DirIsHaveRoad.Yes) + { + roadType = TraficRoadType.leftT; + } + } + up = grid.placeObject.transform.GetChild(0).position; + down = grid.placeObject.transform.GetChild(1).position; + left = grid.placeObject.transform.GetChild(2).position; + right = grid.placeObject.transform.GetChild(3).position; + placeObject = grid.placeObject; + } + } } diff --git a/Assets/Scripts/Pass2/System/Trafic/TraficLightManager.cs b/Assets/Scripts/Pass2/System/Trafic/TraficLightManager.cs index 21d8b7e..c2f780e 100644 --- a/Assets/Scripts/Pass2/System/Trafic/TraficLightManager.cs +++ b/Assets/Scripts/Pass2/System/Trafic/TraficLightManager.cs @@ -7,12 +7,15 @@ public class TraficLightManager : MonoSingleton public TraficWnd traficWnd; public bool isOpenTraficPut = false; public float traficLightTimeScale = 1f; + + + protected override void Awake() { base.Awake(); traficWnd.Init(); } - + /// /// 红绿灯部署阶段开始函数 /// @@ -27,8 +30,10 @@ public class TraficLightManager : MonoSingleton { GameObject go = new GameObject("put"); TraficLightPut put = go.AddComponent(); + put.gridInfo = list[i]; //按照路口类型和放置点位,初始化放置类 put.Init(list[i].up,list[i].down,list[i].left,list[i].right,list[i].roadType,list[i].transform); + go.layer = LayerMask.NameToLayer("LightPut"); } diff --git a/Assets/Scripts/Pass2/System/Trafic/TraficLightPut.cs b/Assets/Scripts/Pass2/System/Trafic/TraficLightPut.cs index d7fbd22..35274cf 100644 --- a/Assets/Scripts/Pass2/System/Trafic/TraficLightPut.cs +++ b/Assets/Scripts/Pass2/System/Trafic/TraficLightPut.cs @@ -15,8 +15,9 @@ public class TraficLightPut : MonoBehaviour public TraficRoadType traficType = TraficRoadType.十; [HideInInspector] public Vector3 upPoint, downPoint, leftPoint, rightPoint; - - + [HideInInspector] + public GridInfo gridInfo; + public void Init(Vector3 up,Vector3 down,Vector3 left,Vector3 right, TraficRoadType type, Transform parent=null) { @@ -32,15 +33,18 @@ public class TraficLightPut : MonoBehaviour transform.eulerAngles = parent.eulerAngles; transform.SetParent(parent); - MeshRenderer meshRenderer =gameObject.AddComponent(); + //碰撞检测 + MeshRenderer meshRenderer = gameObject.AddComponent(); MeshFilter filter = gameObject.AddComponent(); - filter.mesh = parent.GetComponent().mesh; MeshCollider collider = gameObject.AddComponent(); collider.convex = true; collider.isTrigger = true; meshRenderer.enabled = false; + + + //生成提示特效物件 @@ -50,14 +54,15 @@ public class TraficLightPut : MonoBehaviour + private void OnMouseDown() { if (TraficLightManager.Instance.isOpenTraficPut == false) return; - TraficLightManager.Instance.ShowTraficSetPanel(traficType,this); + TraficLightManager.Instance.ShowTraficSetPanel(traficType, this); Debug.Log("显示类型为" + traficType + "的设置面板"); } - + } diff --git a/Assets/Scripts/Pass2/Tool/TraficLightUI.cs b/Assets/Scripts/Pass2/Tool/TraficLightUI.cs index 999df6c..3d21cbc 100644 --- a/Assets/Scripts/Pass2/Tool/TraficLightUI.cs +++ b/Assets/Scripts/Pass2/Tool/TraficLightUI.cs @@ -32,6 +32,8 @@ public class TraficLightUI : MonoBehaviour private float scale = 0.4f; + public Collider collider; + public void Init(bool isGreen, TraficTimeSet set, Vector3 target, LightDir dir,TraficLightUI elseDirLight=null, TraficLightUI paternerLight=null) { @@ -93,7 +95,9 @@ public class TraficLightUI : MonoBehaviour if (_isGreen) { + collider.enabled = false; timer += Time.deltaTime* TraficLightManager.Instance.traficLightTimeScale; + if (timer >= greenTime) { _isYellow = true; @@ -125,8 +129,10 @@ public class TraficLightUI : MonoBehaviour } }else if (_isRed) { + collider.enabled = true; if (_paternerLight != null && _elseDirLight == null) { + this._isGreen = _paternerLight._isGreen; this.image.sprite = _paternerLight.image.sprite; } diff --git a/Assets/Scripts/Pass2/TraficWnd.prefab b/Assets/Scripts/Pass2/TraficWnd.prefab index 0642126..3add55f 100644 --- a/Assets/Scripts/Pass2/TraficWnd.prefab +++ b/Assets/Scripts/Pass2/TraficWnd.prefab @@ -177,6 +177,10 @@ MonoBehaviour: rightSet: {fileID: 3635242882347165374} setOverBtn: {fileID: 4487359193798801451} roadBGImg: {fileID: 4487359193078025009} + lightUIPrefab: {fileID: 7445011578887662815, guid: 7dee8e700029242418ef9f1f7f50ffd2, + type: 3} + lightModelPrefab: {fileID: 8688085298500249927, guid: 78ba24f5d5844364db73026d126ce8f4, + type: 3} --- !u!1 &4487359193078025015 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Pass2/Window/Trafic/TraficLightSet.cs b/Assets/Scripts/Pass2/Window/Trafic/TraficLightSet.cs index 3fcbc0d..91504b8 100644 --- a/Assets/Scripts/Pass2/Window/Trafic/TraficLightSet.cs +++ b/Assets/Scripts/Pass2/Window/Trafic/TraficLightSet.cs @@ -14,8 +14,9 @@ public class TraficLightSet : MonoBehaviour [Header("UI组件")] public Button setOverBtn; public Image roadBGImg; + public GameObject lightUIPrefab; + public GameObject lightModelPrefab; - private TraficLightPut currentPut; private void Start() @@ -47,15 +48,21 @@ public class TraficLightSet : MonoBehaviour TraficLightUI[] uiGroup = new TraficLightUI[num]; for (int i = 0; i < num; i++) { - GameObject go = new GameObject(); + GameObject go = GameObject.Instantiate(lightModelPrefab); group[i] = go; - GameObject ui = GameObject.Instantiate(Resources.Load("Prefab/TraficLightUI")); + + GameObject ui = GameObject.Instantiate(lightUIPrefab); uiGroup[i] = ui.GetComponent(); + + uiGroup[i].collider = group[i].GetComponent(); } group[0].transform.position = currentPut.upPoint; group[1].transform.position = currentPut.downPoint; group[2].transform.position = currentPut.leftPoint; group[3].transform.position = currentPut.rightPoint; + //转向设置 + group[2].transform.eulerAngles = new Vector3(group[2].transform.eulerAngles.x,90, group[2].transform.eulerAngles.z); + group[3].transform.eulerAngles = new Vector3(group[3].transform.eulerAngles.x, 90, group[3].transform.eulerAngles.z); float random = Random.Range(0f, 1f); bool isGreen = random > 0.5f ? true : false; @@ -64,6 +71,7 @@ public class TraficLightSet : MonoBehaviour uiGroup[2].Init(!isGreen, leftSet, currentPut.leftPoint,LightDir.left, uiGroup[0]);//左 uiGroup[3].Init(!isGreen, rightSet, currentPut.rightPoint,LightDir.right, uiGroup[1]);//右 + break; case TraficRoadType.leftT: @@ -72,15 +80,21 @@ public class TraficLightSet : MonoBehaviour TraficLightUI[] uiGroupLT = new TraficLightUI[numLT]; for (int i = 0; i < numLT; i++) { - GameObject go = new GameObject(); + GameObject go = GameObject.Instantiate(lightModelPrefab); groupLT[i] = go; - GameObject ui = GameObject.Instantiate(Resources.Load("Prefab/TraficLightUI")); + + GameObject ui = GameObject.Instantiate(lightUIPrefab); uiGroupLT[i] = ui.GetComponent(); + + uiGroupLT[i].collider = groupLT[i].GetComponent(); } groupLT[0].transform.position = currentPut.upPoint; groupLT[1].transform.position = currentPut.downPoint; groupLT[2].transform.position = currentPut.leftPoint; - + //转向设置 + groupLT[2].transform.eulerAngles = new Vector3(groupLT[2].transform.eulerAngles.x, 90, groupLT[2].transform.eulerAngles.z); + + float randomLT = Random.Range(0f, 1f); bool isGreenLT = randomLT > 0.5f ? true : false; @@ -95,15 +109,20 @@ public class TraficLightSet : MonoBehaviour TraficLightUI[] uiGroupRT = new TraficLightUI[numRT]; for (int i = 0; i < numRT; i++) { - GameObject go = new GameObject(); + GameObject go = GameObject.Instantiate(lightModelPrefab); groupRT[i] = go; - GameObject ui = GameObject.Instantiate(Resources.Load("Prefab/TraficLightUI")); + + GameObject ui = GameObject.Instantiate(lightUIPrefab); uiGroupRT[i] = ui.GetComponent(); + + uiGroupRT[i].collider = groupRT[i].GetComponent(); } groupRT[0].transform.position = currentPut.upPoint; groupRT[1].transform.position = currentPut.downPoint; groupRT[2].transform.position = currentPut.rightPoint; - + //转向设置 + groupRT[2].transform.eulerAngles = new Vector3(groupRT[2].transform.eulerAngles.x, 90, groupRT[2].transform.eulerAngles.z); + float randomRT = Random.Range(0f, 1f); bool isGreenRT = randomRT > 0.5f ? true : false; @@ -118,15 +137,20 @@ public class TraficLightSet : MonoBehaviour TraficLightUI[] uiGroupUT = new TraficLightUI[numUT]; for (int i = 0; i < numUT; i++) { - GameObject go = new GameObject(); + GameObject go = GameObject.Instantiate(lightModelPrefab); groupUT[i] = go; - GameObject ui = GameObject.Instantiate(Resources.Load("Prefab/TraficLightUI")); + + GameObject ui = GameObject.Instantiate(lightUIPrefab); uiGroupUT[i] = ui.GetComponent(); + + uiGroupUT[i].collider = groupUT[i].GetComponent(); } groupUT[0].transform.position = currentPut.upPoint; groupUT[1].transform.position = currentPut.leftPoint; groupUT[2].transform.position = currentPut.rightPoint; - + //转向设置 + groupUT[2].transform.eulerAngles = new Vector3(groupUT[2].transform.eulerAngles.x, 90, groupUT[2].transform.eulerAngles.z); + float randomUT = Random.Range(0f, 1f); bool isGreenUT = randomUT > 0.5f ? true : false; @@ -142,14 +166,18 @@ public class TraficLightSet : MonoBehaviour TraficLightUI[] uiGroupDT = new TraficLightUI[numDT]; for (int i = 0; i < numDT; i++) { - GameObject go = new GameObject(); + GameObject go = GameObject.Instantiate(lightModelPrefab); groupDT[i] = go; - GameObject ui = GameObject.Instantiate(Resources.Load("Prefab/TraficLightUI")); + + GameObject ui = GameObject.Instantiate(lightUIPrefab); uiGroupDT[i] = ui.GetComponent(); + uiGroupDT[i].collider = groupDT[i].GetComponent(); } groupDT[0].transform.position = currentPut.downPoint; groupDT[1].transform.position = currentPut.leftPoint; groupDT[2].transform.position = currentPut.rightPoint; + //转向设置 + groupDT[2].transform.eulerAngles = new Vector3(groupDT[2].transform.eulerAngles.x, 90, groupDT[2].transform.eulerAngles.z); float randomDT = Random.Range(0f, 1f); @@ -160,7 +188,10 @@ public class TraficLightSet : MonoBehaviour break; } - + + currentPut.gridInfo.isPlaceLight = true; + + Debug.Log(currentPut.name + "交通灯:"+ currentPut.gridInfo.isPlaceLight); } public void ShowTraficSetPanel(TraficRoadType type,TraficLightPut put) @@ -227,10 +258,12 @@ public class TraficLightSet : MonoBehaviour roadBGImg.sprite = downTImg; break; } - + //反馈完成设置 + this.gameObject.SetActive(true); currentPut = put; + } } diff --git a/Unity.CollabProxy.Editor.csproj b/Unity.CollabProxy.Editor.csproj index cc80415..e430650 100644 --- a/Unity.CollabProxy.Editor.csproj +++ b/Unity.CollabProxy.Editor.csproj @@ -284,16 +284,16 @@ C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll - C:/Users/20217/Desktop/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll + D:/UnityProject/Project/xf/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll - C:/Users/20217/Desktop/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll + D:/UnityProject/Project/xf/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll - C:/Users/20217/Desktop/Place/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll + D:/UnityProject/Project/xf/Place/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll - C:/Users/20217/Desktop/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll + D:/UnityProject/Project/xf/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll @@ -650,10 +650,10 @@ D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEditor.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEngine.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll diff --git a/Unity.Rider.Editor.csproj b/Unity.Rider.Editor.csproj index 83d2e30..16a61bf 100644 --- a/Unity.Rider.Editor.csproj +++ b/Unity.Rider.Editor.csproj @@ -285,16 +285,16 @@ C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll - C:/Users/20217/Desktop/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll + D:/UnityProject/Project/xf/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll - C:/Users/20217/Desktop/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll + D:/UnityProject/Project/xf/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll - C:/Users/20217/Desktop/Place/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll + D:/UnityProject/Project/xf/Place/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll - C:/Users/20217/Desktop/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll + D:/UnityProject/Project/xf/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll @@ -651,10 +651,10 @@ D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEditor.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEngine.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll diff --git a/Unity.TextMeshPro.Editor.csproj b/Unity.TextMeshPro.Editor.csproj index 3be534d..7e30c5c 100644 --- a/Unity.TextMeshPro.Editor.csproj +++ b/Unity.TextMeshPro.Editor.csproj @@ -311,16 +311,16 @@ C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll - C:/Users/20217/Desktop/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll + D:/UnityProject/Project/xf/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll - C:/Users/20217/Desktop/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll + D:/UnityProject/Project/xf/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll - C:/Users/20217/Desktop/Place/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll + D:/UnityProject/Project/xf/Place/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll - C:/Users/20217/Desktop/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll + D:/UnityProject/Project/xf/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll @@ -677,10 +677,10 @@ D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEditor.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEngine.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll diff --git a/Unity.TextMeshPro.csproj b/Unity.TextMeshPro.csproj index be66dce..8107b47 100644 --- a/Unity.TextMeshPro.csproj +++ b/Unity.TextMeshPro.csproj @@ -323,16 +323,16 @@ C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll - C:/Users/20217/Desktop/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll + D:/UnityProject/Project/xf/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll - C:/Users/20217/Desktop/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll + D:/UnityProject/Project/xf/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll - C:/Users/20217/Desktop/Place/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll + D:/UnityProject/Project/xf/Place/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll - C:/Users/20217/Desktop/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll + D:/UnityProject/Project/xf/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll D:/UnityHub/2019.4.17f1c1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll @@ -680,10 +680,10 @@ D:/UnityHub/2019.4.17f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEditor.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEngine.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll diff --git a/Unity.Timeline.Editor.csproj b/Unity.Timeline.Editor.csproj index 1826c1c..7e9529f 100644 --- a/Unity.Timeline.Editor.csproj +++ b/Unity.Timeline.Editor.csproj @@ -500,16 +500,16 @@ C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll - C:/Users/20217/Desktop/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll + D:/UnityProject/Project/xf/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll - C:/Users/20217/Desktop/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll + D:/UnityProject/Project/xf/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll - C:/Users/20217/Desktop/Place/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll + D:/UnityProject/Project/xf/Place/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll - C:/Users/20217/Desktop/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll + D:/UnityProject/Project/xf/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll @@ -866,10 +866,10 @@ D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEditor.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEngine.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll diff --git a/Unity.Timeline.csproj b/Unity.Timeline.csproj index 89c2b5d..b9f941c 100644 --- a/Unity.Timeline.csproj +++ b/Unity.Timeline.csproj @@ -334,16 +334,16 @@ C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll - C:/Users/20217/Desktop/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll + D:/UnityProject/Project/xf/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll - C:/Users/20217/Desktop/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll + D:/UnityProject/Project/xf/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll - C:/Users/20217/Desktop/Place/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll + D:/UnityProject/Project/xf/Place/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll - C:/Users/20217/Desktop/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll + D:/UnityProject/Project/xf/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll D:/UnityHub/2019.4.17f1c1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll @@ -691,10 +691,10 @@ D:/UnityHub/2019.4.17f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEditor.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEngine.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll diff --git a/Unity.VSCode.Editor.csproj b/Unity.VSCode.Editor.csproj index c9edb7f..cced069 100644 --- a/Unity.VSCode.Editor.csproj +++ b/Unity.VSCode.Editor.csproj @@ -271,16 +271,16 @@ C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll - C:/Users/20217/Desktop/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll + D:/UnityProject/Project/xf/Place/Assets/Common/Plugin/JsonDotNet/Assemblies/Standalone/Newtonsoft.Json.dll - C:/Users/20217/Desktop/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll + D:/UnityProject/Project/xf/Place/Assets/Plugins/Demigiant/DOTween/DOTween.dll - C:/Users/20217/Desktop/Place/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll + D:/UnityProject/Project/xf/Place/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll - C:/Users/20217/Desktop/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll + D:/UnityProject/Project/xf/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll @@ -637,10 +637,10 @@ D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEditor.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Users/20217/Desktop/Place/Library/ScriptAssemblies/UnityEngine.UI.dll + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll diff --git a/UnityEditor.TestRunner.csproj b/UnityEditor.TestRunner.csproj index 5eaf714..31ab4dc 100644 --- a/UnityEditor.TestRunner.csproj +++ b/UnityEditor.TestRunner.csproj @@ -423,7 +423,7 @@ C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll - C:/Users/20217/Desktop/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll + D:/UnityProject/Project/xf/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll diff --git a/UnityEngine.TestRunner.csproj b/UnityEngine.TestRunner.csproj index 754cbe3..1f81f25 100644 --- a/UnityEngine.TestRunner.csproj +++ b/UnityEngine.TestRunner.csproj @@ -372,7 +372,7 @@ C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll - C:/Users/20217/Desktop/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll + D:/UnityProject/Project/xf/Place/Library/PackageCache/com.unity.ext.nunit@1.0.5/net35/unity-custom/nunit.framework.dll D:/UnityHub/2019.4.17f1c1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll diff --git a/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache b/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache index 4b1df9d..4a27bf8 100644 Binary files a/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache and b/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/Assembly-CSharp-firstpass.csproj.AssemblyReference.cache b/obj/Debug/Assembly-CSharp-firstpass.csproj.AssemblyReference.cache index 8961c6c..f5e894a 100644 Binary files a/obj/Debug/Assembly-CSharp-firstpass.csproj.AssemblyReference.cache and b/obj/Debug/Assembly-CSharp-firstpass.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache b/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache index 2738d65..3479e99 100644 Binary files a/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache and b/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 83b0b96..ff5ab33 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/obj/Debug/Unity.CollabProxy.Editor.csproj.AssemblyReference.cache b/obj/Debug/Unity.CollabProxy.Editor.csproj.AssemblyReference.cache index d0c92d1..9135944 100644 Binary files a/obj/Debug/Unity.CollabProxy.Editor.csproj.AssemblyReference.cache and b/obj/Debug/Unity.CollabProxy.Editor.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/Unity.Rider.Editor.csproj.AssemblyReference.cache b/obj/Debug/Unity.Rider.Editor.csproj.AssemblyReference.cache index 91ead86..d2d3fbf 100644 Binary files a/obj/Debug/Unity.Rider.Editor.csproj.AssemblyReference.cache and b/obj/Debug/Unity.Rider.Editor.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/Unity.TextMeshPro.Editor.csproj.AssemblyReference.cache b/obj/Debug/Unity.TextMeshPro.Editor.csproj.AssemblyReference.cache index f5e894a..7de5d1f 100644 Binary files a/obj/Debug/Unity.TextMeshPro.Editor.csproj.AssemblyReference.cache and b/obj/Debug/Unity.TextMeshPro.Editor.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/Unity.TextMeshPro.csproj.AssemblyReference.cache b/obj/Debug/Unity.TextMeshPro.csproj.AssemblyReference.cache index 64ab9dc..a6b970d 100644 Binary files a/obj/Debug/Unity.TextMeshPro.csproj.AssemblyReference.cache and b/obj/Debug/Unity.TextMeshPro.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/Unity.Timeline.Editor.csproj.AssemblyReference.cache b/obj/Debug/Unity.Timeline.Editor.csproj.AssemblyReference.cache index 5b35d29..795c315 100644 Binary files a/obj/Debug/Unity.Timeline.Editor.csproj.AssemblyReference.cache and b/obj/Debug/Unity.Timeline.Editor.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/Unity.Timeline.csproj.AssemblyReference.cache b/obj/Debug/Unity.Timeline.csproj.AssemblyReference.cache index c7bbc46..553417c 100644 Binary files a/obj/Debug/Unity.Timeline.csproj.AssemblyReference.cache and b/obj/Debug/Unity.Timeline.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/Unity.VSCode.Editor.csproj.AssemblyReference.cache b/obj/Debug/Unity.VSCode.Editor.csproj.AssemblyReference.cache index 3eb2a54..8a2213d 100644 Binary files a/obj/Debug/Unity.VSCode.Editor.csproj.AssemblyReference.cache and b/obj/Debug/Unity.VSCode.Editor.csproj.AssemblyReference.cache differ