Merge branch 'feature/dialogbox' into 'develop'

Feature/dialogbox

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

Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!114 &-6421979802148699356
+--- !u!114 &-6174243690473532038
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -9,10 +9,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 73549a74f689f0849a8271d9e908c514, type: 3}
+  m_Script: {fileID: 11500000, guid: 17eea195bdfbf014e91ba7620ee491f8, type: 3}
   m_Name: FMODStudioSettingsPlatform
   m_EditorClassIdentifier: 
-  identifier: b7716510a1f36934c87976f3a81dbf3d
+  identifier: e7a046c753c3c3d4aacc91f6597f310d
   parentIdentifier: default
   active: 0
   Properties:
@@ -73,153 +73,7 @@ MonoBehaviour:
   codecChannels:
     Value: []
     HasValue: 0
---- !u!114 &-2493609972237370556
-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: 8f591a193113347409efedcc618e83d6, type: 3}
-  m_Name: FMODStudioSettingsPlatform
-  m_EditorClassIdentifier: 
-  identifier: de700ef3f37a49b58a57ae3addf01ad9
-  parentIdentifier: default
-  active: 0
-  Properties:
-    LiveUpdate:
-      Value: 0
-      HasValue: 0
-    LiveUpdatePort:
-      Value: 0
-      HasValue: 0
-    Overlay:
-      Value: 0
-      HasValue: 0
-    OverlayPosition:
-      Value: 0
-      HasValue: 0
-    OverlayFontSize:
-      Value: 0
-      HasValue: 0
-    Logging:
-      Value: 0
-      HasValue: 0
-    SampleRate:
-      Value: 0
-      HasValue: 0
-    BuildDirectory:
-      Value: 
-      HasValue: 0
-    SpeakerMode:
-      Value: 0
-      HasValue: 0
-    VirtualChannelCount:
-      Value: 0
-      HasValue: 0
-    RealChannelCount:
-      Value: 0
-      HasValue: 0
-    DSPBufferLength:
-      Value: 0
-      HasValue: 0
-    DSPBufferCount:
-      Value: 0
-      HasValue: 0
-    Plugins:
-      Value: []
-      HasValue: 0
-    StaticPlugins:
-      Value: []
-      HasValue: 0
-    CallbackHandler:
-      Value: {fileID: 0}
-      HasValue: 0
-  OutputTypeName: 
-  threadAffinities:
-    Value: []
-    HasValue: 0
-  displaySortOrder: 0
-  childIdentifiers: []
-  codecChannels:
-    Value: []
-    HasValue: 0
---- !u!114 &-1580684736993228498
-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: b87314b32fbe18943af496e4b47136c6, type: 3}
-  m_Name: FMODStudioSettingsPlatform
-  m_EditorClassIdentifier: 
-  identifier: 46fbfdf3fc43db0458918377fd40293e
-  parentIdentifier: default
-  active: 0
-  Properties:
-    LiveUpdate:
-      Value: 0
-      HasValue: 0
-    LiveUpdatePort:
-      Value: 0
-      HasValue: 0
-    Overlay:
-      Value: 0
-      HasValue: 0
-    OverlayPosition:
-      Value: 0
-      HasValue: 0
-    OverlayFontSize:
-      Value: 0
-      HasValue: 0
-    Logging:
-      Value: 0
-      HasValue: 0
-    SampleRate:
-      Value: 0
-      HasValue: 0
-    BuildDirectory:
-      Value: 
-      HasValue: 0
-    SpeakerMode:
-      Value: 0
-      HasValue: 0
-    VirtualChannelCount:
-      Value: 0
-      HasValue: 0
-    RealChannelCount:
-      Value: 0
-      HasValue: 0
-    DSPBufferLength:
-      Value: 0
-      HasValue: 0
-    DSPBufferCount:
-      Value: 0
-      HasValue: 0
-    Plugins:
-      Value: []
-      HasValue: 0
-    StaticPlugins:
-      Value: []
-      HasValue: 0
-    CallbackHandler:
-      Value: {fileID: 0}
-      HasValue: 0
-  OutputTypeName: 
-  threadAffinities:
-    Value: []
-    HasValue: 0
-  displaySortOrder: 0
-  childIdentifiers: []
-  codecChannels:
-    Value: []
-    HasValue: 0
---- !u!114 &-785679389004310805
+--- !u!114 &-3974345589865759223
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -292,7 +146,7 @@ MonoBehaviour:
   codecChannels:
     Value: []
     HasValue: 0
---- !u!114 &-712030531834803398
+--- !u!114 &-2057712728005687216
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -301,10 +155,83 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 93a382382f106584e8f8f62412fee177, type: 3}
+  m_Script: {fileID: 11500000, guid: 3abeb1429547a134480f4f2f1efc7e21, type: 3}
   m_Name: FMODStudioSettingsPlatform
   m_EditorClassIdentifier: 
-  identifier: fd7c55dab0fce234b8c25f6ffca523c1
+  identifier: c88d16e5272a4e241b0ef0ac2e53b73d
+  parentIdentifier: default
+  active: 0
+  Properties:
+    LiveUpdate:
+      Value: 0
+      HasValue: 0
+    LiveUpdatePort:
+      Value: 0
+      HasValue: 0
+    Overlay:
+      Value: 0
+      HasValue: 0
+    OverlayPosition:
+      Value: 0
+      HasValue: 0
+    OverlayFontSize:
+      Value: 0
+      HasValue: 0
+    Logging:
+      Value: 0
+      HasValue: 0
+    SampleRate:
+      Value: 0
+      HasValue: 0
+    BuildDirectory:
+      Value: 
+      HasValue: 0
+    SpeakerMode:
+      Value: 0
+      HasValue: 0
+    VirtualChannelCount:
+      Value: 0
+      HasValue: 0
+    RealChannelCount:
+      Value: 0
+      HasValue: 0
+    DSPBufferLength:
+      Value: 0
+      HasValue: 0
+    DSPBufferCount:
+      Value: 0
+      HasValue: 0
+    Plugins:
+      Value: []
+      HasValue: 0
+    StaticPlugins:
+      Value: []
+      HasValue: 0
+    CallbackHandler:
+      Value: {fileID: 0}
+      HasValue: 0
+  OutputTypeName: 
+  threadAffinities:
+    Value: []
+    HasValue: 0
+  displaySortOrder: 0
+  childIdentifiers: []
+  codecChannels:
+    Value: []
+    HasValue: 0
+--- !u!114 &-1479416721063755007
+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: bc1f51bc35d549941904cf062bae93a3, type: 3}
+  m_Name: FMODStudioSettingsPlatform
+  m_EditorClassIdentifier: 
+  identifier: 0f8eb3f400726694eb47beb1a9f94ce8
   parentIdentifier: default
   active: 0
   Properties:
