diff --git a/Assets/Resources/Art/Fix/Stone/身体维修界面导出_1227.psb b/Assets/Resources/Art/Fix/Stone/身体维修界面导出_1227.psb index 8c4bcc9fc..1edaa3ef7 100644 --- a/Assets/Resources/Art/Fix/Stone/身体维修界面导出_1227.psb +++ b/Assets/Resources/Art/Fix/Stone/身体维修界面导出_1227.psb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:366f8330044bb08ef1f76e7e32d18d6b2d4d76d9eb5ec8a7f8d9c78f64c7ae4a -size 25779028 +oid sha256:8adaa522724ad7bb2a47bbc024305587f948c2d51064d782cf1dc7cb9d814af1 +size 25769093 diff --git a/Assets/Resources/Art/Fix/Stone/身体维修界面导出_1227.psb.meta b/Assets/Resources/Art/Fix/Stone/身体维修界面导出_1227.psb.meta index 3bcbadf00..e66a3cd86 100644 --- a/Assets/Resources/Art/Fix/Stone/身体维修界面导出_1227.psb.meta +++ b/Assets/Resources/Art/Fix/Stone/身体维修界面导出_1227.psb.meta @@ -123,7 +123,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4056 - y: 1378 + y: 1549 width: 20 height: 43 spriteID: d7537a977e1aff249a7a37ce740f186d @@ -134,7 +134,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4056, y: 1378} + uvTransform: {x: 4056, y: 1549} spritePosition: {x: 1294, y: 1305} - name: "\u8F6C\u901F\u8868" originalName: @@ -143,8 +143,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3889 - y: 4845 + x: 3852 + y: 419 width: 176 height: 176 spriteID: 2fb82d105815d44428fdd68636d8529d @@ -155,7 +155,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3889, y: 4845} + uvTransform: {x: 3852, y: 419} spritePosition: {x: 1226, y: 1218} - name: "\u53D8\u901F\u7BB1\u63D2\u5B54" originalName: @@ -164,8 +164,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3984 - y: 224 + x: 4004 + y: 1763 width: 86 height: 86 spriteID: 0d86bbea963bd064fa75f3e32ddc6171 @@ -176,7 +176,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3984, y: 224} + uvTransform: {x: 4004, y: 1763} spritePosition: {x: 1182, y: 1058} - name: "\u9F7F\u8F6E\u6258\u76D8" originalName: @@ -188,7 +188,7 @@ ScriptedImporter: x: 3889 y: 4340 width: 195 - height: 497 + height: 603 spriteID: d856f692144af3a40a2545c3d836c740 spriteBone: [] spriteOutline: [] @@ -198,7 +198,7 @@ ScriptedImporter: edges: [] tessellationDetail: 0 uvTransform: {x: 3889, y: 4340} - spritePosition: {x: 2099, y: 772} + spritePosition: {x: 2099, y: 666} - name: "\u76D6\u5B50\u6746" originalName: pivot: {x: 0.5, y: 0.5} @@ -249,7 +249,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3852 - y: 940 + y: 1124 width: 162 height: 162 spriteID: ce498871e2f93464682178488c9f2eeb @@ -260,7 +260,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3852, y: 940} + uvTransform: {x: 3852, y: 1124} spritePosition: {x: 2165, y: 999} - name: "\u9AD8\u7EA7\u9F7F\u8F6EA" originalName: @@ -270,7 +270,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3852 - y: 593 + y: 777 width: 166 height: 165 spriteID: d1eef4db336a0a44b97a09b6c3f59b51 @@ -281,7 +281,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3852, y: 593} + uvTransform: {x: 3852, y: 777} spritePosition: {x: 1957, y: 1000} - name: "\u574F\u9F7F\u8F6EC" originalName: @@ -291,7 +291,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3852 - y: 1579 + y: 1763 width: 144 height: 154 spriteID: 5fe6954d52480e344a63304c96ad02ec @@ -302,7 +302,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3852, y: 1579} + uvTransform: {x: 3852, y: 1763} spritePosition: {x: 531, y: 1262} - name: "\u574F\u9F7F\u8F6EB" originalName: @@ -312,7 +312,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3852 - y: 1110 + y: 1294 width: 154 height: 166 spriteID: 7f6287eef393ecf4b811f77f2530ab60 @@ -323,7 +323,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3852, y: 1110} + uvTransform: {x: 3852, y: 1294} spritePosition: {x: 624, y: 1096} - name: "\u574F\u9F7F\u8F6EA" originalName: @@ -333,7 +333,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3852 - y: 766 + y: 950 width: 161 height: 166 spriteID: 892f0014245c39c48a1574f6adecda1a @@ -344,7 +344,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3852, y: 766} + uvTransform: {x: 3852, y: 950} spritePosition: {x: 442, y: 1104} - name: "\u788E\u7247E" originalName: @@ -354,7 +354,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4014 - y: 1378 + y: 1549 width: 34 height: 34 spriteID: 00173d16f3962a34da66f56604ff84fe @@ -365,7 +365,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4014, y: 1378} + uvTransform: {x: 4014, y: 1549} spritePosition: {x: 946, y: 777} - name: "\u788E\u7247D" originalName: @@ -374,8 +374,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3675 - y: 5549 + x: 3852 + y: 1925 width: 162 height: 105 spriteID: 25a080d1c30706f4b827080b388fd6ed @@ -386,7 +386,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3675, y: 5549} + uvTransform: {x: 3852, y: 1925} spritePosition: {x: 794, y: 772} - name: "\u788E\u7247C" originalName: @@ -395,8 +395,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3845 - y: 5549 + x: 3889 + y: 4951 width: 114 height: 92 spriteID: 7f63a61d19250aa44ac37596276ace1c @@ -407,7 +407,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3845, y: 5549} + uvTransform: {x: 3889, y: 4951} spritePosition: {x: 659, y: 780} - name: "\u788E\u7247B" originalName: @@ -416,8 +416,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4014 - y: 1284 + x: 4011 + y: 4951 width: 68 height: 86 spriteID: 0edfdf4071c16ce4197d75fa6a7c4f0d @@ -428,7 +428,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4014, y: 1284} + uvTransform: {x: 4011, y: 4951} spritePosition: {x: 592, y: 782} - name: "\u5531\u9488" originalName: @@ -438,7 +438,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4014 - y: 1110 + y: 1468 width: 76 height: 73 spriteID: 2ddca43741137c54ba5d7e72ff04353c @@ -449,7 +449,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4014, y: 1110} + uvTransform: {x: 4014, y: 1468} spritePosition: {x: 1504, y: 990} - name: "\u5531\u9488\u81C2" originalName: @@ -458,8 +458,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3175 - y: 5554 + x: 3675 + y: 5549 width: 293 height: 20 spriteID: 6adc419d9b00341419026a5802c9d8d6 @@ -470,7 +470,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3175, y: 5554} + uvTransform: {x: 3675, y: 5549} spritePosition: {x: 1606, y: 1026} - name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EA" originalName: @@ -480,7 +480,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3852 - y: 1284 + y: 1468 width: 154 height: 154 spriteID: 6c71322698065a54eb5e2a1fb4f86514 @@ -491,7 +491,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3852, y: 1284} + uvTransform: {x: 3852, y: 1468} spritePosition: {x: 1454, y: 1050} - name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EB" originalName: @@ -522,7 +522,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3852 - y: 419 + y: 603 width: 166 height: 166 spriteID: 33e8c8bbebb24d34286d612f0b261daa @@ -533,7 +533,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3852, y: 419} + uvTransform: {x: 3852, y: 603} spritePosition: {x: 1476, y: 824} - name: "\u53D8\u901F\u7BB1\u5531\u7247\u9F7F\u8F6E" originalName: @@ -564,7 +564,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4056 - y: 1429 + y: 1600 width: 0 height: 0 spriteID: 9e9c52a5ed9bedc49995cb646b5911c5 @@ -575,7 +575,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3894, y: 1269} + uvTransform: {x: 3894, y: 1440} spritePosition: {x: 1782, y: 1048} - name: "\u53D8\u901F\u7BB1" originalName: @@ -606,7 +606,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3852 - y: 1446 + y: 1630 width: 185 height: 125 spriteID: fa945402410b1f347a1469cfe5243495 @@ -617,7 +617,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3852, y: 1446} + uvTransform: {x: 3852, y: 1630} spritePosition: {x: 1073, y: 1212} - name: "\u62C9\u7EF3\u906E\u7F69" originalName: @@ -690,7 +690,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3984 - y: 318 + y: 114 width: 86 height: 86 spriteID: 51b6debf8b8e0c342962b76031b04cdc @@ -701,7 +701,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3984, y: 318} + uvTransform: {x: 3984, y: 114} spritePosition: {x: 900, y: 1231} - name: "\u5FC3\u810F\u76D6\u5B50" originalName: @@ -731,8 +731,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3852 - y: 1741 + x: 3983 + y: 6028 width: 16 height: 243 spriteID: d1fd39ae7def9f8429306cbdf5b6226c @@ -743,7 +743,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3852, y: 1741} + uvTransform: {x: 3983, y: 6028} spritePosition: {x: 1287, y: 1618} - name: "\u8FDB\u6C14\u5EA6\u91CF" originalName: @@ -752,8 +752,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3876 - y: 1741 + x: 3983 + y: 6279 width: 16 height: 243 spriteID: d504cc99c8f5dc14a9dca37818f3686a @@ -764,7 +764,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3876, y: 1741} + uvTransform: {x: 3983, y: 6279} spritePosition: {x: 1204, y: 1618} - name: "\u6C14\u95E8\u62C9\u6746" originalName: @@ -773,8 +773,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3876 - y: 1992 + x: 3984 + y: 208 width: 106 height: 28 spriteID: 0234a2ed53d4a2d44a7c0c9ae9a4c0b7 @@ -785,7 +785,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3876, y: 1992} + uvTransform: {x: 3984, y: 208} spritePosition: {x: 1031, y: 1666} - name: "\u62C9\u6746\u6C60" originalName: @@ -815,8 +815,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4064 - y: 1429 + x: 4056 + y: 1608 width: 0 height: 0 spriteID: c4af958de8260c04c998bba16422774b @@ -827,7 +827,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3878, y: 1243} + uvTransform: {x: 3870, y: 1422} spritePosition: {x: 1459, y: 1570} - name: "\u5FC3\u810F\u9F7F\u8F6EB" originalName: @@ -836,8 +836,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4072 - y: 1429 + x: 4056 + y: 1616 width: 0 height: 0 spriteID: 9e1fb2c4e71c07348835a03b647f2390 @@ -848,7 +848,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3866, y: 1222} + uvTransform: {x: 3850, y: 1409} spritePosition: {x: 1344, y: 1445} - name: "\u5FC3\u810F\u9F7F\u8F6EC" originalName: @@ -857,8 +857,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4056 - y: 1437 + x: 4064 + y: 1600 width: 0 height: 0 spriteID: 10cfd30a75e3f13498f0e156ee72fd9a @@ -869,7 +869,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3896, y: 1278} + uvTransform: {x: 3904, y: 1441} spritePosition: {x: 1295, y: 1611} - name: "\u5FC3\u810F\u9F7F\u8F6ED" originalName: @@ -879,7 +879,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4064 - y: 1437 + y: 1608 width: 0 height: 0 spriteID: 7b3c12797bd298e498872da80d3c9774 @@ -890,7 +890,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3828, y: 1201} + uvTransform: {x: 3828, y: 1372} spritePosition: {x: 1622, y: 1454} - name: "\u5FC3\u810F\u9F7F\u8F6EE" originalName: @@ -899,8 +899,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4072 - y: 1437 + x: 4064 + y: 1616 width: 0 height: 0 spriteID: b3746e118421a8f469f19af5c28ae880 @@ -911,7 +911,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3942, y: 1307} + uvTransform: {x: 3934, y: 1486} spritePosition: {x: 1541, y: 1536} - name: "\u5FC3\u810F\u5F15\u64CE" originalName: @@ -941,8 +941,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3967 - y: 5549 + x: 3852 + y: 2038 width: 100 height: 102 spriteID: 083fac6154604144c8a51ad9da1359f8 @@ -953,7 +953,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3967, y: 5549} + uvTransform: {x: 3852, y: 2038} spritePosition: {x: 1990, y: 1443} - name: "\u80C3\u63D2\u5B54" originalName: @@ -962,8 +962,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3984 - y: 4 + x: 3960 + y: 2038 width: 100 height: 102 spriteID: f29558bb0c039ec4f96c64e296bbd05b @@ -974,7 +974,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3984, y: 4} + uvTransform: {x: 3960, y: 2038} spritePosition: {x: 1018, y: 206} - name: "\u80C3" originalName: @@ -1005,7 +1005,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3984 - y: 114 + y: 4 width: 100 height: 102 spriteID: 435ef27b284ac1242a7e286c6c25d48b @@ -1016,7 +1016,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3984, y: 114} + uvTransform: {x: 3984, y: 4} spritePosition: {x: 1783, y: 446} - name: "\u809D" originalName: @@ -1201,7 +1201,7 @@ ScriptedImporter: parentIndex: 1 spriteID: d7537a977e1aff249a7a37ce740f186d layerID: 229 - mosaicPosition: {x: 4056, y: 1378} + mosaicPosition: {x: 4056, y: 1549} flatten: 0 isImported: 1 isVisible: 1 @@ -1211,7 +1211,7 @@ ScriptedImporter: parentIndex: 1 spriteID: 2fb82d105815d44428fdd68636d8529d layerID: 417 - mosaicPosition: {x: 3889, y: 4845} + mosaicPosition: {x: 3852, y: 419} flatten: 0 isImported: 1 isVisible: 1 @@ -1221,7 +1221,7 @@ ScriptedImporter: parentIndex: 1 spriteID: 0d86bbea963bd064fa75f3e32ddc6171 layerID: 260 - mosaicPosition: {x: 3984, y: 224} + mosaicPosition: {x: 4004, y: 1763} flatten: 0 isImported: 1 isVisible: 1 @@ -1271,7 +1271,7 @@ ScriptedImporter: parentIndex: 8 spriteID: ce498871e2f93464682178488c9f2eeb layerID: 786 - mosaicPosition: {x: 3852, y: 940} + mosaicPosition: {x: 3852, y: 1124} flatten: 0 isImported: 1 isVisible: 1 @@ -1281,7 +1281,7 @@ ScriptedImporter: parentIndex: 8 spriteID: d1eef4db336a0a44b97a09b6c3f59b51 layerID: 712 - mosaicPosition: {x: 3852, y: 593} + mosaicPosition: {x: 3852, y: 777} flatten: 0 isImported: 1 isVisible: 1 @@ -1301,7 +1301,7 @@ ScriptedImporter: parentIndex: 11 spriteID: 5fe6954d52480e344a63304c96ad02ec layerID: 698 - mosaicPosition: {x: 3852, y: 1579} + mosaicPosition: {x: 3852, y: 1763} flatten: 0 isImported: 1 isVisible: 1 @@ -1311,7 +1311,7 @@ ScriptedImporter: parentIndex: 11 spriteID: 7f6287eef393ecf4b811f77f2530ab60 layerID: 697 - mosaicPosition: {x: 3852, y: 1110} + mosaicPosition: {x: 3852, y: 1294} flatten: 0 isImported: 1 isVisible: 1 @@ -1321,7 +1321,7 @@ ScriptedImporter: parentIndex: 11 spriteID: 892f0014245c39c48a1574f6adecda1a layerID: 687 - mosaicPosition: {x: 3852, y: 766} + mosaicPosition: {x: 3852, y: 950} flatten: 0 isImported: 1 isVisible: 1 @@ -1341,7 +1341,7 @@ ScriptedImporter: parentIndex: 15 spriteID: 00173d16f3962a34da66f56604ff84fe layerID: 693 - mosaicPosition: {x: 4014, y: 1378} + mosaicPosition: {x: 4014, y: 1549} flatten: 0 isImported: 1 isVisible: 1 @@ -1351,7 +1351,7 @@ ScriptedImporter: parentIndex: 15 spriteID: 25a080d1c30706f4b827080b388fd6ed layerID: 691 - mosaicPosition: {x: 3675, y: 5549} + mosaicPosition: {x: 3852, y: 1925} flatten: 0 isImported: 1 isVisible: 1 @@ -1361,7 +1361,7 @@ ScriptedImporter: parentIndex: 15 spriteID: 7f63a61d19250aa44ac37596276ace1c layerID: 692 - mosaicPosition: {x: 3845, y: 5549} + mosaicPosition: {x: 3889, y: 4951} flatten: 0 isImported: 1 isVisible: 1 @@ -1371,7 +1371,7 @@ ScriptedImporter: parentIndex: 15 spriteID: 0edfdf4071c16ce4197d75fa6a7c4f0d layerID: 695 - mosaicPosition: {x: 4014, y: 1284} + mosaicPosition: {x: 4011, y: 4951} flatten: 0 isImported: 1 isVisible: 1 @@ -1401,7 +1401,7 @@ ScriptedImporter: parentIndex: 21 spriteID: 2ddca43741137c54ba5d7e72ff04353c layerID: 791 - mosaicPosition: {x: 4014, y: 1110} + mosaicPosition: {x: 4014, y: 1468} flatten: 0 isImported: 1 isVisible: 1 @@ -1411,7 +1411,7 @@ ScriptedImporter: parentIndex: 21 spriteID: 6adc419d9b00341419026a5802c9d8d6 layerID: 797 - mosaicPosition: {x: 3175, y: 5554} + mosaicPosition: {x: 3675, y: 5549} flatten: 0 isImported: 1 isVisible: 1 @@ -1421,7 +1421,7 @@ ScriptedImporter: parentIndex: 1 spriteID: 6c71322698065a54eb5e2a1fb4f86514 layerID: 287 - mosaicPosition: {x: 3852, y: 1284} + mosaicPosition: {x: 3852, y: 1468} flatten: 0 isImported: 1 isVisible: 1 @@ -1441,7 +1441,7 @@ ScriptedImporter: parentIndex: 1 spriteID: 33e8c8bbebb24d34286d612f0b261daa layerID: 280 - mosaicPosition: {x: 3852, y: 419} + mosaicPosition: {x: 3852, y: 603} flatten: 0 isImported: 1 isVisible: 1 @@ -1461,7 +1461,7 @@ ScriptedImporter: parentIndex: 1 spriteID: 9e9c52a5ed9bedc49995cb646b5911c5 layerID: 281 - mosaicPosition: {x: 4056, y: 1429} + mosaicPosition: {x: 4056, y: 1600} flatten: 0 isImported: 1 isVisible: 1 @@ -1481,7 +1481,7 @@ ScriptedImporter: parentIndex: 1 spriteID: fa945402410b1f347a1469cfe5243495 layerID: 254 - mosaicPosition: {x: 3852, y: 1446} + mosaicPosition: {x: 3852, y: 1630} flatten: 0 isImported: 1 isVisible: 1 @@ -1541,7 +1541,7 @@ ScriptedImporter: parentIndex: 35 spriteID: 51b6debf8b8e0c342962b76031b04cdc layerID: 307 - mosaicPosition: {x: 3984, y: 318} + mosaicPosition: {x: 3984, y: 114} flatten: 0 isImported: 1 isVisible: 1 @@ -1571,7 +1571,7 @@ ScriptedImporter: parentIndex: 38 spriteID: d1fd39ae7def9f8429306cbdf5b6226c layerID: 421 - mosaicPosition: {x: 3852, y: 1741} + mosaicPosition: {x: 3983, y: 6028} flatten: 0 isImported: 1 isVisible: 1 @@ -1581,7 +1581,7 @@ ScriptedImporter: parentIndex: 38 spriteID: d504cc99c8f5dc14a9dca37818f3686a layerID: 420 - mosaicPosition: {x: 3876, y: 1741} + mosaicPosition: {x: 3983, y: 6279} flatten: 0 isImported: 1 isVisible: 1 @@ -1591,7 +1591,7 @@ ScriptedImporter: parentIndex: 38 spriteID: 0234a2ed53d4a2d44a7c0c9ae9a4c0b7 layerID: 295 - mosaicPosition: {x: 3876, y: 1992} + mosaicPosition: {x: 3984, y: 208} flatten: 0 isImported: 1 isVisible: 1 @@ -1611,7 +1611,7 @@ ScriptedImporter: parentIndex: 38 spriteID: c4af958de8260c04c998bba16422774b layerID: 446 - mosaicPosition: {x: 4064, y: 1429} + mosaicPosition: {x: 4056, y: 1608} flatten: 0 isImported: 1 isVisible: 1 @@ -1621,7 +1621,7 @@ ScriptedImporter: parentIndex: 38 spriteID: 9e1fb2c4e71c07348835a03b647f2390 layerID: 445 - mosaicPosition: {x: 4072, y: 1429} + mosaicPosition: {x: 4056, y: 1616} flatten: 0 isImported: 1 isVisible: 1 @@ -1631,7 +1631,7 @@ ScriptedImporter: parentIndex: 38 spriteID: 10cfd30a75e3f13498f0e156ee72fd9a layerID: 444 - mosaicPosition: {x: 4056, y: 1437} + mosaicPosition: {x: 4064, y: 1600} flatten: 0 isImported: 1 isVisible: 1 @@ -1641,7 +1641,7 @@ ScriptedImporter: parentIndex: 38 spriteID: 7b3c12797bd298e498872da80d3c9774 layerID: 443 - mosaicPosition: {x: 4064, y: 1437} + mosaicPosition: {x: 4064, y: 1608} flatten: 0 isImported: 1 isVisible: 1 @@ -1651,7 +1651,7 @@ ScriptedImporter: parentIndex: 38 spriteID: b3746e118421a8f469f19af5c28ae880 layerID: 439 - mosaicPosition: {x: 4072, y: 1437} + mosaicPosition: {x: 4064, y: 1616} flatten: 0 isImported: 1 isVisible: 1 @@ -1671,7 +1671,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 083fac6154604144c8a51ad9da1359f8 layerID: 238 - mosaicPosition: {x: 3967, y: 5549} + mosaicPosition: {x: 3852, y: 2038} flatten: 0 isImported: 1 isVisible: 1 @@ -1681,7 +1681,7 @@ ScriptedImporter: parentIndex: -1 spriteID: f29558bb0c039ec4f96c64e296bbd05b layerID: 236 - mosaicPosition: {x: 3984, y: 4} + mosaicPosition: {x: 3960, y: 2038} flatten: 0 isImported: 1 isVisible: 1 @@ -1701,7 +1701,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 435ef27b284ac1242a7e286c6c25d48b layerID: 237 - mosaicPosition: {x: 3984, y: 114} + mosaicPosition: {x: 3984, y: 4} flatten: 0 isImported: 1 isVisible: 1 diff --git a/Assets/Resources/Yarn/FP_Shitou1/EventNode.yarn b/Assets/Resources/Yarn/FP_Shitou1/EventNode.yarn index b9dce4ff2..452e839df 100644 --- a/Assets/Resources/Yarn/FP_Shitou1/EventNode.yarn +++ b/Assets/Resources/Yarn/FP_Shitou1/EventNode.yarn @@ -46,7 +46,7 @@ title: AllGearsRunning <> <> <> -<> +<> <> <> === diff --git a/Assets/Resources/Yarn/FP_Shitou1/Shitou_Start.yarn b/Assets/Resources/Yarn/FP_Shitou1/Shitou_Start.yarn index de91f8394..e59971037 100644 --- a/Assets/Resources/Yarn/FP_Shitou1/Shitou_Start.yarn +++ b/Assets/Resources/Yarn/FP_Shitou1/Shitou_Start.yarn @@ -47,6 +47,7 @@ position: 205,199 // 齿轮掉出来了 <> +<> diff --git a/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn b/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn index 6d7008374..db825437d 100644 --- a/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn +++ b/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn @@ -78,7 +78,7 @@ position: 385,81 title: 进入阶段3 group: 出口 -position: 408,1551 +position: 393,1665 --- <> <> @@ -299,8 +299,9 @@ title: 变速箱 position: 371,414 --- -<> <> +<> +<> <> me: 还是第一次见…
一般机体可没有这么厉害的内燃机动力模块…还是涡轮增压的高级型号。 @@ -396,6 +397,7 @@ me: 听起来像是变速箱里的声音……我这就看看。 ->打开变速箱盖 <> + <> <> <> <> @@ -514,6 +516,7 @@ me: 我先给你安回去吧…但你别再加速了。不然还得飞出来。 === title: 齿轮第二次放回 +position: 383,1182 --- <> <> @@ -584,7 +587,7 @@ me: 让我找找…镍铬齿轮… === title: 更换镍铬齿轮 -position: 402,1263 +position: 387,1377 --- <> <> diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity index e76dbf3be..107dfd194 100644 --- a/Assets/Scenes/ExpressFixScene.unity +++ b/Assets/Scenes/ExpressFixScene.unity @@ -243,115 +243,6 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] ---- !u!1 &52857842 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 52857843} - - component: {fileID: 52857845} - - component: {fileID: 52857844} - m_Layer: 0 - m_Name: Pluggable Shaft1 - m_TagString: Shaft - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &52857843 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 52857842} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.861, y: -0.922, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 199118573} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &52857844 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 52857842} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 0 - shaftType: 3 - hasGear: 1 - gearProp: - isInitGearBroken: 0 - isInitGearDisc: 0 - initRadius: 0.5 - initSprite: {fileID: 4483447099526014788, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} - discIdx: 0 - childGear: {fileID: 0} - targetSpeed: 0 - speed: 0 ---- !u!212 &52857845 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 52857842} - 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: 1134468525 - m_SortingLayer: 10 - m_SortingOrder: 13 - m_Sprite: {fileID: -5530534795728576300, 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: 0.55} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &70067075 GameObject: m_ObjectHideFlags: 0 @@ -764,10 +655,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 609244613} - - {fileID: 2121862245} - - {fileID: 52857843} - - {fileID: 2067817005} + - {fileID: 983249799} + - {fileID: 442174155} + - {fileID: 352833558} + - {fileID: 1805296877} m_Father: {fileID: 657112469} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!21 &200439710 @@ -1375,7 +1266,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &358212954 +--- !u!1 &352833557 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1383,38 +1274,38 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 358212955} - - component: {fileID: 358212957} - - component: {fileID: 358212956} + - component: {fileID: 352833558} + - component: {fileID: 352833560} + - component: {fileID: 352833559} m_Layer: 0 - m_Name: Panel Shaft1 + m_Name: Pluggable Shaft1 m_TagString: Shaft m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &358212955 +--- !u!4 &352833558 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 358212954} + m_GameObject: {fileID: 352833557} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.015, y: 0.883, z: 0} + m_LocalPosition: {x: -1.861, y: -0.922, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 709691612} + m_Father: {fileID: 199118573} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &358212956 +--- !u!114 &352833559 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 358212954} + m_GameObject: {fileID: 352833557} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} @@ -1423,22 +1314,22 @@ MonoBehaviour: id: 0 shaftType: 2 hasGear: 1 - gearProp: NewGear + gearProp: isInitGearBroken: 0 isInitGearDisc: 0 - initRadius: 0.4 - initSprite: {fileID: -5248008505966526047, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} + initRadius: 0.5 + initSprite: {fileID: 4483447099526014788, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} discIdx: 0 childGear: {fileID: 0} targetSpeed: 0 speed: 0 ---- !u!212 &358212957 +--- !u!212 &352833560 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 358212954} + m_GameObject: {fileID: 352833557} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -1606,6 +1497,115 @@ MonoBehaviour: cantStopRunning: 0 showPicPath: checkPoints: [] +--- !u!1 &442174154 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 442174155} + - component: {fileID: 442174157} + - component: {fileID: 442174156} + m_Layer: 0 + m_Name: Pluggable Shaft2 + m_TagString: Shaft + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &442174155 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 442174154} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.54, y: -0.525, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 199118573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &442174156 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 442174154} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 2 + hasGear: 1 + gearProp: + isInitGearBroken: 0 + isInitGearDisc: 0 + initRadius: 0.3 + initSprite: {fileID: 4483447099526014788, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + discIdx: 0 + childGear: {fileID: 0} + targetSpeed: 0 + speed: 0 +--- !u!212 &442174157 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 442174154} + 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: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 13 + m_Sprite: {fileID: -5530534795728576300, 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: 0.55} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &448946530 GameObject: m_ObjectHideFlags: 0 @@ -2369,115 +2369,6 @@ Transform: - {fileID: 8292692516755928814} m_Father: {fileID: 657112469} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &609244612 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 609244613} - - component: {fileID: 609244615} - - component: {fileID: 609244614} - m_Layer: 0 - m_Name: Pluggable Shaft3 - m_TagString: Shaft - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &609244613 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 609244612} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.232, y: -0.319, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 199118573} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &609244614 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 609244612} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 0 - shaftType: 2 - hasGear: 1 - gearProp: - isInitGearBroken: 0 - isInitGearDisc: 1 - initRadius: 0.4 - initSprite: {fileID: -611960561148999933, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} - discIdx: 0 - childGear: {fileID: 0} - targetSpeed: 0 - speed: 0 ---- !u!212 &609244615 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 609244612} - 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: 1134468525 - m_SortingLayer: 10 - m_SortingOrder: 13 - m_Sprite: {fileID: -5530534795728576300, 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: 0.55} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &657112468 GameObject: m_ObjectHideFlags: 0 @@ -2965,7 +2856,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &709691612 Transform: m_ObjectHideFlags: 0 @@ -2979,9 +2870,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 358212955} - - {fileID: 961056072} - - {fileID: 953682127} + - {fileID: 829563470} + - {fileID: 1787608037} + - {fileID: 1655933441} + - {fileID: 1088641598} m_Father: {fileID: 657112469} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &709691613 @@ -4124,6 +4016,115 @@ SpriteMask: m_BackSortingOrder: 81 m_IsCustomRangeActive: 1 m_SpriteSortPoint: 0 +--- !u!1 &829563469 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 829563470} + - component: {fileID: 829563472} + - component: {fileID: 829563471} + m_Layer: 0 + m_Name: Panel Shaft1 + m_TagString: Shaft + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &829563470 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 829563469} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.001, y: 1.123, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 709691612} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &829563471 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 829563469} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 2 + hasGear: 1 + gearProp: NewGear + isInitGearBroken: 0 + isInitGearDisc: 0 + initRadius: 0.4 + initSprite: {fileID: -5248008505966526047, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} + discIdx: 0 + childGear: {fileID: 0} + targetSpeed: 0 + speed: 0 +--- !u!212 &829563472 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 829563469} + 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: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 13 + m_Sprite: {fileID: -5530534795728576300, 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: 0.55} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &857493863 GameObject: m_ObjectHideFlags: 0 @@ -4276,7 +4277,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &953682126 +--- !u!1 &983249798 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4284,38 +4285,38 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 953682127} - - component: {fileID: 953682129} - - component: {fileID: 953682128} + - component: {fileID: 983249799} + - component: {fileID: 983249801} + - component: {fileID: 983249800} m_Layer: 0 - m_Name: Panel Shaft3 + m_Name: Pluggable Shaft3 m_TagString: Shaft m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &953682127 +--- !u!4 &983249799 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 953682126} + m_GameObject: {fileID: 983249798} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.007, y: -0.898, z: 0} + m_LocalPosition: {x: -1.232, y: -0.319, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 709691612} + m_Father: {fileID: 199118573} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &953682128 +--- !u!114 &983249800 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 953682126} + m_GameObject: {fileID: 983249798} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} @@ -4323,7 +4324,7 @@ MonoBehaviour: m_EditorClassIdentifier: id: 0 shaftType: 2 - hasGear: 0 + hasGear: 1 gearProp: isInitGearBroken: 0 isInitGearDisc: 1 @@ -4333,122 +4334,13 @@ MonoBehaviour: childGear: {fileID: 0} targetSpeed: 0 speed: 0 ---- !u!212 &953682129 +--- !u!212 &983249801 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 953682126} - 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: 1134468525 - m_SortingLayer: 10 - m_SortingOrder: 13 - m_Sprite: {fileID: -5530534795728576300, 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: 0.55} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &961056071 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 961056072} - - component: {fileID: 961056074} - - component: {fileID: 961056073} - m_Layer: 0 - m_Name: Panel Shaft2 - m_TagString: Shaft - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &961056072 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 961056071} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.007, y: -0.076, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 709691612} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &961056073 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 961056071} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 0 - shaftType: 2 - hasGear: 0 - gearProp: - isInitGearBroken: 0 - isInitGearDisc: 0 - initRadius: 0.3 - initSprite: {fileID: 4483447099526014788, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} - discIdx: 0 - childGear: {fileID: 0} - targetSpeed: 0 - speed: 0 ---- !u!212 &961056074 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 961056071} + m_GameObject: {fileID: 983249798} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -4646,6 +4538,115 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &1088641597 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1088641598} + - component: {fileID: 1088641600} + - component: {fileID: 1088641599} + m_Layer: 0 + m_Name: Panel Shaft4 + m_TagString: Shaft + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1088641598 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1088641597} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.006, y: -1.273, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 709691612} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1088641599 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1088641597} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 2 + hasGear: 0 + gearProp: + isInitGearBroken: 0 + isInitGearDisc: 0 + initRadius: 0.3 + initSprite: {fileID: 4483447099526014788, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + discIdx: 0 + childGear: {fileID: 0} + targetSpeed: 0 + speed: 0 +--- !u!212 &1088641600 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1088641597} + 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: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 13 + m_Sprite: {fileID: -5530534795728576300, 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: 0.55} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1112213368 GameObject: m_ObjectHideFlags: 0 @@ -5600,11 +5601,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6771085378564992114, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} propertyPath: maxValue - value: 17000 + value: 50 objectReference: {fileID: 0} - target: {fileID: 6771085378564992114, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} propertyPath: currentValue - value: 1000 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8174416950032976404, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3} propertyPath: m_SizeDelta.x @@ -5671,6 +5672,115 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1655933440 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1655933441} + - component: {fileID: 1655933443} + - component: {fileID: 1655933442} + m_Layer: 0 + m_Name: Panel Shaft3 + m_TagString: Shaft + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1655933441 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1655933440} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.002, y: -0.392, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 709691612} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1655933442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1655933440} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 2 + hasGear: 1 + gearProp: NewGear + isInitGearBroken: 0 + isInitGearDisc: 1 + initRadius: 0.5 + initSprite: {fileID: -5248008505966526047, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} + discIdx: 0 + childGear: {fileID: 0} + targetSpeed: 0 + speed: 0 +--- !u!212 &1655933443 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1655933440} + 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: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 13 + m_Sprite: {fileID: -5530534795728576300, 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: 0.55} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1666048029 GameObject: m_ObjectHideFlags: 0 @@ -6172,6 +6282,115 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!1 &1787608036 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1787608037} + - component: {fileID: 1787608039} + - component: {fileID: 1787608038} + m_Layer: 0 + m_Name: Panel Shaft2 + m_TagString: Shaft + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1787608037 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1787608036} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.006, y: 0.362, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 709691612} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1787608038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1787608036} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 2 + hasGear: 1 + gearProp: NewGear + isInitGearBroken: 0 + isInitGearDisc: 0 + initRadius: 0.3 + initSprite: {fileID: -5248008505966526047, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} + discIdx: 0 + childGear: {fileID: 0} + targetSpeed: 0 + speed: 0 +--- !u!212 &1787608039 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1787608036} + 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: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 13 + m_Sprite: {fileID: -5530534795728576300, 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: 0.55} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1799105518 GameObject: m_ObjectHideFlags: 0 @@ -6267,6 +6486,115 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!1 &1805296876 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1805296877} + - component: {fileID: 1805296879} + - component: {fileID: 1805296878} + m_Layer: 0 + m_Name: Driver Shaft + m_TagString: Shaft + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1805296877 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805296876} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.263, y: 0.193, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 199118573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1805296878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805296876} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 0 + hasGear: 1 + gearProp: + isInitGearBroken: 0 + isInitGearDisc: 0 + initRadius: 0.49 + initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} + discIdx: 0 + childGear: {fileID: 0} + targetSpeed: 0 + speed: 0 +--- !u!212 &1805296879 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805296876} + 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: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 13 + m_Sprite: {fileID: -5530534795728576300, 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: 0.55} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!4 &1821936329 stripped Transform: m_CorrespondingSourceObject: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} @@ -6655,7 +6983,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 26.8, y: 0.07} + m_AnchoredPosition: {x: 26.807, y: 0.199} m_SizeDelta: {x: 10, y: 10} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2066386597 @@ -6741,115 +7069,6 @@ SpriteMask: m_BackSortingOrder: 59 m_IsCustomRangeActive: 1 m_SpriteSortPoint: 0 ---- !u!1 &2067817004 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2067817005} - - component: {fileID: 2067817007} - - component: {fileID: 2067817006} - m_Layer: 0 - m_Name: Driver Shaft - m_TagString: Shaft - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2067817005 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2067817004} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.263, y: 0.193, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 199118573} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2067817006 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2067817004} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 0 - shaftType: 0 - hasGear: 1 - gearProp: - isInitGearBroken: 0 - isInitGearDisc: 0 - initRadius: 0.49 - initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} - discIdx: 0 - childGear: {fileID: 0} - targetSpeed: 0 - speed: 0 ---- !u!212 &2067817007 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2067817004} - 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: 1134468525 - m_SortingLayer: 10 - m_SortingOrder: 13 - m_Sprite: {fileID: -5530534795728576300, 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: 0.55} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!21 &2091261678 Material: serializedVersion: 8 @@ -7314,115 +7533,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} m_PrefabInstance: {fileID: 2104582589} m_PrefabAsset: {fileID: 0} ---- !u!1 &2121862244 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2121862245} - - component: {fileID: 2121862247} - - component: {fileID: 2121862246} - m_Layer: 0 - m_Name: Pluggable Shaft2 - m_TagString: Shaft - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2121862245 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2121862244} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.54, y: -0.525, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 199118573} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2121862246 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2121862244} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 0 - shaftType: 3 - hasGear: 1 - gearProp: - isInitGearBroken: 0 - isInitGearDisc: 0 - initRadius: 0.3 - initSprite: {fileID: 4483447099526014788, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} - discIdx: 0 - childGear: {fileID: 0} - targetSpeed: 0 - speed: 0 ---- !u!212 &2121862247 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2121862244} - 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: 1134468525 - m_SortingLayer: 10 - m_SortingOrder: 13 - m_Sprite: {fileID: -5530534795728576300, 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: 0.55} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &2144716741 GameObject: m_ObjectHideFlags: 0 @@ -12672,7 +12782,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4214753503693131867, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7037918505330246345, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: field of view diff --git a/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs b/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs index 22f405b13..0e80bcbca 100644 --- a/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs +++ b/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs @@ -23,7 +23,7 @@ namespace AibisDream private void OnSpeedChange(float originSpeed, float speedScale) { _material.SetFloat(VibrateFade, originSpeed); - progress.CurrentValue = Mathf.RoundToInt(originSpeed * 16000 + 1000); + progress.CurrentValue = Mathf.RoundToInt(originSpeed * 50); } } } \ No newline at end of file diff --git a/Assets/Scripts/MiniGame/Gear/GearSystem.cs b/Assets/Scripts/MiniGame/Gear/GearSystem.cs index 60b8bfee9..de6d531a3 100644 --- a/Assets/Scripts/MiniGame/Gear/GearSystem.cs +++ b/Assets/Scripts/MiniGame/Gear/GearSystem.cs @@ -154,6 +154,10 @@ namespace AibisDream if (_shaftGraph.AllRunning()) { + if (_shaftGraph.AllNewGear()) + { + DialogController.Instance?.SetVariable("$allNewGear", true); + } DialogController.Instance?.StartDialogNode("AllGearsRunning"); } } diff --git a/Assets/Scripts/MiniGame/Gear/Shaft.cs b/Assets/Scripts/MiniGame/Gear/Shaft.cs index 98534a31c..3fb3bc4df 100644 --- a/Assets/Scripts/MiniGame/Gear/Shaft.cs +++ b/Assets/Scripts/MiniGame/Gear/Shaft.cs @@ -22,7 +22,7 @@ namespace AibisDream [SerializeField] private Sprite initSprite; [SerializeField] private int discIdx; - [SerializeField] private Gear childGear; + [SerializeField] public Gear childGear; // 目标角速度 [SerializeField] private float targetSpeed; diff --git a/Assets/Scripts/MiniGame/Gear/ShaftGraph.cs b/Assets/Scripts/MiniGame/Gear/ShaftGraph.cs index 8d3361310..6dae92ed3 100644 --- a/Assets/Scripts/MiniGame/Gear/ShaftGraph.cs +++ b/Assets/Scripts/MiniGame/Gear/ShaftGraph.cs @@ -8,13 +8,18 @@ namespace AibisDream { // 顶点数量 private readonly int _vertexSize; + // 顶点Map private readonly Shaft[] _vertexArray; + private Shaft[] _panelShafts; + // 邻接表 private float[,] _edgeTable; + // 遍历记录 private readonly bool[] _vertexRecordArray; + // 动力轴序号 private readonly int _rootIdx; @@ -29,6 +34,7 @@ namespace AibisDream { shaft.InitShaft(); } + foreach (var shaft in _panelShafts) { shaft.InitShaft(); @@ -36,7 +42,7 @@ namespace AibisDream // 寻找唯一的驱动轴序号 _rootIdx = FindDriverIdx(); - + // 生成边邻接表 GeneEdgeTable(); @@ -62,6 +68,16 @@ namespace AibisDream return _vertexArray.All(shaft => Mathf.Abs(shaft.speed) > 0.01f); } + /// + /// 是否所有齿轮都是新的 + /// + /// + public bool AllNewGear() + { + return _vertexArray.Where(shaft => shaft.shaftType != ShaftType.Driver).All(shaft => + shaft.childGear != null && shaft.childGear.gearProp == "NewGear"); + } + /// /// 初始化速度 /// @@ -71,7 +87,7 @@ namespace AibisDream _vertexArray[_rootIdx].speed = initSpeed; UpdateSpeed(); } - + public void Accelerate(float originSpeed, float speed) { foreach (var shaft in _vertexArray) @@ -128,7 +144,7 @@ namespace AibisDream // 找到对应idx int idx = TranInstanceIDToIdx(instanceID); if (idx == -1) return; - + // 更新该节点对应的邻接表 for (int i = 0; i < _vertexSize; i++) { @@ -150,7 +166,7 @@ namespace AibisDream _edgeTable[i, idx] = 0; } } - + UpdateSpeed(); } @@ -181,7 +197,7 @@ namespace AibisDream _vertexRecordArray[_rootIdx] = true; UpdateShaftSpeedByIdx(_rootIdx); UpdateUnreachableShafts(); - + // 更新完速度后统一更新动画 foreach (var shaft in _vertexArray) { @@ -218,7 +234,7 @@ namespace AibisDream } } } - + private void UpdateUnreachableShafts() { // 从Driver开始相连的齿轮全部更新后,剩下的齿轮置空 diff --git a/Assets/StreamingAssets/LevelData/GearSystem/stone_day1_2.json b/Assets/StreamingAssets/LevelData/GearSystem/stone_day1_2.json index e16889638..9a171afa4 100644 --- a/Assets/StreamingAssets/LevelData/GearSystem/stone_day1_2.json +++ b/Assets/StreamingAssets/LevelData/GearSystem/stone_day1_2.json @@ -1 +1 @@ -{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":null,"isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-1.232,"y":-0.319,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"},{"shaftName":"Pluggable Shaft2","shaftType":3,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.54,"y":-0.525,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Pluggable Shaft1","shaftType":3,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.861,"y":-0.922,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Driver Shaft","shaftType":0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.49,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.263,"y":0.193,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"}],"panelShaftArray":[{"shaftName":"Panel Shaft1","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":"NewGear","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.015,"y":0.883,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Panel Shaft2","shaftType":2,"targetSpeed":0.0,"hasChildGear":false,"radius":0.3,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.007,"y":-0.076,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Panel Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":false,"radius":0.4,"gearProp":null,"isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-0.007,"y":-0.898,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"}]} \ No newline at end of file +{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":"","isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-1.232,"y":-0.319,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"},{"shaftName":"Pluggable Shaft2","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.54,"y":-0.525,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Pluggable Shaft1","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.861,"y":-0.922,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Driver Shaft","shaftType":0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.49,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.263,"y":0.193,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"}],"panelShaftArray":[{"shaftName":"Panel Shaft1","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":"NewGear","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.001,"y":1.123,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Panel Shaft2","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":"NewGear","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.006,"y":0.362,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Panel Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":"NewGear","isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-0.002,"y":-0.392,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Panel Shaft4","shaftType":2,"targetSpeed":0.0,"hasChildGear":false,"radius":0.3,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.006,"y":-1.273,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"}]} \ No newline at end of file diff --git a/Assets/StreamingAssets/LevelData/GearSystem/temp.json b/Assets/StreamingAssets/LevelData/GearSystem/temp.json index d4de7c8d7..6dc5e561c 100644 --- a/Assets/StreamingAssets/LevelData/GearSystem/temp.json +++ b/Assets/StreamingAssets/LevelData/GearSystem/temp.json @@ -1 +1 @@ -{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":"","isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-1.232,"y":-0.319,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"},{"shaftName":"Pluggable Shaft2","shaftType":3,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.54,"y":-0.525,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Pluggable Shaft1","shaftType":3,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.861,"y":-0.922,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Driver Shaft","shaftType":0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.49,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.263,"y":0.193,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"}],"panelShaftArray":[{"shaftName":"Panel Shaft1","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":"NewGear","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.015,"y":0.883,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Panel Shaft2","shaftType":2,"targetSpeed":0.0,"hasChildGear":false,"radius":0.3,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.007,"y":-0.076,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Panel Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":false,"radius":0.4,"gearProp":"","isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-0.007,"y":-0.898,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"}]} \ No newline at end of file +{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":null,"isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-1.232,"y":-0.319,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"},{"shaftName":"Pluggable Shaft2","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.54,"y":-0.525,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Pluggable Shaft1","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.861,"y":-0.922,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Driver Shaft","shaftType":0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.49,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.263,"y":0.193,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"}],"panelShaftArray":[{"shaftName":"Panel Shaft1","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.015,"y":0.883,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Panel Shaft2","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.007,"y":-0.076,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Panel Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":null,"isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-0.007,"y":-0.898,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"}]} \ No newline at end of file