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

# Conflicts:
#	Assets/Scenes/main.unity

Assets/Art/animation/dabaojianshan.anim

@@ -13,40 +13,8 @@ AnimationClip:
   m_UseHighQualityCurve: 1
   m_RotationCurves: []
   m_CompressedRotationCurves: []
-  m_EulerCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: {x: 0, y: 60.126, z: 180}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    path: 
+  m_EulerCurves: []
   m_PositionCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: {x: 0.615, y: 1.333, z: 0.091}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    path: 
   - curve:
       serializedVersion: 2
       m_Curve:
@@ -195,13 +163,6 @@ AnimationClip:
       typeID: 23
       customType: 22
       isPPtrCurve: 0
-    - serializedVersion: 2
-      path: 0
-      attribute: 1
-      script: {fileID: 0}
-      typeID: 4
-      customType: 0
-      isPPtrCurve: 0
     - serializedVersion: 2
       path: 4136487252
       attribute: 1
@@ -216,13 +177,6 @@ AnimationClip:
       typeID: 4
       customType: 0
       isPPtrCurve: 0
-    - serializedVersion: 2
-      path: 0
-      attribute: 4
-      script: {fileID: 0}
-      typeID: 4
-      customType: 4
-      isPPtrCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
     serializedVersion: 2
@@ -234,7 +188,7 @@ AnimationClip:
     m_Level: 0
     m_CycleOffset: 0
     m_HasAdditiveReferencePose: 0
-    m_LoopTime: 0
+    m_LoopTime: 1
     m_LoopBlend: 0
     m_LoopBlendOrientation: 0
     m_LoopBlendPositionY: 0
@@ -245,120 +199,6 @@ AnimationClip:
     m_HeightFromFeet: 0
     m_Mirror: 0
   m_EditorCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0.615
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalPosition.x
-    path: 
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1.333
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalPosition.y
-    path: 
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0.091
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalPosition.z
-    path: 
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: localEulerAnglesRaw.x
-    path: 
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 60.126
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: localEulerAnglesRaw.y
-    path: 
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 180
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: localEulerAnglesRaw.z
-    path: 
-    classID: 4
-    script: {fileID: 0}
   - curve:
       serializedVersion: 2
       m_Curve:
@@ -565,37 +405,7 @@ AnimationClip:
     path: jianke (1)
     classID: 23
     script: {fileID: 0}
-  m_EulerEditorCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.x
-    path: 
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.y
-    path: 
-    classID: 4
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_LocalEulerAngles.z
-    path: 
-    classID: 4
-    script: {fileID: 0}
-  m_HasGenericRootTransform: 1
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events: []

Assets/Art/animation/jian.controller

@@ -1,5 +1,31 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-675029588780196774
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: init
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 0}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
@@ -114,10 +140,13 @@ AnimatorStateMachine:
     m_Position: {x: 200, y: 0, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 522689925344578965}
-    m_Position: {x: 235, y: 65, z: 0}
+    m_Position: {x: 300, y: 90, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 2023555620085887739}
-    m_Position: {x: 310.78778, y: 131.25403, z: 0}
+    m_Position: {x: 350, y: 160, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -675029588780196774}
+    m_Position: {x: 302.33337, y: 258, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

Assets/Art/dabaojian.playable

@@ -39,28 +39,6 @@ MonoBehaviour:
   VirtualCamera:
     exposedName: 8376ef06e9ed57e419c52dca57e950f9
     defaultValue: {fileID: 0}
---- !u!114 &-7899416570772062379
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
-  m_Name: AnimationPlayableAsset
-  m_EditorClassIdentifier: 
-  m_Clip: {fileID: 7400000, guid: 955703154de02ad49bc60918e085883f, type: 2}
-  m_Position: {x: 0, y: 0, z: 0}
-  m_EulerAngles: {x: 0, y: 0, z: 0}
-  m_UseTrackMatchFields: 1
-  m_MatchTargetFields: 63
-  m_RemoveStartOffset: 0
-  m_ApplyFootIK: 1
-  m_Loop: 0
-  m_Version: 1
-  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
 --- !u!114 &-6920487496798206892
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -284,116 +262,6 @@ MonoBehaviour:
   searchHierarchy: 0
   active: 1
   postPlayback: 2
---- !u!114 &-4293382574499072955
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d21dcc2386d650c4597f3633c75a1f98, type: 3}
-  m_Name: Animation Track
-  m_EditorClassIdentifier: 
-  m_Version: 3
-  m_AnimClip: {fileID: 0}
-  m_Locked: 0
-  m_Muted: 0
-  m_CustomPlayableFullTypename: 
-  m_Curves: {fileID: 0}
-  m_Parent: {fileID: 7239528744936741651}
-  m_Children: []
-  m_Clips:
-  - m_Version: 1
-    m_Start: 0
-    m_ClipIn: 0
-    m_Asset: {fileID: -7899416570772062379}
-    m_Duration: 2
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: -4293382574499072955}
-    m_EaseInDuration: 0
-    m_EaseOutDuration: 0
-    m_BlendInDuration: -1
-    m_BlendOutDuration: -1
-    m_MixInCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_MixOutCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_BlendInCurveMode: 0
-    m_BlendOutCurveMode: 0
-    m_ExposedParameterNames: []
-    m_AnimationCurves: {fileID: 0}
-    m_Recordable: 0
-    m_PostExtrapolationMode: 1
-    m_PreExtrapolationMode: 1
-    m_PostExtrapolationTime: Infinity
-    m_PreExtrapolationTime: 0
-    m_DisplayName: dabaojianshan
-  m_Markers:
-    m_Objects: []
-  m_InfiniteClipPreExtrapolation: 0
-  m_InfiniteClipPostExtrapolation: 0
-  m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
-  m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
-  m_InfiniteClipTimeOffset: 0
-  m_InfiniteClipRemoveOffset: 0
-  m_InfiniteClipApplyFootIK: 1
-  mInfiniteClipLoop: 0
-  m_MatchTargetFields: 63
-  m_Position: {x: 0, y: 0, z: 0}
-  m_EulerAngles: {x: 0, y: 0, z: 0}
-  m_AvatarMask: {fileID: 0}
-  m_ApplyAvatarMask: 1
-  m_TrackOffset: 0
-  m_InfiniteClip: {fileID: 0}
-  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
-  m_ApplyOffsets: 0
 --- !u!114 &-2105930443940659684
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -465,7 +333,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Version: 0
   m_Tracks:
-  - {fileID: 7239528744936741651}
   - {fileID: 6592452003439077405}
   - {fileID: 8313749526717812717}
   m_FixedDuration: 0
@@ -708,7 +575,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: d0fc6f5187a81dc47999eefade6f0935, type: 3}
-  m_Name: 2
+  m_Name: 1
   m_EditorClassIdentifier: 
   m_Version: 3
   m_AnimClip: {fileID: 0}
@@ -724,30 +591,6 @@ MonoBehaviour:
   m_Clips: []
   m_Markers:
     m_Objects: []
---- !u!114 &7239528744936741651
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0fc6f5187a81dc47999eefade6f0935, type: 3}
-  m_Name: 1
-  m_EditorClassIdentifier: 
-  m_Version: 3
-  m_AnimClip: {fileID: 0}
-  m_Locked: 0
-  m_Muted: 1
-  m_CustomPlayableFullTypename: 
-  m_Curves: {fileID: 0}
-  m_Parent: {fileID: 11400000}
-  m_Children:
-  - {fileID: -4293382574499072955}
-  m_Clips: []
-  m_Markers:
-    m_Objects: []
 --- !u!114 &8002708534683035003
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -890,12 +733,12 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: d0fc6f5187a81dc47999eefade6f0935, type: 3}
-  m_Name: 3
+  m_Name: 2
   m_EditorClassIdentifier: 
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 0
+  m_Muted: 1
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
@@ -965,25 +808,7 @@ MonoBehaviour:
       m_RotationOrder: 4
     m_MixOutCurve:
       serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
+      m_Curve: []
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -1010,25 +835,7 @@ MonoBehaviour:
     m_BlendOutDuration: -1
     m_MixInCurve:
       serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
+      m_Curve: []
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4

Assets/Resources/SoundEffect/Scene04.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 8962b82ab4cfabc4980d27910275fd4b
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/SoundEffect/SowrdDraw.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 99ee5600c0c7dfb42a1ec64fefb89396
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/SoundEffect/title.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: d5936e54ae40e584481edd72246fabae
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UIPanel/InputPanel.prefab

@@ -16,7 +16,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &159782582
 RectTransform:
   m_ObjectHideFlags: 0
@@ -173,6 +173,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 256713736}
+  - {fileID: 4305943360696934058}
   m_Father: {fileID: 2381847765629935105}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -415,6 +416,86 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &479492324618413643
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4305943360696934058}
+  - component: {fileID: 589176702402758694}
+  - component: {fileID: 7860539703178171312}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4305943360696934058
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 479492324618413643}
+  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: 1128896457}
+  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: 428}
+  m_SizeDelta: {x: 640, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &589176702402758694
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 479492324618413643}
+  m_CullTransparentMesh: 1
+--- !u!114 &7860539703178171312
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 479492324618413643}
+  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_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: 36
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 1
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7528\u8F7B\u821F\u5C06\u674E\u767D\u8F7D\u81F3\u957F\u6C5F\u4E0B\u6E38\u7684\u6C5F\u590F\uFF0C\u6CE8\u610F\u907F\u5F00\u6C5F\u4E0A\u7684\u7901\u77F3\r\n"
 --- !u!1 &2381847764363500642
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UIPanel/TipPanel.prefab

@@ -0,0 +1,242 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1743583424666076322
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1743583424666076323}
+  - component: {fileID: 1743583424666076349}
+  - component: {fileID: 1743583424666076348}
+  - component: {fileID: 819918105997306412}
+  m_Layer: 5
+  m_Name: Text_01
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1743583424666076323
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1743583424666076322}
+  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: 1743583425588677998}
+  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: -743.29}
+  m_SizeDelta: {x: 620, y: 426.38}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1743583424666076349
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1743583424666076322}
+  m_CullTransparentMesh: 1
+--- !u!114 &1743583424666076348
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1743583424666076322}
+  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: 36
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 44
+    m_Alignment: 1
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9F99\u6CC9\u5251\r\n\r\n\u5728\u767D\u5E1D\u57CE\u5076\u9047\u8BD7\u4ED9\u674E\u767D\u83B7\u8D60\u7684\u968F\u8EAB\u4F69\u5251"
+--- !u!114 &819918105997306412
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1743583424666076322}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 17682ca78d5e24249bde9f194c8effe9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  TypeSpeed: 0.1
+  Showtext: {fileID: 1743583424666076348}
+  StringContent: 
+  IsOver: 0
+--- !u!1 &1743583425588677997
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1743583425588677998}
+  - component: {fileID: 1743583425588677999}
+  m_Layer: 5
+  m_Name: TipPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1743583425588677998
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1743583425588677997}
+  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: 1743583426509984050}
+  - {fileID: 1743583424666076323}
+  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!114 &1743583425588677999
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1743583425588677997}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_00
+    gameObject: {fileID: 1743583426509984051}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_01
+    gameObject: {fileID: 819918105997306412}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 0
+--- !u!1 &1743583426509984049
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1743583426509984050}
+  - component: {fileID: 1743583426509984076}
+  - component: {fileID: 1743583426509984051}
+  m_Layer: 5
+  m_Name: Text_00
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1743583426509984050
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1743583426509984049}
+  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: 1743583425588677998}
+  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.000019073, y: 476}
+  m_SizeDelta: {x: 478.6, y: 426.38}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1743583426509984076
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1743583426509984049}
+  m_CullTransparentMesh: 1
+--- !u!114 &1743583426509984051
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1743583426509984049}
+  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: 36
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 44
+    m_Alignment: 1
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u68A6\u56DE\u5439\u89D2\u8FDE\u8425\uFF0C\u516B\u767E\u91CC\u585E\u5916\u58F0"

Assets/VolumetricFogBundle/Builtin/VolumetricAndDynamicFog_Builtin.unitypackage.meta → Assets/Resources/UIPanel/TipPanel.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: eebef07bd4ae74e6981505b540da4731
-DefaultImporter:
+guid: d5408a01dee73294a905220431994de6
+PrefabImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/Art/dabaojian.unity → Assets/Scenes/dabaojian.unity

@@ -5727,6 +5727,8 @@ GameObject:
   m_Component:
   - component: {fileID: 1220919704}
   - component: {fileID: 1220919705}
+  - component: {fileID: 1220919707}
+  - component: {fileID: 1220919706}
   m_Layer: 0
   m_Name: jian
   m_TagString: Untagged
@@ -5741,8 +5743,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1220919703}
-  m_LocalRotation: {x: 0.7071068, y: -0, z: 0.7071068, w: 0}
-  m_LocalPosition: {x: 0.74, y: 2.665, z: -0.3}
+  m_LocalRotation: {x: 0.50095195, y: 0, z: 0.8654751, w: 0}
+  m_LocalPosition: {x: 0.615, y: 1.333, z: 0.091}
   m_LocalScale: {x: 1.600001, y: 1.6000007, z: 1.6000004}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -5775,6 +5777,32 @@ Animator:
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
+--- !u!114 &1220919706
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1220919703}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 165d7a931f925f0438bcbde78dcd6251, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Animator: {fileID: 1220919705}
+--- !u!65 &1220919707
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1220919703}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.12608631, y: 0.10144533, z: 1.057251}
+  m_Center: {x: 0.018596167, y: -0.005924366, z: -0.21281296}
 --- !u!1001 &1309802795
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -10890,7 +10918,7 @@ PlayableDirector:
   m_Enabled: 1
   serializedVersion: 3
   m_PlayableAsset: {fileID: 11400000, guid: f2ca14a9c6824c14f9cd4cceec8a1cc2, type: 2}
-  m_InitialState: 1
+  m_InitialState: 0
   m_WrapMode: 2
   m_DirectorUpdateMode: 1
   m_InitialTime: 0
@@ -10903,8 +10931,10 @@ PlayableDirector:
     value: {fileID: 1165568981}
   - key: {fileID: 6317615857345949403, guid: f2ca14a9c6824c14f9cd4cceec8a1cc2, type: 2}
     value: {fileID: 1220919705}
-  - key: {fileID: -4293382574499072955, guid: f2ca14a9c6824c14f9cd4cceec8a1cc2, type: 2}
+  - key: {fileID: 0}
     value: {fileID: 1220919705}
+  - key: {fileID: -6920487496798206892, guid: f2ca14a9c6824c14f9cd4cceec8a1cc2, type: 2}
+    value: {fileID: 0}
   m_ExposedReferences:
     m_References:
     - bc14a3d2ed8cb7d4c94f69cc8ed51d6d: {fileID: 1946957578}
@@ -10940,6 +10970,7 @@ GameObject:
   - component: {fileID: 1656411218}
   - component: {fileID: 1656411219}
   - component: {fileID: 1165568981}
+  - component: {fileID: 1656411220}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -11051,6 +11082,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_PipelineAsset: {fileID: 11400000, guid: 28122b40c074dbe4690dcecc727e7c29, type: 2}
+--- !u!114 &1656411220
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1656411214}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 40aba8b6eccb6f84ea355b6990f7b4a3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  camera: {fileID: 0}
 --- !u!1 &1756764318
 GameObject:
   m_ObjectHideFlags: 19
@@ -11520,9 +11564,9 @@ ParticleSystem:
   emitterVelocityMode: 1
   looping: 0
   prewarm: 0
-  playOnAwake: 1
+  playOnAwake: 0
   useUnscaledTime: 0
-  autoRandomSeed: 1
+  autoRandomSeed: 0
   startDelay:
     serializedVersion: 2
     minMaxState: 0
@@ -11579,7 +11623,7 @@ ParticleSystem:
   moveWithTransform: 0
   moveWithCustomTransform: {fileID: 0}
   scalingMode: 1
-  randomSeed: 0
+  randomSeed: 9724
   InitialModule:
     serializedVersion: 3
     enabled: 1

Assets/Scripts/AppLauncher.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using Mono;
 using Mono.UI.Core;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 
 public class AppLauncher : MonoBehaviour
 {
@@ -10,6 +11,7 @@ public class AppLauncher : MonoBehaviour
 
     void Start()
     {
+        DontDestroyOnLoad(this);
         GameObject prefab = Resources.Load<GameObject>("Canvas");
 
         GameObject _gameObject = GameObject.Instantiate(prefab);
@@ -19,7 +21,9 @@ public class AppLauncher : MonoBehaviour
         ConfigComponent.Instance.Preload();
         _isStart = true;
         _timer = 0;
-        TimeComponent.Instance.AddTimer(15, () => { UIManager.Instance.LoadAndOpenPanel<StartPanel>(UIManager.UILayer.Middle); });
+       // SceneManager.LoadScene("main");
+        TimeComponent.Instance.AddTimer(10, () => { UIManager.Instance.LoadAndOpenPanel<StartPanel>(UIManager.UILayer.Middle); });
+        UIManager.Instance.PlayBGM("title");
     }
 
     private float _timer;

Assets/Scripts/Mono/GameObjectOnclick.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Mono;
+using Mono.UI.Core;
+using UnityEngine;
+
+public class GameObjectOnclick : MonoBehaviour
+{
+    public Animator Animator;
+
+    void Start()
+    {
+        Animator.Play("dabaojianshan");
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+    }
+
+    private bool isEnable;
+
+    private void OnMouseDown()
+    {
+        if (isEnable)
+        {
+            return;
+        }
+
+        Animator.Play("init");
+   
+        UIManager.Instance.GetPanel<TipPanel>().DBJNext();
+        isEnable = true;
+        TimeComponent.Instance.AddTimer(1f, () =>
+        {
+            Animator.Play("dabaojianshan");
+            isEnable = false;
+        });
+    }
+}

Assets/Scripts/Mono/GameObjectOnclick.cs.meta

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

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

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using UnityEditor.Search;
+
 using UnityEngine;
 using Utility;
 

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

@@ -30,10 +30,10 @@ namespace Mono
             Btn_My.onClick.AddListener(() => { Debug.Log("点击我的"); });
             Btn_CSG.onClick.AddListener(() =>
             {
-                SceneManager.LoadScene("baidicheng");
+                SceneManager.LoadScene("dabaojian");
 
                 UIManager.Instance.HideUIPanel<MainScenePanel>();
-                TimeComponent.Instance.AddTimer(20, () => { UIManager.Instance.LoadAndOpenPanel<ChatPanel>(UIManager.UILayer.Middle); });
+                TimeComponent.Instance.AddTimer(0.5f, () => { UIManager.Instance.LoadAndOpenPanel<TipPanel>(UIManager.UILayer.Middle); });
             });
 
             Btn_Return.onClick.AddListener(() =>

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

@@ -0,0 +1,116 @@
+using System.Collections.Generic;
+using Mono.UI.Core;
+using UnityEngine;
+using UnityEngine.Playables;
+using UnityEngine.SceneManagement;
+using UnityEngine.Timeline;
+using UnityEngine.UI;
+
+namespace Mono
+{
+    [UIBinding(prefab = "TipPanel")]
+    public class TipPanel : UIPanel
+    {
+        public Text Text_00;
+        public Typewriter Text_01;
+
+        public override void GetUIData()
+        {
+            Text_00 = UIData.Get<Text>("Text_00");
+            Text_01 = UIData.Get<Typewriter>("Text_01");
+        }
+
+
+        private PlayableDirector playableDirector;
+        public override void Show()
+        {
+            base.Show();
+            index = 0;
+            // Text_01.StringContent = "龙泉剑\n在白帝城偶遇诗仙李白获赠的随身佩剑";
+            // Text_01.SetContent();
+            //
+             playableDirector = GameObject.Find("timeline").gameObject.GetComponent<PlayableDirector>();
+
+
+            ResetTrackAsset(playableDirector);
+        }
+
+        private int index = 0;
+
+
+        /// <summary>
+        /// 所有的轨道组
+        /// </summary>
+        public List<TrackAsset> trackGroups = new List<TrackAsset>();
+
+        public void ResetTrackAsset(PlayableDirector pd)
+        {
+            trackGroups.Clear();
+            TimelineAsset ta = (TimelineAsset)pd.playableAsset;
+            for (int i = 0; i < ta.rootTrackCount; i++)
+            {
+                TrackAsset trackAsset = ta.GetRootTrack(i);
+                trackAsset.muted = true;
+                trackGroups.Add(trackAsset);
+            }
+        }
+
+        private void MuteAll()
+        {
+            foreach (TrackAsset trackGroup in trackGroups)
+            {
+                // trackGroup.
+
+                trackGroup.muted = true;
+            }
+        }
+
+
+        public void DBJNext()
+        {
+
+            MuteAll();
+
+            foreach (var trackGroup in trackGroups)
+            {
+                switch (index)
+                {
+                    case 0:
+
+                        if (trackGroup.name == "1")
+                        {
+                            trackGroup.muted = false;
+                        }
+
+                        break;
+
+                    case 1:
+
+                        if (trackGroup.name == "2")
+                        {
+                            trackGroup.muted = false;
+                        }
+
+
+                        UIManager.Instance.PlayAudioClip("SowrdDraw");
+                        break;
+                }
+            }
+            playableDirector.Stop();
+            playableDirector.time = 0;
+            playableDirector.Play();
+            index++;
+
+            if (index > 1)
+            {
+                TimeComponent.Instance.AddTimer(1.5f, () =>
+                {
+                    UIManager.Instance.HideUIPanel<TipPanel>();
+                    SceneManager.LoadScene("baidicheng");
+                    UIManager.Instance.PlayBGM("Scene04");
+                    TimeComponent.Instance.AddTimer(22f, () => { UIManager.Instance.LoadAndOpenPanel<ChatPanel>(UIManager.UILayer.Middle); });
+                });
+            }
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e5c883fa1ca742788786ebcd06396e73
+timeCreated: 1697536243

Assets/VolumetricFogBundle/URP/VolumetricFog2_URP.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f9d1b5aa62a634d3cbf33c44a7c04e91
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

EXE/PoetryTour_BurstDebugInformation_DoNotShip/Data/Plugins/x86_64/lib_burst_generated.txt

@@ -118,17 +118,25 @@ Library: E:\MyGameProject\PoetryTour\Temp\StagingArea\Data\Plugins\x86_64\lib_bu
 --compilation-defines=CSHARP_7_3_OR_NEWER
 --compilation-defines=ENABLE_VR_MODULE
 --compilation-defines=ENABLE_XR_MODULE
+--compilation-defines=ENABLE_BURST_1_0_0_OR_NEWER
+--compilation-defines=USING_ANIMATION_MODULE
+--compilation-defines=USING_PHYSICS2D_MODULE
 --compilation-defines=MODULE_AI_EXISTS
 --compilation-defines=MODULE_ANIMATION_EXISTS
 --compilation-defines=MODULE_PHYSICS_EXISTS
 --compilation-defines=MODULE_PHYSICS_2D_EXISTS
 --compilation-defines=MODULE_PARTICLE_SYSTEM_EXISTS
---compilation-defines=ENABLE_BURST_1_0_0_OR_NEWER
---compilation-defines=USING_ANIMATION_MODULE
---compilation-defines=USING_PHYSICS2D_MODULE
 --compilation-defines=ENABLE_ANIMATION_BURST
---compilation-defines=TIMELINE_FRAMEACCURATE
+--compilation-defines=CINEMACHINE_TIMELINE
+--compilation-defines=CINEMACHINE_PHYSICS_2D
+--compilation-defines=CINEMACHINE_PHYSICS
+--compilation-defines=CINEMACHINE_UGUI
+--compilation-defines=CINEMACHINE_LWRP_7_3_1
+--compilation-defines=CINEMACHINE_PIXEL_PERFECT_2_0_3
+--compilation-defines=CINEMACHINE_UNITY_ANIMATION
+--compilation-defines=CINEMACHINE_UNITY_IMGUI
 --compilation-defines=ENABLE_SPRITESHAPE_BURST
+--compilation-defines=TIMELINE_FRAMEACCURATE
 --compilation-defines=ENABLE_URP
 --linker-options=PdbAltPath="PoetryTour_Data/Plugins/x86_64/lib_burst_generated.pdb"
 --generate-link-xml=Temp\burst.link.xml
@@ -271,17 +279,25 @@ Library: E:\MyGameProject\PoetryTour\Temp\StagingArea\Data\Plugins\x86_64\lib_bu
 --compilation-defines=CSHARP_7_3_OR_NEWER
 --compilation-defines=ENABLE_VR_MODULE
 --compilation-defines=ENABLE_XR_MODULE
+--compilation-defines=ENABLE_BURST_1_0_0_OR_NEWER
+--compilation-defines=USING_ANIMATION_MODULE
+--compilation-defines=USING_PHYSICS2D_MODULE
 --compilation-defines=MODULE_AI_EXISTS
 --compilation-defines=MODULE_ANIMATION_EXISTS
 --compilation-defines=MODULE_PHYSICS_EXISTS
 --compilation-defines=MODULE_PHYSICS_2D_EXISTS
 --compilation-defines=MODULE_PARTICLE_SYSTEM_EXISTS
---compilation-defines=ENABLE_BURST_1_0_0_OR_NEWER
---compilation-defines=USING_ANIMATION_MODULE
---compilation-defines=USING_PHYSICS2D_MODULE
 --compilation-defines=ENABLE_ANIMATION_BURST
---compilation-defines=TIMELINE_FRAMEACCURATE
+--compilation-defines=CINEMACHINE_TIMELINE
+--compilation-defines=CINEMACHINE_PHYSICS_2D
+--compilation-defines=CINEMACHINE_PHYSICS
+--compilation-defines=CINEMACHINE_UGUI
+--compilation-defines=CINEMACHINE_LWRP_7_3_1
+--compilation-defines=CINEMACHINE_PIXEL_PERFECT_2_0_3
+--compilation-defines=CINEMACHINE_UNITY_ANIMATION
+--compilation-defines=CINEMACHINE_UNITY_IMGUI
 --compilation-defines=ENABLE_SPRITESHAPE_BURST
+--compilation-defines=TIMELINE_FRAMEACCURATE
 --compilation-defines=ENABLE_URP
 --linker-options=PdbAltPath="PoetryTour_Data/Plugins/x86_64/lib_burst_generated.pdb"
 --generate-link-xml=Temp\burst.link.xml

ProjectSettings/EditorBuildSettings.asset

@@ -6,9 +6,15 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Scenes/MainScene.unity
-    guid: 2cda990e2423bbf4892e6590ba056729
+    path: Assets/Scenes/main.unity
+    guid: 2e6aae558f36b7f468b9e6d63449f183
+  - enabled: 1
+    path: Assets/Scenes/dabaojian.unity
+    guid: ad6f56d409503294a91242df5a6e5187
   - enabled: 1
     path: Assets/Scenes/baidicheng.unity
     guid: 2353d927daf47384a864af83fd2c24ba
+  - enabled: 1
+    path: Assets/Scenes/EndScene.unity
+    guid: 67cbc63eb1c18624face4519edb89be9
   m_configObjects: {}