@@ -419,20 +346,20 @@ MonoBehaviour:
   HideSetupWizard: 1
   LastEventReferenceScanVersion: 131621
   Platforms:
-  - {fileID: 9010303474896345012}
-  - {fileID: 6330521338056678831}
-  - {fileID: 3979222738758991920}
-  - {fileID: -1580684736993228498}
-  - {fileID: 1100827045814593625}
-  - {fileID: 6477534247104662684}
-  - {fileID: -785679389004310805}
-  - {fileID: 1132312529069990576}
-  - {fileID: -6421979802148699356}
-  - {fileID: 5613685733850034091}
-  - {fileID: -2493609972237370556}
-  - {fileID: -712030531834803398}
+  - {fileID: 4449505234930665929}
+  - {fileID: 6611559040954684553}
+  - {fileID: -1479416721063755007}
+  - {fileID: 1697475330856183958}
+  - {fileID: 119274062029799480}
+  - {fileID: -6174243690473532038}
+  - {fileID: -3974345589865759223}
+  - {fileID: 1182458898857209987}
+  - {fileID: 7988466420741846663}
+  - {fileID: -2057712728005687216}
+  - {fileID: 6428052061351901060}
+  - {fileID: 2121415354943079641}
   MigratedPlatforms: 0500000000000000060000000a0000000800000009000000120000000c000000150000000b0000000200000001000000
---- !u!114 &1100827045814593625
+--- !u!114 &119274062029799480
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -505,7 +432,7 @@ MonoBehaviour:
   codecChannels:
     Value: []
     HasValue: 0
---- !u!114 &1132312529069990576
+--- !u!114 &1182458898857209987
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -578,7 +505,7 @@ MonoBehaviour:
   codecChannels:
     Value: []
     HasValue: 0
---- !u!114 &3979222738758991920
+--- !u!114 &1697475330856183958
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -587,10 +514,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bc1f51bc35d549941904cf062bae93a3, type: 3}
+  m_Script: {fileID: 11500000, guid: b87314b32fbe18943af496e4b47136c6, type: 3}
   m_Name: FMODStudioSettingsPlatform
   m_EditorClassIdentifier: 
-  identifier: 0f8eb3f400726694eb47beb1a9f94ce8
+  identifier: 46fbfdf3fc43db0458918377fd40293e
   parentIdentifier: default
   active: 0
   Properties:
@@ -651,7 +578,7 @@ MonoBehaviour:
   codecChannels:
     Value: []
     HasValue: 0
---- !u!114 &5613685733850034091
+--- !u!114 &2121415354943079641
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -660,10 +587,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3abeb1429547a134480f4f2f1efc7e21, type: 3}
+  m_Script: {fileID: 11500000, guid: 93a382382f106584e8f8f62412fee177, type: 3}
   m_Name: FMODStudioSettingsPlatform
   m_EditorClassIdentifier: 
-  identifier: c88d16e5272a4e241b0ef0ac2e53b73d
+  identifier: fd7c55dab0fce234b8c25f6ffca523c1
   parentIdentifier: default
   active: 0
   Properties:
@@ -724,7 +651,153 @@ MonoBehaviour:
   codecChannels:
     Value: []
     HasValue: 0
---- !u!114 &6330521338056678831
+--- !u!114 &4449505234930665929
+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: 335f0a4b26fb46942858ea029e030d2a, type: 3}
+  m_Name: FMODStudioSettingsPlatform
+  m_EditorClassIdentifier: 
+  identifier: playInEditor
+  parentIdentifier: 
+  active: 1
+  Properties:
+    LiveUpdate:
+      Value: 1
+      HasValue: 1
+    LiveUpdatePort:
+      Value: 0
+      HasValue: 0
+    Overlay:
+      Value: 1
+      HasValue: 1
+    OverlayPosition:
+      Value: 0
+      HasValue: 0
+    OverlayFontSize:
+      Value: 0
+      HasValue: 0
+    Logging:
+      Value: 0
+      HasValue: 0
+    SampleRate:
+      Value: 48000
+      HasValue: 1
+    BuildDirectory:
+      Value: 
+      HasValue: 0
+    SpeakerMode:
+      Value: 0
+      HasValue: 0
+    VirtualChannelCount:
+      Value: 1024
+      HasValue: 1
+    RealChannelCount:
+      Value: 256
+      HasValue: 1
+    DSPBufferLength:
+      Value: 0
+      HasValue: 0
+    DSPBufferCount:
+      Value: 0
+      HasValue: 0
+    Plugins:
+      Value: []
+      HasValue: 0
+    StaticPlugins:
+      Value: []
+      HasValue: 0
+    CallbackHandler:
+      Value: {fileID: 0}
+      HasValue: 0
+  OutputTypeName: 
+  threadAffinities:
+    Value: []
+    HasValue: 0
+  displaySortOrder: 0
+  childIdentifiers: []
+  codecChannels:
+    Value: []
+    HasValue: 0
+--- !u!114 &6428052061351901060
+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: 8f591a193113347409efedcc618e83d6, type: 3}
+  m_Name: FMODStudioSettingsPlatform
+  m_EditorClassIdentifier: 
+  identifier: de700ef3f37a49b58a57ae3addf01ad9
+  parentIdentifier: default
+  active: 0
+  Properties:
+    LiveUpdate:
+      Value: 0
+      HasValue: 0
+    LiveUpdatePort:
+      Value: 0
+      HasValue: 0
+    Overlay:
+      Value: 0
+      HasValue: 0
+    OverlayPosition:
+      Value: 0
+      HasValue: 0
+    OverlayFontSize:
+      Value: 0
+      HasValue: 0
+    Logging:
+      Value: 0
+      HasValue: 0
+    SampleRate:
+      Value: 0
+      HasValue: 0
+    BuildDirectory:
+      Value: 
+      HasValue: 0
+    SpeakerMode:
+      Value: 0
+      HasValue: 0
+    VirtualChannelCount:
+      Value: 0
+      HasValue: 0
+    RealChannelCount:
+      Value: 0
+      HasValue: 0
+    DSPBufferLength:
+      Value: 0
+      HasValue: 0
+    DSPBufferCount:
+      Value: 0
+      HasValue: 0
+    Plugins:
+      Value: []
+      HasValue: 0
+    StaticPlugins:
+      Value: []
+      HasValue: 0
+    CallbackHandler:
+      Value: {fileID: 0}
+      HasValue: 0
+  OutputTypeName: 
+  threadAffinities:
+    Value: []
+    HasValue: 0
+  displaySortOrder: 0
+  childIdentifiers: []
+  codecChannels:
+    Value: []
+    HasValue: 0
+--- !u!114 &6611559040954684553
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -807,7 +880,7 @@ MonoBehaviour:
   codecChannels:
     Value: []
     HasValue: 0
---- !u!114 &6477534247104662684
+--- !u!114 &7988466420741846663
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -816,10 +889,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 17eea195bdfbf014e91ba7620ee491f8, type: 3}
+  m_Script: {fileID: 11500000, guid: 73549a74f689f0849a8271d9e908c514, type: 3}
   m_Name: FMODStudioSettingsPlatform
   m_EditorClassIdentifier: 
-  identifier: e7a046c753c3c3d4aacc91f6597f310d
+  identifier: b7716510a1f36934c87976f3a81dbf3d
   parentIdentifier: default
   active: 0
   Properties:
@@ -880,76 +953,3 @@ MonoBehaviour:
   codecChannels:
     Value: []
     HasValue: 0
---- !u!114 &9010303474896345012
-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: 335f0a4b26fb46942858ea029e030d2a, type: 3}
-  m_Name: FMODStudioSettingsPlatform
-  m_EditorClassIdentifier: 
-  identifier: playInEditor
-  parentIdentifier: 
-  active: 1
-  Properties:
-    LiveUpdate:
-      Value: 1
-      HasValue: 1
-    LiveUpdatePort:
-      Value: 0
-      HasValue: 0
-    Overlay:
-      Value: 1
-      HasValue: 1
-    OverlayPosition:
-      Value: 0
-      HasValue: 0
-    OverlayFontSize:
-      Value: 0
-      HasValue: 0
-    Logging:
-      Value: 0
-      HasValue: 0
-    SampleRate:
-      Value: 48000
-      HasValue: 1
-    BuildDirectory:
-      Value: 
-      HasValue: 0
-    SpeakerMode:
-      Value: 0
-      HasValue: 0
-    VirtualChannelCount:
-      Value: 1024
-      HasValue: 1
-    RealChannelCount:
-      Value: 256
-      HasValue: 1
-    DSPBufferLength:
-      Value: 0
-      HasValue: 0
-    DSPBufferCount:
-      Value: 0
-      HasValue: 0
-    Plugins:
-      Value: []
-      HasValue: 0
-    StaticPlugins:
-      Value: []
-      HasValue: 0
-    CallbackHandler:
-      Value: {fileID: 0}
-      HasValue: 0
-  OutputTypeName: 
-  threadAffinities:
-    Value: []
-    HasValue: 0
-  displaySortOrder: 0
-  childIdentifiers: []
-  codecChannels:
-    Value: []
-    HasValue: 0

Assets/Resources/Art/Fix/20250123-164940.psb.meta

@@ -0,0 +1,242 @@
+fileFormatVersion: 2
+guid: 64008f2c27d35ac409386015a6bb5887
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: b2a9591990af98743ba3ff7cf1000886, type: 3}
+  textureImporterSettings:
+    alphaSource: 1
+    mipMapMode: 0
+    enableMipMap: 1
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+    convertToNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+    swizzle: 50462976
+    isReadable: 0
+    streamingMipmaps: 1
+    streamingMipmapsPriority: 0
+    vTOnly: 0
+    ignoreMipmapLimit: 0
+    nPOTScale: 1
+    sRGBTexture: 1
+    spriteMode: 2
+    spriteExtrude: 1
+    spriteMeshType: 1
+    alignment: 0
+    spritePivot: {x: 0.5, y: 0.5}
+    spritePixelsToUnits: 500
+    spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+    spriteGenerateFallbackPhysicsShape: 0
+    generateCubemap: 6
+    cubemapConvolution: 0
+    seamlessCubemap: 0
+    alphaIsTransparency: 1
+    spriteTessellationDetail: -1
+    textureType: 8
+    textureShape: 1
+    singleChannelComponent: 0
+    flipbookRows: 0
+    flipbookColumns: 0
+    ignorePngGamma: 0
+    cookieMode: 0
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+    normalMap: 0
+    textureFormat: 0
+    maxTextureSize: 0
+    lightmap: 0
+    compressionQuality: 0
+    linearTexture: 0
+    grayScaleToAlpha: 0
+    rGBM: 0
+    cubemapConvolutionSteps: 0
+    cubemapConvolutionExponent: 0
+    maxTextureSizeSet: 0
+    compressionQualitySet: 0
+    textureFormatSet: 0
+    applyGammaDecoding: 0
+  spriteImportData:
+  - name: 
+    originalName: 
+    pivot: {x: 0, y: 0}
+    alignment: 0
+    border: {x: 0, y: 0, z: 0, w: 0}
+    rect:
+      serializedVersion: 2
+      x: 0
+      y: 0
+      width: 0
+      height: 0
+    spriteID: 
+    spriteBone: []
+    spriteOutline: []
+    vertices: []
+    spritePhysicsOutline: []
+    indices: 
+    edges: []
+    tessellationDetail: 0
+    uvTransform: {x: 0, y: 0}
+    spritePosition: {x: 0, y: 0}
+  mosaicSpriteImportData: []
+  rigSpriteImportData:
+  - name: "\u56FE\u5C42 2"
+    originalName: 
+    pivot: {x: 0.5, y: 0.5}
+    alignment: 0
+    border: {x: 0, y: 0, z: 0, w: 0}
+    rect:
+      serializedVersion: 2
+      x: 4
+      y: 4
+      width: 1823
+      height: 1127
+    spriteID: bebac499b546daf4893c5ecd0bf27294
+    spriteBone: []
+    spriteOutline: []
+    vertices: []
+    spritePhysicsOutline: []
+    indices: 
+    edges: []
+    tessellationDetail: 0
+    uvTransform: {x: 4, y: 4}
+    spritePosition: {x: 0, y: 0}
+  characterData:
+    bones: []
+    parts: []
+    dimension: {x: 0, y: 0}
+    characterGroups: []
+    pivot: {x: 0, y: 0}
+    boneReadOnly: 0
+  sharedRigSpriteImportData: []
+  sharedRigCharacterData:
+    bones: []
+    parts: []
+    dimension: {x: 0, y: 0}
+    characterGroups: []
+    pivot: {x: 0, y: 0}
+    boneReadOnly: 0
+  platformSettings:
+  - name: DefaultTexturePlatform
+    overridden: 0
+    ignorePlatformSupport: 0
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    androidETC2FallbackOverride: 0
+  - name: Standalone
+    overridden: 0
+    ignorePlatformSupport: 0
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    androidETC2FallbackOverride: 0
+  - name: Server
+    overridden: 0
+    ignorePlatformSupport: 0
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    androidETC2FallbackOverride: 0
+  - name: Android
+    overridden: 0
+    ignorePlatformSupport: 0
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    androidETC2FallbackOverride: 0
+  - name: WebGL
+    overridden: 0
+    ignorePlatformSupport: 0
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    androidETC2FallbackOverride: 0
+  mosaicLayers: 1
+  characterMode: 1
+  documentPivot: {x: 0, y: 0}
+  documentAlignment: 7
+  importHiddenLayers: 0
+  layerMappingOption: 2
+  generatePhysicsShape: 0
+  paperDollMode: 0
+  keepDupilcateSpriteName: 1
+  skeletonAssetReferenceID: 
+  padding: 4
+  spriteSizeExpand: 0
+  spriteCategoryList:
+    categories: []
+  spritePackingTag: 
+  resliceFromLayer: 0
+  mosaicPSDLayers: []
+  rigPSDLayers:
+  - name: "\u56FE\u5C42 2"
+    spriteName: "\u56FE\u5C42 2"
+    isGroup: 0
+    parentIndex: -1
+    spriteID: bebac499b546daf4893c5ecd0bf27294
+    layerID: 8
+    mosaicPosition: {x: 4, y: 4}
+    flatten: 0
+    isImported: 1
+    isVisible: 1
+  - name: "\u56FE\u5C42 1"
+    spriteName: "\u56FE\u5C42 1"
+    isGroup: 0
+    parentIndex: -1
+    spriteID: 079b5602caf6ad6459a584388bf71067
+    layerID: 2
+    mosaicPosition: {x: 4, y: 4}
+    flatten: 0
+    isImported: 0
+    isVisible: 0
+  sharedRigPSDLayers: []
+  pSDLayerImportSetting: []
+  importFileNodeState: 1
+  platformSettingsDirtyTick: 0
+  spriteSizeExpandChanged: 0
+  generateGOHierarchy: 0
+  textureAssetName: 
+  prefabAssetName: 
+  spriteLibAssetName: 
+  skeletonAssetName: 
+  secondarySpriteTextures: []

Assets/Resources/Materials/FadeRing.mat

@@ -0,0 +1,50 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: FadeRing
+  m_Shader: {fileID: 4800000, guid: bb8f232219e0a3a488c321b63e85281f, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AlphaTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _EnableExternalAlpha: 0
+    - _Progress: 0.137
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Flip: {r: 1, g: 1, b: 1, a: 1}
+    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []

Assets/Resources/Materials/FadeRing.mat.meta

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

Assets/Resources/Shader/FadeRing.shader

@@ -0,0 +1,64 @@
+Shader "Unlit/CircleProgressBar"
+{
+    Properties
+    {
+        _MainTex("Texture", 2D) = "white" {}
+        _Progress("Progress",Range(0,1)) = 0.5
+    }
+    SubShader
+    {
+        Tags
+        {
+            "RenderType"="Transparent"
+        }
+        Blend SrcAlpha OneMinusSrcAlpha
+        LOD 100
+
+        Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+            #include "UnityCG.cginc"
+
+            struct appdata
+            {
+                float4 vertex : POSITION;
+                float2 uv : TEXCOORD0;
+            };
+
+            struct v2f
+            {
+                float2 uv : TEXCOORD0;
+                float4 vertex : SV_POSITION;
+            };
+
+            sampler2D _MainTex;
+            float4 _MainTex_ST;
+            float _Progress;
+
+            v2f vert(appdata v)
+            {
+                v2f o;
+                o.vertex = UnityObjectToClipPos(v.vertex);
+                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+                return o;
+            }
+
+            fixed4 frag(v2f i) : SV_Target
+            {
+                float4 col = tex2D(_MainTex, i.uv);
+                float4 final = step(1 - col.r, _Progress);
+                float3 ramp = lerp(float3(0, 1, 0), float3(1, 0, 0), _Progress);
+                final.rgb = final.rgb * ramp;
+                final.a = col.a;
+                if (1 - col.r > _Progress)
+                {
+                    final.a = 0;
+                }
+                return final;
+            }
+            ENDCG
+        }
+    }
+}

Assets/Resources/Shader/FadeRing.shader.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: bb8f232219e0a3a488c321b63e85281f
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/ExpressFixScene.unity

@@ -249,7 +249,6 @@ MonoBehaviour:
   initSprite: {fileID: -611960561148999933, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
   discIdx: 0
   childGear: {fileID: 0}
-  initialSpeed: 0
   targetSpeed: 0
   speed: 0
 --- !u!212 &24693787
@@ -555,6 +554,103 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 2309837242789316790, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3}
   m_PrefabInstance: {fileID: 154381820}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &158974636
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 158974637}
+  - component: {fileID: 158974638}
+  - component: {fileID: 158974639}
+  m_Layer: 0
+  m_Name: "\u6E10\u53D8\u73AF"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &158974637
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 158974636}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -3.164, y: 2.846, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1112213369}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &158974638
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 158974636}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 2d5f7d9c99f43ce4b8ec277a4ab03080, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 1134468525
+  m_SortingLayer: 10
+  m_SortingOrder: 5
+  m_Sprite: {fileID: 3967710112523861117, guid: 64008f2c27d35ac409386015a6bb5887, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 3.646, y: 2.254}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &158974639
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 158974636}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4d9cead340d34293bf0fd9631aede238, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &160015711
 GameObject:
   m_ObjectHideFlags: 0
@@ -1105,7 +1201,6 @@ MonoBehaviour:
   initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
   discIdx: 0
   childGear: {fileID: 0}
-  initialSpeed: 0
   targetSpeed: 0
   speed: 0
 --- !u!212 &255072952
@@ -1214,7 +1309,6 @@ MonoBehaviour:
   initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
   discIdx: 0
   childGear: {fileID: 0}
