diff --git a/Assets/AddressableAssetsData/AssetGroups/Scene_Bridge.asset b/Assets/AddressableAssetsData/AssetGroups/Scene_Bridge.asset index 3411eafe2..63a5d1109 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Scene_Bridge.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Scene_Bridge.asset @@ -47,11 +47,6 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: ea008b0c912c0d748997bf458879cb74 - m_Address: "Animation/\u5929\u6865\u4F69\u4F69" - 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 diff --git a/Assets/AddressableAssetsData/AssetGroups/Scene_ClinicOut.asset b/Assets/AddressableAssetsData/AssetGroups/Scene_ClinicOut.asset index a9ce0c135..e824759e0 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Scene_ClinicOut.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Scene_ClinicOut.asset @@ -72,11 +72,6 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 7760fc67933fb684d81ea5275fac0a50 - m_Address: "Animation/\u8BCA\u5BA4\u5916\u706B\u5C71" - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 253f47db959b2814998695fb5d1f4d97 m_Address: "Timeline/\u65CB\u8F6C\u53F6\u67C4" m_ReadOnly: 0 diff --git a/Assets/GameContent/Feature_MainUI/Prefabs/Common/Select Item.prefab b/Assets/GameContent/Feature_MainUI/Prefabs/Common/Select Item.prefab index 3349bc92a..9297f4f83 100644 --- a/Assets/GameContent/Feature_MainUI/Prefabs/Common/Select Item.prefab +++ b/Assets/GameContent/Feature_MainUI/Prefabs/Common/Select Item.prefab @@ -61,7 +61,7 @@ MonoBehaviour: 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_RaycastPadding: {x: -9, y: -6, z: -9, w: -6} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -356,7 +356,7 @@ MonoBehaviour: 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_RaycastPadding: {x: -9, y: -6, z: -9, w: -6} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalChapterPanel.prefab b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalChapterPanel.prefab index ecde01b02..446f24da6 100644 --- a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalChapterPanel.prefab +++ b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalChapterPanel.prefab @@ -237,7 +237,7 @@ MonoBehaviour: 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_RaycastPadding: {x: -24, y: -24, z: -16, w: -16} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -373,7 +373,7 @@ MonoBehaviour: 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_RaycastPadding: {x: -24, y: -24, z: -16, w: -16} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalRecordPanel.prefab b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalRecordPanel.prefab index 73a7090d8..6d81f444a 100644 --- a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalRecordPanel.prefab +++ b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalRecordPanel.prefab @@ -251,7 +251,6 @@ GameObject: m_Component: - component: {fileID: 9202032327664769810} - component: {fileID: 3845960453838930254} - - component: {fileID: 3554133970631661879} - component: {fileID: 5365233308428735541} m_Layer: 5 m_Name: TerminalRecordPanel @@ -290,29 +289,10 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3871074088889657229} m_Enabled: 1 - m_Alpha: 1 + m_Alpha: 0.88 m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 ---- !u!114 &3554133970631661879 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3871074088889657229} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7096d912f30ffab4c93485d43ccfe542, type: 3} - m_Name: - m_EditorClassIdentifier: - canvasGroup: {fileID: 3845960453838930254} - sweep: {fileID: 0} - visibleAlpha: 0.88 - fadeDuration: 0.06 - showEase: 1 - hideEase: 1 - sweepDuration: 0.08 --- !u!114 &5365233308428735541 MonoBehaviour: m_ObjectHideFlags: 0 @@ -325,7 +305,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2c9847b4d254a5e4bba40d833ed2dff7, type: 3} m_Name: m_EditorClassIdentifier: - panelAnimator: {fileID: 3554133970631661879} + panelAnimator: {fileID: 0} backButton: {fileID: 168933672897652626} scrollRect: {fileID: 4131124589360061642} recordRoot: {fileID: 8734520220881124751} diff --git a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanel.prefab b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanel.prefab index 2989e8751..a4280a255 100644 --- a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanel.prefab +++ b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanel.prefab @@ -10,7 +10,6 @@ GameObject: m_Component: - component: {fileID: 7841453849035343617} - component: {fileID: 5909980267964181477} - - component: {fileID: 4231769899938036500} - component: {fileID: 7617572864936004985} m_Layer: 0 m_Name: TerminalSettingPanel @@ -51,29 +50,10 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2473954831509471071} m_Enabled: 1 - m_Alpha: 1 + m_Alpha: 0.88 m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 ---- !u!114 &4231769899938036500 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2473954831509471071} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7096d912f30ffab4c93485d43ccfe542, type: 3} - m_Name: - m_EditorClassIdentifier: - canvasGroup: {fileID: 5909980267964181477} - sweep: {fileID: 0} - visibleAlpha: 0.88 - fadeDuration: 0.06 - showEase: 1 - hideEase: 1 - sweepDuration: 0.08 --- !u!114 &7617572864936004985 MonoBehaviour: m_ObjectHideFlags: 0 @@ -86,7 +66,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 20e0c562a41a49d4499b6104ccc21f0f, type: 3} m_Name: m_EditorClassIdentifier: - panelAnimator: {fileID: 4231769899938036500} + panelAnimator: {fileID: 0} volumeSlider: {fileID: 2675947580802817105} textSpeedOption: {fileID: 6739766149245709466} windowModeOption: {fileID: 2126111929178198533} diff --git a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanelMini.prefab b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanelMini.prefab index 32a87b2d3..ebf3d019a 100644 --- a/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanelMini.prefab +++ b/Assets/GameContent/Feature_MainUI/Prefabs/TerminalSettingPanelMini.prefab @@ -195,7 +195,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -423, y: 151} - m_SizeDelta: {x: 0, y: 70} + m_SizeDelta: {x: 186.67, y: 70} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2722517140198208553 CanvasRenderer: @@ -1370,11 +1370,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1163567057521848681, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1163567057521848681, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1163567057521848681, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_SizeDelta.x @@ -1382,11 +1382,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1163567057521848681, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 235 objectReference: {fileID: 0} - target: {fileID: 1163567057521848681, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -25 objectReference: {fileID: 0} - target: {fileID: 1284729285510856511, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_IsActive @@ -1398,7 +1398,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1425762017047074178, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2580959752204425430, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMax.x @@ -1406,7 +1406,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2580959752204425430, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2580959752204425430, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMin.x @@ -1534,19 +1534,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5952270497693892333, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5952270497693892333, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5952270497693892333, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 385 objectReference: {fileID: 0} - target: {fileID: 5952270497693892333, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -25 objectReference: {fileID: 0} - target: {fileID: 6131397560991339167, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_IsActive @@ -1562,11 +1562,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6732691262169134867, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6732691262169134867, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6732691262169134867, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_SizeDelta.x @@ -1578,11 +1578,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6732691262169134867, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 660 objectReference: {fileID: 0} - target: {fileID: 6732691262169134867, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -25 objectReference: {fileID: 0} - target: {fileID: 6885231114081803451, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: normalTextColor.a diff --git a/Assets/GameContent/Huoshan/Actor/火山彩带.playable b/Assets/GameContent/Huoshan/Actor/火山彩带.playable index 8fa11e556..cb85f6cc1 100644 --- a/Assets/GameContent/Huoshan/Actor/火山彩带.playable +++ b/Assets/GameContent/Huoshan/Actor/火山彩带.playable @@ -30,6 +30,7 @@ MonoBehaviour: m_Version: 0 m_Tracks: - {fileID: 229814774481162458} + - {fileID: 316860149308452177} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 @@ -128,3 +129,148 @@ MonoBehaviour: m_DisplayName: "\u5F69\u5E26" m_Markers: m_Objects: [] +--- !u!114 &316860149308452177 +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: 133253f56854570409c222a87786b263, type: 3} + m_Name: FMOD Event 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: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 0 + m_ClipIn: 0 + m_Asset: {fileID: 5021032119192316961} + m_Duration: 2.244999885559082 + m_TimeScale: 1 + m_ParentTrack: {fileID: 316860149308452177} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + m_BlendOutDuration: 0 + 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: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: FMODEventPlayable + m_Markers: + m_Objects: [] + template: + volume: 1 +--- !u!114 &5021032119192316961 +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: 987a467495df9d942b56b1b51381d095, type: 3} + m_Name: FMODEventPlayable + m_EditorClassIdentifier: + Template: + EventReference: + Guid: + Data1: 0 + Data2: 0 + Data3: 0 + Data4: 0 + Path: + StopType: 0 + Parameters: [] + ParameterLinks: [] + ParameterAutomation: + Slot00: 0 + Slot01: 0 + Slot02: 0 + Slot03: 0 + Slot04: 0 + Slot05: 0 + Slot06: 0 + Slot07: 0 + Slot08: 0 + Slot09: 0 + Slot10: 0 + Slot11: 0 + Slot12: 0 + Slot13: 0 + Slot14: 0 + Slot15: 0 + EventLength: 2.245 + eventName: + EventReference: + Guid: + Data1: 1501134276 + Data2: 1295893522 + Data3: -928928893 + Data4: 1141318870 + Path: event:/Music/music_volcano_joke + StopType: 0 + Parameters: [] diff --git a/Assets/GameContent/Scene_Bridge/Animation/controller/天桥上佩佩动画导出.controller b/Assets/GameContent/Scene_Bridge/Animation/controller/天桥上佩佩动画导出.controller deleted file mode 100644 index 0a96f8072..000000000 --- a/Assets/GameContent/Scene_Bridge/Animation/controller/天桥上佩佩动画导出.controller +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-9002524052023225829 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: peipei - m_Speed: 0.25 - 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: 7400000, guid: 80ae38e2ecb39b94c885099f1afcd7ec, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &-6882918781625905748 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -9002524052023225829} - m_Position: {x: 340, y: 100, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -9002524052023225829} ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: "\u5929\u6865\u4E0A\u4F69\u4F69\u52A8\u753B\u5BFC\u51FA" - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -6882918781625905748} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} diff --git a/Assets/GameContent/Scene_Bridge/Animation/controller/天桥上佩佩动画导出.controller.meta b/Assets/GameContent/Scene_Bridge/Animation/controller/天桥上佩佩动画导出.controller.meta deleted file mode 100644 index 1af530e70..000000000 --- a/Assets/GameContent/Scene_Bridge/Animation/controller/天桥上佩佩动画导出.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ea008b0c912c0d748997bf458879cb74 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameContent/Scene_ClincOut/Art/诊室附近夕阳.psd b/Assets/GameContent/Scene_ClincOut/Art/诊室附近夕阳.psd index 0f8ccb75b..a7c6942d1 100644 --- a/Assets/GameContent/Scene_ClincOut/Art/诊室附近夕阳.psd +++ b/Assets/GameContent/Scene_ClincOut/Art/诊室附近夕阳.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b93662b740dbc97af6cd7a2e9b863742ff155a01484f3c7d4bc86047f81424c1 -size 657259 +oid sha256:b74a336c784b863d0e1340da62cc9c5a69f6e7465e0a22d3b9f2bfad4eb91002 +size 663343 diff --git a/Assets/GameContent/Scene_ClincOut/Art/诊室附近夜晚.psd b/Assets/GameContent/Scene_ClincOut/Art/诊室附近夜晚.psd index 6632da889..62c5b10c1 100644 --- a/Assets/GameContent/Scene_ClincOut/Art/诊室附近夜晚.psd +++ b/Assets/GameContent/Scene_ClincOut/Art/诊室附近夜晚.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7c06b61a046be2911b071ac1947ac03aee2be52ea4f27ca2e5ff4596db71ae9 -size 659266 +oid sha256:c0320c540ea846775e5b36b7b17910064db20e11ff41c8d82d31f87200477fd1 +size 634944 diff --git a/Assets/GameContent/Scene_ClincOut/Art/诊室附近夜晚.psd.meta b/Assets/GameContent/Scene_ClincOut/Art/诊室附近夜晚.psd.meta index c8ff4dc40..32cef95fa 100644 --- a/Assets/GameContent/Scene_ClincOut/Art/诊室附近夜晚.psd.meta +++ b/Assets/GameContent/Scene_ClincOut/Art/诊室附近夜晚.psd.meta @@ -140,7 +140,7 @@ ScriptedImporter: tessellationDetail: 0 uvTransform: {x: 4, y: 884} spritePosition: {x: 86, y: 0} - - name: "\u4E3B\u4F53" + - name: "\u4E2D\u95F4\u8DEF\u706F" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -151,7 +151,7 @@ ScriptedImporter: y: 4 width: 768 height: 432 - spriteID: 09b4506dc56ce3945adfa3574a6920bb + spriteID: 4a42c672c676e8b49a850065e72109da spriteBone: [] spriteOutline: [] vertices: [] @@ -402,46 +402,6 @@ ScriptedImporter: flatten: 0 isImported: 1 isVisible: 1 - - name: "\u8DEF\u706F\u5206\u5C42" - spriteName: - isGroup: 1 - parentIndex: -1 - spriteID: 360d711a901431a4dab46357db421834 - layerID: 35 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 - isVisible: 0 - - name: "\u6865\u4E0A\u8DEF\u706F \u62F7\u8D1D" - spriteName: - isGroup: 0 - parentIndex: 3 - spriteID: b106a5a614ab9ff449da672f67697e49 - layerID: 34 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 - isVisible: 1 - - name: "\u6865\u4E0A\u8DEF\u706F\u5DE6 \u62F7\u8D1D" - spriteName: - isGroup: 0 - parentIndex: 3 - spriteID: 9836135846512dc40bdf87b4061e75cf - layerID: 33 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 - isVisible: 1 - - name: "\u6865\u4E0A\u8DEF\u706F\u4E01\u8FBE\u5C14 \u62F7\u8D1D" - spriteName: - isGroup: 0 - parentIndex: 3 - spriteID: edc3720dd78691d4a9ab91d5072fdee7 - layerID: 32 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 - isVisible: 1 - name: "\u4E2D\u666F" spriteName: isGroup: 1 @@ -452,12 +412,12 @@ ScriptedImporter: flatten: 0 isImported: 0 isVisible: 1 - - name: "\u4E3B\u4F53" - spriteName: "\u4E3B\u4F53" + - name: "\u4E2D\u95F4\u8DEF\u706F" + spriteName: "\u4E2D\u95F4\u8DEF\u706F" isGroup: 0 - parentIndex: 7 - spriteID: 09b4506dc56ce3945adfa3574a6920bb - layerID: 11 + parentIndex: 3 + spriteID: 4a42c672c676e8b49a850065e72109da + layerID: 12 mosaicPosition: {x: 4, y: 4} flatten: 0 isImported: 1 @@ -475,7 +435,7 @@ ScriptedImporter: - name: "\u591C\u665A" spriteName: "\u591C\u665A" isGroup: 0 - parentIndex: 9 + parentIndex: 5 spriteID: 23bdf1ebe3a40c14eb9bd6fcf53981b7 layerID: 3 mosaicPosition: {x: 4, y: 444} diff --git a/Assets/GameContent/Scene_ClincOut/Art/诊室附近白天.psd b/Assets/GameContent/Scene_ClincOut/Art/诊室附近白天.psd index f0b66d840..6b2e90a7a 100644 --- a/Assets/GameContent/Scene_ClincOut/Art/诊室附近白天.psd +++ b/Assets/GameContent/Scene_ClincOut/Art/诊室附近白天.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5234a769f27a57ff3fd813ddc1016c1d6f92aec921596593f07dda6ce2137e30 -size 614706 +oid sha256:21c252bb978b3944be28be34c2018e7c0bed1b0c72debd5303af912a5bced913 +size 621150 diff --git a/Assets/GameContent/Scene_ClincOut/controller/外出火山.controller b/Assets/GameContent/Scene_ClincOut/controller/外出火山.controller deleted file mode 100644 index ab2347bf5..000000000 --- a/Assets/GameContent/Scene_ClincOut/controller/外出火山.controller +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-7126945841043259132 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: "\u80CC\u5F71IDLE" - 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: 7400000, guid: 098e1a2015038cf4e89d6b9de989b6cd, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &-5245457298479488571 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -7126945841043259132} - m_Position: {x: 310, y: 110, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -7126945841043259132} ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: "\u5916\u51FA\u706B\u5C71" - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -5245457298479488571} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} diff --git a/Assets/GameContent/Scene_ClincOut/controller/外出火山.controller.meta b/Assets/GameContent/Scene_ClincOut/controller/外出火山.controller.meta deleted file mode 100644 index 67caaeeb2..000000000 --- a/Assets/GameContent/Scene_ClincOut/controller/外出火山.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7760fc67933fb684d81ea5275fac0a50 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/ClinicOut.unity b/Assets/Scenes/ClinicOut.unity index a372064a8..c616b7809 100644 --- a/Assets/Scenes/ClinicOut.unity +++ b/Assets/Scenes/ClinicOut.unity @@ -493,7 +493,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 242060919} - - component: {fileID: 242060920} m_Layer: 0 m_Name: "\u5927\u98CE\u843D\u53F6" m_TagString: Untagged @@ -517,21 +516,6 @@ Transform: - {fileID: 1497656901} m_Father: {fileID: 945493322} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &242060920 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 242060918} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: babec43795065b244ac4cef4af7fa225, type: 3} - m_Name: - m_EditorClassIdentifier: - animatorName: "\u5927\u98CE\u843D\u53F6" - animator: {fileID: 1497656902} - completeAfterOneCycleWhenStateLoops: 1 --- !u!1 &265565256 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 5a29ac944..b3e084c92 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -1546,7 +1546,7 @@ Transform: m_GameObject: {fileID: 519420028} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.009999275, y: 0, z: -10} + m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Yarn/FP/FP_Huoshan1/Stage1.yarn b/Assets/Yarn/FP/FP_Huoshan1/Stage1.yarn index 07d9c25f3..60a6b6342 100644 --- a/Assets/Yarn/FP/FP_Huoshan1/Stage1.yarn +++ b/Assets/Yarn/FP/FP_Huoshan1/Stage1.yarn @@ -114,7 +114,7 @@ me: 头？ #line:01bb9ad hs: 你那是末端传感器坏死导致的头憋大了。 #line:05929a0 <> <> -<> + <> <> <> @@ -172,7 +172,7 @@ hs:*帽子*，
到头了！ #line:0dfbd20 me: 啊不是等会什么… #auto_next #line:09fc837 -<> + <> // 火山开始加速表演，掩盖真实情绪 //<>