diff --git a/Assets/Resources/SpriteGroup/佩佩最新.prefab b/Assets/Resources/SpriteGroup/佩佩最新.prefab index 782a79181..398d45ab6 100644 --- a/Assets/Resources/SpriteGroup/佩佩最新.prefab +++ b/Assets/Resources/SpriteGroup/佩佩最新.prefab @@ -972,7 +972,7 @@ Transform: m_GameObject: {fileID: 2685491168148541651} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.13721, y: -1.0069768, z: 0} + m_LocalPosition: {x: -3.414, y: -1.0069768, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1627,7 +1627,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &3180292444082115115 Transform: m_ObjectHideFlags: 0 @@ -1711,7 +1711,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1768653872334917077 Transform: m_ObjectHideFlags: 0 @@ -2167,7 +2167,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &5310136728925613857 Transform: m_ObjectHideFlags: 0 @@ -2177,7 +2177,7 @@ Transform: m_GameObject: {fileID: 7835211489071332129} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.4069767, y: -0.5302329, z: 0} + m_LocalPosition: {x: -3.6846, y: -0.5302329, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2251,7 +2251,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &4009632713096831653 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn index e76616b60..7f9f7bc29 100644 --- a/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn +++ b/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn @@ -17,6 +17,9 @@ position: 0,200 --- <> <> +<> +<> +<> <> <> @@ -38,6 +41,7 @@ me: 看来比我想得要更快些。 <> <> +<> <> <> @@ -63,7 +67,7 @@ yingli_novoice: 我不在乎你之前做得有多好,那对我来说没有任 <> <> -yingli_novoice: 我不知道为什么你不能理解:
这次任务不能完成,你就会被回收 。 +yingli_novoice: 我已经说过很多次了。为什么你就是听不懂?
这次任务不能完成,你就会被回收 。 yingli_novoice: 不用我和你说这意味着什么吧? peipei_novoice: 我…不要被回收…… yingli_novoice: 公司花了很多资源培养你。就算你自己不在乎,也不要让我难堪。 @@ -78,21 +82,22 @@ yingli_novoice: …… yingli_novoice: 做个身体检查,接受治疗。
无论如何,今晚好好休息。 peipei_novoice: 是的,组长。 -<> -<> -<> -<> -<> +<> <> <> me: 原来,美工部的机体也有被回收的风险啊。 <> -<> +<> +<> +<> +<> +<> +<> <> peipei: 啊…你都听到了? -<> +<> peipei: 对不起…打扰到你了。 me: 没有的事,这是我的工作。
说说吧,你怎么了,身体哪里不舒服? peipei: 倒也没有哪里不舒服……只是最近工作表现很差。 diff --git a/Assets/Scenes/ClinicScene.unity b/Assets/Scenes/ClinicScene.unity index c4174944f..4a91ffd54 100644 --- a/Assets/Scenes/ClinicScene.unity +++ b/Assets/Scenes/ClinicScene.unity @@ -123,6 +123,11 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!4 &411836820 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + m_PrefabInstance: {fileID: 8718985815712778838} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1284968266 PrefabInstance: m_ObjectHideFlags: 0 @@ -177,9 +182,82 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 208936720767673838, guid: d61ec1d045b2bfc4bb2db8718f017f2b, type: 3} + insertIndex: -1 + addedObject: {fileID: 411836820} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d61ec1d045b2bfc4bb2db8718f017f2b, type: 3} +--- !u!4 &1284968267 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 208936720767673838, guid: d61ec1d045b2bfc4bb2db8718f017f2b, type: 3} + m_PrefabInstance: {fileID: 1284968266} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8718985815712778838 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1284968267} + m_Modifications: + - target: {fileID: 484818901331367303, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + propertyPath: m_Name + value: "\u4F69\u4F69\u6700\u65B0(Clone)" + objectReference: {fileID: 0} + - target: {fileID: 2685491168148541651, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4873017592926150579, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/StreamingAssets/Config/sprite_group.json b/Assets/StreamingAssets/Config/sprite_group.json index 135450216..85e452640 100644 --- a/Assets/StreamingAssets/Config/sprite_group.json +++ b/Assets/StreamingAssets/Config/sprite_group.json @@ -1 +1 @@ -{"佩佩最新":{"key":"佩佩最新","layerId":941243827,"maxLayer":200,"minLayer":100,"stateDict":{"默认":["佩佩默认姿势"],"低头":["侧低头背手"]}}} \ No newline at end of file +{"佩佩最新":{"key":"佩佩最新","layerId":941243827,"maxLayer":200,"minLayer":100,"stateDict":{"低头不爽":["侧低头不爽嘴型","侧低头抱手"],"默认":["佩佩默认姿势"],"none":[],"默认扬眉":["开心眉毛_1","佩佩默认姿势"],"默认扬眉闭眼":["开心眉毛_1","闭眼","佩佩默认姿势"]}}} \ No newline at end of file diff --git a/Assets/StreamingAssets/FMOD/Desktop/Ambience.bank b/Assets/StreamingAssets/FMOD/Desktop/Ambience.bank index 74c66bfe8..722c086d6 100644 Binary files a/Assets/StreamingAssets/FMOD/Desktop/Ambience.bank and b/Assets/StreamingAssets/FMOD/Desktop/Ambience.bank differ diff --git a/Assets/StreamingAssets/FMOD/Desktop/Master.strings.bank b/Assets/StreamingAssets/FMOD/Desktop/Master.strings.bank index 75c4909ce..a9457a1b1 100644 Binary files a/Assets/StreamingAssets/FMOD/Desktop/Master.strings.bank and b/Assets/StreamingAssets/FMOD/Desktop/Master.strings.bank differ