From f8fc8bd59749252356d8664c047d20483068ff7d Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Mon, 27 Jul 2026 19:48:26 +0800 Subject: [PATCH] =?UTF-8?q?art:=20=E7=BE=8E=E6=9C=AF=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetGroups/Scene_Bridge.asset | 5 -- .../AssetGroups/Scene_ClinicOut.asset | 5 -- .../controller/天桥上佩佩动画导出.controller | 72 ------------------- .../天桥上佩佩动画导出.controller.meta | 8 --- .../Scene_ClincOut/Art/诊室附近夕阳.psd | 4 +- .../Scene_ClincOut/Art/诊室附近夜晚.psd | 4 +- .../Scene_ClincOut/Art/诊室附近夜晚.psd.meta | 56 +++------------ .../Scene_ClincOut/Art/诊室附近白天.psd | 4 +- .../controller/外出火山.controller | 72 ------------------- .../controller/外出火山.controller.meta | 8 --- Assets/Scenes/ClinicOut.unity | 16 ----- 11 files changed, 14 insertions(+), 240 deletions(-) delete mode 100644 Assets/GameContent/Scene_Bridge/Animation/controller/天桥上佩佩动画导出.controller delete mode 100644 Assets/GameContent/Scene_Bridge/Animation/controller/天桥上佩佩动画导出.controller.meta delete mode 100644 Assets/GameContent/Scene_ClincOut/controller/外出火山.controller delete mode 100644 Assets/GameContent/Scene_ClincOut/controller/外出火山.controller.meta 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 2fa2a6844..d80418b24 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/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