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

重构暂存

Browse Source
This commit is contained in:
bottlefish
2024-12-22 18:09:55 +08:00
parent 2d4bba2878
commit 58714dcb2d
5 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn
+1 -1
View File
@@ -117,7 +117,7 @@ position: 256,-1154
---
<<fade_in 0.5>>
<<switch_fix_system_to "BodyModule" "Peipei1.json">>
<<SetExternalError ViewManager MemoryView true>>
//<<SetExternalError ViewManager MemoryView true>>
//<<Set_ViewVisualState ViewManager "ColorView" 1>>
<<wait 0.5>>
<<fade_out 0.5>>
Assets/Scenes/PeipeiFixScene.unity
+7 -7
View File
@@ -3496,7 +3496,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 485fe5a69106f8146a3ef9ca070f306d, type: 3}
m_Name:
m_EditorClassIdentifier:
_socketPos: {fileID: 0}
_socketPos: {fileID: 210414636}
data:
moduleName: Color
modulePicPath: "Art/Fix/Peipei/\u5927\u8111\u7EF4\u4FEE\u7EC6\u5316\u5BFC\u51FAnew/\u8272\u89C9"
@@ -6118,7 +6118,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 485fe5a69106f8146a3ef9ca070f306d, type: 3}
m_Name:
m_EditorClassIdentifier:
_socketPos: {fileID: 0}
_socketPos: {fileID: 1616369506}
data:
moduleName: Eye
modulePicPath: "Art/Fix/Peipei/\u5927\u8111\u7EF4\u4FEE\u7EC6\u5316\u5BFC\u51FAnew/\u53F3\u773C"
@@ -10449,7 +10449,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 485fe5a69106f8146a3ef9ca070f306d, type: 3}
m_Name:
m_EditorClassIdentifier:
_socketPos: {fileID: 0}
_socketPos: {fileID: 53832471}
data:
moduleName: Logic
modulePicPath: "Art/Fix/Peipei/\u5927\u8111\u7EF4\u4FEE\u7EC6\u5316\u5BFC\u51FAnew/\u601D\u7EF4\u6A21\u5757"
@@ -13138,7 +13138,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 485fe5a69106f8146a3ef9ca070f306d, type: 3}
m_Name:
m_EditorClassIdentifier:
_socketPos: {fileID: 0}
_socketPos: {fileID: 2065708031}
data:
moduleName: Memory
modulePicPath: "Art/Fix/Peipei/\u5927\u8111\u7EF4\u4FEE\u7EC6\u5316\u5BFC\u51FAnew/\u8BB0\u5FC6\u6A21\u5757"
@@ -23636,7 +23636,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 485fe5a69106f8146a3ef9ca070f306d, type: 3}
m_Name:
m_EditorClassIdentifier:
_socketPos: {fileID: 0}
_socketPos: {fileID: 633823202}
data:
moduleName: UF
modulePicPath: "Art/Fix/Peipei/\u5927\u8111\u7EF4\u4FEE\u7EC6\u5316\u5BFC\u51FAnew/UF\u5E95\u677F"
@@ -24152,7 +24152,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 485fe5a69106f8146a3ef9ca070f306d, type: 3}
m_Name:
m_EditorClassIdentifier:
_socketPos: {fileID: 0}
_socketPos: {fileID: 1209549275}
data:
moduleName: Emo
modulePicPath: "Art/Fix/Peipei/\u5927\u8111\u7EF4\u4FEE\u7EC6\u5316\u5BFC\u51FAnew/\u60C5\u7EEA\u6A21\u5757"
@@ -26346,7 +26346,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 485fe5a69106f8146a3ef9ca070f306d, type: 3}
m_Name:
m_EditorClassIdentifier:
_socketPos: {fileID: 0}
_socketPos: {fileID: 1217899892}
data:
moduleName: Speak
modulePicPath: "Art/Fix/Peipei/\u5927\u8111\u7EF4\u4FEE\u7EC6\u5316\u5BFC\u51FAnew/\u8BB2\u8BDD\u6A21\u5757"
Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs
+2 -1
View File
@@ -123,7 +123,8 @@ namespace AibisDream.FixSystem
ModulePos = transform.localPosition,
SocketPos = socketPos.localPosition,
waveformType = data.waveformType,
waveHasError = data.waveHasError
waveHasError = data.waveHasError,
ignoreWaveCheck = data.ignoreWaveCheck
};
}
Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs
+7 -3
View File
@@ -162,7 +162,7 @@ namespace AibisDream.FixSystem
private void LoadData(BodyModuleSystemData systemData)
{
inHotErr = systemData.hasHotErr;
var oldModules = GetComponentsInChildren<BodyModule>();
// 先销毁旧的Module
foreach (var oldModule in oldModules)
@@ -175,11 +175,15 @@ namespace AibisDream.FixSystem
}
// 再加载新的Module
foreach (var newModuleData in systemData.moduleDataArray)
var newModules = new BodyModule[systemData.moduleDataArray.Length];
for (int i = 0; i < systemData.moduleDataArray.Length; i++)
{
BodyModule newModule = Instantiate(bodyModulePrefab, bodyModuleGroup).GetComponent<BodyModule>();
newModule.Load(newModuleData);
newModule.Load(systemData.moduleDataArray[i]);
newModules[i] = newModule;
}
BodyModules = newModules;
}
public override void Save()
Assets/StreamingAssets/LevelData/BodyModuleSystem/Peipei1.json
+1 -1
View File
@@ -1 +1 @@
{"hasHotErr":false,"moduleDataArray":[{"moduleName":"Memory","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/记忆模块","modulePos":{"x":-2.524,"y":2.662,"z":0.0},"socketPos":{"x":0.092,"y":0.017,"z":0.0},"waveformType":0,"waveHasError":false},{"moduleName":"UF","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/UF底板","modulePos":{"x":-4.406,"y":0.431,"z":0.0},"socketPos":{"x":-0.243,"y":0.148,"z":0.0},"waveformType":0,"waveHasError":false},{"moduleName":"RightEye","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/右眼","modulePos":{"x":-0.471,"y":0.604,"z":0.0},"socketPos":{"x":-0.879,"y":-0.57,"z":0.0},"waveformType":0,"waveHasError":false},{"moduleName":"","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/色觉","modulePos":{"x":-2.554,"y":0.689,"z":0.0},"socketPos":{"x":-0.003,"y":-0.744,"z":0.0},"waveformType":0,"waveHasError":false},{"moduleName":"Emo","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/情绪模块","modulePos":{"x":-4.5,"y":2.16,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":0,"waveHasError":false},{"moduleName":"Logic","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/思维模块","modulePos":{"x":-0.67,"y":2.16,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":0,"waveHasError":false},{"moduleName":"Speak","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/讲话模块","modulePos":{"x":-2.58,"y":-2.51,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":0,"waveHasError":false}]}
{"hasHotErr":false,"moduleDataArray":[{"moduleName":"Memory","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/记忆模块","modulePos":{"x":-2.524,"y":2.662,"z":0.0},"socketPos":{"x":0.092,"y":0.017,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":true},{"moduleName":"UF","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/UF底板","modulePos":{"x":-4.406,"y":0.431,"z":0.0},"socketPos":{"x":-0.243,"y":0.148,"z":0.0},"waveformType":2,"waveHasError":true,"ignoreWaveCheck":false},{"moduleName":"Eye","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/右眼","modulePos":{"x":-0.471,"y":0.604,"z":0.0},"socketPos":{"x":-0.879,"y":-0.57,"z":0.0},"waveformType":1,"waveHasError":true,"ignoreWaveCheck":false},{"moduleName":"Color","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/色觉","modulePos":{"x":-2.554,"y":0.689,"z":0.0},"socketPos":{"x":-0.003,"y":-0.744,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"Emo","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/情绪模块","modulePos":{"x":-4.5,"y":2.16,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":1,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"Logic","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/思维模块","modulePos":{"x":-0.67,"y":2.16,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":2,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"Speak","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/讲话模块","modulePos":{"x":-2.58,"y":-2.51,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":1,"waveHasError":false,"ignoreWaveCheck":false}]}