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

修复bug

Browse Source
This commit is contained in:
bottlefish
2025-03-01 01:34:42 +08:00
parent 40a76cffef
commit 30ac2ceb54
23 changed files with 34 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Resources/TimeLine/ToBodyModule.playable
+2 -2
View File
@@ -29,7 +29,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1.5
value: {x: 0, y: -6.85, z: 0}
value: {x: 0.033488512, y: -6.85, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -165,7 +165,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 0
value: 0.033488512
inSlope: 0
outSlope: 0
tangentMode: 136
Assets/Resources/Yarn/FP_Day3_mid/Day3_mid.yarn
+1 -1
View File
@@ -131,7 +131,7 @@ me: 你会有的…
<<set_time_of_day EnvironmentManager "night">>
<<fade_out 1>>
感谢游玩艾比斯之梦，本次demo的体验流程已结束。
感谢游玩 爱与机器人维修技术 ，本次demo的体验流程已结束。
->返回主菜单
<<BackToMenu>>
Assets/Resources/Yarn/FP_Peipei2/Stage12_结束对话.yarn
+1 -1
View File
@@ -282,7 +282,7 @@ peipei: 这是我们的职责。
<<set_time_of_day EnvironmentManager "night">>
<<fade_out 1>>
制作组: 感谢游玩艾比斯之梦，本次demo的体验流程已结束。
制作组: 感谢游玩 爱与机器人维修技术 ，本次demo的体验流程已结束。
制作组:（提示:尚有分支可以探索…）
->返回主菜单
<<BackToMenu>>
Assets/Resources/Yarn/FP_Peipei3/BE结束谈话.yarn
+1 -1
View File
@@ -195,7 +195,7 @@ me: ……再见。
<<set_time_of_day EnvironmentManager "night">>
<<fade_out 1>>
感谢游玩艾比斯之梦，本次demo的体验流程已结束。
感谢游玩 爱与机器人维修技术 ，本次demo的体验流程已结束。
->返回主菜单
<<BackToMenu>>
//<<NextYarn>>
Assets/Scenes/PeipeiFixScene.unity
+4 -4
View File
@@ -12733,11 +12733,11 @@ Transform:
m_GameObject: {fileID: 633823201}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.48628008, y: -0.6712673, z: 0}
m_LocalScale: {x: 1.1077018, y: 1.1077018, z: 1.1077018}
m_LocalPosition: {x: 0.36099908, y: -0.61499995, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2071292136}
m_Father: {fileID: 1822610250}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &633823203
SpriteRenderer:
@@ -32455,6 +32455,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2071292136}
- {fileID: 633823202}
m_Father: {fileID: 6045551082333026153}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1822610251
@@ -35267,7 +35268,6 @@ Transform:
m_Children:
- {fileID: 1434391375}
- {fileID: 1465407177}
- {fileID: 633823202}
- {fileID: 1484838014}
m_Father: {fileID: 1822610250}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Assets/Scenes/Persistence.unity
+10 -10
View File
@@ -5053,7 +5053,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u8FD9\u662F\u4E00\u4E2A\u4E3A\u4FBF\u4E8E\u6D4B\u8BD5\u51C6\u5907\u7684\u4E34\u65F6\u529F\u80FD\n\n\n\u5982\u679C\u9996\u6B21\u6E38\u73A9\uFF0C\u63A8\u8350\u60A8\u8FD4\u56DE\u5E76\u70B9\u51FB\u5F00\u59CB\u6E38\u620F\u76F4\u63A5\u5F00\u59CB"
m_text: "\u8FD9\u662F\u4E00\u4E2A\u4E3A\u4FBF\u4E8E\u6D4B\u8BD5\u51C6\u5907\u7684\u4E34\u65F6\u529F\u80FD\n\n\u5982\u679C\u9996\u6B21\u6E38\u73A9\uFF0C\u63A8\u8350\u60A8\u8FD4\u56DE\u5E76\u70B9\u51FB\u5F00\u59CB\u6E38\u620F\u76F4\u63A5\u5F00\u59CB\n\n\u672C\u529F\u80FD\u53EF\u80FD\u5305\u542Bbug\uFF0C\u63A8\u8350\u60F3\u8981\u9009\u5173\u7684\u73A9\u5BB6\u91CD\u542F\u6E38\u620F\u540E\u518D\u4F7F\u7528\u672C\u529F\u80FD"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
@@ -7263,7 +7263,7 @@ Transform:
m_GameObject: {fileID: 519420028}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.009999275, y: 0, z: -10}
m_LocalPosition: {x: 0, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -9284,10 +9284,10 @@ MonoBehaviour:
- {fileID: 11400000, guid: afc5b01ef301cc74db7cae741acad427, type: 2}
- {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2}
- {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2}
runMode: 1
runMode: 0
firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2}
testTalkSo: {fileID: 11400000, guid: 7bf300be492f2634580f0eaabcca2b2e, type: 2}
saveFileName: StoneDay1_2
testTalkSo: {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2}
saveFileName: "PeipeiDay2_\u624B\u672F\u8272\u5F69\u6062\u590D"
--- !u!4 &719228339
Transform:
m_ObjectHideFlags: 0
@@ -14655,8 +14655,8 @@ RectTransform:
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: 75}
m_SizeDelta: {x: 620, y: 150}
m_AnchoredPosition: {x: 321, y: 173}
m_SizeDelta: {x: 1102.2378, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1299926726
MonoBehaviour:
@@ -14678,7 +14678,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u827E\u6BD4\u65AF\u4E4B\u68A6"
m_text: "\u7231&\u673A\u5668\u4EBA\n\u7EF4\u4FEE\u6280\u672F"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 5888259904a10c746869983e379c71cb, type: 2}
m_sharedMaterial: {fileID: 7067580966573828082, guid: 5888259904a10c746869983e379c71cb, type: 2}
@@ -14711,8 +14711,8 @@ MonoBehaviour:
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_fontStyle: 16
m_HorizontalAlignment: 1
m_VerticalAlignment: 8192
m_textAlignment: 65535
m_characterSpacing: 0
Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs
+4 -3
View File
@@ -3,6 +3,7 @@ using AibisDream.Framework;
using AibisDream.Kit;
using Cinemachine;
using UnityEngine;
using System.Collections.Generic;
namespace AibisDream.FixSystem
{
@@ -12,7 +13,7 @@ namespace AibisDream.FixSystem
#region 内部索引
public BodyModule[] BodyModules { get; private set; }
public List<BodyModule> BodyModules { get; private set; }
public CableSystem CableSystem { get; private set; }
public GameObject bodyModulePrefab;
[HideInInspector] public Transform bodyModuleGroup;
@@ -56,7 +57,7 @@ namespace AibisDream.FixSystem
private void InitComponentRefs()
{
// 处理内部索引
BodyModules = transform.GetComponentsInChildren<BodyModule>();
BodyModules = transform.GetComponentsInChildren<BodyModule>().ToList();
CableSystem = transform.Find("Cable System").GetComponent<CableSystem>();
bodyModuleGroup = transform.Find("Body Module Group");
oscilloscopeSystem = transform.Find("Oscilloscope System").GetComponent<OscilloscopeSystem>();
@@ -251,7 +252,7 @@ namespace AibisDream.FixSystem
newModules[i] = newModule;
}
BodyModules = newModules;
BodyModules = newModules.ToList();
}
public override void SaveLevel()
Assets/Scripts/FixSystemNew/BodyModule/BodyModuleYarnCommand.cs
+3
View File
@@ -41,6 +41,8 @@ namespace AibisDream
{
var _UFModule = BodyModuleSystem.FindBodyModuleByName("UF").transform.GetComponent<UFModule>();
_UFModule.RemoveUFModule();
BodyModuleSystem.FindBodyModuleByName("UF").SetSocketAvailable(false);
}
[YarnCommand("Temp_RemoveUFCover")]
@@ -55,6 +57,7 @@ namespace AibisDream
{
var _UFModule = BodyModuleSystem.FindBodyModuleByName("UF").transform.GetComponent<UFModule>();
_UFModule.InstallUFModule();
BodyModuleSystem.FindBodyModuleByName("UF").SetSocketAvailable(true);
}
[YarnCommand("Temp_InstallUFCover")]
Assets/Scripts/FixSystemNew/BodyModule/Modules/UFModule.cs
+8
View File
@@ -2,12 +2,15 @@ using UnityEngine;
using AibisDream.Framework;
using AibisDream;
using System;
using AibisDream.FixSystem;
public class UFModule : MonoBehaviour
{
private GameObject _ufCover;
private GameObject _ufModule;
private GameObject _ufSocket;
private GameObject _ufColor;
private UFData _ufData=new ();
@@ -18,6 +21,7 @@ public class UFModule : MonoBehaviour
// 添加加载逻辑
_ufData.LoadEvent += LoadData;
_ufModule = transform.Find("Module Pic").gameObject;
_ufSocket = transform.Find("Socket").gameObject;
_ufCover = _ufModule.transform.Find("Cover").gameObject;
_ufColor=_ufModule.transform.Find("Color").gameObject;
}
@@ -38,6 +42,8 @@ public class UFModule : MonoBehaviour
if (_ufModule.activeInHierarchy)
{
_ufModule.SetActive(false);
_ufSocket.SetActive(false);
}
_ufData.isUFRemoved = true;
@@ -58,6 +64,7 @@ public class UFModule : MonoBehaviour
if (!_ufModule.activeInHierarchy)
{
_ufModule.SetActive(true);
_ufSocket.SetActive(true);
}
_ufData.isUFRemoved = false;
@@ -85,6 +92,7 @@ public class UFModule : MonoBehaviour
public void UFinit()
{
_ufModule.SetActive(!_ufData.isUFRemoved);
_ufSocket.SetActive(!_ufData.isUFRemoved);
_ufCover.SetActive(!_ufData.isUFCoverRemoved);
_ufColor.SetActive(!_ufData.isColorRemoved);
}
Assets/StreamingAssets/PeipeiDay1_结束对话.json
-93
View File
@@ -1,93 +0,0 @@
{
"fixDataContainer": {
"ClueData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"punchTapeFavorites": []
},
"EyeData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"currentState": 1
},
"ChipData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"isChipRemoved": true
},
"AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"characterName": "佩佩",
"faceName": "不开心",
"poseName": "无动作",
"hasDevice": false,
"isShow": true
},
"UFData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": {
"isUFCoverRemoved": false,
"isUFRemoved": false,
"isColorRemoved": false
}
},
"floatDict": {
"$memoryCount": 3.0,
"$eyeTargetTriggerCount": 2.0,
"$PlugCount": 5.0,
"$chipDiscussCount": 0.0,
"$ufDiscussCount": 3.0,
"$eyeDiscussCount": 2.0,
"$memDiscussCount": 0.0,
"$emoDiscussCount": 0.0,
"$logicDiscussCount": 0.0,
"$speakerDiscussCount": 0.0,
"$UFPhotoID_PeipeiTalk": 1.0,
"$Yarn.Internal.Visiting.IntoEyeView": 8.0,
"$Yarn.Internal.Visiting.UF深入检查": 1.0,
"$Yarn.Internal.Visiting.佩佩告诉你可以想象颜色": 1.0,
"$Yarn.Internal.Visiting.OnMemoryInsert": 0.0,
"$Yarn.Internal.Visiting.检查视觉": 0.0,
"$Yarn.Internal.Visiting.检查情绪": 3.0,
"$Yarn.Internal.Visiting.检查逻辑": 2.0,
"$Yarn.Internal.Visiting.检查语言": 1.0,
"$Yarn.Internal.Visiting.检查色觉": 1.0,
"$Yarn.Internal.Visiting.检查UF": 0.0,
"$Yarn.Internal.Visiting.记忆": 0.0,
"$Yarn.Internal.Visiting.FirstDialogue": 1.0,
"$Yarn.Internal.Visiting.MemoryPlugIn": 3.0,
"$Yarn.Internal.Visiting.Eye_poster": 1.0,
"$Yarn.Internal.Visiting.Eye_plant": 1.0,
"$Yarn.Internal.Visiting.OnMemoryViewShow": 0.0,
"$Yarn.Internal.Visiting.天空": 1.0,
"$Yarn.Internal.Visiting.海报": 1.0,
"$Yarn.Internal.Visiting.植物": 1.0,
"$Yarn.Internal.Visiting.Eye_skyAfterSurgery": 0.0,
"$Yarn.Internal.Visiting.Eye_computerAfterSurgery": 0.0,
"$Yarn.Internal.Visiting.Eye_posterAfterSurgery": 3.0,
"$Yarn.Internal.Visiting.Eye_plantAfterSurgery": 1.0
},
"stringDict": {
"$gameStage": "结束对话",
"$currentEyeTarget": "plant"
},
"boolDict": {
"$isFinishedUFCheck": true,
"$isFinishedEyeCheck": true,
"$hasUncheckedMemory": false,
"$isLineCut": false,
"$PlugAll": false,
"$ufSeen": false,
"$ufKnown": false,
"$ufpurposeKnown": false,
"$chipmissingKnown": false,
"$eyeproblemKnown": false,
"$eyenocolorKnown": true,
"$eyecolorKnown": true,
"$isCheckedPunchTapeFormEye": false,
"$emoChecked": true,
"$logicChecked": true,
"$memoryChecked": true,
"$eyeChecked": true,
"$speakerChecked": true,
"$UfChecked": true,
"$colorChecked": false,
"$peipeiReadyToShow": true,
"$eyeDeepThenUf": false
},
"curSceneKey": "PeipeiFixScene",
"curTalkSceneSo": "PeipeiDay1",
"fixState": 5,
"fixStateArgs": ""
}
Assets/StreamingAssets/PeipeiDay1_结束对话.json.meta
-7
View File
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 7d86dcb5eae48e946b36c8a571872936
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/StreamingAssets/PeipeiDay1_分析.json → Assets/StreamingAssets/TestSaveFiles/PeipeiDay1_分析.json
View File
Assets/StreamingAssets/PeipeiDay1_分析.json.meta → Assets/StreamingAssets/TestSaveFiles/PeipeiDay1_分析.json.meta
View File
Assets/StreamingAssets/PeipeiDay1_复查.json → Assets/StreamingAssets/TestSaveFiles/PeipeiDay1_复查.json
View File
Assets/StreamingAssets/PeipeiDay1_复查.json.meta → Assets/StreamingAssets/TestSaveFiles/PeipeiDay1_复查.json.meta
View File
Assets/StreamingAssets/PeipeiDay1_手术.json → Assets/StreamingAssets/TestSaveFiles/PeipeiDay1_手术.json
View File
Assets/StreamingAssets/PeipeiDay1_手术.json.meta → Assets/StreamingAssets/TestSaveFiles/PeipeiDay1_手术.json.meta
View File
Assets/StreamingAssets/PeipeiDay1_术前谈话.json → Assets/StreamingAssets/TestSaveFiles/PeipeiDay1_术前谈话.json
View File
Assets/StreamingAssets/PeipeiDay1_术前谈话.json.meta → Assets/StreamingAssets/TestSaveFiles/PeipeiDay1_术前谈话.json.meta
View File
Assets/StreamingAssets/PeipeiDay1_视觉检查.json → Assets/StreamingAssets/TestSaveFiles/PeipeiDay1_视觉检查.json
View File
Assets/StreamingAssets/PeipeiDay1_视觉检查.json.meta → Assets/StreamingAssets/TestSaveFiles/PeipeiDay1_视觉检查.json.meta
View File
Assets/StreamingAssets/PeipeiDay1_记忆检查.json → Assets/StreamingAssets/TestSaveFiles/PeipeiDay1_记忆检查.json
View File
Assets/StreamingAssets/PeipeiDay1_记忆检查.json.meta → Assets/StreamingAssets/TestSaveFiles/PeipeiDay1_记忆检查.json.meta
View File