Merge branch 'develop' into 'master'

3月问题修复

See merge request aibis-dream/aibis-dream!355

Assets/Font/Chusung-220206 SDF.asset.meta

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

Assets/Font/Chusung-220206.ttf.meta

@@ -0,0 +1,21 @@
+fileFormatVersion: 2
+guid: 381d5626f43f27b49983e9b2e8bce838
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontNames:
+  - Chusung
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Font/VonwaonBitmap-16px.ttf.meta

@@ -0,0 +1,21 @@
+fileFormatVersion: 2
+guid: ddb682af113b45541aaa9ca902a14016
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontNames:
+  - VonwaonBitmap 16px
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Font/常用简体汉字5000个.txt

@@ -5062,23 +5062,54 @@ B
 N
 M
 ，
+,
 。
+.
 、
+\
+/
 《
+<
 》
+>
 ？
+?
 ；
+;
 ：
+:
 ‘
 ’
+'
 “
 ”
+"
 【
+[
 】
+]
 {
 }
 （
+(
 ）
+)
 ！
+!
 ~
+`
+-
+_
+—
++
+=
+@
+#
+￥
+$
+%
+^
+…
+&
+*
 🎵

Assets/RawResources/齿轮/屏幕适应遮罩.png.meta

@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: 6cc1227684b7e6742ad1b9946b766592
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Prefabs/FontAsset/VonwaonBitmap-16px SDF.asset.meta

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

Assets/Resources/Prefabs/UI/Aside Text.prefab

@@ -102,6 +102,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   role: 0
+  idx: 0
   maxCharNum: 27
 --- !u!114 &2069893582614801070
 MonoBehaviour:
@@ -202,8 +203,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: "\u793A\u4F8B\u6587\u5B57\u793A\u4F8B\u6587"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
-  m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
+  m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []

Assets/Resources/Prefabs/UI/Box.prefab

@@ -18,7 +18,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8421241559617079726
 RectTransform:
   m_ObjectHideFlags: 0
@@ -35,8 +35,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 601.75, y: -173.93996}
+  m_AnchoredPosition: {x: 437, y: -151}
-  m_SizeDelta: {x: 916.934, y: 171.4201}
+  m_SizeDelta: {x: 760, y: 150}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5975286064066965976
 MonoBehaviour:
@@ -139,8 +139,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -630, y: 150}
+  m_AnchoredPosition: {x: -458, y: 95}
-  m_SizeDelta: {x: 196.84, y: 90}
+  m_SizeDelta: {x: 0, y: 90}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &3498389414712684730
 CanvasRenderer:
@@ -163,7 +163,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5188679, g: 0.5188679, b: 0.5188679, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 0}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -247,16 +247,16 @@ RectTransform:
   m_GameObject: {fileID: 5890622946834639560}
   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_LocalScale: {x: 1.2, y: 1.5, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7131956091114956203}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -142.28, y: 67.7}
+  m_AnchoredPosition: {x: -60, y: 35}
   m_SizeDelta: {x: 32, y: 19}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.49999997, y: 0.49999982}
 --- !u!222 &5639890485129627689
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -313,7 +313,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7131956091114956203
 RectTransform:
   m_ObjectHideFlags: 0
@@ -425,8 +425,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 613, y: -170}
+  m_AnchoredPosition: {x: 433, y: -150}
-  m_SizeDelta: {x: 939.4397, y: 132.6784}
+  m_SizeDelta: {x: 750, y: 140}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8735059991624197031
 CanvasRenderer:
@@ -450,16 +450,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u5BF9\u8BDD\u5185\u5BB9\u663E\u793A\u5728\u8FD9\u91CC<sub>\u652F\u6301\u5BCC\u6587\u672C</sub>"
+  m_text: "\u6211\u4EEC\u90FD\u662F\u6309\u7167\u6307\u4EE4\u5DE5\u4F5C\u7684\u673A\u4F53~\u4F46\u533B\u751F\uFF01\u4F60\u7684\u8FD9\u6B21\u5DE5\u4F5C~<br>\u5DF2\u7ECF\u53D8\u6210\u6211\u6C38\u8FDC\u7684\u56DE\u5FC6\u5566\uFF01"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
-  m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
+  m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -483,19 +483,19 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 46
+  m_fontSize: 32
-  m_fontSizeBase: 46
+  m_fontSizeBase: 32
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
+  m_HorizontalAlignment: 8
   m_VerticalAlignment: 256
   m_textAlignment: 65535
-  m_characterSpacing: 0
+  m_characterSpacing: 3
   m_wordSpacing: 0
-  m_lineSpacing: 0
+  m_lineSpacing: 32
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
@@ -504,7 +504,7 @@ MonoBehaviour:
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
+  m_enableKerning: 0
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
@@ -519,7 +519,7 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_margin: {x: 0, y: 0, z: -11.698608, w: -5.858551}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0
@@ -633,11 +633,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5969022388722944562}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 50, y: -45}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 96.84, y: 50.000004}
+  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0.5}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6323810537521366264
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -668,17 +668,17 @@ MonoBehaviour:
       m_Calls: []
   m_text: "\u82F1\u7406"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
-  m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
+  m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
+    rgba: 3238002687
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColor: {r: 1, g: 1, b: 1, a: 0.7529412}
   m_enableVertexGradient: 0
-  m_colorMode: 3
+  m_colorMode: 0
   m_fontColorGradient:
     topLeft: {r: 1, g: 1, b: 1, a: 1}
     topRight: {r: 1, g: 1, b: 1, a: 1}
@@ -693,13 +693,13 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 50
+  m_fontSize: 36
-  m_fontSizeBase: 50
+  m_fontSizeBase: 36
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 1
+  m_fontStyle: 8
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -709,7 +709,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_enableWordWrapping: 0
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -729,7 +729,7 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: -0.00021362305, w: 0}
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0

Assets/Resources/Prefabs/UI/Bubble Left Bottom.prefab

@@ -203,8 +203,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: "\u793A\u4F8B\u6587\u5B57"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
-  m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
+  m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []

Assets/Resources/Prefabs/UI/Bubble Left.prefab

@@ -132,6 +132,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   role: 2
+  idx: 0
   maxCharNum: 14
 --- !u!1 &6816142221905378472
 GameObject:
@@ -202,8 +203,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: "\u793A\u4F8B\u6587\u5B57"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
-  m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
+  m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []

Assets/Resources/Prefabs/UI/Bubble Right Bottom.prefab

@@ -69,8 +69,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: "\u793A\u4F8B\u6587\u5B57"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
-  m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
+  m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -344,4 +344,5 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   role: 1
+  idx: 0
   maxCharNum: 14

Assets/Resources/Prefabs/UI/Bubble Right.prefab

@@ -69,8 +69,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: "\u793A\u4F8B\u6587\u5B57"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
-  m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
+  m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -344,4 +344,5 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   role: 1
+  idx: 0
   maxCharNum: 14

Assets/Resources/Prefabs/UI/Center Choice Button.prefab

@@ -188,8 +188,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Button
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
-  m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
+  m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []

Assets/Resources/Prefabs/UI/Choice Button.prefab

@@ -233,8 +233,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: "\u9009\u9879\u4E00"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
-  m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
+  m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -258,15 +258,15 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 46
+  m_fontSize: 32
-  m_fontSizeBase: 46
+  m_fontSizeBase: 32
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
   m_fontStyle: 0
   m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
+  m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0

Assets/Resources/SpriteGroup/佩佩最新.prefab

@@ -226,7 +226,7 @@ Transform:
   m_GameObject: {fileID: 484818901331367303}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 1.61, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -794,7 +794,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &5416047270864748350
 Transform:
   m_ObjectHideFlags: 0
@@ -2336,7 +2336,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4009632713096831653
 Transform:
   m_ObjectHideFlags: 0

Assets/Resources/SpriteGroup/石头.prefab

@@ -361,8 +361,8 @@ Transform:
   m_GameObject: {fileID: 3259275819111110517}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -2.64, y: 0, z: 0}
+  m_LocalPosition: {x: -2.6, y: -0.15, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 1.1, y: 1.1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7878342799737288793}

Assets/Resources/Yarn/FP_Peipei2/Stage10_术前谈话2.yarn

@@ -78,7 +78,7 @@ peipei: 发热？为什么？……
 <<switch_character_state 默认蓝眼流汗A>>
 <<wait 2.5>>
 <<switch_character_state 默认蓝眼流汗无神微笑>>
-<<wait 1>>
+<<wait 0.7>>
 peipei: 我失败了，是吗？
 me: 是我的错。我不应该提出这么不负责任的方案。
 peipei: 它…坏了吗？
@@ -141,7 +141,7 @@ peipei: 我竟然一直…没有感觉到吗？还是说…<br>已经太久了
 <<switch_character_state 低头蓝眼>>
 <<wait 0.1>>
 <<switch_character_state 低头蓝眼侧目>>
-<<wait 0.8>>
+<<wait 1.2>>
 
 peipei: 医生，我是不是…你遇到过最没用的机体？<br>我是不是…早就该被回收了？
 <<hide_dialog>>
@@ -189,7 +189,7 @@ peipei: 就请再帮我把我的晶圆装到它原本应该在的地方吧。
 
 me: 你是说，你还是想把晶圆装上吗？但UF怎么办？这是不能解你的问题的。
 peipei: 别担心…这只是暂时的，我最后会回来做色彩抹除的。
-me: 也就是说…你想重新装上一段时间UF，然后在附近转转，然后回来重新拿下来，抹除记忆色彩，装上UF。对吧？
+me: 也就是说…你想重新装上一段时间色觉晶圆，<br>然后在附近转转，然后回来重新拿下来，<br>抹除记忆色彩，装上UF。对吧？
 me: 你没有打算装上之后就跑掉，然后找个地方躲起来，以为自己真的能逃避公司的惩罚，对吧？
 <<hide_dialog>>
 <<switch_character_state 默认闭眼I>>
@@ -218,15 +218,20 @@ peipei: 幸福市太小了…你知道我们走不掉。
     me: 你不会想这么做的。
     me: 况且…你刚刚发生了排异反应，这已经足够让我头疼了……
     me: 我不知道这会不会诱发什么更复杂的问题。
+    <<switch_character_state 默认蓝眼无神>>
     me: 你是我的病人，我不能把我的病人置于任何危险之中。
-    <<hide_dialog>>
-    <<switch_character_state 默认蓝眼无神I>>
-    <<wait 1>>
-    <<switch_character_state 默认闭眼>>
     peipei: 对不起…医生。
     peipei: 我只是突然冒出了这个想法。
-    peipei: 但我还是…
+    <<hide_dialog>>
+    <<switch_character_state 默认闭眼>>
+    <<wait 0.1>>
+    <<switch_character_state 默认蓝眼无神>>
+    <<wait 0.7>>
     <<switch_character_state 默认蓝眼无神I>>
+    <<wait 1.5>>
+    <<switch_character_state 默认闭眼>>
+    <<wait 0.2>>
+    peipei: 但我还是…
     peipei: 我很快就会回来的…我不会走远。不会有什么问题的……
     <<jump 色彩抹除选项组_level1>>
 ->CenterOption:同意安装色觉晶圆
@@ -242,21 +247,38 @@ title: 色彩抹除后续
 position: -265,-201
 ---
 peipei: 医生……
-<<switch_character_state 默认蓝眼扬眉E>>
+<<if $peipeiCry==false>>
+    <<switch_character_state 默认蓝眼E>>
+<<else>>
+    <<switch_character_state 默认流泪闭眼>>
+    <<wait 1>>
+    <<switch_character_state 默认蓝眼流泪>>
+    <<wait 0.1>>
+    <<switch_character_state 默认流泪闭眼>>
+    <<wait 1>>
+<<endif>>
 peipei: 如果你离开这里…你会去哪里？
 peipei: 但我是说真的，现在，你从这间诊所离开了……
 peipei: 你会去哪里？
 me: 我不知道。
 me: 我好像…无处可去。
 <<hide_dialog>>
+<<if $peipeiCry==false>>
     <<switch_character_state 默认蓝眼微笑>>
+<<else>>
+    <<switch_character_state 默认蓝眼流泪微笑>>
+<<endif>>
 <<wait 0.5>>
 peipei: 我们都没有也没有任何机会真的逃走。<br>不是吗？
 peipei: 我们都是没有家的人。
 peipei: 我的家在很远很远的南方……<br>但是那个地方已经早就不存在了。
 peipei: 我所拥有的…也就只有那些记忆罢了。<br>我能去的只有幸福市…只有这个罐头厂。
 peipei: 所以，我不可能离开的。医生。
+<<if $peipeiCry==false>>
     <<switch_character_state 默认闭眼>>
+<<else>>
+    <<switch_character_state 默认流泪闭眼>>
+<<endif>>
 peipei: 求求你了，帮我把晶圆装上去吧。
 <<hide_dialog>>
 <<wait 1>>
@@ -264,12 +286,15 @@ me: 如果我的患者要变成那个样子了…我想它应该也至少享有
 me: 再说了，这是你自己的选择……
 <<hide_dialog>>
 <<wait 1>>
+<<if $peipeiCry==false>>
     <<switch_character_state 默认闭眼>>
     <<wait 0.1>>
     <<switch_character_state 默认微笑闭眼>>
     <<wait 0.1>>
     <<switch_character_state 默认蓝眼无神微笑>>
-<<wait 1>>
+    <<switch_character_state 默认流泪闭眼>>
+    <<wait 0.1>>
+<<endif>>
 <<switch_character_state 默认微笑流泪闭眼>>
 <<wait 0.1>>
 <<switch_character_state 默认蓝眼流泪无神微笑>>
@@ -302,17 +327,20 @@ position: -739,-206
     me: 对不起，这风险太大了…<br>不符合最优化操作指令。
     <<hide_dialog>>
     <<wait 1>>
-    <<character_face_new "哭泣抿嘴">>   
+    <<switch_character_state 低头闭眼>>
-    <<character_pos "哭泣">>
+    <<wait 2>>
+    <<switch_character_state 低头流泪闭眼>>
+    <<set $peipeiCry=true>>
     <<wait 1>>
     peipei: 医生…求你了。
     peipei: 求你了……
     peipei: 我不要那样…
     <<hide_dialog>>
     <<wait 1>>
-    <<character_face_new "哭泣张嘴">>   
+    <<switch_character_state 低头蓝眼流泪张嘴>>
     <<wait 1>>
     peipei: 我不要忘掉那些色彩……
+    <<switch_character_state 低头蓝眼流泪>>
     <<jump 色彩抹除选择组_level2>>
 ->CenterOption:同意安装色觉晶圆
     me: 这意味着你会在看到颜色之后很快就失去它…你能接受吗？
@@ -348,38 +376,44 @@ position: -733,301
 me: 佩佩，你是我的患者…<br>我必须要对我的患者负责任。
 <<hide_dialog>>
 <<wait 2>>
-<<character_face_new "哭泣抿嘴">>   
+<<switch_character_state 低头流泪张嘴闭眼>>
-<<character_pos "哭泣">>
 <<wait 1>>
 me: 而且…你知道你逃不掉的，对吧？
 me: 你最后还是会要抹掉它们…这是不会有差别的。
 //me: 短暂的获得终将失去的美好…我想你会更痛苦。
 //如果因为认为别人会有这种感受而替他做选择，反而不合理；这里最好保持在理性上
 <<hide_dialog>>
-<<wait 1>>
+<<switch_character_state 低头流泪闭眼>>
-<<character_pos "无动作">>
+<<wait 0.5>>
-<<character_face_new "不开心">>
-<<wait 1>>
 peipei:………
 me: 我不知道你身体里的那个进程会不会什么时候又开始活跃。
 me: 那很危险，我不能将你置于危险之中。
 peipei:………
 <<hide_dialog>>
 <<wait 2>>
-<<character_face_new "闭眼">>
+<<switch_character_state 低头蓝眼流泪>>
-<<wait 2>>
+<<wait 0.1>>
+<<switch_character_state 低头流泪闭眼>>
+<<wait 0.1>>
+<<switch_character_state 低头蓝眼流泪>>
+<<wait 1>>
+<<switch_character_state 低头蓝眼侧目流泪>>
+<<wait 1>>
+<<switch_character_state 低头蓝眼侧目流泪张嘴>>
 peipei: 我会记得我曾经有过那些彩色的记忆吗？
 me: 你只会记得你曾经有一些记忆…
 me: 但不再记得它们是什么了。
 me: 就像梦一样。
 peipei: 就像梦一样…
+<<switch_character_state 低头流泪闭眼>>
 peipei: 医生……
 peipei: 请把它们清除得干净一些。                 
 peipei: 不要让我痛苦……
 <<hide_dialog>>
 <<wait 1>>
 me: 我会的。
-peipei: 我们去维修室吧。
+me: 我们去维修室吧。
+<<hide_dialog>>
 <<set $isPeipeiBE=true>>
 <<switch_fix_system_to BodyModule>>
 <<character_face_new "不开心">>

Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn

@@ -21,63 +21,69 @@ position: 275,-222
 ---
 <<set_music_param music peipeiEmo 0>>
 <<init_character "佩佩最新">>
-<<show_character>>
 <<switch_character_state 默认闭眼>>
+<<show_character>>
 <<fade_out 1>>
-<<character_auto_blink>>
-<<character_pos 佩佩背后别手>>
-<<character_face_new 闭眼>>
-<<wait 2>>
-<<character_face_new 不开心>>
-<<wait 2>>
-<<character_face_new 闭眼>>
 <<wait 1>>
-
+<<switch_character_state 默认无神>>
+<<wait 0.1>>
+<<switch_character_state 默认闭眼>>
+<<wait 0.1>>
+<<switch_character_state 默认无神>>
+<<wait 1>>
+<<switch_character_state 默认无神微笑>>
 peipei: …我这是怎么了？<br>明明早就已经看不见了。
 <<hide_dialog>>
 <<wait 1>>
 peipei: 怎么还这么优柔寡断的。
 <<hide_dialog>>
 <<wait 1>>
-<<character_face_new 闭眼>>
+<<switch_character_state 默认扬眉微笑闭眼>>
-<<wait 3>>
+<<wait 2>>
-<<character_face_new 微笑>>
+<<switch_character_state 默认扬眉无神E>>
-<<wait 1>>
 peipei: 像一场梦一样。
 <<hide_dialog>>
 <<wait 1>>
 me: 眼睛还会痛吗？
-<<character_face_new 嘴巴笑>>
+<<switch_character_state 默认扬眉无神微笑>>
 peipei: 不痛了。脑袋还有点晕，但我想应该是正常的，对吧？
 me: 记忆经过这么大程度的修改…<br>是的，感觉晕眩是正常的。很快就会恢复。
 me: 你还能…感受到那个念头吗？<br>那个…念头。
 
 <<hide_dialog>>
 <<wait 1>>
-<<character_pos 无动作>>
+<<switch_character_state 默认无神>>
+<<wait 2>>
+<<switch_character_state 默认无神微笑>>
+<<wait 0.1>>
+<<switch_character_state 画画微笑闭眼>>
+<<wait 0.1>>
+<<switch_character_state 画画无神微笑>>
 
 peipei:来吧，医生，我们测一下。<br>美人鱼，罐头广告？
 
 <<hide_dialog>>
 <<wait 1>>
-<<character_pos 画画动作>>
+<<switch_character_state 画画闭眼>>
 <<wait 3>>
-<<character_pos 无动作>>
 <<show_obj 美人鱼正确>>
 <<wait 3>>
 
 peipei: 医生，现在的颜色是正确的吗？
 me: 正确…算是吧。
 peipei: 很好。
-
 <<wait 1>>
 <<hide_obj>>
-
+<<switch_character_state 默认扬眉无神闭眼>>
 peipei: 好…还有很多事情等着我去做。
 
 <<hide_dialog>>
 <<wait 2>>
-<<character_face_new 微笑>>
+<<switch_character_state 默认扬眉无神微笑>>
+<<wait 0.1>>
+<<switch_character_state 默认扬眉无神闭眼>>
+<<wait 0.1>>
+<<switch_character_state 默认扬眉无神闭眼>>
 <<wait 1>>
 
 peipei: 谢谢你…医生。
@@ -85,7 +91,7 @@ peipei: 谢谢你让我醒来。
 
 <<hide_dialog>>
 <<wait 1>>
-<<character_fade_out_new>>
+<<hide_character>>
 
 me: 醒来…或者说睡去。<br>总之，又一个病历结束了。但愿……
 

Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn

@@ -317,6 +317,7 @@ EyeModule: 已与视觉模块建立连接！
             shitou: 我来的路上，好像看到的红绿灯好像变多了。
         <<endif>>
         me: 那是重影，一段时间就会好的。
+        <<ModuleHightLight Eye false>>
     <<else>>
         me: 碰撞导致视觉有重影，但过段时间就会恢复。
     <<endif>>

Assets/Scenes/Persistence.unity

@@ -7989,7 +7989,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &533176308
 RectTransform:
   m_ObjectHideFlags: 0
@@ -8053,7 +8053,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1992781380}
   m_HandleRect: {fileID: 1992781379}
   m_Direction: 0
-  m_Value: 0
+  m_Value: 1
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -10030,10 +10030,10 @@ MonoBehaviour:
   - {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2}
   - {fileID: 11400000, guid: 7bf300be492f2634580f0eaabcca2b2e, type: 2}
   - {fileID: 11400000, guid: 088974ca6c9487041b695af86b6c93a1, type: 2}
-  runMode: 0
+  runMode: 2
   firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2}
   testTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2}
-  saveFileName: "PeipeiDay2_\u7B2C\u4E00\u6B21\u53D1\u70ED"
+  saveFileName: "PeipeiDay2_\u505C\u6B62\u60F3\u8C61"
 --- !u!4 &719228339
 Transform:
   m_ObjectHideFlags: 0
@@ -10506,8 +10506,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 485, y: 80.70001}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 950, y: 918.6}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &761395784
 MonoBehaviour:
@@ -10582,8 +10582,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 485, y: 80.70001}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 950, y: 918.6}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &773911911
 MonoBehaviour:
@@ -12437,10 +12437,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 1693917954}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 485, y: 80.70001}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 950, y: 918.6}
+  m_SizeDelta: {x: 0, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &927888435
 MonoBehaviour:
@@ -12988,7 +12988,7 @@ MonoBehaviour:
   m_ScaleFactor: 1
   m_ReferenceResolution: {x: 1920, y: 1080}
   m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
+  m_MatchWidthOrHeight: 1
   m_PhysicalUnit: 3
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
@@ -14512,7 +14512,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 300}
+  m_SizeDelta: {x: 0, y: 60}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1145374179
 MonoBehaviour:
@@ -14529,8 +14529,8 @@ MonoBehaviour:
   m_Padding:
     m_Left: 0
     m_Right: 0
-    m_Top: 0
+    m_Top: 30
-    m_Bottom: 0
+    m_Bottom: 30
   m_ChildAlignment: 1
   m_Spacing: 10
   m_ChildForceExpandWidth: 1
@@ -16359,10 +16359,42 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 1604842429}
     m_Modifications:
+    - target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 72.01
+      objectReference: {fileID: 0}
+    - target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 50.000004
+      objectReference: {fileID: 0}
+    - target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 86.005005
+      objectReference: {fileID: 0}
+    - target: {fileID: 4734035430968629439, guid: e2211373480d40243a377721316dd8f7, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -45
+      objectReference: {fileID: 0}
+    - target: {fileID: 5969022388722944562, guid: e2211373480d40243a377721316dd8f7, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 172.01001
+      objectReference: {fileID: 0}
     - target: {fileID: 6059188073131988442, guid: e2211373480d40243a377721316dd8f7, type: 3}
       propertyPath: m_Name
       value: Dialog Box
       objectReference: {fileID: 0}
+    - target: {fileID: 6059188073131988442, guid: e2211373480d40243a377721316dd8f7, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -16389,11 +16421,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 1200
+      value: 880
       objectReference: {fileID: 0}
     - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 300
+      value: 270
       objectReference: {fileID: 0}
     - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3}
       propertyPath: m_LocalPosition.x
@@ -16425,11 +16457,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 203
+      value: 280
       objectReference: {fileID: 0}
     - target: {fileID: 7131956091114956203, guid: e2211373480d40243a377721316dd8f7, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -18167,7 +18199,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -17, y: -17}
+  m_SizeDelta: {x: -17, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1463491729
 MonoBehaviour:
@@ -21661,10 +21693,10 @@ RectTransform:
   - {fileID: 927888434}
   m_Father: {fileID: 984233631}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -485, y: -80.7}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 970, y: 161.4}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1694277408
 GameObject:
@@ -26144,7 +26176,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 100}
+  m_AnchoredPosition: {x: 0, y: 54}
   m_SizeDelta: {x: 700, y: 550}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2038437603
@@ -41536,7 +41568,7 @@ MonoBehaviour:
   m_ScaleFactor: 1
   m_ReferenceResolution: {x: 1920, y: 1080}
   m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0.5
+  m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96

Assets/Scripts/Clue/ClueSlotBase.cs

@@ -63,9 +63,11 @@ public class ClueSlotBase : MonoBehaviour, IDropHandler
                 // AudioManager.RandomPlayInteraction("punchtape");
                 AudioManager.Instance.PlaySfx("event:/ActionFB/mem_insert");
                 StartFilmAnimation();
+                FavoritesManager.Instance.CloseFavorites();
                 punchTapeImage.rectTransform.DOAnchorPosY(-473f,4f)
                 .OnComplete(() =>
                 {
+                    
                     punchTapeImage.enabled=false;
                     punchTapeImage.rectTransform.DOAnchorPosY(-3f,0.1f);
                     OnClueInserted(clue);

Assets/Scripts/Dialog System/LineView.cs

@@ -15,6 +15,7 @@ namespace AibisDream
 
             if (DialogController.Instance.quickRunMode)
             {
+                DialogCanvasManager.Instance.TrySkipLine(true);
                 DialogCanvasManager.Instance.NextStep();
             }
         }

Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs

@@ -57,9 +57,9 @@ namespace AibisDream
             // }
             
             // SpriteGroup加载
-            characterGroup.config.key = data.groupName;
+            characterGroup.config.key = data.configKey;
             yield return characterGroup.InstantiateByConfigAsync();
-            characterGroup.SwitchState(data.state);
+            characterGroup.SwitchState(data.curState);
             yield return characterGroup.Fade(data.shown);
         }
 
@@ -99,8 +99,8 @@ namespace AibisDream
         public bool hasDevice;
         public bool isShow;
 
-        public string groupName;
+        public string configKey;
-        public string state;
+        public string curState;
         public bool shown;
 
         public event Action<ClinicData> LoadEvent;

Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs

@@ -83,7 +83,9 @@ namespace AibisDream.FixSystem
             // 逐个字符添加
             yield return DOTween.To(() => text.text.Length, x => UpdateText(x, targetText, oldText), targetLength,
                 targetText.Length * typeSpeed).WaitForCompletion();
+            EnumEventSystem.Global.Send(DialogEventEnum.LineShown);
             yield return new WaitForSeconds(0.5f);
+            EnumEventSystem.Global.Send(DialogEventEnum.LineEnd);
             _nextStep.Invoke();
         }
 
@@ -186,7 +188,7 @@ namespace AibisDream.FixSystem
             // HideDialog应该由其他函数控制
         }
 
-        public bool TrySkipLine()
+        public bool TrySkipLine(bool isAutoSkip)
         {
             // 这里不能跳过对话
             return true;

Assets/Scripts/Framework/OtherKit/MonoCenter.cs

@@ -47,11 +47,7 @@ namespace AibisDream.Framework
     {
         public void OnUpdate()
         {
-            if (Input.GetKeyDown(KeyCode.K))
+            
-            {
-                MonoCenter.Mono.StartCoroutine(FixSystemYarnCommand.SwitchFixSystemTo("Engine"));
-                MonoCenter.Mono.StartCoroutine(EngineYarnCommand.OpenEngineCover());
-            }
         }
     }
 

Assets/Scripts/Game Loop/GameLoopManager.cs

@@ -59,7 +59,7 @@ namespace AibisDream
         private IEnumerator LoadClinicOut()
         {
             yield return SceneLoader.Instance.LoadSceneAsync("ClinicOut");
-            FindObjectOfType<EnvironmentManager>().SetTimeOfDayCommand("day");
+            // FindObjectOfType<EnvironmentManager>().SetTimeOfDayCommand("day");
         }
 
         public void StartWithTalkSceneSO(TalkSceneSO sceneSO)

Assets/Scripts/MiniGame/Engine/MovablePartGroup.cs

@@ -68,8 +68,6 @@ namespace AibisDream
             var duration = 1 / Mathf.Abs(initSpeed * speedRadio);
             
             var target = speedRadio >= 0 ? new Vector3(0, 0, 360) : new Vector3(0, 0, -360);
-            
-            Debug.Log("Rotate");
             _rotateTween = gear.DORotate(target, duration, RotateMode.LocalAxisAdd)
                 .SetEase(Ease.Linear)
                 .SetLoops(-1, LoopType.Incremental);

Assets/Scripts/UI/DialogUI/CenterOption.cs

@@ -52,7 +52,7 @@ namespace AibisDream
             gameObject.SetActive(false);
         }
 
-        public bool TrySkipLine()
+        public bool TrySkipLine(bool isForceSkip)
         {
             // 无法跳过
             return true;

Assets/Scripts/UI/DialogUI/CenterText.cs

@@ -76,9 +76,9 @@ namespace AibisDream
             gameObject.SetActive(false);
         }
 
-        public bool TrySkipLine()
+        public bool TrySkipLine(bool isForceSkip)
         {
-            if (_skipLineDelay)
+            if (_skipLineDelay && !isForceSkip)
             {
                 return true;
             }

Assets/Scripts/UI/DialogUI/DialogBoxBase.cs

@@ -165,9 +165,9 @@ namespace AibisDream
         /// false说明对话已经显示完成了，可以跳过
         /// </summary>
         /// <returns></returns>
-        public virtual bool TrySkipLine()
+        public virtual bool TrySkipLine(bool isForceSkip)
         {
-            if (_skipLineDelay)
+            if (_skipLineDelay && !isForceSkip)
             {
                 return true;
             }
@@ -203,7 +203,7 @@ namespace AibisDream
             else
             {
                 _actorName.transform.parent.localPosition =
-                    character.key == "me" ? new Vector3(460, 150, 0) : new Vector3(-630, 150, 0);
+                    character.key == "me" ? new Vector3(310, 95, 0) : new Vector3(-458, 95, 0);
 
                 _actorName.transform.parent.gameObject.SetActive(true);
                 _actorName.text = character.GetActorName();

Assets/Scripts/UI/DialogUI/DialogBubbleViewer.cs

@@ -68,9 +68,9 @@ namespace AibisDream
             _dialogViews?.ForEach(item => item.HideDialog());
         }
 
-        public bool TrySkipLine()
+        public bool TrySkipLine(bool isForceSkip = false)
         {
-            return _currentView == null || _currentView.TrySkipLine();
+            return _currentView == null || _currentView.TrySkipLine(isForceSkip);
         }
 
         public void NextStep()

Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs

@@ -169,9 +169,9 @@ namespace AibisDream
             _curView.HideDialog();
         }
 
-        public bool TrySkipLine()
+        public bool TrySkipLine(bool isForceSkip = false)
         {
-            return _lastShowView != null && _lastShowView.TrySkipLine();
+            return _lastShowView != null && _lastShowView.TrySkipLine(isForceSkip);
         }
 
         public void NextStep()

Assets/Scripts/UI/DialogUI/IDialogView.cs

@@ -16,7 +16,7 @@ namespace AibisDream
 
         public void HideDialog();
 
-        public bool TrySkipLine();
+        public bool TrySkipLine(bool isForceSkip = false);
 
         public void NextStep();
     }

Assets/Scripts/UI/DialogUI/TextBubble.cs

@@ -18,8 +18,6 @@ namespace AibisDream.Framework
 
         #endregion
 
-        private bool _skipLineDelay;
-
         public bool IsShowingText => _typewriter.isShowingText;
 
         private void Awake()

Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs

@@ -103,9 +103,9 @@ namespace AibisDream
             }
         }
 
-        public bool TrySkipLine()
+        public bool TrySkipLine(bool isForceSkip)
         {
-            if (_skipLineDelay)
+            if (_skipLineDelay && !isForceSkip)
             {
                 return true;
             }

ProjectSettings/ProjectSettings.asset

@@ -133,7 +133,7 @@ PlayerSettings:
   vulkanEnableLateAcquireNextImage: 0
   vulkanEnableCommandBufferRecycling: 1
   loadStoreDebugModeEnabled: 0
-  bundleVersion: 0.1.2.3-20250317-200355
+  bundleVersion: 0.1.2.7-20250321-131406
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0