-  initialSpeed: 0
   targetSpeed: 0.3
   speed: 0
 --- !u!212 &263279953
@@ -1671,7 +1765,7 @@ Transform:
   m_GameObject: {fileID: 463110380}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -7.8, y: 0.406, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2251,7 +2345,6 @@ MonoBehaviour:
   initSprite: {fileID: -1467070179034526403, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
   discIdx: 0
   childGear: {fileID: 0}
-  initialSpeed: 0
   targetSpeed: 0
   speed: 0
 --- !u!212 &594749269
@@ -2401,6 +2494,7 @@ MonoBehaviour:
   - {x: 0, y: 0, z: -6.878}
   - {x: 0, y: 0, z: 20}
   needleDuration: 1.5
+  initSpeed: 1
 --- !u!1 &695150750
 GameObject:
   m_ObjectHideFlags: 0
@@ -2948,7 +3042,6 @@ MonoBehaviour:
   initSprite: {fileID: 2228576813345793800, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
   discIdx: 0
   childGear: {fileID: 0}
-  initialSpeed: 0
   targetSpeed: 0
   speed: 0
 --- !u!212 &720342595
@@ -3484,7 +3577,6 @@ MonoBehaviour:
   initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
   discIdx: 0
   childGear: {fileID: 0}
-  initialSpeed: 0
   targetSpeed: 0
   speed: 0
 --- !u!212 &863746365
@@ -3593,7 +3685,6 @@ MonoBehaviour:
   initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
   discIdx: 0
   childGear: {fileID: 0}
-  initialSpeed: 0
   targetSpeed: 0
   speed: 0
 --- !u!212 &876556889
@@ -3657,14 +3748,13 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 885292092}
-  - component: {fileID: 885292093}
   m_Layer: 0
   m_Name: Speed Dashboard
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &885292092
 Transform:
   m_ObjectHideFlags: 0
@@ -3674,7 +3764,7 @@ Transform:
   m_GameObject: {fileID: 885292091}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 5.0550704, y: 0.47555804, z: 0}
+  m_LocalPosition: {x: -5.199, y: 2.197, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -3682,20 +3772,6 @@ Transform:
   - {fileID: 463110381}
   m_Father: {fileID: 1112213369}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &885292093
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 885292091}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 73c497ccb39448718a07911a5e674d5f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  leftRot: 0
-  rightRot: 137
 --- !u!1 &900787527
 GameObject:
   m_ObjectHideFlags: 0
@@ -3722,7 +3798,7 @@ Transform:
   m_GameObject: {fileID: 900787527}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -7.792, y: 0.406, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -3834,7 +3910,6 @@ MonoBehaviour:
   initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
   discIdx: 0
   childGear: {fileID: 0}
-  initialSpeed: 0
   targetSpeed: 0
   speed: 0
 --- !u!212 &933662731
@@ -4018,6 +4093,7 @@ Transform:
   - {fileID: 885292092}
   - {fileID: 5177406695049049041}
   - {fileID: 13903366}
+  - {fileID: 158974637}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1112213371
@@ -4033,28 +4109,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   engineConfig:
-    oilRate: 0.5
-    resistance: 0.1
     gearSpeed: 0.1
     speedRate: 15
-    targetDuration: 2
+    pullCount: 5
     pullMaxSpeed: 1.2
     returnSpeed: 5
-  engineData:
-    config:
-      oilRate: 0
-      resistance: 0
-      gearSpeed: 0
-      speedRate: 0
-      targetDuration: 0
-      pullMaxSpeed: 0
-      returnSpeed: 0
-    curSpeed: 0
-    curOil: 0
-    curAcceleration: 0
-    isSuccess: 0
-    reachTargetTime: 0
   isAvailable: 0
+  isPullActive: 0
+  curSpeed: 0
   updateSpeedEvent:
     m_PersistentCalls:
       m_Calls: []
@@ -4416,7 +4478,6 @@ MonoBehaviour:
   initSprite: {fileID: -611960561148999933, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
   discIdx: 0
   childGear: {fileID: 0}
-  initialSpeed: 0
   targetSpeed: 0
   speed: 0
 --- !u!212 &1192211357
@@ -4957,7 +5018,6 @@ MonoBehaviour:
   initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
   discIdx: 0
   childGear: {fileID: 0}
-  initialSpeed: 1
   targetSpeed: 0
   speed: 0
 --- !u!212 &1634570222
@@ -5711,7 +5771,6 @@ MonoBehaviour:
   initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
   discIdx: 0
   childGear: {fileID: 0}
-  initialSpeed: 0
   targetSpeed: 0
   speed: 0
 --- !u!212 &1895400171
@@ -5915,7 +5974,6 @@ MonoBehaviour:
   initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
   discIdx: 0
   childGear: {fileID: 0}
-  initialSpeed: 0
   targetSpeed: 0
   speed: 0
 --- !u!212 &1969730207
@@ -6096,7 +6154,6 @@ MonoBehaviour:
   initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
   discIdx: 0
   childGear: {fileID: 0}
-  initialSpeed: 0
   targetSpeed: 0
   speed: 0
 --- !u!212 &2021157135
@@ -6321,7 +6378,6 @@ MonoBehaviour:
   initSprite: {fileID: -1467070179034526403, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
   discIdx: 0
   childGear: {fileID: 0}
-  initialSpeed: 0
   targetSpeed: 0
   speed: 0
 --- !u!212 &2069725406

Assets/Scripts/Dialog System/DialogController.cs

@@ -135,6 +135,18 @@ namespace AibisDream
                 return false;
             }
         }
+        
+        /// <summary>
+        /// 跳到下一句
+        /// </summary>
+        public void JumpLine()
+        {
+            if (!DialogCanvasManager.GetCurView().TrySkipLine())
+            {
+                AudioManager.Instance.StopVoice();
+                DialogCanvasManager.GetCurView().NextStep();
+            }
+        }
 
         #region 命令名
 

Assets/Scripts/Dialog System/LineView.cs

@@ -68,30 +68,5 @@ namespace AibisDream
             var options = DialogOption.GeneOptions(dialogueOptions, onOptionSelected);
             DialogCanvasManager.GetCurView().ShowOptions(options);
         }
-        
-        private void Update()
-        {
-            if (Input.GetMouseButtonDown(0) || Input.GetKeyDown(KeyCode.Space))
-            {
-                JumpLine();
-            }
-        }
-
-        /// <summary>
-        /// 跳到下一句
-        /// </summary>
-        private void JumpLine()
-        {
-            if (_isInCommand)
-            {
-                return;
-            }
-            
-            if (!DialogCanvasManager.GetCurView().TrySkipLine())
-            {
-                AudioManager.Instance.StopVoice();
-                DialogCanvasManager.GetCurView().NextStep();
-            }
-        }
     }
 }

Assets/Scripts/Framework/OtherKit/MonoCenter.cs

@@ -1,5 +1,4 @@
 using System;
-using AibisDream.FixSystem;
 using UnityEngine;
 
 namespace AibisDream.Framework
@@ -47,14 +46,6 @@ namespace AibisDream.Framework
     {
         public void OnUpdate()
         {
-            if (Input.GetKeyDown(KeyCode.K))
-            {
-                MonoCenter.Mono.StartCoroutine(CameraKit.Instance.TransCameraAsync(new Vector3(5f, 5f, -10), 5, 5f));
-            }
-            
-            if (Input.GetKeyDown(KeyCode.A))
-            {
-            }
         }
     }
 

Assets/Scripts/Game Loop/EventEnums.cs

@@ -8,7 +8,8 @@ namespace AibisDream
     {
         NextYarn,
         PlugIn,
-        PlugOut
+        PlugOut,
+        Menu
     }
 
     public enum DialogEventEnum
@@ -17,8 +18,7 @@ namespace AibisDream
         LineShowed,
         LineEnd,
         OptionShow,
-        OptionSelected,
-        Command
+        OptionSelected
     }
 
     public enum InteractionEventEnum

Assets/Scripts/MiniGame/Engine/CordPull.cs

@@ -34,11 +34,6 @@ namespace AibisDream
             _trigger.Register(EventTriggerType.Drag, OnDrag);
         }
 
-        public float GetCurOil()
-        {
-            return Mathf.Abs((transform.localPosition.y - _initPos.y) / maxDistance);
-        }
-
         private void Update()
         {
             if (_isDragging)
@@ -58,15 +53,10 @@ namespace AibisDream
             // 如果拖拽点在下方，限速移动
             else
             {
-                if (Mathf.Abs(_dragPoint.y - transform.position.y) / Time.deltaTime >
-                    _engineSystem.engineConfig.pullMaxSpeed)
-                {
-                    curY = transform.position.y - _engineSystem.engineConfig.pullMaxSpeed * Time.deltaTime;
-                }
-                else
-                {
-                    curY = _dragPoint.y;
-                }
+                curY = _dragPoint.y;
+                var pullDelta = Mathf.Abs(curY - transform.position.y) / maxDistance;
+                // 将增量同步给Engine
+                _engineSystem.AddAirPress(pullDelta);
             }
 
             transform.position = new Vector3(transform.position.x, curY, transform.position.y);
@@ -75,7 +65,8 @@ namespace AibisDream
         private void OnDrag(BaseEventData data)
         {
             // 这里是一些阻碍拖动的情况
-
+            if (!IsActive) return;
+            
             // 正常情况下不会出错
             if (data is not PointerEventData pointerData) return;
 
@@ -85,6 +76,9 @@ namespace AibisDream
 
         private void OnBeginDrag(BaseEventData data)
         {
+            // 这里是一些阻碍拖动的情况
+            if (!IsActive) return;
+            
             // 正常情况下不会出错
             if (data is not PointerEventData pointerData) return;
             // 设置拖拽目标点
@@ -112,7 +106,7 @@ namespace AibisDream
             _dragPoint = new Vector3(transform.position.x, dragY, transform.position.z);
         }
 
-        public bool IsActive => true;
+        public bool IsActive => _engineSystem.isPullActive;
 
         public bool IsAvailable => _engineSystem.isAvailable;
 

Assets/Scripts/MiniGame/Engine/EngineSystem.cs

@@ -1,8 +1,10 @@
 using System;
+using System.Collections;
 using AibisDream.FixSystem;
 using AibisDream.Framework;
 using AibisDream.Utility;
 using Cinemachine;
+using DG.Tweening;
 using UnityEngine;
 using UnityEngine.Events;
 
@@ -10,15 +12,15 @@ namespace AibisDream
 {
     public class EngineSystem : MonoBehaviour
     {
-        private CordPull _cordPull;
         private StaticGear _centerGear;
 
         [Header("系统配置")] public EngineConfig engineConfig;
-        [Header("系统数据")] public EngineData engineData;
-
         public bool isAvailable;
+        public bool isPullActive;
+        private bool _isSuccess;
 
-        [HideInInspector] public UnityEvent<float> updateSpeedEvent = new();
+        public float curSpeed;
+        [HideInInspector] public UnityEvent<float, float> updateSpeedEvent = new();
 
         [SerializeField] private float coverMoveDuration = 5f;
 
@@ -27,10 +29,9 @@ namespace AibisDream
         private void Awake()
         {
             FixSystemCenter.SystemDic.Register(this);
-            _cordPull = transform.Find("拉绳").GetComponent<CordPull>();
             _centerGear = transform.Find("中央齿轮").GetComponent<StaticGear>();
             _centerGear.initSpeed = engineConfig.gearSpeed;
-            
+
             // 注册相机
             var virtualCam = transform.Find("Engine Camera").GetComponentInChildren<ICinemachineCamera>();
             CameraKit.Instance.RegisterCamera(CameraEnum.Engine, virtualCam);
@@ -38,36 +39,41 @@ namespace AibisDream
 
         private void Start()
         {
-            // 初始化数据
-            engineData = new EngineData
-            {
-                config = engineConfig
-            };
             _centerGear.StartRotate();
         }
 
+        public IEnumerator StepOnGas(float targetSpeed, float duration)
+        {
+            // 逐渐加速
+            yield return DOTween.To(() => curSpeed, x => { curSpeed = x; }, targetSpeed, duration).WaitForCompletion();
+        }
+
+        public void AddAirPress(float speedDelta)
+        {
+            curSpeed = CommonUtil.Limit(curSpeed + speedDelta / engineConfig.pullCount, 1, 0);
+        }
+
         private void OnDestroy()
         {
             CameraKit.Instance.UnRegisterCamera(CameraEnum.Engine);
         }
 
-        public void Update()
+        private void Update()
         {
-            // 收集数据
-            engineData.curOil = _cordPull.GetCurOil();
-            // 更新数据
-            engineData.CalcSpeed();
-
-            // 传递速度
-            updateSpeedEvent.Invoke(engineData.GetRealSpeed());
-
-            if (engineData.CheckSuccess())
+            updateSpeedEvent.Invoke(curSpeed, GetSpeedScale());
+            if (curSpeed >= 0.99f && !_isSuccess)
             {
-                Debug.Log("引擎成功");
+                _isSuccess = true;
+                isPullActive = false;
                 DialogController.Instance?.StartDialogNode("EngineSuccess");
             }
         }
 
+        private float GetSpeedScale()
+        {
+            return 1 + curSpeed * engineConfig.speedRate;
+        }
+
         /// <summary>
         /// 开启系统交互
         /// </summary>
@@ -88,70 +94,10 @@ namespace AibisDream
     [Serializable]
     public struct EngineConfig
     {
-        [Header("油门倍率")] public float oilRate;
-        [Header("阻力倍率")] public float resistance;
         [Header("齿轮基础速度")] public float gearSpeed;
         [Header("齿轮速度倍率")] public float speedRate;
-        [Header("成功所需时间")] public float targetDuration;
+        [Header("拉满几次到全速")] public float pullCount;
         [Header("拉绳最大速度")] public float pullMaxSpeed;
         [Header("拉绳回缩速度")] public float returnSpeed;
     }
-
-    [Serializable]
-    public struct EngineData
-    {
-        public EngineConfig config;
-        public float curSpeed;
-        public float curOil;
-        public float curAcceleration;
-        public bool isSuccess;
-        public float reachTargetTime;
-
-        public void CalcSpeed()
-        {
-            if (curOil != 0)
-            {
-                curAcceleration = curAcceleration < 0 ? 0 : curAcceleration;
-                curAcceleration = CommonUtil.Limit(curOil * config.oilRate * Time.deltaTime + curAcceleration, 100, 0);
-            }
-            else
-            {
-                curAcceleration = -config.resistance * (1f + curSpeed);
-            }
-
-
-            curSpeed = CommonUtil.Limit(curSpeed + curAcceleration * Time.deltaTime, 1, 0);
-        }
-
-        public bool CheckSuccess()
-        {
-            // 已经成功就不用校验了
-            if (isSuccess) return false;
-
-            if (curSpeed >= 0.95f)
-            {
-                reachTargetTime += Time.deltaTime;
-            }
-            else
-            {
-                reachTargetTime = 0;
-            }
-
-            // 如果速度达标时间足够就判断成功
-            if (!(reachTargetTime >= config.targetDuration)) return false;
-
-            isSuccess = true;
-            return true;
-        }
-
-
-        /// <summary>
-        /// 获取处理后的速度
-        /// </summary>
-        /// <returns>速度</returns>
-        public float GetRealSpeed()
-        {
-            return 1 + curSpeed * config.speedRate;
-        }
-    }
 }

Assets/Scripts/MiniGame/Engine/EngineYarnCommand.cs

@@ -1,4 +1,5 @@
 using System.Collections;
+using AibisDream.FixSystem;
 using UnityEngine;
 using Yarn.Unity;
 
@@ -6,6 +7,8 @@ namespace AibisDream
 {
     public static class EngineYarnCommand
     {
+        private static EngineSystem EngineSystem => FixSystemCenter.SystemDic.Get<EngineSystem>();
+        
         // 打开引擎盖
         [YarnCommand("open_engine_cover")]
         public static IEnumerator OpenEngineCover()
@@ -21,5 +24,26 @@ namespace AibisDream
             Debug.LogWarning("关闭引擎盖命令已废弃，请尽快删除");
             yield break;
         }
+        
+        /// <summary>
+        /// 踩油门
+        /// </summary>
+        /// <param name="targetSpeed">目标速度</param>
+        /// <param name="duration">用时</param>
+        /// <returns>协程</returns>
+        [YarnCommand("step_on_gas")]
+        public static IEnumerator StepOnGas(float targetSpeed, float duration)
+        {
+            return EngineSystem.StepOnGas(targetSpeed, duration);
+        }
+
+        /// <summary>
+        /// 激活拉绳
+        /// </summary>
+        [YarnCommand("active_engine_pull")]
+        public static void ActivePull()
+        {
+            EngineSystem.isPullActive = true;
+        }
     }
 }

Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs

@@ -1,25 +1,24 @@
-using UnityEngine;
+using UnityEngine;
 
 namespace AibisDream
 {
     public class SpeedDashboard : MonoBehaviour
     {
-        private Transform _pointer;
-        
-        [SerializeField] private float leftRot;
-        [SerializeField] private float rightRot;
+        private Material _material;
+        private EngineSystem _engineSystem;
+        private static readonly int Progress1 = Shader.PropertyToID("_Progress");
 
-        protected void OnStart()
+        private void Awake()
         {
-            _pointer = transform.Find("Pointer");
+            _material = GetComponent<SpriteRenderer>().material;
+            _engineSystem = transform.parent.GetComponent<EngineSystem>();
+
+            _engineSystem.updateSpeedEvent.AddListener(OnSpeedChange);
         }
-        
-        protected void UpdateDashboard(EngineData data)
+
+        private void OnSpeedChange(float originSpeed, float speedScale)
         {
-            var targetRot = (rightRot - leftRot) * data.curSpeed + leftRot;
-            
-            _pointer.eulerAngles = new Vector3(0, 0, -targetRot);
+            _material.SetFloat(Progress1, originSpeed);
         }
     }
-}
-
+}

Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs.meta

@@ -1,11 +1,3 @@
-fileFormatVersion: 2
-guid: 73c497ccb39448718a07911a5e674d5f
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 4d9cead340d34293bf0fd9631aede238
+timeCreated: 1737626210

Assets/Scripts/MiniGame/Engine/StaticGear.cs

@@ -22,12 +22,8 @@ namespace AibisDream
                 .SetEase(Ease.Linear)
                 .SetLoops(-1, LoopType.Incremental);
         }
-
-        /// <summary>
-        /// 为旋转加速
-        /// </summary>
-        /// <param name="speed">速度倍率</param>
-        private void UpdateSpeedScale(float speed)
+        
+        private void UpdateSpeedScale(float originSpeed, float speed)
         {
             _rotateTween.timeScale = speed;
         }

Assets/Scripts/MiniGame/Gear/GearSystem.cs

@@ -39,6 +39,8 @@ namespace AibisDream
         private bool _isTargetReached;
         private bool _isDiscReady;
 
+        public float initSpeed = 1;
+
         private void Awake()
         {
             Init();
@@ -65,6 +67,10 @@ namespace AibisDream
             var panelShafts = _panel.GetComponentsInChildren<Shaft>();
             _shaftGraph = new ShaftGraph(shafts, panelShafts);
 
+            var engine = FixSystemCenter.SystemDic.Get<EngineSystem>();
+            _shaftGraph.StartRotate(initSpeed);
+            engine.updateSpeedEvent.AddListener(_shaftGraph.Accelerate);
+
             _panel.gameObject.SetActive(false);
         }
 

Assets/Scripts/MiniGame/Gear/Shaft.cs

@@ -23,9 +23,6 @@ namespace AibisDream
 
         [SerializeField] private Gear childGear;
 
-        // 初始角速度
-        [SerializeField] private float initialSpeed;
-
         // 目标角速度
         [SerializeField] private float targetSpeed;
 
@@ -70,8 +67,7 @@ namespace AibisDream
 
             // 如果带齿轮，要根据齿轮类型生成
             childGear = InitGear(initRadius, initSprite, isInitGearBroken, isInitGearDisc);
-
-            speed = initialSpeed;
+            
             childGear.UpdateRotation(speed, _speedScale);
         }
 
