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

day1基本走通，接下来优化clueboard

Browse Source
This commit is contained in:
bottlefish
2024-12-06 00:13:04 +08:00
parent 65607f9678
commit 0400a63fa8
9 changed files with 582 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Plugins/CleanFlatUI/Scripts/Editor/ModalWindow/ModalWindowEditor.cs
+4 -1
View File
@@ -12,6 +12,7 @@ namespace RainbowArt.CleanFlatUI
{
SerializedProperty iconTitle;
SerializedProperty title;
SerializedProperty image;
SerializedProperty buttonClose;
SerializedProperty buttonConfirm;
SerializedProperty buttonCancel;
@@ -23,7 +24,8 @@ namespace RainbowArt.CleanFlatUI
protected virtual void OnEnable()
{
iconTitle = serializedObject.FindProperty("iconTitle");
title = serializedObject.FindProperty("title");
title = serializedObject.FindProperty("title");
image= serializedObject.FindProperty("image");
buttonClose = serializedObject.FindProperty("buttonClose");
buttonConfirm = serializedObject.FindProperty("buttonConfirm");
buttonCancel = serializedObject.FindProperty("buttonCancel");
@@ -37,6 +39,7 @@ namespace RainbowArt.CleanFlatUI
{
serializedObject.Update();
EditorGUILayout.PropertyField(iconTitle);
EditorGUILayout.PropertyField(image);
EditorGUILayout.PropertyField(title);
EditorGUILayout.PropertyField(buttonClose);
EditorGUILayout.PropertyField(buttonConfirm);
Assets/Plugins/CleanFlatUI/Scripts/ModalWindow/ModalWindow.cs
+7 -5
View File
@@ -47,6 +47,9 @@ namespace RainbowArt.CleanFlatUI
[SerializeField]
Image iconTitle;
[SerializeField]
Image image;
[SerializeField]
TextMeshProUGUI title;
@@ -62,12 +65,11 @@ namespace RainbowArt.CleanFlatUI
[SerializeField]
Animator animator;
//[SerializeField]
[SerializeField]
TextMeshProUGUI description;
//[SerializeField]
Image image;
private bool isConfirmButtonActive;
[Serializable]
public class ModalWindowEvent : UnityEvent{ }
@@ -84,7 +86,7 @@ namespace RainbowArt.CleanFlatUI
{
set
{
buttonConfirm.enabled=value;
buttonConfirm.gameObject.SetActive(value);
}
}
public string DescriptionValue
Assets/Resources/Yarn/LTS_Peipeiday1/LTS_Peipeiday1.yarn
+45 -21
View File
@@ -8,7 +8,6 @@ position: 249,-2054
title: 数据初始化
tags:
colorID: 4
@@ -102,14 +101,17 @@ position: 251,-1496
<<hide_dialog>>
<<wait 1>>
【占位】这张图看起来很奇怪，大片的草地变成了蓝色，上面有鱼在游动，佩佩自己也很困惑，提示词没有输入这些啊
<<hide_dialog>>
<<EnableAndWaitForClosingUFImage WindowManager>>
【占位】和佩佩前往诊室
<<jump 诊疗室初始化>>
===
title: 诊疗室初始化
tags:
colorID: 3
position: 250,-1179
position: 256,-1154
---
<<fade_in 0.5>>
<<load_scene 佩佩视觉模块>>
@@ -137,23 +139,30 @@ position: 250,-777
<<hide_dialog>>
<<OpenSingleButtonWindow WindowManager UF模块运行记录 共三条引用记录，是否确认调取？>>
<<wait 0.5>>
<<OpenSingleButtonWindow WindowManager 引用1 记忆编号#3014_03_08_ABBA，是否确认打印索引？>>
<<OpenProgressWindow WindowManager 引用1 记忆索引卡带打印中...请等待...>>
<<wait 0.5>>
<<OpenProgressWindow WindowManager 引用1 记忆索引卡带打印中...请等待... 2>>
<<wait 0.5>>
<<generate_PunchTape ClueManager UF绘图1 UFView 记忆占位>>
<<wait 1>>
->放入收藏夹
<<CollectionClue ClueManager>>
<<hide_dialog>>
<<OpenSingleButtonWindow WindowManager 引用2 记忆编号#3022_01_21_CBBA，是否确认打印索引？>>
<<OpenProgressWindow WindowManager 引用2 记忆索引卡带打印中...请等待...>>
<<wait 0.5>>
<<OpenProgressWindow WindowManager 引用2 记忆索引卡带打印中...请等待... 2>>
<<wait 0.5>>
<<generate_PunchTape ClueManager UF绘图2 UFView 记忆占位>>
<<wait 1>>
->放入收藏夹
<<CollectionClue ClueManager>>
<<hide_dialog>>
<<OpenSingleButtonWindow WindowManager 引用3 记忆编号#3018_05_12_DBAC，是否确认打印索引？>>
<<OpenProgressWindow WindowManager 引用3 记忆索引卡带打印中...请等待...>>
<<generate_PunchTape ClueManager UF绘图3 UFView 记忆占位>>
<<wait 0.5>>
<<OpenProgressWindow WindowManager 引用3 记忆索引卡带打印中...请等待... 2>>
<<wait 0.5>>
<<generate_PunchTape ClueManager UF绘图3 UFView liuying1-3>>
<<wait 1>>
->放入收藏夹
<<CollectionClue ClueManager>>
@@ -338,12 +347,16 @@ me: 检查应该都完成了…我们出去吧，佩佩。
<<character_face character frown>>
<<character_fade_in character>>
【占位】要求佩佩再次绘制之前绘制过的图片
<<hide_dialog>>
<<fade_in 1>>
<<wait 1>>
<<fade_out 1>>
<<generate_UFClue ClueManager UFImage can_grass_normal>>
<<OpenImageWindow_UFImage WindowManager UF绘图 can_grass_normal>>
<<wait 1>>
【占位】检查发现没问题
<<CollectionClue ClueManager>>
<<wait 0.5>>
<<hide_dialog>>
<<EnableAndWaitForClosingUFImage WindowManager>>
【占位】结束对话
<<character_fade_out character>>
<<fade_in 1>>
@@ -427,14 +440,17 @@ peipei: 看到窗外的蓝天了吗？
<<EyeEffect_FadeIn EyeManager>>
me: 啊？
peipei: 我其实能够以某种方式看到一些颜色……
<<OpenSingleButtonWindow WindowManager 视觉进程检测 视觉被记忆非法写入，是否确认打印索引？>>
<<OpenProgressWindow WindowManager 非法记忆引用 记忆索引卡带打印中...请等待...>>
<<hide_dialog>>
<<wait 0.5>>
<<OpenSingleButtonWindow WindowManager 非法进程检测 记忆编号#3014_03_08_ABBA 正在向视觉非法写入色彩数据，是否打印索引？>>
<<wait 0.5>>
<<OpenProgressWindow WindowManager 非法记忆引用1 记忆索引卡带打印中...请等待... 2>>
<<wait 0.5>>
<<generate_PunchTape ClueManager 天空 EyeView liuying1-3>>
<<wait 1>>
me: 啊…有一条和记忆相关的错误记录生成了。
me: 记忆…向视觉发送了数据？然后生成了这些颜色？
<<complete_task TaskManager "找到视觉模块中读取记忆的来源">>
me: 我需要做更多的症状记录……
me: 从来没见过……我需要做更多的症状记录……
->放入收藏夹
<<CollectionClue ClueManager>>
me: 我需要让你再观察几个东西，你只要重复刚才做的事情就好了。
peipei: 好的，医生。
@@ -535,10 +551,14 @@ peipei: 啊，又是罐头……
peipei: 坏了！我还有一张海报没出……
<<EyeEffect_FadeIn EyeManager>>
peipei: 啊……我差点忘了。我来这里就是为了这个。
<<ShowNotification ClueManager 进程检测 视觉被记忆非法写入，打印记忆索引卡... 近期请求次数 15次>>
<<wait 1>>
<<hide_dialog>>
<<wait 0.5>>
<<OpenSingleButtonWindow WindowManager 非法进程检测 记忆编号#3014_03_08_ABBA 正在向视觉非法写入色彩数据，是否打印索引？>>
<<wait 0.5>>
<<OpenProgressWindow WindowManager 非法记忆引用1 记忆索引卡带打印中...请等待... 2>>
<<wait 0.5>>
<<generate_PunchTape ClueManager "海报" "EyeView" "liuying1-1">>
me:把这个卡带收起来
->放入收藏夹
<<CollectionClue ClueManager>>
//<<jump EyeCheckEnd>>
<<endif>>
@@ -568,10 +588,14 @@ peipei: 可惜……
///<<set_EyeState EyeManager "CanImagineColor">>枯萎的叶子变成了正确的黄色
peipei: 我还是把它养死了。
peipei: 我愧疚了好久，那时的我真的以为小草可以长成一棵树。
<<ShowNotification ClueManager 进程检测 视觉被记忆非法写入，打印记忆索引卡... 近期请求次数 32次>>
<<wait 1>>
<<hide_dialog>>
<<wait 0.5>>
<<OpenSingleButtonWindow WindowManager 非法进程检测 记忆编号#3014_03_08_ABBA 正在向视觉非法写入色彩数据，是否打印索引？>>
<<wait 0.5>>
<<OpenProgressWindow WindowManager 非法记忆引用1 记忆索引卡带打印中...请等待... 2>>
<<wait 0.5>>
<<generate_PunchTape ClueManager "植物" "EyeView" "liuying1-2">>
me:先收起来
->放入收藏夹
<<CollectionClue ClueManager>>
//<<jump EyeCheckEnd>>
<<endif>>
@@ -678,7 +702,7 @@ title: Eye_posterAfterSurgery
tags:
colorID: 8
group:视觉检查
position: 1690,-1264
position: 1688,-1272
---
<<if visited("Eye_posterAfterSurgery")==false>>
<<set $eyeTargetTriggerCount = $eyeTargetTriggerCount + 1>>
@@ -722,7 +746,7 @@ position: 2323,-1044
<<set $eyeDiscussCount=2>>
<<BackToMainView ViewManager>>
<<endif>>
<<elseif $gameStage==2&&$memoryCount==3>>
<<elseif $gameStage==2>>
<<if $memoryCount==3>>
【占位】UF绘图索引的记忆都看完了，我们可以退出了
<<set $gameStage=3>>
Assets/Resources/Yarn/LTS_Peipeiday1/Test.yarn
+8
View File
@@ -7,3 +7,11 @@ position: -864,-2670
<<generate_PunchTape ClueManager "植物" "EyeView" "liuying1-2" "绿色" true>>
<<generate_PunchTape ClueManager "天空" "EyeView" "liuying1-3" "蓝色" true>>
===
title: UFImageTest
tags:
colorID: 6
position: -864,-2670
---
<<OpenImageWindow_UFImage WindowManager UF绘图 UF占位>>
===
Assets/Resources/Yarn/LTS_Peipeiday1/tutorial.yarn
+5 -1
View File
@@ -9,6 +9,10 @@ position: -870,-2464
me: 拖动波形显示下方的滑条，直到“缺陷波形”变得最清晰，然后点击【深入】。
<<ShowNotification ClueManager 提示 拖动滑条调整波形以深入检查>>
暴漏后点击“深入”即可深入
<<add_task TaskManager 深入视觉模块 寻找绘图异常相关线索>>
<<if $gameStage<=2>>>
<<add_task TaskManager 深入视觉模块 寻找绘图异常相关线索>>
<<elseif $gameStage>=3>>
<<add_task TaskManager 深入视觉模块 找到异常记忆的来源>>
<<endif>>
<<endif>>
===
Assets/Scenes/Persistence.unity
+473 -1
View File
@@ -11279,6 +11279,81 @@ MonoBehaviour:
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!1 &1704748930
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1704748931}
- component: {fileID: 1704748933}
- component: {fileID: 1704748932}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1704748931
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1704748930}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2083058505}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: -200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1704748932
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1704748930}
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: 1}
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: 0}
m_Type: 0
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!222 &1704748933
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1704748930}
m_CullTransparentMesh: 1
--- !u!1001 &1704919983
PrefabInstance:
m_ObjectHideFlags: 0
@@ -11293,7 +11368,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2971839373268861373, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_Name
value: "\u5355\u6309\u94AE\u7A97\u53E3"
value: "\u5355\u6309\u94AE\u7EAF\u6587\u672C\u7A97\u53E3"
objectReference: {fileID: 0}
- target: {fileID: 2971839373268861373, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_Pivot.x
@@ -12665,6 +12744,140 @@ PrefabInstance:
addedObject: {fileID: 1759113}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 68892fec64b888548bb2dc685526cf91, type: 3}
--- !u!1 &1904990749
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1904990752}
- component: {fileID: 1904990751}
- component: {fileID: 1904990750}
m_Layer: 5
m_Name: Description
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1904990750
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1904990749}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "A single button modal window. \r\nDefault is centered display."
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 0e7e80bfdc54f454a8949cf216f589ab, type: 2}
m_sharedMaterial: {fileID: 2810396569639620041, guid: 0e7e80bfdc54f454a8949cf216f589ab, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 28
m_fontSizeBase: 28
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 0
m_fontSizeMax: 40
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 1.1
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1904990751
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1904990749}
m_CullTransparentMesh: 0
--- !u!224 &1904990752
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1904990749}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2083058505}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -50, y: -400}
m_SizeDelta: {x: 800, y: 200}
m_Pivot: {x: 0, y: 1}
--- !u!223 &1914688873 stripped
Canvas:
m_CorrespondingSourceObject: {fileID: 6437954650179994479, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3}
@@ -12754,6 +12967,10 @@ PrefabInstance:
propertyPath: m_Name
value: "\u8FDB\u5EA6\u6761\u7A97\u53E3"
objectReference: {fileID: 0}
- target: {fileID: 2971839373268861373, guid: 461947898df9b4042b14c61056c016f0, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5253004576740219216, guid: 461947898df9b4042b14c61056c016f0, type: 3}
propertyPath: m_IsActive
value: 0
@@ -13743,6 +13960,259 @@ MonoBehaviour:
DelayBeforeStarting: 0
AutoStartFlip: 1
ControledBook: {fileID: 996104069}
--- !u!1001 &2083058503
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2003858546407399498}
m_Modifications:
- target: {fileID: -668396882743783254, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_text
value: "\u4FDD\u5B58\u5E76\u6536\u5F55"
objectReference: {fileID: 0}
- target: {fileID: -668396882743783254, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
- target: {fileID: -668396882743783254, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_sharedMaterial
value:
objectReference: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
- target: {fileID: -668396882743783254, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_hasFontAssetChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 272139149343584025, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 272139149343584025, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 272139149343584025, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 533698654694973082, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_SizeDelta.x
value: 700
objectReference: {fileID: 0}
- target: {fileID: 533698654694973082, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_SizeDelta.y
value: 800
objectReference: {fileID: 0}
- target: {fileID: 533698654694973082, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchoredPosition.y
value: 100
objectReference: {fileID: 0}
- target: {fileID: 1317429119650744762, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2690735023994097180, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2690735023994097180, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2690735023994097180, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2690735023994097180, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2690735023994097180, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchoredPosition.x
value: -130
objectReference: {fileID: 0}
- target: {fileID: 2690735023994097180, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchoredPosition.y
value: 35
objectReference: {fileID: 0}
- target: {fileID: 2971839373268861373, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_Name
value: "UF\u7ED8\u56FE\u5C55\u793A\u7A97\u53E3"
objectReference: {fileID: 0}
- target: {fileID: 2971839373268861373, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3711545442057267838, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: image
value:
objectReference: {fileID: 1704748932}
- target: {fileID: 3711545442057267838, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: description
value:
objectReference: {fileID: 1904990750}
- target: {fileID: 4199281457280971604, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4199281457280971604, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchoredPosition.y
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4356013098929506975, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4356013098929506975, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4356013098929506975, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4356013098929506975, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4356013098929506975, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchoredPosition.y
value: 100
objectReference: {fileID: 0}
- target: {fileID: 4462920760965423960, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
- target: {fileID: 4462920760965423960, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_sharedMaterial
value:
objectReference: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
- target: {fileID: 4462920760965423960, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_HorizontalAlignment
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4462920760965423960, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_hasFontAssetChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7563660215229584026, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 9219810584082714769, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 533698654694973082, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
insertIndex: 2
addedObject: {fileID: 1904990752}
- targetCorrespondingSourceObject: {fileID: 533698654694973082, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
insertIndex: -1
addedObject: {fileID: 1704748931}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
--- !u!114 &2083058504 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3711545442057267838, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
m_PrefabInstance: {fileID: 2083058503}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8fb07e6cd5358104d8d5b7a77780ccfe, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &2083058505 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 533698654694973082, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
m_PrefabInstance: {fileID: 2083058503}
m_PrefabAsset: {fileID: 0}
--- !u!224 &2083058506 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8061307773979316499, guid: ad4eeb77017523e44a270e8f79897e87, type: 3}
m_PrefabInstance: {fileID: 2083058503}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2089816827
GameObject:
m_ObjectHideFlags: 0
@@ -14009,6 +14479,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1704919985}
- {fileID: 2083058506}
- {fileID: 1978869334}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -14335,6 +14806,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
singleButtonWindowPrefab: {fileID: 1704919984}
ImageSingleButtonWindowPrefab: {fileID: 2083058504}
progressWindowPrefab: {fileID: 1978869333}
--- !u!1001 &7847025846205992388
PrefabInstance:
Assets/Scripts/Clue/ClueManager.cs
+19 -19
View File
@@ -89,27 +89,27 @@ public class ClueManager : MonoBehaviour
clueItem.Setup(punchTape);
}
[YarnCommand("generate_UFClue")]
public void GenerateUFClue(string clueName, string imageName,bool directlyAddToFavorites=false)
{
Sprite UFSprite = Resources.Load<Sprite>("Art/Photos/" + imageName);
ImageClue imageClue=new ImageClue("UFView", clueName, UFSprite);
// if(directlyAddToFavorites)
// {
// FavoritesManager.Instance.AddClue(imageClue);
// return;
// }
GameObject clueGO = Instantiate(imageCluePrefab, canvas.transform);
ClueItem clueItem = clueGO.GetComponent<ClueItem>();
currentClue=clueGO;
clueItem.Setup(imageClue);
// ClueInteraction clueInteraction = clueGO.GetComponent<ClueInteraction>();
// clueInteraction.enabled=false;
// currentClueInteraction=clueInteraction;
// [YarnCommand("generate_UFClue")]
// public void GenerateUFClue(string clueName, string imageName,bool directlyAddToFavorites=false)
// {
// Sprite UFSprite = Resources.Load<Sprite>("Art/Photos/" + imageName);
// ImageClue imageClue=new ImageClue("UFView", clueName, UFSprite);
// // if(directlyAddToFavorites)
// // {
// // FavoritesManager.Instance.AddClue(imageClue);
// // return;
// // }
// GameObject clueGO = Instantiate(imageCluePrefab, canvas.transform);
// ClueItem clueItem = clueGO.GetComponent<ClueItem>();
// currentClue=clueGO;
// clueItem.Setup(imageClue);
// // ClueInteraction clueInteraction = clueGO.GetComponent<ClueInteraction>();
// // clueInteraction.enabled=false;
// // currentClueInteraction=clueInteraction;
// currentClueInteraction.OnInteraction+=ShowClueBoardNotification;
// // currentClueInteraction.OnInteraction+=ShowClueBoardNotification;
}
// }
// [YarnCommand("generate_MemoryClue")]
// public void GenerateMemoryClue(string nodeID, string imageName,string mathCode,bool directlyAddToFavorites=false)
// {
Assets/Scripts/Mouse/MouseCursorManager.cs
+1 -88
View File
@@ -51,7 +51,7 @@ public class MouseCursorManager : MonoBehaviour
}
UpdateCursorState();
// 检测点击事件
//检测点击事件
if (Input.GetMouseButtonDown(0)&&!isDraggingPlug)
{
@@ -113,108 +113,21 @@ public class MouseCursorManager : MonoBehaviour
}
}
}
private bool IsHoveringOverDialogueItem()
{
// if (EventSystem.current.IsPointerOverGameObject())
// {
// PointerEventData pointerData = new PointerEventData(EventSystem.current) { position = Input.mousePosition };
// var results = new List<RaycastResult>();
// EventSystem.current.RaycastAll(pointerData, results);
// foreach (var result in results)
// {
// if (result.gameObject.CompareTag("DialogueObject")) // 物体需添加 DialogueObject 标签
// {
// if(result.gameObject.transform.GetChild(0)!=null)
// {
// if(result.gameObject.transform.GetChild(0).GetComponent<Socket>().IsAvailable)
// {
// Debug.Log("Hover Dialogue");
// return true;
// }
// }
// }
// }
// }
return false;
}
private bool IsHoveringOverDragItem()
{
// if (EventSystem.current.IsPointerOverGameObject())
// {
// PointerEventData pointerData = new PointerEventData(EventSystem.current) { position = Input.mousePosition };
// var results = new List<RaycastResult>();
// EventSystem.current.RaycastAll(pointerData, results);
// foreach (var result in results)
// {
// // If the Canvas's sortingOrder is higher than the reference sortingOrder, ignore it
// if (result.gameObject.CompareTag("Dragable")) // 物体需添加 Dragable 标签
// {
// return true;
// }
// }
// }
return false;
}
// 处理点击事件
private void HandleClick()
{
// if(DialogController.Instance.IsTalking)
// {
// return;
// }
// PointerEventData pointerData = new PointerEventData(EventSystem.current) { position = Input.mousePosition };
// var results = new List<RaycastResult>();
// EventSystem.current.RaycastAll(pointerData, results);
// foreach (var result in results)
// {
// Canvas hitCanvas = result.gameObject.GetComponentInParent<Canvas>();
// if (hitCanvas != null)
// {
// // If the Canvas's sortingOrder is higher than the reference sortingOrder, ignore it
// if (hitCanvas.renderMode==RenderMode.ScreenSpaceOverlay)
// {
// Debug.Log("Raycast hit an object with a higher sortingOrder that should block the raycast");
// // You can add additional logic here to block interaction or trigger events
// //return false; // Stop further raycasting if it should be blocked
// }
// else
// {
// if (result.gameObject.CompareTag("DialogueObject"))
// {
// if(result.gameObject.transform.GetChild(0).GetComponent<Socket>().IsAvailable)
// {
// string dialogueNode =result.gameObject.name+"Dialogue"; // 假设物体名是对话节点
// DialogController.Instance.StartDialogNode(dialogueNode);
// return;
// }
// }
// }
// }
// }
}
Assets/Scripts/SystemWindow/WindowManager.cs
+20 -9
View File
@@ -2,6 +2,7 @@ using UnityEngine;
using RainbowArt.CleanFlatUI;
using Yarn.Unity;
using System.Collections;
using DG.Tweening;
public class WindowManager : MonoBehaviour
{
@@ -36,7 +37,7 @@ public class WindowManager : MonoBehaviour
singleButtonWindowPrefab.DescriptionValue = description;
singleButtonWindowPrefab.OnConfirm.AddListener(() => isConfirmed = true);
singleButtonWindowPrefab.gameObject.SetActive(true);
singleButtonWindowPrefab.ShowModalWindow();
// 等待用户确认
yield return new WaitUntil(() => isConfirmed);
@@ -44,18 +45,27 @@ public class WindowManager : MonoBehaviour
singleButtonWindowPrefab.OnConfirm.RemoveAllListeners();
}
[YarnCommand("OpenProgressWindow")]
public IEnumerator OpenProgressWindow(string title, string description)
public IEnumerator OpenProgressWindow(string title, string description,float duration)
{
bool isConfirmed = false;
progressWindowPrefab.TitleValue = title;
progressWindowPrefab.DescriptionValue = description;
progressWindowPrefab.OnFinish.AddListener(() => isConfirmed = true);
progressWindowPrefab.gameObject.SetActive(true);
float currentProgress=0;
DOTween.To(
() => currentProgress,
value =>
{
currentProgress = value;
progressWindowPrefab.SetProgress(currentProgress); // 更新进度
},
100,
duration
);
progressWindowPrefab.ShowModalWindow();
// 等待用户确认
yield return new WaitUntil(() => isConfirmed);
progressWindowPrefab.OnFinish.RemoveAllListeners();
yield return new WaitUntil(() => currentProgress>=100);
progressWindowPrefab.HideModalWindow();
}
[YarnCommand("OpenImageWindow_UFImage")]
public void OpenImageSingleButtonWindowPrefab(string title, string imageName)
@@ -66,15 +76,16 @@ public class WindowManager : MonoBehaviour
ImageSingleButtonWindowPrefab.ImageValue=Resources.Load<Sprite>("Art/Photos/" + imageName);
ImageSingleButtonWindowPrefab.DescriptionValue="";
//progressWindowPrefab.OnFinish.AddListener(() => isConfirmed = true);
progressWindowPrefab.gameObject.SetActive(true);
ImageSingleButtonWindowPrefab.ShowModalWindow();
}
[YarnCommand("EnableAndWaitForClosingUFImage")]
public IEnumerator EnableAndWaitForClosingUFImage()
{
bool isConfirmed = false;
ImageSingleButtonWindowPrefab.IsConfirmButtonActive=true;
ImageSingleButtonWindowPrefab.OnConfirm.AddListener(() => isConfirmed = true);
yield return new WaitUntil(() => isConfirmed);
progressWindowPrefab.OnFinish.RemoveAllListeners();
ImageSingleButtonWindowPrefab.OnConfirm.RemoveAllListeners();
}
}