diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index f5549ff8d..3c0b10878 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -57,6 +57,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 145b0899f1dd4aa409d94f3bee6ac54f + m_Address: ClinicOut + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} m_SchemaSet: diff --git a/Assets/CameraData.meta b/Assets/CameraData.meta new file mode 100644 index 000000000..f4ec59de7 --- /dev/null +++ b/Assets/CameraData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 351f518ac1668ff4ba45e3fec5e1dc13 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Main Camera Blends.asset b/Assets/CameraData/Main Camera Blends.asset similarity index 100% rename from Assets/Main Camera Blends.asset rename to Assets/CameraData/Main Camera Blends.asset diff --git a/Assets/Main Camera Blends.asset.meta b/Assets/CameraData/Main Camera Blends.asset.meta similarity index 100% rename from Assets/Main Camera Blends.asset.meta rename to Assets/CameraData/Main Camera Blends.asset.meta diff --git a/Assets/Render/Renderer2Dtest.asset b/Assets/Render/Renderer2Dtest.asset index 9bebfac1e..d3df27388 100644 --- a/Assets/Render/Renderer2Dtest.asset +++ b/Assets/Render/Renderer2Dtest.asset @@ -1053,15 +1053,19 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 _filter: - - 0.007228916 - - 0.043749984 - - 0.12409639 - - 0.20444278 - - 0.24096388 - - 0.20444278 - - 0.12409639 - - 0.043749984 - - 0.007228916 + - 0.0048309183 + - 0.016401261 + - 0.04532712 + - 0.08293076 + - 0.12053438 + - 0.14946026 + - 0.1610306 + - 0.14946026 + - 0.12053438 + - 0.08293076 + - 0.04532712 + - 0.016401261 + - 0.0048309183 --- !u!114 &-6086986437317696584 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/Resources/Art/Fix/温控器.meta b/Assets/Resources/Art/Fix/温控器.meta new file mode 100644 index 000000000..718ea3d4d --- /dev/null +++ b/Assets/Resources/Art/Fix/温控器.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d0b8fb23239461942ae20b421af10a7c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Art/Fix/温控器/温控器.psb b/Assets/Resources/Art/Fix/温控器/温控器.psb new file mode 100644 index 000000000..73329c056 --- /dev/null +++ b/Assets/Resources/Art/Fix/温控器/温控器.psb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b466a562d9d2c413438506a4d12194e91f433bd2d23714d5175cc97517856175 +size 988457 diff --git a/Assets/Resources/Art/Fix/温控器/温控器.psb.meta b/Assets/Resources/Art/Fix/温控器/温控器.psb.meta new file mode 100644 index 000000000..b760dc86e --- /dev/null +++ b/Assets/Resources/Art/Fix/温控器/温控器.psb.meta @@ -0,0 +1,323 @@ +fileFormatVersion: 2 +guid: 3a68d10f017010f4dac30cbb656d898c +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: b2a9591990af98743ba3ff7cf1000886, type: 3} + textureImporterSettings: + alphaSource: 1 + mipMapMode: 0 + enableMipMap: 1 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + convertToNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + swizzle: 50462976 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + nPOTScale: 1 + sRGBTexture: 1 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 200 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 0 + flipbookColumns: 0 + ignorePngGamma: 0 + cookieMode: 0 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + normalMap: 0 + textureFormat: 0 + maxTextureSize: 0 + lightmap: 0 + compressionQuality: 0 + linearTexture: 0 + grayScaleToAlpha: 0 + rGBM: 0 + cubemapConvolutionSteps: 0 + cubemapConvolutionExponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + spriteImportData: + - name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} + mosaicSpriteImportData: [] + rigSpriteImportData: + - name: "\u6E29\u5EA6\u68C0\u6D4B\u4EEA" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 730 + width: 611 + height: 612 + spriteID: fbd4e215778a1ec41aa495500313467d + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 730} + spritePosition: {x: 44, y: 53} + - name: "\u6E29\u63A7\u5668" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 4 + width: 1116 + height: 718 + spriteID: 3d82715679ca99c4cb9b2c4fccecfb50 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 4} + spritePosition: {x: 0, y: 0} + - name: "\u98CE\u6247" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1128 + y: 4 + width: 653 + height: 655 + spriteID: adcea20de16e07f41af35105a64dd95c + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1128, y: 4} + spritePosition: {x: 41, y: 31} + - name: "\u6746\u5B50" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 1350 + width: 1576 + height: 164 + spriteID: 65beb6e134ea9a548994324dc889602b + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 1350} + spritePosition: {x: 1081, y: 127} + characterData: + bones: [] + parts: [] + dimension: {x: 0, y: 0} + characterGroups: [] + pivot: {x: 0, y: 0} + boneReadOnly: 0 + sharedRigSpriteImportData: [] + sharedRigCharacterData: + bones: [] + parts: [] + dimension: {x: 0, y: 0} + characterGroups: [] + pivot: {x: 0, y: 0} + boneReadOnly: 0 + platformSettings: + - name: DefaultTexturePlatform + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Standalone + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Server + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: WebGL + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + mosaicLayers: 1 + characterMode: 1 + documentPivot: {x: 0, y: 0} + documentAlignment: 7 + importHiddenLayers: 0 + layerMappingOption: 2 + generatePhysicsShape: 0 + paperDollMode: 0 + keepDupilcateSpriteName: 1 + skeletonAssetReferenceID: + padding: 4 + spriteSizeExpand: 0 + spriteCategoryList: + categories: [] + spritePackingTag: + resliceFromLayer: 0 + mosaicPSDLayers: [] + rigPSDLayers: + - name: "\u6E29\u5EA6\u68C0\u6D4B\u63A7\u5236\u5668" + spriteName: + isGroup: 1 + parentIndex: -1 + spriteID: c89a385708c8e8d4cb6fa574f7164527 + layerID: 7 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u6E29\u5EA6\u68C0\u6D4B\u4EEA" + spriteName: "\u6E29\u5EA6\u68C0\u6D4B\u4EEA" + isGroup: 0 + parentIndex: 0 + spriteID: fbd4e215778a1ec41aa495500313467d + layerID: 6 + mosaicPosition: {x: 4, y: 730} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6E29\u63A7\u5668" + spriteName: "\u6E29\u63A7\u5668" + isGroup: 0 + parentIndex: 0 + spriteID: 3d82715679ca99c4cb9b2c4fccecfb50 + layerID: 5 + mosaicPosition: {x: 4, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u98CE\u6247" + spriteName: "\u98CE\u6247" + isGroup: 0 + parentIndex: 0 + spriteID: adcea20de16e07f41af35105a64dd95c + layerID: 4 + mosaicPosition: {x: 1128, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6746\u5B50" + spriteName: "\u6746\u5B50" + isGroup: 0 + parentIndex: 0 + spriteID: 65beb6e134ea9a548994324dc889602b + layerID: 3 + mosaicPosition: {x: 4, y: 1350} + flatten: 0 + isImported: 1 + isVisible: 1 + sharedRigPSDLayers: [] + pSDLayerImportSetting: [] + importFileNodeState: 1 + platformSettingsDirtyTick: 0 + spriteSizeExpandChanged: 0 + generateGOHierarchy: 0 + textureAssetName: + prefabAssetName: + spriteLibAssetName: + skeletonAssetName: + secondarySpriteTextures: [] diff --git a/Assets/Resources/Art/TimeLineAsset.meta b/Assets/Resources/Art/TimeLineAsset.meta new file mode 100644 index 000000000..8a23209ff --- /dev/null +++ b/Assets/Resources/Art/TimeLineAsset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09512a48b849d794c815dce1b7c0b80f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Art/TimeLineAsset/进入维修蒙太奇.psb b/Assets/Resources/Art/TimeLineAsset/进入维修蒙太奇.psb new file mode 100644 index 000000000..8c5397d1e --- /dev/null +++ b/Assets/Resources/Art/TimeLineAsset/进入维修蒙太奇.psb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0bcfc12ad80a7f1b1f37bcb7ea7490a513d9d3d26c081790e005cfc669f7384b +size 11945928 diff --git a/Assets/Resources/Art/TimeLineAsset/进入维修蒙太奇.psb.meta b/Assets/Resources/Art/TimeLineAsset/进入维修蒙太奇.psb.meta new file mode 100644 index 000000000..a4868f55a --- /dev/null +++ b/Assets/Resources/Art/TimeLineAsset/进入维修蒙太奇.psb.meta @@ -0,0 +1,323 @@ +fileFormatVersion: 2 +guid: db89da1c41a5b094d9267dfd2a5ff538 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: b2a9591990af98743ba3ff7cf1000886, type: 3} + textureImporterSettings: + alphaSource: 1 + mipMapMode: 0 + enableMipMap: 1 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + convertToNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + swizzle: 50462976 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + nPOTScale: 1 + sRGBTexture: 1 + spriteMode: 2 + 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: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 0 + flipbookColumns: 0 + ignorePngGamma: 0 + cookieMode: 0 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + normalMap: 0 + textureFormat: 0 + maxTextureSize: 0 + lightmap: 0 + compressionQuality: 0 + linearTexture: 0 + grayScaleToAlpha: 0 + rGBM: 0 + cubemapConvolutionSteps: 0 + cubemapConvolutionExponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + spriteImportData: + - name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} + mosaicSpriteImportData: [] + rigSpriteImportData: + - name: "\u9ED1\u8FB9" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 4 + width: 3840 + height: 2646 + spriteID: 1ed04d17e0beecb4a8ea879d257991b9 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 4} + spritePosition: {x: 4, y: 0} + - name: "\u8FDB\u5165\u7EF4\u4FEE\u8499\u592A\u5947c" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 2658 + width: 1280 + height: 1378 + spriteID: 43d5232c0ef6e2643967740c227d5a27 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 2658} + spritePosition: {x: 2564, y: 634} + - name: "\u8FDB\u5165\u7EF4\u4FEE\u8499\u592A\u5947b" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1292 + y: 2658 + width: 1280 + height: 1378 + spriteID: a6434e232d4fc0145bb0d4e54e1ffd5b + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1292, y: 2658} + spritePosition: {x: 1284, y: 634} + - name: "\u8FDB\u5165\u7EF4\u4FEE\u8499\u592A\u5947a" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 2580 + y: 2658 + width: 1280 + height: 1378 + spriteID: 31af32653e0e5b141a3f456369d5dc3b + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 2580, y: 2658} + spritePosition: {x: 4, y: 634} + characterData: + bones: [] + parts: [] + dimension: {x: 0, y: 0} + characterGroups: [] + pivot: {x: 0, y: 0} + boneReadOnly: 0 + sharedRigSpriteImportData: [] + sharedRigCharacterData: + bones: [] + parts: [] + dimension: {x: 0, y: 0} + characterGroups: [] + pivot: {x: 0, y: 0} + boneReadOnly: 0 + platformSettings: + - name: DefaultTexturePlatform + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Standalone + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Server + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: WebGL + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + mosaicLayers: 1 + characterMode: 1 + documentPivot: {x: 0, y: 0} + documentAlignment: 7 + importHiddenLayers: 0 + layerMappingOption: 2 + generatePhysicsShape: 0 + paperDollMode: 0 + keepDupilcateSpriteName: 1 + skeletonAssetReferenceID: + padding: 4 + spriteSizeExpand: 0 + spriteCategoryList: + categories: [] + spritePackingTag: + resliceFromLayer: 0 + mosaicPSDLayers: [] + rigPSDLayers: + - name: "\u8FDB\u5165\u7EF4\u4FEE\u8499\u592A\u5947" + spriteName: + isGroup: 1 + parentIndex: -1 + spriteID: 71b93356d7ff0954f8753fab058ef422 + layerID: 7 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u9ED1\u8FB9" + spriteName: "\u9ED1\u8FB9" + isGroup: 0 + parentIndex: 0 + spriteID: 1ed04d17e0beecb4a8ea879d257991b9 + layerID: 6 + mosaicPosition: {x: 4, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u8FDB\u5165\u7EF4\u4FEE\u8499\u592A\u5947c" + spriteName: "\u8FDB\u5165\u7EF4\u4FEE\u8499\u592A\u5947c" + isGroup: 0 + parentIndex: 0 + spriteID: 43d5232c0ef6e2643967740c227d5a27 + layerID: 5 + mosaicPosition: {x: 4, y: 2658} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u8FDB\u5165\u7EF4\u4FEE\u8499\u592A\u5947b" + spriteName: "\u8FDB\u5165\u7EF4\u4FEE\u8499\u592A\u5947b" + isGroup: 0 + parentIndex: 0 + spriteID: a6434e232d4fc0145bb0d4e54e1ffd5b + layerID: 4 + mosaicPosition: {x: 1292, y: 2658} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u8FDB\u5165\u7EF4\u4FEE\u8499\u592A\u5947a" + spriteName: "\u8FDB\u5165\u7EF4\u4FEE\u8499\u592A\u5947a" + isGroup: 0 + parentIndex: 0 + spriteID: 31af32653e0e5b141a3f456369d5dc3b + layerID: 3 + mosaicPosition: {x: 2580, y: 2658} + flatten: 0 + isImported: 1 + isVisible: 1 + sharedRigPSDLayers: [] + pSDLayerImportSetting: [] + importFileNodeState: 1 + platformSettingsDirtyTick: 638751447966572813 + spriteSizeExpandChanged: 0 + generateGOHierarchy: 0 + textureAssetName: + prefabAssetName: + spriteLibAssetName: + skeletonAssetName: + secondarySpriteTextures: [] diff --git a/Assets/Resources/SceneSO/Day1_mid.asset b/Assets/Resources/SceneSO/Day1_mid.asset index 2f69f0455..54b769d9b 100644 --- a/Assets/Resources/SceneSO/Day1_mid.asset +++ b/Assets/Resources/SceneSO/Day1_mid.asset @@ -14,5 +14,5 @@ MonoBehaviour: m_EditorClassIdentifier: nextScene: {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2} yarnProject: {fileID: 7545569452688597077, guid: 293561ce52efc594399242651d44b366, type: 3} - firstSceneName: OutSideSceneTemp + firstSceneName: ClinicOut isEndOfDay: 1 diff --git a/Assets/Resources/SceneSO/Day1_night.asset b/Assets/Resources/SceneSO/Day1_night.asset index bf7a80ad8..3f7c0cec0 100644 --- a/Assets/Resources/SceneSO/Day1_night.asset +++ b/Assets/Resources/SceneSO/Day1_night.asset @@ -14,5 +14,5 @@ MonoBehaviour: m_EditorClassIdentifier: nextScene: {fileID: 11400000, guid: fe71f935f1f9a52458c994362567a211, type: 2} yarnProject: {fileID: 7545569452688597077, guid: 29ebe788cfe2c084e88ffdd8e2f93378, type: 3} - firstSceneName: OutSideSceneTemp + firstSceneName: ClinicOut isEndOfDay: 1 diff --git a/Assets/Resources/SceneSO/Day2_mid.asset b/Assets/Resources/SceneSO/Day2_mid.asset index 6fa46a2db..79ba4fef7 100644 --- a/Assets/Resources/SceneSO/Day2_mid.asset +++ b/Assets/Resources/SceneSO/Day2_mid.asset @@ -14,5 +14,5 @@ MonoBehaviour: m_EditorClassIdentifier: nextScene: {fileID: 11400000, guid: ff82a99e791be3e41acf40232f908eb3, type: 2} yarnProject: {fileID: 7545569452688597077, guid: 25f49957c68bca34bb1aeafec7feca8b, type: 3} - firstSceneName: OutSideSceneTemp + firstSceneName: ClinicOut isEndOfDay: 1 diff --git a/Assets/Resources/SceneSO/Day2_night.asset b/Assets/Resources/SceneSO/Day2_night.asset index bd739bf90..77c1cd630 100644 --- a/Assets/Resources/SceneSO/Day2_night.asset +++ b/Assets/Resources/SceneSO/Day2_night.asset @@ -14,5 +14,5 @@ MonoBehaviour: m_EditorClassIdentifier: nextScene: {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2} yarnProject: {fileID: 7545569452688597077, guid: ec06c945cb99fb544b1dd9a2a6ea9a7b, type: 3} - firstSceneName: OutSideSceneTemp + firstSceneName: ClinicOut isEndOfDay: 1 diff --git a/Assets/Resources/SceneSO/Day3_mid.asset b/Assets/Resources/SceneSO/Day3_mid.asset index a107fa096..4ae0c1c7a 100644 --- a/Assets/Resources/SceneSO/Day3_mid.asset +++ b/Assets/Resources/SceneSO/Day3_mid.asset @@ -14,5 +14,5 @@ MonoBehaviour: m_EditorClassIdentifier: nextScene: {fileID: 0} yarnProject: {fileID: 7545569452688597077, guid: 640f90d7758f6524f8735352da531604, type: 3} - firstSceneName: OutSideSceneTemp + firstSceneName: ClinicOut isEndOfDay: 1 diff --git a/Assets/Resources/TimeLine.meta b/Assets/Resources/TimeLine.meta new file mode 100644 index 000000000..7cae5cdc1 --- /dev/null +++ b/Assets/Resources/TimeLine.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fcad5379a45bfea42bb7e54c0ca4356b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/CutLine.playable b/Assets/Resources/TimeLine/CutLine.playable similarity index 100% rename from Assets/Animation/CutLine.playable rename to Assets/Resources/TimeLine/CutLine.playable diff --git a/Assets/Animation/CutLine.playable.meta b/Assets/Resources/TimeLine/CutLine.playable.meta similarity index 100% rename from Assets/Animation/CutLine.playable.meta rename to Assets/Resources/TimeLine/CutLine.playable.meta diff --git a/Assets/Resources/TimeLine/ToBodyModule.playable b/Assets/Resources/TimeLine/ToBodyModule.playable new file mode 100644 index 000000000..785d14f9d --- /dev/null +++ b/Assets/Resources/TimeLine/ToBodyModule.playable @@ -0,0 +1,1414 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &-8987828105686056665 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Recorded (1) + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.5 + value: {x: 0, y: -6.85, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.5 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: -6.85 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!74 &-7397936471105413595 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Recorded (3) + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 2 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 3.5 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 4.5 + value: {x: 0, y: -6.85, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 4.5 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.5 + value: -6.85 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!114 &-4861982396524769642 +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: d21dcc2386d650c4597f3633c75a1f98, type: 3} + m_Name: Animation Track (3) + 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_Markers: + m_Objects: [] + m_InfiniteClipPreExtrapolation: 1 + m_InfiniteClipPostExtrapolation: 1 + m_InfiniteClipOffsetPosition: {x: 3.82, y: -7.5, z: 11.807568} + m_InfiniteClipOffsetEulerAngles: {x: -0, y: 0, z: 0} + m_InfiniteClipTimeOffset: 0 + m_InfiniteClipRemoveOffset: 0 + m_InfiniteClipApplyFootIK: 1 + mInfiniteClipLoop: 0 + m_MatchTargetFields: 63 + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_AvatarMask: {fileID: 0} + m_ApplyAvatarMask: 1 + m_TrackOffset: 0 + m_InfiniteClip: {fileID: -2841981516909641072} + m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} + m_Rotation: {x: 0, y: 0, z: 0, w: 1} + m_ApplyOffsets: 0 +--- !u!74 &-4682988040500022136 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Recorded + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!74 &-2841981516909641072 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Recorded (2) + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.5 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 2 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 3 + value: {x: 0, y: 7.15, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 3 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: 7.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!114 &-2232058861460470490 +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: d21dcc2386d650c4597f3633c75a1f98, type: 3} + m_Name: Animation Track (4) + 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_Markers: + m_Objects: [] + m_InfiniteClipPreExtrapolation: 1 + m_InfiniteClipPostExtrapolation: 1 + m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0} + m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0} + m_InfiniteClipTimeOffset: 0 + m_InfiniteClipRemoveOffset: 0 + m_InfiniteClipApplyFootIK: 1 + mInfiniteClipLoop: 0 + m_MatchTargetFields: 63 + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_AvatarMask: {fileID: 0} + m_ApplyAvatarMask: 1 + m_TrackOffset: 0 + m_InfiniteClip: {fileID: 7508135992580153614} + m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} + m_Rotation: {x: 0, y: 0, z: 0, w: 1} + m_ApplyOffsets: 0 +--- !u!114 &-1955702222206797376 +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: d21dcc2386d650c4597f3633c75a1f98, type: 3} + m_Name: Animation Track (1) + 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_Markers: + m_Objects: [] + m_InfiniteClipPreExtrapolation: 1 + m_InfiniteClipPostExtrapolation: 1 + m_InfiniteClipOffsetPosition: {x: 9.773488, y: 6.5, z: 11.807568} + m_InfiniteClipOffsetEulerAngles: {x: -0, y: 0, z: 0} + m_InfiniteClipTimeOffset: 0 + m_InfiniteClipRemoveOffset: 0 + m_InfiniteClipApplyFootIK: 1 + mInfiniteClipLoop: 0 + m_MatchTargetFields: 63 + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_AvatarMask: {fileID: 0} + m_ApplyAvatarMask: 1 + m_TrackOffset: 0 + m_InfiniteClip: {fileID: -7397936471105413595} + m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} + m_Rotation: {x: 0, y: 0, z: 0, w: 1} + m_ApplyOffsets: 0 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: bfda56da833e2384a9677cd3c976a436, type: 3} + m_Name: ToBodyModule + m_EditorClassIdentifier: + m_Version: 0 + m_Tracks: + - {fileID: 8749163046677871002} + - {fileID: 3372324610345174019} + - {fileID: -1955702222206797376} + - {fileID: -4861982396524769642} + - {fileID: -2232058861460470490} + m_FixedDuration: 0 + m_EditorSettings: + m_Framerate: 60 + m_ScenePreview: 1 + m_DurationMode: 0 + m_MarkerTrack: {fileID: 0} +--- !u!114 &3372324610345174019 +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: d21dcc2386d650c4597f3633c75a1f98, type: 3} + m_Name: Animation Track (2) + 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_Markers: + m_Objects: [] + m_InfiniteClipPreExtrapolation: 1 + m_InfiniteClipPostExtrapolation: 1 + m_InfiniteClipOffsetPosition: {x: -2.1334884, y: 6.5, z: 11.807568} + m_InfiniteClipOffsetEulerAngles: {x: -0, y: 0, z: 0} + m_InfiniteClipTimeOffset: 0 + m_InfiniteClipRemoveOffset: 0 + m_InfiniteClipApplyFootIK: 1 + mInfiniteClipLoop: 0 + m_MatchTargetFields: 63 + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_AvatarMask: {fileID: 0} + m_ApplyAvatarMask: 1 + m_TrackOffset: 0 + m_InfiniteClip: {fileID: -8987828105686056665} + m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} + m_Rotation: {x: 0, y: 0, z: 0, w: 1} + m_ApplyOffsets: 0 +--- !u!74 &7508135992580153614 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Recorded (4) + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 5 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 6 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 6 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 5 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 6 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!114 &8749163046677871002 +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: d21dcc2386d650c4597f3633c75a1f98, type: 3} + m_Name: Animation 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_Markers: + m_Objects: [] + m_InfiniteClipPreExtrapolation: 1 + m_InfiniteClipPostExtrapolation: 1 + m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0} + m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0} + m_InfiniteClipTimeOffset: 0 + m_InfiniteClipRemoveOffset: 0 + m_InfiniteClipApplyFootIK: 1 + mInfiniteClipLoop: 0 + m_MatchTargetFields: 63 + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_AvatarMask: {fileID: 0} + m_ApplyAvatarMask: 1 + m_TrackOffset: 0 + m_InfiniteClip: {fileID: -4682988040500022136} + m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} + m_Rotation: {x: 0, y: 0, z: 0, w: 1} + m_ApplyOffsets: 0 diff --git a/Assets/Resources/TimeLine/ToBodyModule.playable.meta b/Assets/Resources/TimeLine/ToBodyModule.playable.meta new file mode 100644 index 000000000..d86ceb330 --- /dev/null +++ b/Assets/Resources/TimeLine/ToBodyModule.playable.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6a22dc1e52d77c642996ae783383afeb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn b/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn index a9c6a0e15..2fdaedf89 100644 --- a/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn +++ b/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn @@ -4,7 +4,7 @@ colorID: 8 position: 205,-53 --- <> -场景黑屏占位 +<> <> 你走出诊室，靠在巷子的墙上。 巷子正中央站着一个人，佩佩。 @@ -77,7 +77,6 @@ peipei: 再见了，叶子。 ->回到诊室 - <> === diff --git a/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn b/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn index 7a4375c29..f5919401f 100644 --- a/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn +++ b/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn @@ -5,7 +5,7 @@ position: 205,-53 --- <> -<> +<> <> 你坐上了回家的地铁，地铁上挤满了机体。 diff --git a/Assets/Resources/Yarn/FP_Day2_mid/Day2_mid.yarn b/Assets/Resources/Yarn/FP_Day2_mid/Day2_mid.yarn index 8bf4dcf11..ccc9e713a 100644 --- a/Assets/Resources/Yarn/FP_Day2_mid/Day2_mid.yarn +++ b/Assets/Resources/Yarn/FP_Day2_mid/Day2_mid.yarn @@ -4,7 +4,7 @@ colorID: 8 position: 205,-53 --- <> -场景黑屏占位 +<> <> 你走出诊室，靠在巷子的墙上。 diff --git a/Assets/Resources/Yarn/FP_Day2_night/Day2_night.yarn b/Assets/Resources/Yarn/FP_Day2_night/Day2_night.yarn index ed2e9e0c4..8075975e8 100644 --- a/Assets/Resources/Yarn/FP_Day2_night/Day2_night.yarn +++ b/Assets/Resources/Yarn/FP_Day2_night/Day2_night.yarn @@ -4,7 +4,7 @@ colorID: 8 position: 205,-53 --- <> -//<> +<> 场景黑屏占位 <> diff --git a/Assets/Resources/Yarn/FP_Day3_mid/Day3_mid.yarn b/Assets/Resources/Yarn/FP_Day3_mid/Day3_mid.yarn index 45446544f..80e0c0642 100644 --- a/Assets/Resources/Yarn/FP_Day3_mid/Day3_mid.yarn +++ b/Assets/Resources/Yarn/FP_Day3_mid/Day3_mid.yarn @@ -5,7 +5,7 @@ position: 205,-53 --- <> -//<> +<> 场景黑屏占位 <> @@ -75,7 +75,7 @@ peipei: 我会有很多机会给你画画的。 //感觉可以把之前写的day1mid改到这里的BE，只是树叶其实是绿的，但你说是黄的 -//<> +<> 感谢游玩艾比斯之梦，本次demo的体验流程已结束 diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage1_佩佩开场对话.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage1_佩佩开场对话.yarn index 731a1e60a..873eae606 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage1_佩佩开场对话.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage1_佩佩开场对话.yarn @@ -4,6 +4,7 @@ colorID: 8 position: 272,-1156 --- <> +<> <> peipei: 我搞砸了…我搞砸了。 <> diff --git a/Assets/Scenes/ClinicOut.unity b/Assets/Scenes/ClinicOut.unity index a81d4a22a..07b88e5e8 100644 --- a/Assets/Scenes/ClinicOut.unity +++ b/Assets/Scenes/ClinicOut.unity @@ -9849,7 +9849,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!81 &519420029 AudioListener: m_ObjectHideFlags: 0 @@ -15018,7 +15018,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1422341238493880773, guid: 87957cfe30e56984b82c1d9a90fad889, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5153794831014570795, guid: 87957cfe30e56984b82c1d9a90fad889, type: 3} propertyPath: lengthInSec @@ -15658,7 +15658,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1422341238493880773, guid: 87957cfe30e56984b82c1d9a90fad889, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5153794831014570795, guid: 87957cfe30e56984b82c1d9a90fad889, type: 3} propertyPath: lengthInSec @@ -15997,7 +15997,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1422341238493880773, guid: 87957cfe30e56984b82c1d9a90fad889, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5153794831014570795, guid: 87957cfe30e56984b82c1d9a90fad889, type: 3} propertyPath: SizeModule.enabled @@ -16594,7 +16594,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1422341238493880773, guid: 87957cfe30e56984b82c1d9a90fad889, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5153794831014570795, guid: 87957cfe30e56984b82c1d9a90fad889, type: 3} propertyPath: SizeModule.enabled diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index 881ad0fe1..96ba0f66b 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -4210,11 +4210,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3083274345920604345, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3083274345920604345, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 3083274345920604345, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMin.x @@ -4222,7 +4222,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3083274345920604345, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 3083274345920604345, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_SizeDelta.x @@ -4314,11 +4314,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3083274347384374709, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3083274347384374709, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 3083274347408712451, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_Name @@ -6458,8 +6458,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 0.6 - m_fontSizeBase: 0.6 + m_fontSize: 0.2 + m_fontSizeBase: 0.2 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -7788,7 +7788,7 @@ SpriteRenderer: m_SortingLayerID: 1134468525 m_SortingLayer: 10 m_SortingOrder: 40 - m_Sprite: {fileID: -6697397389460088483, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + m_Sprite: {fileID: -5309117149757345723, guid: fd04c28739017964789d58d573f9fabb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -8654,6 +8654,163 @@ SpriteMask: m_BackSortingOrder: 0 m_IsCustomRangeActive: 0 m_SpriteSortPoint: 0 +--- !u!1 &438012754 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 438012755} + - component: {fileID: 438012758} + - component: {fileID: 438012757} + - component: {fileID: 438012756} + m_Layer: 0 + m_Name: "\u6E29\u5EA6\u68C0\u6D4B\u4EEAMask" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &438012755 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 438012754} + 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: 542753289} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -4.895, y: 1.795} + m_SizeDelta: {x: 3.055, y: 3.06} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!331 &438012756 +SpriteMask: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 438012754} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + 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: 15d0c3709176029428a0da2f8cecf0b5, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7526266596215757039, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + m_MaskAlphaCutoff: 0.2 + m_FrontSortingLayerID: 0 + m_BackSortingLayerID: 0 + m_FrontSortingLayer: 0 + m_BackSortingLayer: 0 + m_FrontSortingOrder: 0 + m_BackSortingOrder: 0 + m_IsCustomRangeActive: 0 + m_SpriteSortPoint: 0 +--- !u!114 &438012757 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 438012754} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee158225ee1e59f4791627785501d950, type: 3} + m_Name: + m_EditorClassIdentifier: + shaderTypes: 0 + normalStrength: 5 + normalSmoothing: 1 + computingNormal: 0 +--- !u!212 &438012758 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 438012754} + 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: 1460443025} + 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: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 4 + m_Sprite: {fileID: 7526266596215757039, guid: 3a68d10f017010f4dac30cbb656d898c, 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.055, y: 3.06} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &466676742 GameObject: m_ObjectHideFlags: 0 @@ -9633,7 +9790,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &503082897 RectTransform: m_ObjectHideFlags: 0 @@ -11310,6 +11467,140 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &542753288 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1652512855} + m_Modifications: + - target: {fileID: -8653719598885068355, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_Name + value: "\u6E29\u63A7\u5668" + objectReference: {fileID: 0} + - target: {fileID: -8379289232430307119, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_SortingLayer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -8379289232430307119, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_SortingOrder + value: 16 + objectReference: {fileID: 0} + - target: {fileID: -8379289232430307119, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_SortingLayerID + value: 1134468525 + objectReference: {fileID: 0} + - target: {fileID: -7866505717898858174, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_SortingLayer + value: 12 + objectReference: {fileID: 0} + - target: {fileID: -7866505717898858174, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_SortingLayerID + value: 467777933 + objectReference: {fileID: 0} + - target: {fileID: -7866505717898858174, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 72b0010e1307b614ebb427b0d8dc54ee, type: 2} + - target: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_LocalScale.x + value: 0.76222736 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_LocalScale.y + value: 0.76222736 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_LocalScale.z + value: 0.76222736 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_LocalPosition.x + value: 3.73 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_LocalPosition.y + value: -1.36 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7486750280016786663, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_SortingLayer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -7486750280016786663, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_SortingOrder + value: 18 + objectReference: {fileID: 0} + - target: {fileID: -7486750280016786663, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_SortingLayerID + value: 1134468525 + objectReference: {fileID: 0} + - target: {fileID: -2524845444381665294, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_SortingLayer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -2524845444381665294, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_SortingOrder + value: 15 + objectReference: {fileID: 0} + - target: {fileID: -2524845444381665294, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + propertyPath: m_SortingLayerID + value: 1134468525 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: -2812824633678238534, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + insertIndex: 0 + addedObject: {fileID: 1006909204} + - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + insertIndex: 1 + addedObject: {fileID: 438012755} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 4843985084834002234, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} +--- !u!4 &542753289 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + m_PrefabInstance: {fileID: 542753288} + m_PrefabAsset: {fileID: 0} +--- !u!4 &542753290 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4289677991053106474, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + m_PrefabInstance: {fileID: 542753288} + m_PrefabAsset: {fileID: 0} --- !u!1 &542992025 GameObject: m_ObjectHideFlags: 0 @@ -11319,7 +11610,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 542992026} - - component: {fileID: 542992029} - component: {fileID: 542992028} - component: {fileID: 542992027} m_Layer: 0 @@ -11328,7 +11618,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &542992026 RectTransform: m_ObjectHideFlags: 0 @@ -11338,15 +11628,15 @@ RectTransform: m_GameObject: {fileID: 542992025} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.76222736, y: 0.76222736, z: 0.76222736} + m_LocalScale: {x: 0.79591775, y: 0.79591775, z: 0.79591775} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1652512855} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0.176} - m_SizeDelta: {x: 2.528, y: 2.1929} + m_AnchoredPosition: {x: -2.459, y: -0.01} + m_SizeDelta: {x: 3, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &542992027 MonoBehaviour: @@ -11368,7 +11658,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 7526266596215757039, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11386,58 +11676,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 542992025} m_CullTransparentMesh: 1 ---- !u!212 &542992029 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542992025} - m_Enabled: 0 - 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: 72b0010e1307b614ebb427b0d8dc54ee, 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: 1016946085 - m_SortingLayer: 11 - m_SortingOrder: 10 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!21 &572653911 Material: serializedVersion: 8 @@ -12252,6 +12490,10 @@ MonoBehaviour: - {fileID: 190481521} - {fileID: 9804159} heatmapGameobject: {fileID: 1652512854} + imageToMove: {fileID: 1006909204} + imageToRotate: {fileID: 542753290} + inPos: {x: -33, y: -2, z: 0} + outPos: {x: -24, y: -2, z: 0} --- !u!1 &633823201 GameObject: m_ObjectHideFlags: 0 @@ -16626,6 +16868,111 @@ Transform: - {fileID: 1029182187} m_Father: {fileID: 1428720231} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1006909203 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1006909204} + - component: {fileID: 1006909206} + - component: {fileID: 1006909205} + m_Layer: 0 + m_Name: "\u6E29\u5EA6\u68C0\u6D4B\u4EEA" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1006909204 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1006909203} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0972, y: 1.0972, z: 1.0972} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 542753289} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -5, y: 1.795} + m_SizeDelta: {x: 3.055, y: 3.06} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1006909205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1006909203} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee158225ee1e59f4791627785501d950, type: 3} + m_Name: + m_EditorClassIdentifier: + shaderTypes: 0 + normalStrength: 5 + normalSmoothing: 1 + computingNormal: 0 +--- !u!212 &1006909206 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1006909203} + 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: 72b0010e1307b614ebb427b0d8dc54ee, 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: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 20 + m_Sprite: {fileID: 7526266596215757039, guid: 3a68d10f017010f4dac30cbb656d898c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.055, y: 3.06} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 1 + m_SpriteSortPoint: 0 --- !u!1 &1008884024 GameObject: m_ObjectHideFlags: 0 @@ -19070,7 +19417,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1170503231 RectTransform: m_ObjectHideFlags: 0 @@ -19080,16 +19427,16 @@ RectTransform: m_GameObject: {fileID: 1170503230} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.76222736, y: 0.76222736, z: 0.76222736} + m_LocalScale: {x: 0.8902053, y: 0.8902053, z: 0.8902053} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 253767084} m_Father: {fileID: 1652512855} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: -0.18} - m_SizeDelta: {x: 0, y: 1} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.356, y: -0.789} + m_SizeDelta: {x: 0.75, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1170503232 MonoBehaviour: @@ -21286,11 +21633,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3083274345920604345, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3083274345920604345, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 3083274345920604345, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMin.x @@ -21298,7 +21645,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3083274345920604345, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 3083274345920604345, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_SizeDelta.x @@ -21390,11 +21737,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3083274347384374709, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3083274347384374709, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3083274347384374709, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMin.x @@ -21402,7 +21749,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3083274347384374709, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 3083274347384374710, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_Color.a @@ -24334,6 +24681,249 @@ MonoBehaviour: normalStrength: 5 normalSmoothing: 1 computingNormal: 0 +--- !u!21 &1460443025 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AllIn1SpriteShader/AllIn1SpriteShader + m_Shader: {fileID: 4800000, guid: a36b7719ff0465b42ab1407d67672c5f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _ColorRampTex: + m_Texture: {fileID: 2800000, guid: 279657edc397ece4b8029c727adf6ddc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorRampTexGradient: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorSwapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DistortTex: + m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FadeBurnTex: + m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FadeTex: + m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _GlowTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineDistortTex: + m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 2800000, guid: 74087f6d03f233e4a8a142fa01f9e5cf, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OverlayTex: + m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ShineMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Alpha: 1 + - _AlphaCutoffValue: 0.25 + - _AlphaOutlineBlend: 1 + - _AlphaOutlineGlow: 5 + - _AlphaOutlineMinAlpha: 0 + - _AlphaOutlinePower: 1 + - _AlphaRoundThreshold: 0.5 + - _BillboardY: 0 + - _BlurHD: 0 + - _BlurIntensity: 10 + - _Brightness: 0 + - _ChromAberrAlpha: 0.4 + - _ChromAberrAmount: 1 + - _ClipUvDown: 0 + - _ClipUvLeft: 0 + - _ClipUvRight: 0 + - _ClipUvUp: 0 + - _ColorChangeLuminosity: 0 + - _ColorChangeTolerance: 0.25 + - _ColorChangeTolerance2: 0.25 + - _ColorChangeTolerance3: 0.25 + - _ColorRampBlend: 1 + - _ColorRampLuminosity: 0 + - _ColorRampOutline: 0 + - _ColorSwapBlend: 1 + - _ColorSwapBlueLuminosity: 0.5 + - _ColorSwapGreenLuminosity: 0.5 + - _ColorSwapRedLuminosity: 0.5 + - _Contrast: 1 + - _CullingOption: 0 + - _DistortAmount: 0.5 + - _DistortTexXSpeed: 5 + - _DistortTexYSpeed: 5 + - _EditorDrawers: 6 + - _FadeAmount: -0.1 + - _FadeBurnGlow: 2 + - _FadeBurnTransition: 0.075 + - _FadeBurnWidth: 0.025 + - _FishEyeUvAmount: 0.35 + - _FlickerAlpha: 0 + - _FlickerFreq: 0.2 + - _FlickerPercent: 0.05 + - _GhostBlend: 1 + - _GhostColorBoost: 1 + - _GhostTransparency: 0 + - _GlitchAmount: 3 + - _GlitchSize: 1 + - _Glow: 10 + - _GlowGlobal: 1 + - _GradBlend: 1 + - _GradBoostX: 1.2 + - _GradBoostY: 1.2 + - _GradIsRadial: 0 + - _GrassManualAnim: 1 + - _GrassManualToggle: 0 + - _GrassRadialBend: 0.1 + - _GrassSpeed: 2 + - _GrassWind: 20 + - _GreyscaleBlend: 1 + - _GreyscaleLuminosity: 0 + - _GreyscaleOutline: 0 + - _HandDrawnAmount: 10 + - _HandDrawnSpeed: 5 + - _HitEffectBlend: 1 + - _HitEffectGlow: 5 + - _HologramBlend: 1 + - _HologramMaxAlpha: 0.75 + - _HologramMinAlpha: 0.1 + - _HologramStripesAmount: 0.1 + - _HologramStripesSpeed: 4.5 + - _HologramUnmodAmount: 0 + - _HsvBright: 1 + - _HsvSaturation: 1 + - _HsvShift: 180 + - _InnerOutlineAlpha: 1 + - _InnerOutlineGlow: 4 + - _InnerOutlineThickness: 1 + - _MaxXUV: 1 + - _MaxYUV: 1 + - _MinXUV: 0 + - _MinYUV: 0 + - _MotionBlurAngle: 0.1 + - _MotionBlurDist: 1.25 + - _MyDstMode: 10 + - _MySrcMode: 5 + - _NegativeAmount: 1 + - _OffsetUvX: 0 + - _OffsetUvY: 0 + - _OnlyInnerOutline: 0 + - _OnlyOutline: 0 + - _OutlineAlpha: 1 + - _OutlineDistortAmount: 0.5 + - _OutlineDistortTexXSpeed: 5 + - _OutlineDistortTexYSpeed: 5 + - _OutlineGlow: 1.5 + - _OutlinePixelWidth: 1 + - _OutlineTexXSpeed: 10 + - _OutlineTexYSpeed: 0 + - _OutlineWidth: 0.004 + - _OverlayBlend: 1 + - _OverlayGlow: 1 + - _OverlayTextureScrollXSpeed: 0.25 + - _OverlayTextureScrollYSpeed: 0.25 + - _PinchUvAmount: 0.35 + - _PixelateSize: 32 + - _PosterizeGamma: 0.75 + - _PosterizeNumColors: 8 + - _PosterizeOutline: 0 + - _RadialClip: 45 + - _RadialClip2: 0 + - _RadialStartAngle: 90 + - _RandomSeed: 0 + - _RectSize: 1 + - _RotateUvAmount: 0 + - _RoundWaveSpeed: 2 + - _RoundWaveStrength: 0.7 + - _ShadowAlpha: 0.5 + - _ShadowX: 0.1 + - _ShadowY: -0.05 + - _ShakeUvSpeed: 2.5 + - _ShakeUvX: 1.5 + - _ShakeUvY: 1 + - _ShineGlow: 1 + - _ShineLocation: 0.5 + - _ShineRotate: 0 + - _ShineWidth: 0.1 + - _TextureScrollXSpeed: 1 + - _TextureScrollYSpeed: 0 + - _TwistUvAmount: 1 + - _TwistUvPosX: 0.5 + - _TwistUvPosY: 0.5 + - _TwistUvRadius: 0.75 + - _WarpScale: 0.5 + - _WarpSpeed: 8 + - _WarpStrength: 0.025 + - _WaveAmount: 7 + - _WaveSpeed: 10 + - _WaveStrength: 7.5 + - _WaveX: 0 + - _WaveY: 0.5 + - _ZTestMode: 4 + - _ZWrite: 0 + - _ZoomUvAmount: 0.5 + m_Colors: + - _AlphaOutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorChangeNewCol: {r: 1, g: 1, b: 0, a: 1} + - _ColorChangeNewCol2: {r: 1, g: 1, b: 0, a: 1} + - _ColorChangeNewCol3: {r: 1, g: 1, b: 0, a: 1} + - _ColorChangeTarget: {r: 1, g: 0, b: 0, a: 1} + - _ColorChangeTarget2: {r: 1, g: 0, b: 0, a: 1} + - _ColorChangeTarget3: {r: 1, g: 0, b: 0, a: 1} + - _ColorSwapBlue: {r: 1, g: 1, b: 1, a: 1} + - _ColorSwapGreen: {r: 1, g: 1, b: 1, a: 1} + - _ColorSwapRed: {r: 1, g: 1, b: 1, a: 1} + - _FadeBurnColor: {r: 1, g: 1, b: 0, a: 1} + - _GlowColor: {r: 1, g: 1, b: 1, a: 1} + - _GradBotLeftCol: {r: 0, g: 0, b: 1, a: 1} + - _GradBotRightCol: {r: 0, g: 1, b: 0, a: 1} + - _GradTopLeftCol: {r: 1, g: 0, b: 0, a: 1} + - _GradTopRightCol: {r: 1, g: 1, b: 0, a: 1} + - _GreyscaleTintColor: {r: 1, g: 1, b: 1, a: 1} + - _HitEffectColor: {r: 1, g: 1, b: 1, a: 1} + - _HologramStripeColor: {r: 0, g: 1, b: 1, a: 1} + - _InnerOutlineColor: {r: 1, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _OverlayColor: {r: 1, g: 1, b: 1, a: 1} + - _ShadowColor: {r: 0, g: 0, b: 0, a: 1} + - _ShineColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!1 &1465407176 GameObject: m_ObjectHideFlags: 0 @@ -27903,7 +28493,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1652512855 RectTransform: m_ObjectHideFlags: 0 @@ -27917,13 +28507,14 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1170503231} + - {fileID: 542753289} - {fileID: 542992026} m_Father: {fileID: 320706165} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -32.57, y: -3.58} - m_SizeDelta: {x: 2.5, y: 2.5} + m_AnchoredPosition: {x: -24, y: -2} + m_SizeDelta: {x: 3, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1652512856 MonoBehaviour: @@ -27953,7 +28544,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0.37998462, b: 0.6792453, a: 1} + m_Color: {r: 0, g: 0.37998462, b: 0.6792453, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -36875,6 +37466,9 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 2085860891} m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4070921155132268514, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + insertIndex: -1 + addedObject: {fileID: 6045551082333026155} - targetCorrespondingSourceObject: {fileID: 4445889917739518717, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} insertIndex: -1 addedObject: {fileID: 0} @@ -36890,6 +37484,28 @@ Transform: m_CorrespondingSourceObject: {fileID: 2309837242789316790, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} m_PrefabInstance: {fileID: 6045551082333026152} m_PrefabAsset: {fileID: 0} +--- !u!1 &6045551082333026154 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4070921155132268514, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + m_PrefabInstance: {fileID: 6045551082333026152} + m_PrefabAsset: {fileID: 0} +--- !u!320 &6045551082333026155 +PlayableDirector: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6045551082333026154} + m_Enabled: 1 + serializedVersion: 3 + m_PlayableAsset: {fileID: 0} + m_InitialState: 1 + m_WrapMode: 2 + m_DirectorUpdateMode: 1 + m_InitialTime: 0 + m_SceneBindings: [] + m_ExposedReferences: + m_References: [] --- !u!1001 &7026926953013077400 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 825a32b5c..2ce5b33ab 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -1770,6 +1770,112 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 2001435037} m_PrefabAsset: {fileID: 0} +--- !u!1 &135020137 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 135020138} + - component: {fileID: 135020140} + - component: {fileID: 135020139} + m_Layer: 0 + m_Name: Square + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &135020138 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 135020137} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.01, z: 11.807568} + m_LocalScale: {x: 28.465687, y: 10.257905, z: 10.257905} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 719273461} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &135020139 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 135020137} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!212 &135020140 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 135020137} + m_Enabled: 0 + 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: -495565875 + m_SortingLayer: 14 + m_SortingOrder: 10 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &136152903 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -1914,6 +2020,112 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 145702194} m_CullTransparentMesh: 1 +--- !u!1 &149258300 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 149258301} + - component: {fileID: 149258303} + - component: {fileID: 149258302} + m_Layer: 0 + m_Name: "\u8FDB\u5165\u7EF4\u4FEE\u8499\u592A\u5947b (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &149258301 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 149258300} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.82, y: -7.5, z: 11.807568} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 719273461} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &149258302 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 149258300} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!212 &149258303 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 149258300} + m_Enabled: 0 + 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: -495565875 + m_SortingLayer: 14 + m_SortingOrder: 2 + m_Sprite: {fileID: 4219350562336281573, guid: db89da1c41a5b094d9267dfd2a5ff538, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.9534883, y: 6.409302} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &152335402 PrefabInstance: m_ObjectHideFlags: 0 @@ -6075,7 +6287,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - m_CustomBlends: {fileID: 0} + m_CustomBlends: {fileID: 11400000, guid: 97ddad596c0b5f94e8bb6e86e444a1cc, type: 2} m_CameraCutEvent: m_PersistentCalls: m_Calls: [] @@ -7939,8 +8151,8 @@ MonoBehaviour: - {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} runMode: 2 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} - testTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} - saveFileName: "PeipeiDay1_\u8BB0\u5FC6\u68C0\u67E5" + testTalkSo: {fileID: 11400000, guid: 68a9c1b8c5230454bb9498fd2ab5714b, type: 2} + saveFileName: "PeipeiDay2_\u7B2C\u4E00\u6B21\u53D1\u70ED" --- !u!4 &719228339 Transform: m_ObjectHideFlags: 0 @@ -7956,6 +8168,70 @@ Transform: m_Children: [] m_Father: {fileID: 1009826577} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &719273460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 719273461} + - component: {fileID: 719273462} + m_Layer: 0 + m_Name: ToBodyModule + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &719273461 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 719273460} + 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: 1492146874} + - {fileID: 1445318053} + - {fileID: 149258301} + - {fileID: 1205252467} + - {fileID: 135020138} + m_Father: {fileID: 1317294298} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!320 &719273462 +PlayableDirector: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 719273460} + m_Enabled: 1 + serializedVersion: 3 + m_PlayableAsset: {fileID: 11400000, guid: 6a22dc1e52d77c642996ae783383afeb, type: 2} + m_InitialState: 0 + m_WrapMode: 2 + m_DirectorUpdateMode: 1 + m_InitialTime: 0 + m_SceneBindings: + - key: {fileID: 8749163046677871002, guid: 6a22dc1e52d77c642996ae783383afeb, type: 2} + value: {fileID: 1492146875} + - key: {fileID: -1955702222206797376, guid: 6a22dc1e52d77c642996ae783383afeb, type: 2} + value: {fileID: 1445318054} + - key: {fileID: 3372324610345174019, guid: 6a22dc1e52d77c642996ae783383afeb, type: 2} + value: {fileID: 1205252468} + - key: {fileID: -4861982396524769642, guid: 6a22dc1e52d77c642996ae783383afeb, type: 2} + value: {fileID: 149258302} + - key: {fileID: -2232058861460470490, guid: 6a22dc1e52d77c642996ae783383afeb, type: 2} + value: {fileID: 135020139} + m_ExposedReferences: + m_References: [] --- !u!1 &731599307 GameObject: m_ObjectHideFlags: 0 @@ -10408,6 +10684,7 @@ Transform: - {fileID: 719228339} - {fileID: 40915750} - {fileID: 442870838} + - {fileID: 1317294298} - {fileID: 1620453322} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -11485,6 +11762,112 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1153212192} m_CullTransparentMesh: 1 +--- !u!1 &1205252466 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1205252467} + - component: {fileID: 1205252469} + - component: {fileID: 1205252468} + m_Layer: 0 + m_Name: "\u8FDB\u5165\u7EF4\u4FEE\u8499\u592A\u5947a (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1205252467 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1205252466} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.1334884, y: 6.5, z: 11.807568} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 719273461} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1205252468 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1205252466} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!212 &1205252469 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1205252466} + m_Enabled: 0 + 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: -495565875 + m_SortingLayer: 14 + m_SortingOrder: 1 + m_Sprite: {fileID: -5187601590052369691, guid: db89da1c41a5b094d9267dfd2a5ff538, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.9534883, y: 6.409302} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1209741188 GameObject: m_ObjectHideFlags: 0 @@ -12954,6 +13337,51 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1317294297 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1317294298} + - component: {fileID: 1317294299} + m_Layer: 0 + m_Name: TimelineManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1317294298 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1317294297} + 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: 719273461} + m_Father: {fileID: 1009826577} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1317294299 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1317294297} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ccea65c35014bc24080e71809ed81683, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1337853806 PrefabInstance: m_ObjectHideFlags: 0 @@ -13968,6 +14396,112 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1445318052 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1445318053} + - component: {fileID: 1445318055} + - component: {fileID: 1445318054} + m_Layer: 0 + m_Name: "\u8FDB\u5165\u7EF4\u4FEE\u8499\u592A\u5947c (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1445318053 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1445318052} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 9.773488, y: 6.5, z: 11.807568} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 719273461} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1445318054 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1445318052} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!212 &1445318055 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1445318052} + m_Enabled: 0 + 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: -495565875 + m_SortingLayer: 14 + m_SortingOrder: 3 + m_Sprite: {fileID: 1250384684011561397, guid: db89da1c41a5b094d9267dfd2a5ff538, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.9534883, y: 6.409302} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1450136609 GameObject: m_ObjectHideFlags: 0 @@ -14301,6 +14835,112 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1491364813} m_CullTransparentMesh: 1 +--- !u!1 &1492146873 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1492146874} + - component: {fileID: 1492146876} + - component: {fileID: 1492146875} + m_Layer: 0 + m_Name: "\u9ED1\u8FB9 (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1492146874 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1492146873} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.82, y: -0.34651184, z: 11.807568} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 719273461} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1492146875 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1492146873} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!212 &1492146876 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1492146873} + m_Enabled: 0 + 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: -495565875 + m_SortingLayer: 14 + m_SortingOrder: 4 + m_Sprite: {fileID: -2658279071448061229, guid: db89da1c41a5b094d9267dfd2a5ff538, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 17.860466, y: 12.306976} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1516166493 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/FixSystem/DraggableUI.cs b/Assets/Scripts/FixSystem/DraggableUI.cs index 16b7aa4dc..ca35520eb 100644 --- a/Assets/Scripts/FixSystem/DraggableUI.cs +++ b/Assets/Scripts/FixSystem/DraggableUI.cs @@ -2,21 +2,21 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; -public class DraggableUI : MonoBehaviour,IDragHandler, IPointerDownHandler +public class DraggableUI : MonoBehaviour, IDragHandler, IPointerDownHandler { private RectTransform rectTransform; private Canvas canvas; public RectTransform target; - public GameObject button; - - public bool isDone=false; + public bool isDone = false; + private bool isLocked = false; private void Awake() { rectTransform = GetComponent(); canvas = GetComponentInParent(); + LockDrag(); } public void OnPointerDown(PointerEventData eventData) @@ -24,23 +24,22 @@ public class DraggableUI : MonoBehaviour,IDragHandler, IPointerDownHandler // 这里可以添加按下时的逻辑，比如记录初始位置 } + public void OnDrag(PointerEventData eventData) + { + if (isLocked) return; - public void OnDrag(PointerEventData eventData) - { - Vector3 screenPosition = new Vector3(eventData.position.x, eventData.position.y, - Camera.main.WorldToScreenPoint(transform.position).z); - Vector3 move = Camera.main.ScreenToWorldPoint(screenPosition); - move.z = transform.position.z; - transform.position = move; - //plugSprite.enabled = true; + Vector3 screenPosition = new Vector3(eventData.position.x, eventData.position.y, + Camera.main.WorldToScreenPoint(transform.position).z); + Vector3 move = Camera.main.ScreenToWorldPoint(screenPosition); + move.z = transform.position.z; + transform.position = move; } + void Update() { - // 计算两个物体之间的距离 float distance = Vector3.Distance(transform.position, target.position); - // 检查距离是否在范围内，并激活或禁用 Button - if (distance <= 1&&!isDone) + if (distance <= 1 && !isDone) { button.SetActive(true); } @@ -49,5 +48,14 @@ public class DraggableUI : MonoBehaviour,IDragHandler, IPointerDownHandler button.SetActive(false); } } -} + public void LockDrag() + { + isLocked = true; + } + + public void UnlockDrag() + { + isLocked = false; + } +} \ No newline at end of file diff --git a/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs b/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs index 2edaf5714..2ab06aeaa 100644 --- a/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs +++ b/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs @@ -19,6 +19,14 @@ public class HeatMapController : MonoBehaviour public GameObject heatmapGameobject; + public RectTransform imageToMove; // 需要移动的Image + public Transform imageToRotate; // 需要旋转的Image + public Vector3 inPos; // Heatmap进入位置 + public Vector3 outPos; // Heatmap退出位置 + + + private Vector3 imageInitialPos; // Image的初始位置 + [HideInInspector] private Vector4[] points = new Vector4[7]; // 存储6个点的数组，(x, y, z) = center, w = temperature [HideInInspector] private Vector4[] properties = new Vector4[7]; // 存储6个盒子大小的数组, (x,y) = boxsize @@ -55,11 +63,27 @@ public class HeatMapController : MonoBehaviour public void ShowHeatMap() { - heatmapGameobject.SetActive(true); - heatmapGameobject.GetComponent().isDone = false; + StartCoroutine(ShowHeatMapCoroutine()); } + + private IEnumerator ShowHeatMapCoroutine() + { + // 初始化Heatmap位置 + heatmapGameobject.transform.localPosition = outPos; + heatmapGameobject.SetActive(true); + heatmapGameobject.transform.DOLocalMove(inPos, 1f); + heatmapGameobject.GetComponent().isDone = false; + yield return new WaitForSeconds(1f); // 等待动画完成 + heatmapGameobject.GetComponent().UnlockDrag(); + } + public void HideHeatMap() { + var draggableUI = heatmapGameobject.GetComponent(); + heatmapGameobject.transform.DOLocalMove(outPos, 1f).OnComplete(() => + { + draggableUI.UnlockDrag(); + }); heatmapGameobject.SetActive(false); } @@ -68,29 +92,48 @@ public class HeatMapController : MonoBehaviour StartCoroutine(ReduceValueCoroutine()); } - IEnumerator ReduceValueCoroutine() + IEnumerator ReduceValueCoroutine() { - if (Tempture>=2) + var draggableUI = heatmapGameobject.GetComponent(); + draggableUI.LockDrag(); + + // 存储初始位置 + imageInitialPos = imageToMove.localPosition; + + // 移动和旋转动画 + imageToMove.DOLocalMoveX(imageInitialPos.x + 3.5f, 1f); + var rotationTween = imageToRotate.DORotate(new Vector3(0, 0, 360), 1f, RotateMode.FastBeyond360) + .SetLoops(-1, LoopType.Restart) + .SetEase(Ease.Linear); + + if (Tempture < 2) { - Debug.Log("降温失败"); - heatmapGameobject.GetComponent().isDone = true; - yield return new WaitForSeconds(1); - if(DialogController.Instance!=null) - DialogController.Instance.StartDialogNode("降温失败"); - yield break; + Debug.Log("降温成功"); + float duration = 3.5f; + SetTemptureSmooth(0, duration); + AudioManager.RandomPlayInteraction("cooler_cooling"); + yield return new WaitForSeconds(duration); + rotationTween.Kill(); + imageToRotate.localRotation = Quaternion.identity; + // 恢复初始状态 + imageToMove.DOLocalMove(imageInitialPos, 1f); + yield return new WaitForSeconds(1.5f); + DialogController.Instance.StartDialogNode("降温成功"); + bodyModuleSystem.OnCooling(); } else { - Debug.Log("降温成功"); - heatmapGameobject.GetComponent().isDone = true; - float duration = 2f; - SetTemptureSmooth(0,duration); - AudioManager.RandomPlayInteraction("cooler_cooling"); - yield return new WaitForSeconds(duration); - DialogController.Instance.StartDialogNode("降温成功"); - bodyModuleSystem.OnCooling(); - Debug.Log("Value has reached zero."); + Debug.Log("降温失败"); + yield return new WaitForSeconds(3f); + DialogController.Instance.StartDialogNode("降温失败"); } + + // 停止旋转 + rotationTween.Kill(); + imageToRotate.localRotation = Quaternion.identity; + + // 恢复初始状态 + imageToMove.DOLocalMove(imageInitialPos, 1f); } void Start() { diff --git a/Assets/Scripts/FixSystem/HeatMap/HeatTest.shader b/Assets/Scripts/FixSystem/HeatMap/HeatTest.shader index aaa51327d..e20f10d49 100644 --- a/Assets/Scripts/FixSystem/HeatMap/HeatTest.shader +++ b/Assets/Scripts/FixSystem/HeatMap/HeatTest.shader @@ -198,7 +198,7 @@ fixed4 frag (v2f i) : SV_Target } } - col.a = 0.75; + col.a = 1; return col; } diff --git a/Assets/Scripts/FixSystemNew/FixStateMachine.cs b/Assets/Scripts/FixSystemNew/FixStateMachine.cs index cdf5f9cf4..6f1b71e5a 100644 --- a/Assets/Scripts/FixSystemNew/FixStateMachine.cs +++ b/Assets/Scripts/FixSystemNew/FixStateMachine.cs @@ -105,9 +105,12 @@ namespace AibisDream.FixSystem public IEnumerator Enter() { var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); + // 拔出插头 bodyModuleSystem.ResetPlug(); // 切换相机 + yield return CameraKit.Instance.SwitchCamera(CameraEnum.CoolingMachine); + yield return TimelineManager.Instance.PlayTimeline("ToBodyModule"); yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule); // 开启交互 bodyModuleSystem.EnableSystem(); @@ -276,7 +279,7 @@ namespace AibisDream.FixSystem public IEnumerator Enter() { - float duration = 0.5f; + //float duration = 0.5f; var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); var eyeSystem = FixSystemCenter.SystemDic.Get(); // 先切BodyModule @@ -349,6 +352,7 @@ namespace AibisDream.FixSystem memorySystem.OnExit(); memorySystem.CloseMemoryView(); yield return MainUIController.Instance.FadeOutSync(duration); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule); memorySystem.PullMemoryProjector(); } } diff --git a/Assets/Scripts/Framework/TimelineKit.meta b/Assets/Scripts/Framework/TimelineKit.meta new file mode 100644 index 000000000..2f6beb66e --- /dev/null +++ b/Assets/Scripts/Framework/TimelineKit.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 81a3c7f5c3edcc94e83bef49a64c7183 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Framework/TimelineKit/TimelineManager.cs b/Assets/Scripts/Framework/TimelineKit/TimelineManager.cs new file mode 100644 index 000000000..d95e0dcd7 --- /dev/null +++ b/Assets/Scripts/Framework/TimelineKit/TimelineManager.cs @@ -0,0 +1,111 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Playables; +using Yarn.Unity; + +public class TimelineManager : MonoBehaviour +{ + public static TimelineManager Instance { get; private set; } + + // 使用字典来管理多个PlayableDirector + private Dictionary directors = new Dictionary(); + + private void Awake() + { + if (Instance == null) + { + Instance = this; + DontDestroyOnLoad(gameObject); // 不销毁 + } + else + { + Destroy(gameObject); + return; + } + + // 自动注册所有子对象中的PlayableDirector + RegisterAllDirectors(); + } + + /// + /// 自动注册所有子对象中的PlayableDirector + /// + private void RegisterAllDirectors() + { + var allDirectors = GetComponentsInChildren(); + foreach (var director in allDirectors) + { + if (director.playableAsset != null) + { + RegisterDirector(director.playableAsset.name, director); + } + } + } + + /// + /// 注册PlayableDirector + /// + /// Timeline的名称 + /// PlayableDirector实例 + public void RegisterDirector(string name, PlayableDirector director) + { + if (!directors.ContainsKey(name)) + { + directors.Add(name, director); + Debug.Log($"Registered PlayableDirector for {name}"); + } + } + + /// + /// 播放指定的Timeline并等待其完成 + /// + /// Timeline的名称 + [YarnCommand("play_timeline")] + public IEnumerator PlayTimeline(string name) + { + if (directors.TryGetValue(name, out var director)) + { + director.Play(); + Debug.Log($"Timeline {name} playing."); + + // 等待Timeline播放完成 + bool isPlaying = true; + director.stopped += (PlayableDirector aDirector) => { isPlaying = false; }; + + while (isPlaying) + { + yield return null; + } + + Debug.Log($"Timeline {name} finished."); + + // 重置PlayableDirector的状态 + director.time = 0; + director.Evaluate(); // 评估以应用时间重置 + director.Stop(); + } + else + { + Debug.LogError($"PlayableDirector for {name} not found."); + } + } + + /// + /// 暂停指定的Timeline + /// + /// Timeline的名称 + [YarnCommand("pause_timeline")] + public void PauseTimeline(string name) + { + if (directors.TryGetValue(name, out var director)) + { + director.Pause(); + Debug.Log($"Timeline {name} paused."); + } + else + { + Debug.LogError($"PlayableDirector for {name} not found."); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Framework/TimelineKit/TimelineManager.cs.meta b/Assets/Scripts/Framework/TimelineKit/TimelineManager.cs.meta new file mode 100644 index 000000000..2fb50fe13 --- /dev/null +++ b/Assets/Scripts/Framework/TimelineKit/TimelineManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ccea65c35014bc24080e71809ed81683 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/finishCut.signal b/Assets/Signal/finishCut.signal similarity index 100% rename from Assets/finishCut.signal rename to Assets/Signal/finishCut.signal diff --git a/Assets/finishCut.signal.meta b/Assets/Signal/finishCut.signal.meta similarity index 100% rename from Assets/finishCut.signal.meta rename to Assets/Signal/finishCut.signal.meta