From e6709e621d164ed45b4cbc5e883dc6743f26211f Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Wed, 11 Jun 2025 17:54:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E9=A1=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FP_Prologue/FP_Prologue Shared Data.asset | 444 +++++++++--------- .../FP_Prologue/FP_Prologue_zh-Hans.asset | 8 + Assets/Render/Renderer2Dtest.asset | 22 +- .../Yarn/FP_Prologue/Stage2-5_切割.yarn | 2 +- Assets/Scenes/Persistence.unity | 19 +- .../Scripts/FixSystemNew/FixStateMachine.cs | 3 - Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs | 3 +- .../UI/DialogUI/Bubbles/BubbleGroup.cs | 8 +- .../UI/DialogUI/DialogCanvasManager.cs | 3 - 9 files changed, 275 insertions(+), 237 deletions(-) diff --git a/Assets/Language/Dialog/FP_Prologue/FP_Prologue Shared Data.asset b/Assets/Language/Dialog/FP_Prologue/FP_Prologue Shared Data.asset index 6b3503ce3..ab05639ef 100644 --- a/Assets/Language/Dialog/FP_Prologue/FP_Prologue Shared Data.asset +++ b/Assets/Language/Dialog/FP_Prologue/FP_Prologue Shared Data.asset @@ -19,27 +19,27 @@ MonoBehaviour: m_Key: line:0e3b3ba m_Metadata: m_Items: - - rid: 8171259511202906197 + - rid: 8171259512443109921 - m_Id: 76867964928 m_Key: line:01c1dfc m_Metadata: m_Items: - - rid: 8171259511202906198 + - rid: 8171259512443109922 - m_Id: 76867964929 m_Key: line:08eb9ab m_Metadata: m_Items: - - rid: 8171259511202906199 + - rid: 8171259512443109923 - m_Id: 76867964930 m_Key: line:0bf981d m_Metadata: m_Items: - - rid: 8171259511202906200 + - rid: 8171259512443109924 - m_Id: 76867964931 m_Key: line:03f99fe m_Metadata: m_Items: - - rid: 8171259511202906201 + - rid: 8171259512443109925 - m_Id: 76867964932 m_Key: line:03641d7 m_Metadata: @@ -49,127 +49,127 @@ MonoBehaviour: m_Key: line:0b98273 m_Metadata: m_Items: - - rid: 8171259511202906202 + - rid: 8171259512443109926 - m_Id: 76867964934 m_Key: line:0fef445 m_Metadata: m_Items: - - rid: 8171259511202906203 + - rid: 8171259512443109927 - m_Id: 76867964935 m_Key: line:0e4e2a7 m_Metadata: m_Items: - - rid: 8171259511202906204 + - rid: 8171259512443109928 - m_Id: 76867964936 m_Key: line:0849aef m_Metadata: m_Items: - - rid: 8171259511202906205 + - rid: 8171259512443109929 - m_Id: 76867964937 m_Key: line:07a0e10 m_Metadata: m_Items: - - rid: 8171259511202906206 + - rid: 8171259512443109930 - m_Id: 76867964938 m_Key: line:0a6cc48 m_Metadata: m_Items: - - rid: 8171259511202906207 + - rid: 8171259512443109931 - m_Id: 76867964939 m_Key: line:07c7fc7 m_Metadata: m_Items: - - rid: 8171259511202906208 + - rid: 8171259512443109932 - m_Id: 76867964940 m_Key: line:0a5293c m_Metadata: m_Items: - - rid: 8171259511202906209 + - rid: 8171259512443109933 - m_Id: 76867964941 m_Key: line:0bc09c4 m_Metadata: m_Items: - - rid: 8171259511202906210 + - rid: 8171259512443109934 - m_Id: 76867964942 m_Key: line:023ac3f m_Metadata: m_Items: - - rid: 8171259511202906211 + - rid: 8171259512443109935 - m_Id: 76867964943 m_Key: line:0c5ffe4 m_Metadata: m_Items: - - rid: 8171259511202906212 + - rid: 8171259512443109936 - m_Id: 76867964944 m_Key: line:0c5bd59 m_Metadata: m_Items: - - rid: 8171259511202906213 + - rid: 8171259512443109937 - m_Id: 76867964945 m_Key: line:021552c m_Metadata: m_Items: - - rid: 8171259511202906214 + - rid: 8171259512443109938 - m_Id: 76867964946 m_Key: line:08d1f7d m_Metadata: m_Items: - - rid: 8171259511202906215 + - rid: 8171259512443109939 - m_Id: 76867964947 m_Key: line:0c9f813 m_Metadata: m_Items: - - rid: 8171259511202906216 + - rid: 8171259512443109940 - m_Id: 76867964948 m_Key: line:0cf04a4 m_Metadata: m_Items: - - rid: 8171259511202906217 + - rid: 8171259512443109941 - m_Id: 76867964949 m_Key: line:0059ace m_Metadata: m_Items: - - rid: 8171259511202906218 + - rid: 8171259512443109942 - m_Id: 76867964950 m_Key: line:0052964 m_Metadata: m_Items: - - rid: 8171259511202906219 + - rid: 8171259512443109943 - m_Id: 76867964951 m_Key: line:0657a42 m_Metadata: m_Items: - - rid: 8171259511202906220 + - rid: 8171259512443109944 - m_Id: 76867964952 m_Key: line:02a9739 m_Metadata: m_Items: - - rid: 8171259511202906221 + - rid: 8171259512443109945 - m_Id: 76867964953 m_Key: line:04a9080 m_Metadata: m_Items: - - rid: 8171259511202906222 + - rid: 8171259512443109946 - m_Id: 76867964954 m_Key: line:0f85e9f m_Metadata: m_Items: - - rid: 8171259511202906223 + - rid: 8171259512443109947 - m_Id: 76867964955 m_Key: line:0f0e96d m_Metadata: m_Items: - - rid: 8171259511202906224 + - rid: 8171259512443109948 - m_Id: 76867964956 m_Key: line:0d447f7 m_Metadata: m_Items: - - rid: 8171259511202906225 + - rid: 8171259512443109949 - m_Id: 76867964957 m_Key: line:09d4fb0 m_Metadata: m_Items: - - rid: 8171259511202906226 + - rid: 8171259512443109950 - m_Id: 76867964958 m_Key: line:0ec4682 m_Metadata: @@ -179,382 +179,392 @@ MonoBehaviour: m_Key: line:0345c62 m_Metadata: m_Items: - - rid: 8171259511202906227 + - rid: 8171259512443109951 - m_Id: 76867964960 m_Key: line:03c692e m_Metadata: m_Items: - - rid: 8171259511202906228 + - rid: 8171259512443109952 - m_Id: 76867964961 m_Key: line:04d5033 m_Metadata: m_Items: - - rid: 8171259511202906229 + - rid: 8171259512443109953 - m_Id: 76867964962 m_Key: line:0238d8f m_Metadata: m_Items: - - rid: 8171259511202906230 + - rid: 8171259512443109954 - m_Id: 76867964963 m_Key: line:0c332b8 m_Metadata: m_Items: - - rid: 8171259511202906231 + - rid: 8171259512443109955 - m_Id: 76867964964 m_Key: line:01803fe m_Metadata: m_Items: - - rid: 8171259511202906232 + - rid: 8171259512443109956 - m_Id: 76867964965 m_Key: line:0d9a126 m_Metadata: m_Items: - - rid: 8171259511202906233 + - rid: 8171259512443109957 - m_Id: 76867964966 m_Key: line:07c564c m_Metadata: m_Items: - - rid: 8171259511202906234 + - rid: 8171259512443109958 - m_Id: 76867964967 m_Key: line:0cd0c41 m_Metadata: m_Items: - - rid: 8171259511202906235 + - rid: 8171259512443109959 - m_Id: 76867964968 m_Key: line:0e37a5a m_Metadata: m_Items: - - rid: 8171259511202906236 + - rid: 8171259512443109960 - m_Id: 76867964969 m_Key: line:064e749 m_Metadata: m_Items: - - rid: 8171259511202906237 + - rid: 8171259512443109961 - m_Id: 76867964970 m_Key: line:0582043 m_Metadata: m_Items: - - rid: 8171259511202906238 + - rid: 8171259512443109962 - m_Id: 76867964971 m_Key: line:014641d m_Metadata: m_Items: - - rid: 8171259511202906239 + - rid: 8171259512443109963 - m_Id: 76867964972 m_Key: line:002672d m_Metadata: m_Items: - - rid: 8171259511202906240 + - rid: 8171259512443109964 - m_Id: 76867964973 m_Key: line:0408052 m_Metadata: m_Items: - - rid: 8171259511202906241 + - rid: 8171259512443109965 - m_Id: 76867964974 m_Key: line:037a594 m_Metadata: m_Items: - - rid: 8171259511202906242 + - rid: 8171259512443109966 - m_Id: 76867964975 m_Key: line:0b1dd52 m_Metadata: m_Items: - - rid: 8171259511202906243 + - rid: 8171259512443109967 - m_Id: 76867964976 m_Key: line:0274eb9 m_Metadata: m_Items: - - rid: 8171259511202906244 + - rid: 8171259512443109968 - m_Id: 76867964977 m_Key: line:0ab8d02 m_Metadata: m_Items: - - rid: 8171259511202906245 + - rid: 8171259512443109969 - m_Id: 76867964978 m_Key: line:083eaa8 m_Metadata: m_Items: - - rid: 8171259511202906246 + - rid: 8171259512443109970 - m_Id: 76867964979 m_Key: line:015afd3 m_Metadata: m_Items: - - rid: 8171259511202906247 + - rid: 8171259512443109971 - m_Id: 76867964980 m_Key: line:04b0c1b m_Metadata: m_Items: - - rid: 8171259511202906248 + - rid: 8171259512443109972 - m_Id: 76867964981 m_Key: line:0e795e0 m_Metadata: m_Items: - - rid: 8171259511202906249 + - rid: 8171259512443109973 - m_Id: 76867964982 m_Key: line:0a0aea0 m_Metadata: m_Items: - - rid: 8171259511202906250 + - rid: 8171259512443109974 - m_Id: 76867964983 m_Key: line:0d70b5d m_Metadata: m_Items: - - rid: 8171259511202906251 + - rid: 8171259512443109975 - m_Id: 76867964984 m_Key: line:015ac4e m_Metadata: m_Items: - - rid: 8171259511202906252 + - rid: 8171259512443109976 - m_Id: 76867964985 m_Key: line:0a0de6e m_Metadata: m_Items: - - rid: 8171259511202906253 + - rid: 8171259512443109977 - m_Id: 76867964986 m_Key: line:0baa994 m_Metadata: m_Items: - - rid: 8171259511202906254 + - rid: 8171259512443109978 - m_Id: 76867964987 m_Key: line:0f7b387 m_Metadata: m_Items: - - rid: 8171259511202906255 + - rid: 8171259512443109979 - m_Id: 76867964988 m_Key: line:0b2facf m_Metadata: m_Items: - - rid: 8171259511202906256 + - rid: 8171259512443109980 - m_Id: 76867964989 m_Key: line:08ee885 m_Metadata: m_Items: - - rid: 8171259511202906257 + - rid: 8171259512443109981 - m_Id: 76867964990 m_Key: line:075ce88 m_Metadata: m_Items: - - rid: 8171259511202906258 + - rid: 8171259512443109982 - m_Id: 76867964991 m_Key: line:0ba461f m_Metadata: m_Items: - - rid: 8171259511202906259 + - rid: 8171259512443109983 - m_Id: 76867964992 m_Key: line:0352590 m_Metadata: m_Items: - - rid: 8171259511202906260 + - rid: 8171259512443109984 - m_Id: 76867964993 m_Key: line:0cf6d36 m_Metadata: m_Items: - - rid: 8171259511202906261 + - rid: 8171259512443109985 - m_Id: 76867964994 m_Key: line:0c23843 m_Metadata: m_Items: - - rid: 8171259511202906262 + - rid: 8171259512443109986 - m_Id: 76867964995 m_Key: line:0b93ed1 m_Metadata: m_Items: - - rid: 8171259511202906263 + - rid: 8171259512443109987 - m_Id: 76867964996 m_Key: line:0e7b127 m_Metadata: m_Items: - - rid: 8171259511202906264 + - rid: 8171259512443109988 - m_Id: 76867964997 m_Key: line:0348ba1 m_Metadata: m_Items: - - rid: 8171259511202906265 + - rid: 8171259512443109989 - m_Id: 76867964998 m_Key: line:02a0fcf m_Metadata: m_Items: - - rid: 8171259511202906266 + - rid: 8171259512443109990 - m_Id: 76867964999 m_Key: line:05442fd m_Metadata: m_Items: - - rid: 8171259511202906267 + - rid: 8171259512443109991 - m_Id: 76867965000 m_Key: line:01ed870 m_Metadata: m_Items: - - rid: 8171259511202906268 + - rid: 8171259512443109992 - m_Id: 76867965001 m_Key: line:02662fa m_Metadata: m_Items: - - rid: 8171259511202906269 + - rid: 8171259512443109993 - m_Id: 76867965002 m_Key: line:01f32fe m_Metadata: m_Items: - - rid: 8171259511202906270 + - rid: 8171259512443109994 - m_Id: 76867965003 m_Key: line:0c8cdb8 m_Metadata: m_Items: - - rid: 8171259511202906271 + - rid: 8171259512443109995 - m_Id: 76867965004 m_Key: line:02b2195 m_Metadata: m_Items: - - rid: 8171259511202906272 + - rid: 8171259512443109996 - m_Id: 76867965005 m_Key: line:0ff21b3 m_Metadata: m_Items: - - rid: 8171259511202906273 + - rid: 8171259512443109997 - m_Id: 76867965006 m_Key: line:09e71e1 m_Metadata: m_Items: - - rid: 8171259511202906274 + - rid: 8171259512443109998 - m_Id: 76867965007 m_Key: line:0c45957 m_Metadata: m_Items: - - rid: 8171259511202906275 + - rid: 8171259512443109999 - m_Id: 76867965008 m_Key: line:0cd26c4 m_Metadata: m_Items: - - rid: 8171259511202906276 + - rid: 8171259512443110000 - m_Id: 76867965009 m_Key: line:0a0b422 m_Metadata: m_Items: - - rid: 8171259511202906277 + - rid: 8171259512443110001 - m_Id: 76867965010 m_Key: line:044a9a4 m_Metadata: m_Items: - - rid: 8171259511202906278 + - rid: 8171259512443110002 - m_Id: 76867965011 m_Key: line:090f82d m_Metadata: m_Items: - - rid: 8171259511202906279 + - rid: 8171259512443110003 - m_Id: 76867965012 m_Key: line:0d127c8 m_Metadata: m_Items: - - rid: 8171259511202906280 + - rid: 8171259512443110004 - m_Id: 76867965013 m_Key: line:00ea64d m_Metadata: m_Items: - - rid: 8171259511202906281 + - rid: 8171259512443110005 - m_Id: 76867965014 m_Key: line:0ce000f m_Metadata: m_Items: - - rid: 8171259511202906282 + - rid: 8171259512443110006 - m_Id: 76867965015 m_Key: line:008fb97 m_Metadata: m_Items: - - rid: 8171259511202906283 + - rid: 8171259512443110007 - m_Id: 76867965016 m_Key: line:08251a5 m_Metadata: m_Items: - - rid: 8171259511202906284 + - rid: 8171259512443110008 - m_Id: 76867965017 m_Key: line:084b284 m_Metadata: m_Items: - - rid: 8171259511202906285 + - rid: 8171259512443110009 - m_Id: 76867965018 m_Key: line:031572d m_Metadata: m_Items: - - rid: 8171259511202906286 + - rid: 8171259512443110010 - m_Id: 76867965019 m_Key: line:0e21b2b m_Metadata: m_Items: - - rid: 8171259511202906287 + - rid: 8171259512443110011 - m_Id: 76867965020 m_Key: line:04add2c m_Metadata: m_Items: - - rid: 8171259511202906288 + - rid: 8171259512443110012 - m_Id: 76867965021 m_Key: line:0b0f0ef m_Metadata: m_Items: - - rid: 8171259511202906289 + - rid: 8171259512443110013 - m_Id: 76872159232 m_Key: line:0c4c232 m_Metadata: m_Items: - - rid: 8171259511202906290 + - rid: 8171259512443110014 - m_Id: 76872159233 m_Key: line:0dab2e6 m_Metadata: m_Items: - - rid: 8171259511202906291 + - rid: 8171259512443110015 - m_Id: 76872159234 m_Key: line:005c0b8 m_Metadata: m_Items: - - rid: 8171259511202906292 + - rid: 8171259512443110016 - m_Id: 76872159235 m_Key: line:08d9eb2 m_Metadata: m_Items: - - rid: 8171259511202906293 + - rid: 8171259512443110017 - m_Id: 76872159236 m_Key: line:09bc69e m_Metadata: m_Items: - - rid: 8171259511202906294 + - rid: 8171259512443110018 - m_Id: 76872159237 m_Key: line:0286596 m_Metadata: m_Items: - - rid: 8171259511202906295 + - rid: 8171259512443110019 - m_Id: 76872159238 m_Key: line:02b2f2f m_Metadata: m_Items: - - rid: 8171259511202906296 + - rid: 8171259512443110020 - m_Id: 76872159239 m_Key: line:095d856 m_Metadata: m_Items: - - rid: 8171259511202906297 + - rid: 8171259512443110021 - m_Id: 76872159240 m_Key: line:0995165 m_Metadata: m_Items: - - rid: 8171259511202906298 + - rid: 8171259512443110022 - m_Id: 76872159241 m_Key: line:0382726 m_Metadata: m_Items: - - rid: 8171259511202906299 + - rid: 8171259512443110023 - m_Id: 76872159242 m_Key: line:0668599 m_Metadata: m_Items: - - rid: 8171259511202906300 + - rid: 8171259512443110024 - m_Id: 76872159243 m_Key: line:0cbf347 m_Metadata: m_Items: - - rid: 8171259511202906301 + - rid: 8171259512443110025 - m_Id: 76872159244 m_Key: line:0bf67b0 m_Metadata: m_Items: - - rid: 8171259511202906302 + - rid: 8171259512443110026 + - m_Id: 356927556030464 + m_Key: line:0b94b47 + m_Metadata: + m_Items: + - rid: 8171259512443110027 + - m_Id: 356927585390592 + m_Key: line:014f73d + m_Metadata: + m_Items: + - rid: 8171259512443110028 m_Metadata: m_Items: [] m_KeyGenerator: @@ -576,537 +586,547 @@ MonoBehaviour: type: {class: DistributedUIDGenerator, ns: UnityEngine.Localization.Tables, asm: Unity.Localization} data: m_CustomEpoch: 1749550075919 - - rid: 8171259511202906197 + - rid: 8171259512443109921 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906198 + - rid: 8171259512443109922 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906199 + - rid: 8171259512443109923 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906200 + - rid: 8171259512443109924 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906201 + - rid: 8171259512443109925 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906202 + - rid: 8171259512443109926 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906203 + - rid: 8171259512443109927 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906204 + - rid: 8171259512443109928 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906205 + - rid: 8171259512443109929 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906206 + - rid: 8171259512443109930 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906207 + - rid: 8171259512443109931 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906208 + - rid: 8171259512443109932 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906209 + - rid: 8171259512443109933 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906210 + - rid: 8171259512443109934 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906211 + - rid: 8171259512443109935 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906212 + - rid: 8171259512443109936 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906213 + - rid: 8171259512443109937 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906214 + - rid: 8171259512443109938 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906215 + - rid: 8171259512443109939 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906216 + - rid: 8171259512443109940 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906217 + - rid: 8171259512443109941 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906218 + - rid: 8171259512443109942 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906219 + - rid: 8171259512443109943 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906220 + - rid: 8171259512443109944 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906221 + - rid: 8171259512443109945 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906222 + - rid: 8171259512443109946 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906223 + - rid: 8171259512443109947 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906224 + - rid: 8171259512443109948 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906225 + - rid: 8171259512443109949 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906226 + - rid: 8171259512443109950 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906227 + - rid: 8171259512443109951 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68A6" tags: [] - - rid: 8171259511202906228 + - rid: 8171259512443109952 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u5F00\u573A" tags: [] - - rid: 8171259511202906229 + - rid: 8171259512443109953 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u5F00\u573A" tags: [] - - rid: 8171259511202906230 + - rid: 8171259512443109954 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u706F\u5149" tags: [] - - rid: 8171259511202906231 + - rid: 8171259512443109955 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u706F\u5149" tags: [] - - rid: 8171259511202906232 + - rid: 8171259512443109956 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u706F\u5149" tags: [] - - rid: 8171259511202906233 + - rid: 8171259512443109957 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u706F\u5149" tags: [] - - rid: 8171259511202906234 + - rid: 8171259512443109958 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u706F\u5149" tags: [] - - rid: 8171259511202906235 + - rid: 8171259512443109959 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u706F\u5149" tags: [] - - rid: 8171259511202906236 + - rid: 8171259512443109960 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u624B\u672F\u51C6\u5907" tags: [] - - rid: 8171259511202906237 + - rid: 8171259512443109961 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u624B\u672F\u51C6\u5907" tags: [] - - rid: 8171259511202906238 + - rid: 8171259512443109962 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u624B\u672F\u51C6\u5907" tags: [] - - rid: 8171259511202906239 + - rid: 8171259512443109963 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u624B\u672F\u51C6\u5907" tags: [] - - rid: 8171259511202906240 + - rid: 8171259512443109964 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u624B\u672F\u51C6\u5907" tags: [] - - rid: 8171259511202906241 + - rid: 8171259512443109965 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u5207\u9664\u60C5\u7EEA" tags: [] - - rid: 8171259511202906242 + - rid: 8171259512443109966 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u60C5\u7EEA\u5207\u9664\u540E" tags: [] - - rid: 8171259511202906243 + - rid: 8171259512443109967 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u60C5\u7EEA\u5207\u9664\u540E" tags: [] - - rid: 8171259511202906244 + - rid: 8171259512443109968 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u60C5\u7EEA\u5207\u9664\u540E" tags: [] - - rid: 8171259511202906245 + - rid: 8171259512443109969 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u60C5\u7EEA\u5207\u9664\u540E" tags: [] - - rid: 8171259511202906246 + - rid: 8171259512443109970 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u60C5\u7EEA\u5207\u9664\u540E" tags: [] - - rid: 8171259511202906247 + - rid: 8171259512443109971 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u60C5\u7EEA\u5207\u9664\u540E" tags: [] - - rid: 8171259511202906248 + - rid: 8171259512443109972 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u5207\u9664\u903B\u8F91" tags: [] - - rid: 8171259511202906249 + - rid: 8171259512443109973 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u903B\u8F91\u5207\u9664\u540E" tags: [] - - rid: 8171259511202906250 + - rid: 8171259512443109974 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u903B\u8F91\u5207\u9664\u540E" tags: [] - - rid: 8171259511202906251 + - rid: 8171259512443109975 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u903B\u8F91\u5207\u9664\u540E" tags: [] - - rid: 8171259511202906252 + - rid: 8171259512443109976 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u903B\u8F91\u5207\u9664\u540E" tags: [] - - rid: 8171259511202906253 + - rid: 8171259512443109977 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u7535\u51FB\u540E" tags: [] - - rid: 8171259511202906254 + - rid: 8171259512443109978 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u7535\u51FB\u540E" tags: [] - - rid: 8171259511202906255 + - rid: 8171259512443109979 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u7535\u51FB\u540E" tags: [] - - rid: 8171259511202906256 + - rid: 8171259512443109980 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u7535\u51FB\u540E" tags: [] - - rid: 8171259511202906257 + - rid: 8171259512443109981 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u7535\u51FB\u540E" tags: [] - - rid: 8171259511202906258 + - rid: 8171259512443109982 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u7535\u51FB\u540E" tags: [] - - rid: 8171259511202906259 + - rid: 8171259512443109983 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u7535\u51FB\u540E" tags: [] - - rid: 8171259511202906260 + - rid: 8171259512443109984 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u5207\u9664\u8BB0\u5FC6" tags: [] - - rid: 8171259511202906261 + - rid: 8171259512443109985 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u8BB0\u5FC6\u5207\u9664\u540E" tags: - auto_next - - rid: 8171259511202906262 + - rid: 8171259512443109986 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u8BB0\u5FC6\u5207\u9664\u540E" tags: [] - - rid: 8171259511202906263 + - rid: 8171259512443109987 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u8BB0\u5FC6\u5207\u9664\u540E" tags: [] - - rid: 8171259511202906264 + - rid: 8171259512443109988 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u60C5\u7EEA" tags: [] - - rid: 8171259511202906265 + - rid: 8171259512443109989 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u60C5\u7EEA" tags: [] - - rid: 8171259511202906266 + - rid: 8171259512443109990 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u60C5\u7EEA" tags: [] - - rid: 8171259511202906267 + - rid: 8171259512443109991 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u60C5\u7EEA" tags: [] - - rid: 8171259511202906268 + - rid: 8171259512443109992 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u60C5\u7EEA" tags: [] - - rid: 8171259511202906269 + - rid: 8171259512443109993 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u60C5\u7EEA" tags: [] - - rid: 8171259511202906270 + - rid: 8171259512443109994 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u60C5\u7EEA" tags: [] - - rid: 8171259511202906271 + - rid: 8171259512443109995 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u60C5\u7EEA" tags: [] - - rid: 8171259511202906272 + - rid: 8171259512443109996 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u903B\u8F91" tags: [] - - rid: 8171259511202906273 + - rid: 8171259512443109997 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u903B\u8F91" tags: [] - - rid: 8171259511202906274 + - rid: 8171259512443109998 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u903B\u8F91" tags: [] - - rid: 8171259511202906275 + - rid: 8171259512443109999 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u903B\u8F91" tags: [] - - rid: 8171259511202906276 + - rid: 8171259512443110000 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u903B\u8F91" tags: [] - - rid: 8171259511202906277 + - rid: 8171259512443110001 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u903B\u8F91" tags: [] - - rid: 8171259511202906278 + - rid: 8171259512443110002 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u903B\u8F91" tags: [] - - rid: 8171259511202906279 + - rid: 8171259512443110003 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u903B\u8F91" tags: [] - - rid: 8171259511202906280 + - rid: 8171259512443110004 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 8171259511202906281 + - rid: 8171259512443110005 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 8171259511202906282 + - rid: 8171259512443110006 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 8171259511202906283 + - rid: 8171259512443110007 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 8171259511202906284 + - rid: 8171259512443110008 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 8171259511202906285 + - rid: 8171259512443110009 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 8171259511202906286 + - rid: 8171259512443110010 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 8171259511202906287 + - rid: 8171259512443110011 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 8171259511202906288 + - rid: 8171259512443110012 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 8171259511202906289 + - rid: 8171259512443110013 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 8171259511202906290 + - rid: 8171259512443110014 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 8171259511202906291 + - rid: 8171259512443110015 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 8171259511202906292 + - rid: 8171259512443110016 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u89C6\u89C9" tags: [] - - rid: 8171259511202906293 + - rid: 8171259512443110017 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u89C6\u89C9" tags: [] - - rid: 8171259511202906294 + - rid: 8171259512443110018 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u89C6\u89C9" tags: [] - - rid: 8171259511202906295 + - rid: 8171259512443110019 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u89C6\u89C9" tags: - lastline - - rid: 8171259511202906296 + - rid: 8171259512443110020 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u89C6\u89C9" tags: [] - - rid: 8171259511202906297 + - rid: 8171259512443110021 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BED\u8A00" tags: [] - - rid: 8171259511202906298 + - rid: 8171259512443110022 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BED\u8A00" tags: [] - - rid: 8171259511202906299 + - rid: 8171259512443110023 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BED\u8A00" tags: [] - - rid: 8171259511202906300 + - rid: 8171259512443110024 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BED\u8A00" tags: - lastline - - rid: 8171259511202906301 + - rid: 8171259512443110025 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BED\u8A00" tags: [] - - rid: 8171259511202906302 + - rid: 8171259512443110026 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: end tags: - auto_next + - rid: 8171259512443110027 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: "\u5207\u9664\u903B\u8F91" + tags: [] + - rid: 8171259512443110028 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: "\u5207\u9664\u8BB0\u5FC6" + tags: [] diff --git a/Assets/Language/Dialog/FP_Prologue/FP_Prologue_zh-Hans.asset b/Assets/Language/Dialog/FP_Prologue/FP_Prologue_zh-Hans.asset index b7d148a9e..34f246eb7 100644 --- a/Assets/Language/Dialog/FP_Prologue/FP_Prologue_zh-Hans.asset +++ b/Assets/Language/Dialog/FP_Prologue/FP_Prologue_zh-Hans.asset @@ -450,6 +450,14 @@ MonoBehaviour: m_Localized: "CenterText: \u7B2C\u4E00\u7AE0" m_Metadata: m_Items: [] + - m_Id: 356927556030464 + m_Localized: "Task: \u5207\u9664\u903B\u8F91\u6A21\u5757" + m_Metadata: + m_Items: [] + - m_Id: 356927585390592 + m_Localized: "Task: \u5207\u9664\u8BB0\u5FC6\u6A21\u5757" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Render/Renderer2Dtest.asset b/Assets/Render/Renderer2Dtest.asset index 98d1609e4..1b30ef4ee 100644 --- a/Assets/Render/Renderer2Dtest.asset +++ b/Assets/Render/Renderer2Dtest.asset @@ -477,19 +477,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 &-6101378415725230565 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/Resources/Yarn/FP_Prologue/Stage2-5_切割.yarn b/Assets/Resources/Yarn/FP_Prologue/Stage2-5_切割.yarn index 71c4d635c..3bd1c7323 100644 --- a/Assets/Resources/Yarn/FP_Prologue/Stage2-5_切割.yarn +++ b/Assets/Resources/Yarn/FP_Prologue/Stage2-5_切割.yarn @@ -286,7 +286,7 @@ position: 907,-2702 <> <> // <> -<> +<> Linking: 正在建立连接… #line:0e7b127 <> gotash?: 啊！痛…好痛！ #line:0348ba1 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 49fe13526..c5811f392 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -16934,6 +16934,7 @@ GameObject: - component: {fileID: 1318260398} - component: {fileID: 1318260400} - component: {fileID: 1318260399} + - component: {fileID: 1318260401} m_Layer: 5 m_Name: Width Estimation m_TagString: Untagged @@ -16958,7 +16959,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -1129} - m_SizeDelta: {x: 200, y: 50} + m_SizeDelta: {x: 1291.51, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1318260399 MonoBehaviour: @@ -16980,7 +16981,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: + m_text: "SD\u53D1\u65AF\u8482\u82ACSD\u53D1\u65AF\u8482\u82ACSD\u53D1\u65AF\u8482\u82ACSD\u53D1\u65AF\u8482\u82ACSD\u53D1\u65AF\u8482\u82ACSD\u53D1\u65AF\u8482\u82ACSD\u53D1\u65AF\u8482\u82AC" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2} m_sharedMaterial: {fileID: -5947736473428621296, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2} @@ -17057,6 +17058,20 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1318260397} m_CullTransparentMesh: 1 +--- !u!114 &1318260401 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1318260397} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1001 &1337853806 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/FixSystemNew/FixStateMachine.cs b/Assets/Scripts/FixSystemNew/FixStateMachine.cs index 5627a4dc3..2d2389082 100644 --- a/Assets/Scripts/FixSystemNew/FixStateMachine.cs +++ b/Assets/Scripts/FixSystemNew/FixStateMachine.cs @@ -574,9 +574,6 @@ namespace AibisDream.FixSystem yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutEmoDeep); yield return UIManager.Instance.GetPanel().FadeOutAsync(0.1f); yield return cuttingManager.StartCutting(bodyModule); - - - } public IEnumerator Exit() diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs b/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs index 335aafb6c..3aa74e3fd 100644 --- a/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs +++ b/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs @@ -120,8 +120,7 @@ namespace AibisDream private void HandleLayout(string line) { // 先去除富文本标签 - line = Regex.Replace(line, "[<|{].*?[>|}]", string.Empty); - Debug.Log(line); + line = Regex.Replace(line.Replace("
", "\n"), "[<|{].*?[>|}]", string.Empty); var width = DialogCanvasManager.Instance.EstimateTextWidth(line, _lineText.fontSize); if (width > maxWidth) { diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs index 1220e550a..18e5ca98e 100644 --- a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs +++ b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs @@ -138,7 +138,12 @@ namespace AibisDream public bool TrySkipLine(bool isForceSkip = false) { - if (_curBubble.IsShowingText) + if (!_curBubble) + { + return true; + } + + if (_curBubble && _curBubble.IsShowingText) { _curBubble.SkipLine(); return true; @@ -156,6 +161,7 @@ namespace AibisDream _nextStep = null; _curBubble?.Hide(); + _curBubble = null; next?.Invoke(); } diff --git a/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs b/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs index 21c681943..eeacf422e 100644 --- a/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs +++ b/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs @@ -156,9 +156,6 @@ namespace AibisDream public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, string lineId, bool isAutoSkip = false) { - Debug.Log($"{character.dialogViewType}"); - Debug.Log(_defaultView.GetType()); - _isNextAutoSkip = isAutoSkip; // 根据DialogViewType确定在哪个对话框显示 if (character.dialogViewType == DialogViewType.Default)