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

Merge branch '春晖11.12' into 'develop'

Browse Source 
春晖11.12

See merge request aibis-dream/aibis-dream!63
This commit is contained in:
bottlefish
2024-11-11 23:04:40 +00:00
parent 47f8726d75 1921e87a3c
commit 4411ff46f5
18 changed files with 4150 additions and 1012 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Prefabs/Node/sloutionTemplate.prefab
+1963
View File
File diff suppressed because it is too large Load Diff
Assets/Prefabs/Node/记忆反流.prefab.meta → Assets/Prefabs/Node/sloutionTemplate.prefab.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d114720bc67db244ba330bee6ab56f4c
guid: 5521e8e3a14c928419d19f181b2f53e5
PrefabImporter:
externalObjects: {}
userData:
Assets/Prefabs/Node/记忆反流.prefab
-192
View File
@@ -1,192 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &8591039488042663305
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: _sID
value: ad0ad11a-3d6c-46f1-ad0b-2b948156f157
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_SizeDelta.x
value: 250
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_SizeDelta.y
value: 190
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_AnchoredPosition.x
value: -795
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_AnchoredPosition.y
value: -263
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1347914344471040156, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: _sID
value: 9d88ec22-156c-4a77-ad07-6cb33f6d3ce7
objectReference: {fileID: 0}
- target: {fileID: 1792524688117826133, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: _sID
value: 3a493554-adb3-4490-8e5d-c7e3b3aaced2
objectReference: {fileID: 0}
- target: {fileID: 6118747302830726965, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_text
value: "\u8BB0\u5FC6\u53CD\u6D41\n"
objectReference: {fileID: 0}
- target: {fileID: 6571406705974035353, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: _id
value: "\u8BB0\u5FC6\u53CD\u6D41"
objectReference: {fileID: 0}
- target: {fileID: 6571406705974035353, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: _sID
value: cb900bad-8a7c-4a56-aa17-e4296661a93d
objectReference: {fileID: 0}
- target: {fileID: 6571406705974035353, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: ports.Array.size
value: 3
objectReference: {fileID: 0}
- target: {fileID: 6571406705974035353, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: ports.Array.data[0]
value:
objectReference: {fileID: 7204718192528945858}
- target: {fileID: 6571406705974035353, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: ports.Array.data[1]
value:
objectReference: {fileID: 258979254313026624}
- target: {fileID: 6571406705974035353, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: ports.Array.data[2]
value:
objectReference: {fileID: 8843012196055470834}
- target: {fileID: 8393837270682192980, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_Color.b
value: 0.17557846
objectReference: {fileID: 0}
- target: {fileID: 8393837270682192980, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_Color.g
value: 0.17557846
objectReference: {fileID: 0}
- target: {fileID: 8393837270682192980, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_Color.r
value: 0.6792453
objectReference: {fileID: 0}
- target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: _sID
value: 5b4e07b8-1572-4de4-92d2-94d8af8478f1
objectReference: {fileID: 0}
- target: {fileID: 8732203183804650455, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_Name
value: "\u8BB0\u5FC6\u53CD\u6D41"
objectReference: {fileID: 0}
- target: {fileID: 8993689228335016799, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
--- !u!114 &258979254313026624 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
m_PrefabInstance: {fileID: 8591039488042663305}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &7204718192528945858 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
m_PrefabInstance: {fileID: 8591039488042663305}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &8843012196055470834 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3}
m_PrefabInstance: {fileID: 8591039488042663305}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3}
m_Name:
m_EditorClassIdentifier:
Assets/Prototype/佩佩/Scripts/EyeTransitionManager.cs
+10
View File
@@ -101,6 +101,11 @@ public class EyeTransitionManager : MonoBehaviour
public delegate void ViewChangeRequestedHandler(ViewState targetViewState);
public event ViewChangeRequestedHandler OnViewChangeRequested;
public event Action OnGetMainView;
public event Action OnGetDeepView;
private void Awake()
{
@@ -112,6 +117,7 @@ public class EyeTransitionManager : MonoBehaviour
}
private void OnDestroy()
{
SceneManager.sceneUnloaded -= OnSceneUnloaded;
@@ -429,6 +435,8 @@ public void SetViewAvailability(string viewStateName, bool isAvailable)
isTransitioning = false;
AudioManager.PlayAmb1Audio("amb_main");
AudioManager.PlayAmb2Audio("amb_general");
//MouseCursorManager.Instance.isInDeepView=false;
OnGetMainView.Invoke();
});
}
@@ -486,8 +494,10 @@ public void SetViewAvailability(string viewStateName, bool isAvailable)
SetView(targetViewState);
FadeFromBlack(() =>
{
//MouseCursorManager.Instance.isInDeepView=true;
currentViewState = targetViewState;
isTransitioning = false;
OnGetDeepView.Invoke();
if(targetConfig.audioName!=null)
{
AudioManager.PlayAmb1Audio(targetConfig.audioName);
Assets/Prototype/佩佩/Scripts/MemoryProcess.cs
+4 -3
View File
@@ -78,7 +78,7 @@ public class MemoryProcess : MonoBehaviour,IViewLifecycle
public void OnExit()
{
FavoritesManager.Instance.CloseFavorites();
// 离开视图时的逻辑
Debug.Log("MemoryView exited.");
@@ -226,11 +226,11 @@ void OnClarityChanged(float value)
}
[YarnCommand("MemoryFinished")]
public void MemoryFinished()
public IEnumerator MemoryFinished()
{
AudioManager.PauseMemoryAudio();
// Fade out alpha from 1 to 0
playBackground.DOFade(0f, 1f).WaitForCompletion(); // Fade to fully transparent over 1 second
yield return playBackground.DOFade(0f, 1f).WaitForCompletion(); // Fade to fully transparent over 1 second
// Deactivate playBackground after fade out
playBackground.gameObject.SetActive(false);
@@ -252,6 +252,7 @@ public IEnumerator ColorFadeOut()
}
public IEnumerator PlayMemory()
{
FavoritesManager.Instance.CloseFavorites();
// Activate playBackground and fade in alpha from 0 to 1
AudioManager.PlayMemoryAudio("mem_"+clueSlot.punchTape.MemoryIndex);
playBackground.gameObject.SetActive(true);
Assets/Prototype/佩佩/佩佩视觉模块.unity
+318 -50
View File
@@ -1733,15 +1733,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3083274345920604345, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3083274345920604345, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3083274345920604345, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3083274347254332314, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3}
propertyPath: m_IsActive
@@ -1749,11 +1749,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3083274347384374709, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3083274347384374709, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3083274347408712451, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3}
propertyPath: m_Name
@@ -4118,7 +4118,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 157256356}
- {fileID: 1452850630}
m_Father: {fileID: 1108670798}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -4299,7 +4298,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 1452850630}
m_Father: {fileID: 147027245}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -4374,7 +4374,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1376336156}
- {fileID: 452985793}
m_Father: {fileID: 1108670798}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -4636,7 +4635,7 @@ RectTransform:
m_LocalScale: {x: 0.92999995, y: 0.92999995, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 965315464}
m_Father: {fileID: 1190564545}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -7245,11 +7244,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3565815748221874198, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3}
propertyPath: m_SizeDelta.x
value: 200
value: 300
objectReference: {fileID: 0}
- target: {fileID: 3565815748221874198, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3}
propertyPath: m_SizeDelta.y
value: 20
value: 150
objectReference: {fileID: 0}
- target: {fileID: 3565815748221874198, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3}
propertyPath: m_AnchoredPosition.x
@@ -7257,7 +7256,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3565815748221874198, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 35
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8538217932967146522, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3}
propertyPath: m_Pivot.x
@@ -7349,29 +7348,37 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 2424662228528623556, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3}
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 3565815748221874198, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3}
insertIndex: -1
addedObject: {fileID: 241874896}
addedObject: {fileID: 253098560}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 7880595094219686492, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3}
insertIndex: -1
addedObject: {fileID: 241874897}
m_SourcePrefab: {fileID: 100100000, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3}
--- !u!224 &241874894 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8538217932967146522, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3}
m_PrefabInstance: {fileID: 241874893}
m_PrefabAsset: {fileID: 0}
--- !u!1 &241874895 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2424662228528623556, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3}
--- !u!224 &241874895 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3565815748221874198, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3}
m_PrefabInstance: {fileID: 241874893}
m_PrefabAsset: {fileID: 0}
--- !u!114 &241874896
--- !u!1 &241874896 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7880595094219686492, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3}
m_PrefabInstance: {fileID: 241874893}
m_PrefabAsset: {fileID: 0}
--- !u!114 &241874897
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 241874895}
m_GameObject: {fileID: 241874896}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 08ace7d1cbb872b49a73a914f1f93b10, type: 3}
@@ -7380,6 +7387,82 @@ MonoBehaviour:
currentClueItem: {fileID: 0}
isOccupied: 0
isLocked: 0
--- !u!1 &253098559
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 253098560}
- component: {fileID: 253098562}
- component: {fileID: 253098561}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &253098560
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 253098559}
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:
- {fileID: 982326623}
m_Father: {fileID: 241874895}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.74290466, y: 1.4861}
m_SizeDelta: {x: -13.3744, y: -17.8325}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &253098561
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 253098559}
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: 0, g: 0, b: 0, 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 &253098562
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 253098559}
m_CullTransparentMesh: 1
--- !u!1 &253421357
GameObject:
m_ObjectHideFlags: 0
@@ -10837,7 +10920,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 161670716}
m_Father: {fileID: 1376336156}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -13898,7 +13981,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 0
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
@@ -15737,7 +15820,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1543897235}
- {fileID: 1769603217}
m_Father: {fileID: 1108670798}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -19029,7 +19111,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.5136678, y: 1.5136678, z: 1.6276}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 1126428514}
m_Father: {fileID: 1227012526}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -19668,6 +19751,7 @@ Transform:
- {fileID: 1102365682}
- {fileID: 1182811777}
- {fileID: 396458941}
- {fileID: 1044419358}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &861050806
@@ -21216,7 +21300,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2077058953}
- {fileID: 1700157242}
m_Father: {fileID: 1108670798}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -21363,8 +21446,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1190564545}
- {fileID: 1197222020}
- {fileID: 177996561}
m_Father: {fileID: 1108670798}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -21870,6 +21951,140 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &982326622
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 982326623}
- component: {fileID: 982326625}
- component: {fileID: 982326624}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &982326623
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 982326622}
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: 253098560}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &982326624
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 982326622}
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: "\u7D22\u5F15\u5361\u63A5\u53E3"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, 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: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
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: 1
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 &982326625
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 982326622}
m_CullTransparentMesh: 1
--- !u!21 &987173779
Material:
serializedVersion: 8
@@ -22613,6 +22828,55 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1042920660}
m_CullTransparentMesh: 1
--- !u!1 &1044419357
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1044419358}
- component: {fileID: 1044419359}
m_Layer: 0
m_Name: RayCastManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1044419358
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1044419357}
serializedVersion: 2
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: 859854053}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1044419359
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1044419357}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 360cd7bb154acc740941f053cbd8cff2, type: 3}
m_Name:
m_EditorClassIdentifier:
graphicRaycasters:
- {fileID: 1141076859}
- {fileID: 1022441799}
- {fileID: 1323307887}
- {fileID: 1108670795}
--- !u!1 &1076377841
GameObject:
m_ObjectHideFlags: 0
@@ -23482,7 +23746,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 1371483725}
m_Father: {fileID: 1698343261}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -24216,14 +24481,14 @@ RectTransform:
m_GameObject: {fileID: 1126428513}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.92999995, y: 0.92999995, z: 1}
m_LocalScale: {x: 0.6144016, y: 0.6144016, z: 0.6144016}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1227012526}
m_Father: {fileID: 827517850}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0, y: -0.77189946}
m_AnchoredPosition: {x: 0, y: -0.509953}
m_SizeDelta: {x: 0.5, y: 0.51}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1126428515
@@ -24588,6 +24853,7 @@ RectTransform:
- {fileID: 1816976208}
- {fileID: 534016564}
- {fileID: 486116302}
- {fileID: 1196152381}
- {fileID: 4042129}
m_Father: {fileID: 2027266814}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -25171,7 +25437,9 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 177996561}
- {fileID: 1197222020}
m_Father: {fileID: 965315464}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -25513,7 +25781,7 @@ GameObject:
- component: {fileID: 1196152383}
- component: {fileID: 1196152382}
m_Layer: 5
m_Name: Image
m_Name: Socket
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -25526,16 +25794,16 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1196152380}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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: 1323307890}
m_Father: {fileID: 1141076862}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 2.585, y: 1.293}
m_AnchoredPosition: {x: 2.5499878, y: 1.289978}
m_SizeDelta: {x: 0.6, y: 0.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1196152382
@@ -25593,7 +25861,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1197222020
RectTransform:
m_ObjectHideFlags: 0
@@ -25606,7 +25874,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 965315464}
m_Father: {fileID: 1190564545}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -26233,7 +26501,6 @@ RectTransform:
- {fileID: 1248839823}
- {fileID: 2116459114}
- {fileID: 1138631438}
- {fileID: 1126428514}
m_Father: {fileID: 1108670798}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -28632,7 +28899,6 @@ RectTransform:
- {fileID: 490939724}
- {fileID: 1132009643}
- {fileID: 987548330}
- {fileID: 1196152381}
m_Father: {fileID: 2027266814}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -29456,7 +29722,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1698343261}
m_Father: {fileID: 1106034699}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -29806,7 +30072,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 452985793}
m_Father: {fileID: 161670716}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -30947,7 +31214,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 147027245}
m_Father: {fileID: 157256356}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -31679,7 +31946,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 1769603217}
m_Father: {fileID: 646902526}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -35808,7 +36076,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1106034699}
- {fileID: 1371483725}
m_Father: {fileID: 1108670798}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -36087,7 +36354,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 948128554}
m_Father: {fileID: 2077058953}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -37915,7 +38182,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 646902526}
m_Father: {fileID: 1543897235}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -41234,7 +41501,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1882925197
RectTransform:
m_ObjectHideFlags: 0
@@ -44245,7 +44512,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 1700157242}
m_Father: {fileID: 948128554}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn
+13 -2
View File
@@ -1,8 +1,8 @@
title: UF图像问题回答正确
title: UF图像问题回答正确
tags:
---
me: UF绘图使用的红色应该是在记忆“草地”的引导下调用的
me:而草地记忆出现了glitch，这桑因为什么？
me:而草地记忆出现了glitch，这是因为什么？
<<EnableQuestion CanvasClueBoard MemoryGrass>>
===
title: 记忆问题回答正确
@@ -13,4 +13,15 @@ me: 正常来说应该是视觉去向记忆传递信息，但是现在颜色信
me:明白了，是记忆反流症
<<EnableQuestion CanvasClueBoard EyePlant>>
<<AddNodeAndConnection CanvasClueBoard EyePlant 记忆反流>>
me:要怎么办呢？
me: 看起来只有做记忆-视觉阻断手术了
<<EnableQuestion CanvasClueBoard 记忆反流>>
<<AddNodeAndConnection CanvasClueBoard 记忆反流 手术>>
===
title: 执行手术
tags:
---
me: 这是唯一的办法了吧
->去做记忆-视觉阻断手术
->再想想
===
Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn
+91 -91
View File
@@ -7,8 +7,8 @@ position: 242,-2373
//NOTE：房间界面的对话都单句写短一些（16字以内，参考CoffeeTalk），维修的可以长一些
////新闻:balabalabala
///<<indoor>>
//<<jump VarsInit>>
<<jump 诊断初始化>>
<<jump VarsInit>>
//<<jump 诊断初始化>>
===
title: VarsInit
tags:
@@ -105,9 +105,9 @@ peipei: 画好了
me: （嗯...看着很奇怪...不知道为什么，像是绿色彻底丢失了...）
me: （先放入诊疗面板吧）
<<CollectionClue ClueManager>>
//<<AddNode CanvasClueBoard UFImage>>
// <<OpenClueBoard ClueBoard>>
// <<wait_for_ClueBoard_close ClueBoard>>
me: 噢？有新的日志？
peipei: 医生，怎么样，情况很严重么？
me: 还不知道，我们可能需要深入检查下
me: 我们去诊疗室吧
@@ -166,7 +166,7 @@ me: 先收起来吧，之后要查看下
title: AddAllClueToFavorites
tags:
colorID: 6
position: -560,-1440
position: -1098,-2867
---
<<generate_PunchTape ClueManager "海报" "EyeView" "liuying1-1" "红色" true>>
<<generate_PunchTape ClueManager "植物" "EyeView" "liuying1-2" "绿色" true>>
@@ -188,7 +188,7 @@ position: 245,-522
// <<endif>>
// 检查主目标是否完成并提供反馈
<<if $isFinishedEyeCheck == -1>>
<<if $memoryCount == 3>>
<<if $memoryCount == 4>>
me: 似乎该检查的都检查了，应该去看下诊疗单了
//<<OpenClueBoard target>>
<<else>>
@@ -200,7 +200,7 @@ position: 245,-522
title: 结论
tags:
colorID: 8
position: 40,-1078
position: -163,-1061
---
//现在关于切换场景的数据保存还没有完成，建议先不切场景
<<set $ufDiscussCount=4>>
@@ -213,7 +213,7 @@ position: 40,-1078
title: 手术
tags:
colorID: 8
position: 40,-840
position: -157,-751
---
<<wait_for_ClueBoard_close ClueBoard>>
<<set_line_cuttable LineManager MemoryEye true>>
@@ -300,40 +300,40 @@ colorID: 8
position: 639,-1240
---
me: 佩佩，为什么你看到的是黑白的？
peipei: 啊……医生，这好像是很久的事情了。
me: 很久的事情……？
peipei: 是的。不记得是在装上UF的时候还是装了之后一段时间的事情……
peipei: 总之是某次设备升级之后就这样了。
me: 你们能通过UF模块产生有颜色的图片，但是你们自己却看不见颜色？
peipei: 医生，你也是公司的员工呀，你也有医疗模块吧。
me: 什么意思？
peipei: 公司的所有技术性工作都是最终由技术性模块操作完成的。
peipei: 画都是我身体里的UF画的，它自己会产生颜色，我不需要能看见或者理解颜色。
me: 也就是说成为绘图工，就会失去色觉？
me: 这听起来…太令人难以接受了。
peipei: ……其实也不必为我那么担心啦，医生。
peipei: 我还是能想办法看见颜色的。
me: 什么？可是…我没在你的视觉里看到颜色。
peipei: 没什么，医生……抱歉。我…失言了。
peipei: 但总之，不用为我担心……
me: （佩佩有什么事情瞒着我。）
->追问
me: 佩佩，你刚才想要说的话，我希望你能告诉我。
me: 我需要知道尽量多的信息，才好对你做最准确的诊断和治疗。
peipei: 你…能替我保守秘密么？
->我守口如瓶
me: 你可以信任我，我会守口如瓶的。
peipei: 谢谢你，医生。其实仔细想想……
->只要有利于治疗
me: 如果保守这个秘密有利于治疗的话：是的。毕竟我是个医生。
peipei: 你说的对，医生…我不该这么问的。其实仔细想想……
->取决于你要说什么
me: 我不知道，这取决于这个秘密的性质了。
peipei: 好吧，其实仔细想想……
peipei: 对医生应该是不能说谎的，对吧？
peipei: 小时候我经常生病。有天为了能出去玩，我对住院医生说谎了。
peipei: 那一次医生很生气。他很关心我，但是我让他失望了，没有能照顾好自己。
peipei: 所以我想，也许不该成为一个秘密。
// peipei: 啊……医生，这好像是很久的事情了。
// me: 很久的事情……？
// peipei: 是的。不记得是在装上UF的时候还是装了之后一段时间的事情……
// peipei: 总之是某次设备升级之后就这样了。
// me: 你们能通过UF模块产生有颜色的图片，但是你们自己却看不见颜色？
// peipei: 医生，你也是公司的员工呀，你也有医疗模块吧。
// me: 什么意思？
// peipei: 公司的所有技术性工作都是最终由技术性模块操作完成的。
// peipei: 画都是我身体里的UF画的，它自己会产生颜色，我不需要能看见或者理解颜色。
// me: 也就是说成为绘图工，就会失去色觉？
// me: 这听起来…太令人难以接受了。
// peipei: ……其实也不必为我那么担心啦，医生。
// peipei: 我还是能想办法看见颜色的。
// me: 什么？可是…我没在你的视觉里看到颜色。
// peipei: 没什么，医生……抱歉。我…失言了。
// peipei: 但总之，不用为我担心……
// me: （佩佩有什么事情瞒着我。）
// ->追问
// me: 佩佩，你刚才想要说的话，我希望你能告诉我。
// me: 我需要知道尽量多的信息，才好对你做最准确的诊断和治疗。
// peipei: 你…能替我保守秘密么？
// ->我守口如瓶
// me: 你可以信任我，我会守口如瓶的。
// peipei: 谢谢你，医生。其实仔细想想……
// ->只要有利于治疗
// me: 如果保守这个秘密有利于治疗的话：是的。毕竟我是个医生。
// peipei: 你说的对，医生…我不该这么问的。其实仔细想想……
// ->取决于你要说什么
// me: 我不知道，这取决于这个秘密的性质了。
// peipei: 好吧，其实仔细想想……
// peipei: 对医生应该是不能说谎的，对吧？
// peipei: 小时候我经常生病。有天为了能出去玩，我对住院医生说谎了。
// peipei: 那一次医生很生气。他很关心我，但是我让他失望了，没有能照顾好自己。
// peipei: 所以我想，也许不该成为一个秘密。
<<set_Eyetarget EyeManager "sky" false>>
peipei: 看到窗外的蓝天了吗？
<<set_EyeState EyeManager "CanImagineColor">>
@@ -344,15 +344,15 @@ peipei: 看到窗外的蓝天了吗？
me: 记忆发送了进程，为视觉进行了写入操作？这是怎么发生的？
me: 先放进文件袋，等会去看看
<<CollectionClue ClueManager>>
me: 佩佩，你做了什么？为什么突然出现了颜色？
peipei: 我不知道怎么说……我就是记得它是这个颜色。
me: 记得？
peipei: 医生，你应该也有关于天空的珍贵记忆吧。你还记得在那段记忆里，天空是什么颜色的吗？
me: 记得？
peipei: 你一定是记得的，我也是。天空的颜色不是那么容易被忘记的。
peipei: 只要想起那个记忆，眼前就浮现出颜色了
//总觉得这里想象力已经呼之欲出了
me: 佩佩，我得再做几次测试
// me: 佩佩，你做了什么？为什么突然出现了颜色？
// peipei: 我不知道怎么说……我就是记得它是这个颜色。
// me: 记得？
// peipei: 医生，你应该也有关于天空的珍贵记忆吧。你还记得在那段记忆里，天空是什么颜色的吗？
// me: 记得？
// peipei: 你一定是记得的，我也是。天空的颜色不是那么容易被忘记的。
// peipei: 只要想起那个记忆，眼前就浮现出颜色了
// //总觉得这里想象力已经呼之欲出了
// me: 佩佩，我得再做几次测试
me: 我需要让你再观察几个东西，你只要重复刚才做的事情就好了。
peipei: 好的，医生。
<<set $eyecolorKnown=true>>
@@ -437,7 +437,7 @@ position: 642,-840
---
<<if $isFinishedEyeCheck==-1>>
me:这里应该已经彻底检查过了
<<jump 主维修界面>>
//<<jump 主维修界面>>
<<endif>>
<<if $isFinishedEyeCheck==1>>
<<if $eyeTargetTriggerCount == 1>>
@@ -445,14 +445,14 @@ me:这里应该已经彻底检查过了
<<elseif $eyeTargetTriggerCount == 2>>
me:这个也没问题，看来是好了,我们离开这里吧
<<set $isFinishedEyeCheck=-1>>
<<jump 主维修界面>>
//<<jump 主维修界面>>
<<endif>>
<<elseif $isFinishedEyeCheck==0&&$eyeTargetTriggerCount == 3>>
me:视觉部分该检查的都检查了，我们离开这里吧
<<SetExternalError ViewManager MemoryView true>>
<<set $isFinishedEyeCheck=-1>>
<<jump 主维修界面>>
//<<jump 主维修界面>>
<<endif>>
<<Set_MouseMovementLockState EyeManager false>>
===
@@ -504,11 +504,11 @@ position: 2640,-840
---
<<MemoryFinished MemoryManager>>
<<if $memoryCount==3>>
me:所有的索引卡都看了，我们退出记忆吧
//me:所有的索引卡都看了，我们退出记忆吧
///todo只给提示，不自动退
<<set $ufDiscussCount=3>>
<<set $eyeDiscussCount=2>>
<<jump 主维修界面>>
//<<jump 主维修界面>>
<<endif>>
===
title: 天空
@@ -617,42 +617,42 @@ position: 3316,-1247
<<endif>>
<<jump End_memoryPaly>>
===
title: OnUFViewDeepIn
tags:
colorID: 3
position: -399,-876
---
// <<if $isFinishedUFCheck==0>>
// <<set $isFinishedUFCheck=-1>>
// <<if $ufKnown==false>>
// me: 为什么你的左眼长得不一样？
// 解释UF
// <<elseif $ufSeen==false>>>>
// me: 这就是你提到的UF吗？
// me: 没想到…竟然是加装在眼睛上的。
// <<endif>>
// me:居然无法进入，权限还挺高。
// me: 为啥要专门用一个模块来做这件事情呢，还有这么高的权限…
// peipei: 解释公司对AI绘图的规定
// <<set $ufpurposeKnown = true>>
// me:那就外部测试下吧
// me:生成UF图
// <<show_photo UFManager "can_grass_error">>
// <<hide_photo UFManager>>
// <<generate_UFClue ClueManager UFImage can_grass_error 绿色>>
// me:生成好了
// <<set $ufDiscussCount=2>>
// <<elseif $isFinishedUFCheck==1>>
// <<set $isFinishedUFCheck=-1>>
// me: 再试试生成
// <<show_photo UFManager "can_grass_normal">>
// <<hide_photo UFManager>>
// <<generate_UFClue ClueManager UFImage can_grass_normal 绿色>>
// me:生成好了
// <<set $ufDiscussCount=6>>
// <<endif>>
<<jump 主维修界面>>
===
// title: OnUFViewDeepIn
// tags:
// colorID: 3
// position: -450,-1011
// ---
// // <<if $isFinishedUFCheck==0>>
// // <<set $isFinishedUFCheck=-1>>
// // <<if $ufKnown==false>>
// // me: 为什么你的左眼长得不一样？
// // 解释UF
// // <<elseif $ufSeen==false>>>>
// // me: 这就是你提到的UF吗？
// // me: 没想到…竟然是加装在眼睛上的。
// // <<endif>>
// // me:居然无法进入，权限还挺高。
// // me: 为啥要专门用一个模块来做这件事情呢，还有这么高的权限…
// // peipei: 解释公司对AI绘图的规定
// // <<set $ufpurposeKnown = true>>
// // me:那就外部测试下吧
// // me:生成UF图
// // <<show_photo UFManager "can_grass_error">>
// // <<hide_photo UFManager>>
// // <<generate_UFClue ClueManager UFImage can_grass_error 绿色>>
// // me:生成好了
// // <<set $ufDiscussCount=2>>
// // <<elseif $isFinishedUFCheck==1>>
// // <<set $isFinishedUFCheck=-1>>
// // me: 再试试生成
// // <<show_photo UFManager "can_grass_normal">>
// // <<hide_photo UFManager>>
// // <<generate_UFClue ClueManager UFImage can_grass_normal 绿色>>
// // me:生成好了
// // <<set $ufDiscussCount=6>>
// // <<endif>>
// <<jump 主维修界面>>
// ===
title: EmoViewDialogue
tags:
colorID: 8
Assets/Scenes/Persistence.unity
+1457 -627
View File
File diff suppressed because it is too large Load Diff
Assets/Scripts/Clue/ClueBaordNew.cs
+6
View File
@@ -59,6 +59,12 @@ public class ClueBaordNew : MonoBehaviour
connection.EnableDrag=false;
DialogController.Instance.StartDialogNode("记忆问题回答正确");
}
if (connection.port0.node.ID == "手术" && connection.port1.node.ID == "solution")
{
connection.DisableClick=false;
connection.EnableDrag=false;
DialogController.Instance.StartDialogNode("执行手术");
}
}
Assets/Scripts/Clue/ClueBoardManager.cs
+13 -4
View File
@@ -6,6 +6,7 @@ using DG.Tweening;
using TMPro;
using AibisDream;
using Yarn.Unity;
using System;
public class ClueBoardManager : MonoBehaviour
{
@@ -26,7 +27,11 @@ public class ClueBoardManager : MonoBehaviour
private bool isBoardOpen = false;
private Vector2 hiddenPosition; // ClueBoard隐藏时的位置
private Vector2 visiblePosition; // ClueBoard显示时的位置
public event Action OnClueBoardOpen;
public event Action OnClueBoardClose;
[YarnCommand("wait_for_ClueBoard_close")]
public IEnumerator WaitForClose()
{
// 这里等待关闭按钮点击事件
@@ -38,7 +43,7 @@ public class ClueBoardManager : MonoBehaviour
private void Start()
{
clueBoardRectTransform = clueBoardUI.GetComponent<RectTransform>();
// 定义ClueBoard UI的位置
// hiddenPosition = new Vector2(-Screen.width, clueBoardRectTransform.anchoredPosition.y); // 屏幕右侧
// visiblePosition = new Vector2(0, clueBoardRectTransform.anchoredPosition.y); // 屏幕内
@@ -76,15 +81,16 @@ public class ClueBoardManager : MonoBehaviour
clueBoardUI.SetActive(true);
iamgePointer.GetComponent<Image>().enabled=true;
isBoardOpen = true;
OnClueBoardOpen?.Invoke();
MouseCursorManager.Instance.ClueBoardIn();
// 用DOTween从右侧移动到可见区域
// clueBoardRectTransform.DOAnchorPos(visiblePosition, 0.5f);
}
private void CloseClueBoard()
[YarnCommand("CloseClueBoard")]
public void CloseClueBoard()
{
isBoardOpen = false;
// 用DOTween移动回右侧屏幕外
// clueBoardRectTransform.DOAnchorPos(hiddenPosition, 0.5f).OnComplete(() =>
// {
@@ -92,6 +98,9 @@ public class ClueBoardManager : MonoBehaviour
// });
clueBoardUI.SetActive(false);
iamgePointer.GetComponent<Image>().enabled=false;
OnClueBoardClose?.Invoke();
MouseCursorManager.Instance.ClueBoardOut();
}
// 添加新的 ClueSlot
Assets/Scripts/Clue/ClueManager.cs
+2
View File
@@ -20,6 +20,8 @@ public class ClueManager : MonoBehaviour
//public Notification ClueBoardNotification;
ClueBaordNew clueBaord;
MouseCursorManager mouseManager;
void Start()
{
clueBaord=FindObjectOfType<ClueBaordNew>();
Assets/Scripts/Dialog System/DialogController.cs
+6 -5
View File
@@ -31,6 +31,7 @@ namespace AibisDream
if (_isTalking == value) return;
_isTalking = value;
Debug.Log($"IsTalking 状态更改: {_isTalking}");
if (value)
{
OnDialogueStart?.Invoke();
@@ -69,15 +70,15 @@ namespace AibisDream
bookManager.OnBookClosed += () => { IsBlock = false; };
bookManager.OnBookOpen += () => { IsBlock = true; };
dialogueRunner.onDialogueStart.AddListener(() => { OnDialogueStart?.Invoke(); });
dialogueRunner.onDialogueComplete.AddListener(() => { OnDialogueComplete?.Invoke(); });
dialogueRunner.AddCommandListener(_ => { IsTalking = false; });
dialogueRunner.onDialogueStart.AddListener(() => { OnDialogueStart?.Invoke(); IsTalking = true;});
dialogueRunner.onDialogueComplete.AddListener(() => { OnDialogueComplete?.Invoke(); IsTalking = false;});
//dialogueRunner.AddCommandListener(_ => { IsTalking = false; });
// 对话结束时切下一个SO
dialogueRunner.onDialogueComplete.AddListener(() =>
{
DialogCanvasManager.Instance.SwitchDialogView(DialogViewType.Bubble);
StartCoroutine(GameLoopManager.Instance.NextSceneSo());
// DialogCanvasManager.Instance.SwitchDialogView(DialogViewType.Bubble);
// StartCoroutine(GameLoopManager.Instance.NextSceneSo());
});
}
Assets/Scripts/Dialog System/LineView.cs
+2 -2
View File
@@ -33,7 +33,7 @@ namespace AibisDream
private void HandleLineOutput(LocalizedLine dialogueLine, Action onTextShowed, Action onDialogueLineFinished)
{
// 对话系统正在交谈状态
DialogController.Instance.IsTalking = true;
//DialogController.Instance.IsTalking = true;
DialogCanvasManager.GetCurView().ShowLine(dialogueLine.TextWithoutCharacterName.Text,
dialogueLine.GetCharacterVo(), onDialogueLineFinished, onTextShowed, dialogueLine.IsAutoSkipLine());
@@ -63,7 +63,7 @@ namespace AibisDream
return;
}
DialogController.Instance.IsTalking = true;
//DialogController.Instance.IsTalking = true;
DialogCanvasManager.GetCurView().ShowOptions(dialogueOptions, onOptionSelected);
}
Assets/Scripts/FixSystem/Cable/Plug.cs
+2
View File
@@ -105,6 +105,7 @@ public class Plug : MonoBehaviour, IDragHandler, IPointerDownHandler, IPointerUp
return;
}
isDragging = true;
MouseCursorManager.Instance.StartDraggingPlug();
image.raycastTarget = false;
// 通知 DialogueManager 开始拖拽
// DialogueManager.Instance.SetDragging(true);
@@ -155,6 +156,7 @@ public class Plug : MonoBehaviour, IDragHandler, IPointerDownHandler, IPointerUp
}
isDragging = false;
MouseCursorManager.Instance.StopDraggingPlug();
image.raycastTarget = true;
// 通知 DialogueManager 结束拖拽
Assets/Scripts/Mouse/MouseCursorManager.cs
+137 -35
View File
@@ -3,6 +3,7 @@ using UnityEngine.EventSystems;
using UnityEngine.UI;
using System.Collections.Generic;
using AibisDream;
using Unity.VisualScripting;
public class MouseCursorManager : MonoBehaviour
{
@@ -16,10 +17,14 @@ public class MouseCursorManager : MonoBehaviour
public Canvas dialogueCanvas; // 对话Canvas
public Image cursorImage; // 用于显示自定义光标的Image
private bool isInDialogue = false; // 是否处于对话状态
private bool isDraggingPlug = false; // 是否正在拖拽Plug
private bool isUsingTool = false; // 是否处于使用工具状态
private bool isInClueBoard = false; // 是否处于使用工具状态
private Vector3 defaultCursorOffset = new Vector3(20, -20, 0); // default 指针的偏移量
public List<Button> ButtonDisableWhenIsTalking;
private void Awake()
{
@@ -39,21 +44,40 @@ public class MouseCursorManager : MonoBehaviour
}
private void Update()
{
if (cursorImage.sprite != defaultCursorSprite)
{
cursorImage.transform.position = Input.mousePosition;
}
UpdateCursorState();
// 检测点击事件
if (Input.GetMouseButtonDown(0))
if (Input.GetMouseButtonDown(0)&&!isDraggingPlug)
{
HandleClick();
}
}
private void UpdateCursorState()
{
if(isInClueBoard)
{
cursorImage.gameObject.SetActive(false);
return;
}
else
{
cursorImage.gameObject.SetActive(true);
}
if (DialogController.Instance.IsTalking)
{
foreach(Button button in ButtonDisableWhenIsTalking)
{
button.interactable=false;
}
SetCursor(dialogueCursorSprite);
dialogueCanvas.sortingOrder = 1000; // 确保对话窗口在最前
dialogueCanvas.overrideSorting = true;
@@ -61,10 +85,21 @@ public class MouseCursorManager : MonoBehaviour
}
else
{
foreach(Button button in ButtonDisableWhenIsTalking)
{
button.interactable=true;
}
dialogueCanvas.overrideSorting = false;
dialogueCanvas.GetComponent<GraphicRaycaster>().blockingMask = LayerMask.GetMask("Nothing");
if (IsHoveringOverDragItem())
if(isDraggingPlug)
{
SetCursor(handCursorSprite);
}
else if (IsHoveringOverDragItem())
{
SetCursor(handCursorSprite);
}
@@ -86,13 +121,19 @@ public class MouseCursorManager : MonoBehaviour
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 标签
{
return true;
}
{
if(result.gameObject.transform.GetChild(0).GetComponent<Socket>().IsAvailable)
{
Debug.Log("Hover Dialogue");
return true;
}
}
}
}
return false;
@@ -108,10 +149,19 @@ public class MouseCursorManager : MonoBehaviour
foreach (var result in results)
{
if (result.gameObject.CompareTag("Dragable")) // 物体需添加 Dragable 标签
{
return true;
}
// If the Canvas's sortingOrder is higher than the reference sortingOrder, ignore it
if (result.gameObject.CompareTag("Dragable")) // 物体需添加 Dragable 标签
{
return true;
}
}
}
return false;
@@ -120,31 +170,48 @@ public class MouseCursorManager : MonoBehaviour
// 处理点击事件
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)
{
if (result.gameObject.CompareTag("DialogueObject"))
{
string dialogueNode =result.gameObject.name+"Dialogue"; // 假设物体名是对话节点
DialogController.Instance.StartDialogNode(dialogueNode);
return;
}
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;
}
}
}
}
}
}
public void EnterDialogue()
{
isInDialogue = true;
}
public void ExitDialogue()
{
isInDialogue = false;
ResetCursor();
}
public void StartDraggingPlug()
{
@@ -165,22 +232,57 @@ public class MouseCursorManager : MonoBehaviour
public void StopUsingTool()
{
isUsingTool = false;
ResetCursor();
}
public void ClueBoardIn()
{
isInClueBoard = true;
}
public void ClueBoardOut()
{
isInClueBoard = false;
ResetCursor();
}
public void SetCursor(Sprite cursorSprite, bool flip = false)
public void SetCursor(Sprite cursorSprite, bool flip = false)
{
if (cursorSprite != null)
{
if (cursorSprite != null)
cursorImage.sprite = cursorSprite;
cursorImage.enabled = true;
cursorImage.rectTransform.localScale = new Vector3(flip ? -1 : 1, 1, 1);
// 如果是默认指针图标，应用偏移量
if (cursorSprite == defaultCursorSprite)
{
cursorImage.sprite = cursorSprite;
cursorImage.enabled = true;
cursorImage.rectTransform.localScale = new Vector3(flip ? -1 : 1, 1, 1);
cursorImage.transform.position = Input.mousePosition + defaultCursorOffset;
}
else
{
// 非默认图标时直接跟随鼠标位置
cursorImage.transform.position = Input.mousePosition;
}
}
}
public void ResetCursor()
public void ResetCursor()
{
Cursor.visible = false;
cursorImage.sprite = defaultCursorSprite;
cursorImage.rectTransform.localScale = Vector3.one; // 恢复为不翻转的默认状态
// 如果是默认指针图标，应用偏移量
if (cursorImage.sprite == defaultCursorSprite)
{
cursorImage.sprite = defaultCursorSprite;
cursorImage.rectTransform.localScale = Vector3.one; // 恢复为不翻转的默认状态
cursorImage.transform.position = Input.mousePosition + defaultCursorOffset;
}
else
{
// 非默认图标时直接跟随鼠标位置
cursorImage.transform.position = Input.mousePosition;
}
}
}
Assets/Scripts/Mouse/RaycastManager.cs
+114
View File
@@ -0,0 +1,114 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class RaycastManager : MonoBehaviour
{
private ClueBoardManager cm;
private EyeTransitionManager em;
public List<GraphicRaycaster> graphicRaycasters = new List<GraphicRaycaster>();
// 是否开启 ClueBoard 和 DeepView
private bool isClueBoardIn = false;
private bool isDeepViewIn = false;
void Start()
{
// 查找 ClueBoardManager 和 EyeTransitionManager
cm = FindObjectOfType<ClueBoardManager>();
em = FindObjectOfType<EyeTransitionManager>();
// 订阅事件
if (cm != null)
{
Debug.Log("Successfully found ClueBoardManager and subscribed to events.");
cm.OnClueBoardOpen += HandleClueBoardOpen;
cm.OnClueBoardClose += HandleClueBoardClose;
}
else
{
Debug.LogWarning("EyeTransitionManager not found!");
}
if (em != null)
{
Debug.Log("Successfully found EyeTransitionManager and subscribed to events.");
em.OnGetMainView += HandleGetMainView;
em.OnGetDeepView += HandleGetDeepView;
}
else
{
Debug.LogWarning("EyeTransitionManager not found!");
}
// 获取所有的 Raycastable Canvas 组件
}
// ClueBoard 打开时处理
private void HandleClueBoardOpen()
{
Debug.Log("打开ClueBoard");
isClueBoardIn = true;
UpdateRaycastStatus();
}
// ClueBoard 关闭时处理
private void HandleClueBoardClose()
{
Debug.Log("关闭ClueBoard");
isClueBoardIn = false;
UpdateRaycastStatus();
}
// MainView 激活时处理
private void HandleGetMainView()
{
Debug.Log("回到MainView");
isDeepViewIn = false;
UpdateRaycastStatus();
}
// DeepView 激活时处理
private void HandleGetDeepView()
{
Debug.Log("去到DeepView");
isDeepViewIn = true;
UpdateRaycastStatus();
}
// 更新 Raycast 组件的状态
private void UpdateRaycastStatus()
{
// 如果 ClueBoard 或 DeepView 开启，禁用所有 GraphicRaycaster
foreach (var raycaster in graphicRaycasters)
{
if (isClueBoardIn || isDeepViewIn)
{
raycaster.enabled = false;
}
else
{
raycaster.enabled = true;
}
}
}
// 确保在场景切换时销毁 RaycastManager
private void OnDestroy()
{
if (cm != null)
{
cm.OnClueBoardOpen -= HandleClueBoardOpen;
cm.OnClueBoardClose -= HandleClueBoardClose;
}
if (em != null)
{
em.OnGetMainView -= HandleGetMainView;
em.OnGetDeepView -= HandleGetDeepView;
}
}
}
Assets/Scripts/Mouse/RaycastManager.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 360cd7bb154acc740941f053cbd8cff2
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: