diff --git a/Assets/RawResources/Actor/诊室外人物/Idle.anim b/Assets/RawResources/Actor/诊室外人物/Idle.anim index dd66cb12a..4cdb53e50 100644 --- a/Assets/RawResources/Actor/诊室外人物/Idle.anim +++ b/Assets/RawResources/Actor/诊室外人物/Idle.anim @@ -16,31 +16,28 @@ AnimationClip: m_EulerCurves: [] m_PositionCurves: [] m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Enabled - path: - classID: 212 - script: {fileID: 0} - flags: 16 + m_FloatCurves: [] m_PPtrCurves: - serializedVersion: 2 - curve: [] + curve: + - time: 0 + value: {fileID: -1770973043791279248, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + - time: 0.25 + value: {fileID: 1908937743158120732, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + - time: 0.5 + value: {fileID: -2872163063393113613, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + - time: 0.75 + value: {fileID: 6432550650617401418, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + - time: 1 + value: {fileID: -6426910035944907541, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + - time: 1.25 + value: {fileID: -1485347798701981434, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + - time: 1.5 + value: {fileID: 8585650675589757685, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + - time: 1.75 + value: {fileID: -945477622473464830, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + - time: 2 + value: {fileID: -945477622473464830, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} attribute: m_Sprite path: classID: 212 @@ -59,7 +56,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0 + m_StopTime: 2.01 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -74,28 +71,7 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Enabled - path: - classID: 212 - script: {fileID: 0} - flags: 16 + m_EditorCurves: [] m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/RawResources/Actor/诊室外人物/Speak.anim b/Assets/RawResources/Actor/诊室外人物/Speak.anim index 09a7edf92..83ce6e06b 100644 --- a/Assets/RawResources/Actor/诊室外人物/Speak.anim +++ b/Assets/RawResources/Actor/诊室外人物/Speak.anim @@ -16,31 +16,28 @@ AnimationClip: m_EulerCurves: [] m_PositionCurves: [] m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Enabled - path: - classID: 212 - script: {fileID: 0} - flags: 16 + m_FloatCurves: [] m_PPtrCurves: - serializedVersion: 2 - curve: [] + curve: + - time: 0 + value: {fileID: -9087678837184484472, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + - time: 0.25 + value: {fileID: -693011079226969579, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + - time: 0.5 + value: {fileID: 1566858041427093753, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + - time: 0.75 + value: {fileID: -8113773223906961195, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + - time: 1 + value: {fileID: 7381348855809886235, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + - time: 1.25 + value: {fileID: -922264828827705230, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + - time: 1.5 + value: {fileID: 3449811961139707988, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + - time: 1.75 + value: {fileID: 5400199351387444021, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + - time: 2 + value: {fileID: 5400199351387444021, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} attribute: m_Sprite path: classID: 212 @@ -59,7 +56,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0 + m_StopTime: 2.01 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -74,28 +71,7 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Enabled - path: - classID: 212 - script: {fileID: 0} - flags: 16 + m_EditorCurves: [] m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/RawResources/Actor/诊室外人物/Watch.anim b/Assets/RawResources/Actor/诊室外人物/Watch.anim index 5678ca3e5..a4c1e2041 100644 --- a/Assets/RawResources/Actor/诊室外人物/Watch.anim +++ b/Assets/RawResources/Actor/诊室外人物/Watch.anim @@ -21,23 +21,23 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: -6297660235568238501, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + value: {fileID: 9038355420617165515, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} - time: 0.25 - value: {fileID: 8782527306615123988, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + value: {fileID: -6292246713809386722, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} - time: 0.5 - value: {fileID: -6634362488125652403, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + value: {fileID: 8715181765042302325, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} - time: 0.75 - value: {fileID: 8354085528250567009, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + value: {fileID: -3010977742252407126, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} - time: 1 - value: {fileID: 3145883346895557732, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + value: {fileID: -3815907826865963964, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} - time: 1.25 - value: {fileID: -4148849911865974556, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + value: {fileID: 7422854648985795963, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} - time: 1.5 - value: {fileID: -2930643966015560564, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + value: {fileID: 6806079289945762758, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} - time: 1.75 - value: {fileID: 551382827390195929, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + value: {fileID: 5258484559747789093, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} - time: 2 - value: {fileID: 551382827390195929, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} + value: {fileID: 5258484559747789093, guid: 8cfe101cd350eef4eaa418b1034f1e66, type: 3} attribute: m_Sprite path: classID: 212 diff --git a/Assets/RawResources/Actor/诊所外英里.aseprite b/Assets/RawResources/Actor/诊所外英里.aseprite index 387b6181d..26fa31bd5 100644 Binary files a/Assets/RawResources/Actor/诊所外英里.aseprite and b/Assets/RawResources/Actor/诊所外英里.aseprite differ diff --git a/Assets/RawResources/Actor/诊所外英里.aseprite.meta b/Assets/RawResources/Actor/诊所外英里.aseprite.meta index 05efb3278..c2de41740 100644 --- a/Assets/RawResources/Actor/诊所外英里.aseprite.meta +++ b/Assets/RawResources/Actor/诊所外英里.aseprite.meta @@ -18,11 +18,6 @@ ScriptedImporter: assembly: UnityEngine.AnimationModule name: Watch second: {fileID: 7400000, guid: 35432d41607909a48ad5b3a942f58417, type: 2} - - first: - type: UnityEngine:AnimationClip - assembly: UnityEngine.AnimationModule - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Clip" - second: {fileID: 7400000, guid: 1e6aa2c9a4093ee4e9049769b356cee9, type: 2} serializedVersion: 2 userData: assetBundleName: @@ -115,7 +110,7 @@ ScriptedImporter: addSortingGroup: 1 addShadowCasters: 0 importFileNodeState: 1 - platformSettingsDirtyTick: 638851036425175460 + platformSettingsDirtyTick: 638851090684690992 textureAssetName: singleSpriteImportData: - name: @@ -139,6 +134,326 @@ ScriptedImporter: tessellationDetail: 0 uvTransform: {x: 0, y: 0} animatedSpriteImportData: + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_16" + originalName: + pivot: {x: 0.36290324, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 96 + y: 320 + width: 62 + height: 153 + spriteID: 66ff39a8a83c06a4abe4fda70083fc38 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 96, y: 320} + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_17" + originalName: + pivot: {x: 0.36290324, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 96 + y: 481 + width: 62 + height: 153 + spriteID: 5f126ea329a951441a89dcef64ec7132 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 96, y: 481} + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_18" + originalName: + pivot: {x: 0.36290324, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 96 + y: 642 + width: 62 + height: 153 + spriteID: e0915a58d894b1c41af1693b87412889 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 96, y: 642} + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_19" + originalName: + pivot: {x: 0.36290324, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 96 + y: 803 + width: 62 + height: 153 + spriteID: bdc596805c448c146a2dc9c03a0fd75e + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 96, y: 803} + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_20" + originalName: + pivot: {x: 0.36290324, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 188 + y: 4 + width: 62 + height: 153 + spriteID: fe08724924a1ae24990132ad917cf793 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 188, y: 4} + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_21" + originalName: + pivot: {x: 0.36290324, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 188 + y: 165 + width: 62 + height: 153 + spriteID: 9a76b7fe63de1c74883edb8e3015abc9 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 188, y: 165} + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_22" + originalName: + pivot: {x: 0.36290324, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 188 + y: 326 + width: 62 + height: 153 + spriteID: 8c98f68d5b61675499d95f6ca1c036a6 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 188, y: 326} + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_23" + originalName: + pivot: {x: 0.36290324, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 188 + y: 487 + width: 62 + height: 153 + spriteID: ec38f8a37eb77c24c931a1efdd2af8b9 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 188, y: 487} + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_8" + originalName: + pivot: {x: 0.36290324, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 188 + y: 648 + width: 62 + height: 153 + spriteID: 92ce2ab860a75e642bafe9742bc91aff + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 188, y: 648} + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_9" + originalName: + pivot: {x: 0.36290324, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 188 + y: 809 + width: 62 + height: 153 + spriteID: af26adcac3438a64497e375996c23c33 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 188, y: 809} + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_10" + originalName: + pivot: {x: 0.36290324, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 258 + y: 4 + width: 62 + height: 153 + spriteID: 529b41809712313499125a1a12fb178f + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 258, y: 4} + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_11" + originalName: + pivot: {x: 0.36290324, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 258 + y: 165 + width: 62 + height: 153 + spriteID: 3445009362fdb484dbf60827a7d65a65 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 258, y: 165} + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_12" + originalName: + pivot: {x: 0.36290324, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 258 + y: 326 + width: 62 + height: 153 + spriteID: 2e019bcf3b35d784b8c9a9da4993c428 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 258, y: 326} + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_13" + originalName: + pivot: {x: 0.36290324, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 258 + y: 487 + width: 62 + height: 153 + spriteID: 1664b6465d3266141b45cda3a82dbe31 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 258, y: 487} + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_14" + originalName: + pivot: {x: 0.36290324, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 258 + y: 648 + width: 62 + height: 153 + spriteID: 0e515b06b52256d4d8b97aec73b1b0c2 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 258, y: 648} + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_15" + originalName: + pivot: {x: 0.36290324, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 258 + y: 809 + width: 62 + height: 153 + spriteID: 58371713a135c954191e53e30a97bc8c + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 258, y: 809} - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_0" originalName: pivot: {x: 0.44642857, y: 0} @@ -150,7 +465,7 @@ ScriptedImporter: y: 4 width: 84 height: 150 - spriteID: 2bbfc27d193200646aa46298806f237d + spriteID: b3f27cd32ecd68f488d792cb972cdf46 spriteBone: [] spriteOutline: [] vertices: [] @@ -170,7 +485,7 @@ ScriptedImporter: y: 162 width: 84 height: 150 - spriteID: 2f2dc4fda650b77409b14943159acbf9 + spriteID: cd70915df3259db47af077e615627a23 spriteBone: [] spriteOutline: [] vertices: [] @@ -190,7 +505,7 @@ ScriptedImporter: y: 320 width: 84 height: 150 - spriteID: 253e87915e1d24a439f7f5fe99f988df + spriteID: 29aa62f428b2d214b874884e3c15e5ac spriteBone: [] spriteOutline: [] vertices: [] @@ -200,6 +515,66 @@ ScriptedImporter: tessellationDetail: 0 uvTransform: {x: 4, y: 320} - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_3" + originalName: + pivot: {x: 0.44642857, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 478 + width: 84 + height: 150 + spriteID: 2381dcb8850432c49a6d794e3a232ba2 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 478} + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_4" + originalName: + pivot: {x: 0.44642857, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 636 + width: 84 + height: 150 + spriteID: 9394557317cd1334c9e626229756def4 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 636} + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_5" + originalName: + pivot: {x: 0.44642857, y: 0} + alignment: 9 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 794 + width: 84 + height: 150 + spriteID: 1cea4066ee003104ab20265290be9a29 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 794} + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_6" originalName: pivot: {x: 0.44642857, y: 0} alignment: 9 @@ -210,7 +585,7 @@ ScriptedImporter: y: 4 width: 84 height: 150 - spriteID: d8268ac47cc54ba44ac03aa196fd9071 + spriteID: a8817791256e42042bfdc4b5dba156ff spriteBone: [] spriteOutline: [] vertices: [] @@ -219,7 +594,7 @@ ScriptedImporter: edges: [] tessellationDetail: 0 uvTransform: {x: 96, y: 4} - - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_4" + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_7" originalName: pivot: {x: 0.44642857, y: 0} alignment: 9 @@ -230,7 +605,7 @@ ScriptedImporter: y: 162 width: 84 height: 150 - spriteID: 0acad82de8e4e97428062fbf7c67a0ed + spriteID: 81cb509270f467841ac0120fadb0f568 spriteBone: [] spriteOutline: [] vertices: [] @@ -239,66 +614,6 @@ ScriptedImporter: edges: [] tessellationDetail: 0 uvTransform: {x: 96, y: 162} - - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_5" - originalName: - pivot: {x: 0.44642857, y: 0} - alignment: 9 - border: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 96 - y: 320 - width: 84 - height: 150 - spriteID: e093546ba0d790149bb7588c87b91591 - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 96, y: 320} - - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_6" - originalName: - pivot: {x: 0.44642857, y: 0} - alignment: 9 - border: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 188 - y: 4 - width: 84 - height: 150 - spriteID: 36b561d33307aa549bdc1169add6fe67 - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 188, y: 4} - - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_7" - originalName: - pivot: {x: 0.44642857, y: 0} - alignment: 9 - border: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 188 - y: 162 - width: 84 - height: 150 - spriteID: 2639854a75dd9804dbbc6c52e94ef30a - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 188, y: 162} spriteSheetImportData: [] asepriteLayers: - layerIndex: 0 @@ -308,6 +623,134 @@ ScriptedImporter: layerType: 0 blendMode: 0 cells: + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_16" + frameIndex: 16 + cellRect: + x: 24 + y: 0 + width: 62 + height: 153 + spriteId: 66ff39a8a83c06a4abe4fda70083fc38 + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_17" + frameIndex: 17 + cellRect: + x: 24 + y: 0 + width: 62 + height: 153 + spriteId: 5f126ea329a951441a89dcef64ec7132 + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_18" + frameIndex: 18 + cellRect: + x: 24 + y: 0 + width: 62 + height: 153 + spriteId: e0915a58d894b1c41af1693b87412889 + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_19" + frameIndex: 19 + cellRect: + x: 24 + y: 0 + width: 62 + height: 153 + spriteId: bdc596805c448c146a2dc9c03a0fd75e + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_20" + frameIndex: 20 + cellRect: + x: 24 + y: 0 + width: 62 + height: 153 + spriteId: fe08724924a1ae24990132ad917cf793 + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_21" + frameIndex: 21 + cellRect: + x: 24 + y: 0 + width: 62 + height: 153 + spriteId: 9a76b7fe63de1c74883edb8e3015abc9 + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_22" + frameIndex: 22 + cellRect: + x: 24 + y: 0 + width: 62 + height: 153 + spriteId: 8c98f68d5b61675499d95f6ca1c036a6 + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_23" + frameIndex: 23 + cellRect: + x: 24 + y: 0 + width: 62 + height: 153 + spriteId: ec38f8a37eb77c24c931a1efdd2af8b9 + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_8" + frameIndex: 8 + cellRect: + x: 24 + y: 0 + width: 62 + height: 153 + spriteId: 92ce2ab860a75e642bafe9742bc91aff + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_9" + frameIndex: 9 + cellRect: + x: 24 + y: 0 + width: 62 + height: 153 + spriteId: af26adcac3438a64497e375996c23c33 + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_10" + frameIndex: 10 + cellRect: + x: 24 + y: 0 + width: 62 + height: 153 + spriteId: 529b41809712313499125a1a12fb178f + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_11" + frameIndex: 11 + cellRect: + x: 24 + y: 0 + width: 62 + height: 153 + spriteId: 3445009362fdb484dbf60827a7d65a65 + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_12" + frameIndex: 12 + cellRect: + x: 24 + y: 0 + width: 62 + height: 153 + spriteId: 2e019bcf3b35d784b8c9a9da4993c428 + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_13" + frameIndex: 13 + cellRect: + x: 24 + y: 0 + width: 62 + height: 153 + spriteId: 1664b6465d3266141b45cda3a82dbe31 + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_14" + frameIndex: 14 + cellRect: + x: 24 + y: 0 + width: 62 + height: 153 + spriteId: 0e515b06b52256d4d8b97aec73b1b0c2 + - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_15" + frameIndex: 15 + cellRect: + x: 24 + y: 0 + width: 62 + height: 153 + spriteId: 58371713a135c954191e53e30a97bc8c - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_0" frameIndex: 0 cellRect: @@ -315,7 +758,7 @@ ScriptedImporter: y: 0 width: 84 height: 150 - spriteId: 2bbfc27d193200646aa46298806f237d + spriteId: b3f27cd32ecd68f488d792cb972cdf46 - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_1" frameIndex: 1 cellRect: @@ -323,7 +766,7 @@ ScriptedImporter: y: 0 width: 84 height: 150 - spriteId: 2f2dc4fda650b77409b14943159acbf9 + spriteId: cd70915df3259db47af077e615627a23 - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_2" frameIndex: 2 cellRect: @@ -331,7 +774,7 @@ ScriptedImporter: y: 0 width: 84 height: 150 - spriteId: 253e87915e1d24a439f7f5fe99f988df + spriteId: 29aa62f428b2d214b874884e3c15e5ac - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_3" frameIndex: 3 cellRect: @@ -339,7 +782,7 @@ ScriptedImporter: y: 0 width: 84 height: 150 - spriteId: d8268ac47cc54ba44ac03aa196fd9071 + spriteId: 2381dcb8850432c49a6d794e3a232ba2 - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_4" frameIndex: 4 cellRect: @@ -347,7 +790,7 @@ ScriptedImporter: y: 0 width: 84 height: 150 - spriteId: 0acad82de8e4e97428062fbf7c67a0ed + spriteId: 9394557317cd1334c9e626229756def4 - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_5" frameIndex: 5 cellRect: @@ -355,7 +798,7 @@ ScriptedImporter: y: 0 width: 84 height: 150 - spriteId: e093546ba0d790149bb7588c87b91591 + spriteId: 1cea4066ee003104ab20265290be9a29 - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_6" frameIndex: 6 cellRect: @@ -363,7 +806,7 @@ ScriptedImporter: y: 0 width: 84 height: 150 - spriteId: 36b561d33307aa549bdc1169add6fe67 + spriteId: a8817791256e42042bfdc4b5dba156ff - name: "\u8BCA\u6240\u5916\u82F1\u91CC_Frame_7" frameIndex: 7 cellRect: @@ -371,14 +814,14 @@ ScriptedImporter: y: 0 width: 84 height: 150 - spriteId: 2639854a75dd9804dbbc6c52e94ef30a + spriteId: 81cb509270f467841ac0120fadb0f568 linkedCells: [] parentIndex: -1 platformSettings: - name: DefaultTexturePlatform overridden: 0 ignorePlatformSupport: 0 - maxTextureSize: 4096 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Render/Renderer2Dtest.asset b/Assets/Render/Renderer2Dtest.asset index 8bd4a3162..0d0ed7b88 100644 --- a/Assets/Render/Renderer2Dtest.asset +++ b/Assets/Render/Renderer2Dtest.asset @@ -477,19 +477,15 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 _filter: - - 0.0048309183 - - 0.016401261 - - 0.04532712 - - 0.08293076 - - 0.12053438 - - 0.14946026 - - 0.1610306 - - 0.14946026 - - 0.12053438 - - 0.08293076 - - 0.04532712 - - 0.016401261 - - 0.0048309183 + - 0.007228916 + - 0.043749984 + - 0.12409639 + - 0.20444278 + - 0.24096388 + - 0.20444278 + - 0.12409639 + - 0.043749984 + - 0.007228916 --- !u!114 &-6101378415725230565 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 52ea60073..0a968a704 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -3003,7 +3003,7 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_HighlightedColor: {r: 0.4, g: 0.4, b: 0.4, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} @@ -3618,7 +3618,7 @@ GameObject: - component: {fileID: 231219353} m_Layer: 5 m_Name: Image - m_TagString: Untagged + m_TagString: Selectable m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -4198,7 +4198,7 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_HighlightedColor: {r: 0.4, g: 0.4, b: 0.4, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} @@ -5504,7 +5504,7 @@ GameObject: - component: {fileID: 343980039} m_Layer: 5 m_Name: Text - m_TagString: Untagged + m_TagString: Selectable m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -5675,9 +5675,12 @@ GameObject: m_Component: - component: {fileID: 367483172} - component: {fileID: 367483173} + - component: {fileID: 367483175} + - component: {fileID: 367483174} + - component: {fileID: 367483176} m_Layer: 5 m_Name: Top Bar - m_TagString: Untagged + m_TagString: Selectable m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -5700,10 +5703,10 @@ RectTransform: - {fileID: 1928871879} m_Father: {fileID: 2135943277} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} + m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -48} - m_SizeDelta: {x: 0, y: 120} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 406, y: 150} m_Pivot: {x: 1, y: 1} --- !u!114 &367483173 MonoBehaviour: @@ -5718,19 +5721,71 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 30 m_Right: 30 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 2 + m_ChildAlignment: 5 m_Spacing: 30 m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 1 + m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!114 &367483174 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367483171} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!222 &367483175 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367483171} + m_CullTransparentMesh: 1 +--- !u!114 &367483176 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367483171} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 951630327, guid: ca909870d485bde44b1e652490df203f, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &369430729 GameObject: m_ObjectHideFlags: 0 @@ -6670,7 +6725,7 @@ GameObject: - component: {fileID: 461705133} m_Layer: 5 m_Name: Text - m_TagString: Untagged + m_TagString: Selectable m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -8195,7 +8250,7 @@ GameObject: - component: {fileID: 527148465} m_Layer: 5 m_Name: Image - m_TagString: Untagged + m_TagString: Selectable m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -8646,7 +8701,7 @@ GameObject: - component: {fileID: 576009915} m_Layer: 5 m_Name: Image - m_TagString: Untagged + m_TagString: Selectable m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -9167,7 +9222,7 @@ GameObject: - component: {fileID: 640896812} m_Layer: 5 m_Name: Record - m_TagString: Untagged + m_TagString: Selectable m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -9190,8 +9245,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: 1795.9999, y: 0} - m_SizeDelta: {x: 64, y: 120} + m_AnchoredPosition: {x: 282, y: -25} + m_SizeDelta: {x: 64, y: 100} m_Pivot: {x: 1, y: 1} --- !u!222 &640896811 CanvasRenderer: @@ -13003,9 +13058,10 @@ GameObject: - component: {fileID: 960307108} - component: {fileID: 960307110} - component: {fileID: 960307111} + - component: {fileID: 960307112} m_Layer: 5 m_Name: Quick Forward - m_TagString: Untagged + m_TagString: Selectable m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -13028,8 +13084,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: 1701.9999, y: 0.000051498413} - m_SizeDelta: {x: 64, y: 120} + m_AnchoredPosition: {x: 94, y: -25} + m_SizeDelta: {x: 64, y: 100} m_Pivot: {x: 1, y: 1} --- !u!222 &960307110 CanvasRenderer: @@ -13103,6 +13159,23 @@ MonoBehaviour: m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 +--- !u!114 &960307112 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 960307107} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9ccf36d0564d46b98327fbcbfb03096b, type: 3} + m_Name: + m_EditorClassIdentifier: + data: + trueKey: main_fast_true + trueSprite: {fileID: 21300000, guid: 4c3f42fff40b5f64db42790e0258b47b, type: 3} + falseKey: main_fast + falseSprite: {fileID: 21300000, guid: 72a2a3c5e2547a947a2ae3befad5dd04, type: 3} --- !u!1 &977428573 GameObject: m_ObjectHideFlags: 0 @@ -15021,7 +15094,7 @@ GameObject: - component: {fileID: 1164645870} m_Layer: 5 m_Name: Auto Skip - m_TagString: Untagged + m_TagString: Selectable m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -15044,8 +15117,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: 1701.9999, y: 0} - m_SizeDelta: {x: 64, y: 120} + m_AnchoredPosition: {x: 188, y: -25} + m_SizeDelta: {x: 64, y: 100} m_Pivot: {x: 1, y: 1} --- !u!222 &1164645868 CanvasRenderer: @@ -21427,7 +21500,7 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_HighlightedColor: {r: 0.4, g: 0.4, b: 0.4, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} @@ -22792,7 +22865,7 @@ GameObject: - component: {fileID: 1795397297} m_Layer: 5 m_Name: Text - m_TagString: Untagged + m_TagString: Selectable m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -23599,7 +23672,7 @@ GameObject: - component: {fileID: 1928871883} m_Layer: 5 m_Name: Setting - m_TagString: Untagged + m_TagString: Selectable m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -23622,8 +23695,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: 1889.9999, y: 0} - m_SizeDelta: {x: 64, y: 120} + m_AnchoredPosition: {x: 376, y: -25} + m_SizeDelta: {x: 64, y: 100} m_Pivot: {x: 1, y: 1} --- !u!222 &1928871882 CanvasRenderer: @@ -24124,7 +24197,7 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_HighlightedColor: {r: 0.4, g: 0.4, b: 0.4, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} @@ -24322,7 +24395,7 @@ GameObject: - component: {fileID: 1970860742} m_Layer: 5 m_Name: Image - m_TagString: Untagged + m_TagString: Selectable m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -26976,7 +27049,7 @@ GameObject: - component: {fileID: 2144722411} m_Layer: 5 m_Name: Text - m_TagString: Untagged + m_TagString: Selectable m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Scripts/UI/Cursor/CursorManager.cs b/Assets/Scripts/UI/Cursor/CursorManager.cs index 34065090a..010202998 100644 --- a/Assets/Scripts/UI/Cursor/CursorManager.cs +++ b/Assets/Scripts/UI/Cursor/CursorManager.cs @@ -1,9 +1,11 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Linq; using AibisDream.Framework; using AibisDream.Kit; using UnityEngine; +using UnityEngine.EventSystems; using UnityEngine.UI; namespace AibisDream @@ -16,8 +18,9 @@ namespace AibisDream public Sprite nextTalk, talking, option, interactive, holding, disable; private Image _cursor; - - private Sprite _cursorCache; + private GraphicRaycaster _raycaster; + + private Sprite _curCursor; private CursorState _stateCache; #region 状态相关 @@ -25,14 +28,14 @@ namespace AibisDream private Coroutine _switchCoroutine; private CursorState _curState = CursorState.Default; private bool _isTalking; - private bool _isPaused; + private bool _isInGame; #endregion // 卸载时注销事件 private readonly List _unRegisters = new(); - public override void OnSingletonInit() + private void Start() { InitRefs(); InitCursor(); @@ -63,6 +66,7 @@ namespace AibisDream private void InitRefs() { _cursor = transform.Find("Cursor").GetComponent(); + _raycaster = UIManager.Instance.Canvas.GetComponent(); } private void RegisterEvent() @@ -75,42 +79,41 @@ namespace AibisDream private void RegisterGameEvent() { + _unRegisters.Add(EnumEventSystem.Global.Register(GameLoopEnum.GameStart, OnGameStart)); _unRegisters.Add(EnumEventSystem.Global.Register(GameLoopEnum.GameQuit, OnGameQuit)); _unRegisters.Add(EnumEventSystem.Global.Register(GameLoopEnum.PauseGame, OnPauseGame)); _unRegisters.Add(EnumEventSystem.Global.Register(GameLoopEnum.UnPauseGame, OnUnPauseGame)); } + private void OnGameStart() + { + _isInGame = true; + } + private void OnUnPauseGame() { - _cursor.sprite = _cursorCache; - _cursorCache = null; - _curState = _stateCache; _stateCache = CursorState.Default; - _isPaused = false; + _isInGame = true; } private void OnPauseGame() { - _cursorCache = _cursor.sprite; - _cursor.sprite = defaultCursor; - _stateCache = _curState; _curState = CursorState.Default; - - _isPaused = true; + + _isInGame = false; } private void OnGameQuit() { - _cursor.sprite = defaultCursor; - _cursorCache = null; + _curCursor = defaultCursor; _curState = CursorState.Default; _stateCache = CursorState.Default; - _isPaused = false; + _isInGame = false; } private void RegisterDialogEvent() @@ -144,20 +147,46 @@ namespace AibisDream private void Update() { - if (_isPaused) - { - return; - } + UpdateCursor(); + HandleDialog(); + } - if (Input.GetMouseButtonDown(0) || Input.GetKeyDown(KeyCode.Space)) + private void UpdateCursor() + { + // 再判断是不是浮在可交互物上 + _cursor.sprite = !_isInGame || IsOverSelected() ? defaultCursor : _curCursor; + } + + private void HandleDialog() + { + if (!_isInGame) return; + if (!Input.GetMouseButtonDown(0) && !Input.GetKeyDown(KeyCode.Space)) return; + + // 控制对话 + if (_isTalking) { - if (_isTalking) - { - DialogController.Instance.JumpLine(); - } + DialogController.Instance.JumpLine(); } } + private bool IsOverSelected() + { + if (!EventSystem.current.IsPointerOverGameObject()) + { + return false; + } + + var eventData = new PointerEventData(EventSystem.current) + { + position = Input.mousePosition + }; + + var results = new List(); + _raycaster.Raycast(eventData, results); + + return results.Count > 0 && results.Any(result => result.gameObject.CompareTag("Selectable")); + } + private void LateUpdate() { // // 将虚拟指针与鼠标位置同步 @@ -183,7 +212,7 @@ namespace AibisDream _switchCoroutine = StartCoroutine(DelayAction(() => { _isTalking = false; - _cursor.sprite = defaultCursor; + _curCursor = defaultCursor; })); } @@ -199,7 +228,7 @@ namespace AibisDream _switchCoroutine = StartCoroutine(DelayAction(() => { _isTalking = false; - _cursor.sprite = defaultCursor; + _curCursor = defaultCursor; })); } @@ -268,7 +297,7 @@ namespace AibisDream private void SwitchCursor(Sprite sprite) { StopDelayCursor(); - _cursor.sprite = sprite; + _curCursor = sprite; } private void StopDelayCursor() @@ -292,8 +321,6 @@ namespace AibisDream public enum CursorState { Default, - Interactive, - Dialog, - Menu + Interactive } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Panel/MainPanel.cs b/Assets/Scripts/UI/Panel/MainPanel.cs index 861e5c4ea..b37278ea9 100644 --- a/Assets/Scripts/UI/Panel/MainPanel.cs +++ b/Assets/Scripts/UI/Panel/MainPanel.cs @@ -49,9 +49,9 @@ namespace AibisDream auto.OnClick.AddListener(AutoSkip); auto.getBool = () => DialogController.Instance.autoRunMode; - // var ffwd = topBar.Find("Quick Forward").GetComponent(); - // ffwd.OnClick.AddListener(QuickForward); - // ffwd.getBool = () => DialogController.Instance.quickRunMode; + var ffwd = topBar.Find("Quick Forward").GetComponent(); + ffwd.OnClick.AddListener(QuickForward); + ffwd.getBool = () => DialogController.Instance.quickRunMode; } private void AutoSkip() diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index b799847fe..df4e9a066 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -12,6 +12,7 @@ TagManager: - DialogueObject - MoveableCharacter - Vehicle + - Selectable layers: - Default - TransparentFX