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

# Conflicts:
#	Assets/Scenes/baidicheng.unity

Assets/Resources/Canvas.prefab

@@ -404,6 +404,7 @@ GameObject:
   - component: {fileID: 4591470911106441115}
   - component: {fileID: 4591470911106441108}
   - component: {fileID: 5681877715498747450}
+  - component: {fileID: 820990036358367912}
   m_Layer: 5
   m_Name: Canvas
   m_TagString: Untagged
@@ -543,6 +544,18 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 0
+--- !u!114 &820990036358367912
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4591470911106441109}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 09ec6795c309025418a28c3001337c8c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &8035333688633652909
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UIPanel/ChatPanel.prefab

@@ -561,7 +561,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7304293926859201516
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Resources/UIPanel/StartPanel.prefab

@@ -208,7 +208,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5145079802948576279
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Scenes/EndScene.unity

@@ -0,0 +1,125 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 9
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 3
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 12
+  m_GIWorkflowMode: 1
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 0
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 12
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 256
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 1
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 512
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 256
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 1
+    m_PVRDenoiserTypeDirect: 1
+    m_PVRDenoiserTypeIndirect: 1
+    m_PVRDenoiserTypeAO: 1
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 0}
+  m_LightingSettings: {fileID: 0}
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 2
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    accuratePlacement: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}

Assets/VolumetricFogBundle/Builtin/VolumetricAndDynamicFog_Builtin.unitypackage.meta → Assets/Scenes/EndScene.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: eebef07bd4ae74e6981505b540da4731
+guid: 67cbc63eb1c18624face4519edb89be9
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Art/baidicheng.unity → Assets/Scenes/baidicheng.unity

@@ -7025,7 +7025,7 @@ Light:
   serializedVersion: 10
   m_Type: 1
   m_Shape: 0
-  m_Color: {r: 0.8039216, g: 0.9293765, b: 1, a: 1}
+  m_Color: {r: 1, g: 0.88436025, b: 0.80566037, a: 1}
   m_Intensity: 1
   m_Range: 10
   m_SpotAngle: 30
@@ -7279,6 +7279,43 @@ Transform:
   m_Father: {fileID: 802580076}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!84 &249579056
+RenderTexture:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  m_IsAlphaChannelOptional: 0
+  serializedVersion: 5
+  m_Width: 256
+  m_Height: 256
+  m_AntiAliasing: 1
+  m_MipCount: -1
+  m_DepthStencilFormat: 0
+  m_ColorFormat: 8
+  m_MipMap: 0
+  m_GenerateMips: 1
+  m_SRGB: 0
+  m_UseDynamicScale: 0
+  m_BindMS: 0
+  m_EnableCompatibleFormat: 1
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 1
+    m_MipBias: 0
+    m_WrapU: 0
+    m_WrapV: 0
+    m_WrapW: 0
+  m_Dimension: 2
+  m_VolumeDepth: 1
+  m_ShadowSamplingMode: 2
 --- !u!1001 &288307701
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -10594,43 +10631,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!84 &685085512
-RenderTexture:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  m_IsAlphaChannelOptional: 0
-  serializedVersion: 5
-  m_Width: 256
-  m_Height: 256
-  m_AntiAliasing: 1
-  m_MipCount: -1
-  m_DepthStencilFormat: 0
-  m_ColorFormat: 8
-  m_MipMap: 0
-  m_GenerateMips: 1
-  m_SRGB: 0
-  m_UseDynamicScale: 0
-  m_BindMS: 0
-  m_EnableCompatibleFormat: 1
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 0
-    m_WrapV: 0
-    m_WrapW: 0
-  m_Dimension: 2
-  m_VolumeDepth: 1
-  m_ShadowSamplingMode: 2
 --- !u!1 &686109419
 GameObject:
   m_ObjectHideFlags: 0
@@ -15542,7 +15542,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1297694970}
-  m_LocalRotation: {x: -0.019138113, y: -0.08874365, z: -0.0017054308, w: 0.99586916}
+  m_LocalRotation: {x: -0.019138092, y: -0.08874362, z: -0.0017054282, w: 0.99586916}
   m_LocalPosition: {x: 358, y: 3403, z: 5692}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -23145,6 +23145,7 @@ GameObject:
   - component: {fileID: 1656411218}
   - component: {fileID: 1656411219}
   - component: {fileID: 1165568981}
+  - component: {fileID: 1656411220}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -23256,6 +23257,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 &1658856394
 GameObject:
   m_ObjectHideFlags: 0
@@ -24286,7 +24300,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 685085512}
+        m_Texture: {fileID: 249579056}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
@@ -24309,18 +24323,18 @@ Material:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _DetailColor: {r: 0.575, g: 0.575, b: 0.575, a: 0}
     - _DetailData: {r: 0.5, g: 4, b: -0.5, a: 0}
-    - _DetailWindDirection: {r: -0.108957514, g: 0, b: 0, a: 0}
+    - _DetailWindDirection: {r: -0.02971566, g: 0, b: 0, a: 0}
     - _DistanceData: {r: 0, g: 5, b: 1, a: 1}
     - _FogOfWarCenter: {r: 0, g: 0, b: 0, a: 1}
     - _FogOfWarCenterAdjusted: {r: 0, g: 0, b: 0, a: 1}
     - _FogOfWarSize: {r: 0, g: 0, b: 0, a: 1}
-    - _LightColor: {r: 1.6078432, g: 1.858753, b: 2, a: 0.148}
+    - _LightColor: {r: 2, g: 1.7687205, b: 1.6113207, a: 0.148}
     - _MaxDistanceData: {r: 100000, g: 1, b: 0, a: 0}
     - _RayMarchSettings: {r: 5, g: 0.01, b: 1, a: 0.1}
     - _ShadowData: {r: 0.5, g: 0, b: 62500, a: 0}
     - _SpecularColor: {r: 0.5, g: 0.5, b: 0.5, a: 0}
     - _SunDir: {r: 0.49525782, g: 0.36346677, b: 0.78905755, a: 0}
-    - _WindDirection: {r: -0.108957514, g: 0, b: 0, a: 0}
+    - _WindDirection: {r: -0.02971566, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []
 --- !u!1 &1819042572
 GameObject:

Assets/Art/main.unity → Assets/Scenes/main.unity

@@ -7560,6 +7560,43 @@ Transform:
   m_Father: {fileID: 6933930956171087367}
   m_RootOrder: 63
   m_LocalEulerAnglesHint: {x: -10.306, y: -25.101, z: 2.823}
+--- !u!84 &619486783
+RenderTexture:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  m_IsAlphaChannelOptional: 0
+  serializedVersion: 5
+  m_Width: 256
+  m_Height: 256
+  m_AntiAliasing: 1
+  m_MipCount: -1
+  m_DepthStencilFormat: 0
+  m_ColorFormat: 8
+  m_MipMap: 0
+  m_GenerateMips: 1
+  m_SRGB: 0
+  m_UseDynamicScale: 0
+  m_BindMS: 0
+  m_EnableCompatibleFormat: 1
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 1
+    m_MipBias: 0
+    m_WrapU: 0
+    m_WrapV: 0
+    m_WrapW: 0
+  m_Dimension: 2
+  m_VolumeDepth: 1
+  m_ShadowSamplingMode: 2
 --- !u!1 &622614520
 GameObject:
   m_ObjectHideFlags: 0
@@ -9334,6 +9371,50 @@ LODGroup:
     renderers:
     - renderer: {fileID: 1530070203}
   m_Enabled: 1
+--- !u!1 &980951869
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 980951871}
+  - component: {fileID: 980951870}
+  m_Layer: 0
+  m_Name: AppLauncher
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &980951870
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 980951869}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b7166c217b370d84cae678218e9169a6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &980951871
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 980951869}
+  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: 0}
+  m_RootOrder: 18
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &981134425
 Transform:
   m_ObjectHideFlags: 0
@@ -9481,43 +9562,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1020232339}
   m_Mesh: {fileID: -8871384741103020932, guid: 13900542abc2e2f4f90c9434150912fd, type: 3}
---- !u!84 &1042501781
-RenderTexture:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  m_IsAlphaChannelOptional: 0
-  serializedVersion: 5
-  m_Width: 256
-  m_Height: 256
-  m_AntiAliasing: 1
-  m_MipCount: -1
-  m_DepthStencilFormat: 0
-  m_ColorFormat: 8
-  m_MipMap: 0
-  m_GenerateMips: 1
-  m_SRGB: 0
-  m_UseDynamicScale: 0
-  m_BindMS: 0
-  m_EnableCompatibleFormat: 1
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 0
-    m_WrapV: 0
-    m_WrapW: 0
-  m_Dimension: 2
-  m_VolumeDepth: 1
-  m_ShadowSamplingMode: 2
 --- !u!4 &1095730308
 Transform:
   m_ObjectHideFlags: 0
@@ -15939,6 +15983,7 @@ GameObject:
   - component: {fileID: 1656411218}
   - component: {fileID: 1656411219}
   - component: {fileID: 1165568981}
+  - component: {fileID: 1656411220}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -16050,6 +16095,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 &1676938404
 GameObject:
   m_ObjectHideFlags: 0
