Merge branch 'master' of http://192.168.123.2:3000/fort23/PoetryTour

Assets/Art/Mat/guodu.mat

@@ -139,7 +139,7 @@ Material:
     - _Diss_UV: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _MainTexChannel: {r: 1, g: 0, b: 0, a: 0}
-    - _Main_Color: {r: 2.9960785, g: 0.76862746, b: 0.40784314, a: 1}
+    - _Main_Color: {r: 1.4980392, g: 0.38431373, b: 0.20392157, a: 1}
     - _Main_UV: {r: 0, g: 0, b: 0, a: 0}
     - _MaskUVSpeed: {r: 0, g: 0, b: 0, a: 0}
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}

Assets/Resources/Config/ShowTextConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 403cd3aff9cb4d143aee777afebda90d
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UIPanel/ShowTextPanel.prefab

@@ -0,0 +1,369 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2041804440473642787
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5916236008825824792}
+  - component: {fileID: 4757099758406642778}
+  - component: {fileID: 3133362208718406594}
+  - component: {fileID: 4449865396564458654}
+  m_Layer: 5
+  m_Name: Btn_Next
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5916236008825824792
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2041804440473642787}
+  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: 5759998873571814780}
+  m_RootOrder: 1
+  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!222 &4757099758406642778
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2041804440473642787}
+  m_CullTransparentMesh: 1
+--- !u!114 &3133362208718406594
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2041804440473642787}
+  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}
+  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: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &4449865396564458654
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2041804440473642787}
+  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: 3133362208718406594}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &5759998872901060596
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5759998872901060599}
+  - component: {fileID: 5759998872901060592}
+  - component: {fileID: 5759998872901060593}
+  - component: {fileID: 5759998872901060598}
+  m_Layer: 5
+  m_Name: Text_ShowTIP
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5759998872901060599
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5759998872901060596}
+  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: 5759998874743720574}
+  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: -32.77}
+  m_SizeDelta: {x: 650, y: 1004.87}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5759998872901060592
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5759998872901060596}
+  m_CullTransparentMesh: 1
+--- !u!114 &5759998872901060593
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5759998872901060596}
+  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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 40
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!114 &5759998872901060598
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5759998872901060596}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 17682ca78d5e24249bde9f194c8effe9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  TypeSpeed: 0.1
+  Showtext: {fileID: 5759998872901060593}
+  StringContent: 
+  IsOver: 0
+--- !u!1 &5759998873571814781
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5759998873571814780}
+  - component: {fileID: 5759998873571814782}
+  - component: {fileID: 5759998873571814783}
+  m_Layer: 5
+  m_Name: ShowTextPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5759998873571814780
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5759998873571814781}
+  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: 5759998874743720574}
+  - {fileID: 5916236008825824792}
+  m_Father: {fileID: 0}
+  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!222 &5759998873571814782
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5759998873571814781}
+  m_CullTransparentMesh: 1
+--- !u!114 &5759998873571814783
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5759998873571814781}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_ShowTIP
+    gameObject: {fileID: 5759998872901060598}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Next
+    gameObject: {fileID: 4449865396564458654}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 0
+--- !u!1 &5759998874743720575
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5759998874743720574}
+  - component: {fileID: 5759998874743720568}
+  - component: {fileID: 5759998874743720569}
+  m_Layer: 5
+  m_Name: BG
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5759998874743720574
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5759998874743720575}
+  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: 5759998872901060599}
+  m_Father: {fileID: 5759998873571814780}
+  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!222 &5759998874743720568
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5759998874743720575}
+  m_CullTransparentMesh: 1
+--- !u!114 &5759998874743720569
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5759998874743720575}
+  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, g: 0, b: 0, 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: 0}
+  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

Assets/Resources/UIPanel/ShowTextPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2303a06360acaa94fa79b3be3121594f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameData/ExcelConfig/ShowTextConfig.cs

@@ -0,0 +1,32 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\ShowText.xlsx. SheetName: ShowTextConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "ShowTextConfig.json")]
+	public partial class ShowTextConfigHolder : ConfigHolder<ShowTextConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct ShowTextConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///对话内容
+		/// </summary>
+public string name;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/ShowTextConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8478cd25823afe7479053591684c1e5e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Mono/GameObjectOnclick.cs

