diff --git a/Assets/AddressableAssetsData/AssetGroups/Actor Resource.asset b/Assets/AddressableAssetsData/AssetGroups/Actor Resource.asset index 9a9fe9a04..3577ffd86 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Actor Resource.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Actor Resource.asset @@ -47,6 +47,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 7c34fc3623b6a734d9a5968c521705a2 + m_Address: "Sprite/\u7A97\u5916\u4F69\u4F69_Idle" + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} m_SchemaSet: diff --git a/Assets/Animation/OutScene/天桥上场景导出.controller b/Assets/Animation/OutScene/天桥上场景导出.controller index af05e684f..6116ba75d 100644 --- a/Assets/Animation/OutScene/天桥上场景导出.controller +++ b/Assets/Animation/OutScene/天桥上场景导出.controller @@ -59,7 +59,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 5870137442411848463} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 260, y: 200, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Animation/OutScene/天桥上场景导出_Clip.anim b/Assets/Animation/OutScene/天桥上场景导出_Clip.anim index 28d927f34..99451ac35 100644 --- a/Assets/Animation/OutScene/天桥上场景导出_Clip.anim +++ b/Assets/Animation/OutScene/天桥上场景导出_Clip.anim @@ -22,31 +22,44 @@ AnimationClip: curve: - time: 0 value: {fileID: -8002450416980082880, guid: 3e2295e46be59a84b8584eb1663aa02a, type: 3} - - time: 0.1 + - time: 0.4 value: {fileID: -5091889229612707932, guid: 3e2295e46be59a84b8584eb1663aa02a, type: 3} - - time: 0.2 + - time: 0.8 value: {fileID: -3589429476546323457, guid: 3e2295e46be59a84b8584eb1663aa02a, type: 3} - - time: 0.3 + - time: 1.2 value: {fileID: -3589429476546323457, guid: 3e2295e46be59a84b8584eb1663aa02a, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} flags: 2 - m_SampleRate: 100 + m_SampleRate: 25 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -8002450416980082880, guid: 3e2295e46be59a84b8584eb1663aa02a, type: 3} + - {fileID: -5091889229612707932, guid: 3e2295e46be59a84b8584eb1663aa02a, type: 3} + - {fileID: -3589429476546323457, guid: 3e2295e46be59a84b8584eb1663aa02a, type: 3} + - {fileID: -3589429476546323457, guid: 3e2295e46be59a84b8584eb1663aa02a, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.31 + m_StopTime: 1.24 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Resources/CharacterPrefab.meta b/Assets/RawResources/Actor/其他.meta similarity index 77% rename from Assets/Resources/CharacterPrefab.meta rename to Assets/RawResources/Actor/其他.meta index f20469fa5..e8b795708 100644 --- a/Assets/Resources/CharacterPrefab.meta +++ b/Assets/RawResources/Actor/其他.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e9bfc8fd29ac48c47b7397878b37e7b0 +guid: 27ed0cfd47ea42b40a26573a730d541b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/RawResources/Actor/其他/CHUANGWAIYINGLIPEIPEI.png b/Assets/RawResources/Actor/其他/CHUANGWAIYINGLIPEIPEI.png new file mode 100644 index 000000000..7715638ec --- /dev/null +++ b/Assets/RawResources/Actor/其他/CHUANGWAIYINGLIPEIPEI.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a0e50cabcd7db45879dcdae62a6a5b6cb7667bee9cbc1c6001697c8a6ba5579 +size 52648 diff --git a/Assets/RawResources/Actor/其他/CHUANGWAIYINGLIPEIPEI.png.meta b/Assets/RawResources/Actor/其他/CHUANGWAIYINGLIPEIPEI.png.meta new file mode 100644 index 000000000..315d5366e --- /dev/null +++ b/Assets/RawResources/Actor/其他/CHUANGWAIYINGLIPEIPEI.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 7c34fc3623b6a734d9a5968c521705a2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 215 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/CharacterPrefab/佩佩.prefab b/Assets/Resources/CharacterPrefab/佩佩.prefab deleted file mode 100644 index af4797482..000000000 --- a/Assets/Resources/CharacterPrefab/佩佩.prefab +++ /dev/null @@ -1,121 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &6921849442527080157 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5184530904460732447} - - component: {fileID: 2140342247378971010} - - component: {fileID: 5106551768358485843} - - component: {fileID: 2990560875214791438} - m_Layer: 0 - m_Name: "\u4F69\u4F69" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5184530904460732447 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6921849442527080157} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.9841349, y: -3.5133443, z: 0.31335288} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &2140342247378971010 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6921849442527080157} - 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: -1251285321 - m_SortingLayer: 3 - m_SortingOrder: 20 - m_Sprite: {fileID: 7687822722487461200, guid: 87c11494ee2375949ae7c2f2e246a5a6, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 3.5348837, y: 5.162791} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!95 &5106551768358485843 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6921849442527080157} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 1a1248c2244394c4587d7d38f60701fa, type: 2} - 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!114 &2990560875214791438 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6921849442527080157} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62e221e22720bec40b69d4bf463b3db2, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/Resources/CharacterPrefab/佩佩.prefab.meta b/Assets/Resources/CharacterPrefab/佩佩.prefab.meta deleted file mode 100644 index 5f3c83f6a..000000000 --- a/Assets/Resources/CharacterPrefab/佩佩.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7bb6b3d39954f2f48882f2cfccb9cc2a -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/CharacterPrefab/佩佩英里.prefab b/Assets/Resources/CharacterPrefab/佩佩英里.prefab deleted file mode 100644 index 2e15716e5..000000000 --- a/Assets/Resources/CharacterPrefab/佩佩英里.prefab +++ /dev/null @@ -1,121 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &8650368817330308573 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 564940528943278074} - - component: {fileID: 6931146123795724635} - - component: {fileID: 8993819392565494273} - - component: {fileID: 8085366339097436964} - m_Layer: 0 - m_Name: "\u4F69\u4F69\u82F1\u91CC" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &564940528943278074 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8650368817330308573} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.1, y: 0.27, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &6931146123795724635 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8650368817330308573} - 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: 941243827 - m_SortingLayer: 13 - m_SortingOrder: 8 - m_Sprite: {fileID: 21300000, guid: 960e18892ba84984686504a2cb77eb7a, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 58.436985, y: 21.599998} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!114 &8993819392565494273 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8650368817330308573} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62e221e22720bec40b69d4bf463b3db2, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!95 &8085366339097436964 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8650368817330308573} - 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 diff --git a/Assets/Resources/CharacterPrefab/佩佩英里.prefab.meta b/Assets/Resources/CharacterPrefab/佩佩英里.prefab.meta deleted file mode 100644 index f99494759..000000000 --- a/Assets/Resources/CharacterPrefab/佩佩英里.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a1c305e171f764740b1fb1f5dcb3fa1a -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/CharacterPrefab/医生.prefab b/Assets/Resources/CharacterPrefab/医生.prefab deleted file mode 100644 index eafa1ae59..000000000 --- a/Assets/Resources/CharacterPrefab/医生.prefab +++ /dev/null @@ -1,121 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &8137263653361157769 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3683761693053908222} - - component: {fileID: 1562009171237104994} - - component: {fileID: 8243277379770681132} - - component: {fileID: 6418765419289667865} - m_Layer: 0 - m_Name: "\u533B\u751F" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3683761693053908222 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8137263653361157769} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.3458652, y: -3.444042, z: 0.31335288} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1562009171237104994 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8137263653361157769} - 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: -1251285321 - m_SortingLayer: 3 - m_SortingOrder: 17 - m_Sprite: {fileID: -1668788935091507791, guid: aaa4b1e0109a1ea4389a36252af080b2, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.6744186, y: 3.4186046} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!114 &8243277379770681132 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8137263653361157769} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62e221e22720bec40b69d4bf463b3db2, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!95 &6418765419289667865 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8137263653361157769} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 18ba42920e816714bac8f83826dec51e, type: 2} - 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 diff --git a/Assets/Resources/CharacterPrefab/医生.prefab.meta b/Assets/Resources/CharacterPrefab/医生.prefab.meta deleted file mode 100644 index 3753d0ea4..000000000 --- a/Assets/Resources/CharacterPrefab/医生.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 99a3f548613a92a4ab0fab1dbc3ad351 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/CharacterPrefab/天桥佩佩.prefab b/Assets/Resources/CharacterPrefab/天桥佩佩.prefab deleted file mode 100644 index ba62e69e3..000000000 --- a/Assets/Resources/CharacterPrefab/天桥佩佩.prefab +++ /dev/null @@ -1,91 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &4144175623108087268 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -2253911629886400664, guid: 6c35010520b8dcb448613f9bd4d20acb, type: 3} - propertyPath: m_Name - value: "\u5929\u6865\u4F69\u4F69" - objectReference: {fileID: 0} - - target: {fileID: 1160356261127867848, guid: 6c35010520b8dcb448613f9bd4d20acb, type: 3} - propertyPath: m_Controller - value: - objectReference: {fileID: 9100000, guid: 9fdd74ec470908744b76a5684417acaf, type: 2} - - target: {fileID: 3626916397498700004, guid: 6c35010520b8dcb448613f9bd4d20acb, type: 3} - propertyPath: m_Color.a - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3626916397498700004, guid: 6c35010520b8dcb448613f9bd4d20acb, type: 3} - propertyPath: m_SortingOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: 6c35010520b8dcb448613f9bd4d20acb, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: 6c35010520b8dcb448613f9bd4d20acb, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: 6c35010520b8dcb448613f9bd4d20acb, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: 6c35010520b8dcb448613f9bd4d20acb, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: 6c35010520b8dcb448613f9bd4d20acb, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: 6c35010520b8dcb448613f9bd4d20acb, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: 6c35010520b8dcb448613f9bd4d20acb, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: 6c35010520b8dcb448613f9bd4d20acb, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: 6c35010520b8dcb448613f9bd4d20acb, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: 6c35010520b8dcb448613f9bd4d20acb, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: -2253911629886400664, guid: 6c35010520b8dcb448613f9bd4d20acb, type: 3} - insertIndex: -1 - addedObject: {fileID: 4981824136689244422} - m_SourcePrefab: {fileID: -8435245712485981826, guid: 6c35010520b8dcb448613f9bd4d20acb, type: 3} ---- !u!1 &6429854482574547596 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -2253911629886400664, guid: 6c35010520b8dcb448613f9bd4d20acb, type: 3} - m_PrefabInstance: {fileID: 4144175623108087268} - m_PrefabAsset: {fileID: 0} ---- !u!114 &4981824136689244422 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6429854482574547596} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62e221e22720bec40b69d4bf463b3db2, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/Resources/CharacterPrefab/天桥佩佩.prefab.meta b/Assets/Resources/CharacterPrefab/天桥佩佩.prefab.meta deleted file mode 100644 index 66a3fc40d..000000000 --- a/Assets/Resources/CharacterPrefab/天桥佩佩.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 185c594fc979e6f45b8f703bbc80e732 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/CharacterPrefab/天桥医生.prefab b/Assets/Resources/CharacterPrefab/天桥医生.prefab deleted file mode 100644 index 43a68dc26..000000000 --- a/Assets/Resources/CharacterPrefab/天桥医生.prefab +++ /dev/null @@ -1,91 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &22887486727994272 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -2253911629886400664, guid: bfeefef428ed937428a1f073df65ab34, type: 3} - propertyPath: m_Name - value: "\u5929\u6865\u533B\u751F" - objectReference: {fileID: 0} - - target: {fileID: 1160356261127867848, guid: bfeefef428ed937428a1f073df65ab34, type: 3} - propertyPath: m_Controller - value: - objectReference: {fileID: 9100000, guid: 395037c523fbedd4b94ab543e8d794d9, type: 2} - - target: {fileID: 3626916397498700004, guid: bfeefef428ed937428a1f073df65ab34, type: 3} - propertyPath: m_Color.a - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3626916397498700004, guid: bfeefef428ed937428a1f073df65ab34, type: 3} - propertyPath: m_SortingOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bfeefef428ed937428a1f073df65ab34, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bfeefef428ed937428a1f073df65ab34, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bfeefef428ed937428a1f073df65ab34, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bfeefef428ed937428a1f073df65ab34, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bfeefef428ed937428a1f073df65ab34, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bfeefef428ed937428a1f073df65ab34, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bfeefef428ed937428a1f073df65ab34, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bfeefef428ed937428a1f073df65ab34, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bfeefef428ed937428a1f073df65ab34, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bfeefef428ed937428a1f073df65ab34, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: -2253911629886400664, guid: bfeefef428ed937428a1f073df65ab34, type: 3} - insertIndex: -1 - addedObject: {fileID: 2708484933578525508} - m_SourcePrefab: {fileID: -8435245712485981826, guid: bfeefef428ed937428a1f073df65ab34, type: 3} ---- !u!1 &6983164770426219720 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -2253911629886400664, guid: bfeefef428ed937428a1f073df65ab34, type: 3} - m_PrefabInstance: {fileID: 22887486727994272} - m_PrefabAsset: {fileID: 0} ---- !u!114 &2708484933578525508 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6983164770426219720} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62e221e22720bec40b69d4bf463b3db2, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/Resources/CharacterPrefab/天桥医生.prefab.meta b/Assets/Resources/CharacterPrefab/天桥医生.prefab.meta deleted file mode 100644 index 92a8db623..000000000 --- a/Assets/Resources/CharacterPrefab/天桥医生.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7e6b2e85fbf53b9448895f46fb3c7de6 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/CharacterPrefab/天桥小佩佩.prefab b/Assets/Resources/CharacterPrefab/天桥小佩佩.prefab deleted file mode 100644 index 62082c900..000000000 --- a/Assets/Resources/CharacterPrefab/天桥小佩佩.prefab +++ /dev/null @@ -1,99 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &8671492543135501769 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -2253911629886400664, guid: bba9e3dfd56b5a04fa1721cedb8960a4, type: 3} - propertyPath: m_Name - value: "\u5929\u6865\u5C0F\u4F69\u4F69" - objectReference: {fileID: 0} - - target: {fileID: 1160356261127867848, guid: bba9e3dfd56b5a04fa1721cedb8960a4, type: 3} - propertyPath: m_Controller - value: - objectReference: {fileID: 9100000, guid: 52e445dccb54405438f3e3e439ccbbc7, type: 2} - - target: {fileID: 3626916397498700004, guid: bba9e3dfd56b5a04fa1721cedb8960a4, type: 3} - propertyPath: m_Color.a - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3626916397498700004, guid: bba9e3dfd56b5a04fa1721cedb8960a4, type: 3} - propertyPath: m_SortingLayer - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3626916397498700004, guid: bba9e3dfd56b5a04fa1721cedb8960a4, type: 3} - propertyPath: m_SortingOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3626916397498700004, guid: bba9e3dfd56b5a04fa1721cedb8960a4, type: 3} - propertyPath: m_SortingLayerID - value: 844151739 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bba9e3dfd56b5a04fa1721cedb8960a4, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bba9e3dfd56b5a04fa1721cedb8960a4, type: 3} - propertyPath: m_LocalPosition.y - value: -5 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bba9e3dfd56b5a04fa1721cedb8960a4, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bba9e3dfd56b5a04fa1721cedb8960a4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bba9e3dfd56b5a04fa1721cedb8960a4, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bba9e3dfd56b5a04fa1721cedb8960a4, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bba9e3dfd56b5a04fa1721cedb8960a4, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bba9e3dfd56b5a04fa1721cedb8960a4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bba9e3dfd56b5a04fa1721cedb8960a4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7878350319992209165, guid: bba9e3dfd56b5a04fa1721cedb8960a4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: -2253911629886400664, guid: bba9e3dfd56b5a04fa1721cedb8960a4, type: 3} - insertIndex: -1 - addedObject: {fileID: 5056258450875451564} - m_SourcePrefab: {fileID: -8435245712485981826, guid: bba9e3dfd56b5a04fa1721cedb8960a4, type: 3} ---- !u!1 &1796702975464676001 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -2253911629886400664, guid: bba9e3dfd56b5a04fa1721cedb8960a4, type: 3} - m_PrefabInstance: {fileID: 8671492543135501769} - m_PrefabAsset: {fileID: 0} ---- !u!114 &5056258450875451564 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1796702975464676001} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62e221e22720bec40b69d4bf463b3db2, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/Resources/CharacterPrefab/天桥小佩佩.prefab.meta b/Assets/Resources/CharacterPrefab/天桥小佩佩.prefab.meta deleted file mode 100644 index f3965d855..000000000 --- a/Assets/Resources/CharacterPrefab/天桥小佩佩.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3166fd715166f374187c06313f9b4b6d -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Basic Function/Clinic System.prefab b/Assets/Resources/Prefabs/Basic Function/Clinic System.prefab index edd629a70..69d4b93f8 100644 --- a/Assets/Resources/Prefabs/Basic Function/Clinic System.prefab +++ b/Assets/Resources/Prefabs/Basic Function/Clinic System.prefab @@ -252,6 +252,37 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &447530836707154265 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2415944712404285539} + m_Layer: 0 + m_Name: ActorRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2415944712404285539 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 447530836707154265} + 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: 8348444316318293934} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &764896453847549160 GameObject: m_ObjectHideFlags: 0 @@ -740,6 +771,56 @@ Transform: - {fileID: 8705859560797599931} m_Father: {fileID: 7333995943917754426} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3439365558513550950 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4549147204478999838} + - component: {fileID: 5081330277883557559} + m_Layer: 0 + m_Name: "\u7A97\u5916" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4549147204478999838 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3439365558513550950} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.38999987, y: 0.14, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7425565608715268791} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5081330277883557559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3439365558513550950} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1988b7c536404a3d89fd441651bd40ea, type: 3} + m_Name: + m_EditorClassIdentifier: + slotName: "\u7A97\u5916" + sortingLayer: 941243827 + sortingOrder: 8 + hasDefaultActor: 0 + defaultActorType: 0 + defaultActorName: --- !u!1 &3643703955811308797 GameObject: m_ObjectHideFlags: 0 @@ -876,69 +957,6 @@ MonoBehaviour: minSpawnCount: 2 maxSpawnCount: 4 IntervalBetweenCharacter: {x: 4, y: 6} ---- !u!1 &4996535553228346509 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8383566418032547105} - m_Layer: 0 - m_Name: Slot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8383566418032547105 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4996535553228346509} - 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: 6657208505121927469} - m_Father: {fileID: 7333995943917754426} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &5045635943726692889 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6657208505121927469} - m_Layer: 0 - m_Name: "\u7A97\u5916" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6657208505121927469 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5045635943726692889} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.38999987, y: 0.14, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8383566418032547105} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5505251028286205928 GameObject: m_ObjectHideFlags: 0 @@ -1141,7 +1159,6 @@ Transform: - {fileID: 997395576468173360} - {fileID: 8988582123737961170} - {fileID: 1289813725535206033} - - {fileID: 8383566418032547105} - {fileID: 5133231342155857510} - {fileID: 8348444316318293934} m_Father: {fileID: 0} @@ -1159,6 +1176,38 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: characterGroup: {fileID: 0} +--- !u!1 &5758239449941812692 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7425565608715268791} + m_Layer: 0 + m_Name: Slots + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7425565608715268791 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5758239449941812692} + 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: 4549147204478999838} + m_Father: {fileID: 8348444316318293934} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5931021022772549460 GameObject: m_ObjectHideFlags: 0 @@ -1606,7 +1655,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8348444316318293934} - - component: {fileID: 159736596192834160} + - component: {fileID: 8168673585846604432} m_Layer: 0 m_Name: ActorManager m_TagString: Untagged @@ -1623,13 +1672,15 @@ Transform: m_GameObject: {fileID: 7640562354936030701} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -6.245866, y: 0.15334429, z: -0.31335288} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 7425565608715268791} + - {fileID: 2415944712404285539} m_Father: {fileID: 7333995943917754426} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &159736596192834160 +--- !u!114 &8168673585846604432 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1638,11 +1689,9 @@ MonoBehaviour: m_GameObject: {fileID: 7640562354936030701} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 40a5ab0dc89da0f469155caebeaf7383, type: 3} + m_Script: {fileID: 11500000, guid: 3700d4c1c99441a7979e423de3700aad, type: 3} m_Name: m_EditorClassIdentifier: - slotList: - - {fileID: 6657208505121927469} --- !u!1 &7706243578629115492 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn b/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn index cbe01dfcf..81fefd34a 100644 --- a/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn +++ b/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn @@ -5,7 +5,7 @@ position: 205,-53 --- <> <> -<> +<> <> 你好,陌生的人类。 #line:08816f7 <> diff --git a/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn b/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn index 4084269ef..9bef4f747 100644 --- a/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn +++ b/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn @@ -13,7 +13,7 @@ position: 205,-53 // 巷子正中央站着一个人,佩佩。 你走出诊室,诊室外的护栏边站着一个熟悉的人影。 #line:012d086 <> -<> +<> <> <> me: 呼… #line:0f8a4c3 @@ -100,13 +100,13 @@ me: 它已经黄了。 #line:0049b60 peipei: 再见了,叶子。 #line:0694ade 佩佩看了你一眼,微笑了一下,转头离开了。 #line:00d0440 -<> +<> <> 吸完最后一口烟,你长舒一口气。 #line:0a732a9 <> ->CenterOption: 回到诊室 #line:05dd25e <> - <> + <> <> <> <> diff --git a/Assets/Resources/Yarn/FP_Day2_mid/Day2_mid.yarn b/Assets/Resources/Yarn/FP_Day2_mid/Day2_mid.yarn index bb89bb3af..34902447f 100644 --- a/Assets/Resources/Yarn/FP_Day2_mid/Day2_mid.yarn +++ b/Assets/Resources/Yarn/FP_Day2_mid/Day2_mid.yarn @@ -8,7 +8,7 @@ position: 205,-53 <> <> <> -<> +<> <> me: (轻哼)小鸟...小鸟…… #line:0114a4d <> @@ -21,7 +21,7 @@ me: …… #line:0df9d06 ->CenterOption: 回到岗位 #line:024f4c4 <> <> - <> + <> <> <> <> diff --git a/Assets/Resources/Yarn/FP_Day2_night/Day2_night.yarn b/Assets/Resources/Yarn/FP_Day2_night/Day2_night.yarn index 2591ab867..94ac15144 100644 --- a/Assets/Resources/Yarn/FP_Day2_night/Day2_night.yarn +++ b/Assets/Resources/Yarn/FP_Day2_night/Day2_night.yarn @@ -130,7 +130,7 @@ position: 205,-53 <> 佩佩双手撑在栏杆上,四处好奇地张望着。 #line:0a4bb44 -<> +<> <> //她疲惫的眼神透露出一种陌生的情绪。
这里显然已经和她印象中的世界不太一样了。 @@ -182,7 +182,7 @@ me: 去吧。找一个更高的地方。 #line:0175172 <> peipei: 一会…一会见。 #line:026c5a8 <> -<> +<> <> <> 佩佩跌跌撞撞地离开了天桥。 #line:09e9be9 @@ -191,7 +191,7 @@ peipei: 一会…一会见。 #line:026c5a8 <> ->CenterOption: 回到岗位 #line:0859319 <> - <> + <> <> <> @@ -226,7 +226,7 @@ peipei: 一会…一会见。 #line:026c5a8 <> <> <> -<> +<> <> <> //me: 我就知道没那么简单。这下可闯大祸了… diff --git a/Assets/Resources/Yarn/FP_Day3_mid/Day3_mid.yarn b/Assets/Resources/Yarn/FP_Day3_mid/Day3_mid.yarn index 1f0d93739..3307ec76d 100644 --- a/Assets/Resources/Yarn/FP_Day3_mid/Day3_mid.yarn +++ b/Assets/Resources/Yarn/FP_Day3_mid/Day3_mid.yarn @@ -7,12 +7,12 @@ position: 205,-53 <> <> <> -<> +<> <> <> - +诊室外医生 me: 佩佩? me: 跑到哪里去了…… @@ -24,7 +24,7 @@ peipei: 下雪了! 你抬头看去,灰白色的天空中,除了树叶外,还飘落着一种细细的粉末,洒在你的手上。 <> <> -<> +<> peipei: 你看见了吗?医生! 头顶的天桥栏杆上面探出一个脑袋,佩佩正笑着朝你打招呼。 @@ -36,13 +36,13 @@ peipei: 医生!来这里! <> <> <> - <> - <> - <> + <> + <> + <> <> <> -<> +<> <> // 她背对着你喊着你,头也不回地抬头看着天空。 @@ -113,7 +113,7 @@ peipei: 医生…这片树叶是什么颜色的? peipei: 再见,医生。 <> <> -<> +<> <> <> @@ -125,7 +125,7 @@ me: 你会有的… ->CenterOption: 回到岗位 - <> + <> //感觉可以把之前写的day1mid改到这里的BE,只是树叶其实是绿的,但你说是黄的 <> diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn index 6c54aecdf..4371faf1f 100644 --- a/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn +++ b/Assets/Resources/Yarn/FP_Peipei1/Stage1_佩佩开场对话.yarn @@ -58,8 +58,8 @@ position: 0,400 --- // <> -<> -<> +<> +<> yingli_novoice: 我不希望就因为你的这个怪病,而让我们部门的评价受到影响。 #line:0706187 peipei_novoice: 我没病,组长…我只是自己没发现……
…我会注意的。我会完成得很好的…相信我。 #line:0a29d9c peipei_novoice: 我以前……#auto_next #line:0d5302d @@ -82,8 +82,8 @@ yingli_novoice: …… #line:0691cca yingli_novoice: 做个身体检查,接受治疗。
无论如何,今晚好好休息。 #line:0e36c2b peipei_novoice: 是的,组长。 #line:07b19bb -<> -<> +<> +<> <> <> diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn index ec07266be..b383bf523 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn @@ -212,16 +212,16 @@ position: 205,-53 <> <> <> -<> -<> -<> -<> +<> +<> +<> +<> <> <> 佩佩双手撑在栏杆上,呆呆地望着远方。 #line:01905d9 <> -<> +<> <> me: …… #line:06df2f5 //她疲惫的眼神透露出一种陌生的情绪。
这里显然已经和她印象中的世界不太一样了。 @@ -229,7 +229,7 @@ me: …… #line:06df2f5 <> <> -<> +<> <> <> me: 呼… #line:060ff16 @@ -296,7 +296,7 @@ peipei: 这是我们的职责。 #line:080c8a0 <> <> -<> +<> <> <> 你目视她离开,吸完最后一口烟,长舒一口气。 #line:0dc3000 @@ -304,13 +304,13 @@ peipei: 这是我们的职责。 #line:080c8a0 <> ->CenterOption: 回到岗位 #line:0ba7be1 <> - <> + <> <> <> <> <> -<> +<> <> CenterText: 未完待续...
感谢游玩 爱与机器人维修技术
本次demo的体验流程已结束。 #line:00f29a9 <> diff --git a/Assets/Resources/Yarn/FP_Shitou1/Stage3_结束对话.yarn b/Assets/Resources/Yarn/FP_Shitou1/Stage3_结束对话.yarn index e7fa38ec9..f394dc4bf 100644 --- a/Assets/Resources/Yarn/FP_Shitou1/Stage3_结束对话.yarn +++ b/Assets/Resources/Yarn/FP_Shitou1/Stage3_结束对话.yarn @@ -36,7 +36,7 @@ me: 好了,试试吧,走两步。 #line:052c8b3 shitou: 呼!呜!好快啊,从来没有过的感觉! #line:0d5bdc9 <> -<> +<> <> shitou: 喔喔~哈哈! #line:058d88a @@ -45,7 +45,7 @@ me: 别在诊室里乱跑! #line:0c42be2 <> <> -<> +<> <> <> diff --git a/Assets/Resources/Yarn/Fiction_Day1_mid/Fiction_Day1_mid.yarn b/Assets/Resources/Yarn/Fiction_Day1_mid/Fiction_Day1_mid.yarn index 1b1ed922d..54df0bd11 100644 --- a/Assets/Resources/Yarn/Fiction_Day1_mid/Fiction_Day1_mid.yarn +++ b/Assets/Resources/Yarn/Fiction_Day1_mid/Fiction_Day1_mid.yarn @@ -17,7 +17,7 @@ colorID: 8 position: 250,200 --- <> -<> +<> <> <> @@ -137,22 +137,22 @@ colorID: 8 position: 250,200 --- <> -<> -<> -<> +<> +<> +<> <> <> // 你走出诊室,靠在巷子的墙上。 // 巷子正中央站着一个人,佩佩。 你走出诊室,诊室外的护栏边站着一个熟悉的人影。 #line:012d086 <> -<> -<> +<> +<> <> // ->CenterOption: 点火 <> <> -<> +<> me: 呼… #line:0f8a4c3 <> <> @@ -239,7 +239,7 @@ me: 它已经黄了。 #line:0049b60 peipei: 再见了,叶子。 #line:0694ade 佩佩看了你一眼,微笑了一下,转头离开了。 #line:00d0440 -<> +<> <> hs: 美工机体也会故障?这可比我促销失败还罕见啊。 #line:0dda97b @@ -280,9 +280,9 @@ me: 这家伙…… #line:09f05d5 <> ->CenterOption: 回到诊室 #line:05dd25e <> - <> + <> <> - <> + <>W <> <> diff --git a/Assets/Scenes/Bridge.unity b/Assets/Scenes/Bridge.unity index 2c3f4218a..d03d7b7db 100644 --- a/Assets/Scenes/Bridge.unity +++ b/Assets/Scenes/Bridge.unity @@ -344,7 +344,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &519420030 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index ec38b5a58..ce512929b 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -2020,7 +2020,6 @@ MonoBehaviour: socketPos: {fileID: 0} data: moduleName: Color - clickRadius: 0.2 available: 1 --- !u!114 &162810236 MonoBehaviour: @@ -3629,7 +3628,6 @@ MonoBehaviour: socketPos: {fileID: 0} data: moduleName: Eye - clickRadius: 0.2 available: 1 --- !u!1 &236862861 GameObject: @@ -7837,7 +7835,6 @@ MonoBehaviour: socketPos: {fileID: 0} data: moduleName: Logic - clickRadius: 0.2 available: 1 --- !u!1 &693974688 GameObject: @@ -8848,7 +8845,6 @@ MonoBehaviour: socketPos: {fileID: 0} data: moduleName: Memory - clickRadius: 0.2 available: 1 --- !u!1 &905842940 GameObject: @@ -17266,7 +17262,6 @@ MonoBehaviour: socketPos: {fileID: 0} data: moduleName: UF - clickRadius: 0.2 available: 1 --- !u!114 &1822610252 MonoBehaviour: @@ -17792,7 +17787,6 @@ MonoBehaviour: socketPos: {fileID: 0} data: moduleName: Emo - clickRadius: 0.2 available: 1 --- !u!1 &1952854102 GameObject: @@ -18956,7 +18950,6 @@ MonoBehaviour: socketPos: {fileID: 0} data: moduleName: Speak - clickRadius: 0.2 available: 1 --- !u!1 &2108328658 GameObject: diff --git a/Assets/Scripts/SceneManagement/ActorKit/ActorManager.cs b/Assets/Scripts/SceneManagement/ActorKit/ActorManager.cs index 04336c9f0..edd6e6471 100644 --- a/Assets/Scripts/SceneManagement/ActorKit/ActorManager.cs +++ b/Assets/Scripts/SceneManagement/ActorKit/ActorManager.cs @@ -110,7 +110,7 @@ namespace AibisDream } } - [YarnCommand("actor_fade_in")] + [YarnCommand("fade_in_actor")] public static IEnumerator ActorFadeIn(string actorName = ClinicSlotName, float duration = 1) { if (ActorManager.Instance.TryFindActor(actorName, out var actor)) @@ -119,7 +119,7 @@ namespace AibisDream } } - [YarnCommand("actor_fade_out")] + [YarnCommand("fade_out_actor")] public static IEnumerator ActorFadeOut(string actorName = ClinicSlotName, float duration = 1) { if (ActorManager.Instance.TryFindActor(actorName, out var actor)) diff --git a/Assets/Scripts/SceneManagement/ActorKit/SpriteActor.cs b/Assets/Scripts/SceneManagement/ActorKit/SpriteActor.cs index b35229531..d82c76039 100644 --- a/Assets/Scripts/SceneManagement/ActorKit/SpriteActor.cs +++ b/Assets/Scripts/SceneManagement/ActorKit/SpriteActor.cs @@ -1,4 +1,5 @@ using AibisDream.Framework; +using AibisDream.Utility; using UnityEngine; namespace AibisDream @@ -10,6 +11,7 @@ namespace AibisDream base.Init(actorName, slot); // 赋值 spriteRenderer.sprite = ResourceKit.LoadAssetSync($"Sprite/{ActorName}_Idle"); + spriteRenderer.SetAlpha(0); } public override void ChangeState(string stateName) diff --git a/Assets/Scripts/SceneManagement/Old.meta b/Assets/Scripts/SceneManagement/Old.meta deleted file mode 100644 index fa4c523dd..000000000 --- a/Assets/Scripts/SceneManagement/Old.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 98de6971e73e45b5ae6f1df075d7d55f -timeCreated: 1747892423 \ No newline at end of file diff --git a/Assets/Scripts/SceneManagement/Old/Actor.cs b/Assets/Scripts/SceneManagement/Old/Actor.cs deleted file mode 100644 index c0dc69116..000000000 --- a/Assets/Scripts/SceneManagement/Old/Actor.cs +++ /dev/null @@ -1,55 +0,0 @@ -using UnityEngine; - -public class Actor : MonoBehaviour -{ - private Animator animator; - - private void Awake() - { - // 自动获取 Animator 组件 - animator = GetComponent(); - if (animator == null) - { - Debug.LogError("Animator component not found on actor."); - } - } - - public void PlayAnimation(string animationName) - { - if (animator != null) - { - animator.Play(animationName); - } - else - { - Debug.LogError("Animator not found on actor."); - } - } - - public void InitializeAtSlot(Transform slot) - { - if (slot != null) - { - transform.position = slot.position; - transform.rotation = slot.rotation; - } - else - { - Debug.LogError("Slot transform is null."); - } - } - - public void SetAnimationState(string stateName) - { - if (animator != null) - { - animator.SetTrigger(stateName); - Debug.Log("Trigger"+stateName); - } - else - { - Debug.LogError("Animator not found on actor."); - } - } -} - diff --git a/Assets/Scripts/SceneManagement/Old/Actor.cs.meta b/Assets/Scripts/SceneManagement/Old/Actor.cs.meta deleted file mode 100644 index 07dc69906..000000000 --- a/Assets/Scripts/SceneManagement/Old/Actor.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 62e221e22720bec40b69d4bf463b3db2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/SceneManagement/Old/ActorManager.cs b/Assets/Scripts/SceneManagement/Old/ActorManager.cs deleted file mode 100644 index 287ea7538..000000000 --- a/Assets/Scripts/SceneManagement/Old/ActorManager.cs +++ /dev/null @@ -1,128 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using AibisDream.Utility; -using UnityEngine; -using Yarn.Unity; - -public class ActorManager : MonoBehaviour -{ - [Header("Actors")] - private List actors = new(); - - [Header("Slots")] - public List slotList = new(); // 用于在编辑器中设置插槽 - private Dictionary slots = new(); - - [YarnCommand("fade_in_actor")] - public IEnumerator FadeInActorByName(string actorName, float duration) - { - var actor = actors.Find(a => a.name == actorName); - if (actor != null) - { - yield return StartCoroutine(FadeActor(actor.GetComponent(), 0f, 1f, duration)); - } - else - { - Debug.LogError($"Actor with name {actorName} not found."); - } - } - - [YarnCommand("fade_out_actor")] - public IEnumerator FadeOutActorByName(string actorName, float duration) - { - var actor = actors.Find(a => a.name == actorName); - if (actor != null) - { - yield return StartCoroutine(FadeActor(actor.GetComponent(), 1f, 0f, duration)); - } - else - { - Debug.LogError($"Actor with name {actorName} not found."); - } - } - - [YarnCommand("play_actor_animation")] - public void PlayActorAnimation(string actorName, string animationName) - { - var actor = actors.Find(a => a.name == actorName); - if (actor != null) - { - actor.SetAnimationState(animationName); - } - else - { - Debug.LogError($"Actor with name {actorName} not found."); - } - } - - [YarnCommand("initialize_actor_at_slot")] - public void InitializeActorAtSlot(string actorName, string slotName) - { - var prefab = Resources.Load($"CharacterPrefab/{actorName}"); - if (prefab != null && slots.TryGetValue(slotName, out var slot)) - { - var actorInstance = Instantiate(prefab, slot.position, slot.rotation,this.transform); - actorInstance.name = actorName; // 去掉 "(Clone)" 后缀 - var actor = actorInstance.GetComponent(); - if (actor != null) - { - actors.Add(actor); - actor.InitializeAtSlot(slot); - } - } - else - { - Debug.LogError($"Actor prefab with name {actorName} not found or slot with name {slotName} not found."); - } - } - - private IEnumerator FadeActor(SpriteRenderer actor, float startAlpha, float endAlpha, float duration) - { - float elapsedTime = 0f; - Color color = actor.color; - - while (elapsedTime < duration) - { - elapsedTime += Time.deltaTime; - float alpha = Mathf.Lerp(startAlpha, endAlpha, elapsedTime / duration); - actor.color = new Color(color.r, color.g, color.b, alpha); - yield return null; - } - - actor.color = new Color(color.r, color.g, color.b, endAlpha); - } - - private void SetActorAlphaZero(SpriteRenderer actor) - { - actor.SetAlpha(0); - } - - private void Start() - { - InitializeSlots(); - HideAllActors(); - } - - private void InitializeSlots() - { - foreach (var slot in slotList) - { - if (slot != null) - { - slots[slot.name] = slot; - } - } - } - - private void HideAllActors() - { - foreach (var actor in actors) - { - var spriteRenderer = actor.GetComponent(); - if (spriteRenderer != null) - { - spriteRenderer.color = new Color(spriteRenderer.color.r, spriteRenderer.color.g, spriteRenderer.color.b, 0f); - } - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/SceneManagement/Old/ActorManager.cs.meta b/Assets/Scripts/SceneManagement/Old/ActorManager.cs.meta deleted file mode 100644 index 7de25f27a..000000000 --- a/Assets/Scripts/SceneManagement/Old/ActorManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 40a5ab0dc89da0f469155caebeaf7383 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/SceneManagement/Old/EnvironmentManager.cs b/Assets/Scripts/SceneManagement/Old/EnvironmentManager.cs deleted file mode 100644 index dbaf092f5..000000000 --- a/Assets/Scripts/SceneManagement/Old/EnvironmentManager.cs +++ /dev/null @@ -1,92 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; -using Yarn.Unity; - -public class EnvironmentManager : MonoBehaviour -{ - [Header("Time of Day Objects")] - public List dayObjects; - public List nightObjects; - public List midnightObjects; - - [Header("Weather Effects")] - public GameObject snowEffect; - - private void Start() - { - // 设置默认状态 - SetTimeOfDay(TimeOfDay.Day); - SetWeather(false); - } - - // [YarnCommand("set_time_of_day")] - public void SetTimeOfDayCommand(string timeOfDay) - { - timeOfDay = timeOfDay.ToLower(); - if (timeOfDay == "day" && dayObjects.Count > 0) - { - SetTimeOfDay(TimeOfDay.Day); - } - else if (timeOfDay == "night" && nightObjects.Count > 0) - { - SetTimeOfDay(TimeOfDay.Night); - } - else if (timeOfDay == "midnight" && midnightObjects.Count > 0) - { - SetTimeOfDay(TimeOfDay.Midnight); - } - else - { - Debug.LogError($"Invalid or unavailable time of day: {timeOfDay}"); - } - } - - public void SetTimeOfDay(TimeOfDay timeOfDay) - { - if (dayObjects.Count > 0) - { - foreach (var obj in dayObjects) - { - obj.SetActive(timeOfDay == TimeOfDay.Day); - } - } - - if (nightObjects.Count > 0) - { - foreach (var obj in nightObjects) - { - obj.SetActive(timeOfDay == TimeOfDay.Night); - } - } - - if (midnightObjects.Count > 0) - { - foreach (var obj in midnightObjects) - { - obj.SetActive(timeOfDay == TimeOfDay.Midnight); - } - } - } - - // [YarnCommand("set_weather")] - public void SetWeatherCommand(string weatherType) - { - bool isSnowing = weatherType.ToLower() == "snow"; - SetWeather(isSnowing); - } - - public void SetWeather(bool isSnowing) - { - if (snowEffect != null) - { - snowEffect.SetActive(isSnowing); - } - } -} - -public enum TimeOfDay -{ - Day, - Night, - Midnight -} \ No newline at end of file diff --git a/Assets/Scripts/SceneManagement/Old/EnvironmentManager.cs.meta b/Assets/Scripts/SceneManagement/Old/EnvironmentManager.cs.meta deleted file mode 100644 index 02db24663..000000000 --- a/Assets/Scripts/SceneManagement/Old/EnvironmentManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9ebc4f12b48436f4985f9bf4ee8b92b1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: