diff --git a/Assets/Scenes/Bridge.unity b/Assets/Scenes/Bridge.unity index 9a35e6030..9008e9b43 100644 --- a/Assets/Scenes/Bridge.unity +++ b/Assets/Scenes/Bridge.unity @@ -231,7 +231,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1614842706} + m_Father: {fileID: 1778160852} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &195545131 Animator: @@ -393,7 +393,6 @@ Transform: - {fileID: 1778160852} - {fileID: 1885732174} - {fileID: 1857008257} - - {fileID: 1614842706} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &519420028 @@ -539,6 +538,112 @@ MonoBehaviour: m_EditorClassIdentifier: nonRigidbodyVelocity: 0 attenuationObject: {fileID: 0} +--- !u!1 &576811037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 576811038} + - component: {fileID: 576811040} + - component: {fileID: 576811039} + m_Layer: 0 + m_Name: CG (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &576811038 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 576811037} + 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: 1857008257} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &576811039 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 576811037} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + 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!212 &576811040 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 576811037} + 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 11 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 17.860466, y: 10.046512} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &619394800 GameObject: m_ObjectHideFlags: 0 @@ -701,7 +806,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1614842706} + m_Father: {fileID: 1099759396} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &841140605 Animator: @@ -764,7 +869,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 6 + m_SortingOrder: 12 m_Sprite: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -773,7 +878,7 @@ SpriteRenderer: m_Size: {x: 14.651163, y: 3.0232558} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &853213740 @@ -1116,7 +1221,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1099759396 Transform: m_ObjectHideFlags: 0 @@ -1129,7 +1234,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 841140604} m_Father: {fileID: 352219849} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!320 &1099759397 @@ -1156,7 +1262,7 @@ PlayableDirector: - key: {fileID: 7436699437769565425, guid: 476b3bd6ce38234448714252b98a7e96, type: 2} value: {fileID: 841140605} - key: {fileID: 7436699437769565425, guid: 5253d74898c86f547861ebf57b280b4f, type: 2} - value: {fileID: 0} + value: {fileID: 841140605} m_ExposedReferences: m_References: [] --- !u!114 &1099759398 @@ -1303,40 +1409,6 @@ MonoBehaviour: autoBindCinemachineBrain: 0 resetToStartWhenFinished: 0 resetToStartDelay: 0 ---- !u!1 &1614842705 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1614842706} - m_Layer: 0 - m_Name: Animator - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1614842706 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1614842705} - 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: - - {fileID: 841140604} - - {fileID: 195545130} - - {fileID: 1909622310} - m_Father: {fileID: 352219849} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1764988249 GameObject: m_ObjectHideFlags: 0 @@ -1417,7 +1489,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 195545130} m_Father: {fileID: 352219849} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!320 &1778160853 @@ -1754,7 +1827,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 576811038} m_Father: {fileID: 352219849} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!320 &1857008258 @@ -1766,9 +1840,9 @@ PlayableDirector: m_GameObject: {fileID: 1857008256} m_Enabled: 1 serializedVersion: 3 - m_PlayableAsset: {fileID: 11400000, guid: 5253d74898c86f547861ebf57b280b4f, type: 2} + m_PlayableAsset: {fileID: 11400000, guid: 71aa8e39cf2f39945af8ba27eb2acd08, type: 2} m_InitialState: 0 - m_WrapMode: 2 + m_WrapMode: 1 m_DirectorUpdateMode: 1 m_InitialTime: 0 m_SceneBindings: @@ -1779,7 +1853,7 @@ PlayableDirector: - key: {fileID: -4708630142925829535, guid: 2cb71d3803d3e8742aa877424d26eb98, type: 2} value: {fileID: 0} - key: {fileID: 7377573068726715730, guid: 71aa8e39cf2f39945af8ba27eb2acd08, type: 2} - value: {fileID: 1909622311} + value: {fileID: 576811039} - key: {fileID: 7436699437769565425, guid: 5253d74898c86f547861ebf57b280b4f, type: 2} value: {fileID: 841140605} m_ExposedReferences: @@ -1831,7 +1905,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1909622310} m_Father: {fileID: 352219849} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!320 &1885732175 @@ -1843,7 +1918,7 @@ PlayableDirector: m_GameObject: {fileID: 1885732173} m_Enabled: 1 serializedVersion: 3 - m_PlayableAsset: {fileID: 11400000, guid: 5253d74898c86f547861ebf57b280b4f, type: 2} + m_PlayableAsset: {fileID: 11400000, guid: 4180297bbe280ad478f49933e69dcbce, type: 2} m_InitialState: 0 m_WrapMode: 2 m_DirectorUpdateMode: 1 @@ -1913,7 +1988,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1614842706} + m_Father: {fileID: 1885732174} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1909622311 Animator: @@ -2044,11 +2119,11 @@ MonoBehaviour: weather: 2 active: 1 - time: 1 - weather: 2 - active: 1 + weather: 0 + active: 0 - time: 1 weather: 2 - active: 0 + active: 1 --- !u!1 &2139582137 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/ClinicOut.unity b/Assets/Scenes/ClinicOut.unity index 5e3a65ad9..d97556e80 100644 --- a/Assets/Scenes/ClinicOut.unity +++ b/Assets/Scenes/ClinicOut.unity @@ -337,7 +337,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 941243827 m_SortingLayer: 13 - m_SortingOrder: 2 + m_SortingOrder: 3 m_Sprite: {fileID: 5477539165143870540, guid: 139894f45701a144b86b57232315b168, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 0} m_FlipX: 0 @@ -443,7 +443,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 941243827 m_SortingLayer: 13 - m_SortingOrder: 2 + m_SortingOrder: 3 m_Sprite: {fileID: 3710894838871150356, guid: 139894f45701a144b86b57232315b168, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 0} m_FlipX: 0 @@ -1232,7 +1232,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 941243827 m_SortingLayer: 13 - m_SortingOrder: 2 + m_SortingOrder: 3 m_Sprite: {fileID: 5114028229592030309, guid: 139894f45701a144b86b57232315b168, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 0} m_FlipX: 0 @@ -6460,7 +6460,7 @@ PlayableDirector: m_GameObject: {fileID: 1205962967} m_Enabled: 1 serializedVersion: 3 - m_PlayableAsset: {fileID: 11400000, guid: 9e771f24d61d40d42b7e2b4637e8090c, type: 2} + m_PlayableAsset: {fileID: 11400000, guid: 253f47db959b2814998695fb5d1f4d97, type: 2} m_InitialState: 0 m_WrapMode: 1 m_DirectorUpdateMode: 1 @@ -8336,7 +8336,7 @@ PlayableDirector: m_GameObject: {fileID: 1854508163} m_Enabled: 1 serializedVersion: 3 - m_PlayableAsset: {fileID: 11400000, guid: 253f47db959b2814998695fb5d1f4d97, type: 2} + m_PlayableAsset: {fileID: 11400000, guid: 6c4aea2a4a8462344b6ce353f53c7b2a, type: 2} m_InitialState: 0 m_WrapMode: 2 m_DirectorUpdateMode: 1 @@ -8350,6 +8350,12 @@ PlayableDirector: value: {fileID: 711429227} - key: {fileID: 6913286052231973111, guid: 253f47db959b2814998695fb5d1f4d97, type: 2} value: {fileID: 0} + - key: {fileID: -6956288725263805946, guid: 6c4aea2a4a8462344b6ce353f53c7b2a, type: 2} + value: {fileID: 265565257} + - key: {fileID: 8323583033895208436, guid: 6c4aea2a4a8462344b6ce353f53c7b2a, type: 2} + value: {fileID: 229604417} + - key: {fileID: -268691288694346204, guid: 6c4aea2a4a8462344b6ce353f53c7b2a, type: 2} + value: {fileID: 711429227} m_ExposedReferences: m_References: [] --- !u!4 &1854508165 @@ -8368,6 +8374,7 @@ Transform: - {fileID: 265565259} - {fileID: 229604419} - {fileID: 711429229} + - {fileID: 2054278416} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1854508166 @@ -8803,6 +8810,59 @@ Transform: m_CorrespondingSourceObject: {fileID: 5296327770213497549, guid: 87957cfe30e56984b82c1d9a90fad889, type: 3} m_PrefabInstance: {fileID: 2034462922} m_PrefabAsset: {fileID: 0} +--- !u!1 &2054278415 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2054278416} + - component: {fileID: 2054278417} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2054278416 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2054278415} + 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: 1854508165} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &2054278417 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2054278415} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + 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 &2057334822 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 246927af2..3e8567384 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -5629,8 +5629,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: runMode: 0 - firstTalkSo: {fileID: 11400000, guid: afc5b01ef301cc74db7cae741acad427, type: 2} - testTalkSo: {fileID: 11400000, guid: a4dba2e2976607d45a28d4c8cade6b0a, type: 2} + firstTalkSo: {fileID: 11400000, guid: 2f763a2c04ecafb4981379b7363f9791, type: 2} + testTalkSo: {fileID: 11400000, guid: afc5b01ef301cc74db7cae741acad427, type: 2} saveFileName: "20250901_204445_PeipeiDay1_\u8BB0\u5FC6\u68C0\u67E5" --- !u!1 &749156594 GameObject: