diff --git a/Forest/Assets/Art/UI/Prefab/GuideMask.prefab b/Forest/Assets/Art/UI/Prefab/GuideMask.prefab index 53826da..660faf2 100644 --- a/Forest/Assets/Art/UI/Prefab/GuideMask.prefab +++ b/Forest/Assets/Art/UI/Prefab/GuideMask.prefab @@ -1,5 +1,140 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2241127308194685953 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 358391382599710765} + - component: {fileID: 366020088593063643} + - component: {fileID: 2238330998119226928} + m_Layer: 5 + m_Name: Text_Tip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &358391382599710765 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2241127308194685953} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 945861584490713851} + 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: -10, y: 877} + m_SizeDelta: {x: 800, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &366020088593063643 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2241127308194685953} + m_CullTransparentMesh: 1 +--- !u!114 &2238330998119226928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2241127308194685953} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u63D0\u793A\u63D0\u793A\u63D0\u793A\u63D0\u793A\u63D0\u793A" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8ff78e797c9504c05b77b3ed521b84a6, type: 2} + m_sharedMaterial: {fileID: -6578629386010562579, guid: 8ff78e797c9504c05b77b3ed521b84a6, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 70 + m_fontSizeBase: 70 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &3916596018543283146 GameObject: m_ObjectHideFlags: 0 @@ -33,6 +168,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1141517351566209910} + - {fileID: 358391382599710765} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -61,7 +197,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 63e92d9d8beb347159fc3cca727ca5c6, type: 2} - m_Color: {r: 0, g: 0, b: 0, a: 0.42745098} + m_Color: {r: 0, g: 0, b: 0, a: 0.7254902} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -116,7 +252,7 @@ GameObject: - component: {fileID: 8504618897260208688} - component: {fileID: 6194795023024327498} m_Layer: 5 - m_Name: Img_finger + m_Name: Img_Finger m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Forest/Assets/Config/Data/guide_guideconfig.json b/Forest/Assets/Config/Data/guide_guideconfig.json index 54eb127..c666ecc 100644 --- a/Forest/Assets/Config/Data/guide_guideconfig.json +++ b/Forest/Assets/Config/Data/guide_guideconfig.json @@ -2,55 +2,67 @@ { "ID": 101, "NextID": 102, + "GroupID": 1, "GuideNote": "点击岛屿", "GuideDesKey": "Guide_101", - "GuideParams": [ - "BuildRoot/Node5/Option1/Normal" - ] + "GuideType": 0, + "GuideParams": "BuildRoot/Node5/Option1/Normal", + "GuideCompleteType": 0, + "GuideCompleteParams": "" }, { "ID": 102, "NextID": 103, + "GroupID": 1, "GuideNote": "更换建造物", "GuideDesKey": "Guide_102", - "GuideParams": [ - "BuildBoot/BuildUIRoot/UIMainBuild/UI_LiuHaiBottom/Build_Bar/Bar_Tip/Scroll View/Viewport/Content/Item2/Img_Item\n" - ] + "GuideType": 0, + "GuideParams": "BuildBoot/BuildUIRoot/UIMainBuild/UI_LiuHaiBottom/Build_Bar/Bar_Tip/Scroll View/Viewport/Content/Item2/Img_Item\n", + "GuideCompleteType": 0, + "GuideCompleteParams": "" }, { "ID": 103, "NextID": 104, + "GroupID": 1, "GuideNote": "点击保存", "GuideDesKey": "Guide_103", - "GuideParams": [ - "BuildBoot/BuildUIRoot/UIMainBuild/UI_LiuHaiBottom/Build_Bar/Btn_Yes" - ] + "GuideType": 0, + "GuideParams": "BuildBoot/BuildUIRoot/UIMainBuild/UI_LiuHaiBottom/Build_Bar/Btn_Yes", + "GuideCompleteType": 1, + "GuideCompleteParams": "" }, { "ID": 104, "NextID": 105, + "GroupID": 1, "GuideNote": "点击泡泡按钮", "GuideDesKey": "Guide_104", - "GuideParams": [ - "BuildRoot/Node1/Btn" - ] + "GuideType": 0, + "GuideParams": "BuildRoot/Node1/Btn", + "GuideCompleteType": 0, + "GuideCompleteParams": "" }, { "ID": 105, "NextID": 106, + "GroupID": 1, "GuideNote": "点击上锁图标", "GuideDesKey": "Guide_105", - "GuideParams": [ - "BuildBoot/BuildUIRoot/UIMainBuild/UI_LiuHaiBottom/Build_Bar/Bar_Tip/Scroll View/Viewport/Content/Item1/Img_Lock" - ] + "GuideType": 0, + "GuideParams": "BuildBoot/BuildUIRoot/UIMainBuild/UI_LiuHaiBottom/Build_Bar/Bar_Tip/Scroll View/Viewport/Content/Item1/Img_Lock", + "GuideCompleteType": 0, + "GuideCompleteParams": "" }, { "ID": 106, "NextID": -1, + "GroupID": 1, "GuideNote": "点击开始游戏", "GuideDesKey": "Guide_106", - "GuideParams": [ - "BuildBoot/BuildUIRoot/UIMainBuild/Build_Tip/Btn_Game" - ] + "GuideType": 0, + "GuideParams": "BuildBoot/BuildUIRoot/UIMainBuild/Build_Tip/Btn_Game", + "GuideCompleteType": 2, + "GuideCompleteParams": "" } ] \ No newline at end of file diff --git a/Forest/Assets/Scripts/Framework/Event/Events.cs b/Forest/Assets/Scripts/Framework/Event/Events.cs index c4b79cf..5b9b3c8 100644 --- a/Forest/Assets/Scripts/Framework/Event/Events.cs +++ b/Forest/Assets/Scripts/Framework/Event/Events.cs @@ -33,8 +33,11 @@ namespace Framework.Event ShowMainUI, //新手引导 - NextGuideStep, - FinishGuide, + GuideMaskStart, //更换遮罩对象 + OpenUI, + CloseUI, + EnterGame, + } } } \ No newline at end of file diff --git a/Forest/Assets/Scripts/Framework/GameBuild/BuildBoot.cs b/Forest/Assets/Scripts/Framework/GameBuild/BuildBoot.cs index db92a66..535344a 100644 --- a/Forest/Assets/Scripts/Framework/GameBuild/BuildBoot.cs +++ b/Forest/Assets/Scripts/Framework/GameBuild/BuildBoot.cs @@ -129,6 +129,7 @@ public class BuildBoot : MonoBehaviour public void Open(Node node, Action