diff --git a/Assets/Resources/Art/Fix/Cooling/冷却系统.psb b/Assets/Resources/Art/Fix/Cooling/冷却系统.psb index 20633ac2c..dd4b08afd 100644 --- a/Assets/Resources/Art/Fix/Cooling/冷却系统.psb +++ b/Assets/Resources/Art/Fix/Cooling/冷却系统.psb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3561758311c360c15612f2fd685bbd7e930600f0f7a0fcc2f4de656aa2c416dc -size 189963066 +oid sha256:82542e27f0c5f255196389e82453a02b489b1577045c5b5a27c76693c2983096 +size 193386681 diff --git a/Assets/Resources/Art/Fix/Cooling/冷却系统.psb.meta b/Assets/Resources/Art/Fix/Cooling/冷却系统.psb.meta index 2cb2ae28f..b769d987d 100644 --- a/Assets/Resources/Art/Fix/Cooling/冷却系统.psb.meta +++ b/Assets/Resources/Art/Fix/Cooling/冷却系统.psb.meta @@ -101,7 +101,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3730 + x: 2371 y: 4 width: 3864 height: 1683 @@ -113,7 +113,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3730, y: 4} + uvTransform: {x: 2371, y: 4} spritePosition: {x: 4445, y: 1652} - name: "\u4E0B\u534A\u90E8\u5206\u9ED1\u8FB9" originalName: @@ -122,7 +122,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3730 + x: 2371 y: 1695 width: 3864 height: 1652 @@ -134,29 +134,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3730, y: 1695} + uvTransform: {x: 2371, y: 1695} spritePosition: {x: 4445, y: 0} - - name: "\u6CF5\u673A\u4FA7\u906E\u7F69" - originalName: - pivot: {x: 0.5, y: 0.5} - alignment: 0 - border: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 4 - y: 4 - width: 3718 - height: 3335 - spriteID: e65a21221e4e74e40aa6deeef44b5d96 - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 4, y: 4} - spritePosition: {x: 4468, y: 0} - name: "\u63D2\u7EBF" originalName: pivot: {x: 0.5, y: 0.5} @@ -164,8 +143,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3730 - y: 6655 + x: 6243 + y: 843 width: 1926 height: 540 spriteID: 3a1f79906b14d3d43984d90c00e40bb3 @@ -176,7 +155,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3730, y: 6655} + uvTransform: {x: 6243, y: 843} spritePosition: {x: 881, y: 2281} - name: "\u624B" originalName: @@ -185,8 +164,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4 - y: 11979 + x: 2371 + y: 8601 width: 1465 height: 3145 spriteID: 01d3bf2e82558464a8edc19e50ef61fb @@ -197,7 +176,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 11979} + uvTransform: {x: 2371, y: 8601} spritePosition: {x: 2548, y: 190} - name: "\u8499\u592A\u5947\u80CC\u666Fa" originalName: @@ -207,7 +186,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4 - y: 6690 + y: 3347 width: 2328 height: 3335 spriteID: 4de9bb798cf7f2848ae9b92501c07306 @@ -218,7 +197,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 6690} + uvTransform: {x: 4, y: 3347} spritePosition: {x: 2117, y: 0} - name: "\u4E0A\u4E0B\u5361\u6263" originalName: @@ -227,8 +206,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 2589 - y: 11114 + x: 7655 + y: 4 width: 326 height: 773 spriteID: fc3da10066e1fb74fa4708eec44e1da0 @@ -239,7 +218,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 2589, y: 11114} + uvTransform: {x: 7655, y: 4} spritePosition: {x: 6778, y: 290} - name: "\u5361\u6263\u906E\u7F69" originalName: @@ -248,8 +227,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4 - y: 10033 + x: 2371 + y: 6655 width: 2577 height: 1938 spriteID: bc6e04c104c460e41a04c0e6b3eca479 @@ -260,7 +239,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 10033} + uvTransform: {x: 2371, y: 6655} spritePosition: {x: 5653, y: 246} - name: "\u5355\u4FA7\u5361\u6263" originalName: @@ -269,8 +248,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 5297 - y: 7203 + x: 7406 + y: 4393 width: 247 height: 596 spriteID: 3978ab43f8145df4299872d450e8f296 @@ -281,7 +260,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 5297, y: 7203} + uvTransform: {x: 7406, y: 4393} spritePosition: {x: 7387, y: 391} - name: "\u5DE6\u53F3\u5361\u6263" originalName: @@ -290,8 +269,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3730 - y: 7203 + x: 2371 + y: 12703 width: 1559 height: 596 spriteID: f8f957a7f2c173e4b88f2cf370e6e036 @@ -302,7 +281,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3730, y: 7203} + uvTransform: {x: 2371, y: 12703} spritePosition: {x: 7338, y: 467} - name: "\u5E9F\u6DB2 " originalName: @@ -311,8 +290,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 2589 - y: 10033 + x: 6243 + y: 4481 width: 1063 height: 319 spriteID: 059a9efa1fe54a5469547ff962a6dcb4 @@ -323,7 +302,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 2589, y: 10033} + uvTransform: {x: 6243, y: 4481} spritePosition: {x: 6456, y: 499} - name: "\u6CF5\u673A\u4E0A\u7684\u74F6\u5B50" originalName: @@ -332,8 +311,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3730 - y: 7807 + x: 2371 + y: 13307 width: 1551 height: 561 spriteID: 5707d58b204a1e24793fde6fa8db94c4 @@ -344,7 +323,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3730, y: 7807} + uvTransform: {x: 2371, y: 13307} spritePosition: {x: 6162, y: 377} - name: "\u56FE\u5C42 670" originalName: @@ -353,8 +332,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1477 - y: 15237 + x: 6243 + y: 4 width: 1404 height: 831 spriteID: df7beb9cf07d33d4a96f26b47872d802 @@ -365,7 +344,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1477, y: 15237} + uvTransform: {x: 6243, y: 4} spritePosition: {x: 4524, y: 226} - name: "\u73BB\u7483\u7F69 \u62F7\u8D1D" originalName: @@ -374,8 +353,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 2589 - y: 10360 + x: 3919 + y: 14435 width: 873 height: 369 spriteID: cc62582901e59c048879b9532223b065 @@ -386,7 +365,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 2589, y: 10360} + uvTransform: {x: 3919, y: 14435} spritePosition: {x: 4534, y: 267} - name: "\u6CF5\u673A\u7EC4\u4EF6I \u62F7\u8D1D" originalName: @@ -395,8 +374,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3594 - y: 10360 + x: 4851 + y: 16026 width: 92 height: 348 spriteID: 6c946d40eaf993244a2a915aa2de0736 @@ -407,7 +386,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3594, y: 10360} + uvTransform: {x: 4851, y: 16026} spritePosition: {x: 4534, y: 277} - name: "\u6CF5\u673A\u7EC4\u4EF6 \u62F7\u8D1D 2" originalName: @@ -416,8 +395,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 8031 - y: 6283 + x: 4727 + y: 16026 width: 116 height: 301 spriteID: 9b231a2c310895f47b841a0d9f9f9e3b @@ -428,7 +407,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 8031, y: 6283} + uvTransform: {x: 4727, y: 16026} spritePosition: {x: 4600, y: 299} - name: "\u73BB\u7483\u7F69 " originalName: @@ -437,8 +416,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 2589 - y: 10737 + x: 3925 + y: 13876 width: 873 height: 369 spriteID: 7da335462b7085744b6926d696fcc308 @@ -449,7 +428,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 2589, y: 10737} + uvTransform: {x: 3925, y: 13876} spritePosition: {x: 4534, y: 665} - name: "\u6CF5\u673A\u7EC4\u4EF6I " originalName: @@ -458,8 +437,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3470 - y: 10737 + x: 4806 + y: 13876 width: 92 height: 348 spriteID: bf5753c6100cc7641946eceaffb2e273 @@ -470,7 +449,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3470, y: 10737} + uvTransform: {x: 4806, y: 13876} spritePosition: {x: 4534, y: 675} - name: "\u6CF5\u673A\u7EC4\u4EF6 \u62F7\u8D1D" originalName: @@ -479,8 +458,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3470 - y: 10360 + x: 4800 + y: 14435 width: 116 height: 301 spriteID: 1ef8f714cc91e544888db7dea24956d9 @@ -491,7 +470,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3470, y: 10360} + uvTransform: {x: 4800, y: 14435} spritePosition: {x: 4600, y: 697} - name: "\u6DF7\u5408\u6DB2\u4F53" originalName: @@ -500,8 +479,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 2923 - y: 11114 + x: 2371 + y: 15541 width: 340 height: 739 spriteID: ccf17fd5f377c8f4ca7ef3a4ebc44940 @@ -512,7 +491,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 2921, y: 11113} + uvTransform: {x: 2369, y: 15540} spritePosition: {x: 5531, y: 276} - name: "\u6CF5\u673A\u5F00\u5173" originalName: @@ -521,8 +500,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 7602 - y: 3055 + x: 3919 + y: 16026 width: 353 height: 145 spriteID: 67c4dadcb5b435a4692637b1d443cfef @@ -533,7 +512,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 7602, y: 3055} + uvTransform: {x: 3919, y: 16026} spritePosition: {x: 5261, y: 1355} - name: "\u5361\u6263\u5F00\u5173" originalName: @@ -542,8 +521,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 5278 - y: 8935 + x: 3919 + y: 16179 width: 353 height: 145 spriteID: 221fd10a017a40447b0657be39ad26f1 @@ -554,7 +533,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 5278, y: 8935} + uvTransform: {x: 3919, y: 16179} spritePosition: {x: 6997, y: 1355} - name: "\u6CF5\u673A\u5F00\u5173\u6309\u4E0B" originalName: @@ -563,8 +542,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 7602 - y: 2733 + x: 7722 + y: 6283 width: 379 height: 153 spriteID: 00a888cbbead22c48a34162da8cc50cc @@ -575,7 +554,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 7602, y: 2733} + uvTransform: {x: 7722, y: 6283} spritePosition: {x: 5219, y: 1353} - name: "\u5361\u6263\u5F00\u5173\u6309\u4E0B" originalName: @@ -584,8 +563,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 7602 - y: 2894 + x: 7722 + y: 6444 width: 379 height: 153 spriteID: 5a777be5b8ad3044391c6c90d049d627 @@ -596,7 +575,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 7602, y: 2894} + uvTransform: {x: 7722, y: 6444} spritePosition: {x: 6969, y: 1353} - name: "\u673A\u5668\u5E95\u56FE" originalName: @@ -605,7 +584,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3730 + x: 2371 y: 3355 width: 3864 height: 1652 @@ -617,7 +596,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3730, y: 3355} + uvTransform: {x: 2371, y: 3355} spritePosition: {x: 4445, y: 0} - name: "\u7F69\u5B50\u63CF\u8FB9" originalName: @@ -626,8 +605,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1477 - y: 11979 + x: 6243 + y: 5015 width: 1471 height: 1630 spriteID: 9436778b5280eef4cafb2ee3dc112de5 @@ -638,7 +617,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1477, y: 11979} + uvTransform: {x: 6243, y: 5015} spritePosition: {x: 5479, y: 1701} - name: "\u7F69\u5B50" originalName: @@ -647,8 +626,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1477 - y: 13617 + x: 6243 + y: 1695 width: 1435 height: 1612 spriteID: 28fedeb2176ee2c4a88ae05b9f76ab6d @@ -659,7 +638,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1477, y: 13617} + uvTransform: {x: 6243, y: 1695} spritePosition: {x: 5501, y: 1705} - name: "\u6CF5\u673A\u7EC4\u4EF6a" originalName: @@ -668,8 +647,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 2371 - y: 3347 + x: 3535 + y: 11754 width: 1341 height: 423 spriteID: ab79819af6db10f41a8621e8a90683d9 @@ -680,7 +659,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 2371, y: 3347} + uvTransform: {x: 3535, y: 11754} spritePosition: {x: 5551, y: 2798} - name: "\u6CF5\u673A\u7EC4\u4EF6b" originalName: @@ -689,8 +668,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4 - y: 15132 + x: 6243 + y: 3355 width: 1155 height: 1118 spriteID: 05b27b858f998994ca487cf2b20d9018 @@ -701,8 +680,29 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 15132} + uvTransform: {x: 6243, y: 3355} spritePosition: {x: 5650, y: 1769} + - name: "\u6CF5\u5934\u906E\u7F69" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 2371 + y: 11754 + width: 1156 + height: 941 + spriteID: 2eedb6c9926af074fa96e875c5558b8d + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 2371, y: 11754} + spritePosition: {x: 7393, y: 1266} - name: "\u6CF5\u673A\u8FD0\u4F5C\u65F6\u4EAE\u706F" originalName: pivot: {x: 0.5, y: 0.5} @@ -710,8 +710,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 7602 - y: 6053 + x: 4298 + y: 16026 width: 421 height: 222 spriteID: 0866853066cf32e44941c0d229efd545 @@ -722,7 +722,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 7602, y: 6053} + uvTransform: {x: 4298, y: 16026} spritePosition: {x: 4484, y: 2146} - name: "\u9ED1\u5C4F" originalName: @@ -731,8 +731,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 7602 - y: 6283 + x: 7722 + y: 6053 width: 421 height: 222 spriteID: f131b1d457c4c3649b6e1537e6ece2b9 @@ -743,7 +743,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 7602, y: 6283} + uvTransform: {x: 7722, y: 6053} spritePosition: {x: 4484, y: 2146} - name: "\u684C\u9762\u5E95\u56FE" originalName: @@ -752,7 +752,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3730 + x: 2371 y: 5015 width: 3864 height: 1632 @@ -764,7 +764,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3730, y: 5015} + uvTransform: {x: 2371, y: 5015} spritePosition: {x: 4445, y: 1703} - name: "\u74F6\u5B50a \u6C34\u5E73" originalName: @@ -773,8 +773,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3730 - y: 8935 + x: 2371 + y: 14435 width: 1540 height: 545 spriteID: 12a7e55b5f91e084dbee27d8e5591ed0 @@ -785,7 +785,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3730, y: 8935} + uvTransform: {x: 2371, y: 14435} spritePosition: {x: 119, y: 2676} - name: "\u74F6\u5B50a" originalName: @@ -794,8 +794,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 7602 - y: 5015 + x: 7406 + y: 3355 width: 372 height: 1030 spriteID: befed22d44f6ff0489f2c64c5a07342c @@ -806,7 +806,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 7602, y: 5015} + uvTransform: {x: 7406, y: 3355} spritePosition: {x: 2506, y: 2032} - name: "\u74F6\u5B50b \u6C34\u5E73" originalName: @@ -815,8 +815,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3730 - y: 9488 + x: 2371 + y: 14988 width: 1540 height: 545 spriteID: 649e198bb20f18d4dab82073c056be61 @@ -827,7 +827,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3730, y: 9488} + uvTransform: {x: 2371, y: 14988} spritePosition: {x: 131, y: 1812} - name: "\u74F6\u5B50b" originalName: @@ -836,8 +836,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 7602 - y: 3355 + x: 3919 + y: 14988 width: 371 height: 1030 spriteID: 7271942ecedc8d048a88b5217835f321 @@ -848,7 +848,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 7602, y: 3355} + uvTransform: {x: 3919, y: 14988} spritePosition: {x: 3064, y: 2032} - name: "\u74F6\u5B50c \u6C34\u5E73" originalName: @@ -857,8 +857,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3730 - y: 8376 + x: 2371 + y: 13876 width: 1546 height: 551 spriteID: 186f1169147202743be6e48ca7476b73 @@ -869,7 +869,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3730, y: 8376} + uvTransform: {x: 2371, y: 13876} spritePosition: {x: 140, y: 916} - name: "\u74F6\u5B50c" originalName: @@ -878,8 +878,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 2889 - y: 15237 + x: 7722 + y: 5015 width: 375 height: 1030 spriteID: cdddcc753bd920845a19ee65c4c8637e @@ -890,7 +890,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 2889, y: 15237} + uvTransform: {x: 7722, y: 5015} spritePosition: {x: 3659, y: 2032} - name: "\u74F6\u5B50d" originalName: @@ -899,8 +899,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 7602 - y: 1695 + x: 7786 + y: 3355 width: 372 height: 1030 spriteID: 92ef6198f44ea8240b899bfa57ebe3a3 @@ -911,7 +911,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 7602, y: 1695} + uvTransform: {x: 7786, y: 3355} spritePosition: {x: 2506, y: 463} - name: "\u74F6\u5B50e" originalName: @@ -920,8 +920,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 7602 - y: 4 + x: 4298 + y: 14988 width: 371 height: 1030 spriteID: a0dfade01566d6344bdff45647338ca9 @@ -932,7 +932,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 7602, y: 4} + uvTransform: {x: 4298, y: 14988} spritePosition: {x: 3064, y: 463} - name: "\u74F6\u5B50f" originalName: @@ -941,8 +941,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3272 - y: 15237 + x: 7686 + y: 1695 width: 375 height: 1030 spriteID: c6199de03a7948f4189b5bad29d094c5 @@ -953,7 +953,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3272, y: 15237} + uvTransform: {x: 7686, y: 1695} spritePosition: {x: 3659, y: 463} - name: F originalName: @@ -962,8 +962,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 8053 - y: 2733 + x: 8109 + y: 6444 width: 52 height: 60 spriteID: 0be775295da15e145afad69de728ea5c @@ -974,7 +974,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 8053, y: 2733} + uvTransform: {x: 8109, y: 6444} spritePosition: {x: 3828, y: 192} - name: E originalName: @@ -983,8 +983,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 8113 - y: 2733 + x: 8109 + y: 6512 width: 52 height: 60 spriteID: a698f66885ae57c4bb4b2bbe5f0f8acc @@ -995,7 +995,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 8113, y: 2733} + uvTransform: {x: 8109, y: 6512} spritePosition: {x: 3226, y: 192} - name: D originalName: @@ -1004,8 +1004,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 7989 - y: 2733 + x: 8109 + y: 6351 width: 56 height: 60 spriteID: da1f5e1b43b06cd44bb8db0f2a158e7f @@ -1016,7 +1016,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 7989, y: 2733} + uvTransform: {x: 8109, y: 6351} spritePosition: {x: 2670, y: 192} - name: C originalName: @@ -1025,8 +1025,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 7989 - y: 2801 + x: 4806 + y: 14232 width: 50 height: 60 spriteID: 0a39a0d1a490bee43a9a0c6825d83dab @@ -1037,7 +1037,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 7989, y: 2801} + uvTransform: {x: 4806, y: 14232} spritePosition: {x: 3830, y: 1774} - name: B originalName: @@ -1046,8 +1046,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3535 - y: 10669 + x: 8109 + y: 6580 width: 51 height: 60 spriteID: 67f8b56c41a4d5d42aa1963c90b61eda @@ -1058,7 +1058,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3535, y: 10669} + uvTransform: {x: 8109, y: 6580} spritePosition: {x: 3226, y: 1774} - name: A originalName: @@ -1067,8 +1067,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3470 - y: 10669 + x: 8109 + y: 6283 width: 57 height: 60 spriteID: 02a98e6a8ebe48948b6951e48a8376b2 @@ -1079,7 +1079,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3470, y: 10669} + uvTransform: {x: 8109, y: 6283} spritePosition: {x: 2667, y: 1774} - name: "\u684C\u9762\u5730\u56FE" originalName: @@ -1089,7 +1089,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4 - y: 3347 + y: 4 width: 2359 height: 3335 spriteID: 345e8b49e3454934081e7e932cee4d7c @@ -1100,7 +1100,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: -3, y: 3347} + uvTransform: {x: -3, y: 4} spritePosition: {x: 2126, y: 0} characterData: bones: [] @@ -1262,7 +1262,7 @@ ScriptedImporter: parentIndex: 5 spriteID: 92c0f6459866c794b84ec1e851e54ce7 layerID: 4116 - mosaicPosition: {x: 3730, y: 4} + mosaicPosition: {x: 2371, y: 4} flatten: 0 isImported: 1 isVisible: 1 @@ -1272,7 +1272,7 @@ ScriptedImporter: parentIndex: 5 spriteID: 516582272cdbbd249ba79784470c0750 layerID: 4351 - mosaicPosition: {x: 3730, y: 1695} + mosaicPosition: {x: 2371, y: 1695} flatten: 0 isImported: 1 isVisible: 1 @@ -1284,8 +1284,8 @@ ScriptedImporter: layerID: 4973 mosaicPosition: {x: 4, y: 4} flatten: 0 - isImported: 1 - isVisible: 1 + isImported: 0 + isVisible: 0 - name: "\u6362\u6DB2\u8BBE\u5907\u63D2\u7BA1\u8499\u592A\u5947" spriteName: isGroup: 1 @@ -1302,7 +1302,7 @@ ScriptedImporter: parentIndex: 9 spriteID: 3a1f79906b14d3d43984d90c00e40bb3 layerID: 4237 - mosaicPosition: {x: 3730, y: 6655} + mosaicPosition: {x: 6243, y: 843} flatten: 0 isImported: 1 isVisible: 1 @@ -1312,7 +1312,7 @@ ScriptedImporter: parentIndex: 9 spriteID: 01d3bf2e82558464a8edc19e50ef61fb layerID: 4236 - mosaicPosition: {x: 4, y: 11979} + mosaicPosition: {x: 2371, y: 8601} flatten: 0 isImported: 1 isVisible: 1 @@ -1322,7 +1322,7 @@ ScriptedImporter: parentIndex: 9 spriteID: 4de9bb798cf7f2848ae9b92501c07306 layerID: 4350 - mosaicPosition: {x: 4, y: 6690} + mosaicPosition: {x: 4, y: 3347} flatten: 0 isImported: 1 isVisible: 1 @@ -1432,7 +1432,7 @@ ScriptedImporter: parentIndex: 22 spriteID: fc3da10066e1fb74fa4708eec44e1da0 layerID: 4144 - mosaicPosition: {x: 2589, y: 11114} + mosaicPosition: {x: 7655, y: 4} flatten: 0 isImported: 1 isVisible: 1 @@ -1442,7 +1442,7 @@ ScriptedImporter: parentIndex: 22 spriteID: bc6e04c104c460e41a04c0e6b3eca479 layerID: 4948 - mosaicPosition: {x: 4, y: 10033} + mosaicPosition: {x: 2371, y: 6655} flatten: 0 isImported: 1 isVisible: 1 @@ -1452,7 +1452,7 @@ ScriptedImporter: parentIndex: 22 spriteID: 3978ab43f8145df4299872d450e8f296 layerID: 4941 - mosaicPosition: {x: 5297, y: 7203} + mosaicPosition: {x: 7406, y: 4393} flatten: 0 isImported: 1 isVisible: 1 @@ -1462,7 +1462,7 @@ ScriptedImporter: parentIndex: 22 spriteID: f8f957a7f2c173e4b88f2cf370e6e036 layerID: 4119 - mosaicPosition: {x: 3730, y: 7203} + mosaicPosition: {x: 2371, y: 12703} flatten: 0 isImported: 1 isVisible: 1 @@ -1472,7 +1472,7 @@ ScriptedImporter: parentIndex: 22 spriteID: 059a9efa1fe54a5469547ff962a6dcb4 layerID: 4118 - mosaicPosition: {x: 2589, y: 10033} + mosaicPosition: {x: 6243, y: 4481} flatten: 0 isImported: 1 isVisible: 1 @@ -1482,7 +1482,7 @@ ScriptedImporter: parentIndex: 22 spriteID: 5707d58b204a1e24793fde6fa8db94c4 layerID: 4117 - mosaicPosition: {x: 3730, y: 7807} + mosaicPosition: {x: 2371, y: 13307} flatten: 0 isImported: 1 isVisible: 1 @@ -1502,7 +1502,7 @@ ScriptedImporter: parentIndex: 29 spriteID: df7beb9cf07d33d4a96f26b47872d802 layerID: 4717 - mosaicPosition: {x: 1477, y: 15237} + mosaicPosition: {x: 6243, y: 4} flatten: 0 isImported: 1 isVisible: 1 @@ -1512,7 +1512,7 @@ ScriptedImporter: parentIndex: 29 spriteID: cc62582901e59c048879b9532223b065 layerID: 4273 - mosaicPosition: {x: 2589, y: 10360} + mosaicPosition: {x: 3919, y: 14435} flatten: 0 isImported: 1 isVisible: 1 @@ -1522,7 +1522,7 @@ ScriptedImporter: parentIndex: 29 spriteID: 6c946d40eaf993244a2a915aa2de0736 layerID: 4272 - mosaicPosition: {x: 3594, y: 10360} + mosaicPosition: {x: 4851, y: 16026} flatten: 0 isImported: 1 isVisible: 1 @@ -1532,7 +1532,7 @@ ScriptedImporter: parentIndex: 29 spriteID: 9b231a2c310895f47b841a0d9f9f9e3b layerID: 4271 - mosaicPosition: {x: 8031, y: 6283} + mosaicPosition: {x: 4727, y: 16026} flatten: 0 isImported: 1 isVisible: 1 @@ -1542,7 +1542,7 @@ ScriptedImporter: parentIndex: 29 spriteID: 7da335462b7085744b6926d696fcc308 layerID: 4141 - mosaicPosition: {x: 2589, y: 10737} + mosaicPosition: {x: 3925, y: 13876} flatten: 0 isImported: 1 isVisible: 1 @@ -1552,7 +1552,7 @@ ScriptedImporter: parentIndex: 29 spriteID: bf5753c6100cc7641946eceaffb2e273 layerID: 4140 - mosaicPosition: {x: 3470, y: 10737} + mosaicPosition: {x: 4806, y: 13876} flatten: 0 isImported: 1 isVisible: 1 @@ -1562,7 +1562,7 @@ ScriptedImporter: parentIndex: 29 spriteID: 1ef8f714cc91e544888db7dea24956d9 layerID: 4139 - mosaicPosition: {x: 3470, y: 10360} + mosaicPosition: {x: 4800, y: 14435} flatten: 0 isImported: 1 isVisible: 1 @@ -1572,7 +1572,7 @@ ScriptedImporter: parentIndex: 29 spriteID: ccf17fd5f377c8f4ca7ef3a4ebc44940 layerID: 4274 - mosaicPosition: {x: 2923, y: 11114} + mosaicPosition: {x: 2371, y: 15541} flatten: 0 isImported: 1 isVisible: 1 @@ -1582,7 +1582,7 @@ ScriptedImporter: parentIndex: 22 spriteID: 67c4dadcb5b435a4692637b1d443cfef layerID: 4591 - mosaicPosition: {x: 7602, y: 3055} + mosaicPosition: {x: 3919, y: 16026} flatten: 0 isImported: 1 isVisible: 1 @@ -1592,7 +1592,7 @@ ScriptedImporter: parentIndex: 22 spriteID: 221fd10a017a40447b0657be39ad26f1 layerID: 4344 - mosaicPosition: {x: 5278, y: 8935} + mosaicPosition: {x: 3919, y: 16179} flatten: 0 isImported: 1 isVisible: 1 @@ -1602,7 +1602,7 @@ ScriptedImporter: parentIndex: 22 spriteID: 00a888cbbead22c48a34162da8cc50cc layerID: 4928 - mosaicPosition: {x: 7602, y: 2733} + mosaicPosition: {x: 7722, y: 6283} flatten: 0 isImported: 1 isVisible: 1 @@ -1612,7 +1612,7 @@ ScriptedImporter: parentIndex: 22 spriteID: 5a777be5b8ad3044391c6c90d049d627 layerID: 4927 - mosaicPosition: {x: 7602, y: 2894} + mosaicPosition: {x: 7722, y: 6444} flatten: 0 isImported: 1 isVisible: 1 @@ -1622,7 +1622,7 @@ ScriptedImporter: parentIndex: 22 spriteID: 47573c98da7e9f444b65b223ff6a478d layerID: 4361 - mosaicPosition: {x: 3730, y: 3355} + mosaicPosition: {x: 2371, y: 3355} flatten: 0 isImported: 1 isVisible: 1 @@ -1652,7 +1652,7 @@ ScriptedImporter: parentIndex: 44 spriteID: 9436778b5280eef4cafb2ee3dc112de5 layerID: 4586 - mosaicPosition: {x: 1477, y: 11979} + mosaicPosition: {x: 6243, y: 5015} flatten: 0 isImported: 1 isVisible: 1 @@ -1662,7 +1662,7 @@ ScriptedImporter: parentIndex: 44 spriteID: 28fedeb2176ee2c4a88ae05b9f76ab6d layerID: 4585 - mosaicPosition: {x: 1477, y: 13617} + mosaicPosition: {x: 6243, y: 1695} flatten: 0 isImported: 1 isVisible: 1 @@ -1672,7 +1672,7 @@ ScriptedImporter: parentIndex: 44 spriteID: ab79819af6db10f41a8621e8a90683d9 layerID: 4584 - mosaicPosition: {x: 2371, y: 3347} + mosaicPosition: {x: 3535, y: 11754} flatten: 0 isImported: 1 isVisible: 1 @@ -1682,7 +1682,17 @@ ScriptedImporter: parentIndex: 44 spriteID: 05b27b858f998994ca487cf2b20d9018 layerID: 4583 - mosaicPosition: {x: 4, y: 15132} + mosaicPosition: {x: 6243, y: 3355} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6CF5\u5934\u906E\u7F69" + spriteName: "\u6CF5\u5934\u906E\u7F69" + isGroup: 0 + parentIndex: 44 + spriteID: 2eedb6c9926af074fa96e875c5558b8d + layerID: 4990 + mosaicPosition: {x: 2371, y: 11754} flatten: 0 isImported: 1 isVisible: 1 @@ -1692,7 +1702,7 @@ ScriptedImporter: parentIndex: 43 spriteID: 0866853066cf32e44941c0d229efd545 layerID: 4622 - mosaicPosition: {x: 7602, y: 6053} + mosaicPosition: {x: 4298, y: 16026} flatten: 0 isImported: 1 isVisible: 1 @@ -1702,7 +1712,7 @@ ScriptedImporter: parentIndex: 43 spriteID: f131b1d457c4c3649b6e1537e6ece2b9 layerID: 4620 - mosaicPosition: {x: 7602, y: 6283} + mosaicPosition: {x: 7722, y: 6053} flatten: 0 isImported: 1 isVisible: 1 @@ -1712,7 +1722,7 @@ ScriptedImporter: parentIndex: 43 spriteID: 4a475813fa097d94e87049b364bed31d layerID: 4563 - mosaicPosition: {x: 3730, y: 5015} + mosaicPosition: {x: 2371, y: 5015} flatten: 0 isImported: 1 isVisible: 1 @@ -1729,160 +1739,160 @@ ScriptedImporter: - name: "\u74F6\u5B50a \u6C34\u5E73" spriteName: "\u74F6\u5B50a \u6C34\u5E73" isGroup: 0 - parentIndex: 52 + parentIndex: 53 spriteID: 12a7e55b5f91e084dbee27d8e5591ed0 layerID: 4958 - mosaicPosition: {x: 3730, y: 8935} + mosaicPosition: {x: 2371, y: 14435} flatten: 0 isImported: 1 isVisible: 1 - name: "\u74F6\u5B50a" spriteName: "\u74F6\u5B50a" isGroup: 0 - parentIndex: 52 + parentIndex: 53 spriteID: befed22d44f6ff0489f2c64c5a07342c layerID: 4133 - mosaicPosition: {x: 7602, y: 5015} + mosaicPosition: {x: 7406, y: 3355} flatten: 0 isImported: 1 isVisible: 1 - name: "\u74F6\u5B50b \u6C34\u5E73" spriteName: "\u74F6\u5B50b \u6C34\u5E73" isGroup: 0 - parentIndex: 52 + parentIndex: 53 spriteID: 649e198bb20f18d4dab82073c056be61 layerID: 4959 - mosaicPosition: {x: 3730, y: 9488} + mosaicPosition: {x: 2371, y: 14988} flatten: 0 isImported: 1 isVisible: 1 - name: "\u74F6\u5B50b" spriteName: "\u74F6\u5B50b" isGroup: 0 - parentIndex: 52 + parentIndex: 53 spriteID: 7271942ecedc8d048a88b5217835f321 layerID: 4135 - mosaicPosition: {x: 7602, y: 3355} + mosaicPosition: {x: 3919, y: 14988} flatten: 0 isImported: 1 isVisible: 1 - name: "\u74F6\u5B50c \u6C34\u5E73" spriteName: "\u74F6\u5B50c \u6C34\u5E73" isGroup: 0 - parentIndex: 52 + parentIndex: 53 spriteID: 186f1169147202743be6e48ca7476b73 layerID: 4960 - mosaicPosition: {x: 3730, y: 8376} + mosaicPosition: {x: 2371, y: 13876} flatten: 0 isImported: 1 isVisible: 1 - name: "\u74F6\u5B50c" spriteName: "\u74F6\u5B50c" isGroup: 0 - parentIndex: 52 + parentIndex: 53 spriteID: cdddcc753bd920845a19ee65c4c8637e layerID: 4109 - mosaicPosition: {x: 2889, y: 15237} + mosaicPosition: {x: 7722, y: 5015} flatten: 0 isImported: 1 isVisible: 1 - name: "\u74F6\u5B50d" spriteName: "\u74F6\u5B50d" isGroup: 0 - parentIndex: 52 + parentIndex: 53 spriteID: 92ef6198f44ea8240b899bfa57ebe3a3 layerID: 4597 - mosaicPosition: {x: 7602, y: 1695} + mosaicPosition: {x: 7786, y: 3355} flatten: 0 isImported: 1 isVisible: 1 - name: "\u74F6\u5B50e" spriteName: "\u74F6\u5B50e" isGroup: 0 - parentIndex: 52 + parentIndex: 53 spriteID: a0dfade01566d6344bdff45647338ca9 layerID: 4596 - mosaicPosition: {x: 7602, y: 4} + mosaicPosition: {x: 4298, y: 14988} flatten: 0 isImported: 1 isVisible: 1 - name: "\u74F6\u5B50f" spriteName: "\u74F6\u5B50f" isGroup: 0 - parentIndex: 52 + parentIndex: 53 spriteID: c6199de03a7948f4189b5bad29d094c5 layerID: 4595 - mosaicPosition: {x: 3272, y: 15237} + mosaicPosition: {x: 7686, y: 1695} flatten: 0 isImported: 1 isVisible: 1 - name: F spriteName: F isGroup: 0 - parentIndex: 52 + parentIndex: 53 spriteID: 0be775295da15e145afad69de728ea5c layerID: 4619 - mosaicPosition: {x: 8053, y: 2733} + mosaicPosition: {x: 8109, y: 6444} flatten: 0 isImported: 1 isVisible: 1 - name: E spriteName: E isGroup: 0 - parentIndex: 52 + parentIndex: 53 spriteID: a698f66885ae57c4bb4b2bbe5f0f8acc layerID: 4618 - mosaicPosition: {x: 8113, y: 2733} + mosaicPosition: {x: 8109, y: 6512} flatten: 0 isImported: 1 isVisible: 1 - name: D spriteName: D isGroup: 0 - parentIndex: 52 + parentIndex: 53 spriteID: da1f5e1b43b06cd44bb8db0f2a158e7f layerID: 4617 - mosaicPosition: {x: 7989, y: 2733} + mosaicPosition: {x: 8109, y: 6351} flatten: 0 isImported: 1 isVisible: 1 - name: C spriteName: C isGroup: 0 - parentIndex: 52 + parentIndex: 53 spriteID: 0a39a0d1a490bee43a9a0c6825d83dab layerID: 4616 - mosaicPosition: {x: 7989, y: 2801} + mosaicPosition: {x: 4806, y: 14232} flatten: 0 isImported: 1 isVisible: 1 - name: B spriteName: B isGroup: 0 - parentIndex: 52 + parentIndex: 53 spriteID: 67f8b56c41a4d5d42aa1963c90b61eda layerID: 4615 - mosaicPosition: {x: 3535, y: 10669} + mosaicPosition: {x: 8109, y: 6580} flatten: 0 isImported: 1 isVisible: 1 - name: A spriteName: A isGroup: 0 - parentIndex: 52 + parentIndex: 53 spriteID: 02a98e6a8ebe48948b6951e48a8376b2 layerID: 4614 - mosaicPosition: {x: 3470, y: 10669} + mosaicPosition: {x: 8109, y: 6283} flatten: 0 isImported: 1 isVisible: 1 - name: "\u684C\u9762\u5730\u56FE" spriteName: "\u684C\u9762\u5730\u56FE" isGroup: 0 - parentIndex: 52 + parentIndex: 53 spriteID: 345e8b49e3454934081e7e932cee4d7c layerID: 4647 - mosaicPosition: {x: 4, y: 3347} + mosaicPosition: {x: 4, y: 4} flatten: 0 isImported: 1 isVisible: 1 @@ -1899,7 +1909,7 @@ ScriptedImporter: - name: "\u684C\u4E0A\u6CF5" spriteName: isGroup: 1 - parentIndex: 69 + parentIndex: 70 spriteID: d6102b772ff5c754c95728820de6a391 layerID: 4310 mosaicPosition: {x: 0, y: 0} @@ -1909,7 +1919,7 @@ ScriptedImporter: - name: "\u684C\u9762\u7F69\u5B50\u63CF\u8FB9" spriteName: isGroup: 0 - parentIndex: 70 + parentIndex: 71 spriteID: f614746fdb9b0324ba7f5ffdfa6ec6a4 layerID: 4303 mosaicPosition: {x: 0, y: 0} @@ -1919,7 +1929,7 @@ ScriptedImporter: - name: "\u684C\u9762\u7F69\u5B50" spriteName: isGroup: 0 - parentIndex: 70 + parentIndex: 71 spriteID: b8f732a15eb22294fa3d78223223df2e layerID: 4300 mosaicPosition: {x: 0, y: 0} @@ -1929,7 +1939,7 @@ ScriptedImporter: - name: "\u6CF5\u673A\u7EC4\u4EF6a" spriteName: isGroup: 0 - parentIndex: 70 + parentIndex: 71 spriteID: 349583b105d053248ba3ce9546ecbe4e layerID: 4306 mosaicPosition: {x: 0, y: 0} @@ -1939,7 +1949,7 @@ ScriptedImporter: - name: "\u6CF5\u673A\u7EC4\u4EF6b" spriteName: isGroup: 0 - parentIndex: 70 + parentIndex: 71 spriteID: b4b550b10266aa9499c726e3d10d7bbd layerID: 4307 mosaicPosition: {x: 0, y: 0} @@ -1949,7 +1959,7 @@ ScriptedImporter: - name: "\u684C\u9762\u6CF5\u673A\u8FD0\u4F5C\u65F6\u4EAE\u706F" spriteName: isGroup: 0 - parentIndex: 69 + parentIndex: 70 spriteID: 77e11e0b70c376744b5f3112d7f33e0f layerID: 4621 mosaicPosition: {x: 0, y: 0} @@ -1959,7 +1969,7 @@ ScriptedImporter: - name: "\u684C\u9762\u9ED1\u5C4F" spriteName: isGroup: 0 - parentIndex: 69 + parentIndex: 70 spriteID: f81b90ae073f22c4090e46eb30a776cf layerID: 4877 mosaicPosition: {x: 0, y: 0} @@ -1969,7 +1979,7 @@ ScriptedImporter: - name: "\u684C" spriteName: isGroup: 0 - parentIndex: 69 + parentIndex: 70 spriteID: 2a2a0cd121f6bfa4abb8c2b0fa4a3947 layerID: 1976 mosaicPosition: {x: 0, y: 0} @@ -1989,7 +1999,7 @@ ScriptedImporter: - name: "\u4F69\u4F69" spriteName: isGroup: 1 - parentIndex: 78 + parentIndex: 79 spriteID: 7892d63f71b2e904d9328fa4dc760b67 layerID: 3835 mosaicPosition: {x: 0, y: 0} @@ -1999,7 +2009,7 @@ ScriptedImporter: - name: "\u4F69\u4F69\u6362\u6DB2\u8BBE\u5907" spriteName: isGroup: 1 - parentIndex: 79 + parentIndex: 80 spriteID: 460fb41402247674bb8d027b2c8cec9f layerID: 4329 mosaicPosition: {x: 0, y: 0} @@ -2009,7 +2019,7 @@ ScriptedImporter: - name: "\u7BA1\u5B50" spriteName: isGroup: 0 - parentIndex: 80 + parentIndex: 81 spriteID: 14c81932aea52c5469b6de0baac911a9 layerID: 4332 mosaicPosition: {x: 0, y: 0} @@ -2019,7 +2029,7 @@ ScriptedImporter: - name: "\u6362\u6DB2\u8BBE\u5907" spriteName: isGroup: 0 - parentIndex: 80 + parentIndex: 81 spriteID: 7456af8bd39f4a446b93d6ba59243bba layerID: 4325 mosaicPosition: {x: 0, y: 0} @@ -2029,7 +2039,7 @@ ScriptedImporter: - name: "\u4F69\u4F69\u8868\u60C5" spriteName: isGroup: 1 - parentIndex: 79 + parentIndex: 80 spriteID: 1116647889b19cf4ba75ccbe9185822f layerID: 4429 mosaicPosition: {x: 0, y: 0} @@ -2039,7 +2049,7 @@ ScriptedImporter: - name: "\u95ED\u773C" spriteName: isGroup: 0 - parentIndex: 83 + parentIndex: 84 spriteID: e4550927d0fa1f8438cae747ab45eaf8 layerID: 4884 mosaicPosition: {x: 0, y: 0} @@ -2049,7 +2059,7 @@ ScriptedImporter: - name: "\u5FAE\u7B11" spriteName: isGroup: 0 - parentIndex: 83 + parentIndex: 84 spriteID: 4d7af24364080034899ebc8b355cc649 layerID: 4437 mosaicPosition: {x: 0, y: 0} @@ -2059,7 +2069,7 @@ ScriptedImporter: - name: "\u5634\u5DF4\u7B11" spriteName: isGroup: 0 - parentIndex: 83 + parentIndex: 84 spriteID: 863c088eb933bfe478699a93c75defcc layerID: 4456 mosaicPosition: {x: 0, y: 0} @@ -2069,7 +2079,7 @@ ScriptedImporter: - name: "\u4F69\u4F69\u52A8\u4F5C" spriteName: isGroup: 1 - parentIndex: 79 + parentIndex: 80 spriteID: a3845268125494647b3b63a182bbfa54 layerID: 4750 mosaicPosition: {x: 0, y: 0} @@ -2079,7 +2089,7 @@ ScriptedImporter: - name: "\u753B\u753B\u52A8\u4F5C" spriteName: isGroup: 0 - parentIndex: 87 + parentIndex: 88 spriteID: 8095648125b197d4b80f036cc52fb9c6 layerID: 3082 mosaicPosition: {x: 0, y: 0} @@ -2089,7 +2099,7 @@ ScriptedImporter: - name: "\u5782\u624B" spriteName: isGroup: 0 - parentIndex: 79 + parentIndex: 80 spriteID: efb04be4d966a7b43980484e9040b5f5 layerID: 4423 mosaicPosition: {x: 0, y: 0} @@ -2099,7 +2109,7 @@ ScriptedImporter: - name: "\u77F3\u5934" spriteName: isGroup: 1 - parentIndex: 78 + parentIndex: 79 spriteID: ba1ecb7a9d0aa814fab921fc605fc360 layerID: 3129 mosaicPosition: {x: 0, y: 0} @@ -2109,7 +2119,7 @@ ScriptedImporter: - name: "\u77F3\u5934\u6362\u6DB2\u8BBE\u5907" spriteName: isGroup: 1 - parentIndex: 90 + parentIndex: 91 spriteID: f019a38016914694891f04a1d752ca1c layerID: 4551 mosaicPosition: {x: 0, y: 0} @@ -2119,7 +2129,7 @@ ScriptedImporter: - name: "\u7BA1\u5B50" spriteName: isGroup: 0 - parentIndex: 91 + parentIndex: 92 spriteID: 9beeb1ac1bc7fff428deede37cb9e7f8 layerID: 4550 mosaicPosition: {x: 0, y: 0} @@ -2129,7 +2139,7 @@ ScriptedImporter: - name: "\u6362\u6DB2\u8BBE\u5907" spriteName: isGroup: 0 - parentIndex: 91 + parentIndex: 92 spriteID: ae6be7fd0a831814c93525a7d2bd8047 layerID: 4549 mosaicPosition: {x: 0, y: 0} @@ -2139,7 +2149,7 @@ ScriptedImporter: - name: "\u77F3\u5934\u8868\u60C5" spriteName: isGroup: 1 - parentIndex: 90 + parentIndex: 91 spriteID: cc59a4a2a4ac0b242bd2b1aeb50af3b3 layerID: 4465 mosaicPosition: {x: 0, y: 0} @@ -2149,7 +2159,7 @@ ScriptedImporter: - name: "\u601D\u7D22\u8D70\u795E" spriteName: isGroup: 0 - parentIndex: 94 + parentIndex: 95 spriteID: 4342ffbdee6705d408579c227a6e789d layerID: 4472 mosaicPosition: {x: 0, y: 0} @@ -2159,7 +2169,7 @@ ScriptedImporter: - name: "\u6B63\u5E38\u5FAE\u5FAE\u7B11" spriteName: isGroup: 0 - parentIndex: 94 + parentIndex: 95 spriteID: 56aae1ece0334e54295483cf4f951422 layerID: 4467 mosaicPosition: {x: 0, y: 0} @@ -2169,7 +2179,7 @@ ScriptedImporter: - name: "\u77F3\u5934\u52A8\u4F5C" spriteName: isGroup: 1 - parentIndex: 90 + parentIndex: 91 spriteID: 72f7ec08dd66b944abd0c2db89e0cbf5 layerID: 4752 mosaicPosition: {x: 0, y: 0} @@ -2179,7 +2189,7 @@ ScriptedImporter: - name: "\u6478\u5934" spriteName: isGroup: 0 - parentIndex: 97 + parentIndex: 98 spriteID: da041529030b6f542b11056e29041300 layerID: 3966 mosaicPosition: {x: 0, y: 0} @@ -2189,7 +2199,7 @@ ScriptedImporter: - name: "\u77F3\u5934" spriteName: isGroup: 1 - parentIndex: 90 + parentIndex: 91 spriteID: 22f47aa658ac0a4408194297dfb10b9a layerID: 3185 mosaicPosition: {x: 0, y: 0} @@ -2199,7 +2209,7 @@ ScriptedImporter: - name: "\u524D\u53F3\u624B" spriteName: isGroup: 0 - parentIndex: 99 + parentIndex: 100 spriteID: abb68c0ee788cfb47a4159e8bf5b67fc layerID: 4260 mosaicPosition: {x: 0, y: 0} @@ -2209,7 +2219,7 @@ ScriptedImporter: - name: "\u77F3\u5934" spriteName: isGroup: 0 - parentIndex: 99 + parentIndex: 100 spriteID: 019ef82c0308ee1418f1f1a31216ec8a layerID: 4261 mosaicPosition: {x: 0, y: 0} @@ -2229,7 +2239,7 @@ ScriptedImporter: - name: "\u5E18\u5B50" spriteName: isGroup: 0 - parentIndex: 102 + parentIndex: 103 spriteID: 2977925c505725b439cb38d0fb0dae51 layerID: 4867 mosaicPosition: {x: 0, y: 0} @@ -2239,7 +2249,7 @@ ScriptedImporter: - name: "\u623F\u95F4\u5185" spriteName: isGroup: 0 - parentIndex: 102 + parentIndex: 103 spriteID: 620fa906ed5147e4c99c64ab9adc98fe layerID: 3813 mosaicPosition: {x: 0, y: 0} @@ -2259,7 +2269,7 @@ ScriptedImporter: - name: "\u7A97\u6846" spriteName: isGroup: 0 - parentIndex: 105 + parentIndex: 106 spriteID: dabc392d28da2a7478925f4aeec6ddc7 layerID: 3970 mosaicPosition: {x: 0, y: 0} @@ -2269,7 +2279,7 @@ ScriptedImporter: - name: "\u51B0\u971C" spriteName: isGroup: 0 - parentIndex: 105 + parentIndex: 106 spriteID: fa4d75b4fcd371b41a0f8b196a6375e2 layerID: 2394 mosaicPosition: {x: 0, y: 0} @@ -2279,7 +2289,7 @@ ScriptedImporter: - name: "\u5915\u9633" spriteName: isGroup: 0 - parentIndex: 105 + parentIndex: 106 spriteID: d8eca0f52a886264dabf4bd16891e6df layerID: 3962 mosaicPosition: {x: 0, y: 0} @@ -2289,7 +2299,7 @@ ScriptedImporter: - name: "\u96EA" spriteName: isGroup: 0 - parentIndex: 105 + parentIndex: 106 spriteID: efb0fc09dc07ff04489e263fb478c44e layerID: 2449 mosaicPosition: {x: 0, y: 0} @@ -2299,7 +2309,7 @@ ScriptedImporter: - name: "\u591C\u665A" spriteName: isGroup: 0 - parentIndex: 105 + parentIndex: 106 spriteID: b19c7605e61036642ba663ca7da78864 layerID: 2822 mosaicPosition: {x: 0, y: 0} diff --git a/Assets/Resources/Art/Fix/Stone/身体维修界面.psb b/Assets/Resources/Art/Fix/Stone/身体维修界面.psb index d740561e3..f6dd7dafd 100644 --- a/Assets/Resources/Art/Fix/Stone/身体维修界面.psb +++ b/Assets/Resources/Art/Fix/Stone/身体维修界面.psb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74452e0ba89e834af790db7db5f26df41919cf2f53947756fc5954212723936d -size 26671022 +oid sha256:f9f06df65c3ba6cf7965dfe4032381c6c46e64605241b3535c183dca4bb1e282 +size 26531680 diff --git a/Assets/Resources/Art/Fix/Stone/身体维修界面.psb.meta b/Assets/Resources/Art/Fix/Stone/身体维修界面.psb.meta index 65e415f18..38aac58ea 100644 --- a/Assets/Resources/Art/Fix/Stone/身体维修界面.psb.meta +++ b/Assets/Resources/Art/Fix/Stone/身体维修界面.psb.meta @@ -122,8 +122,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3248 - y: 5716 + x: 2910 + y: 5499 width: 651 height: 101 spriteID: dad54d5abbf7996438e47fe42d8414fa @@ -134,7 +134,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3246, y: 5715} + uvTransform: {x: 2908, y: 5498} spritePosition: {x: 2928, y: 2006} - name: "\u6DF1\u5165\u6309\u94AE" originalName: @@ -143,8 +143,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4 - y: 8026 + x: 3103 + y: 5608 width: 161 height: 112 spriteID: 27fd3ef65dfd55c45bf19c14e2ba4aaf @@ -155,7 +155,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 2, y: 8025} + uvTransform: {x: 3101, y: 5607} spritePosition: {x: 3462, y: 1270} - name: "\u6ED1\u5757" originalName: @@ -164,8 +164,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3906 - y: 6529 + x: 4059 + y: 7356 width: 27 height: 72 spriteID: 07698999b4df0c84bbd9c4c322a754b1 @@ -176,7 +176,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3904, y: 6528} + uvTransform: {x: 4057, y: 7355} spritePosition: {x: 2915, y: 1290} - name: "\u6ED1\u52A8\u8F68\u9053" originalName: @@ -185,8 +185,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4 - y: 7907 + x: 3453 + y: 7443 width: 580 height: 111 spriteID: 14b6aef9f9819d242bd85fb48351a3ce @@ -197,7 +197,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 7907} + uvTransform: {x: 3453, y: 7443} spritePosition: {x: 2890, y: 1271} - name: "\u62A5\u9519\u5C4F\u5E55" originalName: @@ -269,10 +269,10 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3941 - y: 6558 - width: 25 - height: 25 + x: 4047 + y: 6195 + width: 10 + height: 10 spriteID: 3f9ee51ee22d4434f8d77faf45d9acd2 spriteBone: [] spriteOutline: [] @@ -281,29 +281,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3939, y: 6557} - spritePosition: {x: 1374, y: 1055} - - name: "\u692D\u5706 1" - originalName: - pivot: {x: 0.5, y: 0.5} - alignment: 0 - border: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 3903 - y: 5661 - width: 26 - height: 26 - spriteID: 289d20330e2397a45ad29088f4f1a6e0 - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 3901, y: 5660} - spritePosition: {x: 1349, y: 1048} + uvTransform: {x: 4045, y: 6194} + spritePosition: {x: 1374, y: 1070} - name: "\u6307\u9488" originalName: pivot: {x: 1, y: 0} @@ -311,8 +290,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3941 - y: 6530 + x: 3996 + y: 6196 width: 44 height: 21 spriteID: 9f9deb0f2cb514d4d828fd62fa70dde3 @@ -323,7 +302,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3941, y: 6529} + uvTransform: {x: 3996, y: 6195} spritePosition: {x: 1269, y: 1306} - name: "\u8F6C\u901F\u8868" originalName: @@ -333,7 +312,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3812 - y: 6345 + y: 6101 width: 176 height: 176 spriteID: b7e297a8275fe3147a264e080dc035dd @@ -344,7 +323,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3812, y: 6345} + uvTransform: {x: 3812, y: 6101} spritePosition: {x: 1226, y: 1218} - name: "\u53D8\u901F\u7BB1\u63D2\u5B54" originalName: @@ -353,8 +332,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3812 - y: 6529 + x: 3966 + y: 5978 width: 86 height: 86 spriteID: 98e19cabc64e47d46aea9ab2c329fca9 @@ -365,30 +344,9 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3812, y: 6529} + uvTransform: {x: 3966, y: 5978} spritePosition: {x: 1182, y: 1058} - - name: "\u76D6\u5B50\u6746" - originalName: - pivot: {x: 0.5, y: 0.5} - alignment: 0 - border: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 3248 - y: 5499 - width: 355 - height: 205 - spriteID: 7805fb4d7ed5ab3429a2316f7fd43f9e - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 3248, y: 5499} - spritePosition: {x: 1470, y: 850} - - name: "\u53D8\u901F\u7BB1\u76D6\u5B50" + - name: "\u53D8\u901F\u7BB1\u8F93\u5165\u9F7F\u8F6E" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -397,27 +355,6 @@ ScriptedImporter: serializedVersion: 2 x: 3453 y: 7105 - width: 492 - height: 492 - spriteID: ca966d50cd7e0e24386a6919795e5460 - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 3453, y: 7105} - spritePosition: {x: 1278, y: 766} - - name: "\u53D8\u901F\u7BB1\u8F93\u5165\u9F7F\u8F6E" - originalName: - pivot: {x: 0.5, y: 0.5} - alignment: 0 - border: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 2910 - y: 5499 width: 330 height: 330 spriteID: 725469d4c92a63f459926985c2726704 @@ -428,7 +365,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 2910, y: 5499} + uvTransform: {x: 3453, y: 7105} spritePosition: {x: 1530, y: 1076} - name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EA" originalName: @@ -437,8 +374,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3789 - y: 5498 + x: 3812 + y: 6458 width: 154 height: 154 spriteID: c562151c266172245900603e7959a8da @@ -449,7 +386,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3789, y: 5499} + uvTransform: {x: 3812, y: 6459} spritePosition: {x: 1454, y: 1050} - name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EB" originalName: @@ -458,8 +395,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3953 - y: 7105 + x: 142 + y: 7907 width: 128 height: 130 spriteID: 93418b50b51ddd441a424a24b868b51a @@ -470,7 +407,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3953, y: 7105} + uvTransform: {x: 142, y: 7907} spritePosition: {x: 1406, y: 946} - name: "\u53D8\u901F\u7BB1\u9F7F\u8F6EC" originalName: @@ -479,8 +416,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3615 - y: 5499 + x: 3812 + y: 6285 width: 166 height: 166 spriteID: d5e68dcab5349504f950128fdb66696c @@ -491,7 +428,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3615, y: 5499} + uvTransform: {x: 3812, y: 6285} spritePosition: {x: 1476, y: 824} - name: "\u53D8\u901F\u7BB1\u5531\u7247\u9F7F\u8F6E" originalName: @@ -500,8 +437,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3951 - y: 5499 + x: 4 + y: 7907 width: 130 height: 130 spriteID: 15bb5a4be7f4d1746b0822dc05b92b5f @@ -512,7 +449,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3951, y: 5499} + uvTransform: {x: 4, y: 7907} spritePosition: {x: 1318, y: 859} - name: "\u53D8\u901F\u7BB1\u8F93\u51FA\u9F7F\u8F6E" originalName: @@ -521,8 +458,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3903 - y: 5695 + x: 4065 + y: 6195 width: 0 height: 0 spriteID: 7e7562128bf69d7418af6bd34587198a @@ -533,7 +470,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3741, y: 5535} + uvTransform: {x: 3903, y: 6035} spritePosition: {x: 1782, y: 1048} - name: "\u53D8\u901F\u7BB1" originalName: @@ -563,8 +500,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3907 - y: 5716 + x: 2910 + y: 5608 width: 185 height: 125 spriteID: be4e6d6bab42a55409387fd23e2ee32c @@ -575,7 +512,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3907, y: 5716} + uvTransform: {x: 2910, y: 5608} spritePosition: {x: 1073, y: 1212} - name: "\u5FC3\u810F\u63D2\u5B54" originalName: @@ -585,7 +522,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3996 - y: 6345 + y: 6101 width: 86 height: 86 spriteID: 393fed26529755c43b3adf65c5215b60 @@ -596,7 +533,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3996, y: 6345} + uvTransform: {x: 3996, y: 6101} spritePosition: {x: 982, y: 1386} - name: "\u5FC3\u810F\u76D6\u5B50" originalName: @@ -626,8 +563,8 @@ ScriptedImporter: border: {x: 0, y: 8, z: 0, w: 8} rect: serializedVersion: 2 - x: 3953 - y: 7353 + x: 4035 + y: 7105 width: 16 height: 243 spriteID: 955abee622701d34c92da4721f082368 @@ -638,7 +575,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3953, y: 7353} + uvTransform: {x: 4035, y: 7105} spritePosition: {x: 1287, y: 1618} - name: "\u8FDB\u6C14\u5EA6\u91CF" originalName: @@ -647,8 +584,8 @@ ScriptedImporter: border: {x: 0, y: 8, z: 0, w: 9} rect: serializedVersion: 2 - x: 3977 - y: 7353 + x: 4059 + y: 7105 width: 16 height: 243 spriteID: 0c11f41444c477f4fac3222cb5b79a98 @@ -659,7 +596,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3977, y: 7353} + uvTransform: {x: 4059, y: 7105} spritePosition: {x: 1204, y: 1618} - name: "\u6C14\u95E8\u62C9\u6746" originalName: @@ -668,8 +605,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3789 - y: 5661 + x: 3986 + y: 6395 width: 106 height: 28 spriteID: ed1ecfe628602a44285fa18ebac88553 @@ -680,7 +617,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3789, y: 5661} + uvTransform: {x: 3986, y: 6395} spritePosition: {x: 1031, y: 1666} - name: "\u62C9\u6746\u6C60" originalName: @@ -710,8 +647,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3911 - y: 5695 + x: 4073 + y: 6195 width: 0 height: 0 spriteID: 446346ef83ab15c43a3d115b695a489a @@ -722,7 +659,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3725, y: 5509} + uvTransform: {x: 3887, y: 6009} spritePosition: {x: 1459, y: 1570} - name: "\u5FC3\u810F\u9F7F\u8F6EB" originalName: @@ -731,8 +668,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3919 - y: 5695 + x: 4081 + y: 6195 width: 0 height: 0 spriteID: b20eafea4b8b8c94c89d9e5d54ae683f @@ -743,7 +680,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3713, y: 5488} + uvTransform: {x: 3875, y: 5988} spritePosition: {x: 1344, y: 1445} - name: "\u5FC3\u810F\u9F7F\u8F6EC" originalName: @@ -752,8 +689,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3927 - y: 5695 + x: 4089 + y: 6195 width: 0 height: 0 spriteID: 4937081512344314a989a0d438fd73d3 @@ -764,7 +701,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3767, y: 5536} + uvTransform: {x: 3929, y: 6036} spritePosition: {x: 1295, y: 1611} - name: "\u5FC3\u810F\u9F7F\u8F6ED" originalName: @@ -773,8 +710,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3812 - y: 5868 + x: 3791 + y: 7105 width: 236 height: 236 spriteID: 14aab779c58f90a40a99c1b0e02cc11c @@ -785,7 +722,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3812, y: 5868} + uvTransform: {x: 3791, y: 7105} spritePosition: {x: 1386, y: 1218} - name: "\u5FC3\u810F\u9F7F\u8F6EE" originalName: @@ -794,8 +731,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3903 - y: 5703 + x: 4065 + y: 6203 width: 0 height: 0 spriteID: a4d40b2ba111122448c31f2ea4fd4d4d @@ -806,7 +743,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3773, y: 5573} + uvTransform: {x: 3935, y: 6073} spritePosition: {x: 1541, y: 1536} - name: "\u5FC3\u810F" originalName: @@ -837,7 +774,7 @@ ScriptedImporter: rect: serializedVersion: 2 x: 3812 - y: 6112 + y: 5868 width: 146 height: 225 spriteID: d4a3363adf457ae4aa15314d2db44ca5 @@ -848,7 +785,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3812, y: 6112} + uvTransform: {x: 3812, y: 5868} spritePosition: {x: 1257, y: 1935} - name: "\u80BA\u63D2\u5B54" originalName: @@ -857,8 +794,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3966 - y: 6112 + x: 3986 + y: 6285 width: 100 height: 102 spriteID: 2b82d9f9ac606bc46a69f1f1f2bc2fac @@ -869,7 +806,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3966, y: 6112} + uvTransform: {x: 3986, y: 6285} spritePosition: {x: 1990, y: 1443} - name: "\u80BA" originalName: @@ -899,8 +836,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3966 - y: 6222 + x: 3974 + y: 6459 width: 100 height: 102 spriteID: 7df889ef25dabad46bcacf053c71d0e6 @@ -911,7 +848,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3966, y: 6222} + uvTransform: {x: 3974, y: 6459} spritePosition: {x: 1068, y: 192} - name: "\u80C3" originalName: @@ -941,8 +878,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3953 - y: 7243 + x: 3966 + y: 5868 width: 100 height: 102 spriteID: a7f4162658d13014eb7749886a9e8c79 @@ -953,7 +890,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3953, y: 7243} + uvTransform: {x: 3966, y: 5868} spritePosition: {x: 1783, y: 446} - name: "\u809D" originalName: @@ -1107,7 +1044,7 @@ ScriptedImporter: parentIndex: -1 spriteID: dad54d5abbf7996438e47fe42d8414fa layerID: 475 - mosaicPosition: {x: 3248, y: 5716} + mosaicPosition: {x: 2910, y: 5499} flatten: 0 isImported: 1 isVisible: 1 @@ -1117,7 +1054,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 27fd3ef65dfd55c45bf19c14e2ba4aaf layerID: 463 - mosaicPosition: {x: 4, y: 8026} + mosaicPosition: {x: 3103, y: 5608} flatten: 0 isImported: 1 isVisible: 1 @@ -1127,7 +1064,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 07698999b4df0c84bbd9c4c322a754b1 layerID: 476 - mosaicPosition: {x: 3906, y: 6529} + mosaicPosition: {x: 4059, y: 7356} flatten: 0 isImported: 1 isVisible: 1 @@ -1137,7 +1074,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 14b6aef9f9819d242bd85fb48351a3ce layerID: 469 - mosaicPosition: {x: 4, y: 7907} + mosaicPosition: {x: 3453, y: 7443} flatten: 0 isImported: 1 isVisible: 1 @@ -1187,7 +1124,7 @@ ScriptedImporter: parentIndex: 8 spriteID: 3f9ee51ee22d4434f8d77faf45d9acd2 layerID: 459 - mosaicPosition: {x: 3941, y: 6558} + mosaicPosition: {x: 4047, y: 6195} flatten: 0 isImported: 1 isVisible: 1 @@ -1199,15 +1136,15 @@ ScriptedImporter: layerID: 458 mosaicPosition: {x: 3903, y: 5661} flatten: 0 - isImported: 1 - isVisible: 1 + isImported: 0 + isVisible: 0 - name: "\u6307\u9488" spriteName: "\u6307\u9488" isGroup: 0 parentIndex: 8 spriteID: 9f9deb0f2cb514d4d828fd62fa70dde3 layerID: 229 - mosaicPosition: {x: 3941, y: 6529} + mosaicPosition: {x: 3996, y: 6195} flatten: 0 isImported: 1 isVisible: 1 @@ -1227,7 +1164,7 @@ ScriptedImporter: parentIndex: 8 spriteID: b7e297a8275fe3147a264e080dc035dd layerID: 417 - mosaicPosition: {x: 3812, y: 6345} + mosaicPosition: {x: 3812, y: 6101} flatten: 0 isImported: 1 isVisible: 1 @@ -1237,7 +1174,7 @@ ScriptedImporter: parentIndex: 8 spriteID: 98e19cabc64e47d46aea9ab2c329fca9 layerID: 260 - mosaicPosition: {x: 3812, y: 6529} + mosaicPosition: {x: 3966, y: 5978} flatten: 0 isImported: 1 isVisible: 1 @@ -1249,8 +1186,8 @@ ScriptedImporter: layerID: 203 mosaicPosition: {x: 3248, y: 5499} flatten: 0 - isImported: 1 - isVisible: 1 + isImported: 0 + isVisible: 0 - name: "\u53D8\u901F\u7BB1\u76D6\u5B50" spriteName: "\u53D8\u901F\u7BB1\u76D6\u5B50" isGroup: 0 @@ -1259,15 +1196,15 @@ ScriptedImporter: layerID: 430 mosaicPosition: {x: 3453, y: 7105} flatten: 0 - isImported: 1 - isVisible: 1 + isImported: 0 + isVisible: 0 - name: "\u53D8\u901F\u7BB1\u8F93\u5165\u9F7F\u8F6E" spriteName: "\u53D8\u901F\u7BB1\u8F93\u5165\u9F7F\u8F6E" isGroup: 0 parentIndex: 8 spriteID: 725469d4c92a63f459926985c2726704 layerID: 277 - mosaicPosition: {x: 2910, y: 5499} + mosaicPosition: {x: 3453, y: 7105} flatten: 0 isImported: 1 isVisible: 1 @@ -1277,7 +1214,7 @@ ScriptedImporter: parentIndex: 8 spriteID: c562151c266172245900603e7959a8da layerID: 287 - mosaicPosition: {x: 3789, y: 5499} + mosaicPosition: {x: 3812, y: 6459} flatten: 0 isImported: 1 isVisible: 1 @@ -1287,7 +1224,7 @@ ScriptedImporter: parentIndex: 8 spriteID: 93418b50b51ddd441a424a24b868b51a layerID: 274 - mosaicPosition: {x: 3953, y: 7105} + mosaicPosition: {x: 142, y: 7907} flatten: 0 isImported: 1 isVisible: 1 @@ -1297,7 +1234,7 @@ ScriptedImporter: parentIndex: 8 spriteID: d5e68dcab5349504f950128fdb66696c layerID: 280 - mosaicPosition: {x: 3615, y: 5499} + mosaicPosition: {x: 3812, y: 6285} flatten: 0 isImported: 1 isVisible: 1 @@ -1307,7 +1244,7 @@ ScriptedImporter: parentIndex: 8 spriteID: 15bb5a4be7f4d1746b0822dc05b92b5f layerID: 279 - mosaicPosition: {x: 3951, y: 5499} + mosaicPosition: {x: 4, y: 7907} flatten: 0 isImported: 1 isVisible: 1 @@ -1317,7 +1254,7 @@ ScriptedImporter: parentIndex: 8 spriteID: 7e7562128bf69d7418af6bd34587198a layerID: 281 - mosaicPosition: {x: 3903, y: 5695} + mosaicPosition: {x: 4065, y: 6195} flatten: 0 isImported: 1 isVisible: 1 @@ -1337,7 +1274,7 @@ ScriptedImporter: parentIndex: 8 spriteID: be4e6d6bab42a55409387fd23e2ee32c layerID: 254 - mosaicPosition: {x: 3907, y: 5716} + mosaicPosition: {x: 2910, y: 5608} flatten: 0 isImported: 1 isVisible: 1 @@ -1357,7 +1294,7 @@ ScriptedImporter: parentIndex: 25 spriteID: 393fed26529755c43b3adf65c5215b60 layerID: 307 - mosaicPosition: {x: 3996, y: 6345} + mosaicPosition: {x: 3996, y: 6101} flatten: 0 isImported: 1 isVisible: 1 @@ -1377,7 +1314,7 @@ ScriptedImporter: parentIndex: 25 spriteID: 955abee622701d34c92da4721f082368 layerID: 421 - mosaicPosition: {x: 3953, y: 7353} + mosaicPosition: {x: 4035, y: 7105} flatten: 0 isImported: 1 isVisible: 1 @@ -1387,7 +1324,7 @@ ScriptedImporter: parentIndex: 25 spriteID: 0c11f41444c477f4fac3222cb5b79a98 layerID: 420 - mosaicPosition: {x: 3977, y: 7353} + mosaicPosition: {x: 4059, y: 7105} flatten: 0 isImported: 1 isVisible: 1 @@ -1397,7 +1334,7 @@ ScriptedImporter: parentIndex: 25 spriteID: ed1ecfe628602a44285fa18ebac88553 layerID: 295 - mosaicPosition: {x: 3789, y: 5661} + mosaicPosition: {x: 3986, y: 6395} flatten: 0 isImported: 1 isVisible: 1 @@ -1417,7 +1354,7 @@ ScriptedImporter: parentIndex: 25 spriteID: 446346ef83ab15c43a3d115b695a489a layerID: 446 - mosaicPosition: {x: 3911, y: 5695} + mosaicPosition: {x: 4073, y: 6195} flatten: 0 isImported: 1 isVisible: 1 @@ -1427,7 +1364,7 @@ ScriptedImporter: parentIndex: 25 spriteID: b20eafea4b8b8c94c89d9e5d54ae683f layerID: 445 - mosaicPosition: {x: 3919, y: 5695} + mosaicPosition: {x: 4081, y: 6195} flatten: 0 isImported: 1 isVisible: 1 @@ -1437,7 +1374,7 @@ ScriptedImporter: parentIndex: 25 spriteID: 4937081512344314a989a0d438fd73d3 layerID: 444 - mosaicPosition: {x: 3927, y: 5695} + mosaicPosition: {x: 4089, y: 6195} flatten: 0 isImported: 1 isVisible: 1 @@ -1447,7 +1384,7 @@ ScriptedImporter: parentIndex: 25 spriteID: 14aab779c58f90a40a99c1b0e02cc11c layerID: 443 - mosaicPosition: {x: 3812, y: 5868} + mosaicPosition: {x: 3791, y: 7105} flatten: 0 isImported: 1 isVisible: 1 @@ -1457,7 +1394,7 @@ ScriptedImporter: parentIndex: 25 spriteID: a4d40b2ba111122448c31f2ea4fd4d4d layerID: 439 - mosaicPosition: {x: 3903, y: 5703} + mosaicPosition: {x: 4065, y: 6203} flatten: 0 isImported: 1 isVisible: 1 @@ -1477,7 +1414,7 @@ ScriptedImporter: parentIndex: -1 spriteID: d4a3363adf457ae4aa15314d2db44ca5 layerID: 397 - mosaicPosition: {x: 3812, y: 6112} + mosaicPosition: {x: 3812, y: 5868} flatten: 0 isImported: 1 isVisible: 1 @@ -1487,7 +1424,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 2b82d9f9ac606bc46a69f1f1f2bc2fac layerID: 238 - mosaicPosition: {x: 3966, y: 6112} + mosaicPosition: {x: 3986, y: 6285} flatten: 0 isImported: 1 isVisible: 1 @@ -1507,7 +1444,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 7df889ef25dabad46bcacf053c71d0e6 layerID: 236 - mosaicPosition: {x: 3966, y: 6222} + mosaicPosition: {x: 3974, y: 6459} flatten: 0 isImported: 1 isVisible: 1 @@ -1527,7 +1464,7 @@ ScriptedImporter: parentIndex: -1 spriteID: a7f4162658d13014eb7749886a9e8c79 layerID: 237 - mosaicPosition: {x: 3953, y: 7243} + mosaicPosition: {x: 3966, y: 5868} flatten: 0 isImported: 1 isVisible: 1 diff --git a/Assets/Resources/Art/Obj/UF中的晶圆.png.meta b/Assets/Resources/Art/Obj/UF中的晶圆.png.meta index 7963f6aa3..800aa3cd1 100644 --- a/Assets/Resources/Art/Obj/UF中的晶圆.png.meta +++ b/Assets/Resources/Art/Obj/UF中的晶圆.png.meta @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Resources/Art/Obj/UF内部.png.meta b/Assets/Resources/Art/Obj/UF内部.png.meta index 454ec2631..a70bdcb90 100644 --- a/Assets/Resources/Art/Obj/UF内部.png.meta +++ b/Assets/Resources/Art/Obj/UF内部.png.meta @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Resources/Art/Obj/天空有色.png.meta b/Assets/Resources/Art/Obj/天空有色.png.meta index 413a8ed7c..f573c6525 100644 --- a/Assets/Resources/Art/Obj/天空有色.png.meta +++ b/Assets/Resources/Art/Obj/天空有色.png.meta @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Resources/Art/Obj/引导1.png.meta b/Assets/Resources/Art/Obj/引导1.png.meta index acd11377a..b750a5254 100644 --- a/Assets/Resources/Art/Obj/引导1.png.meta +++ b/Assets/Resources/Art/Obj/引导1.png.meta @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Resources/Art/Obj/引导2.png.meta b/Assets/Resources/Art/Obj/引导2.png.meta index beaf036d9..c5fcbbed3 100644 --- a/Assets/Resources/Art/Obj/引导2.png.meta +++ b/Assets/Resources/Art/Obj/引导2.png.meta @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Resources/Art/Obj/无色房间.png.meta b/Assets/Resources/Art/Obj/无色房间.png.meta index b1dfae9de..d8e9ae7f2 100644 --- a/Assets/Resources/Art/Obj/无色房间.png.meta +++ b/Assets/Resources/Art/Obj/无色房间.png.meta @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Resources/Art/Obj/晶圆缺失.png.meta b/Assets/Resources/Art/Obj/晶圆缺失.png.meta index 1cab3af2e..96fd27512 100644 --- a/Assets/Resources/Art/Obj/晶圆缺失.png.meta +++ b/Assets/Resources/Art/Obj/晶圆缺失.png.meta @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Resources/Art/Obj/有色海报.png.meta b/Assets/Resources/Art/Obj/有色海报.png.meta index 851948468..6a76d1375 100644 --- a/Assets/Resources/Art/Obj/有色海报.png.meta +++ b/Assets/Resources/Art/Obj/有色海报.png.meta @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Resources/Art/Obj/植物有色.png.meta b/Assets/Resources/Art/Obj/植物有色.png.meta index 40dbfd2f3..238f081f4 100644 --- a/Assets/Resources/Art/Obj/植物有色.png.meta +++ b/Assets/Resources/Art/Obj/植物有色.png.meta @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Resources/Art/Obj/植物错误.png.meta b/Assets/Resources/Art/Obj/植物错误.png.meta index 991bd8008..380af51ab 100644 --- a/Assets/Resources/Art/Obj/植物错误.png.meta +++ b/Assets/Resources/Art/Obj/植物错误.png.meta @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Resources/Art/Obj/错误天空.png.meta b/Assets/Resources/Art/Obj/错误天空.png.meta index 403e4a5f4..0302be13f 100644 --- a/Assets/Resources/Art/Obj/错误天空.png.meta +++ b/Assets/Resources/Art/Obj/错误天空.png.meta @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Resources/Art/Obj/错误海报.png.meta b/Assets/Resources/Art/Obj/错误海报.png.meta index 65cce8cb2..d4eacacb8 100644 --- a/Assets/Resources/Art/Obj/错误海报.png.meta +++ b/Assets/Resources/Art/Obj/错误海报.png.meta @@ -119,6 +119,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Resources/Prefabs/Fix/Bottle.prefab b/Assets/Resources/Prefabs/Fix/Bottle.prefab index 77b385741..1fd7a2e0a 100644 --- a/Assets/Resources/Prefabs/Fix/Bottle.prefab +++ b/Assets/Resources/Prefabs/Fix/Bottle.prefab @@ -1,173 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2840978318626887697 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 567805659929635752} - - component: {fileID: 817690707555423031} - m_Layer: 0 - m_Name: "\u6C34\u5E73\u56FE\u7247" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &567805659929635752 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2840978318626887697} - 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: 1411168873809891308} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &817690707555423031 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2840978318626887697} - 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: 941243827 - m_SortingLayer: 13 - m_SortingOrder: 80 - m_Sprite: {fileID: -6412422441114701899, guid: 8219c076aff3b6645ba4a60beb8e578b, 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: 1 - m_SpriteSortPoint: 0 ---- !u!1 &4795680994712464802 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8724711148914098161} - - component: {fileID: 5889512415423883134} - m_Layer: 0 - m_Name: "\u7AD6\u7ACB\u56FE\u7247" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8724711148914098161 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4795680994712464802} - 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: 1411168873809891308} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &5889512415423883134 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4795680994712464802} - 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: 941243827 - m_SortingLayer: 13 - m_SortingOrder: 81 - m_Sprite: {fileID: -6948434014169429400, guid: 8219c076aff3b6645ba4a60beb8e578b, 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: 1 - m_SpriteSortPoint: 0 --- !u!1 &8845394260969947391 GameObject: m_ObjectHideFlags: 0 @@ -178,8 +10,9 @@ GameObject: m_Component: - component: {fileID: 1411168873809891308} - component: {fileID: 5019418963173552022} - - component: {fileID: 207758920267391891} - component: {fileID: 6048524599704252402} + - component: {fileID: 207758920267391891} + - component: {fileID: 653930043964180535} m_Layer: 0 m_Name: Bottle m_TagString: Moveable @@ -196,12 +29,10 @@ Transform: m_GameObject: {fileID: 8845394260969947391} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.02, y: -0.02, z: 0} + m_LocalPosition: {x: 0.02, y: -0.02, z: -0.1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8724711148914098161} - - {fileID: 567805659929635752} + m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &5019418963173552022 @@ -236,38 +67,19 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0.007122487, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1.1171172, y: 3.0930932} + newSize: {x: 1.1171172, y: 3.0930932} + adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 3.11} + m_Size: {x: 1.0522316, y: 3.11} m_EdgeRadius: 0 ---- !u!114 &207758920267391891 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8845394260969947391} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6474997a226747428064c19bfb501a0f, type: 3} - m_Name: - m_EditorClassIdentifier: - data: - name: - description: - verticalSprite: - horizontalSprite: - curSnapSlot: {fileID: 0} - targetSnapSlot: {fileID: 0} --- !u!50 &6048524599704252402 Rigidbody2D: serializedVersion: 4 @@ -276,7 +88,7 @@ Rigidbody2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8845394260969947391} - m_BodyType: 0 + m_BodyType: 1 m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 @@ -295,3 +107,73 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 4 +--- !u!114 &207758920267391891 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8845394260969947391} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6474997a226747428064c19bfb501a0f, type: 3} + m_Name: + m_EditorClassIdentifier: + data: + name: + description: + verticalSprite: + horizontalSprite: + curSnapSlot: {fileID: 0} +--- !u!212 &653930043964180535 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8845394260969947391} + 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: 941243827 + m_SortingLayer: 13 + m_SortingOrder: 80 + m_Sprite: {fileID: -6948434014169429400, guid: 8219c076aff3b6645ba4a60beb8e578b, 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.1171172, y: 3.0930932} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Resources/Prefabs/Gear System/Gear.prefab b/Assets/Resources/Prefabs/Gear System/Gear.prefab index 17c56b0e6..e7b347678 100644 --- a/Assets/Resources/Prefabs/Gear System/Gear.prefab +++ b/Assets/Resources/Prefabs/Gear System/Gear.prefab @@ -74,7 +74,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 5 m_Sprite: {fileID: 21300000, guid: eccbf2467d281894bafba3ef467f0875, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity index 2ad692e03..7f8ae3296 100644 --- a/Assets/Scenes/ExpressFixScene.unity +++ b/Assets/Scenes/ExpressFixScene.unity @@ -123,6 +123,126 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &3113342 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3113343} + - component: {fileID: 3113345} + - component: {fileID: 3113344} + m_Layer: 0 + m_Name: Static Gear + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &3113343 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3113342} + 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: 689059532} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &3113344 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3113342} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &3113345 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3113342} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 1 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &18238394 GameObject: m_ObjectHideFlags: 0 @@ -291,6 +411,233 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &50200690 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 50200691} + - component: {fileID: 50200693} + - component: {fileID: 50200692} + m_Layer: 0 + m_Name: Pluggable Shaft8 + m_TagString: Shaft + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &50200691 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 50200690} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.5980012, y: -0.94100016, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 335400454} + m_Father: {fileID: 199118573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &50200692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 50200690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 3 + initRadius: 0.18 + initSprite: {fileID: 2517083572485905542, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + hasGear: 0 + childGear: {fileID: 0} + initialSpeed: 0 + targetSpeed: 0 + speed: 0 +--- !u!212 &50200693 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 50200690} + 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: -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 &84302515 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 84302516} + - component: {fileID: 84302518} + - component: {fileID: 84302517} + m_Layer: 0 + m_Name: Static Gear + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &84302516 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 84302515} + 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: 397208137} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &84302517 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 84302515} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &84302518 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 84302515} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 1 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &129808764 GameObject: m_ObjectHideFlags: 0 @@ -372,7 +719,7 @@ SpriteRenderer: m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1001 &154381820 @@ -475,135 +822,24 @@ Transform: 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_ConstrainProportionsScale: 1 m_Children: - - {fileID: 542720339} - - {fileID: 995693012} - - {fileID: 1429499427} - - {fileID: 2012701254} - - {fileID: 1933921925} + - {fileID: 1502166470} + - {fileID: 1816705940} + - {fileID: 920977095} + - {fileID: 689059532} + - {fileID: 50200691} + - {fileID: 1178243156} + - {fileID: 1229298157} + - {fileID: 397208137} + - {fileID: 519966455} + - {fileID: 1502891418} + - {fileID: 1191582645} + - {fileID: 1157913869} + - {fileID: 304594812} + - {fileID: 1913843931} m_Father: {fileID: 657112469} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &207364163 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 207364164} - - component: {fileID: 207364166} - - component: {fileID: 207364165} - m_Layer: 0 - m_Name: Static Gear - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &207364164 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 207364163} - 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: 1429499427} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!58 &207364165 -CircleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 207364163} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - serializedVersion: 2 - m_Radius: 0.5 ---- !u!212 &207364166 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 207364163} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 1 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &219926366 GameObject: m_ObjectHideFlags: 0 @@ -783,7 +1019,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 2 m_SpriteSortPoint: 0 ---- !u!1 &360323324 +--- !u!1 &304594811 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -791,30 +1027,106 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 360323325} + - component: {fileID: 304594812} + - component: {fileID: 304594814} + - component: {fileID: 304594813} m_Layer: 0 - m_Name: Gears - m_TagString: Untagged + m_Name: Driver Shaft + m_TagString: Shaft m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &360323325 +--- !u!4 &304594812 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360323324} + m_GameObject: {fileID: 304594811} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.188, y: 0.44500002, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 657112469} + m_Children: + - {fileID: 1695269846} + m_Father: {fileID: 199118573} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &385257988 +--- !u!114 &304594813 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 304594811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 0 + initRadius: 0.09 + initSprite: {fileID: 2517083572485905542, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + hasGear: 1 + childGear: {fileID: 0} + initialSpeed: 1 + targetSpeed: 0 + speed: 0 +--- !u!212 &304594814 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 304594811} + 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: -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 &335400453 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -822,9 +1134,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 385257989} - - component: {fileID: 385257991} - - component: {fileID: 385257990} + - component: {fileID: 335400454} + - component: {fileID: 335400456} + - component: {fileID: 335400455} m_Layer: 0 m_Name: Static Gear m_TagString: Untagged @@ -832,28 +1144,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!4 &385257989 +--- !u!4 &335400454 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 385257988} + m_GameObject: {fileID: 335400453} 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: 2012701254} + m_Father: {fileID: 50200691} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!58 &385257990 +--- !u!58 &335400455 CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 385257988} + m_GameObject: {fileID: 335400453} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -882,13 +1194,13 @@ CircleCollider2D: m_Offset: {x: 0, y: 0} serializedVersion: 2 m_Radius: 0.5 ---- !u!212 &385257991 +--- !u!212 &335400456 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 385257988} + m_GameObject: {fileID: 335400453} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -934,6 +1246,264 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &353968968 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 353968969} + - component: {fileID: 353968971} + - component: {fileID: 353968970} + m_Layer: 0 + m_Name: Static Gear + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &353968969 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 353968968} + 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: 1913843931} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &353968970 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 353968968} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &353968971 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 353968968} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 1 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &360323324 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 360323325} + m_Layer: 0 + m_Name: Gears + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &360323325 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360323324} + 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: 657112469} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &397208136 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 397208137} + - component: {fileID: 397208139} + - component: {fileID: 397208138} + m_Layer: 0 + m_Name: Pluggable Shaft5 + m_TagString: Shaft + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &397208137 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 397208136} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2, y: -0.6250002, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 84302516} + m_Father: {fileID: 199118573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &397208138 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 397208136} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 3 + initRadius: 0.09 + initSprite: {fileID: -997898850808940670, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + hasGear: 1 + childGear: {fileID: 0} + initialSpeed: 0 + targetSpeed: 0 + speed: 0 +--- !u!212 &397208139 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 397208136} + 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: -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 @@ -1113,6 +1683,190 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &488146691 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 488146692} + - component: {fileID: 488146693} + m_Layer: 0 + m_Name: "\u9501\u5B9A\u5360\u4F4D" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &488146692 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 488146691} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 7.31, y: -2.94, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9075492487606270442} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &488146693 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 488146691} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.0044341087, y: -0.1197201} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 4.698018, y: 2.0730464} + m_EdgeRadius: 0 +--- !u!1 &519966454 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 519966455} + - component: {fileID: 519966457} + - component: {fileID: 519966456} + m_Layer: 0 + m_Name: Pluggable Shaft4 + m_TagString: Shaft + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &519966455 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519966454} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.1860008, y: -0.08200007, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2073125522} + m_Father: {fileID: 199118573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &519966456 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519966454} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 3 + initRadius: 0.27 + initSprite: {fileID: -997898850808940670, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + hasGear: 1 + childGear: {fileID: 0} + initialSpeed: 0 + targetSpeed: 0 + speed: 0 +--- !u!212 &519966457 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519966454} + 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: -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 &536896723 GameObject: m_ObjectHideFlags: 0 @@ -1176,7 +1930,7 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: -0.0037719011} @@ -1192,113 +1946,6 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 0.3587699} m_EdgeRadius: 0 ---- !u!1 &542720338 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 542720339} - - component: {fileID: 542720341} - - component: {fileID: 542720340} - m_Layer: 0 - m_Name: Target - m_TagString: Shaft - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &542720339 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542720338} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6.629, y: 0.684, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1449816260} - m_Father: {fileID: 199118573} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &542720340 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542720338} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 0 - shaftType: 1 - initRadius: 1 - initSprite: {fileID: 2517083572485905542, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} - hasGear: 1 - childGear: {fileID: 0} - initialSpeed: 0 - targetSpeed: 0.3 - speed: 0 ---- !u!212 &542720341 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542720338} - 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: -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 &551825976 GameObject: m_ObjectHideFlags: 0 @@ -1528,6 +2175,126 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &638818516 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 638818517} + - component: {fileID: 638818519} + - component: {fileID: 638818518} + m_Layer: 0 + m_Name: Static Gear + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &638818517 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 638818516} + 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: 920977095} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &638818518 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 638818516} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &638818519 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 638818516} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 1 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &657112468 GameObject: m_ObjectHideFlags: 0 @@ -1554,7 +2321,7 @@ Transform: m_GameObject: {fileID: 657112468} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 20, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.93, y: 0.93, z: 0.93} m_ConstrainProportionsScale: 0 m_Children: @@ -1576,6 +2343,353 @@ MonoBehaviour: m_EditorClassIdentifier: gearPrefab: {fileID: 5285827322175967477, guid: 1711cb9f16070e0488096c259d4eee3d, type: 3} shaftPrefab: {fileID: 6363828760380717502, guid: 4bc957ee60485f2439dca605f6d4035e, type: 3} +--- !u!1 &689059531 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 689059532} + - component: {fileID: 689059534} + - component: {fileID: 689059533} + m_Layer: 0 + m_Name: Pluggable Shaft9 + m_TagString: Shaft + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &689059532 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689059531} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.7100011, y: -0.9590002, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3113343} + m_Father: {fileID: 199118573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &689059533 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689059531} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 3 + initRadius: 0.18 + initSprite: {fileID: -997898850808940670, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + hasGear: 1 + childGear: {fileID: 0} + initialSpeed: 0 + targetSpeed: 0 + speed: 0 +--- !u!212 &689059534 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689059531} + 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: -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 &689577048 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 689577049} + - component: {fileID: 689577051} + - component: {fileID: 689577050} + m_Layer: 0 + m_Name: Static Gear + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &689577049 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689577048} + 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: 1502891418} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &689577050 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689577048} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &689577051 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 689577048} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 1 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &694233552 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 694233553} + - component: {fileID: 694233555} + - component: {fileID: 694233554} + m_Layer: 0 + m_Name: Static Gear + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &694233553 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 694233552} + 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: 1191582645} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &694233554 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 694233552} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &694233555 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 694233552} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 1 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &695150750 GameObject: m_ObjectHideFlags: 0 @@ -1639,7 +2753,7 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0.013091326, y: -0.0037403703} @@ -2171,7 +3285,7 @@ Transform: - {fileID: 2064668201} m_Father: {fileID: 1410382569} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &931866230 +--- !u!1 &920977094 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2179,143 +3293,60 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 931866231} - - component: {fileID: 931866232} + - component: {fileID: 920977095} + - component: {fileID: 920977097} + - component: {fileID: 920977096} m_Layer: 0 - m_Name: "\u74F6\u67B6\u906E\u7F69" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &931866231 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 931866230} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.74, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3425443257668001660} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!331 &931866232 -SpriteMask: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 931866230} - 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: 1561374818738902417, guid: 8219c076aff3b6645ba4a60beb8e578b, type: 3} - m_MaskAlphaCutoff: 0.2 - m_FrontSortingLayerID: 941243827 - m_BackSortingLayerID: 941243827 - m_FrontSortingLayer: 13 - m_BackSortingLayer: 13 - m_FrontSortingOrder: 81 - m_BackSortingOrder: 80 - m_IsCustomRangeActive: 1 - m_SpriteSortPoint: 0 ---- !u!1 &995693011 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 995693012} - - component: {fileID: 995693014} - - component: {fileID: 995693013} - m_Layer: 0 - m_Name: Driver + m_Name: Empty Pluggable Shaft1 m_TagString: Shaft m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &995693012 +--- !u!4 &920977095 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 995693011} + m_GameObject: {fileID: 920977094} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.64, y: 3.33, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.135, y: 0.182, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2003869747} + - {fileID: 638818517} m_Father: {fileID: 199118573} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &995693013 +--- !u!114 &920977096 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 995693011} + m_GameObject: {fileID: 920977094} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} m_Name: m_EditorClassIdentifier: id: 0 - shaftType: 0 - initRadius: 0.5 - initSprite: {fileID: -997898850808940670, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} - hasGear: 1 + shaftType: 3 + initRadius: 0.15 + initSprite: {fileID: 2517083572485905542, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + hasGear: 0 childGear: {fileID: 0} - initialSpeed: 1 + initialSpeed: 0 targetSpeed: 0 speed: 0 ---- !u!212 &995693014 +--- !u!212 &920977097 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 995693011} + m_GameObject: {fileID: 920977094} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -2361,6 +3392,246 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &992880609 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 992880610} + - component: {fileID: 992880612} + - component: {fileID: 992880611} + m_Layer: 0 + m_Name: Static Gear + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &992880610 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 992880609} + 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: 1502166470} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &992880611 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 992880609} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &992880612 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 992880609} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 1 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1003152247 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1003152248} + - component: {fileID: 1003152250} + - component: {fileID: 1003152249} + m_Layer: 0 + m_Name: Static Gear + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1003152248 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1003152247} + 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: 1229298157} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &1003152249 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1003152247} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &1003152250 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1003152247} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 1 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1027538762 GameObject: m_ObjectHideFlags: 0 @@ -2408,6 +3679,126 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: character: {fileID: 0} +--- !u!1 &1040656336 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1040656337} + - component: {fileID: 1040656339} + - component: {fileID: 1040656338} + m_Layer: 0 + m_Name: Static Gear + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1040656337 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1040656336} + 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: 1157913869} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &1040656338 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1040656336} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &1040656339 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1040656336} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 1 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1081346457 GameObject: m_ObjectHideFlags: 0 @@ -2566,7 +3957,7 @@ MonoBehaviour: isSuccess: 0 coverMoveDuration: 2 coverMoveDistance: 2.8 ---- !u!1 &1119304932 +--- !u!1 &1157913868 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2574,73 +3965,60 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1119304933} - - component: {fileID: 1119304935} - - component: {fileID: 1119304934} + - component: {fileID: 1157913869} + - component: {fileID: 1157913871} + - component: {fileID: 1157913870} m_Layer: 0 - m_Name: Static Gear - m_TagString: Untagged + m_Name: Pluggable Shaft1 + m_TagString: Shaft m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1119304933 + m_IsActive: 1 +--- !u!4 &1157913869 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1119304932} + m_GameObject: {fileID: 1157913868} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.4060006, y: 0.29500005, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1933921925} + m_Children: + - {fileID: 1040656337} + m_Father: {fileID: 199118573} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!58 &1119304934 -CircleCollider2D: +--- !u!114 &1157913870 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1119304932} + m_GameObject: {fileID: 1157913868} m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - serializedVersion: 2 - m_Radius: 0.5 ---- !u!212 &1119304935 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 3 + initRadius: 0.18 + initSprite: {fileID: 2517083572485905542, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + hasGear: 1 + childGear: {fileID: 0} + initialSpeed: 0 + targetSpeed: 0 + speed: 0 +--- !u!212 &1157913871 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1119304932} + m_GameObject: {fileID: 1157913868} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -2674,13 +4052,13 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_SortingOrder: 4 + 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: 1 - m_Size: {x: 1, y: 1} + m_DrawMode: 0 + m_Size: {x: 1, y: 0.55} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2770,6 +4148,220 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1178243155 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1178243156} + - component: {fileID: 1178243158} + - component: {fileID: 1178243157} + m_Layer: 0 + m_Name: Pluggable Shaft7 + m_TagString: Shaft + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1178243156 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1178243155} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.2280006, y: -0.45300016, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2124825891} + m_Father: {fileID: 199118573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1178243157 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1178243155} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 3 + initRadius: 0.09 + initSprite: {fileID: 2517083572485905542, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + hasGear: 0 + childGear: {fileID: 0} + initialSpeed: 0 + targetSpeed: 0 + speed: 0 +--- !u!212 &1178243158 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1178243155} + 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: -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 &1191582644 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1191582645} + - component: {fileID: 1191582647} + - component: {fileID: 1191582646} + 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 &1191582645 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1191582644} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.7060009, y: 0.30799994, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 694233553} + m_Father: {fileID: 199118573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1191582646 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1191582644} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 3 + initRadius: 0.09 + initSprite: {fileID: 2517083572485905542, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + hasGear: 0 + childGear: {fileID: 0} + initialSpeed: 0 + targetSpeed: 0 + speed: 0 +--- !u!212 &1191582647 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1191582644} + 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: -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 &1195425274 GameObject: m_ObjectHideFlags: 0 @@ -2851,7 +4443,7 @@ SpriteRenderer: m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &1223292339 @@ -2888,7 +4480,6 @@ Transform: - {fileID: 5866476691632637982} - {fileID: 8746543875332178802} - {fileID: 3990029345714523381} - - {fileID: 1631960655} m_Father: {fileID: 5099857572599168636} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1223292341 @@ -2911,8 +4502,151 @@ MonoBehaviour: topBuckleLockPos: {x: 7.3002996, y: -2.9759758, z: 0} leftBuckleLockPos: {x: 5.334, y: -3.049, z: 0} rightBuckleLockPos: {x: 9.248, y: -3.049, z: 0} + pumpUpPos: {x: 0, y: 0, z: 0} + pumpDownPos: {x: 0, y: -1.9, z: 0} showDuration: 0.5 buckleDuration: 0.5 + pumpDuration: 2 +--- !u!1 &1229298156 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1229298157} + - component: {fileID: 1229298159} + - component: {fileID: 1229298158} + m_Layer: 0 + m_Name: Pluggable Shaft6 + m_TagString: Shaft + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1229298157 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1229298156} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.855001, y: -0.3910001, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1003152248} + m_Father: {fileID: 199118573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1229298158 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1229298156} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 3 + initRadius: 0.18 + initSprite: {fileID: 2517083572485905542, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + hasGear: 1 + childGear: {fileID: 0} + initialSpeed: 0 + targetSpeed: 0 + speed: 0 +--- !u!212 &1229298159 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1229298156} + 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: -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 &1279241653 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1279241654} + m_Layer: 0 + m_Name: "\u6CF5\u5934" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1279241654 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1279241653} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4121118064729006111} + - {fileID: 1855379866570077322} + m_Father: {fileID: 5866476691632637982} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1362020081 GameObject: m_ObjectHideFlags: 0 @@ -2972,7 +4706,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1410382569 Transform: m_ObjectHideFlags: 0 @@ -2991,7 +4725,7 @@ Transform: - {fileID: 2061960537} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1429499426 +--- !u!1 &1502166469 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2999,60 +4733,60 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1429499427} - - component: {fileID: 1429499429} - - component: {fileID: 1429499428} + - component: {fileID: 1502166470} + - component: {fileID: 1502166472} + - component: {fileID: 1502166471} m_Layer: 0 - m_Name: Constant + m_Name: Empty Pluggable Shaft3 m_TagString: Shaft m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1429499427 +--- !u!4 &1502166470 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1429499426} + m_GameObject: {fileID: 1502166469} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.973, y: 2.457, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.118, y: -0.256, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 207364164} + - {fileID: 992880610} m_Father: {fileID: 199118573} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1429499428 +--- !u!114 &1502166471 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1429499426} + m_GameObject: {fileID: 1502166469} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} m_Name: m_EditorClassIdentifier: id: 0 - shaftType: 2 - initRadius: 0.5 - initSprite: {fileID: 4685789066096419141, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} - hasGear: 1 + shaftType: 3 + initRadius: 0.15 + initSprite: {fileID: 2517083572485905542, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + hasGear: 0 childGear: {fileID: 0} initialSpeed: 0 targetSpeed: 0 speed: 0 ---- !u!212 &1429499429 +--- !u!212 &1502166472 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1429499426} + m_GameObject: {fileID: 1502166469} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -3098,7 +4832,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1449816259 +--- !u!1 &1502891417 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3106,73 +4840,60 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1449816260} - - component: {fileID: 1449816262} - - component: {fileID: 1449816261} + - component: {fileID: 1502891418} + - component: {fileID: 1502891420} + - component: {fileID: 1502891419} m_Layer: 0 - m_Name: Static Gear - m_TagString: Untagged + m_Name: Pluggable Shaft3 + m_TagString: Shaft m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1449816260 + m_IsActive: 1 +--- !u!4 &1502891418 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1449816259} + m_GameObject: {fileID: 1502891417} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.9760008, y: 0.30000004, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 542720339} + m_Children: + - {fileID: 689577049} + m_Father: {fileID: 199118573} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!58 &1449816261 -CircleCollider2D: +--- !u!114 &1502891419 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1449816259} + m_GameObject: {fileID: 1502891417} m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - serializedVersion: 2 - m_Radius: 0.5 ---- !u!212 &1449816262 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 3 + initRadius: 0.18 + initSprite: {fileID: 2517083572485905542, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + hasGear: 1 + childGear: {fileID: 0} + initialSpeed: 0 + targetSpeed: 0 + speed: 0 +--- !u!212 &1502891420 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1449816259} + m_GameObject: {fileID: 1502891417} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -3206,13 +4927,13 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_SortingOrder: 4 + 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: 1 - m_Size: {x: 1, y: 1} + m_DrawMode: 0 + m_Size: {x: 1, y: 0.55} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -3361,7 +5082,7 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.925, y: 0.625} m_EdgeRadius: 0 ---- !u!1 &1631960654 +--- !u!1 &1658488032 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3369,40 +5090,76 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1631960655} - - component: {fileID: 1631960656} + - component: {fileID: 1658488033} + - component: {fileID: 1658488035} + - component: {fileID: 1658488034} m_Layer: 0 - m_Name: "\u6CF5\u673A\u4FA7\u906E\u7F69" + m_Name: Static Gear m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1631960655 + m_IsActive: 0 +--- !u!4 &1658488033 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1631960654} + m_GameObject: {fileID: 1658488032} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.62, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1223292340} + m_Father: {fileID: 1816705940} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!331 &1631960656 -SpriteMask: +--- !u!58 &1658488034 +CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1631960654} + m_GameObject: {fileID: 1658488032} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &1658488035 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1658488032} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 m_MotionVectors: 1 @@ -3413,7 +5170,7 @@ SpriteMask: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3426,23 +5183,24 @@ SpriteMask: m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 5482654695604781318, guid: 8219c076aff3b6645ba4a60beb8e578b, type: 3} - m_MaskAlphaCutoff: 0.2 - m_FrontSortingLayerID: 941243827 - m_BackSortingLayerID: 941243827 - m_FrontSortingLayer: 13 - m_BackSortingLayer: 13 - m_FrontSortingOrder: 80 - m_BackSortingOrder: 79 - m_IsCustomRangeActive: 1 + m_SortingOrder: 5 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 1 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &1666048029 GameObject: @@ -3883,6 +5641,126 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1695269845 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1695269846} + - component: {fileID: 1695269848} + - component: {fileID: 1695269847} + m_Layer: 0 + m_Name: Static Gear + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1695269846 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695269845} + 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: 304594812} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &1695269847 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695269845} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &1695269848 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695269845} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 1 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1704466887 GameObject: m_ObjectHideFlags: 0 @@ -4336,6 +6214,220 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!1 &1816705939 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1816705940} + - component: {fileID: 1816705942} + - component: {fileID: 1816705941} + m_Layer: 0 + m_Name: Empty Pluggable Shaft2 + m_TagString: Shaft + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1816705940 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1816705939} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.087, y: -0.693, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1658488033} + m_Father: {fileID: 199118573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1816705941 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1816705939} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 3 + initRadius: 0.15 + initSprite: {fileID: 2517083572485905542, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + hasGear: 0 + childGear: {fileID: 0} + initialSpeed: 0 + targetSpeed: 0 + speed: 0 +--- !u!212 &1816705942 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1816705939} + 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: -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 &1913843930 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1913843931} + - component: {fileID: 1913843933} + - component: {fileID: 1913843932} + m_Layer: 0 + m_Name: Target Shaft + m_TagString: Shaft + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1913843931 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1913843930} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.1600008, y: -0.9610002, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 353968969} + m_Father: {fileID: 199118573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1913843932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1913843930} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 1 + initRadius: 0.27 + initSprite: {fileID: 2517083572485905542, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + hasGear: 1 + childGear: {fileID: 0} + initialSpeed: 0 + targetSpeed: 0.3 + speed: 0 +--- !u!212 &1913843933 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1913843930} + 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: -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 &1932269923 GameObject: m_ObjectHideFlags: 0 @@ -4431,113 +6523,6 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 ---- !u!1 &1933921924 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1933921925} - - component: {fileID: 1933921927} - - component: {fileID: 1933921926} - m_Layer: 0 - m_Name: Empty - m_TagString: Shaft - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1933921925 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1933921924} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6.56, y: 4.334, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1119304933} - m_Father: {fileID: 199118573} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1933921926 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1933921924} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 0 - shaftType: 3 - initRadius: 0.5 - initSprite: {fileID: 2517083572485905542, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} - hasGear: 0 - childGear: {fileID: 0} - initialSpeed: 0 - targetSpeed: 0 - speed: 0 ---- !u!212 &1933921927 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1933921924} - 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: -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 &1950862272 GameObject: m_ObjectHideFlags: 0 @@ -4622,233 +6607,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2003869746 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2003869747} - - component: {fileID: 2003869749} - - component: {fileID: 2003869748} - m_Layer: 0 - m_Name: Static Gear - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &2003869747 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2003869746} - 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: 995693012} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!58 &2003869748 -CircleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2003869746} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - serializedVersion: 2 - m_Radius: 0.5 ---- !u!212 &2003869749 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2003869746} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 1 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &2012701253 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2012701254} - - component: {fileID: 2012701256} - - component: {fileID: 2012701255} - m_Layer: 0 - m_Name: Pluggable - m_TagString: Shaft - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2012701254 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2012701253} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.516, y: 3.867, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 385257989} - m_Father: {fileID: 199118573} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2012701255 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2012701253} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 0 - shaftType: 3 - initRadius: 0.5 - initSprite: {fileID: 2517083572485905542, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} - hasGear: 1 - childGear: {fileID: 0} - initialSpeed: 0 - targetSpeed: 0 - speed: 0 ---- !u!212 &2012701256 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2012701253} - 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: -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 &2061960536 GameObject: m_ObjectHideFlags: 0 @@ -5019,6 +6777,329 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2066386597 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2066386598} + - component: {fileID: 2066386599} + m_Layer: 0 + m_Name: "\u6CF5\u5934\u906E\u7F69" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2066386598 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2066386597} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5.172, y: -0.812, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7046838055193118540} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!331 &2066386599 +SpriteMask: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2066386597} + 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: -4561017723739588791, guid: 8219c076aff3b6645ba4a60beb8e578b, type: 3} + m_MaskAlphaCutoff: 0.2 + m_FrontSortingLayerID: 941243827 + m_BackSortingLayerID: 941243827 + m_FrontSortingLayer: 13 + m_BackSortingLayer: 13 + m_FrontSortingOrder: 61 + m_BackSortingOrder: 59 + m_IsCustomRangeActive: 1 + m_SpriteSortPoint: 0 +--- !u!1 &2073125521 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2073125522} + - component: {fileID: 2073125524} + - component: {fileID: 2073125523} + m_Layer: 0 + m_Name: Static Gear + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2073125522 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2073125521} + 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: 519966455} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &2073125523 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2073125521} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &2073125524 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2073125521} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 1 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &2124825890 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2124825891} + - component: {fileID: 2124825893} + - component: {fileID: 2124825892} + m_Layer: 0 + m_Name: Static Gear + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2124825891 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2124825890} + 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: 1178243156} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &2124825892 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2124825890} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!212 &2124825893 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2124825890} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 1 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2133683124 GameObject: m_ObjectHideFlags: 0 @@ -5322,7 +7403,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 + m_MaskInteraction: 2 m_SpriteSortPoint: 0 --- !u!4 &488366181828707408 Transform: @@ -5979,11 +8060,11 @@ Transform: m_GameObject: {fileID: 55461965490791556} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 5.1576586, y: 1.9834838, z: 0} + m_LocalPosition: {x: 5.157659, y: 1.9834838, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7046838055193118540} + m_Father: {fileID: 1279241654} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1885084969862063570 SpriteRenderer: @@ -6693,7 +8774,6 @@ Transform: - {fileID: 1776039590} - {fileID: 1799105519} - {fileID: 488366181828707408} - - {fileID: 931866231} m_Father: {fileID: 5099857572599168636} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3462511924263142827 @@ -6971,11 +9051,11 @@ Transform: m_GameObject: {fileID: 8678762819119525228} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 5.13964, y: 4.0300303, z: 0} + m_LocalPosition: {x: 5.1396403, y: 4.0300303, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7046838055193118540} + m_Father: {fileID: 1279241654} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &4172303922151227798 SpriteRenderer: @@ -7387,7 +9467,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 941243827 m_SortingLayer: 13 - m_SortingOrder: 98 + m_SortingOrder: 75 m_Sprite: {fileID: 6157844295804381006, guid: 8219c076aff3b6645ba4a60beb8e578b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -7752,6 +9832,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1279241654} - {fileID: 7046838055193118540} - {fileID: 4804752346305095091} - {fileID: 2637407694422089600} @@ -8091,8 +10172,7 @@ Transform: m_Children: - {fileID: 7550439840247379907} - {fileID: 3784388396908826591} - - {fileID: 4121118064729006111} - - {fileID: 1855379866570077322} + - {fileID: 2066386598} m_Father: {fileID: 5866476691632637982} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7068384167402292361 @@ -8816,7 +10896,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 941243827 m_SortingLayer: 13 - m_SortingOrder: 61 + m_SortingOrder: 60 m_Sprite: {fileID: 8456091941763830399, guid: 8219c076aff3b6645ba4a60beb8e578b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -8826,7 +10906,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 + m_MaskInteraction: 2 m_SpriteSortPoint: 0 --- !u!212 &8520551981405752809 SpriteRenderer: @@ -9052,7 +11132,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 941243827 m_SortingLayer: 13 - m_SortingOrder: 99 + m_SortingOrder: 75 m_Sprite: {fileID: 9184878608666286671, guid: 8219c076aff3b6645ba4a60beb8e578b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -9087,6 +11167,7 @@ Transform: - {fileID: 695150751} - {fileID: 536896724} - {fileID: 8090610914013374239} + - {fileID: 488146692} m_Father: {fileID: 1223292340} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &9210352354887959608 diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs index 4b26c7afc..5394e8d9c 100644 --- a/Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs +++ b/Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs @@ -9,6 +9,7 @@ namespace AibisDream.FixSystem public event Action InsertSlotEvent; public CoolingBottleData initBottleData; + private CoolingBottle _curBottle; private GameObject _bottlePrefab; private bool _inShelf; @@ -32,6 +33,7 @@ namespace AibisDream.FixSystem if (string.IsNullOrEmpty(initBottleData.name)) return; var newBottle = Instantiate(_bottlePrefab, transform).GetComponent(); + _curBottle = newBottle; // 加载瓶子数据 newBottle.Load(initBottleData); newBottle.curSnapSlot = this; @@ -43,11 +45,13 @@ namespace AibisDream.FixSystem /// private void OnTriggerEnter2D(Collider2D other) { - Debug.Log("Enter: " + other.gameObject.name); + // 如果当前Slot里已经有瓶子了,就返回 + if (_curBottle != null) return; + // 尝试获取瓶子 if (other.gameObject.TryGetComponent(out var bottle)) { - bottle.targetSnapSlot = this; + bottle.targetSnapSlotSet.Add(this); } } @@ -57,23 +61,52 @@ namespace AibisDream.FixSystem /// private void OnTriggerExit2D(Collider2D other) { - Debug.Log("Exit: " + other.gameObject.name); // 尝试获取瓶子 if (other.gameObject.TryGetComponent(out var bottle)) { - bottle.targetSnapSlot = null; + bottle.targetSnapSlotSet.Remove(this); } } + /// + /// 移除当前瓶子 + /// + public void RemoveBottle() + { + _curBottle = null; + } + /// /// 插入时触发 /// /// public void InsertSlot(CoolingBottle coolingBottle) { - coolingBottle.transform.parent = transform; - coolingBottle.SwitchColliderSize(_inShelf); + _curBottle = coolingBottle; + // 在架子上才正过来 + if (_inShelf) + { + coolingBottle.Rotate(true); + } InsertSlotEvent?.Invoke(coolingBottle); } + + /// + /// 是否有冷却液 + /// + /// 瓶子 + public CoolingBottle GetCurBottle() + { + return _curBottle; + } + + public void DestroyBottle() + { + if (_curBottle) + { + _curBottle = null; + Destroy(_curBottle); + } + } } } \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingBottle.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingBottle.cs index 9a8c2b127..5b03cdc88 100644 --- a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingBottle.cs +++ b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingBottle.cs @@ -1,28 +1,34 @@ using System; +using System.Collections; +using System.Collections.Generic; using AibisDream.Framework; using DG.Tweening; using UnityEngine; namespace AibisDream.FixSystem { - [RequireComponent(typeof(Collider2D))] + [RequireComponent(typeof(Collider2D), typeof(Rigidbody2D))] public class CoolingBottle : MonoBehaviour, IMoveable { + private const float RotateTime = 0.3f; private const float SnapMoveTime = 0.3f; - private static readonly Vector2 VerticalBox = new(1, 3.11f); - private static readonly Vector2 HorizontalBox = new(4.7f, 1.65f); - + private static readonly Vector3 ClockwiseAngle = new(0, 0, 0); + private static readonly Vector3 ClockWiseScale = new(1, 1, 1); + private static readonly Vector3 AnticlockwiseAngle = new(0, 0, 90); + private static readonly Vector3 AnticlockwiseScale = new(1.45f, 1.45f, 1); + public CoolingBottleData data; #region 引用 - - private BoxCollider2D _collider; - - private SpriteRenderer _verticalSprite; - private SpriteRenderer _horizontalSprite; + + private Sprite _verticalSprite; + private Sprite _horizontalSprite; public BottleSlot curSnapSlot; - public BottleSlot targetSnapSlot; + public readonly HashSet targetSnapSlotSet = new(); + + private Rigidbody2D _rb; + private SpriteRenderer _renderer; #endregion @@ -33,60 +39,94 @@ namespace AibisDream.FixSystem private void InitRefs() { - _collider = GetComponent(); - _collider.size = VerticalBox; - - _verticalSprite = transform.Find("竖立图片").GetComponent(); - _horizontalSprite = transform.Find("水平图片").GetComponent(); + _rb = GetComponent(); + _renderer = GetComponent(); } - #region - - public void LiquidDown() - { - } - - public void LiquidUp() - { - } - - #endregion - #region 移动逻辑 public bool IsBlock { get; set; } public void StartMove() { + _rb.isKinematic = false; + curSnapSlot.RemoveBottle(); + // 开始移动时就切换成横版 + Rotate(false); + } + + public void Rotate(bool isVertical) + { + StartCoroutine(RotateAsync(isVertical)); + } + + /// + /// 旋转瓶子 + /// + /// 是否竖直 + /// + private IEnumerator RotateAsync(bool isVertical) + { + var angle = isVertical ? ClockwiseAngle : AnticlockwiseAngle; + var scale = isVertical ? ClockWiseScale : AnticlockwiseScale; + // 动画序列 + var sq = DOTween.Sequence(); + Tween rotate = transform.DORotate(angle, RotateTime, RotateMode.FastBeyond360); + sq.Join(rotate); + Tween scaleTw = transform.DOScale(scale, RotateTime); + sq.Join(scaleTw); + + while (sq.active && !sq.IsComplete()) + { + yield return null; + } } public void Move(Vector2 mousePos) { - transform.position = mousePos; + _rb.MovePosition(mousePos); } public void StopMove() { - if (targetSnapSlot) + if (TryFindClosestSlot(out var targetSlot)) { - curSnapSlot = targetSnapSlot; + curSnapSlot = targetSlot; } - targetSnapSlot = null; + targetSnapSlotSet.Clear(); // 吸附到目标位置 + _rb.isKinematic = true; transform.DOMove(curSnapSlot.transform.position, SnapMoveTime); curSnapSlot.InsertSlot(this); // TODO 停止描边 } - /// - /// 切换碰撞箱形状 - /// - /// 是否水平 - public void SwitchColliderSize(bool isVertical) + public bool TryFindClosestSlot(out BottleSlot targetSlot) { - _collider.size = isVertical ? VerticalBox : HorizontalBox; + // 没有目标Slot,返回 + if (targetSnapSlotSet.Count == 0) + { + targetSlot = null; + return false; + } + + // 寻找最近的Slot + var shortestDistance = float.MaxValue; + BottleSlot closestSlot = null; + foreach (var slot in targetSnapSlotSet) + { + var distance = Vector3.Distance(slot.transform.position, transform.position); + if (distance < shortestDistance) + { + shortestDistance = distance; + closestSlot = slot; + } + } + + targetSlot = closestSlot; + return true; } #endregion @@ -94,8 +134,8 @@ namespace AibisDream.FixSystem public void Load(CoolingBottleData targetData) { data = targetData; - _verticalSprite.sprite = ResourceKit.LoadSpriteFromPsd($"Art/Fix/Cooling/冷却系统/{data.verticalSprite}"); - _horizontalSprite.sprite = ResourceKit.LoadSpriteFromPsd($"Art/Fix/Cooling/冷却系统/{data.horizontalSprite}"); + _verticalSprite = ResourceKit.LoadSpriteFromPsd($"Art/Fix/Cooling/冷却系统/{data.verticalSprite}"); + _renderer.sprite = _verticalSprite; } } diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs index e42bc496d..b729f648b 100644 --- a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs +++ b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs @@ -1,6 +1,7 @@ using System.Collections; using AibisDream.FixSystem; using UnityEngine; +using Yarn.Unity; namespace AibisDream.Framework { @@ -18,9 +19,9 @@ namespace AibisDream.Framework public bool isLocked; - #endregion + private CoolingBottle CurBottle => _pumpUI.bottleSlot.GetCurBottle(); - public CoolingBottle curBottle; + #endregion private void Awake() { @@ -33,6 +34,8 @@ namespace AibisDream.Framework _pumpUI = transform.Find("Pump Part").GetComponent(); _bottomUI = transform.Find("Bottom Part").GetComponent(); _tubeUI = transform.Find("Tube Part").GetComponent(); + + isLocked = true; } #region 对外开放 @@ -57,48 +60,60 @@ namespace AibisDream.Framework public void Unlock() { isLocked = false; - if (curBottle) + if (CurBottle) { - curBottle.IsBlock = false; + CurBottle.IsBlock = false; } _pumpUI.OpenBuckle(); } public void InsertBottle(CoolingBottle bottle) { - // 设置为当前Bottle - curBottle = bottle; + // 插入似乎没有太多逻辑? } public void Lock() { isLocked = true; // 已锁定的瓶子禁止使用 - if (curBottle) + if (CurBottle) { - curBottle.IsBlock = true; + CurBottle.IsBlock = true; } _pumpUI.CloseBuckle(); } public void StartPump() { - throw new System.NotImplementedException(); + // 进行泵机操作 + if (isLocked && CurBottle) + { + // 播放pump动画 + _pumpUI.PlayPumpAnime(); + // 播放泵机运行对话 + // DialogController.Instance.StartDialogNode($"泵机运行_{CurBottle.data.name}"); + Debug.Log($"泵机运行_{CurBottle.data.name}"); + } } - public void CloseBottleUI() + [YarnCommand("close_bottle_ui")] + public IEnumerator CloseBottleUI() { - throw new System.NotImplementedException(); + yield return _bottomUI.Hide(); + } + + [YarnCommand("close_cooling_system")] + public IEnumerator CloseCoolingSystem() + { + yield return _pumpUI.Hide(); + _pumpUI.StopPumpAnime(); + _pumpUI.DestroyBottle(); } - public void CloseCoolingSystem() + [YarnCommand("pull_out_tube")] + public IEnumerator PullOutTube() { - throw new System.NotImplementedException(); - } - - public void PullOutTube() - { - throw new System.NotImplementedException(); + yield return _tubeUI.PlayPullOutAnime(); } #endregion @@ -121,10 +136,10 @@ namespace AibisDream.Framework // 点击泵机开关 public void StartPump(); // 冷却液架收回 - public void CloseBottleUI(); + public IEnumerator CloseBottleUI(); // 冷却系统UI收回 - public void CloseCoolingSystem(); + public IEnumerator CloseCoolingSystem(); // 拔管 - public void PullOutTube(); + public IEnumerator PullOutTube(); } } \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/PumpController.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/PumpController.cs index d8cd00add..f87f8487c 100644 --- a/Assets/Scripts/FixSystemNew/CoolingMachine/PumpController.cs +++ b/Assets/Scripts/FixSystemNew/CoolingMachine/PumpController.cs @@ -2,13 +2,13 @@ using AibisDream.Framework; using DG.Tweening; using UnityEngine; +using UnityEngine.Serialization; namespace AibisDream.FixSystem { public class PumpController : MonoBehaviour { - [Header("整体位置")] - public Vector3 hidePos; + [Header("整体位置")] public Vector3 hidePos; public Vector3 showPos; public Vector3 topBuckleUnlockPos; @@ -17,22 +17,28 @@ namespace AibisDream.FixSystem public Vector3 topBuckleLockPos; public Vector3 leftBuckleLockPos; public Vector3 rightBuckleLockPos; - - [Header("移动用时")] - public float showDuration; + + public Vector3 pumpUpPos; + public Vector3 pumpDownPos; + + [Header("移动用时")] public float showDuration; public float buckleDuration; + public float pumpDuration; #region 组件索引 private CoolingSystem _coolingSystem; - + private SpriteButton _lockButton; private SpriteButton _pumpButton; private Transform _topBuckle; private Transform _leftBuckle; private Transform _rightBuckle; - private BottleSlot _bottleSlot; + [HideInInspector] public BottleSlot bottleSlot; + private GameObject _lockBox; + + private Transform _pumpHead; #endregion @@ -48,20 +54,26 @@ namespace AibisDream.FixSystem { // 初始化引用 _coolingSystem = GetComponentInParent(); - + var buckleGroup = transform.Find("按键卡扣组"); - + _lockButton = new SpriteButton(buckleGroup.Find("Lock Button").gameObject); _pumpButton = new SpriteButton(buckleGroup.Find("Pump Button").gameObject); _lockButton.OnButtonDown += LockButtonDown; _pumpButton.OnButtonDown += PumpButtonDown; - + _topBuckle = buckleGroup.Find("上下卡扣"); _leftBuckle = buckleGroup.Find("左卡扣"); _rightBuckle = buckleGroup.Find("右卡扣"); - // _bottleSlot = GetComponentInChildren(); - // _bottleSlot?.InsertSlotEvent += _coolingSystem.InsertBottle; + _lockBox = buckleGroup.Find("锁定占位").gameObject; + _lockBox.SetActive(true); + + var pumpGroup = transform.Find("泵机组"); + _pumpHead = pumpGroup.Find("泵头"); + + bottleSlot = GetComponentInChildren(); + bottleSlot.InsertSlotEvent += _coolingSystem.InsertBottle; } #region 按钮 @@ -118,11 +130,14 @@ namespace AibisDream.FixSystem { yield return null; } + gameObject.SetActive(false); } - + public void OpenBuckle() { + _lockBox.SetActive(false); + _topBuckle.DOLocalMove(topBuckleUnlockPos, buckleDuration); _leftBuckle.DOLocalMove(leftBuckleUnlockPos, buckleDuration); _rightBuckle.DOLocalMove(rightBuckleUnlockPos, buckleDuration); @@ -130,11 +145,30 @@ namespace AibisDream.FixSystem public void CloseBuckle() { + _lockBox.SetActive(true); + _topBuckle.DOLocalMove(topBuckleLockPos, buckleDuration); _leftBuckle.DOLocalMove(leftBuckleLockPos, buckleDuration); _rightBuckle.DOLocalMove(rightBuckleLockPos, buckleDuration); } + public void PlayPumpAnime() + { + _pumpHead.DOLocalMove(pumpDownPos, pumpDuration).SetLoops(-1, LoopType.Yoyo) + .SetEase(Ease.Linear); + } + + public void StopPumpAnime() + { + _pumpHead.DOKill(); + _pumpHead.localPosition = pumpUpPos; + } + + public void DestroyBottle() + { + bottleSlot.DestroyBottle(); + } + #endregion } } \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs index 373d9d66c..d9513090f 100644 --- a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs +++ b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs @@ -36,6 +36,7 @@ namespace AibisDream.FixSystem TransitionDic.Add(FixState.Engine, FixState.BodyModule, new EngineToBodyModuleCommand()); TransitionDic.Add(FixState.Clinic, FixState.Engine, new ClinicToEngineCommand()); TransitionDic.Add(FixState.Engine, FixState.Clinic, new EngineToClinicCommand()); + TransitionDic.Add(FixState.Clinic, FixState.CoolingMachine, new ClinicToCoolingCommand()); } /// diff --git a/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs b/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs index ec2d3ecd9..4702ed542 100644 --- a/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs +++ b/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs @@ -71,4 +71,29 @@ namespace AibisDream.FixSystem _configName = arg; } } + + public struct ClinicToCoolingCommand : ITransitionCommand + { + private static readonly Vector3 CameraPos = new(6.61f, 0, -10); + private const float Duration = 2f; + + public IEnumerator Execute() + { + var coolingSystem = FixSystemCenter.SystemDic.Get(); + + // 移动相机 + yield return CameraKit.Instance.TransCameraAsync(CameraPos, Duration); + // 打开泵机 + yield return coolingSystem.OpenCoolingSystem(); + // 播放插线动画 + yield return coolingSystem.LinkTube(); + // 打开冷却液架 + yield return coolingSystem.OpenBottleUI(); + } + + public void SetArgs(string arg) + { + // 没有需要设置的参数 + } + } } \ No newline at end of file diff --git a/Assets/Scripts/Framework/OtherKit/CameraKit.cs b/Assets/Scripts/Framework/OtherKit/CameraKit.cs index f08a1fa8e..a9101c171 100644 --- a/Assets/Scripts/Framework/OtherKit/CameraKit.cs +++ b/Assets/Scripts/Framework/OtherKit/CameraKit.cs @@ -48,6 +48,12 @@ namespace AibisDream.Framework return _mainCamera.transform.DOMove(targetPos, duration); } + public IEnumerator TransCameraAsync(Vector3 targetPos, float duration) + { + var targetOrthographicSize = _mainCamera.orthographicSize; + yield return TransCameraAsync(targetPos, targetOrthographicSize, duration); + } + public IEnumerator TransCameraAsync(Vector3 targetPos, float targetOrthographicSize, float duration) { var sq = TransCamera(targetPos, targetOrthographicSize, duration); diff --git a/Assets/StreamingAssets/LevelData/GearSystem/new.json b/Assets/StreamingAssets/LevelData/GearSystem/new.json new file mode 100644 index 000000000..f7a8052dc --- /dev/null +++ b/Assets/StreamingAssets/LevelData/GearSystem/new.json @@ -0,0 +1 @@ +{"shaftLevelDataArray":[{"shaftName":"Empty Pluggable Shaft3","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.15,"shaftPos":{"x":-1.118,"y":-0.256,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Empty Pluggable Shaft2","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.15,"shaftPos":{"x":-1.087,"y":-0.693,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Empty Pluggable Shaft1","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.15,"shaftPos":{"x":-1.135,"y":0.182,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft9","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"shaftPos":{"x":-1.71000111,"y":-0.9590002,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮A"},{"shaftName":"Pluggable Shaft8","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.18,"shaftPos":{"x":-2.59800124,"y":-0.941000164,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft7","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.09,"shaftPos":{"x":-2.22800064,"y":-0.453000158,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft6","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"shaftPos":{"x":-1.855001,"y":-0.3910001,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft5","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.09,"shaftPos":{"x":-2.0,"y":-0.6250002,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮A"},{"shaftName":"Pluggable Shaft4","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.27,"shaftPos":{"x":-2.18600082,"y":-0.08200007,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮A"},{"shaftName":"Pluggable Shaft3","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"shaftPos":{"x":-1.97600079,"y":0.300000042,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft2","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.09,"shaftPos":{"x":-1.70600092,"y":0.307999939,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft1","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"shaftPos":{"x":-2.40600061,"y":0.295000046,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Driver Shaft","shaftType":0,"initialSpeed":1.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.09,"shaftPos":{"x":-2.188,"y":0.445000023,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Target Shaft","shaftType":1,"initialSpeed":0.0,"targetSpeed":0.3,"hasChildGear":true,"radius":0.27,"shaftPos":{"x":-2.1600008,"y":-0.9610002,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"}]} \ No newline at end of file diff --git a/Assets/StreamingAssets/LevelData/GearSystem/new.json.meta b/Assets/StreamingAssets/LevelData/GearSystem/new.json.meta new file mode 100644 index 000000000..bc3bdef63 --- /dev/null +++ b/Assets/StreamingAssets/LevelData/GearSystem/new.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 726877e95eebeea4db75ffd9d783b78e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/LevelData/GearSystem/temp.json b/Assets/StreamingAssets/LevelData/GearSystem/temp.json index acb32ed78..8c72a1a60 100644 --- a/Assets/StreamingAssets/LevelData/GearSystem/temp.json +++ b/Assets/StreamingAssets/LevelData/GearSystem/temp.json @@ -1 +1 @@ -{"shaftLevelDataArray":[{"shaftName":"Target","shaftType":1,"initialSpeed":0.0,"targetSpeed":0.3,"hasChildGear":true,"radius":1.0,"shaftPos":{"x":6.629,"y":0.684,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Driver","shaftType":0,"initialSpeed":1.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"shaftPos":{"x":4.64,"y":3.33,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮A"},{"shaftName":"Constant","shaftType":2,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"shaftPos":{"x":5.973,"y":2.457,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮B"},{"shaftName":"Pluggable","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"shaftPos":{"x":5.516,"y":3.867,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Empty","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.5,"shaftPos":{"x":6.56,"y":4.334,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"}]} \ No newline at end of file +{"shaftLevelDataArray":[{"shaftName":"Target Shaft","shaftType":0,"initialSpeed":0.0,"targetSpeed":0.3,"hasChildGear":true,"radius":0.27,"shaftPos":{"x":5.488,"y":0.118,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Driver Shaft","shaftType":0,"initialSpeed":1.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.09,"shaftPos":{"x":5.459,"y":1.488,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft1","shaftType":0,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"shaftPos":{"x":5.241,"y":1.338,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft2","shaftType":0,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.09,"shaftPos":{"x":5.941,"y":1.351,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft3","shaftType":0,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"shaftPos":{"x":5.671,"y":1.343,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft4","shaftType":0,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.27,"shaftPos":{"x":5.461,"y":0.961,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮A"},{"shaftName":"Pluggable Shaft5","shaftType":0,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.09,"shaftPos":{"x":5.653,"y":0.434,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮A"},{"shaftName":"Pluggable Shaft6","shaftType":0,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"shaftPos":{"x":5.803,"y":0.671,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft7","shaftType":0,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.09,"shaftPos":{"x":5.236,"y":0.678,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft8","shaftType":0,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.18,"shaftPos":{"x":5.054,"y":0.13,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Pluggable Shaft9","shaftType":0,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"shaftPos":{"x":5.917,"y":0.119,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮A"},{"shaftName":"Empty Pluggable Shaft1","shaftType":0,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.5,"shaftPos":{"x":4.4398,"y":4.1688,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Empty Pluggable Shaft2","shaftType":0,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.5,"shaftPos":{"x":6.10357,"y":4.1688,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"},{"shaftName":"Empty Pluggable Shaft3","shaftType":0,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.5,"shaftPos":{"x":7.76733971,"y":4.1688,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面/变速箱齿轮C"}]} \ No newline at end of file