diff --git a/Forest/Assets/Scenes/Build/Build_1.unity b/Forest/Assets/Scenes/Build/Build_1.unity index dcb085e..4b19222 100644 --- a/Forest/Assets/Scenes/Build/Build_1.unity +++ b/Forest/Assets/Scenes/Build/Build_1.unity @@ -453,6 +453,68 @@ Transform: - {fileID: 1348874866} m_Father: {fileID: 76654114} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &297726499 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8849663015456450217, guid: e9c96c211fb08417084dbd9a3f85ab3c, + type: 3} + m_PrefabInstance: {fileID: 334302849} + m_PrefabAsset: {fileID: 0} +--- !u!114 &297726501 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3351268473546380341, guid: e9c96c211fb08417084dbd9a3f85ab3c, + type: 3} + m_PrefabInstance: {fileID: 334302849} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 297726499} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &297726503 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 297726499} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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: 297726501} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &311710693 GameObject: m_ObjectHideFlags: 0 @@ -602,65 +664,90 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 374389568} m_Modifications: + - target: {fileID: 781503480839846848, guid: e9c96c211fb08417084dbd9a3f85ab3c, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 907971685945980573, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 907971685945980573, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 907971685945980573, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 240 objectReference: {fileID: 0} - target: {fileID: 907971685945980573, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 240 objectReference: {fileID: 0} - target: {fileID: 907971685945980573, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 606 objectReference: {fileID: 0} - target: {fileID: 907971685945980573, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_AnchoredPosition.y + value: -125 + objectReference: {fileID: 0} + - target: {fileID: 1501056032042821150, guid: e9c96c211fb08417084dbd9a3f85ab3c, + type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 1665594906165725798, guid: e9c96c211fb08417084dbd9a3f85ab3c, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2181581025797918851, guid: e9c96c211fb08417084dbd9a3f85ab3c, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2564137945090303001, guid: e9c96c211fb08417084dbd9a3f85ab3c, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3971867689370811158, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3971867689370811158, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3971867689370811158, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 240 objectReference: {fileID: 0} - target: {fileID: 3971867689370811158, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 240 objectReference: {fileID: 0} - target: {fileID: 3971867689370811158, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 120 objectReference: {fileID: 0} - target: {fileID: 3971867689370811158, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -125 objectReference: {fileID: 0} - target: {fileID: 5333295855086785665, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} @@ -770,32 +857,32 @@ PrefabInstance: - target: {fileID: 6311661543308928235, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6311661543308928235, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6311661543308928235, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 240 objectReference: {fileID: 0} - target: {fileID: 6311661543308928235, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 240 objectReference: {fileID: 0} - target: {fileID: 6311661543308928235, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 363 objectReference: {fileID: 0} - target: {fileID: 6311661543308928235, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -125 objectReference: {fileID: 0} - target: {fileID: 9145173861266666151, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} @@ -807,7 +894,19 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 9145173861266666151, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2181581025797918851, guid: e9c96c211fb08417084dbd9a3f85ab3c, + type: 3} + insertIndex: -1 + addedObject: {fileID: 686420181} + - targetCorrespondingSourceObject: {fileID: 8849663015456450217, guid: e9c96c211fb08417084dbd9a3f85ab3c, + type: 3} + insertIndex: -1 + addedObject: {fileID: 297726503} + - targetCorrespondingSourceObject: {fileID: 7130342339561235028, guid: e9c96c211fb08417084dbd9a3f85ab3c, + type: 3} + insertIndex: -1 + addedObject: {fileID: 621101626} m_SourcePrefab: {fileID: 100100000, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3} --- !u!224 &334302850 stripped RectTransform: @@ -1526,6 +1625,68 @@ Transform: - {fileID: 397456830} m_Father: {fileID: 1497732328} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &621101622 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7130342339561235028, guid: e9c96c211fb08417084dbd9a3f85ab3c, + type: 3} + m_PrefabInstance: {fileID: 334302849} + m_PrefabAsset: {fileID: 0} +--- !u!114 &621101624 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 13335543186065596, guid: e9c96c211fb08417084dbd9a3f85ab3c, + type: 3} + m_PrefabInstance: {fileID: 334302849} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 621101622} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &621101626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 621101622} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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: 621101624} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &644199642 GameObject: m_ObjectHideFlags: 0 @@ -1573,7 +1734,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9b618b5bdf3884745b8cccd94ea6fcf1, type: 3} m_Name: m_EditorClassIdentifier: - curCondition: 0 + CurCondition: 50 --- !u!1 &655320739 GameObject: m_ObjectHideFlags: 0 @@ -1670,6 +1831,68 @@ Transform: - {fileID: 735303003} m_Father: {fileID: 1347511408} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &686420177 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2181581025797918851, guid: e9c96c211fb08417084dbd9a3f85ab3c, + type: 3} + m_PrefabInstance: {fileID: 334302849} + m_PrefabAsset: {fileID: 0} +--- !u!114 &686420179 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8460578807918861653, guid: e9c96c211fb08417084dbd9a3f85ab3c, + type: 3} + m_PrefabInstance: {fileID: 334302849} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 686420177} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &686420181 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 686420177} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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: 686420179} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &735303002 GameObject: m_ObjectHideFlags: 0 @@ -3960,7 +4183,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 6 m_Sprite: {fileID: 21300000, guid: 679bf02009f604c9ba9473b2637c9f20, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -4494,7 +4717,7 @@ Transform: m_GameObject: {fileID: 2046127229} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -0.645, y: 0.505, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Forest/Assets/Scripts/Framework/GameBuild/BuildBoot.cs b/Forest/Assets/Scripts/Framework/GameBuild/BuildBoot.cs index b0ad00f..db3472e 100644 --- a/Forest/Assets/Scripts/Framework/GameBuild/BuildBoot.cs +++ b/Forest/Assets/Scripts/Framework/GameBuild/BuildBoot.cs @@ -1,21 +1,25 @@ +using System; using System.Collections.Generic; using Framework.Constants; using Framework.Manager; using Gameplay.Game; using Gameplay.Manager; using Sirenix.OdinInspector; +using TMPro; using UnityEngine; using UnityEngine.UI; public class BuildBoot : MonoBehaviour { - [LabelText("当前条件")] public int curCondition; + [LabelText("当前条件")] public int CurCondition; /// /// 节点类 /// public class Node { + public string Name; + public GameObject NodeObj; public GameObject BubbleObj; @@ -24,7 +28,7 @@ public class BuildBoot : MonoBehaviour public Node(GameObject root) { - NodeObj = root; + Name = root.name; Options = new List