From 30ca85748d8d88f0f62f354dcac2e736e2fb8aa8 Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Sat, 22 Feb 2025 01:37:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=94=E6=B3=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/RawResources/Art/维修界面UI.psd | 4 +- Assets/RawResources/Art/维修界面UI.psd.meta | 43 +- Assets/RawResources/齿轮/场外气泡1.png | 3 + Assets/RawResources/齿轮/场外气泡1.png.meta | 153 ++++++ Assets/RawResources/齿轮/场外气泡2.png | 3 + Assets/RawResources/齿轮/场外气泡2.png.meta | 153 ++++++ Assets/RawResources/齿轮/矩形 1.png | 3 + Assets/RawResources/齿轮/矩形 1.png.meta | 153 ++++++ Assets/Render/Renderer2Dtest.asset | 22 +- Assets/Resources/Materials/MemoryForFade.mat | 2 +- .../WenQuanYi Bitmap Song 14px SDF.asset | 4 +- Assets/Resources/Prefabs/UI/Aside Text.prefab | 347 ++++++++++++ .../Prefabs/UI/Aside Text.prefab.meta | 7 + .../Resources/Prefabs/UI/Bubble Left.prefab | 347 ++++++++++++ .../Prefabs/UI/Bubble Left.prefab.meta | 7 + .../Resources/Prefabs/UI/Bubble Right.prefab | 347 ++++++++++++ .../Prefabs/UI/Bubble Right.prefab.meta | 7 + .../UI/{Bubble.prefab => Old Bubble.prefab} | 20 +- ...ble.prefab.meta => Old Bubble.prefab.meta} | 0 .../Resources/Yarn/FP_Day1_mid/Day1_mid.yarn | 10 +- .../Yarn/FP_Day1_night/Day1_night.yarn | 4 +- .../Resources/Yarn/FP_Day2_mid/Day2_mid.yarn | 4 +- .../Yarn/FP_Day2_night/Day2_night.yarn | 4 +- .../Resources/Yarn/FP_Day3_mid/Day3_mid.yarn | 6 +- Assets/Scenes/ClinicOut.unity | 499 ++++++++++++++++- Assets/Scenes/ExpressFixScene.unity | 2 +- Assets/Scenes/Persistence.unity | 6 +- Assets/Scenes/SkyBridge.unity | 501 +++++++++++++++++- .../Screen System/ScreenSystem.cs | 2 +- .../UI/DialogUI/DialogCanvasManager.cs | 1 + Assets/Scripts/UI/DialogUI/TextBubble.cs | 53 ++ Assets/Scripts/UI/DialogUI/TextBubble.cs.meta | 11 + Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs | 142 +++++ .../UI/DialogUI/TextBubbleGroup.cs.meta | 3 + Assets/Scripts/Utility/CommonUtil.cs | 45 ++ Assets/StreamingAssets/Config/character.csv | 6 +- 36 files changed, 2859 insertions(+), 65 deletions(-) create mode 100644 Assets/RawResources/齿轮/场外气泡1.png create mode 100644 Assets/RawResources/齿轮/场外气泡1.png.meta create mode 100644 Assets/RawResources/齿轮/场外气泡2.png create mode 100644 Assets/RawResources/齿轮/场外气泡2.png.meta create mode 100644 Assets/RawResources/齿轮/矩形 1.png create mode 100644 Assets/RawResources/齿轮/矩形 1.png.meta create mode 100644 Assets/Resources/Prefabs/UI/Aside Text.prefab create mode 100644 Assets/Resources/Prefabs/UI/Aside Text.prefab.meta create mode 100644 Assets/Resources/Prefabs/UI/Bubble Left.prefab create mode 100644 Assets/Resources/Prefabs/UI/Bubble Left.prefab.meta create mode 100644 Assets/Resources/Prefabs/UI/Bubble Right.prefab create mode 100644 Assets/Resources/Prefabs/UI/Bubble Right.prefab.meta rename Assets/Resources/Prefabs/UI/{Bubble.prefab => Old Bubble.prefab} (96%) rename Assets/Resources/Prefabs/UI/{Bubble.prefab.meta => Old Bubble.prefab.meta} (100%) create mode 100644 Assets/Scripts/UI/DialogUI/TextBubble.cs create mode 100644 Assets/Scripts/UI/DialogUI/TextBubble.cs.meta create mode 100644 Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs create mode 100644 Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs.meta diff --git a/Assets/RawResources/Art/维修界面UI.psd b/Assets/RawResources/Art/维修界面UI.psd index 446376b97..592b6420a 100644 --- a/Assets/RawResources/Art/维修界面UI.psd +++ b/Assets/RawResources/Art/维修界面UI.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e0418035da775d71b8ad03bca96d9e9aeddcc13b3d222acb4ca12e913868fd0 -size 7915850 +oid sha256:d2afeda6c4b2b45208a139ff19bb7cbd82303e1f1326ae5ed4a64e9ebecaea7a +size 7896209 diff --git a/Assets/RawResources/Art/维修界面UI.psd.meta b/Assets/RawResources/Art/维修界面UI.psd.meta index ddf148221..ebd1997ba 100644 --- a/Assets/RawResources/Art/维修界面UI.psd.meta +++ b/Assets/RawResources/Art/维修界面UI.psd.meta @@ -99,6 +99,27 @@ ScriptedImporter: spritePosition: {x: 0, y: 0} mosaicSpriteImportData: [] rigSpriteImportData: + - name: "\u77E9\u5F62 1" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1551 + y: 2172 + width: 2031 + height: 121 + spriteID: 6e6a3e7411e18674997c8735b867dd87 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1549, y: 2171} + spritePosition: {x: 1037, y: 284} - name: "\u56FE\u50CF\u5C4F\u5E55" originalName: pivot: {x: 0.5, y: 0.5} @@ -340,6 +361,16 @@ ScriptedImporter: resliceFromLayer: 1 mosaicPSDLayers: [] rigPSDLayers: + - name: "\u77E9\u5F62 1" + spriteName: "\u77E9\u5F62 1" + isGroup: 0 + parentIndex: -1 + spriteID: 6e6a3e7411e18674997c8735b867dd87 + layerID: 25 + mosaicPosition: {x: 1551, y: 2172} + flatten: 0 + isImported: 1 + isVisible: 1 - name: "\u56FA\u5B9A\u5C4F\u5E55" spriteName: isGroup: 1 @@ -353,7 +384,7 @@ ScriptedImporter: - name: "\u56FE\u50CF\u5C4F\u5E55" spriteName: "\u56FE\u50CF\u5C4F\u5E55" isGroup: 0 - parentIndex: 0 + parentIndex: 1 spriteID: ce2217142cd572e4bab9a2187f094ed3 layerID: 10 mosaicPosition: {x: 4, y: 5022} @@ -363,7 +394,7 @@ ScriptedImporter: - name: "\u56FE\u50CF\u9762\u677F" spriteName: "\u56FE\u50CF\u9762\u677F" isGroup: 0 - parentIndex: 0 + parentIndex: 1 spriteID: 4063b4528a43d694aa07546adfef049d layerID: 9 mosaicPosition: {x: 4, y: 2172} @@ -383,7 +414,7 @@ ScriptedImporter: - name: "\u8F74\u627F\u5916\u58F3" spriteName: "\u8F74\u627F\u5916\u58F3" isGroup: 0 - parentIndex: 3 + parentIndex: 4 spriteID: 2b79b23e22bec4e43bc5bb20cff130f2 layerID: 6 mosaicPosition: {x: 4, y: 6898} @@ -393,7 +424,7 @@ ScriptedImporter: - name: "\u8F74" spriteName: "\u8F74" isGroup: 0 - parentIndex: 3 + parentIndex: 4 spriteID: 58d37c257f17ef0468d4723d46e07ab9 layerID: 5 mosaicPosition: {x: 1016, y: 5022} @@ -413,7 +444,7 @@ ScriptedImporter: - name: "\u6587\u5B57\u5C4F\u5E55 " spriteName: "\u6587\u5B57\u5C4F\u5E55 " isGroup: 0 - parentIndex: 6 + parentIndex: 7 spriteID: f1f6b7aa86735064babc8ffbc63c6a52 layerID: 19 mosaicPosition: {x: 4, y: 5960} @@ -423,7 +454,7 @@ ScriptedImporter: - name: "\u6587\u5B57\u9762\u677F" spriteName: "\u6587\u5B57\u9762\u677F" isGroup: 0 - parentIndex: 6 + parentIndex: 7 spriteID: 794f4c3d9e6226244866d694f3e9e472 layerID: 14 mosaicPosition: {x: 4, y: 3597} diff --git a/Assets/RawResources/齿轮/场外气泡1.png b/Assets/RawResources/齿轮/场外气泡1.png new file mode 100644 index 000000000..5e59ab840 --- /dev/null +++ b/Assets/RawResources/齿轮/场外气泡1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4d26707fe36811ea3212bc4f1ab951702aa6c517249a3e9d62b8140a5536110 +size 1964 diff --git a/Assets/RawResources/齿轮/场外气泡1.png.meta b/Assets/RawResources/齿轮/场外气泡1.png.meta new file mode 100644 index 000000000..082dc67d2 --- /dev/null +++ b/Assets/RawResources/齿轮/场外气泡1.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 10d4856e2d2a65f449e90197f502ca30 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 215 + spriteBorder: {x: 67, y: 63, z: 18, w: 11} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/齿轮/场外气泡2.png b/Assets/RawResources/齿轮/场外气泡2.png new file mode 100644 index 000000000..d2bf8b4b1 --- /dev/null +++ b/Assets/RawResources/齿轮/场外气泡2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a57e8db201b21b11a984b88b3fb2abee12d76a6e7ec33637437bc5aa150a8053 +size 2151 diff --git a/Assets/RawResources/齿轮/场外气泡2.png.meta b/Assets/RawResources/齿轮/场外气泡2.png.meta new file mode 100644 index 000000000..c4e248094 --- /dev/null +++ b/Assets/RawResources/齿轮/场外气泡2.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 79e04f9b22fb71d4c8009e561c6e2849 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 215 + spriteBorder: {x: 19, y: 59, z: 67, w: 13} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RawResources/齿轮/矩形 1.png b/Assets/RawResources/齿轮/矩形 1.png new file mode 100644 index 000000000..5451ef619 --- /dev/null +++ b/Assets/RawResources/齿轮/矩形 1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f68ff138e38c1426096b40c22d5e08bd51c031c51132903a003e01b5046dfd72 +size 4298 diff --git a/Assets/RawResources/齿轮/矩形 1.png.meta b/Assets/RawResources/齿轮/矩形 1.png.meta new file mode 100644 index 000000000..359929ddb --- /dev/null +++ b/Assets/RawResources/齿轮/矩形 1.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: d71374f9cb887f74aa77083c28f0f3b5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 215 + spriteBorder: {x: 20, y: 10, z: 20, w: 10} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Render/Renderer2Dtest.asset b/Assets/Render/Renderer2Dtest.asset index d3df27388..9bebfac1e 100644 --- a/Assets/Render/Renderer2Dtest.asset +++ b/Assets/Render/Renderer2Dtest.asset @@ -1053,19 +1053,15 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 _filter: - - 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 + - 0.007228916 + - 0.043749984 + - 0.12409639 + - 0.20444278 + - 0.24096388 + - 0.20444278 + - 0.12409639 + - 0.043749984 + - 0.007228916 --- !u!114 &-6086986437317696584 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/Resources/Materials/MemoryForFade.mat b/Assets/Resources/Materials/MemoryForFade.mat index 9e7b05c7e..0659b3043 100644 --- a/Assets/Resources/Materials/MemoryForFade.mat +++ b/Assets/Resources/Materials/MemoryForFade.mat @@ -165,7 +165,7 @@ Material: - _DirectionalAlphaFadeNoiseFactor: 0.2 - _DirectionalAlphaFadeRotation: 0 - _DirectionalAlphaFadeWidth: 0.2 - - _DirectionalDistortionFade: 0 + - _DirectionalDistortionFade: -15 - _DirectionalDistortionInvert: 1 - _DirectionalDistortionNoiseFactor: 0.2 - _DirectionalDistortionRandomDirection: 0.1 diff --git a/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset b/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset index 61f6f42e7..a181b3d17 100644 --- a/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset +++ b/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d96d80247e2a4ce29f214ae1cfbaebc02b7062368d9b4bab8d4867a718d0f494 -size 70553912 +oid sha256:a1fd6dc0a3d784fd6f415ee73f9f0bff3f708daf793dfa892088cf5cb782e863 +size 70553882 diff --git a/Assets/Resources/Prefabs/UI/Aside Text.prefab b/Assets/Resources/Prefabs/UI/Aside Text.prefab new file mode 100644 index 000000000..e9460f954 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Aside Text.prefab @@ -0,0 +1,347 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &636000980267337347 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7131805321628290712} + - component: {fileID: 7358390236059354160} + - component: {fileID: 4885774530129593635} + - component: {fileID: 976084703594307224} + - component: {fileID: 6998093250223179302} + - component: {fileID: 2069893582614801070} + m_Layer: 0 + m_Name: Aside Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7131805321628290712 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636000980267337347} + 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: 5427574618981766466} + m_Father: {fileID: 0} + 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: -410.7} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7358390236059354160 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636000980267337347} + m_CullTransparentMesh: 1 +--- !u!114 &4885774530129593635 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636000980267337347} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 20 + m_Right: 20 + m_Top: 10 + m_Bottom: 10 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &976084703594307224 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636000980267337347} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &6998093250223179302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636000980267337347} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d97efe2567012354e9482f0774e66b76, type: 3} + m_Name: + m_EditorClassIdentifier: + role: 0 + maxCharNum: 27 +--- !u!114 &2069893582614801070 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636000980267337347} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.7137255} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d71374f9cb887f74aa77083c28f0f3b5, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3663279889698756716 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5427574618981766466} + - component: {fileID: 155457522474296090} + - component: {fileID: 6575815863077080064} + - component: {fileID: 3684216874607031351} + - component: {fileID: 1336326449354403086} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5427574618981766466 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3663279889698756716} + 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: 7131805321628290712} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 1.0000002, y: 0.5} +--- !u!222 &155457522474296090 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3663279889698756716} + m_CullTransparentMesh: 1 +--- !u!114 &6575815863077080064 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3663279889698756716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u793A\u4F8B\u6587\u5B57\u793A\u4F8B\u6587" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 5 + m_wordSpacing: 0 + m_lineSpacing: 10 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &3684216874607031351 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3663279889698756716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e8ace8ced0e81c847968cdca0aeda757, type: 3} + m_Name: + m_EditorClassIdentifier: + typewriterStartsAutomatically: 0 + animationLoop: 0 + timeScale: 0 + _text: "\u793A\u4F8B\u6587\u5B57\u793A\u4F8B\u6587\u5B57\u793A\u4F8B\u6587\u5B57\n\u793A\u4F8B\u6587\u5B57\u793A\u4F8B\u6587\u5B57\u793A\u4F8B\u6587\u5B57" + useDynamicScaling: 1 + referenceFontSize: 10 + isResettingTimeOnNewText: 1 + useDefaultDatabases: 1 + databaseBehaviors: {fileID: 11400000, guid: ab7e07cba198f4345b19d351e6a3034f, type: 2} + databaseAppearances: {fileID: 11400000, guid: 71ecf6147756deb4ca20570628f94f96, type: 2} + useDefaultStyleSheet: 1 + styleSheet: {fileID: 0} + databaseActions: {fileID: 11400000, guid: de78232a60d74f6459e57e5606304209, type: 2} + defaultAppearancesTags: + - fade + defaultDisappearancesTags: + - fade + defaultBehaviorsTags: [] + defaultTagsMode: 0 +--- !u!114 &1336326449354403086 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3663279889698756716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 57a6945b90dcd0c4b81619c0d8b5c283, type: 3} + m_Name: + m_EditorClassIdentifier: + useTypeWriter: 1 + startTypewriterMode: 3 + hideAppearancesOnSkip: 0 + hideDisappearancesOnSkip: 0 + triggerEventsOnSkip: 0 + resetTypingSpeedAtStartup: 1 + disappearanceOrientation: 0 + triggerShowedAfterEffectsEnd: 0 + triggerDisappearedAfterEffectsEnd: 0 + onTextShowed: + m_PersistentCalls: + m_Calls: [] + onTypewriterStart: + m_PersistentCalls: + m_Calls: [] + onTextDisappeared: + m_PersistentCalls: + m_Calls: [] + onCharacterVisible: + m_PersistentCalls: + m_Calls: [] + onMessage: + m_PersistentCalls: + m_Calls: [] + waitForNormalChars: 0.03 + waitLong: 0.6 + waitMiddle: 0.2 + avoidMultiplePunctuationWait: 0 + waitForNewLines: 1 + waitForLastCharacter: 1 + useTypewriterWaitForDisappearances: 1 + disappearanceWaitTime: 0.015 + disappearanceSpeedMultiplier: 1 diff --git a/Assets/Resources/Prefabs/UI/Aside Text.prefab.meta b/Assets/Resources/Prefabs/UI/Aside Text.prefab.meta new file mode 100644 index 000000000..7e1bdfbff --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Aside Text.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f2461bca3b627ae4a88d010a5d86786a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Bubble Left.prefab b/Assets/Resources/Prefabs/UI/Bubble Left.prefab new file mode 100644 index 000000000..5ff084c8f --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Bubble Left.prefab @@ -0,0 +1,347 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4266339626480639172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4336017121026145511} + - component: {fileID: 4416548178251148154} + - component: {fileID: 5476282360557458710} + - component: {fileID: 4483543465212823168} + - component: {fileID: 7894693401603114512} + - component: {fileID: 8749375209308270703} + m_Layer: 0 + m_Name: Bubble Left + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4336017121026145511 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4266339626480639172} + 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: 5946440465696624735} + m_Father: {fileID: 0} + 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.000038146973, y: -0.0000076293945} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 1, y: 0} +--- !u!222 &4416548178251148154 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4266339626480639172} + m_CullTransparentMesh: 1 +--- !u!114 &5476282360557458710 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4266339626480639172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 79e04f9b22fb71d4c8009e561c6e2849, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4483543465212823168 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4266339626480639172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 30 + m_Right: 45 + m_Top: 30 + m_Bottom: 50 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &7894693401603114512 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4266339626480639172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &8749375209308270703 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4266339626480639172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d97efe2567012354e9482f0774e66b76, type: 3} + m_Name: + m_EditorClassIdentifier: + role: 2 + maxCharNum: 14 +--- !u!1 &6816142221905378472 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5946440465696624735} + - component: {fileID: 8342286320321982617} + - component: {fileID: 7169781614477738915} + - component: {fileID: 7510624018743839707} + - component: {fileID: 2267608901098016527} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5946440465696624735 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6816142221905378472} + 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: 4336017121026145511} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 1.0000002, y: 0.5} +--- !u!222 &8342286320321982617 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6816142221905378472} + m_CullTransparentMesh: 1 +--- !u!114 &7169781614477738915 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6816142221905378472} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u793A\u4F8B\u6587\u5B57" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 5 + m_wordSpacing: 0 + m_lineSpacing: 10 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &7510624018743839707 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6816142221905378472} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e8ace8ced0e81c847968cdca0aeda757, type: 3} + m_Name: + m_EditorClassIdentifier: + typewriterStartsAutomatically: 0 + animationLoop: 0 + timeScale: 0 + _text: "\u793A\u4F8B\u6587\u5B57\u793A\u4F8B\u6587\u5B57\u793A\u4F8B\u6587\u5B57\n\u793A\u4F8B\u6587\u5B57\u793A\u4F8B\u6587\u5B57\u793A\u4F8B\u6587\u5B57" + useDynamicScaling: 1 + referenceFontSize: 10 + isResettingTimeOnNewText: 1 + useDefaultDatabases: 1 + databaseBehaviors: {fileID: 11400000, guid: ab7e07cba198f4345b19d351e6a3034f, type: 2} + databaseAppearances: {fileID: 11400000, guid: 71ecf6147756deb4ca20570628f94f96, type: 2} + useDefaultStyleSheet: 1 + styleSheet: {fileID: 0} + databaseActions: {fileID: 11400000, guid: de78232a60d74f6459e57e5606304209, type: 2} + defaultAppearancesTags: + - fade + defaultDisappearancesTags: + - fade + defaultBehaviorsTags: [] + defaultTagsMode: 0 +--- !u!114 &2267608901098016527 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6816142221905378472} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 57a6945b90dcd0c4b81619c0d8b5c283, type: 3} + m_Name: + m_EditorClassIdentifier: + useTypeWriter: 1 + startTypewriterMode: 3 + hideAppearancesOnSkip: 0 + hideDisappearancesOnSkip: 0 + triggerEventsOnSkip: 0 + resetTypingSpeedAtStartup: 1 + disappearanceOrientation: 0 + triggerShowedAfterEffectsEnd: 0 + triggerDisappearedAfterEffectsEnd: 0 + onTextShowed: + m_PersistentCalls: + m_Calls: [] + onTypewriterStart: + m_PersistentCalls: + m_Calls: [] + onTextDisappeared: + m_PersistentCalls: + m_Calls: [] + onCharacterVisible: + m_PersistentCalls: + m_Calls: [] + onMessage: + m_PersistentCalls: + m_Calls: [] + waitForNormalChars: 0.03 + waitLong: 0.6 + waitMiddle: 0.2 + avoidMultiplePunctuationWait: 0 + waitForNewLines: 1 + waitForLastCharacter: 1 + useTypewriterWaitForDisappearances: 1 + disappearanceWaitTime: 0.015 + disappearanceSpeedMultiplier: 1 diff --git a/Assets/Resources/Prefabs/UI/Bubble Left.prefab.meta b/Assets/Resources/Prefabs/UI/Bubble Left.prefab.meta new file mode 100644 index 000000000..0f1bef44e --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Bubble Left.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6b054c2700ea05541a8a6e6088636183 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Bubble Right.prefab b/Assets/Resources/Prefabs/UI/Bubble Right.prefab new file mode 100644 index 000000000..38eb689c2 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Bubble Right.prefab @@ -0,0 +1,347 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &919715082008267532 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3600946623263556837} + - component: {fileID: 1823907582874377734} + - component: {fileID: 346924832956287327} + - component: {fileID: 5703038747030166026} + - component: {fileID: 4712901011866528258} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3600946623263556837 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 919715082008267532} + 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: 8301362509965583806} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 1.0000002, y: 0.5} +--- !u!222 &1823907582874377734 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 919715082008267532} + m_CullTransparentMesh: 1 +--- !u!114 &346924832956287327 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 919715082008267532} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u793A\u4F8B\u6587\u5B57" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 5 + m_wordSpacing: 0 + m_lineSpacing: 10 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &5703038747030166026 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 919715082008267532} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e8ace8ced0e81c847968cdca0aeda757, type: 3} + m_Name: + m_EditorClassIdentifier: + typewriterStartsAutomatically: 0 + animationLoop: 0 + timeScale: 0 + _text: "\u793A\u4F8B\u6587\u5B57\u793A\u4F8B\u6587\u5B57\u793A\u4F8B\u6587\u5B57\n\u793A\u4F8B\u6587\u5B57\u793A\u4F8B\u6587\u5B57\u793A\u4F8B\u6587\u5B57" + useDynamicScaling: 1 + referenceFontSize: 10 + isResettingTimeOnNewText: 1 + useDefaultDatabases: 1 + databaseBehaviors: {fileID: 11400000, guid: ab7e07cba198f4345b19d351e6a3034f, type: 2} + databaseAppearances: {fileID: 11400000, guid: 71ecf6147756deb4ca20570628f94f96, type: 2} + useDefaultStyleSheet: 1 + styleSheet: {fileID: 0} + databaseActions: {fileID: 11400000, guid: de78232a60d74f6459e57e5606304209, type: 2} + defaultAppearancesTags: + - fade + defaultDisappearancesTags: + - fade + defaultBehaviorsTags: [] + defaultTagsMode: 0 +--- !u!114 &4712901011866528258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 919715082008267532} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 57a6945b90dcd0c4b81619c0d8b5c283, type: 3} + m_Name: + m_EditorClassIdentifier: + useTypeWriter: 1 + startTypewriterMode: 3 + hideAppearancesOnSkip: 0 + hideDisappearancesOnSkip: 0 + triggerEventsOnSkip: 0 + resetTypingSpeedAtStartup: 1 + disappearanceOrientation: 0 + triggerShowedAfterEffectsEnd: 0 + triggerDisappearedAfterEffectsEnd: 0 + onTextShowed: + m_PersistentCalls: + m_Calls: [] + onTypewriterStart: + m_PersistentCalls: + m_Calls: [] + onTextDisappeared: + m_PersistentCalls: + m_Calls: [] + onCharacterVisible: + m_PersistentCalls: + m_Calls: [] + onMessage: + m_PersistentCalls: + m_Calls: [] + waitForNormalChars: 0.03 + waitLong: 0.6 + waitMiddle: 0.2 + avoidMultiplePunctuationWait: 0 + waitForNewLines: 1 + waitForLastCharacter: 1 + useTypewriterWaitForDisappearances: 1 + disappearanceWaitTime: 0.015 + disappearanceSpeedMultiplier: 1 +--- !u!1 &3878580226911155808 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8301362509965583806} + - component: {fileID: 5197848310989299629} + - component: {fileID: 1003674434464858882} + - component: {fileID: 4875506132961310160} + - component: {fileID: 8128744769141486596} + - component: {fileID: 3191636764436914976} + m_Layer: 0 + m_Name: Bubble Right + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8301362509965583806 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3878580226911155808} + 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: 3600946623263556837} + m_Father: {fileID: 0} + 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.000038146973, y: -0.0000076293945} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!222 &5197848310989299629 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3878580226911155808} + m_CullTransparentMesh: 1 +--- !u!114 &1003674434464858882 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3878580226911155808} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 10d4856e2d2a65f449e90197f502ca30, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4875506132961310160 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3878580226911155808} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 45 + m_Right: 30 + m_Top: 30 + m_Bottom: 50 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &8128744769141486596 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3878580226911155808} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &3191636764436914976 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3878580226911155808} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d97efe2567012354e9482f0774e66b76, type: 3} + m_Name: + m_EditorClassIdentifier: + role: 1 + maxCharNum: 14 diff --git a/Assets/Resources/Prefabs/UI/Bubble Right.prefab.meta b/Assets/Resources/Prefabs/UI/Bubble Right.prefab.meta new file mode 100644 index 000000000..d4a0a8276 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Bubble Right.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 69ad0ddb052b20c4a9d8df6bb524f2d4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Bubble.prefab b/Assets/Resources/Prefabs/UI/Old Bubble.prefab similarity index 96% rename from Assets/Resources/Prefabs/UI/Bubble.prefab rename to Assets/Resources/Prefabs/UI/Old Bubble.prefab index feaf94b31..7164de3d9 100644 --- a/Assets/Resources/Prefabs/UI/Bubble.prefab +++ b/Assets/Resources/Prefabs/UI/Old Bubble.prefab @@ -395,6 +395,8 @@ MonoBehaviour: triggerEventsOnSkip: 0 resetTypingSpeedAtStartup: 1 disappearanceOrientation: 0 + triggerShowedAfterEffectsEnd: 0 + triggerDisappearedAfterEffectsEnd: 0 onTextShowed: m_PersistentCalls: m_Calls: [] @@ -413,7 +415,7 @@ MonoBehaviour: waitForNormalChars: 0.1 waitLong: 0.6 waitMiddle: 0.2 - avoidMultiplePunctuactionWait: 0 + avoidMultiplePunctuationWait: 0 waitForNewLines: 1 waitForLastCharacter: 1 useTypewriterWaitForDisappearances: 1 @@ -430,9 +432,8 @@ GameObject: - component: {fileID: 2114528386511579871} - component: {fileID: 9109024175080783090} - component: {fileID: 7036814853636706666} - - component: {fileID: 1577716708503439262} m_Layer: 5 - m_Name: Bubble + m_Name: Old Bubble m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -498,16 +499,3 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &1577716708503439262 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8518890624210964847} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d43fa24173f81ea4ea102be91896826e, type: 3} - m_Name: - m_EditorClassIdentifier: - delayTime: 300 diff --git a/Assets/Resources/Prefabs/UI/Bubble.prefab.meta b/Assets/Resources/Prefabs/UI/Old Bubble.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Bubble.prefab.meta rename to Assets/Resources/Prefabs/UI/Old Bubble.prefab.meta diff --git a/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn b/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn index 3a20f4ed0..5ba80ac4e 100644 --- a/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn +++ b/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn @@ -15,7 +15,7 @@ position: 205,-53 <> <> <> -->点火 +->CenterOption: 点火 <> <> me: 呼… @@ -49,20 +49,20 @@ me: 你不是要回去工作吗？ peipei: 你喜欢冬天吗？ <> -->喜欢 +->CenterOption:喜欢 me: 我不知道…我应该是喜欢的。 佩佩依旧抬着头，树叶从她的面前飘落。 peipei: 我以为我也…
但我意识到我好像更喜欢夏天。 peipei: 或者说…我不舍得它的结束。 peipei: 可惜再漫长的季节都会结束。 -->讨厌 +->CenterOption:讨厌 <> <> me: 我讨厌冬天。 佩佩依旧抬着头，树叶从她的面前飘落。 peipei: 你也能感受到，对吗？ peipei: 它们都在死去。 -->没意义 +->CenterOption:没意义 me: 我们是机体，季节对我们来说没有意义。 佩佩依旧抬着头，树叶从她的面前飘落。 peipei: 对啊，我们是机体。 @@ -107,7 +107,7 @@ peipei: 再见了，叶子。 <> 吸完最后一口烟，你长舒一口气。 -->回到诊室 +->CenterOption: 回到诊室 <> <> <> diff --git a/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn b/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn index f90974fc2..7407ffa95 100644 --- a/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn +++ b/Assets/Resources/Yarn/FP_Day1_night/Day1_night.yarn @@ -9,7 +9,7 @@ position: 205,-53 <> <> me: 时候不早了… -->前往电车站 +->CenterOption: 前往电车站 <> <> <> @@ -28,7 +28,7 @@ me: 时候不早了… 你看向窗外，窗外是密密麻麻的高楼大厦。 你知道那里面住着数不尽的机体，像一座巨大的蜂巢。 -->结束一天 +->CenterOption: 结束一天 <> <> <> diff --git a/Assets/Resources/Yarn/FP_Day2_mid/Day2_mid.yarn b/Assets/Resources/Yarn/FP_Day2_mid/Day2_mid.yarn index c6affb434..06bc3d6cd 100644 --- a/Assets/Resources/Yarn/FP_Day2_mid/Day2_mid.yarn +++ b/Assets/Resources/Yarn/FP_Day2_mid/Day2_mid.yarn @@ -10,13 +10,13 @@ position: 205,-53 <> <> me: （轻哼）小鸟...小鸟…… -->点火 +->CenterOption: 点火 <> <> me: …… <> <> -->回到诊室 +->CenterOption: 回到诊室 <> <> <> diff --git a/Assets/Resources/Yarn/FP_Day2_night/Day2_night.yarn b/Assets/Resources/Yarn/FP_Day2_night/Day2_night.yarn index 0884750b3..a005f4fa2 100644 --- a/Assets/Resources/Yarn/FP_Day2_night/Day2_night.yarn +++ b/Assets/Resources/Yarn/FP_Day2_night/Day2_night.yarn @@ -17,7 +17,7 @@ me: …… //或许是因为季节的变化，或许是因为别的什么。 <> <> -->点火 +->CenterOption:点火 <> <> me: 呼… @@ -69,7 +69,7 @@ peipei: 一会…一会见。 你目视她离开，吸完最后一口烟，长舒一口气。 <> <> -->回诊室 +->CenterOption:回诊室 <> <> <> diff --git a/Assets/Resources/Yarn/FP_Day3_mid/Day3_mid.yarn b/Assets/Resources/Yarn/FP_Day3_mid/Day3_mid.yarn index a7097be60..d7a1181b9 100644 --- a/Assets/Resources/Yarn/FP_Day3_mid/Day3_mid.yarn +++ b/Assets/Resources/Yarn/FP_Day3_mid/Day3_mid.yarn @@ -29,7 +29,7 @@ peipei: 你看见了吗？医生！ peipei: 医生！来这里！ -->去天桥 +->CenterOption:去天桥 <> <> <> @@ -97,7 +97,7 @@ me: 你不是要回去工作吗？ <> <> -->接过 +->CenterOption:接过 <> // 她依然看着你，直直的眼神和你对视。她的嘴微张着，许多种表情从她的脸上闪过。 <> @@ -118,7 +118,7 @@ peipei: 你会有的… -->回到诊室 +->CenterOption:回到诊室 <> //感觉可以把之前写的day1mid改到这里的BE，只是树叶其实是绿的，但你说是黄的 <> diff --git a/Assets/Scenes/ClinicOut.unity b/Assets/Scenes/ClinicOut.unity index 03f231c5d..8256a56b8 100644 --- a/Assets/Scenes/ClinicOut.unity +++ b/Assets/Scenes/ClinicOut.unity @@ -5399,6 +5399,132 @@ Transform: - {fileID: 1501389274} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &146077693 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 370776970} + m_Modifications: + - target: {fileID: 4266339626480639172, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_Name + value: Bubble Left + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchoredPosition.x + value: -351 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchoredPosition.y + value: -233 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} +--- !u!224 &146077694 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + m_PrefabInstance: {fileID: 146077693} + m_PrefabAsset: {fileID: 0} --- !u!1 &172576938 GameObject: m_ObjectHideFlags: 0 @@ -10337,6 +10463,124 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: -70, y: -90, z: 90} +--- !u!1 &370776966 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 370776970} + - component: {fileID: 370776969} + - component: {fileID: 370776968} + - component: {fileID: 370776967} + - component: {fileID: 370776971} + m_Layer: 5 + m_Name: Bubble Group + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &370776967 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 370776966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &370776968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 370776966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &370776969 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 370776966} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &370776970 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 370776966} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 683476662073257099} + - {fileID: 146077694} + - {fileID: 2071726610} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &370776971 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 370776966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8341b0b94bf446d9b3b3c50a4428ee15, type: 3} + m_Name: + m_EditorClassIdentifier: + delayTime: 300 --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -10490,7 +10734,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &619394801 MonoBehaviour: m_ObjectHideFlags: 0 @@ -17861,6 +18105,258 @@ Transform: m_CorrespondingSourceObject: {fileID: 5296327770213497549, guid: 87957cfe30e56984b82c1d9a90fad889, type: 3} m_PrefabInstance: {fileID: 2034462922} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2071726609 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 370776970} + m_Modifications: + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878580226911155808, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_Name + value: Bubble Right + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 357 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchoredPosition.y + value: -229 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} +--- !u!224 &2071726610 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + m_PrefabInstance: {fileID: 2071726609} + m_PrefabAsset: {fileID: 0} +--- !u!224 &683476662073257099 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + m_PrefabInstance: {fileID: 7283383166883411261} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7283383166883411261 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 370776970} + m_Modifications: + - target: {fileID: 636000980267337347, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_Name + value: Aside Text + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchoredPosition.y + value: -410 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -17881,3 +18377,4 @@ SceneRoots: - {fileID: 105721799} - {fileID: 1921397711} - {fileID: 115529396} + - {fileID: 370776970} diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity index 786e603fe..6fae3c04a 100644 --- a/Assets/Scenes/ExpressFixScene.unity +++ b/Assets/Scenes/ExpressFixScene.unity @@ -1626,7 +1626,7 @@ MonoBehaviour: panelClosePos: {x: -5.694, y: -0.531, z: 0} needleEmptyPos: {x: 0, y: 0, z: -48.281} needlePosArr: - - {x: 0, y: 0, z: -20.012} + - {x: 0, y: 0, z: -7.863} - {x: 0, y: 0, z: -6.878} - {x: 0, y: 0, z: 20} needleDuration: 1.5 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index f67e912a8..0239f8542 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -6343,7 +6343,7 @@ Transform: m_GameObject: {fileID: 519420028} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.009999275, y: 0, z: -10} + m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -8256,8 +8256,8 @@ MonoBehaviour: - {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} runMode: 1 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} - testTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} - saveFileName: "PeipeiDay3_\u6E05\u9664\u8BB0\u5FC6\u8272\u5F69" + testTalkSo: {fileID: 11400000, guid: 8d8b11f0c2fbc4d4cb8c2857d98383c9, type: 2} + saveFileName: "PeipeiDay1_\u8BB0\u5FC6\u68C0\u67E5" --- !u!4 &719228339 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/SkyBridge.unity b/Assets/Scenes/SkyBridge.unity index 12c3b8e34..dfe57b8fd 100644 --- a/Assets/Scenes/SkyBridge.unity +++ b/Assets/Scenes/SkyBridge.unity @@ -123,6 +123,132 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &11030335 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1695219948} + m_Modifications: + - target: {fileID: 4266339626480639172, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_Name + value: Bubble Left + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchoredPosition.x + value: -412 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchoredPosition.y + value: -18 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} +--- !u!224 &11030336 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4336017121026145511, guid: 6b054c2700ea05541a8a6e6088636183, type: 3} + m_PrefabInstance: {fileID: 11030335} + m_PrefabAsset: {fileID: 0} --- !u!1 &42967868 GameObject: m_ObjectHideFlags: 0 @@ -9849,7 +9975,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 @@ -9984,7 +10110,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &619394801 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15498,6 +15624,132 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 87957cfe30e56984b82c1d9a90fad889, type: 3} +--- !u!1001 &1268806972 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1695219948} + m_Modifications: + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878580226911155808, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_Name + value: Bubble Right + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 177 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_AnchoredPosition.y + value: -27 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} +--- !u!224 &1268806973 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8301362509965583806, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3} + m_PrefabInstance: {fileID: 1268806972} + m_PrefabAsset: {fileID: 0} --- !u!21 &1419706337 Material: serializedVersion: 8 @@ -16224,6 +16476,132 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: -178.544} +--- !u!1001 &1569380037 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1695219948} + m_Modifications: + - target: {fileID: 636000980267337347, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_Name + value: Aside Text + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_AnchoredPosition.y + value: -412 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} +--- !u!224 &1569380038 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7131805321628290712, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3} + m_PrefabInstance: {fileID: 1569380037} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1652434544 PrefabInstance: m_ObjectHideFlags: 0 @@ -16555,6 +16933,124 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1695219943 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1695219948} + - component: {fileID: 1695219947} + - component: {fileID: 1695219946} + - component: {fileID: 1695219945} + - component: {fileID: 1695219944} + m_Layer: 5 + m_Name: Bubble Group + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1695219944 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695219943} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8341b0b94bf446d9b3b3c50a4428ee15, type: 3} + m_Name: + m_EditorClassIdentifier: + delayTime: 300 +--- !u!114 &1695219945 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695219943} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1695219946 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695219943} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1695219947 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695219943} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1695219948 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695219943} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1569380038} + - {fileID: 11030336} + - {fileID: 1268806973} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &1707754918 GameObject: m_ObjectHideFlags: 0 @@ -17157,3 +17653,4 @@ SceneRoots: - {fileID: 1475389260} - {fileID: 1801092469} - {fileID: 1858506582} + - {fileID: 1695219948} diff --git a/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs b/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs index 59d529609..e31c92d20 100644 --- a/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs +++ b/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs @@ -15,7 +15,7 @@ namespace AibisDream.FixSystem #region 效果参数 public float rotateDuration = 0.5f; - public float typeSpeed = 0.1f; + public float typeSpeed = 0.05f; #endregion diff --git a/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs b/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs index 8fd2047d5..9e5b8ad0e 100644 --- a/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs +++ b/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs @@ -185,6 +185,7 @@ namespace AibisDream if (_dialogViewDict.TryGetValue(dialogViewType, out var view)) { _curView.HideDialog(); + _lastShowView = null; _curView = view; } else diff --git a/Assets/Scripts/UI/DialogUI/TextBubble.cs b/Assets/Scripts/UI/DialogUI/TextBubble.cs new file mode 100644 index 000000000..bfe4427fa --- /dev/null +++ b/Assets/Scripts/UI/DialogUI/TextBubble.cs @@ -0,0 +1,53 @@ +using System; +using AibisDream.Kit; +using AibisDream.Utility; +using Febucci.UI.Core; +using UnityEngine; + +namespace AibisDream.Framework +{ + public class TextBubble : MonoBehaviour + { + private TypewriterCore _typewriter; + + #region 参数 + + [SerializeField] public ActorRole role; + [SerializeField] private int maxCharNum; + + #endregion + + private bool _skipLineDelay; + + public bool IsShowingText => _typewriter.isShowingText; + + private void Awake() + { + _typewriter = GetComponentInChildren(); + } + + public void ShowLine(string line, Action onTextEnd) + { + _typewriter.ShowText(""); + gameObject.SetActive(true); + var formattedLine = CommonUtil.SplitString(line, maxCharNum); + _typewriter.ShowText(formattedLine); + // 对话结束回调 + _typewriter.onTextShowed.RemoveAllListeners(); + _typewriter.onTextShowed.AddListener(() => onTextEnd?.Invoke()); + } + + public void SkipLine() + { + if (_typewriter.isShowingText) + { + _typewriter.SkipTypewriter(); + } + } + + public void Hide() + { + gameObject.SetActive(false); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/DialogUI/TextBubble.cs.meta b/Assets/Scripts/UI/DialogUI/TextBubble.cs.meta new file mode 100644 index 000000000..345b0b5d6 --- /dev/null +++ b/Assets/Scripts/UI/DialogUI/TextBubble.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d97efe2567012354e9482f0774e66b76 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs b/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs new file mode 100644 index 000000000..dba38eb8f --- /dev/null +++ b/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs @@ -0,0 +1,142 @@ +using System; +using System.Collections.Generic; +using AibisDream.Framework; +using AibisDream.Kit; +using AibisDream.Utility; +using UnityEngine; + +namespace AibisDream +{ + public class TextBubbleGroup : MonoBehaviour, IDialogView + { + private readonly Dictionary _bubbleDict = new(); + + #region 一些索引 + + private bool _skipLineDelay; + private Action _nextStep; + private Action _onTextShowed; + private bool _isAutoSkip; + private ActorRole _curRole; + + [Header("跳过阻塞延迟时间/ms")] [SerializeField] + private int delayTime = 300; + + #endregion + + #region 初始化 + + private void Awake() + { + InitBubbles(); + // 注册泡泡 + DialogCanvasManager.Instance.RegisterDialogView(DialogViewType.Bubble, this); + DialogCanvasManager.Instance.SwitchDialogView(DialogViewType.Bubble); + + HideDialog(); + } + + private void OnDestroy() + { + DialogCanvasManager.Instance.SwitchDialogView(DialogViewType.OldBox); + DialogCanvasManager.Instance.UnregisterDialogView(DialogViewType.Bubble); + } + + private void InitBubbles() + { + foreach (var bubble in GetComponentsInChildren(true)) + { + _bubbleDict[bubble.role] = bubble; + } + } + + #endregion + + public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, Action onTextShowed = null, + bool isAutoSkip = false) + { + gameObject.SetActive(true); + + if (_curRole != character.role) + { + _bubbleDict[_curRole].Hide(); + } + + if (_bubbleDict.TryGetValue(character.role, out var bubble)) + { + bubble.ShowLine(dialogLine, OnTextShowed); + // 设置延时 + _skipLineDelay = true; + _ = CommonUtil.Delay(delayTime, () => { _skipLineDelay = false; }); + } + else + { + Debug.LogWarning($"{character.GetActorName()}的Role没有对应Bubble"); + return; + } + + // 保留信息 + _nextStep = nextStep; + _onTextShowed = onTextShowed; + _isAutoSkip = isAutoSkip; + _curRole = character.role; + } + + public void ShowOptions(DialogOption[] dialogueOptions) + { + // 没有选项 + } + + public void HideDialog() + { + foreach (var bubble in _bubbleDict.Values) + { + bubble.Hide(); + } + } + + public bool TrySkipLine() + { + if (_skipLineDelay) + { + return true; + } + + if (_bubbleDict.TryGetValue(_curRole, out var bubble) && bubble.IsShowingText) + { + bubble.SkipLine(); + return true; + } + + return false; + } + + public void NextStep() + { + if (_nextStep == null) return; + + EnumEventSystem.Global.Send(DialogEventEnum.LineEnd); + var next = _nextStep; + _nextStep = null; + + _bubbleDict[_curRole].Hide(); + + next.Invoke(); + } + + private void OnTextShowed() + { + // 触发事件 + EnumEventSystem.Global.Send(DialogEventEnum.LineShowed); + // 停止语音 + _onTextShowed?.Invoke(); + + // 执行自动跳过结局 + if (_isAutoSkip) + { + _ = CommonUtil.Delay(200, NextStep); + _isAutoSkip = false; + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs.meta b/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs.meta new file mode 100644 index 000000000..b30fdc68e --- /dev/null +++ b/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8341b0b94bf446d9b3b3c50a4428ee15 +timeCreated: 1740146642 \ No newline at end of file diff --git a/Assets/Scripts/Utility/CommonUtil.cs b/Assets/Scripts/Utility/CommonUtil.cs index b62051e7b..33c484fce 100644 --- a/Assets/Scripts/Utility/CommonUtil.cs +++ b/Assets/Scripts/Utility/CommonUtil.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using System.Text; using System.Threading.Tasks; using Unity.VisualScripting; using UnityEngine; @@ -134,5 +135,49 @@ namespace AibisDream.Utility } #endregion + + /// + /// 拆分字符串为若干行 + /// + /// + /// + /// + public static string SplitString(string input, int maxCharsPerLine) + { + if (string.IsNullOrEmpty(input) || maxCharsPerLine <= 0) + { + return input; + } + + var result = new StringBuilder(); + var lines = input.Replace("
", "\n").Split('\n'); + + foreach (var line in lines) + { + var currentIndex = 0; + + while (currentIndex < line.Length) + { + var length = Math.Min(maxCharsPerLine, line.Length - currentIndex); + result.Append(line.Substring(currentIndex, length)); + currentIndex += length; + + if (currentIndex < line.Length) + { + result.Append('\n'); + } + } + + result.Append('\n'); + } + + // Remove the last '\n' if needed + if (result.Length > 0) + { + result.Length--; + } + + return result.ToString(); + } } } \ No newline at end of file diff --git a/Assets/StreamingAssets/Config/character.csv b/Assets/StreamingAssets/Config/character.csv index 62d3eeaa2..4c7dd9bc9 100644 --- a/Assets/StreamingAssets/Config/character.csv +++ b/Assets/StreamingAssets/Config/character.csv @@ -1,14 +1,14 @@ 通过key索引配置,中文名,"显示位置，Default使用默认，Screen插线屏幕，OldBox基本对话框",人物角色（Player/MainActor/Aside）,名称显示时的颜色,头像Pic路径,语音资源路径 Key,Cn,DialogViewType,Role,NameColor,HeadPicPath,VoicePath -peipei,佩佩,Default,Aside,#00FFFF,peipei_head,voice_peipei -me,我,Default,Aside,,me_head,voice_me +peipei,佩佩,Default,MainActor,#00FFFF,peipei_head,voice_peipei +me,我,Default,Player,,me_head,voice_me peipei_novoice,胆怯女声,Default,Aside,#00FFFF,,voice_peipei yingli_novoice,严厉女声,Default,Aside,#FFCC00,,voice_yingli tutorial,教学,Default,Aside,,, docter,儿科医生,Default,Aside,#FFCC00,, peipei_child,童年佩佩,Default,Aside,#00FFFF,,voice_peipei unknown,？？？,Default,Aside,#FFCC00,, -shitou,石头,Default,Aside,,,voice_shitou +shitou,石头,Default,MainActor,,,voice_shitou Descent,Descent,Default,Aside,#FFCC00,,voice_me e-assistant,电子助手,Default,Aside,#FFCC00,,voice_me Gotashi_unknow,戴纯金雕塑头的男人,Default,Aside,#FFCC00,,voice_yingli