tinbird/aibis-dream
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构暂存

Browse Source
This commit is contained in:
bottlefish
2024-12-23 15:32:54 +08:00
parent 58714dcb2d
commit 4e08fda3e6
10 changed files with 993 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Resources/Yarn/Re_LTS_Peipeiday1/Eye.yarn
+5 -6
View File
@@ -1,4 +1,4 @@
title: DeepInEye
title: EyeDeepIn
tags:
position: -9,21
---
@@ -257,14 +257,14 @@ position: 251,1116
<<if visited("End_memoryPaly")==false>>
me:没什么头绪，先看看别的地方
<<Set_MouseMovementLockState EyeManager false>>
<<BackToMainView ViewManager>>
<<switch_fix_system_to BodyModule>>
<<endif>>
<<if $isFinishedEyeCheck==true>>
me:这里应该已经彻底检查过了
<<Set_MouseMovementLockState EyeManager false>>
<<BackToMainView ViewManager>>
<<switch_fix_system_to BodyModule>>
<<endif>>
<<if $gameStage==7>>
@@ -285,7 +285,7 @@ me:这里应该已经彻底检查过了
<<complete_task TaskManager "重新检查视觉症状">>
<<set $gameStage=8>>
<<set $gameStageDoOnceFinished=false>>
<<BackToMainView ViewManager>>
<<switch_fix_system_to BodyModule>>
<<complete_task TaskManager 复查视觉模块>>
<<jump UF绘图复查>>
<<endif>>
@@ -296,11 +296,10 @@ me:这里应该已经彻底检查过了
【占位】虽然不知道为什么，但是我们应该去检查一下这些记忆都是什么，是否和UF的非法记忆有关
<<set $gameStage=4>>
<<set $gameStageDoOnceFinished=false>>
<<SetExternalError ViewManager MemoryView true>>
<<set $isFinishedEyeCheck=true>>
<<Set_MouseMovementLockState EyeManager false>>
<<complete_task TaskManager 深入视觉模块>>
<<BackToMainView ViewManager>>
<<switch_fix_system_to BodyModule>>
<<complete_task TaskManager 全身检查，寻找错误记忆调用的来源>>
<<complete_task TaskManager 再次检查视觉模块>>
<<add_task TaskManager 查询从视觉中得到的记忆索引 找到异常记忆的来源>>
Assets/Resources/Yarn/Re_LTS_Peipeiday1/Memory.yarn
+1 -1
View File
@@ -1,4 +1,4 @@
title: DeepInMemory
title: MemoryDeepIn
tags:
---
<<switch_fix_system_to Memory>>
Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn
+9 -11
View File
@@ -1,7 +1,7 @@
title: Start
tags:
colorID: 8
position: 234,-2054
position: 253,-2041
---
// 打开ClueBoard
//<<jump 打开ClueBoard>>
@@ -11,7 +11,7 @@ position: 234,-2054
title: 数据初始化
tags:
colorID: 4
position: 235,-1739
position: 248,-1739
---
///在这里决定这次诊疗的目标是什么，以及目标判断相关的数值
@@ -116,12 +116,11 @@ colorID: 3
position: 256,-1154
---
<<fade_in 0.5>>
<<switch_fix_system_to "BodyModule" "Peipei1.json">>
<<switch_fix_system_to "BodyModule">>
//<<SetExternalError ViewManager MemoryView true>>
//<<Set_ViewVisualState ViewManager "ColorView" 1>>
<<wait 0.5>>
<<fade_out 0.5>>
<<add_task TaskManager 寻找绘图异常相关线索>>
<<task_moveIn TaskManager>>
【占位】进入维修后，你想要进UF内部看一看，但是UF不允许，UF只允许调取最近1h的记录
@@ -203,7 +202,7 @@ group:分析相关
position: -274,-580
---
<<fade_in 1>>
<<load_scene ClinicScene>>
<<switch_fix_system_to Clinic>>
<<move_out_fix>>
<<fade_out 1>>
<<character_init_new Peipei>>
@@ -220,7 +219,7 @@ title: 结论
tags:
colorID: 8
group:分析相关
position: -270,-411
position: -270,-412
---
<<character_init_new Peipei>>
<<character_eye_new "auto_blink">>
@@ -255,13 +254,12 @@ title: 手术准备
tags:
colorID: 8
group:手术相关
position: -273,-93
position: -269,-100
---
<<move_to_fix>>
//<<move_to_fix>>
<<fade_in 1>>
<<load_scene 佩佩视觉模块>>
<<switch_fix_system_to BodyModule>>
<<fade_out 1>>
<<SetExternalError ViewManager MemoryView true>>
<<set_line_cuttable LineManager MemoryEye true>>
<<set $gameStage=6>>
<<set $gameStageDoOnceFinished=false>>
@@ -310,7 +308,7 @@ position: 297,-77
---
me: 检查应该都完成了…我们出去吧，佩佩。
<<fade_in 1>>
<<load_scene ClinicScene>>
<<switch_fix_system_to Clinic>>
<<move_out_fix>>
<<fade_out 1>>
<<character_init_new Peipei>>
Assets/Scenes/PeipeiFixScene.unity
+772 -480
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/Persistence.unity
+151 -17
View File
@@ -1721,6 +1721,17 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 99451801}
m_PrefabAsset: {fileID: 0}
--- !u!114 &99451806 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 99451801}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 99451805}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &114645688
GameObject:
m_ObjectHideFlags: 0
@@ -2281,6 +2292,17 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 149374359}
m_PrefabAsset: {fileID: 0}
--- !u!114 &149374364 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 149374359}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 149374363}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &152335402
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2660,6 +2682,17 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 188420210}
m_PrefabAsset: {fileID: 0}
--- !u!114 &188420215 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 188420210}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 188420214}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &190090867 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
@@ -3140,6 +3173,17 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 216794752}
m_PrefabAsset: {fileID: 0}
--- !u!114 &216794757 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 216794752}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 216794756}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &237392154
GameObject:
m_ObjectHideFlags: 0
@@ -5279,6 +5323,17 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 475823254}
m_PrefabAsset: {fileID: 0}
--- !u!114 &475823259 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 475823254}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 475823258}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &476337178 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
@@ -6892,6 +6947,17 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 629580921}
m_PrefabAsset: {fileID: 0}
--- !u!114 &629580926 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 629580921}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 629580925}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &651726652
GameObject:
m_ObjectHideFlags: 0
@@ -9757,6 +9823,17 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 852388791}
m_PrefabAsset: {fileID: 0}
--- !u!114 &852388796 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 852388791}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 852388795}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &855263533
GameObject:
m_ObjectHideFlags: 0
@@ -11875,7 +11952,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!114 &1200911921
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -15098,6 +15175,17 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 1556863295}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1556863300 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 1556863295}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1556863299}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1560719975
GameObject:
m_ObjectHideFlags: 0
@@ -15774,6 +15862,17 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 1437328103}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1599989369 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 1437328103}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1599989368}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1604842425
GameObject:
m_ObjectHideFlags: 0
@@ -16191,7 +16290,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a2f82f623f7c479cb5d1935ee6067484, type: 3}
m_Name:
m_EditorClassIdentifier:
_nodes: []
_nodes:
- {fileID: 1989818787}
- {fileID: 216794757}
- {fileID: 475823259}
- {fileID: 1599989369}
- {fileID: 149374364}
- {fileID: 99451806}
- {fileID: 852388796}
- {fileID: 629580926}
- {fileID: 188420215}
- {fileID: 1556863300}
- {fileID: 500438203}
- {fileID: 1592246587}
_connections: []
_cacheRaycasters: 1
--- !u!4 &1620453322
@@ -19134,6 +19245,17 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 1989818781}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1989818787 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3}
m_PrefabInstance: {fileID: 1989818781}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1989818785}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1990871918
GameObject:
m_ObjectHideFlags: 0
@@ -23660,7 +23782,7 @@ RectTransform:
m_Father: {fileID: 265254503306996572}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
@@ -30596,7 +30718,7 @@ MonoBehaviour:
rectTransform: {fileID: 8007592087727081612}
linkTransform: {fileID: 0}
groupTransform: {fileID: 0}
graphManager: {fileID: 0}
graphManager: {fileID: 3728315362672514892}
enableSelfConnection: 0
_enableDrag: 0
_enableHover: 1
@@ -32292,7 +32414,7 @@ MonoBehaviour:
rectTransform: {fileID: 7282059703919780462}
linkTransform: {fileID: 0}
groupTransform: {fileID: 0}
graphManager: {fileID: 0}
graphManager: {fileID: 3728315362672514892}
enableSelfConnection: 0
_enableDrag: 0
_enableHover: 1
@@ -34286,7 +34408,19 @@ MonoBehaviour:
mainCamera: {fileID: 519420031}
lineRenderer: {fileID: 3253743068496567163}
contentPanel: {fileID: 243936684424215245}
localNodes: []
localNodes:
- {fileID: 1989818787}
- {fileID: 216794757}
- {fileID: 475823259}
- {fileID: 1599989369}
- {fileID: 149374364}
- {fileID: 99451806}
- {fileID: 852388796}
- {fileID: 629580926}
- {fileID: 188420215}
- {fileID: 1556863300}
- {fileID: 500438203}
- {fileID: 1592246587}
localConnections: []
pointer:
customImage: {fileID: 1475193827753151906}
@@ -34294,7 +34428,7 @@ MonoBehaviour:
iconOnDrag: {fileID: 8895775685280376203, guid: eb11ac9a06fb4792b393db9b83ab43b4, type: 3}
exclusiveOnDragCanvas: {fileID: 0}
useLegacyDragMethod: 0
position: {x: 2686.129, y: 882.63367, z: 0}
position: {x: 974.2973, y: 1166.5173, z: 0}
dragSelection:
customRenderer: {fileID: 0}
line:
@@ -34670,7 +34804,7 @@ MonoBehaviour:
rectTransform: {fileID: 8980408154347076217}
linkTransform: {fileID: 0}
groupTransform: {fileID: 0}
graphManager: {fileID: 0}
graphManager: {fileID: 3728315362672514892}
enableSelfConnection: 0
_enableDrag: 0
_enableHover: 1
@@ -35153,7 +35287,7 @@ MonoBehaviour:
rectTransform: {fileID: 9150678032829601296}
linkTransform: {fileID: 0}
groupTransform: {fileID: 0}
graphManager: {fileID: 0}
graphManager: {fileID: 3728315362672514892}
enableSelfConnection: 0
_enableDrag: 0
_enableHover: 1
@@ -36144,7 +36278,7 @@ MonoBehaviour:
rectTransform: {fileID: 8305720147907504314}
linkTransform: {fileID: 0}
groupTransform: {fileID: 0}
graphManager: {fileID: 0}
graphManager: {fileID: 3728315362672514892}
enableSelfConnection: 0
_enableDrag: 0
_enableHover: 1
@@ -43003,7 +43137,7 @@ MonoBehaviour:
rectTransform: {fileID: 2041500036121329234}
linkTransform: {fileID: 0}
groupTransform: {fileID: 0}
graphManager: {fileID: 0}
graphManager: {fileID: 3728315362672514892}
enableSelfConnection: 0
_enableDrag: 0
_enableHover: 1
@@ -46801,7 +46935,7 @@ MonoBehaviour:
rectTransform: {fileID: 3037079921269169012}
linkTransform: {fileID: 0}
groupTransform: {fileID: 0}
graphManager: {fileID: 0}
graphManager: {fileID: 3728315362672514892}
enableSelfConnection: 0
_enableDrag: 0
_enableHover: 1
@@ -48769,7 +48903,7 @@ MonoBehaviour:
rectTransform: {fileID: 2592852046776807969}
linkTransform: {fileID: 0}
groupTransform: {fileID: 0}
graphManager: {fileID: 0}
graphManager: {fileID: 3728315362672514892}
enableSelfConnection: 0
_enableDrag: 0
_enableHover: 1
@@ -49924,7 +50058,7 @@ RectTransform:
m_Father: {fileID: 6498488201931268245}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
@@ -50198,7 +50332,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &7966889870541532172
RectTransform:
m_ObjectHideFlags: 0
@@ -52610,7 +52744,7 @@ MonoBehaviour:
rectTransform: {fileID: 4596928483061751012}
linkTransform: {fileID: 0}
groupTransform: {fileID: 0}
graphManager: {fileID: 0}
graphManager: {fileID: 3728315362672514892}
enableSelfConnection: 0
_enableDrag: 0
_enableHover: 1
@@ -53526,7 +53660,7 @@ MonoBehaviour:
rectTransform: {fileID: 3538142130825932876}
linkTransform: {fileID: 0}
groupTransform: {fileID: 0}
graphManager: {fileID: 0}
graphManager: {fileID: 3728315362672514892}
enableSelfConnection: 0
_enableDrag: 0
_enableHover: 1
Assets/Scripts/FixSystem/Tools/ToolManager.cs
+28 -28
View File
@@ -20,7 +20,7 @@ public class ToolManager : MonoBehaviour
public bool HasTool => currentTool != null; // 判断玩家是否已获得工具
private Module currentModule;
public Transform faceCanvas;
// public Transform faceCanvas;
private Vector3 originalCanvasPosition; // 原始面板位置
@@ -42,7 +42,7 @@ public class ToolManager : MonoBehaviour
private void Start()
{
originalCanvasPosition=faceCanvas.position;
//originalCanvasPosition=faceCanvas.position;
currentModule=null;
toolBox.SetActive(false); // 初始隐藏工具盒
@@ -63,7 +63,7 @@ public class ToolManager : MonoBehaviour
{
//module.StartRepairIfToolIsScrewdriver(currentTool);
currentModule=module;
EnterRepairMode();
//EnterRepairMode();
}
else
{
@@ -171,33 +171,33 @@ public class ToolManager : MonoBehaviour
}
}
public void EnterRepairMode()
{
isInRepiarMode=true;
//isRepairMode = true;
currentModule.RemoveAllPlugsFromSockets();
// 使用 DOTween 对 Canvas 的位置和缩放进行平滑过渡
faceCanvas.DOMove(currentModule.repairCanvasPosition, 1)
.SetEase(Ease.OutQuad) // 移动面板
.OnComplete(() => currentModule.EnableScrewsInteraction(true)); // 动画完成后才启用交互
faceCanvas.DOScale(currentModule.repairCanvasScale, 1)
.SetEase(Ease.OutQuad)
.OnComplete(() => DialogController.Instance.StartDialogNode("EnterRepairMode")); // 缩放面板
}
// public void EnterRepairMode()
// {
// isInRepiarMode=true;
// //isRepairMode = true;
// currentModule.RemoveAllPlugsFromSockets();
// // 使用 DOTween 对 Canvas 的位置和缩放进行平滑过渡
// faceCanvas.DOMove(currentModule.repairCanvasPosition, 1)
// .SetEase(Ease.OutQuad) // 移动面板
// .OnComplete(() => currentModule.EnableScrewsInteraction(true)); // 动画完成后才启用交互
// faceCanvas.DOScale(currentModule.repairCanvasScale, 1)
// .SetEase(Ease.OutQuad)
// .OnComplete(() => DialogController.Instance.StartDialogNode("EnterRepairMode")); // 缩放面板
// }
[YarnCommand("ExitRepairMode")]
public void ExitRepairMode()
{
isInRepiarMode=false;
// 使用 DOTween 对 Canvas 的位置和缩放进行平滑过渡
faceCanvas.DOMove(originalCanvasPosition, 1)
.SetEase(Ease.InQuad);
// [YarnCommand("ExitRepairMode")]
// public void ExitRepairMode()
// {
// isInRepiarMode=false;
// // 使用 DOTween 对 Canvas 的位置和缩放进行平滑过渡
// faceCanvas.DOMove(originalCanvasPosition, 1)
// .SetEase(Ease.InQuad);
faceCanvas.DOScale(1f, 1)
.SetEase(Ease.InQuad); // 恢复面板缩放
ShowToolBoxAfterTask();
currentModule=null;
}
// faceCanvas.DOScale(1f, 1)
// .SetEase(Ease.InQuad); // 恢复面板缩放
// ShowToolBoxAfterTask();
// currentModule=null;
// }
[YarnCommand("ShowTool")]
Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs
+1 -2
View File
@@ -72,8 +72,7 @@ namespace AibisDream.FixSystem
else if(data.ignoreWaveCheck)
{
_bodyModuleSystem.oscilloscopeSystem.ShowScreenMessage("无需检查，允许进入", Color.yellow);
//_bodyModuleSystem.oscilloscopeSystem.PlayWave(data.waveformType, data.waveHasError);
_bodyModuleSystem.oscilloscopeSystem.ChangeDeepInButtonState(true);
}
else if(data.waveHasError)
{
Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs
+20 -2
View File
@@ -49,7 +49,7 @@ namespace AibisDream.FixSystem
_scanLine.SetScreenSize(_screen.bounds.size.x, _screen.bounds.size.y);
_screenText.text = "";
_deepinButton.OnButtonDown += StartScan;
_deepinButton.OnButtonDown += HandleDeepInButtonClick;
_scanLine.ScanErrorEvent += OnScanSuccess;
}
@@ -91,6 +91,11 @@ namespace AibisDream.FixSystem
_scanLine.CloseScan();
}
public void ChangeDeepInButtonState(bool state)
{
_deepinButton.SetActive(state);
}
/// <summary>
/// 调整相位
/// </summary>
@@ -112,12 +117,25 @@ namespace AibisDream.FixSystem
float spikeX = _waveformLine.GetSpikeX();
StartCoroutine(_scanLine.ScanForError(spikeX));
}
public void HandleDeepInButtonClick()
{
if(_bodyModuleSystem.CableSystem.curBodyModule.data.ignoreWaveCheck==true)
{
_bodyModuleSystem.HandleDeepIn();
}
else
{
StartScan();
}
}
/// <summary>
/// 扫描成功后
/// </summary>
public void OnScanSuccess()
{
{
_bodyModuleSystem.HandleDeepIn();
_ = CommonUtil.Delay(2000, StopWave);
}
Assets/Scripts/Mouse/MouseCursorManager.cs
+5 -5
View File
@@ -79,9 +79,9 @@ public class MouseCursorManager : MonoBehaviour
}
SetCursor(dialogueCursorSprite);
dialogueCanvas.sortingOrder = 1000; // 确保对话窗口在最前
dialogueCanvas.overrideSorting = true;
dialogueCanvas.GetComponent<GraphicRaycaster>().blockingMask = LayerMask.GetMask("Everything");
// dialogueCanvas.sortingOrder = 1000; // 确保对话窗口在最前
// dialogueCanvas.overrideSorting = true;
//dialogueCanvas.GetComponent<GraphicRaycaster>().blockingMask = LayerMask.GetMask("Everything");
}
else
{
@@ -91,8 +91,8 @@ public class MouseCursorManager : MonoBehaviour
}
dialogueCanvas.overrideSorting = false;
dialogueCanvas.GetComponent<GraphicRaycaster>().blockingMask = LayerMask.GetMask("Nothing");
//dialogueCanvas.overrideSorting = false;
//dialogueCanvas.GetComponent<GraphicRaycaster>().blockingMask = LayerMask.GetMask("Nothing");
if(isDraggingPlug)
{
Assets/StreamingAssets/LevelData/BodyModuleSystem/temp.json
+1 -1
View File
@@ -1 +1 @@
{"hasHotErr":false,"moduleDataArray":[{"moduleName":"Memory","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/记忆模块","modulePos":{"x":-2.524,"y":2.662,"z":0.0},"socketPos":{"x":0.092,"y":0.017,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"UF","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/UF底板","modulePos":{"x":-4.406,"y":0.431,"z":0.0},"socketPos":{"x":-0.243,"y":0.148,"z":0.0},"waveformType":2,"waveHasError":true,"ignoreWaveCheck":false},{"moduleName":"Eye","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/右眼","modulePos":{"x":-0.471,"y":0.604,"z":0.0},"socketPos":{"x":-0.879,"y":-0.57,"z":0.0},"waveformType":1,"waveHasError":true,"ignoreWaveCheck":false},{"moduleName":"","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/色觉","modulePos":{"x":-2.554,"y":0.689,"z":0.0},"socketPos":{"x":-0.003,"y":-0.744,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"Emo","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/情绪模块","modulePos":{"x":-4.5,"y":2.16,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":1,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"Logic","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/思维模块","modulePos":{"x":-0.67,"y":2.16,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":2,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"Speak","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/讲话模块","modulePos":{"x":-2.58,"y":-2.51,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":1,"waveHasError":false,"ignoreWaveCheck":false}]}
{"hasHotErr":false,"moduleDataArray":[{"moduleName":"Memory","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/记忆模块","modulePos":{"x":-2.524,"y":2.662,"z":0.0},"socketPos":{"x":0.092,"y":0.017,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":true},{"moduleName":"UF","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/UF底板","modulePos":{"x":-4.406,"y":0.431,"z":0.0},"socketPos":{"x":-0.243,"y":0.148,"z":0.0},"waveformType":2,"waveHasError":true,"ignoreWaveCheck":false},{"moduleName":"Eye","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/右眼","modulePos":{"x":-0.471,"y":0.604,"z":0.0},"socketPos":{"x":-0.879,"y":-0.57,"z":0.0},"waveformType":1,"waveHasError":true,"ignoreWaveCheck":false},{"moduleName":"Color","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/色觉","modulePos":{"x":-2.554,"y":0.689,"z":0.0},"socketPos":{"x":-0.003,"y":-0.744,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"Emo","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/情绪模块","modulePos":{"x":-4.5,"y":2.16,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":1,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"Logic","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/思维模块","modulePos":{"x":-0.67,"y":2.16,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":2,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"Speak","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/讲话模块","modulePos":{"x":-2.58,"y":-2.51,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":1,"waveHasError":false,"ignoreWaveCheck":false}]}