@@ -16555,7 +16613,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 1042501781}
+        m_Texture: {fileID: 619486783}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
@@ -16578,7 +16636,7 @@ Material:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _DetailColor: {r: 0.5533019, g: 0.5533019, b: 0.5533019, a: 0}
     - _DetailData: {r: 0.5, g: 4, b: -0.5, a: 0}
-    - _DetailWindDirection: {r: 0, g: 0, b: 0, a: 0}
+    - _DetailWindDirection: {r: -0.048836865, g: 0, b: 0, a: 0}
     - _DistanceData: {r: 0, g: 5, b: 1, a: 1}
     - _FogOfWarCenter: {r: 0, g: 0, b: 0, a: 1}
     - _FogOfWarCenterAdjusted: {r: 0, g: 0, b: 0, a: 1}
@@ -16589,7 +16647,7 @@ Material:
     - _ShadowData: {r: 0.5, g: 0, b: 62500, a: 0}
     - _SpecularColor: {r: 0.5, g: 0.5, b: 0.5, a: 0}
     - _SunDir: {r: 0.49525782, g: 0.36346677, b: 0.78905755, a: 0}
-    - _WindDirection: {r: 0, g: 0, b: 0, a: 0}
+    - _WindDirection: {r: -0.048836865, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []
 --- !u!4 &1833292951
 Transform:

Assets/Scripts/AppLauncher.cs

@@ -1,24 +1,41 @@
 using System.Collections;
 using System.Collections.Generic;
 using Mono;
+using Mono.UI.Core;
 using UnityEngine;
 
 public class AppLauncher : MonoBehaviour
 {
+    private bool _isStart;
+
     void Start()
     {
         GameObject prefab = Resources.Load<GameObject>("Canvas");
 
         GameObject _gameObject = GameObject.Instantiate(prefab);
         UIManager.Instance.SetUIRoot(_gameObject);
-        UIManager.Instance.LoadAndOpenPanel<StartPanel>(UIManager.UILayer.Middle);
+
 
         ConfigComponent.Instance.Preload();
+        _isStart = true;
+        _timer = 0;
+        TimeComponent.Instance.AddTimer(15, () => { UIManager.Instance.LoadAndOpenPanel<StartPanel>(UIManager.UILayer.Middle); });
     }
 
+    private float _timer;
+
     // Update is called once per frame
-    void Update()
-    {
-        
-    }
+    // void Update()
+    // {
+    //     if (_isStart)
+    //     {
+    //         _timer += Time.deltaTime;
+    //         if (_timer >= 15)
+    //         {
+    //             UIManager.Instance.LoadAndOpenPanel<StartPanel>(UIManager.UILayer.Middle);
+    //             _isStart = false;
+    //             _timer = 0;
+    //         }
+    //     }
+    // }
 }

Assets/Scripts/DontDestroyOnLoadTag.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Mono.UI.Core;
+using UnityEngine;
+
+public class DontDestroyOnLoadTag : MonoBehaviour
+{
+    void Awake()
+    {
+        DontDestroyOnLoad(this);
+    }
+
+    public void Update()
+    {
+        TimeComponent.Instance.Update();
+    }
+}

Assets/Scripts/DontDestroyOnLoadTag.cs.meta

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

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

@@ -0,0 +1,33 @@
+using System;
+
+namespace Mono.UI.Core
+{
+    public class CustomTimer
+    {
+        public float TargetTime;
+
+        public float CurTime;
+        public Action Action;
+        public bool IsOver;
+
+        public void Update(float time)
+        {
+            CurTime += time;
+            if (CurTime >= TargetTime)
+            {
+                IsOver = true;
+                Action?.Invoke();
+
+                TimeComponent.Instance.Rec(this);
+            }
+        }
+
+        public void CustomInit(float targetTime, Action action)
+        {
+            CurTime = 0;
+            TargetTime = targetTime;
+            Action = action;
+            IsOver = false;
+        }
+    }
+}

Assets/Scripts/Mono/UI/Core/CustomTimer.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9b5e243f40c74ddeb3fe00290303ba4c
+timeCreated: 1697531786

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

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using UnityEditor.Search;
+using UnityEngine;
+using Utility;
+
+namespace Mono.UI.Core
+{
+    public class TimeComponent : Singleton<TimeComponent>
+    {
+        public Queue<CustomTimer> TimerPool = new Queue<CustomTimer>();
+        public List<CustomTimer> CustomTimers = new List<CustomTimer>();
+
+        public void Init()
+        {
+        }
+
+        public void AddTimer(float time, Action action)
+        {
+            CustomTimer customTimer;
+            if (TimerPool.Count > 0)
+            {
+                customTimer = TimerPool.Dequeue();
+            }
+            else
+            {
+                customTimer = new CustomTimer();
+            }
+
+            customTimer.CustomInit(time, action);
+            CustomTimers.Add(customTimer);
+        }
+
+        public void Update()
+        {
+            for (var i = 0; i < CustomTimers.Count; i++)
+            {
+                CustomTimers[i].Update(Time.deltaTime);
+            }
+        }
+
+        public void Rec(CustomTimer customTimer)
+        {
+            if (CustomTimers.Contains(customTimer))
+            {
+                CustomTimers.Remove(customTimer);
+                TimerPool.Enqueue(customTimer);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7bc09747ffb34c62935776f511790092
+timeCreated: 1697531673

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

@@ -1,6 +1,7 @@
 using Excel2Json;
 using Unity.VisualScripting;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 
 namespace Mono
@@ -35,15 +36,21 @@ namespace Mono
 
         public bool IsOver;
 
-
+    
+        
+        
         public override void Show()
         {
             base.Show();
             Image_NPC.gameObject.SetActive(true);
             Text_YK.gameObject.SetActive(false);
+            
             UIManager.Instance.PlayBGM("scene02");
             CurIndex = 0;
             Text_Dialogue.Showtext.text = "";
+            Dialogue();
+
+
         }
 
         public void Dialogue()
@@ -52,6 +59,7 @@ namespace Mono
             {
                 IsOver = true;
 
+             
                 UIManager.Instance.HideUIPanel<ChatPanel>();
                 UIManager.Instance.LoadAndOpenPanel<InputPanel>(UIManager.UILayer.Middle);
 

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

@@ -1,5 +1,7 @@
 using System;
+using Mono.UI.Core;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 
 namespace Mono
@@ -56,7 +58,7 @@ namespace Mono
             {
                 UIManager.Instance.PlayAudioClip("UI_ButtonClick");
                 UIManager.Instance.HideUIPanel<InputPanel>();
-                UIManager.Instance.LoadAndOpenPanel<CSGPanel>(UIManager.UILayer.Middle);
+                UIManager.Instance.LoadAndOpenPanel<MainScenePanel>(UIManager.UILayer.Middle);
                 
                 Destroy(Map);
                 Destroy(Npc);
@@ -67,7 +69,12 @@ namespace Mono
         public override void Show()
         {
             base.Show();
-            CreatSceneAndPlayer();
+            SceneManager.LoadScene("EndScene");
+            TimeComponent.Instance.AddTimer(0.5f, () =>
+            {
+                CreatSceneAndPlayer();
+            });
+           
             Btn_Start.gameObject.SetActive(true);
             Btn_Retrun.gameObject.SetActive(false);
             ShijuRoot.gameObject.SetActive(false);
@@ -79,6 +86,7 @@ namespace Mono
         public GameObject Npc;
         public void CreatSceneAndPlayer()
         {
+        
             GameObject prefab00 = Resources.Load<GameObject>("Game/Map");
 
             Map=  GameObject.Instantiate(prefab00);

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

@@ -1,4 +1,6 @@
-using UnityEngine;
+using Mono.UI.Core;
+using UnityEngine;
+using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 
 namespace Mono
@@ -28,10 +30,12 @@ namespace Mono
             Btn_My.onClick.AddListener(() => { Debug.Log("点击我的"); });
             Btn_CSG.onClick.AddListener(() =>
             {
+                SceneManager.LoadScene("baidicheng");
+
                 UIManager.Instance.HideUIPanel<MainScenePanel>();
-                UIManager.Instance.LoadAndOpenPanel<CSGPanel>(UIManager.UILayer.Middle);
+                TimeComponent.Instance.AddTimer(20, () => { UIManager.Instance.LoadAndOpenPanel<ChatPanel>(UIManager.UILayer.Middle); });
             });
-            
+
             Btn_Return.onClick.AddListener(() =>
             {
                 UIManager.Instance.StopBGM();
@@ -44,7 +48,7 @@ namespace Mono
         public override void Show()
         {
             base.Show();
-            
+
             UIManager.Instance.PlayBGM("scene01");
         }
     }

Assets/VolumetricFogBundle/URP/VolumetricFog2_URP.unitypackage.meta

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

ProjectSettings/EditorBuildSettings.asset

@@ -8,4 +8,7 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/MainScene.unity
     guid: 2cda990e2423bbf4892e6590ba056729
+  - enabled: 1
+    path: Assets/Scenes/baidicheng.unity
+    guid: 2353d927daf47384a864af83fd2c24ba
   m_configObjects: {}