Merge branch 'develop' into feature/dialog

This commit is contained in:
2025-05-16 14:16:30 +08:00
11 changed files with 283 additions and 186 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Scenes/HuoShanEmoSceneTest.unity.meta
guid: 004d0a5c55f37834582101d1f97a7feb
guid: 09e9d8cde488b8d489c6988d55c962ee
========
guid: 020615eb526a782489f42bb8f48c395a
folderAsset: yes
@@ -19,387 +19,387 @@ MonoBehaviour:
m_Key: line:03c692e
m_Metadata:
m_Items:
- rid: 7848877297662951427
- rid: 7848877297662952018
- m_Id: 371765548318720
m_Key: line:06c79ca
m_Metadata:
m_Items:
- rid: 7848877297662951428
- rid: 7848877297662952019
- m_Id: 371765548318721
m_Key: line:00549b2
m_Metadata:
m_Items:
- rid: 7848877297662951429
- rid: 7848877297662952020
- m_Id: 371765548318722
m_Key: line:09748e9
m_Metadata:
m_Items:
- rid: 7848877297662951430
- rid: 7848877297662952021
- m_Id: 371765548318723
m_Key: line:02cb425
m_Metadata:
m_Items:
- rid: 7848877297662951431
- rid: 7848877297662952022
- m_Id: 371765548318724
m_Key: line:01f32fe
m_Metadata:
m_Items:
- rid: 7848877297662951432
- rid: 7848877297662952023
- m_Id: 371765548318725
m_Key: line:037a594
m_Metadata:
m_Items:
- rid: 7848877297662951433
- rid: 7848877297662952024
- m_Id: 371765548318726
m_Key: line:0d39771
m_Metadata:
m_Items:
- rid: 7848877297662951434
- rid: 7848877297662952025
- m_Id: 371765548318727
m_Key: line:054ce15
m_Metadata:
m_Items:
- rid: 7848877297662951435
- rid: 7848877297662952026
- m_Id: 371765548318728
m_Key: line:0509e8b
m_Metadata:
m_Items:
- rid: 7848877297662951436
- rid: 7848877297662952027
- m_Id: 371765548318729
m_Key: line:0fda55a
m_Metadata:
m_Items:
- rid: 7848877297662951437
- rid: 7848877297662952028
- m_Id: 371765548318730
m_Key: line:099e8a3
m_Metadata:
m_Items:
- rid: 7848877297662951438
- rid: 7848877297662952029
- m_Id: 371765548318731
m_Key: line:04b0c1b
m_Metadata:
m_Items:
- rid: 7848877297662951439
- rid: 7848877297662952030
- m_Id: 371765548318732
m_Key: line:0e795e0
m_Metadata:
m_Items:
- rid: 7848877297662951440
- rid: 7848877297662952031
- m_Id: 371765548318733
m_Key: line:095103b
m_Metadata:
m_Items:
- rid: 7848877297662951441
- rid: 7848877297662952032
- m_Id: 371765548318734
m_Key: line:037ee29
m_Metadata:
m_Items:
- rid: 7848877297662951442
- rid: 7848877297662952033
- m_Id: 371765548318735
m_Key: line:09238fc
m_Metadata:
m_Items:
- rid: 7848877297662951443
- rid: 7848877297662952034
- m_Id: 371765548318736
m_Key: line:0f05c8d
m_Metadata:
m_Items:
- rid: 7848877297662951444
- rid: 7848877297662952035
- m_Id: 371765548318737
m_Key: line:027615e
m_Metadata:
m_Items:
- rid: 7848877297662951445
- rid: 7848877297662952036
- m_Id: 371765548318738
m_Key: line:006512a
m_Metadata:
m_Items:
- rid: 7848877297662951446
- rid: 7848877297662952037
- m_Id: 371765548318739
m_Key: line:0ca432e
m_Metadata:
m_Items:
- rid: 7848877297662951447
- rid: 7848877297662952038
- m_Id: 371765548318740
m_Key: line:024f2de
m_Metadata:
m_Items:
- rid: 7848877297662951448
- rid: 7848877297662952039
- m_Id: 371765548318741
m_Key: line:0352590
m_Metadata:
m_Items:
- rid: 7848877297662951449
- rid: 7848877297662952040
- m_Id: 371765548318742
m_Key: line:0cf6d36
m_Metadata:
m_Items:
- rid: 7848877297662951450
- rid: 7848877297662952041
- m_Id: 371765548318743
m_Key: line:08377c6
m_Metadata:
m_Items:
- rid: 7848877297662951451
- rid: 7848877297662952042
- m_Id: 371765548318744
m_Key: line:05cf137
m_Metadata:
m_Items:
- rid: 7848877297662951452
- rid: 7848877297662952043
- m_Id: 371765548318745
m_Key: line:0553efe
m_Metadata:
m_Items:
- rid: 7848877297662951453
- rid: 7848877297662952044
- m_Id: 371765548318746
m_Key: line:0ea1b53
m_Metadata:
m_Items:
- rid: 7848877297662951454
- rid: 7848877297662952045
- m_Id: 371765548318747
m_Key: line:0e7b127
m_Metadata:
m_Items:
- rid: 7848877297662951455
- rid: 7848877297662952046
- m_Id: 371765548318748
m_Key: line:0348ba1
m_Metadata:
m_Items:
- rid: 7848877297662951456
- rid: 7848877297662952047
- m_Id: 371765548318749
m_Key: line:02a0fcf
m_Metadata:
m_Items:
- rid: 7848877297662951457
- rid: 7848877297662952048
- m_Id: 371765548318750
m_Key: line:05442fd
m_Metadata:
m_Items:
- rid: 7848877297662951458
- rid: 7848877297662952049
- m_Id: 371765548318751
m_Key: line:01ed870
m_Metadata:
m_Items:
- rid: 7848877297662951459
- rid: 7848877297662952050
- m_Id: 371765548318752
m_Key: line:02662fa
m_Metadata:
m_Items:
- rid: 7848877297662951460
- rid: 7848877297662952051
- m_Id: 371765548318753
m_Key: line:0135eb9
m_Metadata:
m_Items:
- rid: 7848877297662951461
- rid: 7848877297662952052
- m_Id: 371765548318754
m_Key: line:0d07afb
m_Metadata:
m_Items:
- rid: 7848877297662951462
- rid: 7848877297662952053
- m_Id: 371765548318755
m_Key: line:0c8cdb8
m_Metadata:
m_Items:
- rid: 7848877297662951463
- rid: 7848877297662952054
- m_Id: 371765548318756
m_Key: line:02b2195
m_Metadata:
m_Items:
- rid: 7848877297662951464
- rid: 7848877297662952055
- m_Id: 371765548318757
m_Key: line:0ff21b3
m_Metadata:
m_Items:
- rid: 7848877297662951465
- rid: 7848877297662952056
- m_Id: 371765548318758
m_Key: line:09e71e1
m_Metadata:
m_Items:
- rid: 7848877297662951466
- rid: 7848877297662952057
- m_Id: 371765548318759
m_Key: line:0c45957
m_Metadata:
m_Items:
- rid: 7848877297662951467
- rid: 7848877297662952058
- m_Id: 371765548318760
m_Key: line:0cd26c4
m_Metadata:
m_Items:
- rid: 7848877297662951468
- rid: 7848877297662952059
- m_Id: 371765548318761
m_Key: line:0a0b422
m_Metadata:
m_Items:
- rid: 7848877297662951469
- rid: 7848877297662952060
- m_Id: 371765548318762
m_Key: line:044a9a4
m_Metadata:
m_Items:
- rid: 7848877297662951470
- rid: 7848877297662952061
- m_Id: 371765548318763
m_Key: line:00ee7c7
m_Metadata:
m_Items:
- rid: 7848877297662951471
- rid: 7848877297662952062
- m_Id: 371765548318764
m_Key: line:020cb0a
m_Metadata:
m_Items:
- rid: 7848877297662951472
- rid: 7848877297662952063
- m_Id: 371765548318765
m_Key: line:090f82d
m_Metadata:
m_Items:
- rid: 7848877297662951473
- rid: 7848877297662952064
- m_Id: 371765548318766
m_Key: line:0d127c8
m_Metadata:
m_Items:
- rid: 7848877297662951474
- rid: 7848877297662952065
- m_Id: 371765548318767
m_Key: line:00ea64d
m_Metadata:
m_Items:
- rid: 7848877297662951475
- rid: 7848877297662952066
- m_Id: 371765548318768
m_Key: line:0ce000f
m_Metadata:
m_Items:
- rid: 7848877297662951476
- rid: 7848877297662952067
- m_Id: 371765548318769
m_Key: line:008fb97
m_Metadata:
m_Items:
- rid: 7848877297662951477
- rid: 7848877297662952068
- m_Id: 371765548318770
m_Key: line:08251a5
m_Metadata:
m_Items:
- rid: 7848877297662951478
- rid: 7848877297662952069
- m_Id: 371765548318771
m_Key: line:084b284
m_Metadata:
m_Items:
- rid: 7848877297662951479
- rid: 7848877297662952070
- m_Id: 371765548318772
m_Key: line:031572d
m_Metadata:
m_Items:
- rid: 7848877297662951480
- rid: 7848877297662952071
- m_Id: 371765548318773
m_Key: line:0e21b2b
m_Metadata:
m_Items:
- rid: 7848877297662951481
- rid: 7848877297662952072
- m_Id: 371765548318774
m_Key: line:04add2c
m_Metadata:
m_Items:
- rid: 7848877297662951482
- rid: 7848877297662952073
- m_Id: 371765548318775
m_Key: line:0b0f0ef
m_Metadata:
m_Items:
- rid: 7848877297662951483
- rid: 7848877297662952074
- m_Id: 371765548318776
m_Key: line:0c4c232
m_Metadata:
m_Items:
- rid: 7848877297662951484
- rid: 7848877297662952075
- m_Id: 371765548318777
m_Key: line:0304ad7
m_Metadata:
m_Items:
- rid: 7848877297662951485
- rid: 7848877297662952076
- m_Id: 371765548318778
m_Key: line:0dab2e6
m_Metadata:
m_Items:
- rid: 7848877297662951486
- rid: 7848877297662952077
- m_Id: 371765548318779
m_Key: line:005c0b8
m_Metadata:
m_Items:
- rid: 7848877297662951487
- rid: 7848877297662952078
- m_Id: 371765548318780
m_Key: line:08d9eb2
m_Metadata:
m_Items:
- rid: 7848877297662951488
- rid: 7848877297662952079
- m_Id: 371765548318781
m_Key: line:09bc69e
m_Metadata:
m_Items:
- rid: 7848877297662951489
- rid: 7848877297662952080
- m_Id: 371765548318782
m_Key: line:0286596
m_Metadata:
m_Items:
- rid: 7848877297662951490
- rid: 7848877297662952081
- m_Id: 371765548318783
m_Key: line:02b2f2f
m_Metadata:
m_Items:
- rid: 7848877297662951491
- rid: 7848877297662952082
- m_Id: 371765548318784
m_Key: line:095d856
m_Metadata:
m_Items:
- rid: 7848877297662951492
- rid: 7848877297662952083
- m_Id: 371765548318785
m_Key: line:0995165
m_Metadata:
m_Items:
- rid: 7848877297662951493
- rid: 7848877297662952084
- m_Id: 371765548318786
m_Key: line:0382726
m_Metadata:
m_Items:
- rid: 7848877297662951494
- rid: 7848877297662952085
- m_Id: 371765548318787
m_Key: line:0668599
m_Metadata:
m_Items:
- rid: 7848877297662951495
- rid: 7848877297662952086
- m_Id: 371765548318788
m_Key: line:0cbf347
m_Metadata:
m_Items:
- rid: 7848877297662951496
- rid: 7848877297662952087
- m_Id: 371765548318789
m_Key: line:07f6601
m_Metadata:
m_Items:
- rid: 7848877297662951497
- rid: 7848877297662952088
- m_Id: 371765548318790
m_Key: line:07401ee
m_Metadata:
m_Items:
- rid: 7848877297662951498
- rid: 7848877297662952089
- m_Id: 371765548318791
m_Key: line:05c76b0
m_Metadata:
m_Items:
- rid: 7848877297662951499
- rid: 7848877297662952090
- m_Id: 371765548318792
m_Key: line:0c3c692
m_Metadata:
m_Items:
- rid: 7848877297662951500
- rid: 7848877297662952091
- m_Id: 371765548318793
m_Key: line:0a72930
m_Metadata:
m_Items:
- rid: 7848877297662951501
- rid: 7848877297662952092
- m_Id: 371765548318794
m_Key: line:02f64d8
m_Metadata:
m_Items:
- rid: 7848877297662951502
- rid: 7848877297662952093
- m_Id: 371765548318795
m_Key: line:002d60b
m_Metadata:
m_Items:
- rid: 7848877297662951503
- rid: 7848877297662952094
m_Metadata:
m_Items: []
m_KeyGenerator:
@@ -407,391 +407,391 @@ MonoBehaviour:
references:
version: 2
RefIds:
- rid: 7848877297662951427
- rid: 7848877297662952018
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u5F00\u706F"
tags: []
- rid: 7848877297662951428
- rid: 7848877297662952019
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u5F00\u706F"
tags: []
- rid: 7848877297662951429
- rid: 7848877297662952020
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u5F00\u706F\u540E"
tags: []
- rid: 7848877297662951430
- rid: 7848877297662952021
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u5F00\u706F\u540E"
tags: []
- rid: 7848877297662951431
- rid: 7848877297662952022
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u624B\u672F\u51C6\u5907"
tags: []
- rid: 7848877297662951432
- rid: 7848877297662952023
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u5207\u9664\u60C5\u7EEA"
tags: []
- rid: 7848877297662951433
- rid: 7848877297662952024
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u60C5\u7EEA\u5207\u9664\u540E"
tags: []
- rid: 7848877297662951434
- rid: 7848877297662952025
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u60C5\u7EEA\u5207\u9664\u540E"
tags: []
- rid: 7848877297662951435
- rid: 7848877297662952026
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u60C5\u7EEA\u5207\u9664\u540E"
tags: []
- rid: 7848877297662951436
- rid: 7848877297662952027
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u60C5\u7EEA\u5207\u9664\u540E"
tags: []
- rid: 7848877297662951437
- rid: 7848877297662952028
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u60C5\u7EEA\u5207\u9664\u540E"
tags: []
- rid: 7848877297662951438
- rid: 7848877297662952029
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u60C5\u7EEA\u5207\u9664\u540E"
tags: []
- rid: 7848877297662951439
- rid: 7848877297662952030
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u5207\u9664\u903B\u8F91"
tags: []
- rid: 7848877297662951440
- rid: 7848877297662952031
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u903B\u8F91\u5207\u9664\u540E"
tags: []
- rid: 7848877297662951441
- rid: 7848877297662952032
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u903B\u8F91\u5207\u9664\u540E"
tags: []
- rid: 7848877297662951442
- rid: 7848877297662952033
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u903B\u8F91\u5207\u9664\u540E"
tags: []
- rid: 7848877297662951443
- rid: 7848877297662952034
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u903B\u8F91\u5207\u9664\u540E"
tags: []
- rid: 7848877297662951444
- rid: 7848877297662952035
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u903B\u8F91\u5207\u9664\u540E"
tags: []
- rid: 7848877297662951445
- rid: 7848877297662952036
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u903B\u8F91\u5207\u9664\u540E"
tags: []
- rid: 7848877297662951446
- rid: 7848877297662952037
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u903B\u8F91\u5207\u9664\u540E"
tags:
- auto_next
- rid: 7848877297662951447
- rid: 7848877297662952038
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u903B\u8F91\u5207\u9664\u540E"
tags: []
- rid: 7848877297662951448
- rid: 7848877297662952039
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u903B\u8F91\u5207\u9664\u540E"
tags: []
- rid: 7848877297662951449
- rid: 7848877297662952040
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u5207\u9664\u8BB0\u5FC6"
tags: []
- rid: 7848877297662951450
- rid: 7848877297662952041
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u8BB0\u5FC6\u5207\u9664\u540E"
tags:
- auto_next
- rid: 7848877297662951451
- rid: 7848877297662952042
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u8BB0\u5FC6\u5207\u9664\u540E"
tags: []
- rid: 7848877297662951452
- rid: 7848877297662952043
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u8BB0\u5FC6\u5207\u9664\u540E"
tags: []
- rid: 7848877297662951453
- rid: 7848877297662952044
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u8BB0\u5FC6\u5207\u9664\u540E"
tags: []
- rid: 7848877297662951454
- rid: 7848877297662952045
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u8BB0\u5FC6\u5207\u9664\u540E"
tags: []
- rid: 7848877297662951455
- rid: 7848877297662952046
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u60C5\u7EEA"
tags: []
- rid: 7848877297662951456
- rid: 7848877297662952047
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u60C5\u7EEA"
tags: []
- rid: 7848877297662951457
- rid: 7848877297662952048
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u60C5\u7EEA"
tags: []
- rid: 7848877297662951458
- rid: 7848877297662952049
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u60C5\u7EEA"
tags: []
- rid: 7848877297662951459
- rid: 7848877297662952050
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u60C5\u7EEA"
tags: []
- rid: 7848877297662951460
- rid: 7848877297662952051
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u60C5\u7EEA"
tags: []
- rid: 7848877297662951461
- rid: 7848877297662952052
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u60C5\u7EEA"
tags: []
- rid: 7848877297662951462
- rid: 7848877297662952053
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u60C5\u7EEA"
tags: []
- rid: 7848877297662951463
- rid: 7848877297662952054
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u60C5\u7EEA"
tags: []
- rid: 7848877297662951464
- rid: 7848877297662952055
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u903B\u8F91"
tags: []
- rid: 7848877297662951465
- rid: 7848877297662952056
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u903B\u8F91"
tags: []
- rid: 7848877297662951466
- rid: 7848877297662952057
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u903B\u8F91"
tags: []
- rid: 7848877297662951467
- rid: 7848877297662952058
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u903B\u8F91"
tags: []
- rid: 7848877297662951468
- rid: 7848877297662952059
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u903B\u8F91"
tags: []
- rid: 7848877297662951469
- rid: 7848877297662952060
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u903B\u8F91"
tags: []
- rid: 7848877297662951470
- rid: 7848877297662952061
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u903B\u8F91"
tags: []
- rid: 7848877297662951471
- rid: 7848877297662952062
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u903B\u8F91"
tags: []
- rid: 7848877297662951472
- rid: 7848877297662952063
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u903B\u8F91"
tags: []
- rid: 7848877297662951473
- rid: 7848877297662952064
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u903B\u8F91"
tags: []
- rid: 7848877297662951474
- rid: 7848877297662952065
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u8BB0\u5FC6"
tags: []
- rid: 7848877297662951475
- rid: 7848877297662952066
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u8BB0\u5FC6"
tags: []
- rid: 7848877297662951476
- rid: 7848877297662952067
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u8BB0\u5FC6"
tags: []
- rid: 7848877297662951477
- rid: 7848877297662952068
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u8BB0\u5FC6"
tags: []
- rid: 7848877297662951478
- rid: 7848877297662952069
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u8BB0\u5FC6"
tags: []
- rid: 7848877297662951479
- rid: 7848877297662952070
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u8BB0\u5FC6"
tags: []
- rid: 7848877297662951480
- rid: 7848877297662952071
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u8BB0\u5FC6"
tags: []
- rid: 7848877297662951481
- rid: 7848877297662952072
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u8BB0\u5FC6"
tags: []
- rid: 7848877297662951482
- rid: 7848877297662952073
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u8BB0\u5FC6"
tags: []
- rid: 7848877297662951483
- rid: 7848877297662952074
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u8BB0\u5FC6"
tags: []
- rid: 7848877297662951484
- rid: 7848877297662952075
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u8BB0\u5FC6"
tags: []
- rid: 7848877297662951485
- rid: 7848877297662952076
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u8BB0\u5FC6"
tags: []
- rid: 7848877297662951486
- rid: 7848877297662952077
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u8BB0\u5FC6"
tags: []
- rid: 7848877297662951487
- rid: 7848877297662952078
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u89C6\u89C9"
tags: []
- rid: 7848877297662951488
- rid: 7848877297662952079
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u89C6\u89C9"
tags: []
- rid: 7848877297662951489
- rid: 7848877297662952080
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u89C6\u89C9"
tags: []
- rid: 7848877297662951490
- rid: 7848877297662952081
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u89C6\u89C9"
tags:
- lastline
- rid: 7848877297662951491
- rid: 7848877297662952082
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u89C6\u89C9"
tags: []
- rid: 7848877297662951492
- rid: 7848877297662952083
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u8BED\u8A00"
tags: []
- rid: 7848877297662951493
- rid: 7848877297662952084
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u8BED\u8A00"
tags: []
- rid: 7848877297662951494
- rid: 7848877297662952085
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u8BED\u8A00"
tags: []
- rid: 7848877297662951495
- rid: 7848877297662952086
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u8BED\u8A00"
tags:
- lastline
- rid: 7848877297662951496
- rid: 7848877297662952087
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u68C0\u67E5\u8BED\u8A00"
tags: []
- rid: 7848877297662951497
- rid: 7848877297662952088
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u60CA\u9192"
tags: []
- rid: 7848877297662951498
- rid: 7848877297662952089
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u60CA\u9192"
tags: []
- rid: 7848877297662951499
- rid: 7848877297662952090
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u60CA\u9192"
tags: []
- rid: 7848877297662951500
- rid: 7848877297662952091
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u60CA\u9192"
tags: []
- rid: 7848877297662951501
- rid: 7848877297662952092
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u60CA\u9192"
tags: []
- rid: 7848877297662951502
- rid: 7848877297662952093
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u60CA\u9192"
tags: []
- rid: 7848877297662951503
- rid: 7848877297662952094
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u60CA\u9192"
@@ -18,7 +18,7 @@ position: 205,199
//【流程相关】
//gamestage:1-引入对话;2-检查;3-检查后对话;4-调速;5-调速后对话(冷却液)
<<declare $gameStage=1>>
<<declare $gameStage=2>>
<<declare $emoChecked=false>>
<<declare $logicChecked=false>>
<<declare $memoryChecked=false>>
@@ -120,4 +120,11 @@ title: HeadCoverCutDown
title: DeepInEnd
---
<<jump end>>
===
title: 拿起插头
---
<<if $gameStage==2>>
<<ModuleHightLight Emo true>>
<<endif>>
===
@@ -1,7 +1,7 @@
title: Stage2
tags:
group: 入口
position: 250,-2611
position: 250,-2612
---
//患者正在发生“原型排异溃解”,表现为患者持续听到一个不存在的声音在说话,同时伴随部分模块的“递归性坏死”——高热且核心完整度不断下降,影响机体的运行体征
//医生要处理这些坏死,防止机体整体溃解关机
@@ -17,18 +17,11 @@ position: 250,-2611
title: 手术准备
tags:
colorID: 8
position: 250,200
position: 251,-1917
---
???: 它就在情绪模块…我能感觉到。<br>让它停下…求求你了,医生。 #line:02cb425
<<add_task TaskManager "检查情绪模块">>
<<task_moveIn TaskManager>>
<<ModuleHightLight Emo true>>
<<ModuleHightLight Logic false>>
<<ModuleHightLight Memory false>>
<<ModuleHightLight Eye false>>
<<ModuleHightLight Speak false>>
<<ModuleHightLight LeftEye false>>
<<ModuleHightLight HeadCover>>
<<hide_dialog>>
<<wait 1>>
===
@@ -37,7 +30,7 @@ position: 250,200
title: 主维修界面_头部
position: 384,81
position: 637,-2064
---
<<if $gameStage==3 && visited("切除情绪")==false>>
<<jump Center>>
@@ -55,7 +48,7 @@ title: 切除情绪
tags:
colorID: 8
group:插线检查
position: 906,-585
position: 907,-2702
---
<<hide_dialog>>
<<add_task TaskManager "切除情绪模块">>
@@ -71,7 +64,7 @@ title: 情绪切除后
tags:
colorID: 8
group:插线检查
position: 906,-585
position: 907,-2702
---
<<set $emoRemoved = true>>
???: 啊…啊! #line:037a594
@@ -96,7 +89,7 @@ title: 切除逻辑
tags:
colorID: 8
group:插线检查
position: 906,-585
position: 907,-2702
---
<<hide_dialog>>
<<add_task TaskManager "切除逻辑模块">>
@@ -111,7 +104,7 @@ title: 逻辑切除后
tags:
colorID: 8
group:插线检查
position: 906,-585
position: 907,-2702
---
<<set $logicRemoved=true>>
???: 呃…啊… #line:0e795e0
@@ -140,7 +133,7 @@ title: 切除记忆
tags:
colorID: 8
group:插线检查
position: 906,-585
position: 907,-2702
---
<<hide_dialog>>
<<add_task TaskManager "切除记忆模块">>
@@ -155,7 +148,7 @@ title: 记忆切除后
tags:
colorID: 8
group:插线检查
position: 906,-585
position: 907,-2702
---
<<complete_task TaskManager "切除记忆模块">>
???: 呃呃呃呃呃呃呃呃#auto_next #line:0cf6d36
@@ -180,7 +173,7 @@ title: 检查情绪
tags:
colorID: 8
group:插线检查
position: 906,-585
position: 907,-2702
---
<<ModuleHightLight Emo false>>
<<complete_task TaskManager "检查情绪模块">>
@@ -212,7 +205,7 @@ title: 检查逻辑
tags:
colorID: 8
group:插线检查
position: 1381,-589
position: 1382,-2706
---
<<ModuleHightLight Logic false>>
<<if $gameStage == 2>>
@@ -249,7 +242,7 @@ title: 检查记忆
tags: 待编辑
colorID: 8
group:插线检查
position: 1148,-586
position: 1149,-2703
---
<<ModuleHightLight Memory false>>
<<if $emoRemoved == true>>
@@ -290,7 +283,7 @@ title: 检查视觉
tags: 待编辑
colorID: 8
group:插线检查
position: 1388,-386
position: 1389,-2503
---
<<wait 0.1>>
<<open_screen Eye>>
@@ -313,7 +306,7 @@ title: 检查语言
tags:
colorID: 8
group:插线检查
position: 1147,-223
position: 1148,-2340
---
<<wait 0.1>>
<<open_screen Speak>>
@@ -1,6 +1,6 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Shapes/LICENSE.meta
guid: 3cedab865549a294a838e0d3c1983677
guid: eacb35cb3dd6f0c4bb60192dcc946b0b
========
guid: 694cfa7c42f0b9547905f5db558699da
folderAsset: yes
+1 -1
View File
@@ -1,6 +1,6 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Shapes/Quick Start Guide.pdf.meta
guid: 97c69f5935086634d9aefe3228688196
guid: 8474bb1ed42baf8468764975726e32d2
========
guid: 23817f4f65de8da4f80b8816c4dc3d16
folderAsset: yes
+88 -1
View File
@@ -296,7 +296,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &66799944
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -938,6 +938,88 @@ SpriteMask:
m_BackSortingOrder: 0
m_IsCustomRangeActive: 1
m_SpriteSortPoint: 0
--- !u!1 &198450013
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 198450015}
- component: {fileID: 198450014}
m_Layer: 0
m_Name: Light 2D
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &198450014
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 198450013}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ComponentVersion: 1
m_LightType: 4
m_BlendStyleIndex: 0
m_FalloffIntensity: 0.5
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1
m_LightVolumeIntensity: 1
m_LightVolumeIntensityEnabled: 0
m_ApplyToSortingLayers: f3a9fe5c00000000bbbb5032670b9971b7e66ab5d3878c191da0cc5f7740d514351d35393d533d9a7dc3a93dad9d9e43a55d9d3c8db9e11bb33d1a38cd4376e253b7f3d03394c91221d98fe1c7af7730011a6676
m_LightCookieSprite: {fileID: 0}
m_DeprecatedPointLightCookieSprite: {fileID: 0}
m_LightOrder: 0
m_AlphaBlendOnOverlap: 0
m_OverlapOperation: 0
m_NormalMapDistance: 3
m_NormalMapQuality: 2
m_UseNormalMap: 0
m_ShadowIntensityEnabled: 0
m_ShadowIntensity: 0.75
m_ShadowVolumeIntensityEnabled: 0
m_ShadowVolumeIntensity: 0.75
m_LocalBounds:
m_Center: {x: 0, y: -0.00000011920929, z: 0}
m_Extent: {x: 0.9985302, y: 0.99853027, z: 0}
m_PointLightInnerAngle: 360
m_PointLightOuterAngle: 360
m_PointLightInnerRadius: 0
m_PointLightOuterRadius: 1
m_ShapeLightParametricSides: 5
m_ShapeLightParametricAngleOffset: 0
m_ShapeLightParametricRadius: 1
m_ShapeLightFalloffSize: 0.5
m_ShapeLightFalloffOffset: {x: 0, y: 0}
m_ShapePath:
- {x: -0.5, y: -0.5, z: 0}
- {x: 0.5, y: -0.5, z: 0}
- {x: 0.5, y: 0.5, z: 0}
- {x: -0.5, y: 0.5, z: 0}
--- !u!4 &198450015
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 198450013}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -21.22, y: 0.42158538, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &199118572
GameObject:
m_ObjectHideFlags: 0
@@ -4881,6 +4963,10 @@ PrefabInstance:
propertyPath: m_Name
value: Screen System
objectReference: {fileID: 0}
- target: {fileID: 3950570453712645596, guid: 7c9077b0433a4cf45812d3d82e129d9d, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -11050,3 +11136,4 @@ SceneRoots:
- {fileID: 994336031}
- {fileID: 66799946}
- {fileID: 9210352354887959608}
- {fileID: 198450015}
@@ -12,9 +12,15 @@ namespace AibisDream
[YarnCommand("enable_cut")]
public static void EnableCut(string moduleName)
{
Reset_Plug();
var cutModule = BodyModuleSystem.FindBodyModuleByName(moduleName);
cutModule.EnableCut();
}
[YarnCommand("Reset_Plug")]
public static void Reset_Plug()
{
BodyModuleSystem.CableSystem.ResetPlug();
}
[YarnCommand("ShowHeatMap")]
public static void ShowHeatMap()
@@ -119,5 +125,6 @@ namespace AibisDream
{
yield return PunchTapeSystem.StartCoroutine(PunchTapeSystem.PrintPunchTapes(count));
}
}
}
@@ -4,6 +4,7 @@ using AibisDream.Utility;
using DG.Tweening;
using UnityEngine;
using UnityEngine.EventSystems;
using Yarn;
namespace AibisDream.FixSystem
{
@@ -135,11 +136,12 @@ namespace AibisDream.FixSystem
GlobalVariableKit.IsPlugHighLight = false;
_sprite.material.SetFloat(ShineFade, 0);
// 拖拽后还要高亮其他组件
var bodyModuleSystem = FixSystemCenter.SystemDic.Get<BodyModuleSystem>();
foreach (var module in bodyModuleSystem.BodyModules)
{
module.Highlight(true);
}
// var bodyModuleSystem = FixSystemCenter.SystemDic.Get<BodyModuleSystem>();
// foreach (var module in bodyModuleSystem.BodyModules)
// {
// module.Highlight(true);
// }
DialogController.Instance.StartDialogNode("拿起插头");
}
// 开启拖拽
@@ -316,6 +316,7 @@ namespace AibisDream.Framework
EyeDeep,
ExpressionDeep,
Emo,
EmoDeep
EmoDeep,
Op
}
}