@@ -274,7 +270,6 @@ namespace AibisDream
             isInitGearBroken = levelData.isGearBroken;
             isInitGearDisc = levelData.isDisc;
             discIdx = levelData.discIdx;
-            initialSpeed = levelData.initialSpeed;
             targetSpeed = levelData.targetSpeed;
             initRadius = levelData.radius;
         }
@@ -291,7 +286,6 @@ namespace AibisDream
                 isGearBroken = isInitGearBroken,
                 isDisc = isInitGearDisc,
                 discIdx = discIdx,
-                initialSpeed = initialSpeed,
                 targetSpeed = targetSpeed,
                 radius = initRadius
             };
@@ -315,7 +309,6 @@ namespace AibisDream
 
         // 关卡数据
         public ShaftType shaftType;
-        public float initialSpeed;
         public float targetSpeed;
         public bool hasChildGear;
         public float radius;

Assets/Scripts/MiniGame/Gear/ShaftGraph.cs

@@ -43,6 +43,24 @@ namespace AibisDream
             UpdateSpeed();
         }
 
+        /// <summary>
+        /// 初始化速度
+        /// </summary>
+        /// <param name="initSpeed">初始速度</param>
+        public void StartRotate(float initSpeed)
+        {
+            _vertexArray[_rootIdx].speed = initSpeed;
+            UpdateSpeed();
+        }
+        
+        public void Accelerate(float originSpeed, float speed)
+        {
+            foreach (var shaft in _vertexArray)
+            {
+                if (shaft.HasChildGear()) shaft.UpdateSpeedScale(speed);
+            }
+        }
+
         private int FindDriverIdx()
         {
             for (int i = 0; i < _vertexSize; i++)
@@ -261,17 +279,5 @@ namespace AibisDream
 
             return isShaftAvailable;
         }
-
-        /// <summary>
-        /// 通过引擎系统加速
-        /// </summary>
-        /// <param name="curSpeed">当前速度</param>
-        private void Accelerate(float curSpeed)
-        {
-            foreach (var shaft in _vertexArray)
-            {
-                if (shaft.HasChildGear()) shaft.UpdateSpeedScale(1 + curSpeed);
-            }
-        }
     }
 }

Assets/Scripts/UI/Cursor/CursorManager.cs

@@ -15,13 +15,13 @@ namespace AibisDream
         public Sprite nextTalk, talking, option, interactive, holding, disable, eye;
 
         private Image _cursor;
-        private RectTransform _cursorCanvas;
 
         #region 状态相关
 
         private Coroutine _switchCoroutine;
         private CursorState _curState = CursorState.Default;
         private bool _isTalking;
+        [HideInInspector] public bool isInMenu;
 
         #endregion
 
@@ -59,12 +59,18 @@ namespace AibisDream
         private void InitRefs()
         {
             _cursor = transform.Find("Cursor").GetComponent<Image>();
-            _cursorCanvas = GetComponent<RectTransform>();
         }
 
         private void RegisterEvent()
         {
             // 此处监听所有可能对鼠标状态产生影响的事件
+            RegisterDialogEvent();
+            RegisterTriggerEvent();
+            RegisterMenu();
+        }
+
+        private void RegisterDialogEvent()
+        {
             // 对话相关
             _unRegisters.Add(EnumEventSystem.Global.Register<DialogEventEnum, DialogLine>(DialogEventEnum.LineStart,
                 OnLineStart));
@@ -74,7 +80,10 @@ namespace AibisDream
             _unRegisters.Add(
                 EnumEventSystem.Global.Register<DialogEventEnum, DialogLine>(DialogEventEnum.OptionSelected,
                     OnOptionSelect));
+        }
 
+        private void RegisterTriggerEvent()
+        {
             // 交互相关
             _unRegisters.Add(EnumEventSystem.Global.Register(InteractionEventEnum.Start, OnInteractiveStart));
             _unRegisters.Add(EnumEventSystem.Global.Register(InteractionEventEnum.End, OnInteractiveEnd));
@@ -89,6 +98,22 @@ namespace AibisDream
                 EnumEventSystem.Global.Register<TriggerEnum, IInteraction>(TriggerEnum.PointerUp, OnPointerUp));
         }
 
+        private void RegisterMenu()
+        {
+            _unRegisters.Add(EnumEventSystem.Global.Register<EventEnum, bool>(EventEnum.Menu, OnMenuChange));
+        }
+
+        private void Update()
+        {
+            if (Input.GetMouseButtonDown(0) || Input.GetKeyDown(KeyCode.Space))
+            {
+                if (_isTalking && !isInMenu)
+                {
+                    DialogController.Instance.JumpLine();
+                }
+            }
+        }
+
         private void LateUpdate()
         {
             // // 将虚拟指针与鼠标位置同步
@@ -190,6 +215,15 @@ namespace AibisDream
 
         #endregion
 
+        #region 菜单打开
+
+        private void OnMenuChange(bool isMenuOpen)
+        {
+            isInMenu = isMenuOpen;
+        }
+
+        #endregion
+
         #region 指针切换
 
         /// <summary>

Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs

@@ -162,6 +162,7 @@ namespace AibisDream
         {
             var logObj = transform.Find("Dialogue Log").gameObject;
             logObj.SetActive(!logObj.activeSelf);
+            EnumEventSystem.Global.Send(EventEnum.Menu, logObj.activeSelf);
         }
 
         #endregion