From d00edd7bb85feb2e90c8ca2b7fbb67152db08517 Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Mon, 13 Jul 2026 22:53:59 +0800 Subject: [PATCH] =?UTF-8?q?scene:=20=E7=99=BB=E8=AE=B0=E5=8F=99=E4=BA=8B?= =?UTF-8?q?=20Timeline=20=E5=B9=B6=E6=8C=82=E5=85=A5=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor --- .../AddressableAssetSettings.asset | 2 +- .../AssetGroups/Scene_Bridge.asset | 5 + .../AssetGroups/Scene_ClinicOut.asset | 5 + Assets/Scenes/Bridge.unity | 180 ++++++++++++++++- Assets/Scenes/ClinicOut.unity | 190 +++++++++++++++++- 5 files changed, 369 insertions(+), 13 deletions(-) diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index b165ffb1d..1c7d4afc1 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: 09546aca93a801441859af2a811fe53b m_currentHash: serializedVersion: 2 - Hash: 1616e06b587c7889ae21faab8aef8e68 + Hash: 00000000000000000000000000000000 m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_BundleLocalCatalog: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Scene_Bridge.asset b/Assets/AddressableAssetsData/AssetGroups/Scene_Bridge.asset index d0c8e2ea4..b15f4ad08 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Scene_Bridge.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Scene_Bridge.asset @@ -52,6 +52,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: f19cff809e7020b41ba8ad7da199db86 + m_Address: "Timeline/day2\u5915\u9633\u533B\u751F\u770B\u4F69\u4F69\u4FA7\u8138" + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} m_SchemaSet: diff --git a/Assets/AddressableAssetsData/AssetGroups/Scene_ClinicOut.asset b/Assets/AddressableAssetsData/AssetGroups/Scene_ClinicOut.asset index 89b38ed01..792eec304 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Scene_ClinicOut.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Scene_ClinicOut.asset @@ -82,6 +82,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 1799dbcdb4a76624bb89622707581f92 + m_Address: "Timeline/\u82F1\u91CC\u521D\u767B\u573A" + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} m_SchemaSet: diff --git a/Assets/Scenes/Bridge.unity b/Assets/Scenes/Bridge.unity index 8b42c4dbe..1cf78b19f 100644 --- a/Assets/Scenes/Bridge.unity +++ b/Assets/Scenes/Bridge.unity @@ -1332,6 +1332,78 @@ MonoBehaviour: autoBindCinemachineBrain: 0 resetToStartWhenFinished: 0 resetToStartDelay: 0 +--- !u!1 &1140915030 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1140915033} + - component: {fileID: 1140915032} + - component: {fileID: 1140915031} + m_Layer: 0 + m_Name: "day2\u5915\u9633\u533B\u751F\u770B\u4F69\u4F69\u4FA7\u8138" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1140915031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1140915030} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07d657d6b80509b4eb04f59afaa9aa2d, type: 3} + m_Name: + m_EditorClassIdentifier: + timelineName: "day2\u5915\u9633\u533B\u751F\u770B\u4F69\u4F69\u4FA7\u8138" + director: {fileID: 1140915032} + autoBindCinemachineBrain: 0 + resetToStartWhenFinished: 0 + resetToStartDelay: 0 +--- !u!320 &1140915032 +PlayableDirector: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1140915030} + m_Enabled: 1 + serializedVersion: 3 + m_PlayableAsset: {fileID: 11400000, guid: f19cff809e7020b41ba8ad7da199db86, type: 2} + m_InitialState: 0 + m_WrapMode: 1 + m_DirectorUpdateMode: 1 + m_InitialTime: 0 + m_SceneBindings: + - key: {fileID: -2030842490917413181, guid: f19cff809e7020b41ba8ad7da199db86, type: 2} + value: {fileID: 1975996165} + - key: {fileID: -4788355223232630102, guid: f19cff809e7020b41ba8ad7da199db86, type: 2} + value: {fileID: 1975996162} + m_ExposedReferences: + m_References: [] +--- !u!4 &1140915033 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1140915030} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1975996164} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1375573818 GameObject: m_ObjectHideFlags: 0 @@ -2174,6 +2246,112 @@ MonoBehaviour: - time: 1 weather: 2 active: 1 +--- !u!1 &1975996162 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1975996164} + - component: {fileID: 1975996163} + - component: {fileID: 1975996165} + m_Layer: 0 + m_Name: Visual + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!212 &1975996163 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1975996162} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 315200563 + m_SortingLayer: 17 + m_SortingOrder: 10 + m_Sprite: {fileID: 7951236598197254894, guid: df6bb9e5926db0a49985eb6c0fa45d6c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.84, y: 2.16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1975996164 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1975996162} + serializedVersion: 2 + 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: 1140915033} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1975996165 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1975996162} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: -2435893846402698570, guid: df6bb9e5926db0a49985eb6c0fa45d6c, type: 3} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &2139582137 GameObject: m_ObjectHideFlags: 0 @@ -2203,7 +2381,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0e1a1832f60f72e449b07f1298eefa53, type: 3} m_Name: m_EditorClassIdentifier: - bubbleSlotGroup: {fileID: 859248833} --- !u!4 &2139582139 Transform: m_ObjectHideFlags: 0 @@ -2351,3 +2528,4 @@ SceneRoots: - {fileID: 930314674} - {fileID: 352219849} - {fileID: 2139582139} + - {fileID: 1140915033} diff --git a/Assets/Scenes/ClinicOut.unity b/Assets/Scenes/ClinicOut.unity index 47cf3efc3..a372064a8 100644 --- a/Assets/Scenes/ClinicOut.unity +++ b/Assets/Scenes/ClinicOut.unity @@ -175,16 +175,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e6bb1b847b634daca8351126b7e717d6, type: 3} m_Name: m_EditorClassIdentifier: - actorData: - onSave: - m_PersistentCalls: - m_Calls: [] - actorName: "\u8BCA\u5BA4\u5916\u4F69\u4F69" - slotName: "\u8BCA\u5BA4\u5916\u680F\u6746" - actorType: 0 - stateName: Idle - alpha: 1 - faceParam: 0 --- !u!212 &2725662 SpriteRenderer: m_ObjectHideFlags: 0 @@ -677,7 +667,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0e1a1832f60f72e449b07f1298eefa53, type: 3} m_Name: m_EditorClassIdentifier: - bubbleSlotGroup: {fileID: 144761227} --- !u!4 &321975066 Transform: m_ObjectHideFlags: 0 @@ -941,6 +930,78 @@ MonoBehaviour: m_EditorClassIdentifier: nonRigidbodyVelocity: 0 attenuationObject: {fileID: 0} +--- !u!1 &553462137 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 553462140} + - component: {fileID: 553462139} + - component: {fileID: 553462138} + m_Layer: 0 + m_Name: "\u82F1\u91CC\u521D\u767B\u573A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &553462138 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 553462137} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07d657d6b80509b4eb04f59afaa9aa2d, type: 3} + m_Name: + m_EditorClassIdentifier: + timelineName: "\u82F1\u91CC\u521D\u767B\u573A" + director: {fileID: 553462139} + autoBindCinemachineBrain: 0 + resetToStartWhenFinished: 0 + resetToStartDelay: 0 +--- !u!320 &553462139 +PlayableDirector: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 553462137} + m_Enabled: 1 + serializedVersion: 3 + m_PlayableAsset: {fileID: 11400000, guid: 1799dbcdb4a76624bb89622707581f92, type: 2} + m_InitialState: 0 + m_WrapMode: 2 + m_DirectorUpdateMode: 1 + m_InitialTime: 0 + m_SceneBindings: + - key: {fileID: 5719508972026876605, guid: 1799dbcdb4a76624bb89622707581f92, type: 2} + value: {fileID: 656986306} + - key: {fileID: 7183806554824717566, guid: 1799dbcdb4a76624bb89622707581f92, type: 2} + value: {fileID: 656986303} + m_ExposedReferences: + m_References: [] +--- !u!4 &553462140 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 553462137} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 656986305} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &619394800 GameObject: m_ObjectHideFlags: 0 @@ -1023,6 +1084,112 @@ Transform: m_Children: [] m_Father: {fileID: 467680739} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &656986303 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 656986305} + - component: {fileID: 656986304} + - component: {fileID: 656986306} + m_Layer: 0 + m_Name: Visual + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!212 &656986304 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 656986303} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 315200563 + m_SortingLayer: 17 + m_SortingOrder: 10 + m_Sprite: {fileID: -8396094187894558117, guid: 2778fb4d82c715e4fbe063c841b93a66, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.84, y: 2.16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &656986305 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 656986303} + serializedVersion: 2 + 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: 553462140} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &656986306 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 656986303} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 3624182686428208388, guid: 2778fb4d82c715e4fbe063c841b93a66, type: 3} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1001 &671080241 PrefabInstance: m_ObjectHideFlags: 0 @@ -9991,3 +10158,4 @@ SceneRoots: - {fileID: 1205962970} - {fileID: 1793462669} - {fileID: 821920700} + - {fileID: 553462140}