diff --git a/Assets/Editor/Script/BodyModuleSystemEditor.cs b/Assets/Editor/Script/BodyModuleSystemEditor.cs new file mode 100644 index 000000000..982b86080 --- /dev/null +++ b/Assets/Editor/Script/BodyModuleSystemEditor.cs @@ -0,0 +1,23 @@ +using AibisDream.FixSystem; +using UnityEditor; +using UnityEngine; + +namespace AibisDream.SystemEditor +{ + [CustomEditor(typeof(BodyModuleSystem))] + public class BodyModuleSystemEditor : SystemHasDataEditor + { + public override void OnInspectorGUI() + { + var example = (BodyModuleSystem)target; + + base.OnInspectorGUI(); + GUILayout.Label("修改"); + + if (GUILayout.Button("添加一个新模块")) + { + example.AddBodyModule(); + } + } + } +} \ No newline at end of file diff --git a/Assets/Editor/Script/BodyModuleSystemEditor.cs.meta b/Assets/Editor/Script/BodyModuleSystemEditor.cs.meta new file mode 100644 index 000000000..e98fddc82 --- /dev/null +++ b/Assets/Editor/Script/BodyModuleSystemEditor.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2bfe60c0be744740a6df2bee152c5dc0 +timeCreated: 1732921141 \ No newline at end of file diff --git a/Assets/Editor/Script/GearSystemEditor.cs b/Assets/Editor/Script/GearSystemEditor.cs deleted file mode 100644 index 0743b3a17..000000000 --- a/Assets/Editor/Script/GearSystemEditor.cs +++ /dev/null @@ -1,33 +0,0 @@ -using UnityEditor; -using UnityEngine; - -namespace AibisDream -{ - /// - /// 齿轮系统编辑器 - /// - [CustomEditor(typeof(GearController))] - public class GearSystemEditor : Editor - { - public override void OnInspectorGUI() - { - DrawDefaultInspector(); - GearController controller = (GearController)target; - - GUILayout.Label("关卡编辑功能"); - if (GUILayout.Button("添加一个齿轮轴")) - { - Debug.Log("添加齿轮轴"); - } - - if (GUILayout.Button("添加一个浮动的齿轮")) - { - Debug.Log("添加浮动齿轮"); - } - - GUILayout.Label("关卡加载/编辑"); - - } - } -} - diff --git a/Assets/Editor/Script/SystemHasDataEditor.cs b/Assets/Editor/Script/SystemHasDataEditor.cs new file mode 100644 index 000000000..9155ab933 --- /dev/null +++ b/Assets/Editor/Script/SystemHasDataEditor.cs @@ -0,0 +1,54 @@ +using AibisDream.Framework; +using UnityEditor; +using UnityEngine; + +namespace AibisDream.SystemEditor +{ + [CustomEditor(typeof(SystemHasData), true)] + public class SystemHasDataEditor : Editor + { + private int _selectedIndex; + private string _inputText = ""; + + public override void OnInspectorGUI() + { + // 获取目标对象 + SystemHasData example = (SystemHasData)target; + + // 绘制默认的 Inspector + DrawDefaultInspector(); + + GUILayout.Label("数据加载与保存"); + // 绘制下拉选择和输入框 + EditorGUILayout.BeginHorizontal(); + int newIndex = EditorGUILayout.Popup(_selectedIndex, example.GetDataKeyOptions()); + _inputText = EditorGUILayout.TextField(_inputText); + EditorGUILayout.EndHorizontal(); + + if (newIndex != _selectedIndex) + { + _selectedIndex = newIndex; + _inputText = example.GetDataKeyOptions()[newIndex]; + } + + // 保存按钮 + if (GUILayout.Button("保存")) + { + Undo.RecordObject(example, "Save Input Value"); + example.CurDataKey = _inputText; + example.Save(); + Debug.Log("Saved: " + _inputText); + } + + // 加载按钮 + if (GUILayout.Button("加载")) + { + example.CurDataKey = _inputText; + _selectedIndex = System.Array.IndexOf(example.GetDataKeyOptions(), _inputText); + if (_selectedIndex < 0) _selectedIndex = 0; + example.Load(); + Debug.Log("Loaded: " + _inputText); + } + } + } +} \ No newline at end of file diff --git a/Assets/Editor/Script/SystemHasDataEditor.cs.meta b/Assets/Editor/Script/SystemHasDataEditor.cs.meta new file mode 100644 index 000000000..f1660ee2d --- /dev/null +++ b/Assets/Editor/Script/SystemHasDataEditor.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9ed77cdf9a26442990dbc9904c51d905 +timeCreated: 1732899623 \ No newline at end of file diff --git a/Assets/Resources/Art/Fix/Stone/身体维修界面.psb b/Assets/Resources/Art/Fix/Stone/身体维修界面.psb index 496550096..b638650e0 100644 Binary files a/Assets/Resources/Art/Fix/Stone/身体维修界面.psb and b/Assets/Resources/Art/Fix/Stone/身体维修界面.psb differ diff --git a/Assets/Resources/Art/Fix/Stone/身体维修界面.psb.meta b/Assets/Resources/Art/Fix/Stone/身体维修界面.psb.meta index c891fcf78..a1ef9184f 100644 --- a/Assets/Resources/Art/Fix/Stone/身体维修界面.psb.meta +++ b/Assets/Resources/Art/Fix/Stone/身体维修界面.psb.meta @@ -94,6 +94,27 @@ ScriptedImporter: spritePosition: {x: 0, y: 0} mosaicSpriteImportData: [] rigSpriteImportData: + - name: "\u6CE2\u5F62\u5C4F\u5E55" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 2206 + y: 7105 + width: 651 + height: 459 + spriteID: 44f8fc5d39c10514c89c302f049ad74c + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 2204, y: 7104} + spritePosition: {x: 2937, y: 1410} - name: "\u5C4F\u5E55\u4FE1\u606F" originalName: pivot: {x: 0.5, y: 0.5} @@ -101,8 +122,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3290 - y: 7461 + x: 3248 + y: 5716 width: 651 height: 101 spriteID: dad54d5abbf7996438e47fe42d8414fa @@ -113,8 +134,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3288, y: 7460} - spritePosition: {x: 2934, y: 1892} + uvTransform: {x: 3246, y: 5715} + spritePosition: {x: 2928, y: 2006} - name: "\u6DF1\u5165\u6309\u94AE" originalName: pivot: {x: 0.5, y: 0.5} @@ -122,8 +143,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3812 - y: 6052 + x: 166 + y: 8026 width: 161 height: 112 spriteID: 27fd3ef65dfd55c45bf19c14e2ba4aaf @@ -134,7 +155,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3810, y: 6051} + uvTransform: {x: 164, y: 8025} spritePosition: {x: 3462, y: 1270} - name: "\u6ED1\u5757" originalName: @@ -144,7 +165,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3906 - y: 6530 + y: 6529 width: 27 height: 72 spriteID: 07698999b4df0c84bbd9c4c322a754b1 @@ -155,7 +176,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3904, y: 6529} + uvTransform: {x: 3904, y: 6528} spritePosition: {x: 2915, y: 1290} - name: "\u6ED1\u52A8\u8F68\u9053" originalName: @@ -164,8 +185,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 367 - y: 7903 + x: 4 + y: 7907 width: 580 height: 111 spriteID: 14b6aef9f9819d242bd85fb48351a3ce @@ -176,7 +197,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 367, y: 7903} + uvTransform: {x: 4, y: 7907} spritePosition: {x: 2890, y: 1271} - name: "\u62A5\u9519\u5C4F\u5E55" originalName: @@ -185,7 +206,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1424 + x: 1428 y: 7105 width: 770 height: 528 @@ -197,7 +218,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1424, y: 7105} + uvTransform: {x: 1428, y: 7105} spritePosition: {x: 2886, y: 1376} - name: "\u5DE6\u4FA7\u754C\u9762" originalName: @@ -227,8 +248,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3282 - y: 7104 + x: 2212 + y: 5498 width: 697 height: 356 spriteID: 5dd8c8637cee4004791d409a9dd08c43 @@ -239,7 +260,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3290, y: 7105} + uvTransform: {x: 2220, y: 5499} spritePosition: {x: 1745, y: 1386} - name: "\u692D\u5706 2" originalName: @@ -248,8 +269,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1377 - y: 8154 + x: 4067 + y: 5660 width: 25 height: 25 spriteID: 3f9ee51ee22d4434f8d77faf45d9acd2 @@ -260,7 +281,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1375, y: 8153} + uvTransform: {x: 4065, y: 5659} spritePosition: {x: 1374, y: 1055} - name: "\u692D\u5706 1" originalName: @@ -269,8 +290,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4063 - y: 7599 + x: 3913 + y: 5673 width: 26 height: 26 spriteID: 289d20330e2397a45ad29088f4f1a6e0 @@ -281,7 +302,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4061, y: 7598} + uvTransform: {x: 3911, y: 5672} spritePosition: {x: 1349, y: 1048} - name: "\u6307\u9488" originalName: @@ -290,29 +311,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3920 - y: 6310 - width: 20 - height: 43 - spriteID: c7aa11cecdaa86640854984d4b51a89f - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 3920, y: 6310} - spritePosition: {x: 1910, y: 1059} - - name: "\u6307\u9488" - originalName: - pivot: {x: 0.5, y: 0.5} - alignment: 0 - border: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 3920 - y: 6361 + x: 4067 + y: 5609 width: 20 height: 43 spriteID: 9f9deb0f2cb514d4d828fd62fa70dde3 @@ -323,9 +323,9 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3920, y: 6361} + uvTransform: {x: 4067, y: 5609} spritePosition: {x: 1294, y: 1305} - - name: "\u8F6C\u901F\u8868" + - name: "\u56FA\u5B9A\u8F6C\u901F\u8868" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -333,7 +333,28 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3812 - y: 5868 + y: 6345 + width: 176 + height: 176 + spriteID: 2c7aa826be00a514ebafbfe2253d1ff9 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 3812, y: 6345} + spritePosition: {x: 1832, y: 992} + - name: "\u8F6C\u901F\u8868" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 3615 + y: 5499 width: 176 height: 176 spriteID: b7e297a8275fe3147a264e080dc035dd @@ -344,7 +365,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3812, y: 5868} + uvTransform: {x: 3615, y: 5499} spritePosition: {x: 1226, y: 1218} - name: "\u53D8\u901F\u7BB1\u63D2\u5B54" originalName: @@ -353,8 +374,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3812 - y: 6530 + x: 3973 + y: 5609 width: 86 height: 86 spriteID: 98e19cabc64e47d46aea9ab2c329fca9 @@ -365,7 +386,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3812, y: 6530} + uvTransform: {x: 3973, y: 5609} spritePosition: {x: 1182, y: 1058} - name: "\u76D6\u5B50\u6746" originalName: @@ -374,8 +395,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4 - y: 7903 + x: 3248 + y: 5499 width: 355 height: 205 spriteID: 7805fb4d7ed5ab3429a2316f7fd43f9e @@ -386,8 +407,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 7903} - spritePosition: {x: 1472, y: 852} + uvTransform: {x: 3248, y: 5499} + spritePosition: {x: 1470, y: 850} - name: "\u53D8\u901F\u7BB1\u76D6\u5B50" originalName: pivot: {x: 0.5, y: 0.5} @@ -395,7 +416,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 2790 + x: 3453 y: 7105 width: 492 height: 492 @@ -407,7 +428,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 2790, y: 7105} + uvTransform: {x: 3453, y: 7105} spritePosition: {x: 1278, y: 766} - name: "\u53D8\u901F\u7BB1\u8F93\u5165\u9F7F\u8F6E" originalName: @@ -416,7 +437,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 2220 + x: 2910 y: 5499 width: 330 height: 330 @@ -428,7 +449,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 2220, y: 5499} + uvTransform: {x: 2910, y: 5499} spritePosition: {x: 1530, y: 1076} - name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EA" originalName: @@ -437,8 +458,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 541 - y: 8021 + x: 4 + y: 8025 width: 154 height: 154 spriteID: c562151c266172245900603e7959a8da @@ -449,7 +470,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 541, y: 8022} + uvTransform: {x: 4, y: 8026} spritePosition: {x: 1454, y: 1050} - name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EB" originalName: @@ -458,8 +479,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3812 - y: 6172 + x: 3953 + y: 7243 width: 128 height: 130 spriteID: 93418b50b51ddd441a424a24b868b51a @@ -470,7 +491,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3812, y: 6172} + uvTransform: {x: 3953, y: 7243} spritePosition: {x: 1406, y: 946} - name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EC" originalName: @@ -479,8 +500,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 367 - y: 8022 + x: 3799 + y: 5499 width: 166 height: 166 spriteID: d5e68dcab5349504f950128fdb66696c @@ -491,7 +512,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 367, y: 8022} + uvTransform: {x: 3799, y: 5499} spritePosition: {x: 1476, y: 824} - name: "\u53D8\u901F\u7BB1\u5531\u7247\u9F7F\u8F6E" originalName: @@ -500,8 +521,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3949 - y: 7461 + x: 3953 + y: 7105 width: 130 height: 130 spriteID: 15bb5a4be7f4d1746b0822dc05b92b5f @@ -512,7 +533,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3949, y: 7461} + uvTransform: {x: 3953, y: 7105} spritePosition: {x: 1318, y: 859} - name: "\u53D8\u901F\u7BB1\u8F93\u51FA\u9F7F\u8F6E" originalName: @@ -521,8 +542,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3920 - y: 6412 + x: 4067 + y: 5693 width: 0 height: 0 spriteID: 7e7562128bf69d7418af6bd34587198a @@ -533,7 +554,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3758, y: 6252} + uvTransform: {x: 3905, y: 5533} spritePosition: {x: 1782, y: 1048} - name: "\u53D8\u901F\u7BB1" originalName: @@ -555,7 +576,7 @@ ScriptedImporter: edges: [] tessellationDetail: 0 uvTransform: {x: 4, y: 7105} - spritePosition: {x: 1172, y: 548} + spritePosition: {x: 1170, y: 546} - name: "\u6CB9\u95E8" originalName: pivot: {x: 1, y: 0} @@ -563,8 +584,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 703 - y: 8022 + x: 3907 + y: 5716 width: 185 height: 125 spriteID: be4e6d6bab42a55409387fd23e2ee32c @@ -575,7 +596,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 703, y: 8022} + uvTransform: {x: 3907, y: 5716} spritePosition: {x: 1073, y: 1212} - name: "\u5FC3\u810F\u63D2\u5B54" originalName: @@ -584,8 +605,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3996 - y: 5868 + x: 3812 + y: 6529 width: 86 height: 86 spriteID: 393fed26529755c43b3adf65c5215b60 @@ -596,7 +617,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3996, y: 5868} + uvTransform: {x: 3812, y: 6529} spritePosition: {x: 982, y: 1386} - name: "\u5FC3\u810F\u76D6\u5B50" originalName: @@ -605,7 +626,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1424 + x: 1428 y: 7641 width: 634 height: 544 @@ -617,7 +638,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1424, y: 7641} + uvTransform: {x: 1428, y: 7641} spritePosition: {x: 920, y: 1372} - name: "\u55B7\u6CB9\u5EA6\u91CF" originalName: @@ -626,8 +647,8 @@ ScriptedImporter: border: {x: 0, y: 8, z: 0, w: 8} rect: serializedVersion: 2 - x: 1353 - y: 7903 + x: 3996 + y: 6345 width: 16 height: 243 spriteID: 955abee622701d34c92da4721f082368 @@ -638,7 +659,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1353, y: 7903} + uvTransform: {x: 3996, y: 6345} spritePosition: {x: 1287, y: 1618} - name: "\u8FDB\u6C14\u5EA6\u91CF" originalName: @@ -647,8 +668,8 @@ ScriptedImporter: border: {x: 0, y: 8, z: 0, w: 9} rect: serializedVersion: 2 - x: 1377 - y: 7903 + x: 4020 + y: 6345 width: 16 height: 243 spriteID: 0c11f41444c477f4fac3222cb5b79a98 @@ -659,7 +680,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1377, y: 7903} + uvTransform: {x: 4020, y: 6345} spritePosition: {x: 1204, y: 1618} - name: "\u6C14\u95E8\u62C9\u6746" originalName: @@ -668,8 +689,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3949 - y: 7599 + x: 3799 + y: 5673 width: 106 height: 28 spriteID: ed1ecfe628602a44285fa18ebac88553 @@ -680,7 +701,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3949, y: 7599} + uvTransform: {x: 3799, y: 5673} spritePosition: {x: 1031, y: 1666} - name: "\u62C9\u6746\u6C60" originalName: @@ -689,7 +710,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 2202 + x: 2865 y: 7105 width: 580 height: 498 @@ -701,7 +722,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 2202, y: 7105} + uvTransform: {x: 2865, y: 7105} spritePosition: {x: 932, y: 1410} - name: "\u5FC3\u810F\u9F7F\u8F6EA" originalName: @@ -710,8 +731,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3928 - y: 6412 + x: 4075 + y: 5693 width: 0 height: 0 spriteID: 446346ef83ab15c43a3d115b695a489a @@ -722,7 +743,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3742, y: 6226} + uvTransform: {x: 3889, y: 5507} spritePosition: {x: 1459, y: 1570} - name: "\u5FC3\u810F\u9F7F\u8F6EB" originalName: @@ -731,8 +752,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3936 - y: 6412 + x: 4083 + y: 5693 width: 0 height: 0 spriteID: b20eafea4b8b8c94c89d9e5d54ae683f @@ -743,7 +764,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3730, y: 6205} + uvTransform: {x: 3877, y: 5486} spritePosition: {x: 1344, y: 1445} - name: "\u5FC3\u810F\u9F7F\u8F6EC" originalName: @@ -752,8 +773,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1410 - y: 8154 + x: 4091 + y: 5693 width: 0 height: 0 spriteID: 4937081512344314a989a0d438fd73d3 @@ -764,7 +785,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1250, y: 7995} + uvTransform: {x: 3931, y: 5534} spritePosition: {x: 1295, y: 1611} - name: "\u5FC3\u810F\u9F7F\u8F6ED" originalName: @@ -773,8 +794,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 955 - y: 7903 + x: 3812 + y: 5868 width: 236 height: 236 spriteID: 14aab779c58f90a40a99c1b0e02cc11c @@ -785,7 +806,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 955, y: 7903} + uvTransform: {x: 3812, y: 5868} spritePosition: {x: 1386, y: 1218} - name: "\u5FC3\u810F\u9F7F\u8F6EE" originalName: @@ -794,8 +815,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1410 - y: 8162 + x: 4067 + y: 5701 width: 0 height: 0 spriteID: a4d40b2ba111122448c31f2ea4fd4d4d @@ -806,7 +827,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1280, y: 8032} + uvTransform: {x: 3937, y: 5571} spritePosition: {x: 1541, y: 1536} - name: "\u5FC3\u810F" originalName: @@ -836,8 +857,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1199 - y: 7903 + x: 3812 + y: 6112 width: 146 height: 225 spriteID: d4a3363adf457ae4aa15314d2db44ca5 @@ -848,7 +869,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1199, y: 7903} + uvTransform: {x: 3812, y: 6112} spritePosition: {x: 1257, y: 1935} - name: "\u80BA\u63D2\u5B54" originalName: @@ -857,8 +878,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3981 - y: 6052 + x: 3973 + y: 5499 width: 100 height: 102 spriteID: 2b82d9f9ac606bc46a69f1f1f2bc2fac @@ -869,7 +890,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3981, y: 6052} + uvTransform: {x: 3973, y: 5499} spritePosition: {x: 1990, y: 1443} - name: "\u80BA" originalName: @@ -899,8 +920,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3812 - y: 6310 + x: 3966 + y: 6112 width: 100 height: 102 spriteID: 7df889ef25dabad46bcacf053c71d0e6 @@ -911,7 +932,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3812, y: 6310} + uvTransform: {x: 3966, y: 6112} spritePosition: {x: 1068, y: 192} - name: "\u80C3" originalName: @@ -941,8 +962,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3812 - y: 6420 + x: 3966 + y: 6222 width: 100 height: 102 spriteID: a7f4162658d13014eb7749886a9e8c79 @@ -953,7 +974,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3812, y: 6420} + uvTransform: {x: 3966, y: 6222} spritePosition: {x: 1783, y: 446} - name: "\u809D" originalName: @@ -1091,13 +1112,23 @@ ScriptedImporter: resliceFromLayer: 0 mosaicPSDLayers: [] rigPSDLayers: + - name: "\u6CE2\u5F62\u5C4F\u5E55" + spriteName: "\u6CE2\u5F62\u5C4F\u5E55" + isGroup: 0 + parentIndex: -1 + spriteID: 44f8fc5d39c10514c89c302f049ad74c + layerID: 479 + mosaicPosition: {x: 2206, y: 7105} + flatten: 0 + isImported: 1 + isVisible: 1 - name: "\u5C4F\u5E55\u4FE1\u606F" spriteName: "\u5C4F\u5E55\u4FE1\u606F" isGroup: 0 parentIndex: -1 spriteID: dad54d5abbf7996438e47fe42d8414fa layerID: 475 - mosaicPosition: {x: 3290, y: 7461} + mosaicPosition: {x: 3248, y: 5716} flatten: 0 isImported: 1 isVisible: 1 @@ -1107,7 +1138,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 27fd3ef65dfd55c45bf19c14e2ba4aaf layerID: 463 - mosaicPosition: {x: 3812, y: 6052} + mosaicPosition: {x: 166, y: 8026} flatten: 0 isImported: 1 isVisible: 1 @@ -1117,7 +1148,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 07698999b4df0c84bbd9c4c322a754b1 layerID: 476 - mosaicPosition: {x: 3906, y: 6530} + mosaicPosition: {x: 3906, y: 6529} flatten: 0 isImported: 1 isVisible: 1 @@ -1127,7 +1158,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 14b6aef9f9819d242bd85fb48351a3ce layerID: 469 - mosaicPosition: {x: 367, y: 7903} + mosaicPosition: {x: 4, y: 7907} flatten: 0 isImported: 1 isVisible: 1 @@ -1137,7 +1168,7 @@ ScriptedImporter: parentIndex: -1 spriteID: f8e742adf70deed45a81da26d0626293 layerID: 461 - mosaicPosition: {x: 1424, y: 7105} + mosaicPosition: {x: 1428, y: 7105} flatten: 0 isImported: 1 isVisible: 1 @@ -1157,7 +1188,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 5dd8c8637cee4004791d409a9dd08c43 layerID: 456 - mosaicPosition: {x: 3290, y: 7105} + mosaicPosition: {x: 2220, y: 5499} flatten: 0 isImported: 1 isVisible: 1 @@ -1174,147 +1205,147 @@ ScriptedImporter: - name: "\u692D\u5706 2" spriteName: "\u692D\u5706 2" isGroup: 0 - parentIndex: 7 + parentIndex: 8 spriteID: 3f9ee51ee22d4434f8d77faf45d9acd2 layerID: 459 - mosaicPosition: {x: 1377, y: 8154} + mosaicPosition: {x: 4067, y: 5660} flatten: 0 isImported: 1 isVisible: 1 - name: "\u692D\u5706 1" spriteName: "\u692D\u5706 1" isGroup: 0 - parentIndex: 7 + parentIndex: 8 spriteID: 289d20330e2397a45ad29088f4f1a6e0 layerID: 458 - mosaicPosition: {x: 4063, y: 7599} + mosaicPosition: {x: 3913, y: 5673} flatten: 0 isImported: 1 isVisible: 1 - name: "\u6307\u9488" spriteName: "\u6307\u9488" isGroup: 0 - parentIndex: 7 - spriteID: c7aa11cecdaa86640854984d4b51a89f - layerID: 457 - mosaicPosition: {x: 3920, y: 6310} - flatten: 0 - isImported: 1 - isVisible: 1 - - name: "\u6307\u9488" - spriteName: "\u6307\u9488" - isGroup: 0 - parentIndex: 7 + parentIndex: 8 spriteID: 9f9deb0f2cb514d4d828fd62fa70dde3 layerID: 229 - mosaicPosition: {x: 3920, y: 6361} + mosaicPosition: {x: 4067, y: 5609} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u56FA\u5B9A\u8F6C\u901F\u8868" + spriteName: "\u56FA\u5B9A\u8F6C\u901F\u8868" + isGroup: 0 + parentIndex: 8 + spriteID: 2c7aa826be00a514ebafbfe2253d1ff9 + layerID: 482 + mosaicPosition: {x: 3812, y: 6345} flatten: 0 isImported: 1 isVisible: 1 - name: "\u8F6C\u901F\u8868" spriteName: "\u8F6C\u901F\u8868" isGroup: 0 - parentIndex: 7 + parentIndex: 8 spriteID: b7e297a8275fe3147a264e080dc035dd layerID: 417 - mosaicPosition: {x: 3812, y: 5868} + mosaicPosition: {x: 3615, y: 5499} flatten: 0 isImported: 1 isVisible: 1 - name: "\u53D8\u901F\u7BB1\u63D2\u5B54" spriteName: "\u53D8\u901F\u7BB1\u63D2\u5B54" isGroup: 0 - parentIndex: 7 + parentIndex: 8 spriteID: 98e19cabc64e47d46aea9ab2c329fca9 layerID: 260 - mosaicPosition: {x: 3812, y: 6530} + mosaicPosition: {x: 3973, y: 5609} flatten: 0 isImported: 1 isVisible: 1 - name: "\u76D6\u5B50\u6746" spriteName: "\u76D6\u5B50\u6746" isGroup: 0 - parentIndex: 7 + parentIndex: 8 spriteID: 7805fb4d7ed5ab3429a2316f7fd43f9e layerID: 203 - mosaicPosition: {x: 4, y: 7903} + mosaicPosition: {x: 3248, y: 5499} flatten: 0 isImported: 1 isVisible: 1 - name: "\u53D8\u901F\u7BB1\u76D6\u5B50" spriteName: "\u53D8\u901F\u7BB1\u76D6\u5B50" isGroup: 0 - parentIndex: 7 + parentIndex: 8 spriteID: ca966d50cd7e0e24386a6919795e5460 layerID: 430 - mosaicPosition: {x: 2790, y: 7105} + mosaicPosition: {x: 3453, y: 7105} flatten: 0 isImported: 1 isVisible: 1 - name: "\u53D8\u901F\u7BB1\u8F93\u5165\u9F7F\u8F6E" spriteName: "\u53D8\u901F\u7BB1\u8F93\u5165\u9F7F\u8F6E" isGroup: 0 - parentIndex: 7 + parentIndex: 8 spriteID: 725469d4c92a63f459926985c2726704 layerID: 277 - mosaicPosition: {x: 2220, y: 5499} + mosaicPosition: {x: 2910, y: 5499} flatten: 0 isImported: 1 isVisible: 1 - name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EA" spriteName: "\u53D8\u901F\u7BB1\u9F7F\u8F6EA" isGroup: 0 - parentIndex: 7 + parentIndex: 8 spriteID: c562151c266172245900603e7959a8da layerID: 287 - mosaicPosition: {x: 541, y: 8022} + mosaicPosition: {x: 4, y: 8026} flatten: 0 isImported: 1 isVisible: 1 - name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EB" spriteName: "\u53D8\u901F\u7BB1\u9F7F\u8F6EB" isGroup: 0 - parentIndex: 7 + parentIndex: 8 spriteID: 93418b50b51ddd441a424a24b868b51a layerID: 274 - mosaicPosition: {x: 3812, y: 6172} + mosaicPosition: {x: 3953, y: 7243} flatten: 0 isImported: 1 isVisible: 1 - name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EC" spriteName: "\u53D8\u901F\u7BB1\u9F7F\u8F6EC" isGroup: 0 - parentIndex: 7 + parentIndex: 8 spriteID: d5e68dcab5349504f950128fdb66696c layerID: 280 - mosaicPosition: {x: 367, y: 8022} + mosaicPosition: {x: 3799, y: 5499} flatten: 0 isImported: 1 isVisible: 1 - name: "\u53D8\u901F\u7BB1\u5531\u7247\u9F7F\u8F6E" spriteName: "\u53D8\u901F\u7BB1\u5531\u7247\u9F7F\u8F6E" isGroup: 0 - parentIndex: 7 + parentIndex: 8 spriteID: 15bb5a4be7f4d1746b0822dc05b92b5f layerID: 279 - mosaicPosition: {x: 3949, y: 7461} + mosaicPosition: {x: 3953, y: 7105} flatten: 0 isImported: 1 isVisible: 1 - name: "\u53D8\u901F\u7BB1\u8F93\u51FA\u9F7F\u8F6E" spriteName: "\u53D8\u901F\u7BB1\u8F93\u51FA\u9F7F\u8F6E" isGroup: 0 - parentIndex: 7 + parentIndex: 8 spriteID: 7e7562128bf69d7418af6bd34587198a layerID: 281 - mosaicPosition: {x: 3920, y: 6412} + mosaicPosition: {x: 4067, y: 5693} flatten: 0 isImported: 1 isVisible: 1 - name: "\u53D8\u901F\u7BB1" spriteName: "\u53D8\u901F\u7BB1" isGroup: 0 - parentIndex: 7 + parentIndex: 8 spriteID: 905674a2af97be442a16bdb7e34e5230 layerID: 249 mosaicPosition: {x: 4, y: 7105} @@ -1324,10 +1355,10 @@ ScriptedImporter: - name: "\u6CB9\u95E8" spriteName: "\u6CB9\u95E8" isGroup: 0 - parentIndex: 7 + parentIndex: 8 spriteID: be4e6d6bab42a55409387fd23e2ee32c layerID: 254 - mosaicPosition: {x: 703, y: 8022} + mosaicPosition: {x: 3907, y: 5716} flatten: 0 isImported: 1 isVisible: 1 @@ -1344,117 +1375,117 @@ ScriptedImporter: - name: "\u5FC3\u810F\u63D2\u5B54" spriteName: "\u5FC3\u810F\u63D2\u5B54" isGroup: 0 - parentIndex: 24 + parentIndex: 25 spriteID: 393fed26529755c43b3adf65c5215b60 layerID: 307 - mosaicPosition: {x: 3996, y: 5868} + mosaicPosition: {x: 3812, y: 6529} flatten: 0 isImported: 1 isVisible: 1 - name: "\u5FC3\u810F\u76D6\u5B50" spriteName: "\u5FC3\u810F\u76D6\u5B50" isGroup: 0 - parentIndex: 24 + parentIndex: 25 spriteID: 783637c73e28afc46a70e12184fba9a3 layerID: 264 - mosaicPosition: {x: 1424, y: 7641} + mosaicPosition: {x: 1428, y: 7641} flatten: 0 isImported: 1 isVisible: 1 - name: "\u55B7\u6CB9\u5EA6\u91CF" spriteName: "\u55B7\u6CB9\u5EA6\u91CF" isGroup: 0 - parentIndex: 24 + parentIndex: 25 spriteID: 955abee622701d34c92da4721f082368 layerID: 421 - mosaicPosition: {x: 1353, y: 7903} + mosaicPosition: {x: 3996, y: 6345} flatten: 0 isImported: 1 isVisible: 1 - name: "\u8FDB\u6C14\u5EA6\u91CF" spriteName: "\u8FDB\u6C14\u5EA6\u91CF" isGroup: 0 - parentIndex: 24 + parentIndex: 25 spriteID: 0c11f41444c477f4fac3222cb5b79a98 layerID: 420 - mosaicPosition: {x: 1377, y: 7903} + mosaicPosition: {x: 4020, y: 6345} flatten: 0 isImported: 1 isVisible: 1 - name: "\u6C14\u95E8\u62C9\u6746" spriteName: "\u6C14\u95E8\u62C9\u6746" isGroup: 0 - parentIndex: 24 + parentIndex: 25 spriteID: ed1ecfe628602a44285fa18ebac88553 layerID: 295 - mosaicPosition: {x: 3949, y: 7599} + mosaicPosition: {x: 3799, y: 5673} flatten: 0 isImported: 1 isVisible: 1 - name: "\u62C9\u6746\u6C60" spriteName: "\u62C9\u6746\u6C60" isGroup: 0 - parentIndex: 24 + parentIndex: 25 spriteID: 6b94d32d5c28acf489338ccdcdbff11b layerID: 298 - mosaicPosition: {x: 2202, y: 7105} + mosaicPosition: {x: 2865, y: 7105} flatten: 0 isImported: 1 isVisible: 1 - name: "\u5FC3\u810F\u9F7F\u8F6EA" spriteName: "\u5FC3\u810F\u9F7F\u8F6EA" isGroup: 0 - parentIndex: 24 + parentIndex: 25 spriteID: 446346ef83ab15c43a3d115b695a489a layerID: 446 - mosaicPosition: {x: 3928, y: 6412} + mosaicPosition: {x: 4075, y: 5693} flatten: 0 isImported: 1 isVisible: 1 - name: "\u5FC3\u810F\u9F7F\u8F6EB" spriteName: "\u5FC3\u810F\u9F7F\u8F6EB" isGroup: 0 - parentIndex: 24 + parentIndex: 25 spriteID: b20eafea4b8b8c94c89d9e5d54ae683f layerID: 445 - mosaicPosition: {x: 3936, y: 6412} + mosaicPosition: {x: 4083, y: 5693} flatten: 0 isImported: 1 isVisible: 1 - name: "\u5FC3\u810F\u9F7F\u8F6EC" spriteName: "\u5FC3\u810F\u9F7F\u8F6EC" isGroup: 0 - parentIndex: 24 + parentIndex: 25 spriteID: 4937081512344314a989a0d438fd73d3 layerID: 444 - mosaicPosition: {x: 1410, y: 8154} + mosaicPosition: {x: 4091, y: 5693} flatten: 0 isImported: 1 isVisible: 1 - name: "\u5FC3\u810F\u9F7F\u8F6ED" spriteName: "\u5FC3\u810F\u9F7F\u8F6ED" isGroup: 0 - parentIndex: 24 + parentIndex: 25 spriteID: 14aab779c58f90a40a99c1b0e02cc11c layerID: 443 - mosaicPosition: {x: 955, y: 7903} + mosaicPosition: {x: 3812, y: 5868} flatten: 0 isImported: 1 isVisible: 1 - name: "\u5FC3\u810F\u9F7F\u8F6EE" spriteName: "\u5FC3\u810F\u9F7F\u8F6EE" isGroup: 0 - parentIndex: 24 + parentIndex: 25 spriteID: a4d40b2ba111122448c31f2ea4fd4d4d layerID: 439 - mosaicPosition: {x: 1410, y: 8162} + mosaicPosition: {x: 4067, y: 5701} flatten: 0 isImported: 1 isVisible: 1 - name: "\u5FC3\u810F" spriteName: "\u5FC3\u810F" isGroup: 0 - parentIndex: 24 + parentIndex: 25 spriteID: fe0cd590855195341917906fb8d73748 layerID: 311 mosaicPosition: {x: 2220, y: 4340} @@ -1467,7 +1498,7 @@ ScriptedImporter: parentIndex: -1 spriteID: d4a3363adf457ae4aa15314d2db44ca5 layerID: 397 - mosaicPosition: {x: 1199, y: 7903} + mosaicPosition: {x: 3812, y: 6112} flatten: 0 isImported: 1 isVisible: 1 @@ -1477,7 +1508,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 2b82d9f9ac606bc46a69f1f1f2bc2fac layerID: 238 - mosaicPosition: {x: 3981, y: 6052} + mosaicPosition: {x: 3973, y: 5499} flatten: 0 isImported: 1 isVisible: 1 @@ -1497,7 +1528,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 7df889ef25dabad46bcacf053c71d0e6 layerID: 236 - mosaicPosition: {x: 3812, y: 6310} + mosaicPosition: {x: 3966, y: 6112} flatten: 0 isImported: 1 isVisible: 1 @@ -1517,7 +1548,7 @@ ScriptedImporter: parentIndex: -1 spriteID: a7f4162658d13014eb7749886a9e8c79 layerID: 237 - mosaicPosition: {x: 3812, y: 6420} + mosaicPosition: {x: 3966, y: 6222} flatten: 0 isImported: 1 isVisible: 1 diff --git a/Assets/Resources/Prefabs/Fix/Default Module.prefab b/Assets/Resources/Prefabs/Fix/Default Module.prefab new file mode 100644 index 000000000..ca24b636a --- /dev/null +++ b/Assets/Resources/Prefabs/Fix/Default Module.prefab @@ -0,0 +1,229 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1462281046183125317 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5177852888421363108} + - component: {fileID: 942590100883659357} + m_Layer: 0 + m_Name: Socket + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5177852888421363108 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1462281046183125317} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.005, y: -0.011, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7084584428788688235} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &942590100883659357 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1462281046183125317} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 9131045294461249809, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 1 +--- !u!1 &2359294975205654025 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7084584428788688235} + - component: {fileID: 6698795021239649397} + m_Layer: 0 + m_Name: Default Module + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7084584428788688235 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2359294975205654025} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1, y: 1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2560478297392028634} + - {fileID: 5177852888421363108} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6698795021239649397 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2359294975205654025} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 485fe5a69106f8146a3ef9ca070f306d, type: 3} + m_Name: + m_EditorClassIdentifier: + data: + moduleName: + modulePicPath: + modulePos: + x: 0 + y: 0 + z: 0 + socketPos: + x: 0 + y: 0 + z: 0 + waveformType: 0 + waveHasError: 0 +--- !u!1 &7933871335801960612 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2560478297392028634} + - component: {fileID: 3687148484723382491} + m_Layer: 0 + m_Name: Module Pic + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2560478297392028634 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7933871335801960612} + 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: 7084584428788688235} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3687148484723382491 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7933871335801960612} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 4 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.32, y: 1.11} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Resources/Prefabs/Fix/Default Module.prefab.meta b/Assets/Resources/Prefabs/Fix/Default Module.prefab.meta new file mode 100644 index 000000000..8ce053825 --- /dev/null +++ b/Assets/Resources/Prefabs/Fix/Default Module.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: de6db0026fa152946b2d033cd4e76b7e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Fix/Editor Mode Func.prefab b/Assets/Resources/Prefabs/Fix/Editor Mode Func.prefab new file mode 100644 index 000000000..a87869d0a --- /dev/null +++ b/Assets/Resources/Prefabs/Fix/Editor Mode Func.prefab @@ -0,0 +1,320 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1299151124194456251 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3641060396765317556} + - component: {fileID: 7836700930816346096} + - component: {fileID: 6334611288363270407} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3641060396765317556 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1299151124194456251} + 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: 7611243318142021168} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7836700930816346096 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1299151124194456251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!114 &6334611288363270407 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1299151124194456251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!1 &4214753503693131867 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7611243318142021168} + m_Layer: 0 + m_Name: Editor Mode Func + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7611243318142021168 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4214753503693131867} + 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: + - {fileID: 6120444917757515705} + - {fileID: 3641060396765317556} + - {fileID: 8556345213791081418} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8168536426589423301 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8556345213791081418} + - component: {fileID: 7037918505330246345} + - component: {fileID: 1411876041170289596} + - component: {fileID: 5795012028576405938} + - component: {fileID: 3799972374739294581} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8556345213791081418 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8168536426589423301} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7611243318142021168} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &7037918505330246345 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8168536426589423301} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!81 &1411876041170289596 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8168536426589423301} + m_Enabled: 1 +--- !u!114 &5795012028576405938 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8168536426589423301} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + quality: 3 + frameInfluence: 0.1 + jitterScale: 1 + mipBias: 0 + varianceClampScale: 0.9 + contrastAdaptiveSharpening: 0 +--- !u!114 &3799972374739294581 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8168536426589423301} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56666c5a40171f54783dd416a44f42bf, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EventMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_MaxRayIntersections: 0 +--- !u!1001 &5790406710898921353 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7611243318142021168} + m_Modifications: + - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalPosition.x + value: 8.62 + objectReference: {fileID: 0} + - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalPosition.y + value: -4.72 + objectReference: {fileID: 0} + - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6247080755836924787, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + propertyPath: m_Name + value: Audio Manager + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} +--- !u!4 &6120444917757515705 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} + m_PrefabInstance: {fileID: 5790406710898921353} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefabs/Fix/Editor Mode Func.prefab.meta b/Assets/Resources/Prefabs/Fix/Editor Mode Func.prefab.meta new file mode 100644 index 000000000..6d18999a2 --- /dev/null +++ b/Assets/Resources/Prefabs/Fix/Editor Mode Func.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 13f00ab6092291d49a9312e52873d80b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity index 8b7a091b2..4c8156c34 100644 --- a/Assets/Scenes/ExpressFixScene.unity +++ b/Assets/Scenes/ExpressFixScene.unity @@ -534,6 +534,317 @@ Material: - _ShadowColor: {r: 0, g: 0, b: 0, a: 1} - _ShineColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] +--- !u!1 &102656796 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 102656797} + - component: {fileID: 102656798} + m_Layer: 0 + m_Name: Module Pic + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &102656797 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 102656796} + 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: 1253202853} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &102656798 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 102656796} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 4 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.32, y: 1.11} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &115460344 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 115460345} + - component: {fileID: 115460346} + m_Layer: 0 + m_Name: Speed + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &115460345 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 115460344} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.743, y: 1.765, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2064668201} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &115460346 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 115460344} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: -7322283717058934520, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &126636428 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 126636429} + - component: {fileID: 126636430} + m_Layer: 0 + m_Name: Lung + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &126636429 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126636428} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.91, y: 1.84, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 280010265} + - {fileID: 989327507} + m_Father: {fileID: 477971862} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &126636430 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126636428} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 485fe5a69106f8146a3ef9ca070f306d, type: 3} + m_Name: + m_EditorClassIdentifier: + data: + moduleName: Lung + modulePicPath: + modulePos: + x: 0.91 + y: 1.84 + z: 0 + socketPos: + x: 0.005 + y: -0.011 + z: 0 + waveformType: 1 + waveHasError: 1 +--- !u!1 &129808764 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 129808765} + - component: {fileID: 129808766} + m_Layer: 0 + m_Name: Cover + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &129808765 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 129808764} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.774, y: 0.344, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2064668201} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &129808766 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 129808764} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: -6066655743044071147, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &199118572 GameObject: m_ObjectHideFlags: 0 @@ -570,68 +881,6 @@ Transform: - {fileID: 404437037} m_Father: {fileID: 657112469} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &223820135 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1874453573} - m_Modifications: - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6247080755836924787, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - propertyPath: m_Name - value: Audio Manager - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} ---- !u!4 &223820136 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 336529723513575472, guid: b8280919ceaa0a2489020c94c7376cd0, type: 3} - m_PrefabInstance: {fileID: 223820135} - m_PrefabAsset: {fileID: 0} --- !u!1 &240190234 GameObject: m_ObjectHideFlags: 0 @@ -787,6 +1036,90 @@ LineRenderer: m_UseWorldSpace: 1 m_Loop: 0 m_ApplyActiveColorSpace: 1 +--- !u!1 &280010264 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 280010265} + - component: {fileID: 280010266} + m_Layer: 0 + m_Name: Module Pic + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &280010265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 280010264} + 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: 126636429} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &280010266 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 280010264} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 4 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.32, y: 1.11} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &285714351 GameObject: m_ObjectHideFlags: 0 @@ -871,90 +1204,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &307041274 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 307041275} - - component: {fileID: 307041276} - m_Layer: 0 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &307041275 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 307041274} - 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: 1814664091} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &307041276 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 307041274} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: -3514371587045790464, guid: fd04c28739017964789d58d573f9fabb, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &312714147 GameObject: m_ObjectHideFlags: 0 @@ -1124,7 +1373,7 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 6 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &360323324 GameObject: @@ -1306,7 +1555,11 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2007869315} + - {fileID: 126636429} + - {fileID: 1894754779} + - {fileID: 779916737} + - {fileID: 1253202853} + - {fileID: 1097272285} m_Father: {fileID: 1732205055} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &514341497 @@ -1531,50 +1784,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &574939131 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 574939132} - - component: {fileID: 574939133} - m_Layer: 0 - m_Name: Mono Center - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &574939132 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 574939131} - 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: 1874453573} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &574939133 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 574939131} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 93f180e6eb06c9f40a52e2bba277fc6e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &650606349 GameObject: m_ObjectHideFlags: 0 @@ -1648,9 +1857,9 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 - m_Sprite: {fileID: 21300000, guid: fb9767dd0eb07d04ea69aecf574f37c8, type: 3} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_SortingOrder: 5 + m_Sprite: {fileID: -6727903557589621696, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 1 @@ -1709,7 +1918,7 @@ Transform: m_Children: - {fileID: 360323325} - {fileID: 199118573} - m_Father: {fileID: 1104267851} + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &657112470 SpriteRenderer: @@ -1775,8 +1984,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5489eacced0c49c4ab26308cd50fb917, type: 3} m_Name: m_EditorClassIdentifier: - _gearPrefab: {fileID: 0} - runType: 0 + gearPrefab: {fileID: 0} --- !u!1 &693951178 GameObject: m_ObjectHideFlags: 0 @@ -1804,7 +2012,7 @@ Transform: m_GameObject: {fileID: 693951178} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.62, y: 3.03, z: 0} + m_LocalPosition: {x: 6.4, y: -1.2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1854,7 +2062,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 4 m_Sprite: {fileID: 2633204686855763081, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1880,20 +2088,8 @@ MonoBehaviour: m_EditorClassIdentifier: isInDialog: 0 isActive: 1 - curSocket: {fileID: 0} - plugInEvent: - m_PersistentCalls: - m_Calls: [] - plugOutEvent: - m_PersistentCalls: - m_Calls: [] - plugStartDrag: - m_PersistentCalls: - m_Calls: [] - plugEndDrag: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &698344777 + curBodyModule: {fileID: 0} +--- !u!1 &779916736 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1901,66 +2097,57 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 698344778} - - component: {fileID: 698344780} - - component: {fileID: 698344779} + - component: {fileID: 779916737} + - component: {fileID: 779916738} m_Layer: 0 - m_Name: EventSystem + m_Name: GearBox m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &698344778 +--- !u!4 &779916737 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 698344777} + m_GameObject: {fileID: 779916736} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.11, y: 0.08, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1874453573} + m_Children: + - {fileID: 1531925311} + - {fileID: 863146182} + m_Father: {fileID: 477971862} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &698344779 +--- !u!114 &779916738 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 698344777} + m_GameObject: {fileID: 779916736} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Script: {fileID: 11500000, guid: 485fe5a69106f8146a3ef9ca070f306d, type: 3} m_Name: m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &698344780 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 698344777} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 + data: + moduleName: GearBox + modulePicPath: + modulePos: + x: -3.11 + y: 0.08 + z: 0 + socketPos: + x: 0.005 + y: -0.011 + z: 0 + waveformType: 0 + waveHasError: 0 --- !u!1 &796145091 GameObject: m_ObjectHideFlags: 0 @@ -2045,7 +2232,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &801129889 +--- !u!1 &843199596 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2053,38 +2240,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 801129890} - - component: {fileID: 801129891} - - component: {fileID: 801129892} + - component: {fileID: 843199597} + - component: {fileID: 843199598} m_Layer: 0 - m_Name: Socket + m_Name: Cover m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &801129890 +--- !u!4 &843199597 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 801129889} + m_GameObject: {fileID: 843199596} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.005, y: -0.015, z: 0} - m_LocalScale: {x: 0.32, y: 0.32, z: 0.32} - m_ConstrainProportionsScale: 1 + m_LocalPosition: {x: -0.734, y: 0.238, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2007869315} + m_Father: {fileID: 1704466888} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &801129891 +--- !u!212 &843199598 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 801129889} + m_GameObject: {fileID: 843199596} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -2119,7 +2305,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 3 - m_Sprite: {fileID: 21300000, guid: 83cee37d2be8ac244ad6900c361ef447, type: 3} + m_Sprite: {fileID: -8759480157694563036, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -2129,19 +2315,7 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 - m_SpriteSortPoint: 1 ---- !u!114 &801129892 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 801129889} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 14ffdfdc63be167489dc01c0b661c1ac, type: 3} - m_Name: - m_EditorClassIdentifier: + m_SpriteSortPoint: 0 --- !u!1 &862830872 GameObject: m_ObjectHideFlags: 0 @@ -2152,6 +2326,7 @@ GameObject: m_Component: - component: {fileID: 862830873} - component: {fileID: 862830874} + - component: {fileID: 862830875} m_Layer: 0 m_Name: Fix System Center m_TagString: Untagged @@ -2186,6 +2361,102 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1de0c108139bfab468f734b0502b1ad3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &862830875 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 862830872} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93f180e6eb06c9f40a52e2bba277fc6e, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &863146181 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 863146182} + - component: {fileID: 863146183} + m_Layer: 0 + m_Name: Socket + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &863146182 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 863146181} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.005, y: -0.011, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 779916737} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &863146183 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 863146181} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 9131045294461249809, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 1 --- !u!1 &863998404 GameObject: m_ObjectHideFlags: 0 @@ -2415,7 +2686,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &901407696 +--- !u!1 &906083738 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2423,37 +2694,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 901407697} - - component: {fileID: 901407698} + - component: {fileID: 906083739} + - component: {fileID: 906083740} m_Layer: 0 - m_Name: Interface Border + m_Name: Oil Gate m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &901407697 +--- !u!4 &906083739 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 901407696} + m_GameObject: {fileID: 906083738} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -3.12, y: 1.34, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1814664091} + m_Father: {fileID: 2064668201} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &901407698 +--- !u!212 &906083740 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 901407696} + m_GameObject: {fileID: 906083738} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -2487,8 +2758,8 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 2 - m_Sprite: {fileID: -1850603012235433780, guid: fd04c28739017964789d58d573f9fabb, type: 3} + m_SortingOrder: 3 + m_Sprite: {fileID: 6738774341365589705, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -2531,8 +2802,94 @@ Transform: - {fileID: 1950862273} - {fileID: 2133683125} - {fileID: 30335134} + - {fileID: 1704466888} + - {fileID: 2064668201} m_Father: {fileID: 1410382569} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &989327506 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 989327507} + - component: {fileID: 989327508} + m_Layer: 0 + m_Name: Socket + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &989327507 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 989327506} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.005, y: -0.011, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 126636429} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &989327508 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 989327506} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 9131045294461249809, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 1 --- !u!1 &1034942116 GameObject: m_ObjectHideFlags: 0 @@ -2605,7 +2962,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 4 m_Sprite: {fileID: 8948488549379113049, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2617,160 +2974,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1035218747 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1035218750} - - component: {fileID: 1035218749} - - component: {fileID: 1035218748} - - component: {fileID: 1035218751} - - component: {fileID: 1035218752} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1035218748 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1035218747} - m_Enabled: 1 ---- !u!20 &1035218749 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1035218747} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1035218750 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1035218747} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1874453573} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1035218751 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1035218747} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 ---- !u!114 &1035218752 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1035218747} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 56666c5a40171f54783dd416a44f42bf, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EventMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_MaxRayIntersections: 0 --- !u!1001 &1078086546 PrefabInstance: m_ObjectHideFlags: 0 @@ -2933,7 +3136,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1084505819 +--- !u!1 &1097272284 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2941,116 +3144,57 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1084505820} - - component: {fileID: 1084505821} + - component: {fileID: 1097272285} + - component: {fileID: 1097272286} m_Layer: 0 - m_Name: Head + m_Name: Stomach m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1084505820 +--- !u!4 &1097272285 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1084505819} + m_GameObject: {fileID: 1097272284} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.5, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1814664091} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1084505821 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1084505819} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 1 - m_Sprite: {fileID: 8338019933467826960, guid: d8489dc41f8c4c9479ba48d5bf39e02e, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &1104267850 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1104267851} - m_Layer: 0 - m_Name: Body Engine System - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1104267851 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1104267850} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1410382569} - - {fileID: 657112469} - - {fileID: 1112213369} - m_Father: {fileID: 0} + - {fileID: 1680152764} + - {fileID: 1775584169} + m_Father: {fileID: 477971862} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1097272286 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1097272284} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 485fe5a69106f8146a3ef9ca070f306d, type: 3} + m_Name: + m_EditorClassIdentifier: + data: + moduleName: Stomach + modulePicPath: + modulePos: + x: 1 + y: 1 + z: 0 + socketPos: + x: -4.78 + y: -4.83 + z: 0 + waveformType: 1 + waveHasError: 1 --- !u!1 &1112213368 GameObject: m_ObjectHideFlags: 0 @@ -3088,7 +3232,7 @@ Transform: - {fileID: 885292092} - {fileID: 1537489913} - {fileID: 551825977} - m_Father: {fileID: 1104267851} + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1112213370 SpriteRenderer: @@ -3171,6 +3315,90 @@ MonoBehaviour: curAirMax: 0 curAirLevel: 0 inAirRange: 0 +--- !u!1 &1167439877 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1167439878} + - component: {fileID: 1167439879} + m_Layer: 0 + m_Name: Socket + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1167439878 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167439877} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.41, y: -4.22, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1253202853} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1167439879 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167439877} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 9131045294461249809, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 1 --- !u!1 &1172578103 GameObject: m_ObjectHideFlags: 0 @@ -3255,6 +3483,149 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1195425274 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1195425275} + - component: {fileID: 1195425276} + m_Layer: 0 + m_Name: Cover Stick + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1195425275 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1195425274} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.101, y: 0.056, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2064668201} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1195425276 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1195425274} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 6 + m_Sprite: {fileID: 4022517466691586746, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1253202852 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1253202853} + - component: {fileID: 1253202854} + m_Layer: 0 + m_Name: Liver + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1253202853 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253202852} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1, y: 1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 102656797} + - {fileID: 1167439878} + m_Father: {fileID: 477971862} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1253202854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253202852} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 485fe5a69106f8146a3ef9ca070f306d, type: 3} + m_Name: + m_EditorClassIdentifier: + data: + moduleName: Liver + modulePicPath: + modulePos: + x: 1 + y: 1 + z: 0 + socketPos: + x: -0.41 + y: -4.22 + z: 0 + waveformType: 0 + waveHasError: 0 --- !u!1 &1301816244 GameObject: m_ObjectHideFlags: 0 @@ -3280,8 +3651,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1301816244} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6.13, y: 2.23, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 6.54, y: 2.45, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -3293,7 +3664,7 @@ Transform: - {fileID: 1034942117} - {fileID: 2104743874} - {fileID: 1839459966} - m_Father: {fileID: 0} + m_Father: {fileID: 1732205055} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1301816246 MonoBehaviour: @@ -3309,6 +3680,91 @@ MonoBehaviour: m_EditorClassIdentifier: isScanning: 0 isPlaying: 0 + canScan: 0 +--- !u!1 &1360578148 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1360578149} + - component: {fileID: 1360578150} + m_Layer: 0 + m_Name: Module Pic + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1360578149 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1360578148} + 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: 1894754779} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1360578150 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1360578148} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 4 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.32, y: 1.11} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1410382568 GameObject: m_ObjectHideFlags: 0 @@ -3341,7 +3797,7 @@ Transform: - {fileID: 1081346458} - {fileID: 919129558} - {fileID: 2061960537} - m_Father: {fileID: 1104267851} + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1443501785 PrefabInstance: @@ -3444,7 +3900,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.968, y: -0.039, z: 0} - m_LocalScale: {x: 0.32, y: 0.32, z: 0.32} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 693951179} @@ -3489,8 +3945,8 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 - m_Sprite: {fileID: 21300000, guid: 83cee37d2be8ac244ad6900c361ef447, type: 3} + m_SortingOrder: 4 + m_Sprite: {fileID: 9131045294461249809, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -3544,6 +4000,90 @@ Transform: m_Children: [] m_Father: {fileID: 2000626643} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1531925310 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1531925311} + - component: {fileID: 1531925312} + m_Layer: 0 + m_Name: Module Pic + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1531925311 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1531925310} + 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: 779916737} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1531925312 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1531925310} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 4 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.32, y: 1.11} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1537489912 GameObject: m_ObjectHideFlags: 0 @@ -3821,7 +4361,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 4 m_Sprite: {fileID: -4876564293708829301, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3833,6 +4373,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1680152763 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1680152764} + - component: {fileID: 1680152765} + m_Layer: 0 + m_Name: Module Pic + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1680152764 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1680152763} + 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: 1097272285} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1680152765 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1680152763} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 4 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.32, y: 1.11} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1691014402 GameObject: m_ObjectHideFlags: 0 @@ -3934,6 +4558,91 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1704466887 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1704466888} + - component: {fileID: 1704466889} + m_Layer: 0 + m_Name: Heart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1704466888 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1704466887} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.24, y: 2.48, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 843199597} + m_Father: {fileID: 919129558} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1704466889 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1704466887} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 2 + m_Sprite: {fileID: -1971700305276715936, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1732205054 GameObject: m_ObjectHideFlags: 0 @@ -3966,6 +4675,7 @@ Transform: m_Children: - {fileID: 477971862} - {fileID: 693951179} + - {fileID: 1301816245} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1732205056 @@ -3980,8 +4690,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9290bcfb4cf7b6846b60dcd0851a5091, type: 3} m_Name: m_EditorClassIdentifier: - config: - plugSnappingRange: 1 + bodyModulePrefab: {fileID: 2359294975205654025, guid: de6db0026fa152946b2d033cd4e76b7e, type: 3} + bodyModuleGroup: {fileID: 477971862} + plugInEvent: + m_PersistentCalls: + m_Calls: [] + plugOutEvent: + m_PersistentCalls: + m_Calls: [] + plugSnappingRange: 1 --- !u!1 &1735764835 GameObject: m_ObjectHideFlags: 0 @@ -4023,7 +4740,7 @@ LineRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1735764835} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -4147,7 +4864,7 @@ Transform: m_CorrespondingSourceObject: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3} m_PrefabInstance: {fileID: 514341497} m_PrefabAsset: {fileID: 0} ---- !u!1 &1814664090 +--- !u!1 &1775584168 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4155,32 +4872,82 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1814664091} + - component: {fileID: 1775584169} + - component: {fileID: 1775584170} m_Layer: 0 - m_Name: Static Pic Groups + m_Name: Socket m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1814664091 + m_IsActive: 1 +--- !u!4 &1775584169 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1814664090} + m_GameObject: {fileID: 1775584168} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.93, y: 0.93, z: 0.93} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 307041275} - - {fileID: 1084505820} - - {fileID: 901407697} - m_Father: {fileID: 0} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -4.78, y: -4.83, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1097272285} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1775584170 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1775584168} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 9131045294461249809, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 1 --- !u!1 &1839459965 GameObject: m_ObjectHideFlags: 0 @@ -4191,8 +4958,9 @@ GameObject: m_Component: - component: {fileID: 1839459966} - component: {fileID: 1839459967} + - component: {fileID: 1839459968} m_Layer: 0 - m_Name: Deep In Button + m_Name: Deepin Button m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4254,7 +5022,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 5 m_Sprite: {fileID: -1437180882204714391, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -4266,90 +5034,51 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1848534641 -GameObject: +--- !u!61 &1839459968 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1848534642} - - component: {fileID: 1848534643} - m_Layer: 0 - m_Name: Module Pic - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1848534642 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1848534641} - 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: 2007869315} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1848534643 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1848534641} + m_GameObject: {fileID: 1839459965} m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 2 - m_Sprite: {fileID: -4805805798377081046, guid: fd04c28739017964789d58d573f9fabb, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.32, y: 1.11} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.805, y: 0.56} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.805, y: 0.56} + m_EdgeRadius: 0 --- !u!1001 &1860845980 PrefabInstance: m_ObjectHideFlags: 0 @@ -4473,7 +5202,7 @@ LineRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1864728082} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -4504,9 +5233,9 @@ LineRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 959782197 - m_SortingLayer: 7 - m_SortingOrder: 8 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 6 m_Positions: - {x: 0, y: 1.25, z: 0} - {x: 0, y: -1.15, z: 0} @@ -4565,7 +5294,7 @@ LineRenderer: textureScale: {x: 1, y: 1} shadowBias: 0.5 generateLightingData: 0 - m_MaskInteraction: 1 + m_MaskInteraction: 2 m_UseWorldSpace: 0 m_Loop: 0 m_ApplyActiveColorSpace: 1 @@ -4581,41 +5310,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d539f4fdddef410c9df21320f69fe38f, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1874453572 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1874453573} - m_Layer: 0 - m_Name: Editor Mode Func - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1874453573 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1874453572} - 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: - - {fileID: 223820136} - - {fileID: 698344778} - - {fileID: 1035218750} - - {fileID: 574939132} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1888547582 PrefabInstance: m_ObjectHideFlags: 0 @@ -4698,6 +5392,65 @@ Transform: m_CorrespondingSourceObject: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3} m_PrefabInstance: {fileID: 1888547582} m_PrefabAsset: {fileID: 0} +--- !u!1 &1894754778 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1894754779} + - component: {fileID: 1894754780} + m_Layer: 0 + m_Name: Heart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1894754779 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1894754778} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.89, y: 1.44, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1360578149} + - {fileID: 1984660689} + m_Father: {fileID: 477971862} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1894754780 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1894754778} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 485fe5a69106f8146a3ef9ca070f306d, type: 3} + m_Name: + m_EditorClassIdentifier: + data: + moduleName: Heart + modulePicPath: + modulePos: + x: -3.89 + y: 1.44 + z: 0 + socketPos: + x: 0.005 + y: -0.011 + z: 0 + waveformType: 0 + waveHasError: 0 --- !u!1 &1895751249 GameObject: m_ObjectHideFlags: 0 @@ -4867,7 +5620,7 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 5 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1950862272 GameObject: @@ -4986,6 +5739,90 @@ Transform: - {fileID: 18238395} m_Father: {fileID: 1112213369} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1984660688 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1984660689} + - component: {fileID: 1984660690} + m_Layer: 0 + m_Name: Socket + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1984660689 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1984660688} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.005, y: -0.011, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1894754779} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1984660690 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1984660688} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 9131045294461249809, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 1 --- !u!1 &1987352169 GameObject: m_ObjectHideFlags: 0 @@ -4996,6 +5833,7 @@ GameObject: m_Component: - component: {fileID: 1987352170} - component: {fileID: 1987352171} + - component: {fileID: 1987352172} m_Layer: 0 m_Name: Sliding Block m_TagString: Untagged @@ -5012,7 +5850,7 @@ Transform: m_GameObject: {fileID: 1987352169} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -1.2529999, y: 0, z: 0} m_LocalScale: {x: 1, y: 1.0000001, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5058,7 +5896,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 5 m_Sprite: {fileID: 949254551526614629, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -5070,6 +5908,51 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!61 &1987352172 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1987352169} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.135, y: 0.36} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.135, y: 0.36} + m_EdgeRadius: 0 --- !u!1 &2000626642 GameObject: m_ObjectHideFlags: 0 @@ -5145,7 +6028,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 5 m_Sprite: {fileID: 21300000, guid: 6f1e19b22a956634b86a43a0ee4ae6f6, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -5204,59 +6087,6 @@ CircleCollider2D: m_Offset: {x: 0, y: 0} serializedVersion: 2 m_Radius: 0.5 ---- !u!1 &2007869314 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2007869315} - - component: {fileID: 2007869316} - m_Layer: 0 - m_Name: Default Module - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2007869315 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2007869314} - 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: - - {fileID: 1848534642} - - {fileID: 801129890} - m_Father: {fileID: 477971862} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2007869316 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2007869314} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 485fe5a69106f8146a3ef9ca070f306d, type: 3} - m_Name: - m_EditorClassIdentifier: - moduleData: - waveformType: 0 - modulePicList: [] - modulePos: {x: 0, y: 0, z: 0} - isPlugIn: 0 - isFirstPlugIn: 0 - curCommandType: --- !u!1 &2061960536 GameObject: m_ObjectHideFlags: 0 @@ -5329,12 +6159,100 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 4 m_Sprite: {fileID: -6697397389460088483, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 + m_Size: {x: 19.2, y: 10.8} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &2064668200 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2064668201} + - component: {fileID: 2064668202} + m_Layer: 0 + m_Name: Gear Box + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2064668201 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2064668200} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.414, y: -0.726, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1195425275} + - {fileID: 129808765} + - {fileID: 906083739} + - {fileID: 115460345} + m_Father: {fileID: 919129558} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2064668202 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2064668200} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 3 + m_Sprite: {fileID: 3788501556435333283, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 @@ -5417,7 +6335,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 5 m_Sprite: {fileID: 2507139957111385121, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -5525,13 +6443,70 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &9210352354887959608 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4214753503693131867, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} + propertyPath: m_Name + value: Editor Mode Func + objectReference: {fileID: 0} + - target: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 862830873} - {fileID: 1732205055} - - {fileID: 1301816245} - - {fileID: 1814664091} - - {fileID: 1104267851} - - {fileID: 1874453573} + - {fileID: 1410382569} + - {fileID: 657112469} + - {fileID: 1112213369} + - {fileID: 9210352354887959608} diff --git a/Assets/Scripts/Dialog System/DialogController.cs b/Assets/Scripts/Dialog System/DialogController.cs index ca19d7316..bc3b83a4f 100644 --- a/Assets/Scripts/Dialog System/DialogController.cs +++ b/Assets/Scripts/Dialog System/DialogController.cs @@ -13,7 +13,7 @@ namespace AibisDream public class DialogController : Singleton { private const string BookManager = "BookManager"; - + private DialogueRunner dialogueRunner; private VariableStorageBehaviour _variableStorage; @@ -41,20 +41,17 @@ namespace AibisDream OnDialogueComplete?.Invoke(); } } - get - { - return _isTalking; - } + get { return _isTalking; } } // 对话框被阻塞时不能继续对话框交互 public bool IsBlock { get; private set; } public bool quickRunMode; - + // 暂停对话 public bool isInPause; - + # endregion public static UnityAction OnDialogueStart; @@ -70,8 +67,16 @@ namespace AibisDream bookManager.OnBookClosed += () => { IsBlock = false; }; bookManager.OnBookOpen += () => { IsBlock = true; }; - dialogueRunner.onDialogueStart.AddListener(() => { OnDialogueStart?.Invoke(); IsTalking = true;}); - dialogueRunner.onDialogueComplete.AddListener(() => { OnDialogueComplete?.Invoke(); IsTalking = false;}); + dialogueRunner.onDialogueStart.AddListener(() => + { + OnDialogueStart?.Invoke(); + IsTalking = true; + }); + dialogueRunner.onDialogueComplete.AddListener(() => + { + OnDialogueComplete?.Invoke(); + IsTalking = false; + }); //dialogueRunner.AddCommandListener(_ => { IsTalking = false; }); // 对话结束时切下一个SO @@ -116,31 +121,28 @@ namespace AibisDream dialogueRunner.SetProject(yarnProject); dialogueRunner.StartDialogue("Start"); } + public void StartDialogNode(string nodeName) { - if(CheckIfNodeExistInCurrentYarnProject(nodeName)) - { - dialogueRunner.StartDialogue(nodeName); - - } - + if (CheckIfNodeExistInCurrentYarnProject(nodeName)) + { + dialogueRunner.StartDialogue(nodeName); + } } public bool CheckIfNodeExistInCurrentYarnProject(string nodeName) { YarnProject currentProject = dialogueRunner.yarnProject; string[] nodeNames = currentProject.NodeNames; - if (Array.Exists(nodeNames, name => name == nodeName)) + if (Array.Exists(nodeNames, item => item == nodeName)) { return true; - } else { Debug.Log($"节点 {nodeName} 不存在!"); return false; - } - + } } #region 选项指令 @@ -225,7 +227,7 @@ namespace AibisDream Debug.LogWarning($"命令 {commandName} 不存在"); } } - + /// /// 注册暂停命令 /// @@ -258,15 +260,14 @@ namespace AibisDream } #endregion - + #region 命令名 - [YarnCommand("NextYarn")] public static void NextYarn() { - DialogController.Instance.StartCoroutine(GameLoopManager.Instance.NextSceneSo()); + DialogController.Instance.StartCoroutine(GameLoopManager.Instance.NextSceneSo()); } [YarnCommand("switch_tv")] @@ -316,7 +317,6 @@ namespace AibisDream // { // return MainSceneController.Instance.MoveToFix(); // } - [YarnCommand("load_scene")] public static IEnumerator LoadScene(string sceneName, float duration = 1) { @@ -328,7 +328,7 @@ namespace AibisDream DialogCanvasManager.Instance.SwitchDialogView(sceneName == "ClinicScene" ? DialogViewType.Bubble : DialogViewType.OldBox); - if(sceneName=="ClinicScene") + if (sceneName == "ClinicScene") { AudioManager.PlayAmb1Audio("amb_room"); } @@ -336,8 +336,8 @@ namespace AibisDream { AudioManager.PlayAmb1Audio("amb_main"); } - AudioManager.PlayAmb2Audio("amb_general"); + AudioManager.PlayAmb2Audio("amb_general"); } [YarnCommand("unload_scene")] diff --git a/Assets/Scripts/FixSystemNew/BaseSocket.cs b/Assets/Scripts/FixSystemNew/BaseSocket.cs new file mode 100644 index 000000000..fe438c14e --- /dev/null +++ b/Assets/Scripts/FixSystemNew/BaseSocket.cs @@ -0,0 +1,30 @@ +using UnityEngine; + +namespace AibisDream.FixSystem +{ + public interface ISocket + { + public void PlugIn(); + public void PlugOut(); + public Vector3 GetSocketPos(); + } + + public class BaseSocket : MonoBehaviour, ISocket + { + public void PlugIn() + { + Debug.Log("Plug Back InitSocket"); + } + + public void PlugOut() + { + Debug.Log("Plug Out InitSocket"); + } + + public Vector3 GetSocketPos() + { + return transform.position; + } + } +} + diff --git a/Assets/Scripts/FixSystemNew/Socket.cs.meta b/Assets/Scripts/FixSystemNew/BaseSocket.cs.meta similarity index 100% rename from Assets/Scripts/FixSystemNew/Socket.cs.meta rename to Assets/Scripts/FixSystemNew/BaseSocket.cs.meta diff --git a/Assets/Scripts/FixSystemNew/BodyModule.cs b/Assets/Scripts/FixSystemNew/BodyModule.cs index 2aa536dd5..679d82a29 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule.cs @@ -1,32 +1,22 @@ using System; -using System.Collections.Generic; +using AibisDream.Framework; +using Newtonsoft.Json; using UnityEngine; namespace AibisDream.FixSystem { - public class BodyModule : MonoBehaviour + public class BodyModule : MonoBehaviour, ISocket { #region 组件引用 private const string SocketObjName = "Socket"; - public Socket Socket { get; private set; } + private const string ModulePicName = "Module Pic"; + private Transform _socketPos; #endregion - public Vector3 SocketPos => Socket.transform.position; - // 模块基本数据 - [SerializeField] public BodyModuleData moduleData; - - public ISocketCommand curPlugInCommand; - - #region Module状态 - - public bool isPlugIn; - public bool isFirstPlugIn; - public string curCommandType; - - #endregion + [SerializeField] public BodyModuleData data; private void Awake() { @@ -36,24 +26,123 @@ namespace AibisDream.FixSystem private void InitReference() { - Socket = transform.Find(SocketObjName).GetComponent(); + _socketPos = transform.Find(SocketObjName); } + #region 插槽功能 + public void PlugIn() { - + // 插入后先播放wave + ShowWave(); + // 然后触发Yarn节点 + // DialogController.Instance.StartDialogNode(data.PlugInNodeName); } + + public void PlugOut() + { + // 先关闭wave + CloseWave(); + // TODO 触发Yarn节点(似乎目前没有拔出对话?) + } + + public void DeepIn() + { + if (!data.waveHasError) return; + // 如果有错误并且已经深入了 + DialogController.Instance.StartDialogNode(data.DeepInNodeName); + } + + private void CloseWave() + { + FixSystemCenter.SystemDic.Get().StopWave(); + } + + private void ShowWave() + { + FixSystemCenter.SystemDic.Get().PlayWave(data.waveformType, data.waveHasError); + } + + public Vector3 GetSocketPos() + { + return _socketPos.position; + } + + #endregion + + #region 模块数据保存与卸载 + + public void Load(BodyModuleData newData) + { + var modulePic = transform.Find(ModulePicName).GetComponent(); + var socketPos = transform.Find(SocketObjName); + + gameObject.name = newData.moduleName; + // 初始化位置与外形 + transform.localPosition = newData.ModulePos; + modulePic.sprite = newData.ModulePic; + socketPos.localPosition = newData.SocketPos; + // 数据同步 + data = newData; + } + + public BodyModuleData Save() + { + var modulePic = transform.Find(ModulePicName).GetComponent(); + var socketPos = transform.Find(SocketObjName); + + return new BodyModuleData + { + moduleName = data.moduleName, + modulePicPath = ResourceKit.SavePsdSprite(modulePic.sprite), + ModulePos = transform.localPosition, + SocketPos = socketPos.localPosition, + waveformType = data.waveformType, + waveHasError = data.waveHasError + }; + } + + #endregion } [Serializable] public struct BodyModuleData { + public const string PlugInNodeTemplate = "{0}PlugIn"; + public const string DeepInTemplate = "{0}DeepIn"; + + // ID + public string moduleName; + + // 外形信息 + public string modulePicPath; + public SerializableVector3 modulePos; + public SerializableVector3 socketPos; + + // 功能信息 public WaveformType waveformType; - - + public bool waveHasError; - public List modulePicList; + // 只读 + [JsonIgnore] public string PlugInNodeName => string.Format(PlugInNodeTemplate, moduleName); + [JsonIgnore] public string DeepInNodeName => string.Format(DeepInTemplate, moduleName); - public Vector3 modulePos; + [JsonIgnore] + public Sprite ModulePic => + !string.IsNullOrEmpty(modulePicPath) ? ResourceKit.LoadSpriteFromPsd(modulePicPath) : null; + + [JsonIgnore] + public Vector3 ModulePos + { + get => modulePos.ToVector3(); + set => modulePos = new SerializableVector3(value); + } + + [JsonIgnore] + public Vector3 SocketPos + { + get => socketPos.ToVector3(); + set => socketPos = new SerializableVector3(value); + } } } \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/BodyModuleSystem.cs b/Assets/Scripts/FixSystemNew/BodyModuleSystem.cs index d66a7b8e2..9eb5a6178 100644 --- a/Assets/Scripts/FixSystemNew/BodyModuleSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModuleSystem.cs @@ -1,30 +1,40 @@ -using System; +using System.Linq; +using AibisDream.Framework; +using AibisDream.Kit; +using AibisDream.Utility; using UnityEngine; using UnityEngine.Events; namespace AibisDream.FixSystem { - public class BodyModuleSystem : MonoBehaviour + public class BodyModuleSystem : SystemHasData { + public static string DataPath = Application.streamingAssetsPath + "/LevelData/BodyModuleSystem/"; + #region 内部索引 public BodyModule[] BodyModules { get; private set; } public CableSystem CableSystem { get; private set; } + public GameObject bodyModulePrefab; + public Transform bodyModuleGroup; #endregion - #region 对外暴露事件 + #region 数据保存相关 - public UnityEvent PlugInEvent => CableSystem.plugInEvent; - public UnityEvent PlugOutEvent => CableSystem.plugOutEvent; + public override string CurDataKey { get; set; } + private string[] _keyOptions; - public UnityEvent PlugStartDrag => CableSystem.plugStartDrag; - public UnityEvent PlugEndDrag => CableSystem.plugEndDrag; - #endregion - - [SerializeField] - public BodyModuleSystemConfig config = BodyModuleSystemConfig.GeneDefaultConfig(); + + #region 事件 + + [HideInInspector] public UnityEvent plugInEvent; + [HideInInspector] public UnityEvent plugOutEvent; + + #endregion + + [SerializeField] public float plugSnappingRange = 1f; private void Awake() { @@ -36,6 +46,8 @@ namespace AibisDream.FixSystem // 处理内部索引 BodyModules = transform.GetComponentsInChildren(); CableSystem = transform.Find("Cable System").GetComponent(); + bodyModuleGroup = transform.Find("Body Module Group"); + FixSystemCenter.SystemDic.Register(this); } @@ -49,11 +61,11 @@ namespace AibisDream.FixSystem { var closestDistance = Mathf.Infinity; BodyModule closestModule = null; - + // 寻找最接近的BodyModule foreach (var bodyModule in BodyModules) { - float tempDistance = Vector3.Distance(sourcePos, bodyModule.SocketPos); + float tempDistance = Vector3.Distance(sourcePos, bodyModule.GetSocketPos()); if (tempDistance < closestDistance) { @@ -61,9 +73,9 @@ namespace AibisDream.FixSystem closestModule = bodyModule; } } - + // 判断距离是否在目标范围内,在的话就返回,不在的话返回个空的 - if (closestDistance < config.plugSnappingRange && closestModule) + if (closestDistance < plugSnappingRange && closestModule) { targetModule = closestModule; return true; @@ -74,7 +86,111 @@ namespace AibisDream.FixSystem return false; } } - + + /// + /// 深入检查 + /// + public void HandleDeepIn() + { + if (CableSystem.curBodyModule) + { + CableSystem.curBodyModule.DeepIn(); + } + } + + #region 数据加载与保存 + + public override string[] GetDataKeyOptions() + { + return _keyOptions ??= ConfigUtil.Instance.GetFileNames(DataPath); + } + + public override void Load() + { + if (string.IsNullOrEmpty(CurDataKey)) + { + Debug.Log("配置项名称为空"); + return; + } + + string formattedKey = JsonUtil.FormatAsJsonPath(CurDataKey); + if (!ConfigUtil.Instance.TryLoadConfig(DataPath + formattedKey, + out var data)) + { + Debug.Log("没有找到配置项"); + return; + } + +#if UNITY_EDITOR + // 现将当前配置保存为temp避免丢失 + if (CurDataKey != "temp.json") + { + SaveByKey("temp.json"); + } +#endif + + // 加载数据 + LoadData(data); + } + + private void LoadData(BodyModuleSystemData systemData) + { + var oldModules = GetComponentsInChildren(); + // 先销毁旧的Module + foreach (var oldModule in oldModules) + { +#if UNITY_EDITOR + DestroyImmediate(oldModule.gameObject); +#else + Destory(oldModule); +#endif + } + + // 再加载新的Module + foreach (var newModuleData in systemData.moduleDataArray) + { + BodyModule newModule = Instantiate(bodyModulePrefab, bodyModuleGroup).GetComponent(); + newModule.Load(newModuleData); + } + } + + public override void Save() + { + if (string.IsNullOrEmpty(CurDataKey)) return; + + SaveByKey(CurDataKey); + if (!_keyOptions.Contains(CurDataKey)) + { + // 重新读取key + _keyOptions = ConfigUtil.Instance.GetFileNames(DataPath); + } + } + + private void SaveByKey(string key) + { + var oldModules = GetComponentsInChildren(); + var moduleDataArray = new BodyModuleData[oldModules.Length]; + for (int i = 0; i < oldModules.Length; i++) + { + moduleDataArray[i] = oldModules[i].Save(); + } + + var systemData = new BodyModuleSystemData + { + moduleDataArray = moduleDataArray + }; + + string formattedKey = JsonUtil.FormatAsJsonPath(key); + ConfigUtil.Instance.SaveConfig(systemData, DataPath + formattedKey); + } + + public void AddBodyModule() + { + Instantiate(bodyModulePrefab, bodyModuleGroup); + } + + #endregion + /// /// 插线系统是否插在插槽里 /// @@ -83,20 +199,10 @@ namespace AibisDream.FixSystem { return CableSystem.curSocket != null; } - - [Serializable] - public struct BodyModuleSystemConfig - { - public float plugSnappingRange; - - public static BodyModuleSystemConfig GeneDefaultConfig() - { - return new BodyModuleSystemConfig - { - plugSnappingRange = 1f - }; - } - } } -} + public struct BodyModuleSystemData + { + public BodyModuleData[] moduleDataArray; + } +} \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/CableSystem.cs b/Assets/Scripts/FixSystemNew/CableSystem.cs index b30987d3d..986bf1480 100644 --- a/Assets/Scripts/FixSystemNew/CableSystem.cs +++ b/Assets/Scripts/FixSystemNew/CableSystem.cs @@ -1,5 +1,4 @@ -using System; -using UnityEngine; +using UnityEngine; using UnityEngine.Events; using Yarn.Unity; @@ -12,7 +11,7 @@ namespace AibisDream.FixSystem public Plug PlugRef { get; private set; } public Cable CableRef { get; private set; } public Transform CableRootPos { get; private set; } - public Socket InitSocket { get; private set; } + public ISocket InitSocket { get; private set; } public BodyModuleSystem BodyModuleSystem { get; private set; } @@ -23,21 +22,10 @@ namespace AibisDream.FixSystem public bool isInDialog = false; public bool isActive = true; - [HideInInspector] public Socket curSocket; + [HideInInspector] public ISocket curSocket; + [HideInInspector] public BodyModule curBodyModule; #endregion - - #region 事件 - - public UnityEvent plugInEvent; - public UnityEvent plugOutEvent; - - public UnityEvent plugStartDrag; - public UnityEvent plugEndDrag; - - #endregion - - public Vector3 InitSocketPos => InitSocket.transform.position; private void Awake() { @@ -66,7 +54,7 @@ namespace AibisDream.FixSystem PlugRef = transform.Find("Plug").GetComponent(); CableRef = transform.Find("Cable").GetComponent(); CableRootPos = transform.Find("Cable Root Pos").transform; - InitSocket = transform.Find("Init Socket").GetComponent(); + InitSocket = transform.Find("Init Socket").GetComponent(); BodyModuleSystem = transform.parent.GetComponent(); } diff --git a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs index d655865cb..fe30b6540 100644 --- a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs +++ b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs @@ -1,4 +1,3 @@ -using System; using AibisDream.Framework; using UnityEngine; diff --git a/Assets/Scripts/FixSystemNew/FixYarnCommandEx.cs b/Assets/Scripts/FixSystemNew/FixYarnCommandEx.cs new file mode 100644 index 000000000..33c412185 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/FixYarnCommandEx.cs @@ -0,0 +1,45 @@ +using UnityEngine; +using Yarn.Unity; + +namespace AibisDream.FixSystem +{ + public static class FixYarnCommandEx + { + [YarnCommand("start_system")] + public static void StartSystem(string systemName, string dataKey) + { + switch (systemName) + { + case "BodyModuleSystem": + StartBodyModuleSystem(dataKey); + break; + case "GearSystem": + StartGearSystem(dataKey); + break; + case "EngineSystem": + StartGearSystem(dataKey); + break; + default: + Debug.Log($"该系统不存在: {systemName}"); + break; + } + } + + private static void StartBodyModuleSystem(string dataKey) + { + var bodySystem = FixSystemCenter.SystemDic.Get(); + bodySystem.CurDataKey = dataKey; + bodySystem.Load(); + } + + private static void StartGearSystem(string dataKey) + { + var gearSystem = FixSystemCenter.SystemDic.Get(); + } + + private static void StartEngineSystem(string dataKey) + { + var engineSystem = FixSystemCenter.SystemDic.Get(); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/FixYarnCommandEx.cs.meta b/Assets/Scripts/FixSystemNew/FixYarnCommandEx.cs.meta new file mode 100644 index 000000000..9a7d138b4 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/FixYarnCommandEx.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 03e3e3472f5f40a8a9e93b5c793591d4 +timeCreated: 1732917739 \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/OscilloscopeSystem.cs b/Assets/Scripts/FixSystemNew/OscilloscopeSystem.cs index b6a50dc5d..ccd9ed3bb 100644 --- a/Assets/Scripts/FixSystemNew/OscilloscopeSystem.cs +++ b/Assets/Scripts/FixSystemNew/OscilloscopeSystem.cs @@ -1,5 +1,7 @@ -using TMPro; +using AibisDream.Utility; +using TMPro; using UnityEngine; +using Random = UnityEngine.Random; namespace AibisDream.FixSystem { @@ -12,6 +14,7 @@ namespace AibisDream.FixSystem private ScanLine _scanLine; private SpriteRenderer _screen; private WaveSlider _waveSlider; + private SpriteButton _deepinButton; #endregion @@ -19,6 +22,7 @@ namespace AibisDream.FixSystem public bool isScanning; public bool isPlaying; + public bool canScan; #endregion @@ -35,10 +39,19 @@ namespace AibisDream.FixSystem _scanLine = transform.Find("Scan Line").GetComponent(); _screen = transform.Find("Screen").GetComponent(); _waveSlider = transform.Find("Wave Slider").GetComponent(); + _deepinButton = new SpriteButton(transform.Find("Deepin Button").gameObject, false); _waveformLine.SetLineSize(_screen.bounds.size.x, _screen.bounds.size.y); _scanLine.SetScreenSize(_screen.bounds.size.x, _screen.bounds.size.y); _screenText.text = ""; + + _deepinButton.OnButtonDown += StartScan; + _scanLine.ScanErrorEvent += OnScanSuccess; + } + + private void Update() + { + _deepinButton.CheckButtonClick(); } #region 对外开放 @@ -52,6 +65,8 @@ namespace AibisDream.FixSystem { _waveSlider.InitSlider(); isPlaying = true; + canScan = hasError; + _deepinButton.SetActive(canScan); var initialRandomPhase = Mathf.PI * Random.Range(7, 13) * 0.1f; _waveformLine.PlayWave(waveformType, initialRandomPhase, hasError); @@ -63,6 +78,9 @@ namespace AibisDream.FixSystem public void StopWave() { isPlaying = false; + canScan = false; + isScanning = false; + _deepinButton.SetActive(false); _waveSlider.InitSlider(); _waveformLine.StopWave(); @@ -85,9 +103,20 @@ namespace AibisDream.FixSystem /// public void StartScan() { + if (!canScan) return; + float spikeX = _waveformLine.GetSpikeX(); StartCoroutine(_scanLine.ScanForError(spikeX)); } + + /// + /// 扫描成功后 + /// + public void OnScanSuccess() + { + FixSystemCenter.SystemDic.Get().HandleDeepIn(); + _ = CommonUtil.Delay(2000, StopWave); + } /// /// 显示消息 diff --git a/Assets/Scripts/FixSystemNew/Plug.cs b/Assets/Scripts/FixSystemNew/Plug.cs index dfd5e0a2f..218c28588 100644 --- a/Assets/Scripts/FixSystemNew/Plug.cs +++ b/Assets/Scripts/FixSystemNew/Plug.cs @@ -38,7 +38,7 @@ namespace AibisDream.FixSystem _plugRootPos = transform.Find("Plug Root Pos"); } - public void InitPlug(Socket initSocket) + public void InitPlug(ISocket initSocket) { InsertSocket(initSocket); } @@ -47,10 +47,10 @@ namespace AibisDream.FixSystem /// 插入某个socket /// /// 目标socket - private void InsertSocket(Socket targetSocket) + private void InsertSocket(ISocket targetSocket) { // 修改插头位置 - transform.position = targetSocket.transform.position; + transform.position = targetSocket.GetSocketPos(); _cableSystem.CableRef.SetEndPos(transform); // 处理插槽插入 @@ -59,9 +59,13 @@ namespace AibisDream.FixSystem _sprite.enabled = false; // 触发事件 - _cableSystem.plugInEvent?.Invoke(targetSocket); + _cableSystem.BodyModuleSystem.plugInEvent?.Invoke(targetSocket); _cableSystem.curSocket = targetSocket; + if (targetSocket is BodyModule bodyModule) + { + _cableSystem.curBodyModule = bodyModule; + } } /// @@ -76,8 +80,10 @@ namespace AibisDream.FixSystem AudioManager.RandomPlayInteraction("plug_out"); _sprite.enabled = true; // 触发事件 - _cableSystem.plugOutEvent?.Invoke(_cableSystem.curSocket); + _cableSystem.BodyModuleSystem.plugOutEvent?.Invoke(_cableSystem.curSocket); + + _cableSystem.curBodyModule = null; _cableSystem.curSocket = null; } @@ -89,9 +95,6 @@ namespace AibisDream.FixSystem // 未被拖拽也返回 if (!_isDragging) return; - // 这一行感觉不需要,毕竟传递的是引用 - // _cableSystem.CableRef.SetEndPos(transform); - transform.position = CommonUtil.GetMouseWorldPos(eventData.position, transform); } @@ -103,8 +106,7 @@ namespace AibisDream.FixSystem // 开启拖拽 _isDragging = true; // 进行插拔动作 - if (_cableSystem.curSocket) PullUpSocket(); - _cableSystem.plugStartDrag?.Invoke(); + if (_cableSystem.curSocket != null) PullUpSocket(); // 调整插头形状 AdjustPlugPos(); @@ -122,16 +124,14 @@ namespace AibisDream.FixSystem if (_cableSystem.TryFindClosestModule(transform.position, out var targetModule)) { // 找到了就插入目标Module - InsertSocket(targetModule.Socket); - _cableSystem.plugEndDrag?.Invoke(); + InsertSocket(targetModule); } else { // 没找到就插回初始Socket,需要播动画 - transform.DOMove(_cableSystem.InitSocketPos, 0.1f).OnComplete(() => + transform.DOMove(_cableSystem.InitSocket.GetSocketPos(), 0.1f).OnComplete(() => { InsertSocket(_cableSystem.InitSocket); - _cableSystem.plugEndDrag?.Invoke(); }); } } diff --git a/Assets/Scripts/FixSystemNew/ScanLine.cs b/Assets/Scripts/FixSystemNew/ScanLine.cs index 262185089..413457ae9 100644 --- a/Assets/Scripts/FixSystemNew/ScanLine.cs +++ b/Assets/Scripts/FixSystemNew/ScanLine.cs @@ -22,7 +22,7 @@ namespace AibisDream.FixSystem private const float ScanSpeed = 2f; - private event Action ScanErrorEvent; + public event Action ScanErrorEvent; #endregion @@ -34,6 +34,8 @@ namespace AibisDream.FixSystem private void InitComponentRefs() { _line = GetComponent(); + _line.enabled = false; + _line.positionCount = 2; } public IEnumerator ScanForError(float spikeX) @@ -108,11 +110,11 @@ namespace AibisDream.FixSystem public void SetScreenSize(float width, float height) { - _screenLeftX = transform.position.x - width / 2; - _screenRightX = transform.position.x + width / 2; + _screenLeftX = - width / 2; + _screenRightX = width / 2; - _topY = transform.position.y + height / 2; - _bottomY = transform.position.y - height / 2; + _topY = height / 2; + _bottomY = - height / 2; } } } \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/Socket.cs b/Assets/Scripts/FixSystemNew/Socket.cs deleted file mode 100644 index 6abe89762..000000000 --- a/Assets/Scripts/FixSystemNew/Socket.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace AibisDream.FixSystem -{ - public interface ISocket - { - public bool IsAvailable { get; } - - public void PlugIn(); - public void PlugOut(); - } - - public class Socket : MonoBehaviour, ISocket - { - private BodyModule _bodyModule; - public bool IsAvailable { get; private set; } - - public void PlugIn() - { - Debug.Log("Plug In"); - } - - public void PlugOut() - { - Debug.Log("Plug Out"); - } - } -} - diff --git a/Assets/Scripts/FixSystemNew/SocketCommand.cs b/Assets/Scripts/FixSystemNew/SocketCommand.cs deleted file mode 100644 index 761ec6cb4..000000000 --- a/Assets/Scripts/FixSystemNew/SocketCommand.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; - -namespace AibisDream.FixSystem -{ - public interface ISocketCommand - { - void Execute(); - void ShowWave(); - void HandleDeepIn(); - bool CanDeepIn(); - } - - // public class CommandFactory - // { - // public ICommand CreateCommand(string commandType) - // { - // return new EyeCommand(); - // } - // } - - public abstract class AbsSocketCommand : ISocketCommand - { - public bool canDeepIn; - public bool isFirstPlugIn; - - public string moduleName; - public string firstPlugYarnNode; - public string repeatPlugYarnNode; - - public WaveformType waveformType; - - public void Execute() - { - ShowWave(); - DialogController.Instance.StartDialogNode(isFirstPlugIn ? firstPlugYarnNode : repeatPlugYarnNode); - if (isFirstPlugIn) isFirstPlugIn = false; - } - - public void ShowWave() - { - throw new NotImplementedException(); - } - - public void HandleDeepIn() - { - throw new NotImplementedException(); - } - - public bool CanDeepIn() - { - throw new NotImplementedException(); - } - } - - [Serializable] - public class EngineSocketCommand : ISocketCommand - { - public bool canDeepIn; - - public void Execute() - { - throw new NotImplementedException(); - } - - public void ShowWave() - { - throw new NotImplementedException(); - } - - public void HandleDeepIn() - { - throw new NotImplementedException(); - } - - /// - /// 是否可以进行深入 - /// - /// - public bool CanDeepIn() - { - return canDeepIn; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/SocketCommand.cs.meta b/Assets/Scripts/FixSystemNew/SocketCommand.cs.meta deleted file mode 100644 index d05e5eb81..000000000 --- a/Assets/Scripts/FixSystemNew/SocketCommand.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 039e28e566264ed8b8b4e5acbae0376a -timeCreated: 1732714359 \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/WaveSlider.cs b/Assets/Scripts/FixSystemNew/WaveSlider.cs index 56ddf291e..0bbd86514 100644 --- a/Assets/Scripts/FixSystemNew/WaveSlider.cs +++ b/Assets/Scripts/FixSystemNew/WaveSlider.cs @@ -1,5 +1,4 @@ -using System; -using UnityEngine; +using UnityEngine; namespace AibisDream.FixSystem { @@ -23,8 +22,10 @@ namespace AibisDream.FixSystem private Vector2 _startPos; private Vector2 _endPos; + + private float _value; + private bool _isDragging; - public float Value { get; private set; } private void Awake() { @@ -39,6 +40,7 @@ namespace AibisDream.FixSystem _startPos = new Vector2(startTrans.position.x, startTrans.position.y); _endPos = new Vector2(endTrans.position.x, endTrans.position.y); + InitSlider(); } public void InitSlider() @@ -50,25 +52,57 @@ namespace AibisDream.FixSystem { if (OscilloscopeSystem.isScanning) return; - if (Input.GetMouseButton(0)) + if (Input.GetMouseButtonDown(0)) { - Vector2 mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition); - var clampedX = Mathf.Clamp(mousePos.x, _startPos.x, _endPos.x); - _slider.position = new Vector3(clampedX, _slider.position.y, _slider.position.z); - - // 计算滑块在轨道上的比例 - var curValue = (clampedX - _startPos.x) / (_endPos.x - _startPos.x); - UpdateValue(curValue); + OnMouseButtonDown(); } + + if (Input.GetMouseButtonUp(0)) + { + OnMouseButtonUp(); + } + + if (_isDragging) + { + OnDragging(); + } + } + + private void OnMouseButtonDown() + { + // 检测鼠标是否点击在滑块上 + Vector2 mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition); + Collider2D hitCollider = Physics2D.OverlapPoint(mousePos); + + if (hitCollider && hitCollider.transform == _slider) + { + _isDragging = true; + } + } + + private void OnMouseButtonUp() + { + _isDragging = false; + } + + private void OnDragging() + { + Vector2 mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition); + float clampedX = Mathf.Clamp(mousePos.x, _startPos.x, _endPos.x); + _slider.position = new Vector3(clampedX, _slider.position.y, _slider.position.z); + + // 计算滑块在轨道上的比例 + var curValue = (clampedX - _startPos.x) / (_endPos.x - _startPos.x); + UpdateValue(curValue); } private void UpdateValue(float curValue) { - if (!Mathf.Approximately(curValue, Value)) + if (!Mathf.Approximately(curValue, _value)) { // 如果相位有更新,就同步给波形 OscilloscopeSystem.AdjustPhaseShift(curValue); - Value = curValue; + _value = curValue; } } } diff --git a/Assets/Scripts/FixSystemNew/WaveformLine.cs b/Assets/Scripts/FixSystemNew/WaveformLine.cs index 6833ebbcb..cd555a205 100644 --- a/Assets/Scripts/FixSystemNew/WaveformLine.cs +++ b/Assets/Scripts/FixSystemNew/WaveformLine.cs @@ -323,7 +323,7 @@ namespace AibisDream.FixSystem /// 相位 public void AdjustPhaseShift(float phaseShift) { - _waveParam.varPhaseShift = phaseShift; + _waveParam.varPhaseShift = phaseShift * 2 * Mathf.PI; } #endregion diff --git a/Assets/Scripts/Framework/Config/ConfigUtil.cs b/Assets/Scripts/Framework/Config/ConfigUtil.cs index 3d5a8ebf8..1d8fa6b65 100644 --- a/Assets/Scripts/Framework/Config/ConfigUtil.cs +++ b/Assets/Scripts/Framework/Config/ConfigUtil.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using AibisDream.Utility; using UnityEngine; @@ -139,5 +140,27 @@ namespace AibisDream.Kit { JsonUtil.SaveBean(bean, key, path); } + + /// + /// 查询某个文件夹下的所有文件 + /// + /// + /// + /// + public string[] GetFileNames(string folderPath) + { + if (!Directory.Exists(folderPath)) + { + return Array.Empty(); // 如果目录不存在,返回空数组 + } + + // 获取所有 .json 文件的完整路径 + string[] filePaths = Directory.GetFiles(folderPath, "*.json"); + + // 提取文件名(不包括路径) + string[] fileNames = filePaths.Select(Path.GetFileName).ToArray(); + + return fileNames; + } } } \ No newline at end of file diff --git a/Assets/Scripts/Framework/Config/SerializableVector3.cs b/Assets/Scripts/Framework/Config/SerializableVector3.cs new file mode 100644 index 000000000..20c495c8e --- /dev/null +++ b/Assets/Scripts/Framework/Config/SerializableVector3.cs @@ -0,0 +1,21 @@ +using UnityEngine; + +[System.Serializable] +public struct SerializableVector3 +{ + public float x; + public float y; + public float z; + + public SerializableVector3(Vector3 vector) + { + x = vector.x; + y = vector.y; + z = vector.z; + } + + public Vector3 ToVector3() + { + return new Vector3(x, y, z); + } +} diff --git a/Assets/Editor/Script/GearSystemEditor.cs.meta b/Assets/Scripts/Framework/Config/SerializableVector3.cs.meta similarity index 83% rename from Assets/Editor/Script/GearSystemEditor.cs.meta rename to Assets/Scripts/Framework/Config/SerializableVector3.cs.meta index 9381b83e1..82b17a408 100644 --- a/Assets/Editor/Script/GearSystemEditor.cs.meta +++ b/Assets/Scripts/Framework/Config/SerializableVector3.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ab611734fd046fe41b0b72a904792339 +guid: 4ef3fd25c4fbf9b4f91ebba7bab3dffe MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Framework/Core/AppCenter.cs b/Assets/Scripts/Framework/Core/AppCenter.cs index 77e9c60b8..32ea1d8c9 100644 --- a/Assets/Scripts/Framework/Core/AppCenter.cs +++ b/Assets/Scripts/Framework/Core/AppCenter.cs @@ -1,4 +1,4 @@ -namespace Framework.Core +namespace AibisDream.Framework { public enum RunType { diff --git a/Assets/Scripts/Framework/Core/Core.cs b/Assets/Scripts/Framework/Core/Core.cs index 0ce24163d..f89da2f1d 100644 --- a/Assets/Scripts/Framework/Core/Core.cs +++ b/Assets/Scripts/Framework/Core/Core.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Newtonsoft.Json; using UnityEngine; namespace AibisDream.Framework @@ -9,8 +8,7 @@ namespace AibisDream.Framework public interface IModule { void Init(); - void Enable(); - void Disable(); + void Init(string dataKey); void Deinit(); } @@ -22,22 +20,27 @@ namespace AibisDream.Framework void Deinit(); } - public interface IData + public interface ISystemHasData { + string CurDataKey { get; set; } + string[] GetDataKeyOptions(); + void Load(); + void Save(); } - public static class DataExtension + public abstract class SystemHasData : MonoBehaviour, ISystemHasData { - public static void Save(this IData data) - { - string json = JsonConvert.SerializeObject(data, Formatting.Indented); - } + public abstract string CurDataKey { get; set; } + public abstract string[] GetDataKeyOptions(); + public abstract void Load(); + public abstract void Save(); + } - public static void Load(this IData data) - { - - } - } + public interface IHasData + { + void Save(string dataKey); + void Load(string dataKey); + } #region IOC容器 @@ -48,8 +51,6 @@ namespace AibisDream.Framework public void Register(T instance) { var key = typeof(T); - Debug.Log(key.Name); - _instances[key] = instance; } diff --git a/Assets/Scripts/Framework/ResourceKit.meta b/Assets/Scripts/Framework/ResourceKit.meta new file mode 100644 index 000000000..66b339998 --- /dev/null +++ b/Assets/Scripts/Framework/ResourceKit.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9759eab92c6f415cbecbb0bba88d30f8 +timeCreated: 1732915904 \ No newline at end of file diff --git a/Assets/Scripts/Framework/ResourceKit/ResourceKit.cs b/Assets/Scripts/Framework/ResourceKit/ResourceKit.cs new file mode 100644 index 000000000..cd906f07c --- /dev/null +++ b/Assets/Scripts/Framework/ResourceKit/ResourceKit.cs @@ -0,0 +1,68 @@ +using System; +using UnityEditor; +using UnityEngine; + +namespace AibisDream.Framework +{ + public static class ResourceKit + { + public static string SavePsdSprite(Sprite sprite) + { + if (!sprite) return ""; + + // 先读Psd的路径 + string psdPath = AssetDatabase.GetAssetPath(sprite); + var psdResPath = GetResourcePath(psdPath); + // 去后缀 + // 找到最后一个点的位置 + int lastDotIndex = psdResPath.LastIndexOf('.'); + // 如果没有点,说明没有扩展名 + if (lastDotIndex == -1) + { + return psdResPath; + } + + // 提取文件名(不包括扩展名) + var purePath = psdResPath.Substring(0, lastDotIndex); + + // 添加后缀 + return purePath + "/" + sprite.name; + } + + private static string GetResourcePath(string absolutePath) + { + const string resourcesFolderName = "Resources/"; + int index = absolutePath.IndexOf(resourcesFolderName, StringComparison.Ordinal); + + if (index >= 0) + { + // 获取 "Resources/" 之后的部分 + return absolutePath.Substring(index + resourcesFolderName.Length); + } + else + { + return absolutePath; + } + } + + public static Sprite LoadSpriteFromPsd(string path) + { + int lastIndex = path.LastIndexOf('/'); + string spriteName = path.Substring(lastIndex + 1); + string resPath = path.Substring(0, lastIndex); + + // 加载 + var sprites = Resources.LoadAll(resPath); + + foreach (var sprite in sprites) + { + if (sprite.name == spriteName) + { + return sprite; + } + } + + return null; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Framework/ResourceKit/ResourceKit.cs.meta b/Assets/Scripts/Framework/ResourceKit/ResourceKit.cs.meta new file mode 100644 index 000000000..3fabe8b38 --- /dev/null +++ b/Assets/Scripts/Framework/ResourceKit/ResourceKit.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4d84ca862eec4bbbbc0216f76b5e715a +timeCreated: 1732915915 \ No newline at end of file diff --git a/Assets/Scripts/MiniGame/Engine/SpriteButton.cs b/Assets/Scripts/MiniGame/Engine/SpriteButton.cs index 8fb9d1b63..49cd1025f 100644 --- a/Assets/Scripts/MiniGame/Engine/SpriteButton.cs +++ b/Assets/Scripts/MiniGame/Engine/SpriteButton.cs @@ -7,25 +7,25 @@ namespace AibisDream { private GameObject _self; private bool _isHold; - private bool _isButtonActive; + public bool isButtonActive; + public event Action OnButtonDown; public event Action OnButtonUp; public event Action OnButtonHold; - public SpriteButton(GameObject gameObject) + public SpriteButton(GameObject gameObject, bool initActive = true) { _self = gameObject; - _isButtonActive = true; + isButtonActive = initActive; } /// /// 检查按钮 /// - /// public void CheckButtonClick() { - if (!_isButtonActive) + if (!isButtonActive) { _isHold = false; return; @@ -56,5 +56,10 @@ namespace AibisDream _isHold = false; } } + + public void SetActive(bool isActive) + { + isButtonActive = isActive; + } } } diff --git a/Assets/Scripts/MiniGame/Gear/GearController.cs b/Assets/Scripts/MiniGame/Gear/GearController.cs index d6528ac29..82ee21c56 100644 --- a/Assets/Scripts/MiniGame/Gear/GearController.cs +++ b/Assets/Scripts/MiniGame/Gear/GearController.cs @@ -1,7 +1,6 @@ using AibisDream.FixSystem; using AibisDream.Framework; using Framework.Core; -using Unity.VisualScripting; using UnityEngine; namespace AibisDream @@ -10,15 +9,13 @@ namespace AibisDream { #region 索引 - [SerializeField] private GameObject _gearPrefab; + [SerializeField] private GameObject gearPrefab; private Shaft[] _shafts; #endregion private ShaftGraph _shaftGraph; private GearSysTemLevelData _levelData; - - public RunType runType; private void Awake() { @@ -43,16 +40,11 @@ namespace AibisDream this.FindComponents(); _shafts = GetComponentsInChildren(); - _gearPrefab = Resources.Load("Prefabs/Gear System/Gear"); + gearPrefab = Resources.Load("Prefabs/Gear System/Gear"); } public void Enable() { - if (runType == RunType.Editor) - { - - } - _shaftGraph = new ShaftGraph(_shafts); } @@ -100,7 +92,7 @@ namespace AibisDream /// 齿轮Obj public GameObject InitGear(Vector3 pos, float radius, Sprite sprite, float speed) { - GameObject gearObj = Instantiate(_gearPrefab, pos, Quaternion.identity); + GameObject gearObj = Instantiate(gearPrefab, pos, Quaternion.identity); gearObj.transform.parent = transform.GetChild(0).transform; Gear gear = gearObj.GetComponent(); gear.radius = radius; diff --git a/Assets/Scripts/Utility/AutoFlipType.cs b/Assets/Scripts/Utility/AutoFlipType.cs index c3f6b3a31..53e29b8da 100644 --- a/Assets/Scripts/Utility/AutoFlipType.cs +++ b/Assets/Scripts/Utility/AutoFlipType.cs @@ -1,5 +1,4 @@ using System.Collections; -using System.Threading.Tasks; using AibisDream.Framework; using UnityEngine; diff --git a/Assets/Scripts/Utility/JsonUtil.cs b/Assets/Scripts/Utility/JsonUtil.cs index 6f70675bd..72ec65a39 100644 --- a/Assets/Scripts/Utility/JsonUtil.cs +++ b/Assets/Scripts/Utility/JsonUtil.cs @@ -105,6 +105,28 @@ namespace AibisDream.Utility File.WriteAllText(path, tempJson); } } + + /// + /// 自动把文件名转为Json + /// + /// 文件名 + /// 已改为json的文件名 + public static string FormatAsJsonPath(string fileName) + { + // 找到最后一个点的位置 + int lastDotIndex = fileName.LastIndexOf('.'); + + // 如果没有点,说明没有扩展名 + if (lastDotIndex == -1) + { + return fileName + JsonSuffix; + } + + // 提取文件名(不包括扩展名) + string fileNameWithoutExtension = fileName.Substring(0, lastDotIndex); + // 返回新的文件名,使用 .json 作为扩展名 + return fileNameWithoutExtension + JsonSuffix; + } } public enum SaveMode diff --git a/Assets/StreamingAssets/LevelData.meta b/Assets/StreamingAssets/LevelData.meta new file mode 100644 index 000000000..aa326c47d --- /dev/null +++ b/Assets/StreamingAssets/LevelData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9fab37192145c6247b5772d06d3a2069 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/LevelData/BodyModuleSystem.meta b/Assets/StreamingAssets/LevelData/BodyModuleSystem.meta new file mode 100644 index 000000000..72b3176ee --- /dev/null +++ b/Assets/StreamingAssets/LevelData/BodyModuleSystem.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2931a43d35660b848b0f74f2bf964f2e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/LevelData/BodyModuleSystem/stone1.json b/Assets/StreamingAssets/LevelData/BodyModuleSystem/stone1.json new file mode 100644 index 000000000..150512bb9 --- /dev/null +++ b/Assets/StreamingAssets/LevelData/BodyModuleSystem/stone1.json @@ -0,0 +1 @@ +{"moduleDataArray":[{"moduleName":"Lung","modulePicPath":"","modulePos":{"x":0.91,"y":1.84,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":1,"waveHasError":true},{"moduleName":"Heart","modulePicPath":"","modulePos":{"x":-3.89,"y":1.44,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":0,"waveHasError":false},{"moduleName":"GearBox","modulePicPath":"","modulePos":{"x":-3.11,"y":0.08,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":0,"waveHasError":false},{"moduleName":"Liver","modulePicPath":"","modulePos":{"x":1.02,"y":-3.3,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":0,"waveHasError":false},{"moduleName":"Stomach","modulePicPath":"","modulePos":{"x":-3.77,"y":-3.81,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":0,"waveHasError":false}]} \ No newline at end of file diff --git a/Assets/StreamingAssets/LevelData/BodyModuleSystem/stone1.json.meta b/Assets/StreamingAssets/LevelData/BodyModuleSystem/stone1.json.meta new file mode 100644 index 000000000..41bfd5c9b --- /dev/null +++ b/Assets/StreamingAssets/LevelData/BodyModuleSystem/stone1.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: af23137040825664ea7af48a6fce0507 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: