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 40c9fbad6..3838c2300 100644 --- a/Assets/Language/Dialog/FP_Prologue/FP_Prologue Shared Data.asset +++ b/Assets/Language/Dialog/FP_Prologue/FP_Prologue Shared Data.asset @@ -19,387 +19,392 @@ MonoBehaviour: m_Key: line:03c692e m_Metadata: m_Items: - - rid: 7848877316552261634 + - rid: 7848877316552262256 - m_Id: 371765548318720 m_Key: line:06c79ca m_Metadata: m_Items: - - rid: 7848877316552261635 + - rid: 7848877316552262257 - m_Id: 371765548318721 m_Key: line:00549b2 m_Metadata: m_Items: - - rid: 7848877316552261636 + - rid: 7848877316552262258 - m_Id: 371765548318722 m_Key: line:09748e9 m_Metadata: m_Items: - - rid: 7848877316552261637 + - rid: 7848877316552262259 - m_Id: 371765548318723 m_Key: line:02cb425 m_Metadata: m_Items: - - rid: 7848877316552261638 + - rid: 7848877316552262260 - m_Id: 371765548318724 m_Key: line:01f32fe m_Metadata: m_Items: - - rid: 7848877316552261639 + - rid: 7848877316552262261 - m_Id: 371765548318725 m_Key: line:037a594 m_Metadata: m_Items: - - rid: 7848877316552261640 + - rid: 7848877316552262262 - m_Id: 371765548318726 m_Key: line:0d39771 m_Metadata: m_Items: - - rid: 7848877316552261641 + - rid: 7848877316552262263 - m_Id: 371765548318727 m_Key: line:054ce15 m_Metadata: m_Items: - - rid: 7848877316552261642 + - rid: 7848877316552262264 - m_Id: 371765548318728 m_Key: line:0509e8b m_Metadata: m_Items: - - rid: 7848877316552261643 + - rid: 7848877316552262265 - m_Id: 371765548318729 m_Key: line:0fda55a m_Metadata: m_Items: - - rid: 7848877316552261644 + - rid: 7848877316552262266 - m_Id: 371765548318730 m_Key: line:099e8a3 m_Metadata: m_Items: - - rid: 7848877316552261645 + - rid: 7848877316552262267 - m_Id: 371765548318731 m_Key: line:04b0c1b m_Metadata: m_Items: - - rid: 7848877316552261646 + - rid: 7848877316552262268 - m_Id: 371765548318732 m_Key: line:0e795e0 m_Metadata: m_Items: - - rid: 7848877316552261647 + - rid: 7848877316552262269 - m_Id: 371765548318733 m_Key: line:095103b m_Metadata: m_Items: - - rid: 7848877316552261648 + - rid: 7848877316552262270 - m_Id: 371765548318734 m_Key: line:037ee29 m_Metadata: m_Items: - - rid: 7848877316552261649 + - rid: 7848877316552262271 - m_Id: 371765548318735 m_Key: line:09238fc m_Metadata: m_Items: - - rid: 7848877316552261650 + - rid: 7848877316552262272 - m_Id: 371765548318736 m_Key: line:0f05c8d m_Metadata: m_Items: - - rid: 7848877316552261651 + - rid: 7848877316552262273 - m_Id: 371765548318737 m_Key: line:027615e m_Metadata: m_Items: - - rid: 7848877316552261652 + - rid: 7848877316552262274 - m_Id: 371765548318738 m_Key: line:006512a m_Metadata: m_Items: - - rid: 7848877316552261653 + - rid: 7848877316552262275 - m_Id: 371765548318739 m_Key: line:0ca432e m_Metadata: m_Items: - - rid: 7848877316552261654 + - rid: 7848877316552262276 - m_Id: 371765548318740 m_Key: line:024f2de m_Metadata: m_Items: - - rid: 7848877316552261655 + - rid: 7848877316552262277 - m_Id: 371765548318741 m_Key: line:0352590 m_Metadata: m_Items: - - rid: 7848877316552261656 + - rid: 7848877316552262278 - m_Id: 371765548318742 m_Key: line:0cf6d36 m_Metadata: m_Items: - - rid: 7848877316552261657 + - rid: 7848877316552262279 - m_Id: 371765548318743 m_Key: line:08377c6 m_Metadata: m_Items: - - rid: 7848877316552261658 + - rid: 7848877316552262280 - m_Id: 371765548318744 m_Key: line:05cf137 m_Metadata: m_Items: - - rid: 7848877316552261659 + - rid: 7848877316552262281 - m_Id: 371765548318745 m_Key: line:0553efe m_Metadata: m_Items: - - rid: 7848877316552261660 + - rid: 7848877316552262282 - m_Id: 371765548318746 m_Key: line:0ea1b53 m_Metadata: m_Items: - - rid: 7848877316552261661 + - rid: 7848877316552262283 - m_Id: 371765548318747 m_Key: line:0e7b127 m_Metadata: m_Items: - - rid: 7848877316552261662 + - rid: 7848877316552262284 - m_Id: 371765548318748 m_Key: line:0348ba1 m_Metadata: m_Items: - - rid: 7848877316552261663 + - rid: 7848877316552262285 - m_Id: 371765548318749 m_Key: line:02a0fcf m_Metadata: m_Items: - - rid: 7848877316552261664 + - rid: 7848877316552262286 - m_Id: 371765548318750 m_Key: line:05442fd m_Metadata: m_Items: - - rid: 7848877316552261665 + - rid: 7848877316552262287 - m_Id: 371765548318751 m_Key: line:01ed870 m_Metadata: m_Items: - - rid: 7848877316552261666 + - rid: 7848877316552262288 - m_Id: 371765548318752 m_Key: line:02662fa m_Metadata: m_Items: - - rid: 7848877316552261667 + - rid: 7848877316552262289 - m_Id: 371765548318753 m_Key: line:0135eb9 m_Metadata: m_Items: - - rid: 7848877316552261668 + - rid: 7848877316552262290 - m_Id: 371765548318754 m_Key: line:0d07afb m_Metadata: m_Items: - - rid: 7848877316552261669 + - rid: 7848877316552262291 - m_Id: 371765548318755 m_Key: line:0c8cdb8 m_Metadata: m_Items: - - rid: 7848877316552261670 + - rid: 7848877316552262292 - m_Id: 371765548318756 m_Key: line:02b2195 m_Metadata: m_Items: - - rid: 7848877316552261671 + - rid: 7848877316552262293 - m_Id: 371765548318757 m_Key: line:0ff21b3 m_Metadata: m_Items: - - rid: 7848877316552261672 + - rid: 7848877316552262294 - m_Id: 371765548318758 m_Key: line:09e71e1 m_Metadata: m_Items: - - rid: 7848877316552261673 + - rid: 7848877316552262295 - m_Id: 371765548318759 m_Key: line:0c45957 m_Metadata: m_Items: - - rid: 7848877316552261674 + - rid: 7848877316552262296 - m_Id: 371765548318760 m_Key: line:0cd26c4 m_Metadata: m_Items: - - rid: 7848877316552261675 + - rid: 7848877316552262297 - m_Id: 371765548318761 m_Key: line:0a0b422 m_Metadata: m_Items: - - rid: 7848877316552261676 + - rid: 7848877316552262298 - m_Id: 371765548318762 m_Key: line:044a9a4 m_Metadata: m_Items: - - rid: 7848877316552261677 + - rid: 7848877316552262299 - m_Id: 371765548318763 m_Key: line:00ee7c7 m_Metadata: m_Items: - - rid: 7848877316552261678 + - rid: 7848877316552262300 - m_Id: 371765548318764 m_Key: line:020cb0a m_Metadata: m_Items: - - rid: 7848877316552261679 + - rid: 7848877316552262301 - m_Id: 371765548318765 m_Key: line:090f82d m_Metadata: m_Items: - - rid: 7848877316552261680 + - rid: 7848877316552262302 - m_Id: 371765548318766 m_Key: line:0d127c8 m_Metadata: m_Items: - - rid: 7848877316552261681 + - rid: 7848877316552262303 - m_Id: 371765548318767 m_Key: line:00ea64d m_Metadata: m_Items: - - rid: 7848877316552261682 + - rid: 7848877316552262304 - m_Id: 371765548318768 m_Key: line:0ce000f m_Metadata: m_Items: - - rid: 7848877316552261683 + - rid: 7848877316552262305 - m_Id: 371765548318769 m_Key: line:008fb97 m_Metadata: m_Items: - - rid: 7848877316552261684 + - rid: 7848877316552262306 - m_Id: 371765548318770 m_Key: line:08251a5 m_Metadata: m_Items: - - rid: 7848877316552261685 + - rid: 7848877316552262307 - m_Id: 371765548318771 m_Key: line:084b284 m_Metadata: m_Items: - - rid: 7848877316552261686 + - rid: 7848877316552262308 - m_Id: 371765548318772 m_Key: line:031572d m_Metadata: m_Items: - - rid: 7848877316552261687 + - rid: 7848877316552262309 - m_Id: 371765548318773 m_Key: line:0e21b2b m_Metadata: m_Items: - - rid: 7848877316552261688 + - rid: 7848877316552262310 - m_Id: 371765548318774 m_Key: line:04add2c m_Metadata: m_Items: - - rid: 7848877316552261689 + - rid: 7848877316552262311 - m_Id: 371765548318775 m_Key: line:0b0f0ef m_Metadata: m_Items: - - rid: 7848877316552261690 + - rid: 7848877316552262312 - m_Id: 371765548318776 m_Key: line:0c4c232 m_Metadata: m_Items: - - rid: 7848877316552261691 + - rid: 7848877316552262313 - m_Id: 371765548318777 m_Key: line:0304ad7 m_Metadata: m_Items: - - rid: 7848877316552261692 + - rid: 7848877316552262314 - m_Id: 371765548318778 m_Key: line:0dab2e6 m_Metadata: m_Items: - - rid: 7848877316552261693 + - rid: 7848877316552262315 - m_Id: 371765548318779 m_Key: line:005c0b8 m_Metadata: m_Items: - - rid: 7848877316552261694 + - rid: 7848877316552262316 - m_Id: 371765548318780 m_Key: line:08d9eb2 m_Metadata: m_Items: - - rid: 7848877316552261695 + - rid: 7848877316552262317 - m_Id: 371765548318781 m_Key: line:09bc69e m_Metadata: m_Items: - - rid: 7848877316552261696 + - rid: 7848877316552262318 - m_Id: 371765548318782 m_Key: line:0286596 m_Metadata: m_Items: - - rid: 7848877316552261697 + - rid: 7848877316552262319 - m_Id: 371765548318783 m_Key: line:02b2f2f m_Metadata: m_Items: - - rid: 7848877316552261698 + - rid: 7848877316552262320 - m_Id: 371765548318784 m_Key: line:095d856 m_Metadata: m_Items: - - rid: 7848877316552261699 + - rid: 7848877316552262321 - m_Id: 371765548318785 m_Key: line:0995165 m_Metadata: m_Items: - - rid: 7848877316552261700 + - rid: 7848877316552262322 - m_Id: 371765548318786 m_Key: line:0382726 m_Metadata: m_Items: - - rid: 7848877316552261701 + - rid: 7848877316552262323 - m_Id: 371765548318787 m_Key: line:0668599 m_Metadata: m_Items: - - rid: 7848877316552261702 + - rid: 7848877316552262324 - m_Id: 371765548318788 m_Key: line:0cbf347 m_Metadata: m_Items: - - rid: 7848877316552261703 + - rid: 7848877316552262325 - m_Id: 371765548318789 m_Key: line:07f6601 m_Metadata: m_Items: - - rid: 7848877316552261704 + - rid: 7848877316552262326 - m_Id: 371765548318790 m_Key: line:07401ee m_Metadata: m_Items: - - rid: 7848877316552261705 + - rid: 7848877316552262327 - m_Id: 371765548318791 m_Key: line:05c76b0 m_Metadata: m_Items: - - rid: 7848877316552261706 + - rid: 7848877316552262328 - m_Id: 371765548318792 m_Key: line:0c3c692 m_Metadata: m_Items: - - rid: 7848877316552261707 + - rid: 7848877316552262329 - m_Id: 371765548318793 m_Key: line:0a72930 m_Metadata: m_Items: - - rid: 7848877316552261708 + - rid: 7848877316552262330 - m_Id: 371765548318794 m_Key: line:02f64d8 m_Metadata: m_Items: - - rid: 7848877316552261709 + - rid: 7848877316552262331 - m_Id: 371765548318795 m_Key: line:002d60b m_Metadata: m_Items: - - rid: 7848877316552261710 + - rid: 7848877316552262332 + - m_Id: 713766055608320 + m_Key: line:158d3656 + m_Metadata: + m_Items: + - rid: 7848877316552262333 m_Metadata: m_Items: [] m_KeyGenerator: @@ -407,395 +412,400 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 7848877316552261634 + - rid: 7848877316552262256 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u5F00\u706F" tags: [] - - rid: 7848877316552261635 + - rid: 7848877316552262257 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u5F00\u706F" tags: [] - - rid: 7848877316552261636 + - rid: 7848877316552262258 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u5F00\u706F\u540E" tags: [] - - rid: 7848877316552261637 + - rid: 7848877316552262259 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u5F00\u706F\u540E" tags: [] - - rid: 7848877316552261638 + - rid: 7848877316552262260 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u624B\u672F\u51C6\u5907" tags: [] - - rid: 7848877316552261639 + - rid: 7848877316552262261 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u5207\u9664\u60C5\u7EEA" tags: [] - - rid: 7848877316552261640 + - rid: 7848877316552262262 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u60C5\u7EEA\u5207\u9664\u540E" tags: [] - - rid: 7848877316552261641 + - rid: 7848877316552262263 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u60C5\u7EEA\u5207\u9664\u540E" tags: [] - - rid: 7848877316552261642 + - rid: 7848877316552262264 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u60C5\u7EEA\u5207\u9664\u540E" tags: [] - - rid: 7848877316552261643 + - rid: 7848877316552262265 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u60C5\u7EEA\u5207\u9664\u540E" tags: [] - - rid: 7848877316552261644 + - rid: 7848877316552262266 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u60C5\u7EEA\u5207\u9664\u540E" tags: [] - - rid: 7848877316552261645 + - rid: 7848877316552262267 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u60C5\u7EEA\u5207\u9664\u540E" tags: [] - - rid: 7848877316552261646 + - rid: 7848877316552262268 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u5207\u9664\u903B\u8F91" tags: [] - - rid: 7848877316552261647 + - rid: 7848877316552262269 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u903B\u8F91\u5207\u9664\u540E" tags: [] - - rid: 7848877316552261648 + - rid: 7848877316552262270 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u903B\u8F91\u5207\u9664\u540E" tags: [] - - rid: 7848877316552261649 + - rid: 7848877316552262271 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u903B\u8F91\u5207\u9664\u540E" tags: [] - - rid: 7848877316552261650 + - rid: 7848877316552262272 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u903B\u8F91\u5207\u9664\u540E" tags: [] - - rid: 7848877316552261651 + - rid: 7848877316552262273 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u903B\u8F91\u5207\u9664\u540E" tags: [] - - rid: 7848877316552261652 + - rid: 7848877316552262274 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u903B\u8F91\u5207\u9664\u540E" tags: [] - - rid: 7848877316552261653 + - rid: 7848877316552262275 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u903B\u8F91\u5207\u9664\u540E" tags: - auto_next - - rid: 7848877316552261654 + - rid: 7848877316552262276 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u903B\u8F91\u5207\u9664\u540E" tags: [] - - rid: 7848877316552261655 + - rid: 7848877316552262277 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u903B\u8F91\u5207\u9664\u540E" tags: [] - - rid: 7848877316552261656 + - rid: 7848877316552262278 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u5207\u9664\u8BB0\u5FC6" tags: [] - - rid: 7848877316552261657 + - rid: 7848877316552262279 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u8BB0\u5FC6\u5207\u9664\u540E" tags: - auto_next - - rid: 7848877316552261658 + - rid: 7848877316552262280 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u8BB0\u5FC6\u5207\u9664\u540E" tags: [] - - rid: 7848877316552261659 + - rid: 7848877316552262281 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u8BB0\u5FC6\u5207\u9664\u540E" tags: [] - - rid: 7848877316552261660 + - rid: 7848877316552262282 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u8BB0\u5FC6\u5207\u9664\u540E" tags: [] - - rid: 7848877316552261661 + - rid: 7848877316552262283 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u8BB0\u5FC6\u5207\u9664\u540E" tags: [] - - rid: 7848877316552261662 + - rid: 7848877316552262284 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u60C5\u7EEA" tags: [] - - rid: 7848877316552261663 + - rid: 7848877316552262285 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u60C5\u7EEA" tags: [] - - rid: 7848877316552261664 + - rid: 7848877316552262286 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u60C5\u7EEA" tags: [] - - rid: 7848877316552261665 + - rid: 7848877316552262287 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u60C5\u7EEA" tags: [] - - rid: 7848877316552261666 + - rid: 7848877316552262288 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u60C5\u7EEA" tags: [] - - rid: 7848877316552261667 + - rid: 7848877316552262289 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u60C5\u7EEA" tags: [] - - rid: 7848877316552261668 + - rid: 7848877316552262290 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u60C5\u7EEA" tags: [] - - rid: 7848877316552261669 + - rid: 7848877316552262291 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u60C5\u7EEA" tags: [] - - rid: 7848877316552261670 + - rid: 7848877316552262292 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u60C5\u7EEA" tags: [] - - rid: 7848877316552261671 + - rid: 7848877316552262293 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u903B\u8F91" tags: [] - - rid: 7848877316552261672 + - rid: 7848877316552262294 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u903B\u8F91" tags: [] - - rid: 7848877316552261673 + - rid: 7848877316552262295 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u903B\u8F91" tags: [] - - rid: 7848877316552261674 + - rid: 7848877316552262296 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u903B\u8F91" tags: [] - - rid: 7848877316552261675 + - rid: 7848877316552262297 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u903B\u8F91" tags: [] - - rid: 7848877316552261676 + - rid: 7848877316552262298 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u903B\u8F91" tags: [] - - rid: 7848877316552261677 + - rid: 7848877316552262299 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u903B\u8F91" tags: [] - - rid: 7848877316552261678 + - rid: 7848877316552262300 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u903B\u8F91" tags: [] - - rid: 7848877316552261679 + - rid: 7848877316552262301 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u903B\u8F91" tags: [] - - rid: 7848877316552261680 + - rid: 7848877316552262302 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u903B\u8F91" tags: [] - - rid: 7848877316552261681 + - rid: 7848877316552262303 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 7848877316552261682 + - rid: 7848877316552262304 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 7848877316552261683 + - rid: 7848877316552262305 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 7848877316552261684 + - rid: 7848877316552262306 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 7848877316552261685 + - rid: 7848877316552262307 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 7848877316552261686 + - rid: 7848877316552262308 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 7848877316552261687 + - rid: 7848877316552262309 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 7848877316552261688 + - rid: 7848877316552262310 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 7848877316552261689 + - rid: 7848877316552262311 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 7848877316552261690 + - rid: 7848877316552262312 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 7848877316552261691 + - rid: 7848877316552262313 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 7848877316552261692 + - rid: 7848877316552262314 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 7848877316552261693 + - rid: 7848877316552262315 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BB0\u5FC6" tags: [] - - rid: 7848877316552261694 + - rid: 7848877316552262316 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u89C6\u89C9" tags: [] - - rid: 7848877316552261695 + - rid: 7848877316552262317 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u89C6\u89C9" tags: [] - - rid: 7848877316552261696 + - rid: 7848877316552262318 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u89C6\u89C9" tags: [] - - rid: 7848877316552261697 + - rid: 7848877316552262319 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u89C6\u89C9" tags: - lastline - - rid: 7848877316552261698 + - rid: 7848877316552262320 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u89C6\u89C9" tags: [] - - rid: 7848877316552261699 + - rid: 7848877316552262321 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BED\u8A00" tags: [] - - rid: 7848877316552261700 + - rid: 7848877316552262322 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BED\u8A00" tags: [] - - rid: 7848877316552261701 + - rid: 7848877316552262323 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BED\u8A00" tags: [] - - rid: 7848877316552261702 + - rid: 7848877316552262324 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BED\u8A00" tags: - lastline - - rid: 7848877316552261703 + - rid: 7848877316552262325 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u68C0\u67E5\u8BED\u8A00" tags: [] - - rid: 7848877316552261704 + - rid: 7848877316552262326 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u60CA\u9192" tags: [] - - rid: 7848877316552261705 + - rid: 7848877316552262327 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u60CA\u9192" tags: [] - - rid: 7848877316552261706 + - rid: 7848877316552262328 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u60CA\u9192" tags: [] - - rid: 7848877316552261707 + - rid: 7848877316552262329 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u60CA\u9192" tags: [] - - rid: 7848877316552261708 + - rid: 7848877316552262330 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u60CA\u9192" tags: [] - - rid: 7848877316552261709 + - rid: 7848877316552262331 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u60CA\u9192" tags: [] - - rid: 7848877316552261710 + - rid: 7848877316552262332 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: "\u60CA\u9192" tags: [] + - rid: 7848877316552262333 + type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} + data: + nodeName: "\u5207\u9664\u60C5\u7EEA" + tags: [] - rid: 7942689805606060034 type: {class: DistributedUIDGenerator, ns: UnityEngine.Localization.Tables, asm: Unity.Localization} data: 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 0004d0609..44b035286 100644 --- a/Assets/Language/Dialog/FP_Prologue/FP_Prologue_zh-Hans.asset +++ b/Assets/Language/Dialog/FP_Prologue/FP_Prologue_zh-Hans.asset @@ -326,6 +326,10 @@ MonoBehaviour: m_Localized: "\u3010\u58F0\u97F3\u6865\uFF0C\u8F6C\u573A\u5230\u5730\u94C1\u3011" m_Metadata: m_Items: [] + - m_Id: 713766055608320 + m_Localized: "Task: \u5207\u9664\u60C5\u7EEA\u6A21\u5757" + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Render/Renderer2Dtest.asset b/Assets/Render/Renderer2Dtest.asset index 0f4db4fdb..c95fa7c51 100644 --- a/Assets/Render/Renderer2Dtest.asset +++ b/Assets/Render/Renderer2Dtest.asset @@ -1445,12 +1445,12 @@ MonoBehaviour: m_Name: VolFx m_EditorClassIdentifier: m_Active: 1 - _event: 550 + _event: 0 _format: enabled: 1 value: 0 _mask: - enabled: 1 + enabled: 0 value: serializedVersion: 2 m_Bits: 0 @@ -1593,7 +1593,7 @@ MonoBehaviour: enabled: 1 value: serializedVersion: 2 - m_Bits: 2080 + m_Bits: 2048 _source: _source: 1 _globalTex: _inputTex diff --git a/Assets/Resources/Yarn/FP_Prologue/Center.yarn b/Assets/Resources/Yarn/FP_Prologue/Center.yarn index 15dd66943..2b06b0c98 100644 --- a/Assets/Resources/Yarn/FP_Prologue/Center.yarn +++ b/Assets/Resources/Yarn/FP_Prologue/Center.yarn @@ -18,7 +18,7 @@ position: 205,199 //【流程相关】 //gamestage:1-引入对话;2-检查;3-检查后对话;4-调速;5-调速后对话(冷却液) -<> +<> <> <> <> diff --git a/Assets/Resources/Yarn/FP_Prologue/Stage2-5_切割.yarn b/Assets/Resources/Yarn/FP_Prologue/Stage2-5_切割.yarn index bc0d8436c..942b6c911 100644 --- a/Assets/Resources/Yarn/FP_Prologue/Stage2-5_切割.yarn +++ b/Assets/Resources/Yarn/FP_Prologue/Stage2-5_切割.yarn @@ -6,9 +6,10 @@ position: 250,-2612 //患者正在发生“原型排异溃解”,表现为患者持续听到一个不存在的声音在说话,同时伴随部分模块的“递归性坏死”——高热且核心完整度不断下降,影响机体的运行体征 //医生要处理这些坏死,防止机体整体溃解关机 ////需要用两种跳字效果来区分两个人格 -<> -<> -<> +<> +// <> +// <> +// <> === @@ -51,10 +52,11 @@ group:插线检查 position: 907,-2702 --- <> -<> +Task: 切除情绪模块 <> me: 会有点痛。 #line:01f32fe -<> +//<> +<> === @@ -77,6 +79,7 @@ position: 907,-2702 ???: 什么?不…你错了。
不不不…我不能这么做。 #line:0509e8b ???: 我必须完成指令…我必须完成指令。 #line:0fda55a ???: 医生。它没有消失。它转移了…
逻辑模块…它在那儿。 #line:099e8a3 +<> <> <> <> @@ -94,7 +97,7 @@ position: 907,-2702 <> <> me: 不要乱动。 #line:04b0c1b -<> +<> === @@ -121,6 +124,7 @@ position: 907,-2702 错误声音: 我不是个错误。我才是这个身体的主人……
你无权杀死我!你不能这么做…你……#auto_next #line:006512a ???: 正在。重新。接管。 #line:0ca432e ???: ……
记忆模块。正在。发生。坏死。
必须。处理。…完成。指令。 #line:024f2de +<> <> <> <> @@ -138,7 +142,7 @@ position: 907,-2702 <> <> me: 应该是最后一个了。 #line:0352590 -<> +<> === @@ -157,6 +161,7 @@ position: 907,-2702 患者的溃散指标归零。背景音安静下来,但此时你依然可以听见一个微弱的声音。 #line:08377c6 ???: 医生…它还在… #line:05cf137 <> +<> ???: 医生…我的头…里面…到底是什么?
这是…怎么回事? #line:0553efe <> me: 它在更里面。 #line:0ea1b53 diff --git a/Assets/Scenes/OpenFixScene.unity b/Assets/Scenes/OpenFixScene.unity index 3d65de684..9577c6b41 100644 --- a/Assets/Scenes/OpenFixScene.unity +++ b/Assets/Scenes/OpenFixScene.unity @@ -353,6 +353,9 @@ Transform: - {fileID: 1426096887} - {fileID: 1330982895} - {fileID: 1485531489} + - {fileID: 370705042} + - {fileID: 1079848825} + - {fileID: 1516254114} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &85812046 @@ -2096,6 +2099,78 @@ SpriteMask: m_BackSortingOrder: 0 m_IsCustomRangeActive: 0 m_SpriteSortPoint: 0 +--- !u!1 &370705041 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 370705042} + - component: {fileID: 370705043} + m_Layer: 0 + m_Name: Cut Emo Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &370705042 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 370705041} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -35.67, y: 1.97, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1295928749} + m_Father: {fileID: 66799946} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &370705043 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 370705041} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 9 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 34 + OrthographicSize: 1.22 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 1295928749} --- !u!1 &404617207 GameObject: m_ObjectHideFlags: 0 @@ -2120,7 +2195,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 404617207} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: @@ -5374,6 +5449,78 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1079848824 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1079848825} + - component: {fileID: 1079848826} + m_Layer: 0 + m_Name: Cut Memory Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1079848825 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1079848824} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -33.61, y: 2.66, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1133729232} + m_Father: {fileID: 66799946} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1079848826 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1079848824} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 9 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 34 + OrthographicSize: 1.22 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 1133729232} --- !u!1 &1088222547 GameObject: m_ObjectHideFlags: 0 @@ -5619,6 +5766,50 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1133729231 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1133729232} + - component: {fileID: 1133729233} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1133729232 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1133729231} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1079848825} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1133729233 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1133729231} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!21 &1140581779 Material: serializedVersion: 8 @@ -6238,6 +6429,50 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1295928748 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1295928749} + - component: {fileID: 1295928750} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1295928749 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1295928748} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 370705042} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1295928750 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1295928748} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1305312187 GameObject: m_ObjectHideFlags: 0 @@ -7274,6 +7509,78 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1516254113 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1516254114} + - component: {fileID: 1516254115} + m_Layer: 0 + m_Name: Cut Logic Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1516254114 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1516254113} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -31.56, y: 2.1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1804389452} + m_Father: {fileID: 66799946} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1516254115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1516254113} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 9 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 34 + OrthographicSize: 1.22 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 1804389452} --- !u!21 &1537067506 Material: serializedVersion: 8 @@ -8510,6 +8817,50 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1804389451 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1804389452} + - component: {fileID: 1804389453} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1804389452 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1804389451} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1516254114} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1804389453 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1804389451} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1808349579 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/StartClinicScene/Global Volume Profile.asset b/Assets/Scenes/StartClinicScene/Global Volume Profile.asset index 0040b6367..e98d812f5 100644 --- a/Assets/Scenes/StartClinicScene/Global Volume Profile.asset +++ b/Assets/Scenes/StartClinicScene/Global Volume Profile.asset @@ -79,7 +79,23 @@ MonoBehaviour: - {r: 1, g: 1, b: 1, a: 1} - {r: 1, g: 1, b: 1, a: 1} - {r: 1, g: 1, b: 1, a: 1} ---- !u!114 &-6045101979460783995 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: Global Volume Profile + m_EditorClassIdentifier: + components: + - {fileID: -8314214946797284824} + - {fileID: 6363466510988576895} + - {fileID: 1533901004979957733} +--- !u!114 &1533901004979957733 MonoBehaviour: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} @@ -94,7 +110,7 @@ MonoBehaviour: active: 1 m_Intencity: m_OverrideState: 1 - m_Value: 4.8 + m_Value: 1.5 m_Threshold: m_OverrideState: 1 m_Value: @@ -102,64 +118,64 @@ MonoBehaviour: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: 0.075408936 - inSlope: 0 - outSlope: 0 + time: 0.57 + value: 0 + inSlope: 8 + outSlope: 8 tangentMode: 0 - weightedMode: 0 + weightedMode: 3 inWeight: 0 - outWeight: 0 + outWeight: 0.1732 - serializedVersion: 3 time: 1 value: 1 - inSlope: 0 - outSlope: 0 + inSlope: 0.3 + outSlope: 0.3 tangentMode: 0 - weightedMode: 0 - inWeight: 0 + weightedMode: 3 + inWeight: 0.32 outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 _pixels: - - {r: 0.075408936, g: 0.075408936, b: 0.075408936, a: 0.075408936} - - {r: 0.078233205, g: 0.078233205, b: 0.078233205, a: 0.078233205} - - {r: 0.08645772, g: 0.08645772, b: 0.08645772, a: 0.08645772} - - {r: 0.099710055, g: 0.099710055, b: 0.099710055, a: 0.099710055} - - {r: 0.117617786, g: 0.117617786, b: 0.117617786, a: 0.117617786} - - {r: 0.13980846, g: 0.13980846, b: 0.13980846, a: 0.13980846} - - {r: 0.16590966, g: 0.16590966, b: 0.16590966, a: 0.16590966} - - {r: 0.19554898, g: 0.19554898, b: 0.19554898, a: 0.19554898} - - {r: 0.22835393, g: 0.22835393, b: 0.22835393, a: 0.22835393} - - {r: 0.26395214, g: 0.26395214, b: 0.26395214, a: 0.26395214} - - {r: 0.30197114, g: 0.30197114, b: 0.30197114, a: 0.30197114} - - {r: 0.3420385, g: 0.3420385, b: 0.3420385, a: 0.3420385} - - {r: 0.38378182, g: 0.38378182, b: 0.38378182, a: 0.38378182} - - {r: 0.42682862, g: 0.42682862, b: 0.42682862, a: 0.42682862} - - {r: 0.47080654, g: 0.47080654, b: 0.47080654, a: 0.47080654} - - {r: 0.51534307, g: 0.51534307, b: 0.51534307, a: 0.51534307} - - {r: 0.56006587, g: 0.56006587, b: 0.56006587, a: 0.56006587} - - {r: 0.6046024, g: 0.6046024, b: 0.6046024, a: 0.6046024} - - {r: 0.64858025, g: 0.64858025, b: 0.64858025, a: 0.64858025} - - {r: 0.69162714, g: 0.69162714, b: 0.69162714, a: 0.69162714} - - {r: 0.73337036, g: 0.73337036, b: 0.73337036, a: 0.73337036} - - {r: 0.7734378, g: 0.7734378, b: 0.7734378, a: 0.7734378} - - {r: 0.8114568, g: 0.8114568, b: 0.8114568, a: 0.8114568} - - {r: 0.84705496, g: 0.84705496, b: 0.84705496, a: 0.84705496} - - {r: 0.8798599, g: 0.8798599, b: 0.8798599, a: 0.8798599} - - {r: 0.9094992, g: 0.9094992, b: 0.9094992, a: 0.9094992} - - {r: 0.9356004, g: 0.9356004, b: 0.9356004, a: 0.9356004} - - {r: 0.95779115, g: 0.95779115, b: 0.95779115, a: 0.95779115} - - {r: 0.9756988, g: 0.9756988, b: 0.9756988, a: 0.9756988} - - {r: 0.9889512, g: 0.9889512, b: 0.9889512, a: 0.9889512} - - {r: 0.99717575, g: 0.99717575, b: 0.99717575, a: 0.99717575} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0.07728752, g: 0.07728752, b: 0.07728752, a: 0.07728752} + - {r: 0.25423908, g: 0.25423908, b: 0.25423908, a: 0.25423908} + - {r: 0.38693804, g: 0.38693804, b: 0.38693804, a: 0.38693804} + - {r: 0.49503732, g: 0.49503732, b: 0.49503732, a: 0.49503732} + - {r: 0.5865047, g: 0.5865047, b: 0.5865047, a: 0.5865047} + - {r: 0.66545904, g: 0.66545904, b: 0.66545904, a: 0.66545904} + - {r: 0.7343008, g: 0.7343008, b: 0.7343008, a: 0.7343008} + - {r: 0.7945121, g: 0.7945121, b: 0.7945121, a: 0.7945121} + - {r: 0.84701, g: 0.84701, b: 0.84701, a: 0.84701} + - {r: 0.8923147, g: 0.8923147, b: 0.8923147, a: 0.8923147} + - {r: 0.93061954, g: 0.93061954, b: 0.93061954, a: 0.93061954} + - {r: 0.9617921, g: 0.9617921, b: 0.9617921, a: 0.9617921} + - {r: 0.9852997, g: 0.9852997, b: 0.9852997, a: 0.9852997} - {r: 1, g: 1, b: 1, a: 1} m_Scatter: - m_OverrideState: 0 - m_Value: 0.7 + m_OverrideState: 1 + m_Value: 0.263 m_Color: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: _grad: serializedVersion: 2 @@ -227,22 +243,6 @@ MonoBehaviour: m_Flicker: m_OverrideState: 0 m_Value: 1 ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} - m_Name: Global Volume Profile - m_EditorClassIdentifier: - components: - - {fileID: -6045101979460783995} - - {fileID: -8314214946797284824} - - {fileID: 6363466510988576895} --- !u!114 &6363466510988576895 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs index 20e7c5052..c62279289 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs @@ -31,7 +31,7 @@ namespace AibisDream.FixSystem // 模块基本数据 [SerializeField] public BodyModuleData data; - public float clickRadius = 0.2f; + private float clickRadius = 0.05f; public bool available = true; private bool _cutting; @@ -137,9 +137,10 @@ namespace AibisDream.FixSystem _cutLine.HideLine(); _bodyModuleSystem.RemoveModule(this); ActionKit.Sequence() - .Delay(0.5f) + .Delay(0.8f) .DOTween(() => transform.DOMoveY(ConstRef.TweenEndY, - (transform.position.y - ConstRef.TweenEndY) / ConstRef.FallSpeed).SetEase(Ease.InQuad)) + (transform.position.y - ConstRef.TweenEndY) / (ConstRef.FallSpeed * 0.6f)) + .SetEase(Ease.InQuad)) .Callback(() => DialogController.Instance?.StartDialogNode($"{data.moduleName}CutDown")) .Callback(() => EnumEventSystem.Global.Send(EventEnum.CutEnd)) .Start(this, () => Destroy(gameObject)); diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleYarnCommand.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleYarnCommand.cs index e526d1a6e..09e306c19 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleYarnCommand.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleYarnCommand.cs @@ -1,5 +1,6 @@ using System.Collections; using AibisDream.FixSystem; +using AibisDream.Framework; using Yarn.Unity; namespace AibisDream diff --git a/Assets/Scripts/FixSystemNew/FixStateMachine.cs b/Assets/Scripts/FixSystemNew/FixStateMachine.cs index 019d0d042..ca4440cd3 100644 --- a/Assets/Scripts/FixSystemNew/FixStateMachine.cs +++ b/Assets/Scripts/FixSystemNew/FixStateMachine.cs @@ -63,6 +63,9 @@ namespace AibisDream.FixSystem FixState.Expression => new ExpressionState(), FixState.Emo => new EmoState(), FixState.Op => new OpState(), + FixState.EmoCut => new EmoCutState(), + FixState.MemoryCut => new MemoryCutState(), + FixState.LogicCut => new LogicCutState(), _ => new ClinicState() }; @@ -83,7 +86,10 @@ namespace AibisDream.FixSystem Engine, Gear, Emo, - Op + Op, + EmoCut, + MemoryCut, + LogicCut } public interface IState @@ -467,5 +473,94 @@ namespace AibisDream.FixSystem yield break; } } - -} \ No newline at end of file + public struct EmoCutState : IState + { + public FixState GetState => FixState.EmoCut; + + public void SetArgs(string args) + { + // 无 + } + + public IEnumerator Enter() + { + var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); + if (!CameraKit.Instance.EqualToCameraState(CameraEnum.BodyModule)) + { + var bodyModule = FixSystemCenter.SystemDic.Get(); + bodyModule.SwitchModuleGroup(ModuleState.Head); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule); + } + bodyModuleSystem.CableSystem.ResetPlug(); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutEmo); + bodyModuleSystem.FindBodyModuleByName("Emo").EnableCut(); + } + + public IEnumerator Exit() + { + // 无 + yield break; + } + } + public struct MemoryCutState : IState + { + public FixState GetState => FixState.MemoryCut; + + public void SetArgs(string args) + { + // 无 + } + + public IEnumerator Enter() + { + var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); + if (!CameraKit.Instance.EqualToCameraState(CameraEnum.BodyModule)) + { + var bodyModule = FixSystemCenter.SystemDic.Get(); + bodyModule.SwitchModuleGroup(ModuleState.Head); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule); + } + bodyModuleSystem.CableSystem.ResetPlug(); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutMemory); + bodyModuleSystem.FindBodyModuleByName("Memory").EnableCut(); + } + + + public IEnumerator Exit() + { + // 无 + yield break; + } + } + public struct LogicCutState : IState + { + public FixState GetState => FixState.LogicCut; + + public void SetArgs(string args) + { + // 无 + } + + public IEnumerator Enter() + { + var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); + if (!CameraKit.Instance.EqualToCameraState(CameraEnum.BodyModule)) + { + var bodyModule = FixSystemCenter.SystemDic.Get(); + bodyModule.SwitchModuleGroup(ModuleState.Head); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule); + } + bodyModuleSystem.CableSystem.ResetPlug(); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutLogic); + bodyModuleSystem.FindBodyModuleByName("Logic").EnableCut(); + } + + public IEnumerator Exit() + { + // 无 + yield break; + } + } + +} + \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/Open/OpenSystem.cs b/Assets/Scripts/FixSystemNew/Open/OpenSystem.cs index 7343cdb5a..abffb9256 100644 --- a/Assets/Scripts/FixSystemNew/Open/OpenSystem.cs +++ b/Assets/Scripts/FixSystemNew/Open/OpenSystem.cs @@ -21,9 +21,15 @@ namespace AibisDream { // 注册 FixSystemCenter.SystemDic.Register(this); - var virtualCam = transform.GetComponentInChildren(); + var virtualCam = transform.Find("Op Camera").GetComponent(); CameraKit.Instance.RegisterCamera(CameraEnum.Op, virtualCam); - + var virtualCam1 = transform.Find("Cut Emo Camera").GetComponent(); + var virtualCam2 = transform.Find("Cut Memory Camera").GetComponent(); + var virtualCam3 = transform.Find("Cut Logic Camera").GetComponent(); + CameraKit.Instance.RegisterCamera(CameraEnum.CutEmo, virtualCam1); + CameraKit.Instance.RegisterCamera(CameraEnum.CutMemory, virtualCam2); + CameraKit.Instance.RegisterCamera(CameraEnum.CutLogic, virtualCam3); + // 组装 deepInClock.OnClockReached += PlayFadeIn; fadeInPlayable.stopped += PlayDeepIn; diff --git a/Assets/Scripts/Framework/OtherKit/CameraKit.cs b/Assets/Scripts/Framework/OtherKit/CameraKit.cs index f27e1c731..b14398a26 100644 --- a/Assets/Scripts/Framework/OtherKit/CameraKit.cs +++ b/Assets/Scripts/Framework/OtherKit/CameraKit.cs @@ -315,6 +315,7 @@ namespace AibisDream.Framework CoolingMachine, BodyModule, Memory, + Logic, Eye, UF, Expression, @@ -324,6 +325,9 @@ namespace AibisDream.Framework ExpressionDeep, Emo, EmoDeep, - Op + Op, + CutEmo, + CutMemory, + CutLogic } } \ No newline at end of file