From cab779262dff134ad3302deb4b0969c04674bd89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CCongG=E2=80=9D?= Date: Tue, 14 Jan 2025 15:34:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=AF=8F=E6=AC=A1=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=AE=9E=E8=AE=AD=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIPrefabs/ExplainContainPanel.prefab | 324 +++++++++++++++++- Assets/_Scripts/Application/GameManager.cs | 2 +- .../Application/SceneCtrls/NiuSceneMng.cs | 6 + .../Application/UI/AppSettingPanel.cs | 3 +- .../Application/UI/ExplainContainPanel.cs | 46 ++- 5 files changed, 369 insertions(+), 12 deletions(-) diff --git a/Assets/Resources/UIPrefabs/ExplainContainPanel.prefab b/Assets/Resources/UIPrefabs/ExplainContainPanel.prefab index 9108655..1873f08 100644 --- a/Assets/Resources/UIPrefabs/ExplainContainPanel.prefab +++ b/Assets/Resources/UIPrefabs/ExplainContainPanel.prefab @@ -36,6 +36,7 @@ RectTransform: - {fileID: 6332384816655404304} - {fileID: 6745606675765442323} - {fileID: 189938333673924327} + - {fileID: 2086888915212075685} m_Father: {fileID: 7355316348123831504} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -187,9 +188,10 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 0} + m_HighlightedSprite: {fileID: 21300000, guid: 8c77a2052664d0d4e9be892444deddd1, + type: 3} m_PressedSprite: {fileID: 21300000, guid: 8c77a2052664d0d4e9be892444deddd1, type: 3} - m_SelectedSprite: {fileID: 21300000, guid: 8c77a2052664d0d4e9be892444deddd1, type: 3} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal @@ -202,6 +204,161 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &1290555527325003352 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6588964901030347884} + - component: {fileID: 4403345892364699479} + - component: {fileID: 547747191336043664} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6588964901030347884 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1290555527325003352} + 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: + - {fileID: 8859946140086282456} + m_Father: {fileID: 2086888915212075685} + 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: 10, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4403345892364699479 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1290555527325003352} + m_CullTransparentMesh: 1 +--- !u!114 &547747191336043664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1290555527325003352} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 10cb374dd25e08843ae58b57169910e1, 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!1 &1439983187998443897 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 871342592108362003} + - component: {fileID: 6752902964104728313} + - component: {fileID: 1947919694477530423} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &871342592108362003 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1439983187998443897} + 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: 2086888915212075685} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 9, y: -0.5} + m_SizeDelta: {x: -28, y: -3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6752902964104728313 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1439983187998443897} + m_CullTransparentMesh: 1 +--- !u!114 &1947919694477530423 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1439983187998443897} + 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.7490196, g: 1, b: 0.96862745, 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_FontData: + m_Font: {fileID: 12800000, guid: 6682f39107ec959478d15f6ada28f19a, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u4E0D\u518D\u5F39\u51FA" --- !u!1 &2468768412228411747 GameObject: m_ObjectHideFlags: 0 @@ -751,7 +908,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6BCD\u725B\u7684\u53D1\u60C5\u5468\u671F\uFF0C\u5728\u5375\u5DE2\u4E0A\u8868\u73B0\u4E3A\u5375\u6CE1\u671F\u548C\u9EC4\u4F53\u671F\u4E24\u4E2A\u9636\u6BB5\u3002\u76F8\u5BF9\u9AD8\u7684\u5B55\u6FC0\u7D20\u6C34\u5E73\u53EF\u6291\u5236\u5375\u6CE1\u53D1\u80B2\u548C\u53D1\u60C5\uFF0C\u9EC4\u4F53\u671F\u7684\u7ED3\u675F\u662F\u5375\u6CE1\u671F\u5230\u6765\u7684\u524D\u63D0\u6761\u4EF6\u3002\u56E0\u6B64\uFF0C\u540C\u671F\u53D1\u60C5\u7684\u5173\u952E\u5C31\u662F\u63A7\u5236\u9EC4\u4F53\u5BFF\u547D\uFF0C\u5E76\u540C\u65F6\u7EC8\u6B62\u9EC4\u4F53\u671F\u3002\r\n\u5375\u6CE1\u671F\u662F\u5728\u5468\u671F\u6027\u9EC4\u4F53\u9000\u5316\u7EE7\u800C\u8840\u6DB2\u4E2D\u5B55\u916E\u6C34\u5E73\u663E\u8457\u4E0B\u964D\u540E\uFF0C\u5DE2\u4E2D\u5375\u6CE1\u8FC5\u901F\u751F\u957F\u53D1\u80B2\uFF0C\u6700\u540E\u6210\u719F\u5E76\u5BFC\u81F4\u6392\u5375\u7684\u65F6\u671F\u3002\u5375\u6CE1\u671F\u4E4B\u540E\uFF0C\u5375\u6CE1\u7834\u88C2\u5E76\u53D1\u80B2\u6210\u9EC4\u4F53\uFF0C\u968F\u5373\u8FDB\u5165\u9EC4\u4F53\u671F\uFF0C\u5728\u9EC4\u4F53\u5206\u6CCC\u7684\u5236\uFF0C" + m_Text: "\u8BE5\u8F6F\u4EF6\u662F\u4EE5\u725B\u4E3A\u5BF9\u8C61\u7684\u201C\u52A8\u7269\u7E41\u6B96\u201D\u7C7B\u8BFE\u7A0B\u4E13\u4E1A\u5B9E\u8BAD\u3002\u662F\u4EE5\u5178\u578B\u7684\u5DE5\u4F5C\u4EFB\u52A1\u4E3A\u9A71\u52A8\uFF0C\u4EE5\u5DE5\u4F5C\u6D41\u7A0B\u4E3A\u4E3B\u7EBF\u6240\u8FDB\u884C\u7684\u5185\u5BB9\u8BBE\u8BA1\u3002\u5171\u5206\u4E3A\u540C\u671F\u53D1\u60C5\u5904\u7406\u3001\u8D85\u6570\u6392\u5375\u5904\u7406\u3001\u7CBE\u5B50\u6D3B\u7387\u68C0\u67E5\u3001\u4EBA\u5DE5\u6388\u7CBE\u3001\u51B2\u80DA\u3001\u80DA\u80CE\u9009\u62E9\u3001\u80DA\u80CE\u79FB\u690D\u3001\u598A\u5A20\u9274\u5B9A\u4E03\u4E2A\u6A21\u5757\u3002\u53EF\u5E26\u9886\u5B66\u751F\u7531\u6D45\u5165\u6DF1\u4E86\u89E3\u52A8\u7269\u7E41\u6B96\u7684\u5965\u5999\uFF0C\u7531\u6613\u53CA\u96BE\u9010\u6B65\u638C\u63E1\u52A8\u7269\u7E41\u6B96\u6240\u9700\u7684\u77E5\u8BC6\u548C\u6280\u80FD\u3002" --- !u!1 &4406781820653346269 GameObject: m_ObjectHideFlags: 0 @@ -1617,6 +1774,92 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u64CD\u4F5C\u8BF4\u660E" +--- !u!1 &8086155022093170630 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2086888915212075685} + - component: {fileID: 1353926411026546173} + m_Layer: 5 + m_Name: LoopPopSet_N + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2086888915212075685 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8086155022093170630} + 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: + - {fileID: 6588964901030347884} + - {fileID: 871342592108362003} + m_Father: {fileID: 3228359440465635643} + 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: 107, y: -152} + m_SizeDelta: {x: 90, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1353926411026546173 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8086155022093170630} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, 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: 0 + 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: 547747191336043664} + toggleTransition: 1 + graphic: {fileID: 2721685362674604898} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_IsOn: 1 --- !u!1 &8371301832922793931 GameObject: m_ObjectHideFlags: 0 @@ -1793,3 +2036,78 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 +--- !u!1 &9055544062459517381 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8859946140086282456} + - component: {fileID: 3129185475940400901} + - component: {fileID: 2721685362674604898} + m_Layer: 5 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8859946140086282456 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9055544062459517381} + 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: 6588964901030347884} + 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: 14.6121, y: 9.2986} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3129185475940400901 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9055544062459517381} + m_CullTransparentMesh: 1 +--- !u!114 &2721685362674604898 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9055544062459517381} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0405a9bd588a38d4a825905c1b1ee03c, 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 diff --git a/Assets/_Scripts/Application/GameManager.cs b/Assets/_Scripts/Application/GameManager.cs index 6ae9a07..8e83204 100644 --- a/Assets/_Scripts/Application/GameManager.cs +++ b/Assets/_Scripts/Application/GameManager.cs @@ -31,7 +31,7 @@ namespace ZXK.LouDiXvMuNiu //当前app鼠标灵敏度 [System.NonSerialized] public float _CurMouseFlexible = 50.0f; - + public bool _loopPopExplain = true; public bool _IsFirstFreeCamera = true; protected override void AwakeSelf() diff --git a/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs b/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs index 118b992..9792f7d 100644 --- a/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs +++ b/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs @@ -112,6 +112,12 @@ namespace ZXK.LouDiXvMuNiu } GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = _CurSceneStep; + + if (GameManager.Instance._loopPopExplain) + { + GameObject explainContainGeo = UI_Manage.Instance.ShowPanel("ExplainContainPanel", System.Type.GetType("ZXK.LouDiXvMuNiu.ExplainContainPanel"), UIGroup.Tip); + explainContainGeo.GetComponent()._IsFirstEnter = true; + } } private void Update() { diff --git a/Assets/_Scripts/Application/UI/AppSettingPanel.cs b/Assets/_Scripts/Application/UI/AppSettingPanel.cs index 33e9dfc..1952efe 100644 --- a/Assets/_Scripts/Application/UI/AppSettingPanel.cs +++ b/Assets/_Scripts/Application/UI/AppSettingPanel.cs @@ -94,7 +94,8 @@ namespace ZXK.LouDiXvMuNiu _desBtn.onClick.AddListener(() => { PopUpMng._TriAble = false; - UI_Manage.Instance.ShowPanel("ExplainContainPanel", System.Type.GetType("ZXK.LouDiXvMuNiu.ExplainContainPanel"), UIGroup.Tip); + GameObject explainContainGeo = UI_Manage.Instance.ShowPanel("ExplainContainPanel", System.Type.GetType("ZXK.LouDiXvMuNiu.ExplainContainPanel"), UIGroup.Tip); + explainContainGeo.GetComponent()._IsFirstEnter = false; }); _setBtn.onClick.AddListener(() => { diff --git a/Assets/_Scripts/Application/UI/ExplainContainPanel.cs b/Assets/_Scripts/Application/UI/ExplainContainPanel.cs index 9a29521..0f836db 100644 --- a/Assets/_Scripts/Application/UI/ExplainContainPanel.cs +++ b/Assets/_Scripts/Application/UI/ExplainContainPanel.cs @@ -16,6 +16,10 @@ namespace ZXK.LouDiXvMuNiu private GameObject _trainGeo = null; private GameObject _handlerGeo = null; private Button _closeBtn = null; + private Toggle _popLoop = null; + + public bool _IsFirstEnter = false; + public int _clickNumber = 0; protected override void Awake() { @@ -25,26 +29,54 @@ namespace ZXK.LouDiXvMuNiu _trainGeo = GetWedage("TrainExplainBG_N"); _handlerGeo = GetWedage("HandlerExplainBG_N"); _closeBtn = GetWedage("CloseBtn_N").GetComponent