对话框调整

Assets/Language/ActorName/ActorName Shared Data.asset

@@ -131,6 +131,14 @@ MonoBehaviour:
     m_Key: Task
     m_Metadata:
       m_Items: []
+  - m_Id: 16629900499750912
+    m_Key: yl
+    m_Metadata:
+      m_Items: []
+  - m_Id: 16630053096919040
+    m_Key: hs
+    m_Metadata:
+      m_Items: []
   m_Metadata:
     m_Items: []
   m_KeyGenerator:

Assets/Language/ActorName/ActorName_en.asset

@@ -122,6 +122,14 @@ MonoBehaviour:
     m_Localized: MK1 Material Processing Module
     m_Metadata:
       m_Items: []
+  - m_Id: 16629900499750912
+    m_Localized: Yingli(Temp)
+    m_Metadata:
+      m_Items: []
+  - m_Id: 16630053096919040
+    m_Localized: Huoshan(Temp)
+    m_Metadata:
+      m_Items: []
   references:
     version: 2
     RefIds: []

Assets/Language/ActorName/ActorName_zh-Hans.asset

@@ -122,6 +122,14 @@ MonoBehaviour:
     m_Localized: "MK1\u578B\u7269\u6599\u5904\u7406\u6A21\u5757"
     m_Metadata:
       m_Items: []
+  - m_Id: 16629900499750912
+    m_Localized: "\u82F1\u7406"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 16630053096919040
+    m_Localized: "\u706B\u5C71"
+    m_Metadata:
+      m_Items: []
   references:
     version: 2
     RefIds: []

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

Assets/Scenes/Persistence.unity

@@ -1338,6 +1338,179 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1001 &71838975
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 781740447}
+    m_Modifications:
+    - target: {fileID: 215275187407609090, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 951630327, guid: ca909870d485bde44b1e652490df203f, type: 3}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 503.11
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 152.01999
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -402
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 73
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3741179239662950829, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4083462688583332915, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_Padding.m_Right
+      value: 40
+      objectReference: {fileID: 0}
+    - target: {fileID: 4083462688583332915, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_Padding.m_Bottom
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 5463321828217487701, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5463321828217487701, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5463321828217487701, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 433.11
+      objectReference: {fileID: 0}
+    - target: {fileID: 5463321828217487701, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 50.01
+      objectReference: {fileID: 0}
+    - target: {fileID: 5463321828217487701, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 246.555
+      objectReference: {fileID: 0}
+    - target: {fileID: 5463321828217487701, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -127.01999
+      objectReference: {fileID: 0}
+    - target: {fileID: 8272198623999747867, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8272198623999747867, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8272198623999747867, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 64.01
+      objectReference: {fileID: 0}
+    - target: {fileID: 8272198623999747867, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 32.01
+      objectReference: {fileID: 0}
+    - target: {fileID: 8272198623999747867, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 62.005
+      objectReference: {fileID: 0}
+    - target: {fileID: 8272198623999747867, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -46.004997
+      objectReference: {fileID: 0}
+    - target: {fileID: 8352794458094198668, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_Name
+      value: Bubble
+      objectReference: {fileID: 0}
+    - target: {fileID: 8352794458094198668, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8947926204029201251, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: testPivotType
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 8947926204029201251, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+      propertyPath: testBubbleStyle
+      value: 
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
 --- !u!1 &72512885
 GameObject:
   m_ObjectHideFlags: 0
@@ -5518,6 +5691,11 @@ MonoBehaviour:
       Data3: 1610383794
       Data4: -1468709119
     Path: event:/Amb/amb
+--- !u!224 &375324529 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 1284103664181101717, guid: 1f392e4cea7cf3943a25361ff1d1ff85, type: 3}
+  m_PrefabInstance: {fileID: 71838975}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &398552834
 GameObject:
   m_ObjectHideFlags: 0
@@ -10661,7 +10839,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 375324529}
   m_Father: {fileID: 238296903}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}

Assets/Scenes/SubWay.unity

@@ -268,6 +268,7 @@ Transform:
   m_Children:
   - {fileID: 1083958586}
   - {fileID: 1982073522}
+  - {fileID: 642531360}
   m_Father: {fileID: 1929645612}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &143273129
@@ -286,6 +287,51 @@ MonoBehaviour:
     dialogViewType: 7
     bubbleSlots: []
     bubbleOptionSlots: []
+--- !u!1 &163812960
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 163812961}
+  - component: {fileID: 163812962}
+  m_Layer: 0
+  m_Name: SubwayCenter
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &163812961
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 163812960}
+  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: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &163812962
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 163812960}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0e1a1832f60f72e449b07f1298eefa53, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  bubbleSlotGroup: {fileID: 143273129}
 --- !u!1 &226184625
 GameObject:
   m_ObjectHideFlags: 0
@@ -400,50 +446,6 @@ MonoBehaviour:
     - itemName: "\u8FD1\u666F\u697C\u623F2"
       assetAddressArray:
       - "Subway/\u591C\u665A\u7A97\u5916[HOUSEA]"
---- !u!1 &289670550
-GameObject:
-  m_ObjectHideFlags: 3
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 289670551}
-  - component: {fileID: 289670552}
-  m_Layer: 0
-  m_Name: cm
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &289670551
-Transform:
-  m_ObjectHideFlags: 3
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 289670550}
-  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: 954503315}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &289670552
-MonoBehaviour:
-  m_ObjectHideFlags: 3
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 289670550}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &380972587
 GameObject:
   m_ObjectHideFlags: 0
@@ -655,6 +657,58 @@ MonoBehaviour:
   hasDefaultActor: 0
   defaultActorType: 0
   defaultActorName: "\u5730\u94C1\u533B\u751F"
+--- !u!1 &642531359
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 642531360}
+  - component: {fileID: 642531361}
+  m_Layer: 0
+  m_Name: Aside
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &642531360
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 642531359}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 2.24, y: -1.9, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 143273128}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &642531361
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 642531359}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bbc0dde0e8b8a9c498545e1b5b508241, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+    slotPosition: {x: 0, y: 0, z: 0}
+    actorRole: 0
+    idx: 0
+    maxWidth: 1000
+    minWidth: 1000
+    bubbleStyle: {fileID: 11400000, guid: 489dcc2ac344d9044b7d4ef02a433eda, type: 2}
+    pivotType: 8
 --- !u!1 &644071841
 GameObject:
   m_ObjectHideFlags: 0
@@ -768,78 +822,6 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!1 &954503313
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 954503315}
-  - component: {fileID: 954503314}
-  m_Layer: 0
-  m_Name: Subway Camera
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &954503314
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 954503313}
-  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: 5
-    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: 289670551}
---- !u!4 &954503315
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 954503313}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 2.1, y: 0, z: -10}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 289670551}
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &975479657
 GameObject:
   m_ObjectHideFlags: 0
@@ -1591,7 +1573,7 @@ Transform:
   m_GameObject: {fileID: 1929645610}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -2.24, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2573,5 +2555,5 @@ Transform:
 SceneRoots:
   m_ObjectHideFlags: 0
   m_Roots:
+  - {fileID: 163812961}
   - {fileID: 1929645612}
-  - {fileID: 954503315}

Assets/ScriptableObjects/BubbleStyle/Subway Aside Style.asset

@@ -0,0 +1,21 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !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: 758f8de9462d3a54295cb2c1fc8ed407, type: 3}
+  m_Name: Subway Aside Style
+  m_EditorClassIdentifier: 
+  bubblePadding: {x: 30, y: 40, z: 30, w: 30}
+  linePadding: {x: 30, y: 10, z: 20, w: 10}
+  lineFontSize: 30
+  actorPadding: {x: 0, y: 0, z: 0, w: 0}
+  actorFontSize: 32
+  hasActorName: 0
+  bubbleSpriteAddress: "BubbleSprite/\u5927\u5BF9\u8BDD\u6846"

Assets/ScriptableObjects/BubbleStyle/Subway Aside Style.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 489dcc2ac344d9044b7d4ef02a433eda
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ScriptableObjects/BubbleStyle/Subway Style.asset

@@ -12,10 +12,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 758f8de9462d3a54295cb2c1fc8ed407, type: 3}
   m_Name: Subway Style
   m_EditorClassIdentifier: 
-  bubblePadding: {x: 30, y: 40, z: 55, w: 30}
+  bubblePadding: {x: 30, y: 40, z: 30, w: 55}
   linePadding: {x: 30, y: 10, z: 20, w: 10}
   lineFontSize: 30
   actorPadding: {x: 0, y: 0, z: 0, w: 0}
   actorFontSize: 32
-  hasActorName: 0
+  hasActorName: 1
   bubbleSpriteAddress: "BubbleSprite/\u5927\u5BF9\u8BDD\u6846"

Assets/Scripts/Dialog System/LocalisedLineProvider.cs

@@ -2,6 +2,8 @@
 using UnityEngine.Localization.Settings;
 using Yarn.Unity;
 using AibisDream.Framework;
+using AibisDream.Utility;
+using UnityEngine;
 
 namespace AibisDream
 {
@@ -24,12 +26,13 @@ namespace AibisDream
             }
 
             LocalizeSubstitutions(line);
+            var resText = CommonUtil.Escape(text);
 
             // Construct the localized line
             LocalizedLine localizedLine = new LocalizedLine
             {
                 TextID = line.ID,
-                RawText = text,
+                RawText = resText,
                 Substitutions = line.Substitutions,
                 Metadata = YarnProject.lineMetadata.GetMetadata(line.ID)
             };
@@ -53,6 +56,11 @@ namespace AibisDream
             return localizedLine;
         }
 
+        // private string Escape(string text)
+        // {
+        //     Debug
+        // }
+
         private void LocalizeSubstitutions(Yarn.Line line)
         {
             for (var i = 0; i < line.Substitutions.Length; i++)

Assets/Scripts/SceneManagement/EnvironmentKit/EnvironmentManager.cs

@@ -49,7 +49,7 @@ namespace AibisDream
     
     public static class EnvironmentYarnCommand
     {
-        [YarnCommand("init_emvironment")]
+        [YarnCommand("init_environment")]
         public static void InitEnvironment(string timeOfDay, string weatherType = "Sunny")
         {
             if (!Enum.TryParse<TimesOfDay>(timeOfDay, out var time))

Assets/Scripts/SubWay/OutsideCenter.cs

@@ -0,0 +1,16 @@
+using AibisDream.Kit;
+
+namespace AibisDream
+{
+    public class OutsideCenter : Singleton<OutsideCenter>
+    {
+        public BubbleSlotGroup bubbleSlotGroup;
+        
+        public override void OnSingletonInit()
+        {
+            // 加载气泡
+            DialogCanvasManager.Instance.SwitchDialogView(DialogViewType.StandardBubble);
+            BubbleGroup.Instance.LoadBubbles(bubbleSlotGroup.CollectData());
+        }
+    }
+}

Assets/Scripts/SubWay/OutsideCenter.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0e1a1832f60f72e449b07f1298eefa53
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs

@@ -67,7 +67,7 @@ namespace AibisDream
         private void InitRefs()
         {
             _typewriter = GetComponentInChildren<TypewriterCore>();
-            _actorName = transform.Find("名称")?.GetComponent<TMP_Text>();
+            _actorName = transform.Find("名称").GetComponent<TMP_Text>();
             _typewriter.onTextShowed.AddListener(() => EnumEventSystem.Global.Send(DialogEventEnum.LineShown));
             // 获取内容文字
             _lineText = _typewriter.GetComponent<TMP_Text>();
@@ -80,7 +80,7 @@ namespace AibisDream
 
         public void ShowActorName(CharacterVo characterVo)
         {
-            if (_actorName == null || !_actorName.gameObject.activeInHierarchy) return;
+            if (_actorName == null) return;
 
             _actorName.text = string.IsNullOrEmpty(characterVo.GetActorName())
                 ? string.Empty

Assets/Scripts/UI/DialogUI/Bubbles/BubbleFactory.cs

@@ -24,6 +24,7 @@ namespace AibisDream
             bubble.OnDisposed += o => _pool.Recycle(o);
 
             bubble.LoadConfig(data);
+            bubble.Hide();
 
             return bubble;
         }

Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs

@@ -23,6 +23,8 @@ namespace AibisDream
         private Action _nextStep;
         private Bubble _curBubble;
 
+        private IUnRegister _unRegister;
+
         #endregion
 
         #region 生命周期
@@ -30,7 +32,9 @@ namespace AibisDream
         public override void OnSingletonInit()
         {
             // 注册泡泡
-            EnumEventSystem.Global.Register(DialogEventEnum.OptionSelected, HideOptions);
+            _unRegister =
+                EnumEventSystem.Global.Register<DialogEventEnum, DialogText>(DialogEventEnum.OptionSelected,
+                    _ => HideOptions());
             // 工厂
             _bubbleFactory = new BubbleFactory(transform.Find("Bubbles"));
             // 加载选项
@@ -44,7 +48,7 @@ namespace AibisDream
 
         public override void OnSingletonDestroy()
         {
-            EnumEventSystem.Global.UnRegister(DialogEventEnum.OptionSelected, HideOptions);
+            _unRegister.UnRegister();
         }
 
         public void LoadBubbles(BubbleSlotGroupData groupData)
@@ -55,6 +59,7 @@ namespace AibisDream
             {
                 oldBubble.Dispose();
             }
+
             // 加载新泡泡
             _bubbleDict = groupData.bubbleSlots
                 .Select(item => _bubbleFactory.Create(item))
@@ -65,7 +70,7 @@ namespace AibisDream
             {
                 return;
             }
-            
+
             foreach (var optionSlotData in groupData.bubbleOptionSlots)
             {
                 if (optionSlotData.optionIdx >= _options.Length) continue;
@@ -113,6 +118,7 @@ namespace AibisDream
         public void ShowOptions(DialogOption[] dialogueOptions)
         {
             HideDialog();
+            Debug.Log($"Option Count {dialogueOptions.Length}");
             // 要求最多三个选项
             for (var i = 0; i < dialogueOptions.Length; i++)
             {

Assets/Scripts/UI/DialogUI/Bubbles/BubbleOption.cs

@@ -1,5 +1,4 @@
-using AibisDream.Framework;
-using TMPro;
+using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -14,7 +13,8 @@ namespace AibisDream
         
         public void Awake()
         {
-            _text = GetComponent<TMP_Text>();
+            _text = GetComponentInChildren<TMP_Text>();
+            _button = GetComponent<Button>();
         }
         
         public void LoadData(BubbleOptionSlotData data)
@@ -24,6 +24,7 @@ namespace AibisDream
 
         public void ShowOption(DialogOption dialogOption)
         {
+            gameObject.SetActive(true);
             _button.onClick.RemoveAllListeners();
             _text.text = "";
             // 清理旧数据

Assets/Scripts/UI/DialogUI/Bubbles/BubbleSlot.cs

@@ -62,6 +62,7 @@ namespace AibisDream
                 PivotType.TopRight => new Vector3(-0.5f, -0.5f, 0),
                 PivotType.BottomLeft => new Vector3(0.5f, 0.5f, 0),
                 PivotType.BottomRight => new Vector3(-0.5f, 0.5f, 0),
+                PivotType.Center => Vector3.zero,
                 _ => Vector3.zero
             };
         }

Assets/Scripts/UI/DialogUI/Bubbles/BubbleSlotGroup.cs

@@ -40,6 +40,7 @@ namespace AibisDream
         TopLeft,
         TopRight,
         BottomLeft,
-        BottomRight
+        BottomRight,
+        Center
     }
 }

Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs

@@ -45,8 +45,8 @@ namespace AibisDream
         private void Start()
         {
             // 默认对话框直接加载
-            var box = transform.Find("Dialog Box").GetComponent<IDialogView>();
-            RegisterDialogView(DialogViewType.OldBox, box);
+            // var box = transform.Find("Dialog Box").GetComponent<IDialogView>();
+            // RegisterDialogView(DialogViewType.OldBox, box);
             var centerText = transform.Find("Center Text").GetComponent<IDialogView>();
             RegisterDialogView(DialogViewType.CenterText, centerText);
             var centerOption = transform.Find("Center Option").GetComponent<IDialogView>();
@@ -54,7 +54,7 @@ namespace AibisDream
             var bubbleGroup = transform.Find("Bubble Group").GetComponent<IDialogView>();
             RegisterDialogView(DialogViewType.StandardBubble, bubbleGroup);
             
-            _defaultView = _dialogViewDict[DialogViewType.OldBox];
+            _defaultView = _dialogViewDict[DialogViewType.StandardBubble];
         }
 
         private void InitEvent()
@@ -171,8 +171,7 @@ namespace AibisDream
                 }
 
                 _showingView = _defaultView;
-
-                // 没有指定对话框，就用当前激活的
+                
                 _showingView.ShowLine(dialogLine, character, nextStep, lineId, isAutoSkip);
             }
             else if (_dialogViewDict.TryGetValue(character.dialogViewType, out var view))
@@ -267,7 +266,7 @@ namespace AibisDream
         {
             if (_dialogViewDict.TryGetValue(dialogViewType, out var view))
             {
-                _defaultView.HideDialog();
+                _defaultView?.HideDialog();
                 _showingView?.HideDialog();
                 _defaultView = view;
             }

Assets/Scripts/UI/DialogUI/TextBubble.cs

@@ -3,7 +3,9 @@ using AibisDream.Kit;
 using AibisDream.Utility;
 using Febucci.UI.Core;
 using TMPro;
+using Unity.VisualScripting;
 using UnityEngine;
+using Object = System.Object;
 
 namespace AibisDream.Framework
 {

Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using AibisDream.Framework;
 using AibisDream.Kit;
+using Unity.VisualScripting;
 using UnityEngine;
 
 namespace AibisDream
@@ -78,7 +79,10 @@ namespace AibisDream
         {
             foreach (var textBubble in _bubbleDict.Values.SelectMany(inner => inner))
             {
-                textBubble.Hide();
+                if (!textBubble.IsDestroyed())
+                {
+                    textBubble.Hide();
+                }
             }
         }
 
@@ -88,7 +92,7 @@ namespace AibisDream
             {
                 if (activeBubble != textBubble)
                 {
-                    textBubble.Hide();
+                    textBubble?.Hide();
                 }
             }
         }

Assets/Scripts/Utility/CommonUtil.cs

@@ -246,8 +246,14 @@ namespace AibisDream.Utility
                 PivotType.TopRight => new Vector2(1, 1),
                 PivotType.BottomLeft => new Vector2(0, 0),
                 PivotType.BottomRight => new Vector2(1, 0),
+                PivotType.Center => new Vector2(0.5f, 0.5f),
                 _ => Vector2.zero
             };
         }
+
+        public static string Escape(string rawText)
+        {
+            return rawText.Replace("^", "#").Replace("[[", "\\{").Replace("]]", "\\}");
+        }
     }
 }

Assets/StreamingAssets/Config/character.csv

@@ -30,3 +30,5 @@ CenterText,,,CenterText,Aside,,,
 CenterOption,,,CenterOption,Aside,,,
 Task,,,Task,Aside,,,
 TempText,,,Default,Aside,,,
+yl,英理,,Default,MainActor,,,
+hs,火山,,Default,MainActor,,,