Merge branch 'master' of http://server.bitfall.icu:3000/root/Net.Like.Xue.Tokyo

Assets/Artists/Configs/MoitionWrapping.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bec87cf68dfa12a4c854715057e17530
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Artists/Configs/MoitionWrapping/motion_wrapping_step_up.asset

@@ -0,0 +1,758 @@
+%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: 928e2ecfbd1ec0f469e1838b49a4dda9, type: 3}
+  m_Name: motion_wrapping_step_up
+  m_EditorClassIdentifier: 
+  animation: {fileID: -2993534804863918692, guid: b3f40610e0721964c9679e65bd5a61bd, type: 3}
+  rootX:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: -0.08298011
+      outSlope: -0.08298011
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.016666668
+      value: -0.0013830019
+      inSlope: -0.10712713
+      outSlope: -0.10712713
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.033333335
+      value: -0.0035709045
+      inSlope: -0.10495278
+      outSlope: -0.10495278
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.05
+      value: -0.004881428
+      inSlope: -0.07601152
+      outSlope: -0.07601152
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.06666667
+      value: -0.006104622
+      inSlope: -0.08360168
+      outSlope: -0.08360168
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.083333336
+      value: -0.007668151
+      inSlope: -0.08616826
+      outSlope: -0.08616826
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.1
+      value: -0.008976897
+      inSlope: -0.05469688
+      outSlope: -0.05469688
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.11666667
+      value: -0.00949138
+      inSlope: -0.014862484
+      outSlope: -0.014862484
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.13333334
+      value: -0.009472313
+      inSlope: 0.017590487
+      outSlope: 0.017590487
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.15
+      value: -0.008905031
+      inSlope: 0.041883454
+      outSlope: 0.041883454
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.16666667
+      value: -0.008076198
+      inSlope: 0.047886264
+      outSlope: 0.047886264
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.18333334
+      value: -0.007308822
+      inSlope: 0.047908712
+      outSlope: 0.047908712
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.2
+      value: -0.0064792414
+      inSlope: 0.055138856
+      outSlope: 0.055138856
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.21666667
+      value: -0.0054708603
+      inSlope: 0.056812443
+      outSlope: 0.056812443
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.23333333
+      value: -0.0045854934
+      inSlope: 0.03944141
+      outSlope: 0.03944141
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.25
+      value: -0.0041561467
+      inSlope: 0.018384555
+      outSlope: 0.018384555
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.26666668
+      value: -0.0039726747
+      inSlope: 0.005821073
+      outSlope: 0.005821073
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.28333336
+      value: -0.0039621107
+      inSlope: -0.0021974398
+      outSlope: -0.0021974398
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.30000004
+      value: -0.004045923
+      inSlope: -0.004802366
+      outSlope: -0.004802366
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.31666672
+      value: -0.0041221897
+      inSlope: -0.004265491
+      outSlope: -0.004265491
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.3333334
+      value: -0.004188106
+      inSlope: -0.002135316
+      outSlope: -0.002135316
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.35000008
+      value: -0.004193367
+      inSlope: 0.00028681452
+      outSlope: 0.00028681452
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.36666676
+      value: -0.0041785454
+      inSlope: 0.0016027723
+      outSlope: 0.0016027723
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.38333344
+      value: -0.004139941
+      inSlope: 0.0005543228
+      outSlope: 0.0005543228
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.40000013
+      value: -0.004160068
+      inSlope: -0.006602168
+      outSlope: -0.006602168
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.4166668
+      value: -0.0043600136
+      inSlope: -0.011996728
+      outSlope: -0.011996728
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  rootY:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 3.4377978
+      outSlope: 3.4377978
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.016666668
+      value: 0.057296634
+      inSlope: 3.2551374
+      outSlope: 3.2551374
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.033333335
+      value: 0.10850459
+      inSlope: 2.421196
+      outSlope: 2.421196
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.05
+      value: 0.13800317
+      inSlope: 1.4255959
+      outSlope: 1.4255959
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.06666667
+      value: 0.15602446
+      inSlope: 0.89975953
+      outSlope: 0.89975953
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.083333336
+      value: 0.16799515
+      inSlope: 0.5006165
+      outSlope: 0.5006165
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.1
+      value: 0.17271167
+      inSlope: 0.06542266
+      outSlope: 0.06542266
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.11666667
+      value: 0.17017591
+      inSlope: -0.31539908
+      outSlope: -0.31539908
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.13333334
+      value: 0.16219836
+      inSlope: -0.65315896
+      outSlope: -0.65315896
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.15
+      value: 0.14840394
+      inSlope: -0.8054084
+      outSlope: -0.8054084
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.16666667
+      value: 0.13535142
+      inSlope: -0.5194492
+      outSlope: -0.5194492
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.18333334
+      value: 0.13108897
+      inSlope: -0.13732554
+      outSlope: -0.13732554
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.2
+      value: 0.1307739
+      inSlope: 0.027381781
+      outSlope: 0.027381781
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.21666667
+      value: 0.1320017
+      inSlope: 0.14194073
+      outSlope: 0.14194073
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.23333333
+      value: 0.13550526
+      inSlope: 0.29066744
+      outSlope: 0.29066744
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.25
+      value: 0.14169061
+      inSlope: 0.4088561
+      outSlope: 0.4088561
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.26666668
+      value: 0.1491338
+      inSlope: 0.45389375
+      outSlope: 0.45389375
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.28333336
+      value: 0.15682042
+      inSlope: 0.4438069
+      outSlope: 0.4438069
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.30000004
+      value: 0.16392738
+      inSlope: 0.36845833
+      outSlope: 0.36845833
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.31666672
+      value: 0.16910237
+      inSlope: 0.2697531
+      outSlope: 0.2697531
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.3333334
+      value: 0.17291915
+      inSlope: 0.18699095
+      outSlope: 0.18699095
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.35000008
+      value: 0.1753354
+      inSlope: 0.11783113
+      outSlope: 0.11783113
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.36666676
+      value: 0.17684686
+      inSlope: 0.07837051
+      outSlope: 0.07837051
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.38333344
+      value: 0.17794776
+      inSlope: 0.05260165
+      outSlope: 0.05260165
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.40000013
+      value: 0.17860025
+      inSlope: 0.034629077
+      outSlope: 0.034629077
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.4166668
+      value: 0.17910206
+      inSlope: 0.030108666
+      outSlope: 0.030108666
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  rootZ:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: -0.8195056
+      outSlope: -0.8195056
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.016666668
+      value: -0.013658427
+      inSlope: -0.8265368
+      outSlope: -0.8265368
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.033333335
+      value: -0.027551226
+      inSlope: -0.52633464
+      outSlope: -0.52633464
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.05
+      value: -0.031202916
+      inSlope: -0.12196497
+      outSlope: -0.12196497
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.06666667
+      value: -0.031616725
+      inSlope: -0.05715061
+      outSlope: -0.05715061
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.083333336
+      value: -0.033107936
+      inSlope: -0.04945312
+      outSlope: -0.04945312
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.1
+      value: -0.033265162
+      inSlope: 0.05999694
+      outSlope: 0.05999694
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.11666667
+      value: -0.031108038
+      inSlope: 0.19819346
+      outSlope: 0.19819346
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.13333334
+      value: -0.026658712
+      inSlope: 0.37415504
+      outSlope: 0.37415504
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.15
+      value: -0.018636202
+      inSlope: 0.50067425
+      outSlope: 0.50067425
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.16666667
+      value: -0.009969572
+      inSlope: 0.4538896
+      outSlope: 0.4538896
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.18333334
+      value: -0.0035065506
+      inSlope: 0.35277975
+      outSlope: 0.35277975
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.2
+      value: 0.0017897524
+      inSlope: 0.28067246
+      outSlope: 0.28067246
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.21666667
+      value: 0.0058491975
+      inSlope: 0.22066423
+      outSlope: 0.22066423
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.23333333
+      value: 0.009145226
+      inSlope: 0.18823901
+      outSlope: 0.18823901
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.25
+      value: 0.012123831
+      inSlope: 0.16956092
+      outSlope: 0.16956092
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.26666668
+      value: 0.014797259
+      inSlope: 0.15974307
+      outSlope: 0.15974307
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.28333336
+      value: 0.017448604
+      inSlope: 0.14742269
+      outSlope: 0.14742269
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.30000004
+      value: 0.019711353
+      inSlope: 0.111071184
+      outSlope: 0.111071184
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.31666672
+      value: 0.02115098
+      inSlope: 0.076297835
+      outSlope: 0.076297835
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.3333334
+      value: 0.022254616
+      inSlope: 0.06985897
+      outSlope: 0.06985897
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.35000008
+      value: 0.023479614
+      inSlope: 0.0667855
+      outSlope: 0.0667855
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.36666676
+      value: 0.024480801
+      inSlope: 0.045195855
+      outSlope: 0.045195855
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.38333344
+      value: 0.024986144
+      inSlope: 0.022584293
+      outSlope: 0.022584293
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.40000013
+      value: 0.025233611
+      inSlope: 0.012994733
+      outSlope: 0.012994733
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.4166668
+      value: 0.025419302
+      inSlope: 0.01114144
+      outSlope: 0.01114144
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  useLinear:
+    x: 1
+    y: 1
+    z: 1
+  useAnimation:
+    x: 1
+    y: 1
+    z: 1
+  useWarping:
+    x: 1
+    y: 1
+    z: 1
+  useCollision: 0
+  playRateBasis: 1
+  phasesAmount: 1
+  warpPhases:
+  - tOffset: {x: 0, y: 0, z: 0}
+    rOffset: {x: 0, y: 0, z: 0}
+    startTime: 0
+    endTime: 1
+    minRate: 0
+    maxRate: 1
+    totalRootMotion: {x: 0.015415369, y: 0.2629776, z: 0.09194963}

Assets/Artists/Configs/MoitionWrapping/motion_wrapping_step_up.asset.meta

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

Assets/Artists/Scripts/Program.cs

@@ -79,7 +79,7 @@ namespace Net.Like.Xue.Tokyo
 
                 serviceProvider.GetRequiredService<IUXHud>();
 
-                serviceProvider.GetRequiredService<IUXDialogue>().SubtitleLanguage="zh-CN";
+                serviceProvider.GetRequiredService<IUXDialogue>();
 
                 serviceProvider.GetRequiredService<IUXLoadingMap>();
 

Assets/Artists/Scripts/UX/UXEscMenu.cs

@@ -41,6 +41,8 @@ namespace Net.Like.Xue.Tokyo.UX
         private Button _returnButton;
         [UXBindPath("exit-button")]
         private Button _exitButton;
+        [UXBindPath("enable-chs-toggle")]
+        private Toggle _enableChsToggle;
 
         private VisualTreeAsset _template;
         
@@ -126,6 +128,11 @@ namespace Net.Like.Xue.Tokyo.UX
             {
                 _returnButton.clicked += UXService.Return;
                 _exitButton.clicked +=()=> _gameMapService.StopMapAsync().Forget();
+                
+                _enableChsToggle.RegisterValueChangedCallback(x =>
+                {
+                    _uxDialogue.SubtitleLanguage = x.newValue ? "zh-CN" : string.Empty;
+                });
             }
 
             private string OnSubtitle(string arg)