@@ -32,7 +32,7 @@ public class GameObjectOnclick : MonoBehaviour
    
         UIManager.Instance.GetPanel<TipPanel>().DBJNext();
         isEnable = true;
-        TimeComponent.Instance.AddTimer(1f, () =>
+        TimeComponent.Instance.AddTimer(0.5f, () =>
         {
             Animator.Play("dabaojianshan");
             isEnable = false;

Assets/Scripts/Mono/UI/Core/UIManager.cs

@@ -132,7 +132,7 @@ namespace Mono
                 uiPanel.Root.transform.SetParent(root);
             }
 
-
+            uiPanel.Root.transform.SetAsLastSibling();
             uiPanel.DelEvent();
             uiPanel.Show();
 

Assets/Scripts/Mono/UI/Panel/ChatPanel.cs

@@ -60,8 +60,11 @@ namespace Mono
                 IsOver = true;
 
              
+                // UIManager.Instance.HideUIPanel<ChatPanel>();
+                // UIManager.Instance.LoadAndOpenPanel<InputPanel>(UIManager.UILayer.Middle);
                 UIManager.Instance.HideUIPanel<ChatPanel>();
-                UIManager.Instance.LoadAndOpenPanel<InputPanel>(UIManager.UILayer.Middle);
+                ShowTextPanel showTextPanel = UIManager.Instance.LoadAndOpenPanel<ShowTextPanel>(UIManager.UILayer.Middle);
+                showTextPanel.ShowText(2);
 
                 return;
             }

Assets/Scripts/Mono/UI/Panel/InputPanel.cs

@@ -57,8 +57,13 @@ namespace Mono
             Btn_Retrun.onClick.AddListener(() =>
             {
                 UIManager.Instance.PlayAudioClip("UI_ButtonClick");
+                
+                
+                ShowTextPanel showTextPanel = UIManager.Instance.LoadAndOpenPanel<ShowTextPanel>(UIManager.UILayer.Middle);
+                showTextPanel.ShowText(3);
+                
                 UIManager.Instance.HideUIPanel<InputPanel>();
-                UIManager.Instance.LoadAndOpenPanel<MainScenePanel>(UIManager.UILayer.Middle);
+                // UIManager.Instance.LoadAndOpenPanel<MainScenePanel>(UIManager.UILayer.Middle);
                 
                 Destroy(Map);
                 Destroy(Npc);
@@ -70,7 +75,7 @@ namespace Mono
         {
             base.Show();
             SceneManager.LoadScene("EndScene");
-            TimeComponent.Instance.AddTimer(0.5f, () =>
+            TimeComponent.Instance.AddTimer(0.2f, () =>
             {
                 CreatSceneAndPlayer();
             });
@@ -104,6 +109,8 @@ namespace Mono
             Btn_Retrun.gameObject.SetActive(true);
             Mask.gameObject.SetActive(true);
             
+       
+           
            
             Player.Instance = null;
             // _isEnable = true;

Assets/Scripts/Mono/UI/Panel/ShowTextPanel.cs

@@ -0,0 +1,63 @@
+using Excel2Json;
+using Mono.UI.Core;
+using UnityEngine.SceneManagement;
+using UnityEngine.UI;
+
+namespace Mono
+{
+    [UIBinding(prefab = "ShowTextPanel")]
+    public class ShowTextPanel : UIPanel
+    {
+        public Typewriter Text_ShowTIP;
+        public Button Btn_Next;
+
+        public int Index;
+
+        public override void GetUIData()
+        {
+            Text_ShowTIP = UIData.Get<Typewriter>("Text_ShowTIP");
+            Btn_Next = UIData.Get<Button>("Btn_Next");
+        }
+
+        public override void Show()
+        {
+            base.Show();
+        }
+
+        public override void AddButtonEvent()
+        {
+            Btn_Next.onClick.AddListener(ChangeScene);
+        }
+
+
+        public void ShowText(int id)
+        {
+            ShowTextConfig showTextConfig = ConfigComponent.Instance.Get<ShowTextConfig>(id);
+            Text_ShowTIP.StringContent = showTextConfig.name;
+            Text_ShowTIP.SetContent();
+            Index = id;
+        }
+
+        public void ChangeScene()
+        {
+            switch (Index)
+            {
+                case 1:
+                    SceneManager.LoadScene("baidicheng");
+                    UIManager.Instance.PlayBGM("Scene04");
+                    TimeComponent.Instance.AddTimer(22f, () => { UIManager.Instance.LoadAndOpenPanel<ChatPanel>(UIManager.UILayer.Middle); });
+                    TimeComponent.Instance.AddTimer(1f, () => { UIManager.Instance.HideUIPanel<ShowTextPanel>(); });
+
+                    break;
+                case 2:
+                    UIManager.Instance.HideUIPanel<ShowTextPanel>(); 
+                    UIManager.Instance.LoadAndOpenPanel<InputPanel>(UIManager.UILayer.Middle);
+                    break;
+                case 3:
+                    UIManager.Instance.HideUIPanel<ShowTextPanel>(); 
+                    UIManager.Instance.LoadAndOpenPanel<MainScenePanel>(UIManager.UILayer.Middle);
+                    break;
+            }
+        }
+    }
+}

Assets/Scripts/Mono/UI/Panel/ShowTextPanel.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f955ae1e066540dfa5a8ff9a8af8e3a4
+timeCreated: 1698130603

Assets/Scripts/Mono/UI/Panel/TipPanel.cs

@@ -22,6 +22,7 @@ namespace Mono
 
 
         private PlayableDirector playableDirector;
+
         public override void Show()
         {
             base.Show();
@@ -29,7 +30,7 @@ namespace Mono
             // Text_01.StringContent = "龙泉剑\n在白帝城偶遇诗仙李白获赠的随身佩剑";
             // Text_01.SetContent();
             //
-             playableDirector = GameObject.Find("timeline").gameObject.GetComponent<PlayableDirector>();
+            playableDirector = GameObject.Find("timeline").gameObject.GetComponent<PlayableDirector>();
 
 
             ResetTrackAsset(playableDirector);
@@ -68,7 +69,6 @@ namespace Mono
 
         public void DBJNext()
         {
-
             MuteAll();
 
             foreach (var trackGroup in trackGroups)
@@ -96,6 +96,7 @@ namespace Mono
                         break;
                 }
             }
+
             playableDirector.Stop();
             playableDirector.time = 0;
             playableDirector.Play();
@@ -103,12 +104,15 @@ namespace Mono
 
             if (index > 1)
             {
-                TimeComponent.Instance.AddTimer(1.5f, () =>
+                TimeComponent.Instance.AddTimer(0.7f, () =>
                 {
                     UIManager.Instance.HideUIPanel<TipPanel>();
-                    SceneManager.LoadScene("baidicheng");
-                    UIManager.Instance.PlayBGM("Scene04");
-                    TimeComponent.Instance.AddTimer(22f, () => { UIManager.Instance.LoadAndOpenPanel<ChatPanel>(UIManager.UILayer.Middle); });
+
+                    ShowTextPanel showTextPanel = UIManager.Instance.LoadAndOpenPanel<ShowTextPanel>(UIManager.UILayer.Middle);
+                    showTextPanel.ShowText(1);
+                    // SceneManager.LoadScene("baidicheng");
+                    // UIManager.Instance.PlayBGM("Scene04");
+                    // TimeComponent.Instance.AddTimer(22f, () => { UIManager.Instance.LoadAndOpenPanel<ChatPanel>(UIManager.UILayer.Middle); });
                 });
             }
         }

Assets/Scripts/Typewriter.cs

@@ -2,6 +2,7 @@ using System;
 using UnityEngine;
 using System.Collections;
 using System.Text;
+using Unity.VisualScripting;
 using UnityEngine.UI;
 
 public class Typewriter : MonoBehaviour
@@ -36,15 +37,18 @@ public class Typewriter : MonoBehaviour
     {
     }
 
-    [ContextMenu("SetContent")]
+
     /// <summary>
     /// 设置内容
     /// </summary>
+    [ContextMenu("SetContent")]
     public void SetContent()
     {
-         // StringContent = Showtext.text;
+        if (StringContent.Length == 0)
+        {
+            StringContent = Showtext.text;
+        }
         curPos = 0;
-       // Debug.Log("文本内容：" + StringContent.Length);
         Showtext.text = string.Empty;
         InvokeRepeating("Typing", 0, TypeSpeed);
         IsOver = false;