diff --git a/Assets/Resources/Art/Fix/Stone/身体维修界面.psb b/Assets/Resources/Art/Fix/Stone/身体维修界面.psb index 3f0f9181f..496550096 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 d4c6a72c8..c891fcf78 100644 --- a/Assets/Resources/Art/Fix/Stone/身体维修界面.psb.meta +++ b/Assets/Resources/Art/Fix/Stone/身体维修界面.psb.meta @@ -94,6 +94,111 @@ ScriptedImporter: spritePosition: {x: 0, y: 0} mosaicSpriteImportData: [] rigSpriteImportData: + - name: "\u5C4F\u5E55\u4FE1\u606F" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 3290 + y: 7461 + width: 651 + height: 101 + spriteID: dad54d5abbf7996438e47fe42d8414fa + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 3288, y: 7460} + spritePosition: {x: 2934, y: 1892} + - name: "\u6DF1\u5165\u6309\u94AE" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 3812 + y: 6052 + width: 161 + height: 112 + spriteID: 27fd3ef65dfd55c45bf19c14e2ba4aaf + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 3810, y: 6051} + spritePosition: {x: 3462, y: 1270} + - name: "\u6ED1\u5757" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 3906 + y: 6530 + width: 27 + height: 72 + spriteID: 07698999b4df0c84bbd9c4c322a754b1 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 3904, y: 6529} + spritePosition: {x: 2915, y: 1290} + - name: "\u6ED1\u52A8\u8F68\u9053" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 367 + y: 7903 + width: 580 + height: 111 + spriteID: 14b6aef9f9819d242bd85fb48351a3ce + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 367, y: 7903} + spritePosition: {x: 2890, y: 1271} + - name: "\u62A5\u9519\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: 1424 + y: 7105 + width: 770 + height: 528 + spriteID: f8e742adf70deed45a81da26d0626293 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1424, y: 7105} + spritePosition: {x: 2886, y: 1376} - name: "\u5DE6\u4FA7\u754C\u9762" originalName: pivot: {x: 0.5, y: 0.5} @@ -122,7 +227,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3146 + x: 3282 y: 7104 width: 697 height: 356 @@ -134,7 +239,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3154, y: 7105} + uvTransform: {x: 3290, y: 7105} spritePosition: {x: 1745, y: 1386} - name: "\u692D\u5706 2" originalName: @@ -143,8 +248,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4005 - y: 5962 + x: 1377 + y: 8154 width: 25 height: 25 spriteID: 3f9ee51ee22d4434f8d77faf45d9acd2 @@ -155,7 +260,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4004, y: 5961} + uvTransform: {x: 1375, y: 8153} spritePosition: {x: 1374, y: 1055} - name: "\u692D\u5706 1" originalName: @@ -164,8 +269,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3906 - y: 6520 + x: 4063 + y: 7599 width: 26 height: 26 spriteID: 289d20330e2397a45ad29088f4f1a6e0 @@ -176,7 +281,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3904, y: 6519} + uvTransform: {x: 4061, y: 7598} spritePosition: {x: 1349, y: 1048} - name: "\u6307\u9488" originalName: @@ -185,8 +290,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3906 - y: 6469 + x: 3920 + y: 6310 width: 20 height: 43 spriteID: c7aa11cecdaa86640854984d4b51a89f @@ -197,7 +302,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3906, y: 6469} + uvTransform: {x: 3920, y: 6310} spritePosition: {x: 1910, y: 1059} - name: "\u6307\u9488" originalName: @@ -207,7 +312,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3920 - y: 6139 + y: 6361 width: 20 height: 43 spriteID: 9f9deb0f2cb514d4d828fd62fa70dde3 @@ -218,7 +323,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3920, y: 6139} + uvTransform: {x: 3920, y: 6361} spritePosition: {x: 1294, y: 1305} - name: "\u8F6C\u901F\u8868" originalName: @@ -227,8 +332,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3154 - y: 7461 + x: 3812 + y: 5868 width: 176 height: 176 spriteID: b7e297a8275fe3147a264e080dc035dd @@ -239,7 +344,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3154, y: 7461} + uvTransform: {x: 3812, y: 5868} spritePosition: {x: 1226, y: 1218} - name: "\u53D8\u901F\u7BB1\u63D2\u5B54" originalName: @@ -248,8 +353,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4005 - y: 5868 + x: 3812 + y: 6530 width: 86 height: 86 spriteID: 98e19cabc64e47d46aea9ab2c329fca9 @@ -260,7 +365,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4005, y: 5868} + uvTransform: {x: 3812, y: 6530} spritePosition: {x: 1182, y: 1058} - name: "\u76D6\u5B50\u6746" originalName: @@ -290,7 +395,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 2654 + x: 2790 y: 7105 width: 492 height: 492 @@ -302,7 +407,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 2654, y: 7105} + uvTransform: {x: 2790, y: 7105} spritePosition: {x: 1278, y: 766} - name: "\u53D8\u901F\u7BB1\u8F93\u5165\u9F7F\u8F6E" originalName: @@ -332,8 +437,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3512 - y: 7460 + x: 541 + y: 8021 width: 154 height: 154 spriteID: c562151c266172245900603e7959a8da @@ -344,7 +449,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3512, y: 7461} + uvTransform: {x: 541, y: 8022} spritePosition: {x: 1454, y: 1050} - name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EB" originalName: @@ -354,7 +459,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3812 - y: 6001 + y: 6172 width: 128 height: 130 spriteID: 93418b50b51ddd441a424a24b868b51a @@ -365,7 +470,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3812, y: 6001} + uvTransform: {x: 3812, y: 6172} spritePosition: {x: 1406, y: 946} - name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EC" originalName: @@ -374,8 +479,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3338 - y: 7461 + x: 367 + y: 8022 width: 166 height: 166 spriteID: d5e68dcab5349504f950128fdb66696c @@ -386,7 +491,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3338, y: 7461} + uvTransform: {x: 367, y: 8022} spritePosition: {x: 1476, y: 824} - name: "\u53D8\u901F\u7BB1\u5531\u7247\u9F7F\u8F6E" originalName: @@ -395,7 +500,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3674 + x: 3949 y: 7461 width: 130 height: 130 @@ -407,7 +512,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3674, y: 7461} + uvTransform: {x: 3949, y: 7461} spritePosition: {x: 1318, y: 859} - name: "\u53D8\u901F\u7BB1\u8F93\u51FA\u9F7F\u8F6E" originalName: @@ -416,8 +521,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3906 - y: 6554 + x: 3920 + y: 6412 width: 0 height: 0 spriteID: 7e7562128bf69d7418af6bd34587198a @@ -428,7 +533,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3744, y: 6394} + uvTransform: {x: 3758, y: 6252} spritePosition: {x: 1782, y: 1048} - name: "\u53D8\u901F\u7BB1" originalName: @@ -458,8 +563,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3812 - y: 5868 + x: 703 + y: 8022 width: 185 height: 125 spriteID: be4e6d6bab42a55409387fd23e2ee32c @@ -470,7 +575,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3812, y: 5868} + uvTransform: {x: 703, y: 8022} spritePosition: {x: 1073, y: 1212} - name: "\u5FC3\u810F\u63D2\u5B54" originalName: @@ -479,8 +584,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3812 - y: 6469 + x: 3996 + y: 5868 width: 86 height: 86 spriteID: 393fed26529755c43b3adf65c5215b60 @@ -491,7 +596,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3812, y: 6469} + uvTransform: {x: 3996, y: 5868} spritePosition: {x: 982, y: 1386} - name: "\u5FC3\u810F\u76D6\u5B50" originalName: @@ -501,7 +606,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 1424 - y: 7105 + y: 7641 width: 634 height: 544 spriteID: 783637c73e28afc46a70e12184fba9a3 @@ -512,7 +617,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1424, y: 7105} + uvTransform: {x: 1424, y: 7641} spritePosition: {x: 920, y: 1372} - name: "\u55B7\u6CB9\u5EA6\u91CF" originalName: @@ -521,8 +626,8 @@ ScriptedImporter: border: {x: 0, y: 8, z: 0, w: 8} rect: serializedVersion: 2 - x: 3998 - y: 7349 + x: 1353 + y: 7903 width: 16 height: 243 spriteID: 955abee622701d34c92da4721f082368 @@ -533,7 +638,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3998, y: 7349} + uvTransform: {x: 1353, y: 7903} spritePosition: {x: 1287, y: 1618} - name: "\u8FDB\u6C14\u5EA6\u91CF" originalName: @@ -542,8 +647,8 @@ ScriptedImporter: border: {x: 0, y: 8, z: 0, w: 9} rect: serializedVersion: 2 - x: 4022 - y: 7349 + x: 1377 + y: 7903 width: 16 height: 243 spriteID: 0c11f41444c477f4fac3222cb5b79a98 @@ -554,7 +659,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4022, y: 7349} + uvTransform: {x: 1377, y: 7903} spritePosition: {x: 1204, y: 1618} - name: "\u6C14\u95E8\u62C9\u6746" originalName: @@ -563,8 +668,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3812 - y: 6563 + x: 3949 + y: 7599 width: 106 height: 28 spriteID: ed1ecfe628602a44285fa18ebac88553 @@ -575,7 +680,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3812, y: 6563} + uvTransform: {x: 3949, y: 7599} spritePosition: {x: 1031, y: 1666} - name: "\u62C9\u6746\u6C60" originalName: @@ -584,7 +689,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 2066 + x: 2202 y: 7105 width: 580 height: 498 @@ -596,7 +701,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 2066, y: 7105} + uvTransform: {x: 2202, y: 7105} spritePosition: {x: 932, y: 1410} - name: "\u5FC3\u810F\u9F7F\u8F6EA" originalName: @@ -605,8 +710,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3914 - y: 6554 + x: 3928 + y: 6412 width: 0 height: 0 spriteID: 446346ef83ab15c43a3d115b695a489a @@ -617,7 +722,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3728, y: 6368} + uvTransform: {x: 3742, y: 6226} spritePosition: {x: 1459, y: 1570} - name: "\u5FC3\u810F\u9F7F\u8F6EB" originalName: @@ -626,8 +731,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3922 - y: 6554 + x: 3936 + y: 6412 width: 0 height: 0 spriteID: b20eafea4b8b8c94c89d9e5d54ae683f @@ -638,7 +743,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3716, y: 6347} + uvTransform: {x: 3730, y: 6205} spritePosition: {x: 1344, y: 1445} - name: "\u5FC3\u810F\u9F7F\u8F6EC" originalName: @@ -647,8 +752,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3930 - y: 6554 + x: 1410 + y: 8154 width: 0 height: 0 spriteID: 4937081512344314a989a0d438fd73d3 @@ -659,7 +764,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3770, y: 6395} + uvTransform: {x: 1250, y: 7995} spritePosition: {x: 1295, y: 1611} - name: "\u5FC3\u810F\u9F7F\u8F6ED" originalName: @@ -668,8 +773,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3844 - y: 7105 + x: 955 + y: 7903 width: 236 height: 236 spriteID: 14aab779c58f90a40a99c1b0e02cc11c @@ -680,7 +785,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3844, y: 7105} + uvTransform: {x: 955, y: 7903} spritePosition: {x: 1386, y: 1218} - name: "\u5FC3\u810F\u9F7F\u8F6EE" originalName: @@ -689,8 +794,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3926 - y: 6563 + x: 1410 + y: 8162 width: 0 height: 0 spriteID: a4d40b2ba111122448c31f2ea4fd4d4d @@ -701,7 +806,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3796, y: 6433} + uvTransform: {x: 1280, y: 8032} spritePosition: {x: 1541, y: 1536} - name: "\u5FC3\u810F" originalName: @@ -731,8 +836,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3844 - y: 7349 + x: 1199 + y: 7903 width: 146 height: 225 spriteID: d4a3363adf457ae4aa15314d2db44ca5 @@ -743,7 +848,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3844, y: 7349} + uvTransform: {x: 1199, y: 7903} spritePosition: {x: 1257, y: 1935} - name: "\u80BA\u63D2\u5B54" originalName: @@ -752,8 +857,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3812 - y: 6139 + x: 3981 + y: 6052 width: 100 height: 102 spriteID: 2b82d9f9ac606bc46a69f1f1f2bc2fac @@ -764,7 +869,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3812, y: 6139} + uvTransform: {x: 3981, y: 6052} spritePosition: {x: 1990, y: 1443} - name: "\u80BA" originalName: @@ -795,7 +900,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3812 - y: 6249 + y: 6310 width: 100 height: 102 spriteID: 7df889ef25dabad46bcacf053c71d0e6 @@ -806,7 +911,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3812, y: 6249} + uvTransform: {x: 3812, y: 6310} spritePosition: {x: 1068, y: 192} - name: "\u80C3" originalName: @@ -837,7 +942,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3812 - y: 6359 + y: 6420 width: 100 height: 102 spriteID: a7f4162658d13014eb7749886a9e8c79 @@ -848,7 +953,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3812, y: 6359} + uvTransform: {x: 3812, y: 6420} spritePosition: {x: 1783, y: 446} - name: "\u809D" originalName: @@ -912,7 +1017,7 @@ ScriptedImporter: overridden: 0 ignorePlatformSupport: 0 maxTextureSize: 4096 - resizeAlgorithm: 1 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 2 compressionQuality: 50 @@ -986,6 +1091,56 @@ ScriptedImporter: resliceFromLayer: 0 mosaicPSDLayers: [] rigPSDLayers: + - name: "\u5C4F\u5E55\u4FE1\u606F" + spriteName: "\u5C4F\u5E55\u4FE1\u606F" + isGroup: 0 + parentIndex: -1 + spriteID: dad54d5abbf7996438e47fe42d8414fa + layerID: 475 + mosaicPosition: {x: 3290, y: 7461} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6DF1\u5165\u6309\u94AE" + spriteName: "\u6DF1\u5165\u6309\u94AE" + isGroup: 0 + parentIndex: -1 + spriteID: 27fd3ef65dfd55c45bf19c14e2ba4aaf + layerID: 463 + mosaicPosition: {x: 3812, y: 6052} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6ED1\u5757" + spriteName: "\u6ED1\u5757" + isGroup: 0 + parentIndex: -1 + spriteID: 07698999b4df0c84bbd9c4c322a754b1 + layerID: 476 + mosaicPosition: {x: 3906, y: 6530} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6ED1\u52A8\u8F68\u9053" + spriteName: "\u6ED1\u52A8\u8F68\u9053" + isGroup: 0 + parentIndex: -1 + spriteID: 14b6aef9f9819d242bd85fb48351a3ce + layerID: 469 + mosaicPosition: {x: 367, y: 7903} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u62A5\u9519\u5C4F\u5E55" + spriteName: "\u62A5\u9519\u5C4F\u5E55" + isGroup: 0 + parentIndex: -1 + spriteID: f8e742adf70deed45a81da26d0626293 + layerID: 461 + mosaicPosition: {x: 1424, y: 7105} + flatten: 0 + isImported: 1 + isVisible: 1 - name: "\u5DE6\u4FA7\u754C\u9762" spriteName: "\u5DE6\u4FA7\u754C\u9762" isGroup: 0 @@ -1002,7 +1157,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 5dd8c8637cee4004791d409a9dd08c43 layerID: 456 - mosaicPosition: {x: 3154, y: 7105} + mosaicPosition: {x: 3290, y: 7105} flatten: 0 isImported: 1 isVisible: 1 @@ -1019,67 +1174,67 @@ ScriptedImporter: - name: "\u692D\u5706 2" spriteName: "\u692D\u5706 2" isGroup: 0 - parentIndex: 2 + parentIndex: 7 spriteID: 3f9ee51ee22d4434f8d77faf45d9acd2 layerID: 459 - mosaicPosition: {x: 4005, y: 5962} + mosaicPosition: {x: 1377, y: 8154} flatten: 0 isImported: 1 isVisible: 1 - name: "\u692D\u5706 1" spriteName: "\u692D\u5706 1" isGroup: 0 - parentIndex: 2 + parentIndex: 7 spriteID: 289d20330e2397a45ad29088f4f1a6e0 layerID: 458 - mosaicPosition: {x: 3906, y: 6520} + mosaicPosition: {x: 4063, y: 7599} flatten: 0 isImported: 1 isVisible: 1 - name: "\u6307\u9488" spriteName: "\u6307\u9488" isGroup: 0 - parentIndex: 2 + parentIndex: 7 spriteID: c7aa11cecdaa86640854984d4b51a89f layerID: 457 - mosaicPosition: {x: 3906, y: 6469} + mosaicPosition: {x: 3920, y: 6310} flatten: 0 isImported: 1 isVisible: 1 - name: "\u6307\u9488" spriteName: "\u6307\u9488" isGroup: 0 - parentIndex: 2 + parentIndex: 7 spriteID: 9f9deb0f2cb514d4d828fd62fa70dde3 layerID: 229 - mosaicPosition: {x: 3920, y: 6139} + mosaicPosition: {x: 3920, y: 6361} flatten: 0 isImported: 1 isVisible: 1 - name: "\u8F6C\u901F\u8868" spriteName: "\u8F6C\u901F\u8868" isGroup: 0 - parentIndex: 2 + parentIndex: 7 spriteID: b7e297a8275fe3147a264e080dc035dd layerID: 417 - mosaicPosition: {x: 3154, y: 7461} + mosaicPosition: {x: 3812, y: 5868} flatten: 0 isImported: 1 isVisible: 1 - name: "\u53D8\u901F\u7BB1\u63D2\u5B54" spriteName: "\u53D8\u901F\u7BB1\u63D2\u5B54" isGroup: 0 - parentIndex: 2 + parentIndex: 7 spriteID: 98e19cabc64e47d46aea9ab2c329fca9 layerID: 260 - mosaicPosition: {x: 4005, y: 5868} + mosaicPosition: {x: 3812, y: 6530} flatten: 0 isImported: 1 isVisible: 1 - name: "\u76D6\u5B50\u6746" spriteName: "\u76D6\u5B50\u6746" isGroup: 0 - parentIndex: 2 + parentIndex: 7 spriteID: 7805fb4d7ed5ab3429a2316f7fd43f9e layerID: 203 mosaicPosition: {x: 4, y: 7903} @@ -1089,17 +1244,17 @@ ScriptedImporter: - name: "\u53D8\u901F\u7BB1\u76D6\u5B50" spriteName: "\u53D8\u901F\u7BB1\u76D6\u5B50" isGroup: 0 - parentIndex: 2 + parentIndex: 7 spriteID: ca966d50cd7e0e24386a6919795e5460 layerID: 430 - mosaicPosition: {x: 2654, y: 7105} + mosaicPosition: {x: 2790, 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: 2 + parentIndex: 7 spriteID: 725469d4c92a63f459926985c2726704 layerID: 277 mosaicPosition: {x: 2220, y: 5499} @@ -1109,57 +1264,57 @@ ScriptedImporter: - name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EA" spriteName: "\u53D8\u901F\u7BB1\u9F7F\u8F6EA" isGroup: 0 - parentIndex: 2 + parentIndex: 7 spriteID: c562151c266172245900603e7959a8da layerID: 287 - mosaicPosition: {x: 3512, y: 7461} + mosaicPosition: {x: 541, y: 8022} flatten: 0 isImported: 1 isVisible: 1 - name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EB" spriteName: "\u53D8\u901F\u7BB1\u9F7F\u8F6EB" isGroup: 0 - parentIndex: 2 + parentIndex: 7 spriteID: 93418b50b51ddd441a424a24b868b51a layerID: 274 - mosaicPosition: {x: 3812, y: 6001} + mosaicPosition: {x: 3812, y: 6172} flatten: 0 isImported: 1 isVisible: 1 - name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EC" spriteName: "\u53D8\u901F\u7BB1\u9F7F\u8F6EC" isGroup: 0 - parentIndex: 2 + parentIndex: 7 spriteID: d5e68dcab5349504f950128fdb66696c layerID: 280 - mosaicPosition: {x: 3338, y: 7461} + mosaicPosition: {x: 367, y: 8022} 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: 2 + parentIndex: 7 spriteID: 15bb5a4be7f4d1746b0822dc05b92b5f layerID: 279 - mosaicPosition: {x: 3674, y: 7461} + mosaicPosition: {x: 3949, y: 7461} 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: 2 + parentIndex: 7 spriteID: 7e7562128bf69d7418af6bd34587198a layerID: 281 - mosaicPosition: {x: 3906, y: 6554} + mosaicPosition: {x: 3920, y: 6412} flatten: 0 isImported: 1 isVisible: 1 - name: "\u53D8\u901F\u7BB1" spriteName: "\u53D8\u901F\u7BB1" isGroup: 0 - parentIndex: 2 + parentIndex: 7 spriteID: 905674a2af97be442a16bdb7e34e5230 layerID: 249 mosaicPosition: {x: 4, y: 7105} @@ -1169,10 +1324,10 @@ ScriptedImporter: - name: "\u6CB9\u95E8" spriteName: "\u6CB9\u95E8" isGroup: 0 - parentIndex: 2 + parentIndex: 7 spriteID: be4e6d6bab42a55409387fd23e2ee32c layerID: 254 - mosaicPosition: {x: 3812, y: 5868} + mosaicPosition: {x: 703, y: 8022} flatten: 0 isImported: 1 isVisible: 1 @@ -1189,117 +1344,117 @@ ScriptedImporter: - name: "\u5FC3\u810F\u63D2\u5B54" spriteName: "\u5FC3\u810F\u63D2\u5B54" isGroup: 0 - parentIndex: 19 + parentIndex: 24 spriteID: 393fed26529755c43b3adf65c5215b60 layerID: 307 - mosaicPosition: {x: 3812, y: 6469} + mosaicPosition: {x: 3996, y: 5868} flatten: 0 isImported: 1 isVisible: 1 - name: "\u5FC3\u810F\u76D6\u5B50" spriteName: "\u5FC3\u810F\u76D6\u5B50" isGroup: 0 - parentIndex: 19 + parentIndex: 24 spriteID: 783637c73e28afc46a70e12184fba9a3 layerID: 264 - mosaicPosition: {x: 1424, y: 7105} + mosaicPosition: {x: 1424, y: 7641} flatten: 0 isImported: 1 isVisible: 1 - name: "\u55B7\u6CB9\u5EA6\u91CF" spriteName: "\u55B7\u6CB9\u5EA6\u91CF" isGroup: 0 - parentIndex: 19 + parentIndex: 24 spriteID: 955abee622701d34c92da4721f082368 layerID: 421 - mosaicPosition: {x: 3998, y: 7349} + mosaicPosition: {x: 1353, y: 7903} flatten: 0 isImported: 1 isVisible: 1 - name: "\u8FDB\u6C14\u5EA6\u91CF" spriteName: "\u8FDB\u6C14\u5EA6\u91CF" isGroup: 0 - parentIndex: 19 + parentIndex: 24 spriteID: 0c11f41444c477f4fac3222cb5b79a98 layerID: 420 - mosaicPosition: {x: 4022, y: 7349} + mosaicPosition: {x: 1377, y: 7903} flatten: 0 isImported: 1 isVisible: 1 - name: "\u6C14\u95E8\u62C9\u6746" spriteName: "\u6C14\u95E8\u62C9\u6746" isGroup: 0 - parentIndex: 19 + parentIndex: 24 spriteID: ed1ecfe628602a44285fa18ebac88553 layerID: 295 - mosaicPosition: {x: 3812, y: 6563} + mosaicPosition: {x: 3949, y: 7599} flatten: 0 isImported: 1 isVisible: 1 - name: "\u62C9\u6746\u6C60" spriteName: "\u62C9\u6746\u6C60" isGroup: 0 - parentIndex: 19 + parentIndex: 24 spriteID: 6b94d32d5c28acf489338ccdcdbff11b layerID: 298 - mosaicPosition: {x: 2066, y: 7105} + mosaicPosition: {x: 2202, y: 7105} flatten: 0 isImported: 1 isVisible: 1 - name: "\u5FC3\u810F\u9F7F\u8F6EA" spriteName: "\u5FC3\u810F\u9F7F\u8F6EA" isGroup: 0 - parentIndex: 19 + parentIndex: 24 spriteID: 446346ef83ab15c43a3d115b695a489a layerID: 446 - mosaicPosition: {x: 3914, y: 6554} + mosaicPosition: {x: 3928, y: 6412} flatten: 0 isImported: 1 isVisible: 1 - name: "\u5FC3\u810F\u9F7F\u8F6EB" spriteName: "\u5FC3\u810F\u9F7F\u8F6EB" isGroup: 0 - parentIndex: 19 + parentIndex: 24 spriteID: b20eafea4b8b8c94c89d9e5d54ae683f layerID: 445 - mosaicPosition: {x: 3922, y: 6554} + mosaicPosition: {x: 3936, y: 6412} flatten: 0 isImported: 1 isVisible: 1 - name: "\u5FC3\u810F\u9F7F\u8F6EC" spriteName: "\u5FC3\u810F\u9F7F\u8F6EC" isGroup: 0 - parentIndex: 19 + parentIndex: 24 spriteID: 4937081512344314a989a0d438fd73d3 layerID: 444 - mosaicPosition: {x: 3930, y: 6554} + mosaicPosition: {x: 1410, y: 8154} flatten: 0 isImported: 1 isVisible: 1 - name: "\u5FC3\u810F\u9F7F\u8F6ED" spriteName: "\u5FC3\u810F\u9F7F\u8F6ED" isGroup: 0 - parentIndex: 19 + parentIndex: 24 spriteID: 14aab779c58f90a40a99c1b0e02cc11c layerID: 443 - mosaicPosition: {x: 3844, y: 7105} + mosaicPosition: {x: 955, y: 7903} flatten: 0 isImported: 1 isVisible: 1 - name: "\u5FC3\u810F\u9F7F\u8F6EE" spriteName: "\u5FC3\u810F\u9F7F\u8F6EE" isGroup: 0 - parentIndex: 19 + parentIndex: 24 spriteID: a4d40b2ba111122448c31f2ea4fd4d4d layerID: 439 - mosaicPosition: {x: 3926, y: 6563} + mosaicPosition: {x: 1410, y: 8162} flatten: 0 isImported: 1 isVisible: 1 - name: "\u5FC3\u810F" spriteName: "\u5FC3\u810F" isGroup: 0 - parentIndex: 19 + parentIndex: 24 spriteID: fe0cd590855195341917906fb8d73748 layerID: 311 mosaicPosition: {x: 2220, y: 4340} @@ -1312,7 +1467,7 @@ ScriptedImporter: parentIndex: -1 spriteID: d4a3363adf457ae4aa15314d2db44ca5 layerID: 397 - mosaicPosition: {x: 3844, y: 7349} + mosaicPosition: {x: 1199, y: 7903} flatten: 0 isImported: 1 isVisible: 1 @@ -1322,7 +1477,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 2b82d9f9ac606bc46a69f1f1f2bc2fac layerID: 238 - mosaicPosition: {x: 3812, y: 6139} + mosaicPosition: {x: 3981, y: 6052} flatten: 0 isImported: 1 isVisible: 1 @@ -1342,7 +1497,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 7df889ef25dabad46bcacf053c71d0e6 layerID: 236 - mosaicPosition: {x: 3812, y: 6249} + mosaicPosition: {x: 3812, y: 6310} flatten: 0 isImported: 1 isVisible: 1 @@ -1362,7 +1517,7 @@ ScriptedImporter: parentIndex: -1 spriteID: a7f4162658d13014eb7749886a9e8c79 layerID: 237 - mosaicPosition: {x: 3812, y: 6359} + mosaicPosition: {x: 3812, y: 6420} flatten: 0 isImported: 1 isVisible: 1 @@ -1389,7 +1544,7 @@ ScriptedImporter: sharedRigPSDLayers: [] pSDLayerImportSetting: [] importFileNodeState: 1 - platformSettingsDirtyTick: 638666863176496317 + platformSettingsDirtyTick: 638684918888245490 spriteSizeExpandChanged: 0 generateGOHierarchy: 0 textureAssetName: diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity index 6bf794094..8b7a091b2 100644 --- a/Assets/Scenes/ExpressFixScene.unity +++ b/Assets/Scenes/ExpressFixScene.unity @@ -955,6 +955,177 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &312714147 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 312714148} + - component: {fileID: 312714150} + - component: {fileID: 312714149} + m_Layer: 0 + m_Name: Button Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &312714148 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312714147} + 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: 1839459966} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.129, y: -0.049} + m_SizeDelta: {x: 3, y: 0.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &312714149 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312714147} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u6DF1\u5165" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 3.5 + m_fontSizeBase: 3.5 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 32 + m_VerticalAlignment: 1024 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0.9170666, y: 0, z: 1.1393852, w: 0.13894933} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 312714150} + m_maskType: 0 +--- !u!23 &312714150 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312714147} + 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: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &360323324 GameObject: m_ObjectHideFlags: 0 @@ -986,6 +1157,37 @@ Transform: m_Children: [] m_Father: {fileID: 657112469} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &389220476 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 389220477} + m_Layer: 0 + m_Name: Slider Start Pos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &389220477 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 389220476} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.253, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2104743874} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &404437037 stripped Transform: m_CorrespondingSourceObject: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3} @@ -1107,37 +1309,6 @@ Transform: - {fileID: 2007869315} m_Father: {fileID: 1732205055} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &511870640 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 511870641} - m_Layer: 0 - m_Name: Interaction - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &511870641 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 511870640} - 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: 1301816245} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &514341497 PrefabInstance: m_ObjectHideFlags: 0 @@ -1414,7 +1585,6 @@ GameObject: m_Component: - component: {fileID: 650606350} - component: {fileID: 650606352} - - component: {fileID: 650606351} - component: {fileID: 650606353} m_Layer: 0 m_Name: Screen @@ -1435,62 +1605,9 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1735764836} - - {fileID: 1864728083} + m_Children: [] m_Father: {fileID: 1301816245} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!331 &650606351 -SpriteMask: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 650606349} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - 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: 15d0c3709176029428a0da2f8cecf0b5, 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: 3 - 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: 21300000, guid: ddccdd794cef1574793f4f831324c81e, type: 3} - m_MaskAlphaCutoff: 0.2 - m_FrontSortingLayerID: 0 - m_BackSortingLayerID: 0 - m_FrontSortingLayer: 0 - m_BackSortingLayer: 0 - m_FrontSortingOrder: 0 - m_BackSortingOrder: 0 - m_IsCustomRangeActive: 0 - m_SpriteSortPoint: 0 --- !u!212 &650606352 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1529,8 +1646,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 959782197 - m_SortingLayer: 7 + 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} @@ -1576,7 +1693,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &657112469 Transform: m_ObjectHideFlags: 0 @@ -1687,7 +1804,7 @@ Transform: m_GameObject: {fileID: 693951178} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.057, y: 1.484, z: 0} + m_LocalPosition: {x: 2.62, y: 3.03, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2034,8 +2151,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 862830873} + - component: {fileID: 862830874} m_Layer: 0 - m_Name: Manager Center + m_Name: Fix System Center m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2056,6 +2174,18 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &862830874 +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: 1de0c108139bfab468f734b0502b1ad3, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &863998404 GameObject: m_ObjectHideFlags: 0 @@ -2403,6 +2533,90 @@ Transform: - {fileID: 30335134} m_Father: {fileID: 1410382569} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1034942116 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1034942117} + - component: {fileID: 1034942118} + m_Layer: 0 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1034942117 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1034942116} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.018, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1301816245} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1034942118 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1034942116} + 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: 8948488549379113049, 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 &1035218747 GameObject: m_ObjectHideFlags: 0 @@ -2854,7 +3068,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1112213369 Transform: m_ObjectHideFlags: 0 @@ -3057,7 +3271,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1301816245 Transform: m_ObjectHideFlags: 0 @@ -3071,9 +3285,14 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1597590135} - {fileID: 1895751250} - {fileID: 650606350} - - {fileID: 511870641} + - {fileID: 1864728083} + - {fileID: 1735764836} + - {fileID: 1034942117} + - {fileID: 2104743874} + - {fileID: 1839459966} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1301816246 @@ -3088,6 +3307,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a2e20b111511460a8f3a151bd470da9d, type: 3} m_Name: m_EditorClassIdentifier: + isScanning: 0 + isPlaying: 0 --- !u!1 &1410382568 GameObject: m_ObjectHideFlags: 0 @@ -3292,6 +3513,37 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 14ffdfdc63be167489dc01c0b661c1ac, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1495649820 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1495649821} + m_Layer: 0 + m_Name: Plug Root Pos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1495649821 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1495649820} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.822, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2000626643} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1537489912 GameObject: m_ObjectHideFlags: 0 @@ -3435,6 +3687,37 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.925, y: 0.625} m_EdgeRadius: 0 +--- !u!1 &1547844435 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1547844436} + m_Layer: 0 + m_Name: Slider End Pos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1547844436 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1547844435} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.189, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2104743874} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1590335072 GameObject: m_ObjectHideFlags: 0 @@ -3466,6 +3749,90 @@ Transform: m_Children: [] m_Father: {fileID: 693951179} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1597590134 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1597590135} + - component: {fileID: 1597590136} + m_Layer: 0 + m_Name: Screen Text BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1597590135 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1597590134} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.063, y: 1.528, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1301816245} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1597590136 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1597590134} + 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: -4876564293708829301, 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 &1691014402 GameObject: m_ObjectHideFlags: 0 @@ -3583,7 +3950,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1732205055 Transform: m_ObjectHideFlags: 0 @@ -3625,6 +3992,7 @@ GameObject: m_Component: - component: {fileID: 1735764836} - component: {fileID: 1735764838} + - component: {fileID: 1735764839} m_Layer: 0 m_Name: Waveform Visualizer m_TagString: Untagged @@ -3645,7 +4013,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 650606350} + m_Father: {fileID: 1301816245} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!120 &1735764838 LineRenderer: @@ -3747,10 +4115,33 @@ 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 +--- !u!114 &1735764839 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1735764835} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fd4bf97f1c7d4f559fe7ce23a64bff87, type: 3} + m_Name: + m_EditorClassIdentifier: + config: + samples: 1024 + amplitude: 0.6 + spikeRange: 20 + spatialFrequency: 1 + temporalFrequency: 0.1 + targetWaveformNoiseAmplitude: 0.1 + noiseAmplitude: 0.5 + noiseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + clearColor: {r: 0, g: 1, b: 0, a: 1} + waveformType: 0 --- !u!4 &1747384944 stripped Transform: m_CorrespondingSourceObject: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3} @@ -3790,6 +4181,91 @@ Transform: - {fileID: 901407697} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1839459965 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1839459966} + - component: {fileID: 1839459967} + m_Layer: 0 + m_Name: Deep In Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1839459966 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1839459965} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.393, y: -1.584, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 312714148} + m_Father: {fileID: 1301816245} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1839459967 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + 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: 4 + m_Sprite: {fileID: -1437180882204714391, 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 &1848534641 GameObject: m_ObjectHideFlags: 0 @@ -3908,11 +4384,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3} propertyPath: m_LocalPosition.x - value: 4.48 + value: 4.64 objectReference: {fileID: 0} - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3} propertyPath: m_LocalPosition.y - value: 3.28 + value: 3.33 objectReference: {fileID: 0} - target: {fileID: 8196328002646668744, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3} propertyPath: m_LocalPosition.z @@ -3966,6 +4442,7 @@ GameObject: m_Component: - component: {fileID: 1864728083} - component: {fileID: 1864728084} + - component: {fileID: 1864728085} m_Layer: 0 m_Name: Scan Line m_TagString: Untagged @@ -3986,7 +4463,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 650606350} + m_Father: {fileID: 1301816245} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!120 &1864728084 LineRenderer: @@ -4092,6 +4569,18 @@ LineRenderer: m_UseWorldSpace: 0 m_Loop: 0 m_ApplyActiveColorSpace: 1 +--- !u!114 &1864728085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1864728082} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d539f4fdddef410c9df21320f69fe38f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1874453572 GameObject: m_ObjectHideFlags: 0 @@ -4275,8 +4764,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -4497,6 +4986,90 @@ Transform: - {fileID: 18238395} m_Father: {fileID: 1112213369} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1987352169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1987352170} + - component: {fileID: 1987352171} + m_Layer: 0 + m_Name: Sliding Block + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1987352170 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + 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_LocalScale: {x: 1, y: 1.0000001, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2104743874} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1987352171 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1987352169} + 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: 949254551526614629, 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 &2000626642 GameObject: m_ObjectHideFlags: 0 @@ -4528,7 +5101,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1495649821} m_Father: {fileID: 693951179} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2000626644 @@ -4678,13 +5252,11 @@ MonoBehaviour: m_EditorClassIdentifier: moduleData: waveformType: 0 - viewState: 0 - cameraSize: 0 - cameraPos: {x: 0, y: 0} - audioName: - soundName: modulePicList: [] modulePos: {x: 0, y: 0, z: 0} + isPlugIn: 0 + isFirstPlugIn: 0 + curCommandType: --- !u!1 &2061960536 GameObject: m_ObjectHideFlags: 0 @@ -4769,6 +5341,106 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2104743873 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2104743874} + - component: {fileID: 2104743875} + - component: {fileID: 2104743876} + m_Layer: 0 + m_Name: Wave Slider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2104743874 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2104743873} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.446, y: -1.578, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1987352170} + - {fileID: 389220477} + - {fileID: 1547844436} + m_Father: {fileID: 1301816245} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2104743875 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2104743873} + 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: 2507139957111385121, 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!114 &2104743876 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2104743873} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5c6494bd9d5943cf8e875ae582481cf1, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2133683124 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/FixSystemNew/BodyModule.cs b/Assets/Scripts/FixSystemNew/BodyModule.cs index 02d56a230..2aa536dd5 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule.cs @@ -8,19 +8,25 @@ namespace AibisDream.FixSystem { #region 组件引用 - private const string ModulePicObjName = "Module Pic"; private const string SocketObjName = "Socket"; - - private GameObject _modulePic; public Socket Socket { get; private set; } #endregion - + public Vector3 SocketPos => Socket.transform.position; // 模块基本数据 - [SerializeField] - public BodyModuleData moduleData; + [SerializeField] public BodyModuleData moduleData; + + public ISocketCommand curPlugInCommand; + + #region Module状态 + + public bool isPlugIn; + public bool isFirstPlugIn; + public string curCommandType; + + #endregion private void Awake() { @@ -30,26 +36,24 @@ namespace AibisDream.FixSystem private void InitReference() { - _modulePic = transform.Find(ModulePicObjName).gameObject; Socket = transform.Find(SocketObjName).GetComponent(); } + + public void PlugIn() + { + + } } - + [Serializable] public struct BodyModuleData { public WaveformType waveformType; - public EyeTransitionManager.ViewState viewState; - - public int cameraSize; - public Vector2 cameraPos; - public string audioName; - public string soundName; + public List modulePicList; public Vector3 modulePos; } -} - +} \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/BodyModuleSystem.cs b/Assets/Scripts/FixSystemNew/BodyModuleSystem.cs index 642c53533..d66a7b8e2 100644 --- a/Assets/Scripts/FixSystemNew/BodyModuleSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModuleSystem.cs @@ -1,7 +1,4 @@ using System; -using System.Collections; -using System.Collections.Generic; -using AibisDream.Framework; using UnityEngine; using UnityEngine.Events; @@ -39,6 +36,7 @@ namespace AibisDream.FixSystem // 处理内部索引 BodyModules = transform.GetComponentsInChildren(); CableSystem = transform.Find("Cable System").GetComponent(); + FixSystemCenter.SystemDic.Register(this); } /// @@ -47,7 +45,7 @@ namespace AibisDream.FixSystem /// 源位置 /// 最近的Module /// 是否能找到目标范围内的Module - public bool TryFindClosestSocket(Vector3 sourcePos, out BodyModule targetModule) + public bool TryFindClosestModule(Vector3 sourcePos, out BodyModule targetModule) { var closestDistance = Mathf.Infinity; BodyModule closestModule = null; diff --git a/Assets/Scripts/FixSystemNew/Cable.cs b/Assets/Scripts/FixSystemNew/Cable.cs index 1f96906db..81d1117ae 100644 --- a/Assets/Scripts/FixSystemNew/Cable.cs +++ b/Assets/Scripts/FixSystemNew/Cable.cs @@ -109,7 +109,7 @@ namespace AibisDream.FixSystem public static CableConfig GeneDefaultConfig() { - return new CableConfig() + return new CableConfig { resolution = 10, dstMin = 0.1f, diff --git a/Assets/Scripts/FixSystemNew/CableSystem.cs b/Assets/Scripts/FixSystemNew/CableSystem.cs index e406708ce..b30987d3d 100644 --- a/Assets/Scripts/FixSystemNew/CableSystem.cs +++ b/Assets/Scripts/FixSystemNew/CableSystem.cs @@ -15,7 +15,6 @@ namespace AibisDream.FixSystem public Socket InitSocket { get; private set; } public BodyModuleSystem BodyModuleSystem { get; private set; } - private BodyModule[] _bodyModules; #endregion @@ -83,9 +82,9 @@ namespace AibisDream.FixSystem /// 源位置 /// 最近的Module /// 是否能找到目标范围内的Module - public bool TryFindClosestSocket(Vector3 sourcePos, out BodyModule targetModule) + public bool TryFindClosestModule(Vector3 sourcePos, out BodyModule targetModule) { - return BodyModuleSystem.TryFindClosestSocket(sourcePos, out targetModule); + return BodyModuleSystem.TryFindClosestModule(sourcePos, out targetModule); } #region 系统可用状态 diff --git a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs new file mode 100644 index 000000000..d655865cb --- /dev/null +++ b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs @@ -0,0 +1,22 @@ +using System; +using AibisDream.Framework; +using UnityEngine; + +namespace AibisDream.FixSystem +{ + public class FixSystemCenter : MonoBehaviour + { + public static IOCContainer SystemDic = new(); + + private void Awake() + { + SystemDic ??= new IOCContainer(); + } + + private void OnDestroy() + { + SystemDic = null; + } + } +} + diff --git a/Assets/Scripts/FixSystemNew/OscilloscopeScreen.cs.meta b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs.meta similarity index 83% rename from Assets/Scripts/FixSystemNew/OscilloscopeScreen.cs.meta rename to Assets/Scripts/FixSystemNew/FixSystemCenter.cs.meta index 9b2496e2d..3309d8707 100644 --- a/Assets/Scripts/FixSystemNew/OscilloscopeScreen.cs.meta +++ b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d3e8630f1e6849dd82fa2df4def283da +guid: 1de0c108139bfab468f734b0502b1ad3 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/FixSystemNew/OscilloscopeScreen.cs b/Assets/Scripts/FixSystemNew/OscilloscopeScreen.cs deleted file mode 100644 index 2e440170d..000000000 --- a/Assets/Scripts/FixSystemNew/OscilloscopeScreen.cs +++ /dev/null @@ -1,14 +0,0 @@ -using UnityEngine; - -namespace AibisDream.FixSystem -{ - public class OscilloscopeScreen : MonoBehaviour - { - #region 组件索引 - - private WaveformLine _waveformLine; - - #endregion - } -} - diff --git a/Assets/Scripts/FixSystemNew/OscilloscopeSystem.cs b/Assets/Scripts/FixSystemNew/OscilloscopeSystem.cs index d89c8358f..b6a50dc5d 100644 --- a/Assets/Scripts/FixSystemNew/OscilloscopeSystem.cs +++ b/Assets/Scripts/FixSystemNew/OscilloscopeSystem.cs @@ -7,31 +7,92 @@ namespace AibisDream.FixSystem { #region 组件索引 - private BodyModuleSystem _bodyModuleSystem; - private TMP_Text _screenText; + private WaveformLine _waveformLine; + private ScanLine _scanLine; + private SpriteRenderer _screen; + private WaveSlider _waveSlider; + + #endregion + + #region 状态 + + public bool isScanning; + public bool isPlaying; #endregion private void Awake() { + FixSystemCenter.SystemDic.Register(this); InitComponentRefs(); } private void InitComponentRefs() { _screenText = transform.Find("Screen Text").GetComponent(); - - // TODO 回头找个IOC容器一起管 - _bodyModuleSystem = FindObjectOfType(); - + _waveformLine = transform.Find("Waveform Visualizer").GetComponent(); + _scanLine = transform.Find("Scan Line").GetComponent(); + _screen = transform.Find("Screen").GetComponent(); + _waveSlider = transform.Find("Wave Slider").GetComponent(); + + _waveformLine.SetLineSize(_screen.bounds.size.x, _screen.bounds.size.y); + _scanLine.SetScreenSize(_screen.bounds.size.x, _screen.bounds.size.y); _screenText.text = ""; } + #region 对外开放 + + /// + /// 屏幕上播放波形 + /// + /// 波形类型 + /// 是否有错误 + public void PlayWave(WaveformType waveformType, bool hasError) + { + _waveSlider.InitSlider(); + isPlaying = true; + + var initialRandomPhase = Mathf.PI * Random.Range(7, 13) * 0.1f; + _waveformLine.PlayWave(waveformType, initialRandomPhase, hasError); + } + + /// + /// 停止播放波形 + /// + public void StopWave() + { + isPlaying = false; + _waveSlider.InitSlider(); + + _waveformLine.StopWave(); + _scanLine.CloseScan(); + } + + /// + /// 调整相位 + /// + public void AdjustPhaseShift(float phaseShift) + { + if (isPlaying) + { + _waveformLine.AdjustPhaseShift(phaseShift); + } + } + + /// + /// 开始扫描 + /// + public void StartScan() + { + float spikeX = _waveformLine.GetSpikeX(); + StartCoroutine(_scanLine.ScanForError(spikeX)); + } + /// /// 显示消息 /// - /// + /// 消息 public void ShowScreenMessage(string message) { _screenText.text = message; @@ -44,5 +105,19 @@ namespace AibisDream.FixSystem { _screenText.text = ""; } + + #endregion + } + + public enum WaveformType + { + Default, + Sine, + Square, + Triangle, + Sawtooth, + Noise, + Composite, + Pulse } } \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/Plug.cs b/Assets/Scripts/FixSystemNew/Plug.cs index f4a8de47c..dfd5e0a2f 100644 --- a/Assets/Scripts/FixSystemNew/Plug.cs +++ b/Assets/Scripts/FixSystemNew/Plug.cs @@ -20,6 +20,7 @@ namespace AibisDream.FixSystem private CableSystem _cableSystem; private SpriteRenderer _sprite; + private Transform _plugRootPos; #endregion @@ -34,6 +35,7 @@ namespace AibisDream.FixSystem { _cableSystem = transform.parent.GetComponent(); _sprite = GetComponent(); + _plugRootPos = transform.Find("Plug Root Pos"); } public void InitPlug(Socket initSocket) @@ -67,12 +69,16 @@ namespace AibisDream.FixSystem /// private void PullUpSocket() { + // 修改线头位置 + _cableSystem.CableRef.SetEndPos(_plugRootPos); + _cableSystem.curSocket?.PlugOut(); AudioManager.RandomPlayInteraction("plug_out"); _sprite.enabled = true; - _cableSystem.curSocket = null; // 触发事件 _cableSystem.plugOutEvent?.Invoke(_cableSystem.curSocket); + + _cableSystem.curSocket = null; } public void OnDrag(PointerEventData eventData) @@ -113,7 +119,7 @@ namespace AibisDream.FixSystem _isDragging = false; // 寻找可吸附的Module - if (_cableSystem.TryFindClosestSocket(transform.position, out var targetModule)) + if (_cableSystem.TryFindClosestModule(transform.position, out var targetModule)) { // 找到了就插入目标Module InsertSocket(targetModule.Socket); diff --git a/Assets/Scripts/FixSystemNew/ScanLine.cs b/Assets/Scripts/FixSystemNew/ScanLine.cs index 66c21deb0..262185089 100644 --- a/Assets/Scripts/FixSystemNew/ScanLine.cs +++ b/Assets/Scripts/FixSystemNew/ScanLine.cs @@ -8,31 +8,19 @@ namespace AibisDream.FixSystem { #region 组件索引 - private OscilloscopeScreen _screen; private LineRenderer _line; #endregion - #region 扫描线状态 - - private bool _isScanning; - - #endregion - #region 部分参数（后面改成从screen获取） - private float _screenHeight; - private float _screenWidth; - private float _screenLeftX; private float _screenRightX; private float _topY; private float _bottomY; - private float _spikeX; - - private float _scanSpeed; + private const float ScanSpeed = 2f; private event Action ScanErrorEvent; @@ -45,35 +33,40 @@ namespace AibisDream.FixSystem private void InitComponentRefs() { - _screen = transform.parent.GetComponent(); _line = GetComponent(); } - public IEnumerator ScanForError() + public IEnumerator ScanForError(float spikeX) { + _line.enabled = true; + FixSystemCenter.SystemDic.Get().isScanning = true; // 初始化扫描线 InitStartLine(); // 扫描线右移 var currentX = _screenLeftX; var lastX = currentX; - bool isSpikeFound = false; while (currentX <= _screenRightX) { // 横坐标右移 - currentX += Time.deltaTime * _scanSpeed; + currentX += Time.deltaTime * ScanSpeed; SetLinePos(currentX); - + // 检查是否扫到尖峰 - if (CheckSpikeInRange(lastX, currentX)) + if (CheckSpikeInRange(lastX, currentX, spikeX)) { - isSpikeFound = true; // 修改线条 - MarkLineAsError(); + MarkLineAsError(spikeX); // 触发扫描事件 yield return new WaitForSeconds(1f); ScanErrorEvent?.Invoke(); + break; } + + lastX = currentX; + yield return null; } + + FixSystemCenter.SystemDic.Get().isScanning = false; } private void InitStartLine() @@ -82,6 +75,8 @@ namespace AibisDream.FixSystem SetLinePos(_screenLeftX); _line.enabled = true; + _line.startColor = Color.white; + _line.endColor = Color.white; } private void SetLinePos(float posX) @@ -92,16 +87,16 @@ namespace AibisDream.FixSystem _line.SetPosition(1, bottomPosition); } - private bool CheckSpikeInRange(float x1, float x2) + private bool CheckSpikeInRange(float x1, float x2, float spikeX) { var left = Mathf.Min(x1, x2); var right = Mathf.Max(x1, x2); - return _spikeX >= left && _spikeX <= right; + return spikeX >= left && spikeX <= right; } - private void MarkLineAsError() + private void MarkLineAsError(float spikeX) { - SetLinePos(_spikeX); + SetLinePos(spikeX); _line.startColor = Color.red; _line.endColor = Color.red; } @@ -110,5 +105,14 @@ namespace AibisDream.FixSystem { _line.enabled = false; } + + public void SetScreenSize(float width, float height) + { + _screenLeftX = transform.position.x - width / 2; + _screenRightX = transform.position.x + width / 2; + + _topY = transform.position.y + height / 2; + _bottomY = transform.position.y - height / 2; + } } } \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/Socket.cs b/Assets/Scripts/FixSystemNew/Socket.cs index 55351b2e6..6abe89762 100644 --- a/Assets/Scripts/FixSystemNew/Socket.cs +++ b/Assets/Scripts/FixSystemNew/Socket.cs @@ -14,6 +14,7 @@ namespace AibisDream.FixSystem public class Socket : MonoBehaviour, ISocket { + private BodyModule _bodyModule; public bool IsAvailable { get; private set; } public void PlugIn() diff --git a/Assets/Scripts/FixSystemNew/SocketCommand.cs b/Assets/Scripts/FixSystemNew/SocketCommand.cs new file mode 100644 index 000000000..761ec6cb4 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/SocketCommand.cs @@ -0,0 +1,84 @@ +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 new file mode 100644 index 000000000..d05e5eb81 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/SocketCommand.cs.meta @@ -0,0 +1,3 @@ +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 new file mode 100644 index 000000000..56ddf291e --- /dev/null +++ b/Assets/Scripts/FixSystemNew/WaveSlider.cs @@ -0,0 +1,75 @@ +using System; +using UnityEngine; + +namespace AibisDream.FixSystem +{ + public class WaveSlider : MonoBehaviour + { + private OscilloscopeSystem _oscilloscopeSystem; + private OscilloscopeSystem OscilloscopeSystem + { + get + { + if (!_oscilloscopeSystem) + { + _oscilloscopeSystem = FixSystemCenter.SystemDic.Get(); + } + + return _oscilloscopeSystem; + } + } + + private Transform _slider; // 滑块的 Transform + + private Vector2 _startPos; + private Vector2 _endPos; + + public float Value { get; private set; } + + private void Awake() + { + InitComponentsRef(); + } + + private void InitComponentsRef() + { + _slider = transform.Find("Sliding Block"); + var startTrans = transform.Find("Slider Start Pos"); + var endTrans = transform.Find("Slider End Pos"); + + _startPos = new Vector2(startTrans.position.x, startTrans.position.y); + _endPos = new Vector2(endTrans.position.x, endTrans.position.y); + } + + public void InitSlider() + { + _slider.position = new Vector3(_startPos.x, _startPos.y, _slider.position.z); + } + + private void Update() + { + if (OscilloscopeSystem.isScanning) return; + + if (Input.GetMouseButton(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); + } + } + + private void UpdateValue(float curValue) + { + if (!Mathf.Approximately(curValue, Value)) + { + // 如果相位有更新，就同步给波形 + OscilloscopeSystem.AdjustPhaseShift(curValue); + Value = curValue; + } + } + } +} diff --git a/Assets/Scripts/FixSystemNew/WaveSlider.cs.meta b/Assets/Scripts/FixSystemNew/WaveSlider.cs.meta new file mode 100644 index 000000000..3025e03de --- /dev/null +++ b/Assets/Scripts/FixSystemNew/WaveSlider.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5c6494bd9d5943cf8e875ae582481cf1 +timeCreated: 1732863766 \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/WaveformLine.cs b/Assets/Scripts/FixSystemNew/WaveformLine.cs index adefe9242..6833ebbcb 100644 --- a/Assets/Scripts/FixSystemNew/WaveformLine.cs +++ b/Assets/Scripts/FixSystemNew/WaveformLine.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; using UnityEngine; using Random = UnityEngine.Random; @@ -16,11 +17,11 @@ namespace AibisDream.FixSystem private float _screenHeight; #region 状态 - + private bool _isWavePlaying; #endregion - + private WaveParam _waveParam; #region Line数据 @@ -46,8 +47,10 @@ namespace AibisDream.FixSystem _waveformData = new float[config.samples]; _noiseData = new float[config.samples]; _spikeData = new float[config.samples]; - _displayData = new float[config.samples]; + + _waveformLine.positionCount = config.samples; + _waveformLine.enabled = false; } private void InitComponentRefs() @@ -77,15 +80,16 @@ namespace AibisDream.FixSystem private void CalcLinePointsData() { // 分组计算: - var noiseData = GenerateNoiseData(); // 生成噪声 - var waveformData = GenerateWaveformData(); // 波形数据 + var waveformData = _waveParam.waveformType == WaveformType.Default + ? GenerateNoiseData() + : GenerateWaveformData(); // 波形数据 + // 计算错误数据 var spikeData = GenerateSpikeData(); // 错误尖峰数据 - // 合成最终结果 for (int i = 0; i < config.samples; i++) { // 正常线条加错误尖峰 - var lineValue = (_waveParam.isClarity ? waveformData[i] : noiseData[i]) + spikeData[i]; + var lineValue = waveformData[i] + spikeData[i]; _displayData[i] = Mathf.Clamp(lineValue, -_screenHeight / 1.8f, _screenHeight / 1.8f); } } @@ -102,27 +106,19 @@ namespace AibisDream.FixSystem private float[] GenerateWaveformData() { - if (_waveParam.isClarity) + // 计算波形 + for (int i = 0; i < config.samples; i++) { - // 计算波形 - for (int i = 0; i < config.samples; i++) + float basicAngle = TransIndexToAngle(i); + // 正波形 + float wavePoint = CalcLineValueByAngle(basicAngle); + // 如果有相位偏移 + if (_waveParam.PhaseShift > 0) { - float basicAngle = TransIndexToAngle(i); - // 正波形 - float wavePoint = CalcLineValueByAngle(basicAngle); - // 如果有相位偏移 - if (_waveParam.phaseShift > 0) - { - wavePoint -= CalcLineValueByAngle(basicAngle + _waveParam.phaseShift); - } - - _waveformData[i] = wavePoint; + wavePoint -= CalcLineValueByAngle(basicAngle + _waveParam.PhaseShift); } - } - else - { - // 此时没有波形，数组置为0 - Array.Clear(_waveformData, 0, _waveformData.Length); + + _waveformData[i] = wavePoint; } return _waveformData; @@ -154,7 +150,7 @@ namespace AibisDream.FixSystem private float[] GenerateSpikeData() { - if (_waveParam.isSpikeShowed) + if (CheckErrorShow()) { // 错误点可以显示 for (var i = 0; i < config.samples; i++) @@ -170,6 +166,18 @@ namespace AibisDream.FixSystem return _spikeData; } + + /// + /// 错误点是否已经可以定位 + /// + /// + private bool CheckErrorShow() + { + // 没有错误当然就不显示尖峰点 + if (_waveParam.spikeIdx == -1) return false; + // 尖峰点小于1/3时显示 + return _displayData[_waveParam.spikeIdx] < config.amplitude / 3f; + } private float CalcSpikeValueByIdx(int idx) { @@ -215,6 +223,32 @@ namespace AibisDream.FixSystem _waveformLine.endWidth = config.LineWidth; } + private int GeneSpikeIdx() + { + float[] waveData = GenerateWaveformData(); + int resIdx = GetRandomIndexFromTop20Percent(waveData); + Array.Clear(waveData, 0, waveData.Length); + + return resIdx; + } + + int GetRandomIndexFromTop20Percent(float[] array) + { + int n = array.Length; + int topCount = (int)Math.Ceiling(n * 0.2); + + var indexedArray = array + .Select((value, index) => new { Value = Math.Abs(value), Index = index }) + .OrderByDescending(item => item.Value) + .Take(topCount) + .Select(item => item.Index) + .ToArray(); + + int randomIndex = indexedArray[Random.Range(0, indexedArray.Length)]; + + return randomIndex; + } + #region 对外暴露 /// @@ -228,21 +262,24 @@ namespace AibisDream.FixSystem _screenWidth = width; } - /// - /// 设置波形参数 - /// - /// - public void SetWaveParam(WaveParam waveData) - { - _waveParam = waveData; - config.isClarity = waveData.isClarity; - } - /// /// 显示波形 /// - public void PlayWave() + public void PlayWave(WaveformType waveformType, float initialPhase, bool hasError) { + // 配置波形数据 + config.waveformType = waveformType; + _waveParam = new WaveParam + { + waveformType = waveformType, + spikeIdx = -1, + initPhaseShift = initialPhase, + varPhaseShift = 0 + }; + _waveParam.spikeIdx = hasError ? GeneSpikeIdx() : -1; + + // 进行播放 + _waveformLine.enabled = true; _isWavePlaying = true; } @@ -251,9 +288,44 @@ namespace AibisDream.FixSystem /// public void StopWave() { + // 清除数据 + config.waveformType = WaveformType.Default; + _waveParam = new WaveParam + { + waveformType = WaveformType.Default, + spikeIdx = -1, + initPhaseShift = 0, + varPhaseShift = 0 + }; + + // 停止 _isWavePlaying = false; + _waveformLine.enabled = false; } + /// + /// 获取尖峰点坐标 + /// + /// + public float GetSpikeX() + { + if (CheckErrorShow()) + { + return _waveParam.spikeIdx / (float)config.samples * _screenWidth - _screenWidth / 2; + } + + return float.NegativeInfinity; + } + + /// + /// 调整相位 + /// + /// 相位 + public void AdjustPhaseShift(float phaseShift) + { + _waveParam.varPhaseShift = phaseShift; + } + #endregion } @@ -271,33 +343,24 @@ namespace AibisDream.FixSystem public Color noiseColor = Color.gray; public Color clearColor = Color.green; - - public bool isClarity; - public Color LineColor => isClarity ? clearColor : noiseColor; - public float LineWidth => isClarity ? 0.05f : 0.02f; - public float AmplitudeScale => isClarity ? 1f : 0.2f; - public float AdjustedNoiseAmplitude => isClarity ? targetWaveformNoiseAmplitude : noiseAmplitude; + public WaveformType waveformType; + + public Color LineColor => waveformType != WaveformType.Default ? clearColor : noiseColor; + public float LineWidth => waveformType != WaveformType.Default ? 0.05f : 0.02f; + public float AmplitudeScale => waveformType != WaveformType.Default ? 1f : 0.2f; + + public float AdjustedNoiseAmplitude => + waveformType != WaveformType.Default ? targetWaveformNoiseAmplitude : noiseAmplitude; } public struct WaveParam { public WaveformType waveformType; - public float phaseShift; - public bool isClarity; - public bool isSpikeShowed; + public float initPhaseShift; public int spikeIdx; - } + public float varPhaseShift; - public enum WaveformType - { - Default, - Sine, - Square, - Triangle, - Sawtooth, - Noise, - Composite, - Pulse + public float PhaseShift => initPhaseShift + varPhaseShift; } } \ No newline at end of file diff --git a/Assets/Scripts/Framework/Core/Core.cs b/Assets/Scripts/Framework/Core/Core.cs index 7a5bf751c..0ce24163d 100644 --- a/Assets/Scripts/Framework/Core/Core.cs +++ b/Assets/Scripts/Framework/Core/Core.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using Newtonsoft.Json; +using UnityEngine; namespace AibisDream.Framework { @@ -42,20 +43,14 @@ namespace AibisDream.Framework public class IOCContainer { - private readonly Dictionary _instances = new Dictionary(); + private readonly Dictionary _instances = new(); public void Register(T instance) { var key = typeof(T); + Debug.Log(key.Name); - if (_instances.ContainsKey(key)) - { - _instances[key] = instance; - } - else - { - _instances.Add(key, instance); - } + _instances[key] = instance; } public T Get() where T : class diff --git a/Assets/Scripts/Framework/OtherKit/MonoCenter.cs b/Assets/Scripts/Framework/OtherKit/MonoCenter.cs index f46c77588..bde7ea165 100644 --- a/Assets/Scripts/Framework/OtherKit/MonoCenter.cs +++ b/Assets/Scripts/Framework/OtherKit/MonoCenter.cs @@ -1,4 +1,5 @@ using System; +using AibisDream.FixSystem; using UnityEngine; namespace AibisDream.Framework @@ -24,6 +25,7 @@ namespace AibisDream.Framework _iocContainer ??= new IOCContainer(); // 在这里添加相应的工具 Register(new MoveableSystem()); + Register(new WaveTest()); } private void Register(T kit) where T : IMonoKit @@ -41,6 +43,22 @@ namespace AibisDream.Framework private void Update() => OnUpdate?.Invoke(); } + public class WaveTest : IMonoKit + { + public void OnUpdate() + { + if (Input.GetKeyDown(KeyCode.Space)) + { + FixSystemCenter.SystemDic.Get().PlayWave(FixSystem.WaveformType.Sine, true); + } + + if (Input.GetKeyDown(KeyCode.A)) + { + FixSystemCenter.SystemDic.Get().StartScan(); + } + } + } + public interface IMonoKit { void OnUpdate(); diff --git a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs index 7afb2d07d..fda54c489 100644 --- a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs +++ b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs @@ -1,4 +1,5 @@ using System; +using AibisDream.FixSystem; using AibisDream.Utility; using UnityEngine; @@ -22,6 +23,11 @@ namespace AibisDream public event Action UpdateDashboard; + private void Awake() + { + FixSystemCenter.SystemDic.Register(this); + } + private void OnEnable() { engineData = new EngineData(invalidTime); diff --git a/Assets/Scripts/MiniGame/Gear/GearController.cs b/Assets/Scripts/MiniGame/Gear/GearController.cs index acde17dfa..d6528ac29 100644 --- a/Assets/Scripts/MiniGame/Gear/GearController.cs +++ b/Assets/Scripts/MiniGame/Gear/GearController.cs @@ -1,3 +1,4 @@ +using AibisDream.FixSystem; using AibisDream.Framework; using Framework.Core; using Unity.VisualScripting; @@ -38,6 +39,7 @@ namespace AibisDream public void Init() { + FixSystemCenter.SystemDic.Register(this); this.FindComponents(); _shafts = GetComponentsInChildren();