Assets/Artists/UX/ui_esc_menu_dialogue-template.uxml

@@ -1,6 +1,6 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
     <Kamgam.UIToolkitBlurredBackground.BlurredBackground Blur-Tint="#000000C8" style="min-height: 64px; padding-top: 8px; padding-right: 8px; padding-bottom: 8px; padding-left: 8px;">
-        <ui:Label tabindex="-1" text="Label" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Label--0" class="tl" />
+        <ui:Label tabindex="-1" text="Label" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Label--0" class="tl" style="border-left-color: rgb(255, 255, 255); border-right-color: rgb(255, 255, 255); border-top-color: rgb(255, 255, 255); border-bottom-color: rgb(255, 255, 255); border-left-width: 4px; padding-left: 8px;" />
         <ui:VisualElement name="VisualElement--0">
             <ui:Label tabindex="-1" text="Chinese" parse-escape-sequences="true" display-tooltip-when-elided="true" enable-rich-text="false" />
             <ui:Label tabindex="-1" text="Japanese" parse-escape-sequences="true" display-tooltip-when-elided="true" />

Assets/Artists/UX/ui_menu_esc.uxml

@@ -3,10 +3,10 @@
     <Style src="project://database/Assets/BITKit/Unity/UX/Common/Common.uss?fileID=7433441132597879392&amp;guid=a3a69d3518fd02b489e721f3c5b0b539&amp;type=3#Common" />
     <Style src="project://database/Assets/Artists/UX/Style.uss?fileID=7433441132597879392&amp;guid=506d41b7c5d56a44bb5845e69055a5eb&amp;type=3#Style" />
     <ui:VisualElement name="Shadow" picking-mode="Ignore" class="default-background" />
-    <ui:VisualElement class="flex-center" style="flex-direction: row; min-height: 512px; min-width: 1024px;">
+    <ui:VisualElement class="flex-center" style="flex-direction: row; min-width: 10px; max-height: 80%; min-height: 600px;">
         <ui:VisualElement style="min-width: 512px; flex-grow: 1;">
             <ui:Label tabindex="-1" text="对话日志:" parse-escape-sequences="true" display-tooltip-when-elided="true" class="tl" style="font-size: 44px;" />
-            <ui:VisualElement style="flex-grow: 1;">
+            <ui:VisualElement style="flex-grow: 1; flex-direction: column-reverse; justify-content: flex-end;">
                 <ui:ScrollView>
                     <ui:VisualElement name="dialogue-container">
                         <ui:Instance template="ui_esc_menu_dialogue-template" name="ui_esc_menu_dialogue-template" />
@@ -16,7 +16,9 @@
         </ui:VisualElement>
         <ui:VisualElement style="width: 256px;">
             <ui:Button text="返回游戏" parse-escape-sequences="true" display-tooltip-when-elided="true" name="return-button" />
-            <ui:VisualElement style="flex-grow: 1;" />
+            <ui:VisualElement style="flex-grow: 1;">
+                <ui:Toggle label="对话显示双语中文" name="enable-chs-toggle" />
+            </ui:VisualElement>
             <ui:Button text="返回主菜单" parse-escape-sequences="true" display-tooltip-when-elided="true" name="exit-button" />
         </ui:VisualElement>
     </ui:VisualElement>

Assets/Artists/UX/ux_dialogue_template.uxml

@@ -4,7 +4,7 @@
         <ui:Label tabindex="-1" text=":" parse-escape-sequences="true" display-tooltip-when-elided="true" style="margin-top: 4px; margin-right: 4px; margin-bottom: 4px; margin-left: 4px; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; -unity-text-align: middle-left;" />
         <ui:VisualElement style="flex-grow: 1;">
             <ui:Label tabindex="-1" text="Statement" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Label--1" style="white-space: normal; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; -unity-text-align: middle-left;" />
-            <ui:Label tabindex="-1" text="Subtitle" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Label--2" style="white-space: normal; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; -unity-text-align: middle-left;" />
+            <ui:Label tabindex="-1" text="Subtitle" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Label--2" style="white-space: normal; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; -unity-text-align: middle-left; color: rgb(255, 164, 0);" />
         </ui:VisualElement>
     </ui:VisualElement>
 </ui:UXML>

Assets/AssetBundleCollectorSetting.asset

@@ -45,6 +45,14 @@ MonoBehaviour:
         FilterRuleName: CollectAll
         AssetTags: scriptable_object
         UserData: 
+      - CollectPath: Assets/Artists/Configs/MoitionWrapping
+        CollectorGUID: bec87cf68dfa12a4c854715057e17530
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackDirectory
+        FilterRuleName: CollectAll
+        AssetTags: scriptable_object
+        UserData: 
     - GroupName: Prefab
       GroupDesc: 
       AssetTags: