From 0595ae61562e099b20eb601b49a945bcabad8c16 Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Wed, 25 Dec 2024 22:21:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E7=89=A9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Art/Background/主界面尝试尝试最新导出.psb | 4 +- .../主界面尝试尝试最新导出.psb.meta | 143 +++-- Assets/Resources/Characters/佩佩.psb | 3 + Assets/Resources/Characters/佩佩.psb.meta | 489 ++++++++++++++++ Assets/Resources/Characters/石头.psb | 3 + Assets/Resources/Characters/石头.psb.meta | 520 ++++++++++++++++++ .../Yarn/ShitouFunctional1/PlugOptions.yarn | 42 ++ .../ShitouFunctional1/ShitouFunctional1.yarn | 6 +- Assets/Scenes/ExpressFixScene.unity | 154 +++++- Assets/Scenes/Persistence.unity | 2 +- .../FixSystemNew/Clinic/CharacterViewer.cs | 177 ++++++ .../Clinic/CharacterViewer.cs.meta | 11 + .../FixSystemNew/Clinic/ClinicSystem.cs | 24 +- .../FixSystemNew/Clinic/ClinicYarnCommand.cs | 39 +- .../CoolingMachine/BottleShelf.cs | 13 +- .../FixSystemNew/CoolingMachine/BottleSlot.cs | 2 + .../CoolingMachine/CoolingBottle.cs | 11 +- .../CoolingMachine/CoolingSystem.cs | 38 +- .../CoolingMachine/CoolingSystemCommand.cs | 87 +++ .../CoolingSystemCommand.cs.meta | 3 + .../CoolingMachine/PumpController.cs | 25 +- .../CoolingMachine/TubeController.cs | 8 +- .../StateTransition/ClinicTransition.cs | 3 +- .../FixSystemNew/StateTransition/FixState.cs | 83 ++- .../Scripts/Framework/OtherKit/CameraKit.cs | 7 +- .../Scripts/Framework/OtherKit/MonoCenter.cs | 4 +- 26 files changed, 1714 insertions(+), 187 deletions(-) create mode 100644 Assets/Resources/Characters/佩佩.psb create mode 100644 Assets/Resources/Characters/佩佩.psb.meta create mode 100644 Assets/Resources/Characters/石头.psb create mode 100644 Assets/Resources/Characters/石头.psb.meta create mode 100644 Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs create mode 100644 Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs.meta create mode 100644 Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystemCommand.cs create mode 100644 Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystemCommand.cs.meta diff --git a/Assets/Resources/Art/Background/主界面尝试尝试最新导出.psb b/Assets/Resources/Art/Background/主界面尝试尝试最新导出.psb index 7c2f71e08..f0de4491d 100644 --- a/Assets/Resources/Art/Background/主界面尝试尝试最新导出.psb +++ b/Assets/Resources/Art/Background/主界面尝试尝试最新导出.psb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a5221fdc94ff689aaf87b6fb175e550af7b02301de3c2695ff43dad80bc9c08 -size 238722494 +oid sha256:d24c630ae489d347f272034213a935d5d388db46848076661d01acca9c01b69d +size 238124431 diff --git a/Assets/Resources/Art/Background/主界面尝试尝试最新导出.psb.meta b/Assets/Resources/Art/Background/主界面尝试尝试最新导出.psb.meta index 8af43e286..8812f2e49 100644 --- a/Assets/Resources/Art/Background/主界面尝试尝试最新导出.psb.meta +++ b/Assets/Resources/Art/Background/主界面尝试尝试最新导出.psb.meta @@ -143,8 +143,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 12573 - y: 2924 + x: 15573 + y: 3025 width: 689 height: 218 spriteID: 411373c8e1da70e4388083d8c9713c90 @@ -155,8 +155,29 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 12573, y: 2924} + uvTransform: {x: 15573, y: 3025} spritePosition: {x: 6695, y: 561} + - name: "\u684C\u9762\u6CF5\u673A\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: 13377 + y: 2629 + width: 602 + height: 637 + spriteID: ae4fb1e78a413fe4aa30181741fd6389 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 13377, y: 2629} + spritePosition: {x: 7583, y: 33} - name: "\u6CF5\u673A\u7EC4\u4EF6b" originalName: pivot: {x: 0.5, y: 0.5} @@ -164,7 +185,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 13959 + x: 14569 y: 2629 width: 593 height: 574 @@ -176,7 +197,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 13959, y: 2629} + uvTransform: {x: 14569, y: 2629} spritePosition: {x: 6746, y: 33} - name: "\u684C\u9762\u6CF5\u673A\u8FD0\u4F5C\u65F6\u4EAE\u706F" originalName: @@ -185,8 +206,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 9796 - y: 4183 + x: 15170 + y: 3025 width: 217 height: 106 spriteID: 8b886be0d4dc69e4bbb860267b345302 @@ -197,7 +218,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 9796, y: 4183} + uvTransform: {x: 15170, y: 3025} spritePosition: {x: 6148, y: 229} - name: "\u684C\u9762\u9ED1\u5C4F" originalName: @@ -206,8 +227,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 10021 - y: 4183 + x: 15170 + y: 3139 width: 217 height: 106 spriteID: 7897ed12f592c9047b0a804941a55c45 @@ -218,7 +239,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 10021, y: 4183} + uvTransform: {x: 15170, y: 3139} spritePosition: {x: 6148, y: 229} - name: "\u684C" originalName: @@ -269,7 +290,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 13377 + x: 13987 y: 2629 width: 574 height: 616 @@ -281,7 +302,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 13377, y: 2629} + uvTransform: {x: 13987, y: 2629} spritePosition: {x: 3652, y: 564} - name: "\u601D\u7D22\u8D70\u795E" originalName: @@ -290,8 +311,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 11767 - y: 2924 + x: 15170 + y: 2629 width: 395 height: 388 spriteID: 011849e1953f10947809d9c264777e81 @@ -302,7 +323,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 11767, y: 2924} + uvTransform: {x: 15170, y: 2629} spritePosition: {x: 2897, y: 2388} - name: "\u6B63\u5E38\u5FAE\u5FAE\u7B11" originalName: @@ -311,8 +332,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 12170 - y: 2924 + x: 15573 + y: 2629 width: 395 height: 388 spriteID: 7809c728ed9ff1a499326df1839c5a1f @@ -323,7 +344,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 12170, y: 2924} + uvTransform: {x: 15573, y: 2629} spritePosition: {x: 2897, y: 2388} - name: "\u524D\u53F3\u624B" originalName: @@ -1263,7 +1284,17 @@ ScriptedImporter: parentIndex: 64 spriteID: 411373c8e1da70e4388083d8c9713c90 layerID: 4306 - mosaicPosition: {x: 12573, y: 2924} + mosaicPosition: {x: 15573, y: 3025} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u684C\u9762\u6CF5\u673A\u906E\u7F69" + spriteName: "\u684C\u9762\u6CF5\u673A\u906E\u7F69" + isGroup: 0 + parentIndex: 64 + spriteID: ae4fb1e78a413fe4aa30181741fd6389 + layerID: 4936 + mosaicPosition: {x: 13377, y: 2629} flatten: 0 isImported: 1 isVisible: 1 @@ -1273,7 +1304,7 @@ ScriptedImporter: parentIndex: 64 spriteID: 71b6e75ad93ff924e83d4b54c883858d layerID: 4307 - mosaicPosition: {x: 13959, y: 2629} + mosaicPosition: {x: 14569, y: 2629} flatten: 0 isImported: 1 isVisible: 1 @@ -1283,7 +1314,7 @@ ScriptedImporter: parentIndex: 63 spriteID: 8b886be0d4dc69e4bbb860267b345302 layerID: 4621 - mosaicPosition: {x: 9796, y: 4183} + mosaicPosition: {x: 15170, y: 3025} flatten: 0 isImported: 1 isVisible: 1 @@ -1293,7 +1324,7 @@ ScriptedImporter: parentIndex: 63 spriteID: 7897ed12f592c9047b0a804941a55c45 layerID: 4877 - mosaicPosition: {x: 10021, y: 4183} + mosaicPosition: {x: 15170, y: 3139} flatten: 0 isImported: 1 isVisible: 1 @@ -1320,7 +1351,7 @@ ScriptedImporter: - name: "\u4F69\u4F69" spriteName: isGroup: 1 - parentIndex: 72 + parentIndex: 73 spriteID: 78da49119eb0e7f4faaebc113abceabd layerID: 3835 mosaicPosition: {x: 0, y: 0} @@ -1330,7 +1361,7 @@ ScriptedImporter: - name: "\u4F69\u4F69\u6362\u6DB2\u8BBE\u5907" spriteName: isGroup: 1 - parentIndex: 73 + parentIndex: 74 spriteID: aaf69b738a32dad4b8e2005c4dee6816 layerID: 4329 mosaicPosition: {x: 0, y: 0} @@ -1340,7 +1371,7 @@ ScriptedImporter: - name: "\u7BA1\u5B50" spriteName: isGroup: 0 - parentIndex: 74 + parentIndex: 75 spriteID: 0041f8a0469ce7044b8247f100e56c74 layerID: 4332 mosaicPosition: {x: 0, y: 0} @@ -1350,7 +1381,7 @@ ScriptedImporter: - name: "\u6362\u6DB2\u8BBE\u5907" spriteName: isGroup: 0 - parentIndex: 74 + parentIndex: 75 spriteID: 2644bcfff31ffa241a91425aace0cfbc layerID: 4325 mosaicPosition: {x: 0, y: 0} @@ -1360,7 +1391,7 @@ ScriptedImporter: - name: "\u4F69\u4F69\u8868\u60C5" spriteName: isGroup: 1 - parentIndex: 73 + parentIndex: 74 spriteID: e4314ef6a95a56d4cbe413de73d82058 layerID: 4429 mosaicPosition: {x: 0, y: 0} @@ -1370,7 +1401,7 @@ ScriptedImporter: - name: "\u95ED\u773C" spriteName: isGroup: 0 - parentIndex: 77 + parentIndex: 78 spriteID: 66b5c73cd17a6a44ab12b917cbe366ab layerID: 4884 mosaicPosition: {x: 0, y: 0} @@ -1380,7 +1411,7 @@ ScriptedImporter: - name: "\u5FAE\u7B11" spriteName: isGroup: 0 - parentIndex: 77 + parentIndex: 78 spriteID: 33175c17463e2214c86876a5d2947c75 layerID: 4437 mosaicPosition: {x: 0, y: 0} @@ -1390,7 +1421,7 @@ ScriptedImporter: - name: "\u5634\u5DF4\u7B11" spriteName: isGroup: 0 - parentIndex: 77 + parentIndex: 78 spriteID: 0f454dffacfe1ec438d61ea8ba8492e7 layerID: 4456 mosaicPosition: {x: 0, y: 0} @@ -1400,7 +1431,7 @@ ScriptedImporter: - name: "\u4F69\u4F69\u52A8\u4F5C" spriteName: isGroup: 1 - parentIndex: 73 + parentIndex: 74 spriteID: 169d8c1a37bc7da4f854ae77f3d9ff90 layerID: 4750 mosaicPosition: {x: 0, y: 0} @@ -1410,7 +1441,7 @@ ScriptedImporter: - name: "\u753B\u753B\u52A8\u4F5C" spriteName: isGroup: 0 - parentIndex: 81 + parentIndex: 82 spriteID: 961cdc2500e8da84e94d473d9b5f71d5 layerID: 3082 mosaicPosition: {x: 0, y: 0} @@ -1420,7 +1451,7 @@ ScriptedImporter: - name: "\u5782\u624B" spriteName: isGroup: 0 - parentIndex: 73 + parentIndex: 74 spriteID: 16bf6c56291ffe24badbdbcb865c042b layerID: 4423 mosaicPosition: {x: 0, y: 0} @@ -1430,7 +1461,7 @@ ScriptedImporter: - name: "\u77F3\u5934" spriteName: isGroup: 1 - parentIndex: 72 + parentIndex: 73 spriteID: 62dd90536e9f8834cbd4fc5517fd3df9 layerID: 3129 mosaicPosition: {x: 0, y: 0} @@ -1440,7 +1471,7 @@ ScriptedImporter: - name: "\u77F3\u5934\u6362\u6DB2\u8BBE\u5907" spriteName: isGroup: 1 - parentIndex: 84 + parentIndex: 85 spriteID: d9cfcfafb49c5a64c9dced846d71ab1d layerID: 4551 mosaicPosition: {x: 0, y: 0} @@ -1450,7 +1481,7 @@ ScriptedImporter: - name: "\u7BA1\u5B50" spriteName: "\u7BA1\u5B50" isGroup: 0 - parentIndex: 85 + parentIndex: 86 spriteID: 849d9124528056c47955f41ba7a01605 layerID: 4550 mosaicPosition: {x: 10542, y: 3347} @@ -1460,17 +1491,17 @@ ScriptedImporter: - name: "\u6362\u6DB2\u8BBE\u5907" spriteName: "\u6362\u6DB2\u8BBE\u5907" isGroup: 0 - parentIndex: 85 + parentIndex: 86 spriteID: 70ad330e45088ab4aac40a7752b3dc7e layerID: 4549 - mosaicPosition: {x: 13377, y: 2629} + mosaicPosition: {x: 13987, y: 2629} flatten: 0 isImported: 1 isVisible: 1 - name: "\u77F3\u5934\u8868\u60C5" spriteName: isGroup: 1 - parentIndex: 84 + parentIndex: 85 spriteID: 0848d32c346258c46b77e8d5673e7325 layerID: 4465 mosaicPosition: {x: 0, y: 0} @@ -1480,27 +1511,27 @@ ScriptedImporter: - name: "\u601D\u7D22\u8D70\u795E" spriteName: "\u601D\u7D22\u8D70\u795E" isGroup: 0 - parentIndex: 88 + parentIndex: 89 spriteID: 011849e1953f10947809d9c264777e81 layerID: 4472 - mosaicPosition: {x: 11767, y: 2924} + mosaicPosition: {x: 15170, y: 2629} flatten: 0 isImported: 1 isVisible: 1 - name: "\u6B63\u5E38\u5FAE\u5FAE\u7B11" spriteName: "\u6B63\u5E38\u5FAE\u5FAE\u7B11" isGroup: 0 - parentIndex: 88 + parentIndex: 89 spriteID: 7809c728ed9ff1a499326df1839c5a1f layerID: 4467 - mosaicPosition: {x: 12170, y: 2924} + mosaicPosition: {x: 15573, y: 2629} flatten: 0 isImported: 1 isVisible: 1 - name: "\u77F3\u5934\u52A8\u4F5C" spriteName: isGroup: 1 - parentIndex: 84 + parentIndex: 85 spriteID: 2052561990c216844817e3cdef1e2df6 layerID: 4752 mosaicPosition: {x: 0, y: 0} @@ -1510,7 +1541,7 @@ ScriptedImporter: - name: "\u6478\u5934" spriteName: isGroup: 0 - parentIndex: 91 + parentIndex: 92 spriteID: b974b37d1e7877244875a232e9c6b37b layerID: 3966 mosaicPosition: {x: 0, y: 0} @@ -1520,7 +1551,7 @@ ScriptedImporter: - name: "\u77F3\u5934" spriteName: isGroup: 1 - parentIndex: 84 + parentIndex: 85 spriteID: 0585e5756b0ec354f8f04218171eb215 layerID: 3185 mosaicPosition: {x: 0, y: 0} @@ -1530,7 +1561,7 @@ ScriptedImporter: - name: "\u524D\u53F3\u624B" spriteName: "\u524D\u53F3\u624B" isGroup: 0 - parentIndex: 93 + parentIndex: 94 spriteID: af7a6904172df1d4caccd3d00d088605 layerID: 4260 mosaicPosition: {x: 4, y: 5505} @@ -1540,7 +1571,7 @@ ScriptedImporter: - name: "\u77F3\u5934" spriteName: "\u77F3\u5934" isGroup: 0 - parentIndex: 93 + parentIndex: 94 spriteID: 7e500db015e68d542b883749ec674aa9 layerID: 4261 mosaicPosition: {x: 11767, y: 4} @@ -1560,7 +1591,7 @@ ScriptedImporter: - name: "\u5E18\u5B50" spriteName: "\u5E18\u5B50" isGroup: 0 - parentIndex: 96 + parentIndex: 97 spriteID: 30ecba081eac70440bfac7a7959ef31e layerID: 4867 mosaicPosition: {x: 9032, y: 4} @@ -1570,7 +1601,7 @@ ScriptedImporter: - name: "\u623F\u95F4\u5185" spriteName: "\u623F\u95F4\u5185" isGroup: 0 - parentIndex: 96 + parentIndex: 97 spriteID: ce0820a62e9a1e8499ebcccec53b565f layerID: 3813 mosaicPosition: {x: 4, y: 4} @@ -1590,7 +1621,7 @@ ScriptedImporter: - name: "\u7A97\u6846" spriteName: "\u7A97\u6846" isGroup: 0 - parentIndex: 99 + parentIndex: 100 spriteID: df8833565709d2043ab02243abb14b3a layerID: 3970 mosaicPosition: {x: 13377, y: 1416} @@ -1600,7 +1631,7 @@ ScriptedImporter: - name: "\u51B0\u971C" spriteName: "\u51B0\u971C" isGroup: 0 - parentIndex: 99 + parentIndex: 100 spriteID: fd6e3bf8757d8784c961b67ac3f55a9a layerID: 2394 mosaicPosition: {x: 4, y: 4408} @@ -1610,7 +1641,7 @@ ScriptedImporter: - name: "\u5915\u9633" spriteName: isGroup: 0 - parentIndex: 99 + parentIndex: 100 spriteID: 8561221dcea436b4d8cc0439d0c8ac58 layerID: 3962 mosaicPosition: {x: 0, y: 0} @@ -1620,7 +1651,7 @@ ScriptedImporter: - name: "\u96EA" spriteName: "\u96EA" isGroup: 0 - parentIndex: 99 + parentIndex: 100 spriteID: d36bb45080605af44ad1d30a1ae5b069 layerID: 2449 mosaicPosition: {x: 13377, y: 4} @@ -1630,7 +1661,7 @@ ScriptedImporter: - name: "\u591C\u665A" spriteName: "\u591C\u665A" isGroup: 0 - parentIndex: 99 + parentIndex: 100 spriteID: 413093f8377e48042825bd7ee5b637dd layerID: 2822 mosaicPosition: {x: 2668, y: 4408} diff --git a/Assets/Resources/Characters/佩佩.psb b/Assets/Resources/Characters/佩佩.psb new file mode 100644 index 000000000..b43e9ae4c --- /dev/null +++ b/Assets/Resources/Characters/佩佩.psb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4a44d72815ac121628605b9860b8638cec080324d64ce5e3203a1126eca8ef9 +size 5299624 diff --git a/Assets/Resources/Characters/佩佩.psb.meta b/Assets/Resources/Characters/佩佩.psb.meta new file mode 100644 index 000000000..91b974505 --- /dev/null +++ b/Assets/Resources/Characters/佩佩.psb.meta @@ -0,0 +1,489 @@ +fileFormatVersion: 2 +guid: 7d6a918e16020614cb2713d3035203d9 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: b2a9591990af98743ba3ff7cf1000886, type: 3} + textureImporterSettings: + alphaSource: 1 + mipMapMode: 0 + enableMipMap: 1 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + convertToNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + swizzle: 50462976 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + nPOTScale: 1 + sRGBTexture: 1 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 200 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 0 + flipbookColumns: 0 + ignorePngGamma: 0 + cookieMode: 0 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + normalMap: 0 + textureFormat: 0 + maxTextureSize: 0 + lightmap: 0 + compressionQuality: 0 + linearTexture: 0 + grayScaleToAlpha: 0 + rGBM: 0 + cubemapConvolutionSteps: 0 + cubemapConvolutionExponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + spriteImportData: + - name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} + mosaicSpriteImportData: [] + rigSpriteImportData: + - name: "\u7BA1\u5B50" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 712 + y: 837 + width: 301 + height: 478 + spriteID: 5ff657918905b3347982bd265943934b + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 712, y: 837} + spritePosition: {x: 2266, y: 0} + - name: "\u6362\u6DB2\u8BBE\u5907" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 712 + y: 429 + width: 361 + height: 400 + spriteID: df7ea6ea89764e44e920ea7c23c2cf31 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 712, y: 429} + spritePosition: {x: 2044, y: 290} + - name: "\u95ED\u773C" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 712 + y: 1911 + width: 292 + height: 132 + spriteID: f8503d351278f0b4eadabf8b6de21455 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 712, y: 1911} + spritePosition: {x: 1921, y: 1361} + - name: "\u5FAE\u7B11" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 712 + y: 1624 + width: 330 + height: 279 + spriteID: 43444ae3d88d12c479d0b1f066ed541f + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 712, y: 1624} + spritePosition: {x: 1921, y: 1230} + - name: "\u5634\u5DF4\u7B11" + 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: 1869 + width: 75 + height: 49 + spriteID: 37a81dd7f7793334a8c148665d98d94c + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 1869} + spritePosition: {x: 2033, y: 1267} + - name: "\u4E0D\u5F00\u5FC3" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 712 + y: 1323 + width: 347 + height: 293 + spriteID: 4ab86294501fd534d82ffabcc7d05bac + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 712, y: 1323} + spritePosition: {x: 1907, y: 1220} + - name: "\u753B\u753B\u52A8\u4F5C" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 712 + y: 4 + width: 963 + height: 417 + spriteID: 2c3a65da5119f394794439c03b844707 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 712, y: 4} + spritePosition: {x: 1435, y: 528} + - name: "\u5782\u624B" + 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: 700 + height: 1857 + spriteID: 7c8739ae35022bb4695845fa81c4beb3 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 4} + spritePosition: {x: 1745, y: 0} + characterData: + bones: [] + parts: [] + dimension: {x: 0, y: 0} + characterGroups: [] + pivot: {x: 0, y: 0} + boneReadOnly: 0 + sharedRigSpriteImportData: [] + sharedRigCharacterData: + bones: [] + parts: [] + dimension: {x: 0, y: 0} + characterGroups: [] + pivot: {x: 0, y: 0} + boneReadOnly: 0 + platformSettings: + - name: DefaultTexturePlatform + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Standalone + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Server + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Android + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: WebGL + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + mosaicLayers: 1 + characterMode: 1 + documentPivot: {x: 0, y: 0} + documentAlignment: 0 + importHiddenLayers: 0 + layerMappingOption: 2 + generatePhysicsShape: 0 + paperDollMode: 0 + keepDupilcateSpriteName: 1 + skeletonAssetReferenceID: + padding: 4 + spriteSizeExpand: 0 + spriteCategoryList: + categories: [] + spritePackingTag: + resliceFromLayer: 0 + mosaicPSDLayers: [] + rigPSDLayers: + - name: "\u4F69\u4F69" + spriteName: + isGroup: 1 + parentIndex: -1 + spriteID: 8862426db09b46c44a4b59fe089e43ce + layerID: 3835 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u4F69\u4F69\u6362\u6DB2\u8BBE\u5907" + spriteName: + isGroup: 1 + parentIndex: 0 + spriteID: 0ba35533c078ba24ba16ec97743b5836 + layerID: 4329 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u7BA1\u5B50" + spriteName: "\u7BA1\u5B50" + isGroup: 0 + parentIndex: 1 + spriteID: 5ff657918905b3347982bd265943934b + layerID: 4332 + mosaicPosition: {x: 712, y: 837} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6362\u6DB2\u8BBE\u5907" + spriteName: "\u6362\u6DB2\u8BBE\u5907" + isGroup: 0 + parentIndex: 1 + spriteID: df7ea6ea89764e44e920ea7c23c2cf31 + layerID: 4325 + mosaicPosition: {x: 712, y: 429} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u4F69\u4F69\u8868\u60C5" + spriteName: + isGroup: 1 + parentIndex: 0 + spriteID: c1741b854d7128d479375fad4d2f3676 + layerID: 4429 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u95ED\u773C" + spriteName: "\u95ED\u773C" + isGroup: 0 + parentIndex: 4 + spriteID: f8503d351278f0b4eadabf8b6de21455 + layerID: 4884 + mosaicPosition: {x: 712, y: 1911} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u5FAE\u7B11" + spriteName: "\u5FAE\u7B11" + isGroup: 0 + parentIndex: 4 + spriteID: 43444ae3d88d12c479d0b1f066ed541f + layerID: 4437 + mosaicPosition: {x: 712, y: 1624} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u5634\u5DF4\u7B11" + spriteName: "\u5634\u5DF4\u7B11" + isGroup: 0 + parentIndex: 4 + spriteID: 37a81dd7f7793334a8c148665d98d94c + layerID: 4456 + mosaicPosition: {x: 4, y: 1869} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u4E0D\u5F00\u5FC3" + spriteName: "\u4E0D\u5F00\u5FC3" + isGroup: 0 + parentIndex: 4 + spriteID: 4ab86294501fd534d82ffabcc7d05bac + layerID: 5010 + mosaicPosition: {x: 712, y: 1323} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u4F69\u4F69\u52A8\u4F5C" + spriteName: + isGroup: 1 + parentIndex: 0 + spriteID: 41b415c24753e704182b5d7114fdf6a8 + layerID: 4750 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u753B\u753B\u52A8\u4F5C" + spriteName: "\u753B\u753B\u52A8\u4F5C" + isGroup: 0 + parentIndex: 9 + spriteID: 2c3a65da5119f394794439c03b844707 + layerID: 3082 + mosaicPosition: {x: 712, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u5782\u624B" + spriteName: "\u5782\u624B" + isGroup: 0 + parentIndex: 0 + spriteID: 7c8739ae35022bb4695845fa81c4beb3 + layerID: 4423 + mosaicPosition: {x: 4, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + sharedRigPSDLayers: [] + pSDLayerImportSetting: [] + importFileNodeState: 1 + platformSettingsDirtyTick: 0 + spriteSizeExpandChanged: 0 + generateGOHierarchy: 0 + textureAssetName: + prefabAssetName: + spriteLibAssetName: + skeletonAssetName: + secondarySpriteTextures: [] diff --git a/Assets/Resources/Characters/石头.psb b/Assets/Resources/Characters/石头.psb new file mode 100644 index 000000000..596b17144 --- /dev/null +++ b/Assets/Resources/Characters/石头.psb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e2ce7d4548bb96f770eb74bf2f41f34c37f96dab2e63074a5b51cd600e788a4 +size 6432299 diff --git a/Assets/Resources/Characters/石头.psb.meta b/Assets/Resources/Characters/石头.psb.meta new file mode 100644 index 000000000..657bfedb9 --- /dev/null +++ b/Assets/Resources/Characters/石头.psb.meta @@ -0,0 +1,520 @@ +fileFormatVersion: 2 +guid: 6fdcdcbb0ac7428489630aab7f76a33b +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: b2a9591990af98743ba3ff7cf1000886, type: 3} + textureImporterSettings: + alphaSource: 1 + mipMapMode: 0 + enableMipMap: 1 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + convertToNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + swizzle: 50462976 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + nPOTScale: 1 + sRGBTexture: 1 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 200 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 0 + flipbookColumns: 0 + ignorePngGamma: 0 + cookieMode: 0 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + normalMap: 0 + textureFormat: 0 + maxTextureSize: 0 + lightmap: 0 + compressionQuality: 0 + linearTexture: 0 + grayScaleToAlpha: 0 + rGBM: 0 + cubemapConvolutionSteps: 0 + cubemapConvolutionExponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + spriteImportData: + - name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 0, y: 0} + spritePosition: {x: 0, y: 0} + mosaicSpriteImportData: [] + rigSpriteImportData: + - name: "\u7BA1\u5B50" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 715 + y: 2799 + width: 286 + height: 490 + spriteID: 0c53e782b3912634b9535f72b3d4d697 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 715, y: 2799} + spritePosition: {x: 2588, y: 60} + - name: "\u6362\u6DB2\u8BBE\u5907" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 346 + y: 3308 + width: 373 + height: 398 + spriteID: f45023624212c234ea8d9de1285b2634 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 346, y: 3308} + spritePosition: {x: 2365, y: 366} + - name: "\u77F3\u5934\u95ED\u773C" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 346 + y: 3714 + width: 361 + height: 302 + spriteID: 836f3d4d7ac750d4f9fd08cc3d6c3e84 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 346, y: 3714} + spritePosition: {x: 1852, y: 1688} + - name: "\u6B63\u5E38\u5FAE\u5FAE\u7B11" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 715 + y: 3714 + width: 257 + height: 252 + spriteID: 5a3ec02baaa77a54bbfdc12783488238 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 715, y: 3714} + spritePosition: {x: 1876, y: 1546} + - name: "\u601D\u7D22\u8D70\u795E" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 727 + y: 3308 + width: 257 + height: 252 + spriteID: a8d6b0e19be59a74a99d6a64801ab91d + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 727, y: 3308} + spritePosition: {x: 1876, y: 1546} + - name: "\u5927\u7B11" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 346 + y: 2799 + width: 361 + height: 501 + spriteID: a0d5b1a1615688c4f92b4cc44db8e9ab + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 346, y: 2799} + spritePosition: {x: 1852, y: 1489} + - name: "\u6478\u5934" + 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: 1899 + width: 703 + height: 892 + spriteID: 40941f331ae96ec4598adf25fc111a05 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 1899} + spritePosition: {x: 1270, y: 1110} + - name: "\u524D\u53F3\u624B" + 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: 2799 + width: 334 + height: 1237 + spriteID: 7844b22869d43f142bc5569e275ecffb + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 2799} + spritePosition: {x: 1465, y: 167} + - name: "\u77F3\u5934" + 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: 1039 + height: 1887 + spriteID: 6a92284c8c7dca147a206973206deb58 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 4} + spritePosition: {x: 1721, y: 108} + characterData: + bones: [] + parts: [] + dimension: {x: 0, y: 0} + characterGroups: [] + pivot: {x: 0, y: 0} + boneReadOnly: 0 + sharedRigSpriteImportData: [] + sharedRigCharacterData: + bones: [] + parts: [] + dimension: {x: 0, y: 0} + characterGroups: [] + pivot: {x: 0, y: 0} + boneReadOnly: 0 + platformSettings: + - name: DefaultTexturePlatform + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Standalone + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Server + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: Android + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + - name: WebGL + overridden: 0 + ignorePlatformSupport: 0 + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + forceMaximumCompressionQuality_BC6H_BC7: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + androidETC2FallbackOverride: 0 + mosaicLayers: 1 + characterMode: 1 + documentPivot: {x: 0, y: 0} + documentAlignment: 0 + importHiddenLayers: 0 + layerMappingOption: 2 + generatePhysicsShape: 0 + paperDollMode: 0 + keepDupilcateSpriteName: 1 + skeletonAssetReferenceID: + padding: 4 + spriteSizeExpand: 0 + spriteCategoryList: + categories: [] + spritePackingTag: + resliceFromLayer: 0 + mosaicPSDLayers: [] + rigPSDLayers: + - name: "\u77F3\u5934" + spriteName: + isGroup: 1 + parentIndex: -1 + spriteID: 1ac93b4650a6acf448cee27dbb68b736 + layerID: 3129 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u77F3\u5934\u6362\u6DB2\u8BBE\u5907" + spriteName: + isGroup: 1 + parentIndex: 0 + spriteID: f16127b32f1b5de47b250d8086e64325 + layerID: 4551 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u7BA1\u5B50" + spriteName: "\u7BA1\u5B50" + isGroup: 0 + parentIndex: 1 + spriteID: 0c53e782b3912634b9535f72b3d4d697 + layerID: 4550 + mosaicPosition: {x: 715, y: 2799} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6362\u6DB2\u8BBE\u5907" + spriteName: "\u6362\u6DB2\u8BBE\u5907" + isGroup: 0 + parentIndex: 1 + spriteID: f45023624212c234ea8d9de1285b2634 + layerID: 4549 + mosaicPosition: {x: 346, y: 3308} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u77F3\u5934\u8868\u60C5" + spriteName: + isGroup: 1 + parentIndex: 0 + spriteID: dfe5690bbeef4b54ea7f1d398e668fc5 + layerID: 4465 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u77F3\u5934\u95ED\u773C" + spriteName: "\u77F3\u5934\u95ED\u773C" + isGroup: 0 + parentIndex: 4 + spriteID: 836f3d4d7ac750d4f9fd08cc3d6c3e84 + layerID: 5009 + mosaicPosition: {x: 346, y: 3714} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6B63\u5E38\u5FAE\u5FAE\u7B11" + spriteName: "\u6B63\u5E38\u5FAE\u5FAE\u7B11" + isGroup: 0 + parentIndex: 4 + spriteID: 5a3ec02baaa77a54bbfdc12783488238 + layerID: 4467 + mosaicPosition: {x: 715, y: 3714} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u601D\u7D22\u8D70\u795E" + spriteName: "\u601D\u7D22\u8D70\u795E" + isGroup: 0 + parentIndex: 4 + spriteID: a8d6b0e19be59a74a99d6a64801ab91d + layerID: 4472 + mosaicPosition: {x: 727, y: 3308} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u5927\u7B11" + spriteName: "\u5927\u7B11" + isGroup: 0 + parentIndex: 4 + spriteID: a0d5b1a1615688c4f92b4cc44db8e9ab + layerID: 4995 + mosaicPosition: {x: 346, y: 2799} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u77F3\u5934\u52A8\u4F5C" + spriteName: + isGroup: 1 + parentIndex: 0 + spriteID: d6767e8474622a34886829938eb66dcf + layerID: 4752 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u6478\u5934" + spriteName: "\u6478\u5934" + isGroup: 0 + parentIndex: 9 + spriteID: 40941f331ae96ec4598adf25fc111a05 + layerID: 3966 + mosaicPosition: {x: 4, y: 1899} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u524D\u53F3\u624B" + spriteName: "\u524D\u53F3\u624B" + isGroup: 0 + parentIndex: 9 + spriteID: 7844b22869d43f142bc5569e275ecffb + layerID: 4260 + mosaicPosition: {x: 4, y: 2799} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u77F3\u5934" + spriteName: "\u77F3\u5934" + isGroup: 0 + parentIndex: 0 + spriteID: 6a92284c8c7dca147a206973206deb58 + layerID: 4261 + mosaicPosition: {x: 4, y: 4} + flatten: 0 + isImported: 1 + isVisible: 1 + sharedRigPSDLayers: [] + pSDLayerImportSetting: [] + importFileNodeState: 1 + platformSettingsDirtyTick: 0 + spriteSizeExpandChanged: 0 + generateGOHierarchy: 0 + textureAssetName: + prefabAssetName: + spriteLibAssetName: + skeletonAssetName: + secondarySpriteTextures: [] diff --git a/Assets/Resources/Yarn/ShitouFunctional1/PlugOptions.yarn b/Assets/Resources/Yarn/ShitouFunctional1/PlugOptions.yarn index 89c8d22f4..609efc7b2 100644 --- a/Assets/Resources/Yarn/ShitouFunctional1/PlugOptions.yarn +++ b/Assets/Resources/Yarn/ShitouFunctional1/PlugOptions.yarn @@ -39,3 +39,45 @@ position: -367,189 <> === +title: 插入冷却液 +--- +<> +喜达诺，澄清型透析剂。降低模块运转造成的反应，减轻患者痛苦。 +<> +可善，澄清型透析剂。降低循环系统压力，延长冷却液寿命。 +<> +强克，澄清型透析剂。降低动力系统压力，略微提高整体动力。 +<> +息利康，澄清型透析剂。降低气体系统压力，减轻滤板积碳。 +<> +曲妥珠，澄清型透析剂。降低消化系统压力，降低摄入物造成的毒性。 +<> +曲马多，强冷型透析剂。降低机体全局温度。 +<> +=== + +title: 开启泵机 +--- + +<> +希望这能让他好受一些。 +<> +希望这些冷却液能撑得更久一些。 +<> +好吧…如果他真的需要跑得再快一些。 +<> +希望能让他的滤板多坚持一会。 +<> +希望这会有用。 +<> +【占位】降一下滴速，不然他会不舒服的。 +<> + +<> + +<> +<> +<> +<> +<> +=== diff --git a/Assets/Resources/Yarn/ShitouFunctional1/ShitouFunctional1.yarn b/Assets/Resources/Yarn/ShitouFunctional1/ShitouFunctional1.yarn index a85d69dc7..a98d67a26 100644 --- a/Assets/Resources/Yarn/ShitouFunctional1/ShitouFunctional1.yarn +++ b/Assets/Resources/Yarn/ShitouFunctional1/ShitouFunctional1.yarn @@ -531,13 +531,12 @@ title: 冷却液初始化 tags: position: 208,775 --- -【【医生给石头挂上冷却液泵】】 +<> shitou: 呼，好凉！医生，麻烦调慢点！ me: 还没开始呢。 me: （我需要找一瓶透析剂装上……任何一种澄清型的都行。） <> <> -<> === @@ -546,6 +545,7 @@ title: 透析剂选择 tags: position: 208,775 --- +<> 医生拉出冷却液架，上面摆满了各种颜色的冷却液罐 ->喜达诺透析剂 澄清型透析剂。降低模块运转造成的反应，减轻患者痛苦。 @@ -834,7 +834,7 @@ me: 你要明天回来复查。 shitou: 好，好……医生，真是太感谢你啦！ -<> +<> me: 不客气…再见。 diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity index 8a597b0fb..21c8cb813 100644 --- a/Assets/Scenes/ExpressFixScene.unity +++ b/Assets/Scenes/ExpressFixScene.unity @@ -2769,6 +2769,89 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1.0037398, y: 0.34917247} m_EdgeRadius: 0 +--- !u!1 &750333137 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 750333138} + - component: {fileID: 750333139} + 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 &750333138 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 750333137} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 7.61, y: -5.686, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3512200925740993632} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!331 &750333139 +SpriteMask: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 750333137} + 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: 4745624560961009798, guid: cc12c4f35170969408e0dc663ac136b5, type: 3} + m_MaskAlphaCutoff: 0.2 + m_FrontSortingLayerID: 941243827 + m_BackSortingLayerID: 941243827 + m_FrontSortingLayer: 13 + m_BackSortingLayer: 13 + m_FrontSortingOrder: 44 + m_BackSortingOrder: 42 + m_IsCustomRangeActive: 1 + m_SpriteSortPoint: 0 --- !u!1 &796145091 GameObject: m_ObjectHideFlags: 0 @@ -3679,6 +3762,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: character: {fileID: 0} + pumpUpPos: {x: 0, y: 0, z: 0} + pumpDownPos: {x: 0, y: 0, z: 0} + pumpDuration: 0 --- !u!1 &1040656336 GameObject: m_ObjectHideFlags: 0 @@ -4462,7 +4548,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1223292340 Transform: m_ObjectHideFlags: 0 @@ -6052,7 +6138,7 @@ Transform: m_GameObject: {fileID: 1776039589} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.82, y: -2.36, z: 0} + m_LocalPosition: {x: -3.78, y: -2.17, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -6608,6 +6694,39 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2057350028 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2057350029} + m_Layer: 0 + m_Name: "\u684C\u4E0A\u6CF5\u5934" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2057350029 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057350028} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 7.6, y: -4.1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4055730028068989532} + - {fileID: 4723618132295095337} + m_Father: {fileID: 5449320178873640439} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2061960536 GameObject: m_ObjectHideFlags: 0 @@ -8498,7 +8617,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &2742888092830762139 Transform: m_ObjectHideFlags: 0 @@ -8861,8 +8980,7 @@ Transform: m_Children: - {fileID: 1537135417389927140} - {fileID: 1347003206199920069} - - {fileID: 4055730028068989532} - - {fileID: 4723618132295095337} + - {fileID: 750333138} m_Father: {fileID: 5449320178873640439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3632475463347199027 @@ -9003,11 +9121,11 @@ Transform: m_GameObject: {fileID: 4112260238635059984} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 7.596097, y: -2.9954953, z: 0} + m_LocalPosition: {x: -0.011, y: 1.081, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3512200925740993632} + m_Father: {fileID: 2057350029} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4062159919652516018 GameObject: @@ -9203,11 +9321,11 @@ Transform: m_GameObject: {fileID: 8896627361608028971} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 7.6051054, y: -4.0465465, z: 0} + m_LocalPosition: {x: -0.0019917488, y: 0.029948711, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3512200925740993632} + m_Father: {fileID: 2057350029} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &4743841279531421233 SpriteRenderer: @@ -9813,6 +9931,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2057350029} - {fileID: 3512200925740993632} - {fileID: 7660918536041312851} - {fileID: 2742888092830762139} @@ -9901,7 +10020,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &6490201648993155036 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9915,6 +10034,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: character: {fileID: 0} + pumpUpPos: {x: 7.6, y: -4.1, z: 0} + pumpDownPos: {x: 7.6, y: -5.2, z: 0} + pumpDuration: 2 --- !u!1 &6555330201112027695 GameObject: m_ObjectHideFlags: 0 @@ -10605,7 +10727,7 @@ MonoBehaviour: m_GameObject: {fileID: 5284943801058875444} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d109d83a617c845469dcde9ac20246be, type: 3} + m_Script: {fileID: 11500000, guid: 26c6d766a411186449e3e0fd4c9f1ca5, type: 3} m_Name: m_EditorClassIdentifier: --- !u!4 &7660918536041312851 @@ -10673,7 +10795,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &8043825578382505353 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10787,7 +10909,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 + m_MaskInteraction: 2 m_SpriteSortPoint: 0 --- !u!212 &8239509622042514909 SpriteRenderer: @@ -11204,7 +11326,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7037918505330246345, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: orthographic size - value: 1.5 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: m_LocalPosition.x @@ -11252,11 +11374,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8556345213791081418, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: m_LocalPosition.x - value: -1.43 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8556345213791081418, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: m_LocalPosition.y - value: -0.3 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 79935a0c2..df161820a 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -34428,7 +34428,7 @@ MonoBehaviour: iconOnDrag: {fileID: 8895775685280376203, guid: eb11ac9a06fb4792b393db9b83ab43b4, type: 3} exclusiveOnDragCanvas: {fileID: 0} useLegacyDragMethod: 0 - position: {x: 3386.25, y: 735.5, z: 0} + position: {x: 0, y: 0, z: 0} dragSelection: customRenderer: {fileID: 0} line: diff --git a/Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs b/Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs new file mode 100644 index 000000000..aaf4ee92e --- /dev/null +++ b/Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs @@ -0,0 +1,177 @@ +using System.Collections; +using AibisDream.Utility; +using DG.Tweening; +using UnityEngine; + +namespace AibisDream.FixSystem +{ + public class CharacterViewer : MonoBehaviour + { + private string _curCharacterName; + private GameObject _curCharacter; + private float _characterAlpha; + private Coroutine _autoBlinkCoroutine; + + private Transform FaceGroup => _curCharacter.transform.Find("表情"); + private Transform PoseGroup => _curCharacter.transform.Find("动作"); + private Transform LinkDevice => _curCharacter.transform.Find("换液设备"); + private SpriteRenderer _blinkLayer; + + public IEnumerator CharacterInit(string characterName) + { + // 异步加载角色预制体（psb） + ResourceRequest request = Resources.LoadAsync($"Characters/{characterName}"); + yield return request; +#if DEBUG + if (request.asset == null) + { + Debug.Log($"{characterName}没有找到"); + yield break; + } +#endif + // 先卸载旧的 + if (_curCharacter != null) + { + Destroy(_curCharacter); + _curCharacter = null; + } + + // 加载新的 + GameObject characterPrefab = request.asset as GameObject; + _curCharacter = Instantiate(characterPrefab, transform); + + // 初始化处理 + _curCharacter.SetActive(false); + _blinkLayer = transform.Find("眨眼").GetComponent(); + _blinkLayer.enabled = false; + // 表情和动作只留一种 + ActiveLayer(FaceGroup); + ActiveLayer(PoseGroup); + // 换液设备先隐藏 + RemoveLinkDevice(); + + // 初始化角色透明度 + SetCharacterAlpha(0); + + // 等待一帧，确保初始化完成 + yield return new WaitForSeconds(1); + // 激活角色 + _curCharacter.SetActive(true); + } + + private static void ActiveLayer(Transform root, string layerName = null) + { + var childLayers = root.GetComponentsInChildren(); + if (childLayers.Length == 0) return; + + foreach (var layer in childLayers) + { + layer.enabled = layer.gameObject.name == layerName; + } + + // 如果输入为空，就默认激活一层 + if (layerName == null) + { + childLayers[0].enabled = true; + } + } + + private void SetCharacterAlpha(float alpha) + { + SpriteRenderer[] renderers = _curCharacter.GetComponentsInChildren(); + foreach (var childRenderer in renderers) + { + Color color = childRenderer.color; + color.a = alpha; + childRenderer.color = color; + } + } + + public IEnumerator CharacterFadeIn(float duration = 1f) + { + if (_curCharacter != null) + { + _curCharacter.SetActive(true); + yield return FadeCharacter(1, duration); + } + } + + public IEnumerator CharacterFadeOut(float duration = 1f) + { + if (_curCharacter != null) + { + yield return FadeCharacter(0, duration); + _curCharacter.SetActive(false); + } + } + + private IEnumerator FadeCharacter(float toAlpha, float duration) + { + yield return DOTween.To(() => _characterAlpha, x => SetCharacterAlpha(x), toAlpha, duration) + .WaitForCompletion(); + } + + public void SwitchPose(string poseName) + { + ActiveLayer(PoseGroup, poseName); + } + + public void SwitchFace(string faceName) + { + StopAutoBlink(); + ActiveLayer(FaceGroup, faceName); + } + + public void Blink() + { + _blinkLayer.enabled = true; + _ = CommonUtil.Delay(100, () => { _blinkLayer.enabled = false; }); + } + + public void AutoBlink() + { + StopAutoBlink(); + _autoBlinkCoroutine = StartCoroutine(AutoBlinkAsync()); + } + + public void StopAutoBlink() + { + if (_autoBlinkCoroutine != null) + { + StopCoroutine(_autoBlinkCoroutine); + } + } + + private IEnumerator AutoBlinkAsync() + { + while (true) + { + yield return new WaitForSeconds(6f); + Blink(); + } + } + + public void AddLinkDevice() + { + LinkDevice.gameObject.SetActive(true); + } + + public void RemoveLinkDevice() + { + LinkDevice.gameObject.SetActive(false); + } + + public void CharacterShow(string characterName) + { + if (_curCharacter != null) + { + // 将角色的透明度设置为 1 + SetCharacterAlpha(1); + } + else + { + Debug.LogError($"Character {characterName} not found in loaded characters."); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs.meta b/Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs.meta new file mode 100644 index 000000000..c6766a5c0 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 26c6d766a411186449e3e0fd4c9f1ca5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs b/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs index 13403a188..9783c9d37 100644 --- a/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs +++ b/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs @@ -1,17 +1,25 @@ using System.Collections; using AibisDream.FixSystem; +using DG.Tweening; using UnityEngine; namespace AibisDream { public class ClinicSystem : MonoBehaviour { - [HideInInspector] public CharacterManager character; + [HideInInspector] public CharacterViewer character; + private Transform _pumpHead; + + public Vector3 pumpUpPos; + public Vector3 pumpDownPos; + public float pumpDuration; private void Awake() { FixSystemCenter.SystemDic.Register(this); - character = transform.Find("Character").GetComponent(); + character = transform.GetComponentInChildren(); + + _pumpHead = transform.Find("正图").Find("近景").Find("桌上泵头"); } public IEnumerator Indoor(float duration) @@ -28,5 +36,17 @@ namespace AibisDream yield return MainUIController.Instance.FadeInSync(duration); gameObject.SetActive(false); } + + public void StartTablePump() + { + _pumpHead.DOLocalMove(pumpDownPos, pumpDuration).SetLoops(-1, LoopType.Yoyo) + .SetEase(Ease.Linear); + } + + public void StopTablePump() + { + _pumpHead.DOKill(); + _pumpHead.DOLocalMove(pumpUpPos, 0.5f); + } } } \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/Clinic/ClinicYarnCommand.cs b/Assets/Scripts/FixSystemNew/Clinic/ClinicYarnCommand.cs index 869ef10a9..d1846d3f1 100644 --- a/Assets/Scripts/FixSystemNew/Clinic/ClinicYarnCommand.cs +++ b/Assets/Scripts/FixSystemNew/Clinic/ClinicYarnCommand.cs @@ -1,5 +1,6 @@ using System.Collections; using AibisDream.FixSystem; +using UnityEngine; using Yarn.Unity; namespace AibisDream @@ -7,7 +8,7 @@ namespace AibisDream public static class ClinicYarnCommand { private static ClinicSystem ClinicSystem => FixSystemCenter.SystemDic.Get(); - private static CharacterManager Character => ClinicSystem.character; + private static CharacterViewer Character => ClinicSystem.character; [YarnCommand("indoor_new")] public static IEnumerator Indoor(float duration) @@ -51,22 +52,48 @@ namespace AibisDream #region 角色动作调整 - [YarnCommand("character_face_new")] + [YarnCommand("character_face")] public static void CharacterFace(string state) { - Character.SetFaceState(state); + Character.SwitchFace(state); } - [YarnCommand("character_eye_new")] + [YarnCommand("character_eye")] public static void CharacterEye(string state) { - Character.SetEyeState(state); + // Character.SetEyeState(state); + Debug.LogWarning("该命令已废弃"); } [YarnCommand("character_crying_new")] public static void CharacterCrying(bool isCrying) { - Character.SetCrying(isCrying); + // Character.SetCrying(isCrying); + Debug.LogWarning("该命令已废弃"); + } + + [YarnCommand("character_pos")] + public static void SwitchPos(string poseName) + { + Character.SwitchPose(poseName); + } + + [YarnCommand("character_auto_blink")] + public static void AutoBlink() + { + Character.AutoBlink(); + } + + [YarnCommand("character_add_device")] + public static void AddLinkDevice() + { + Character.AddLinkDevice(); + } + + [YarnCommand("character_remove_device")] + public static void RemoveLinkDevice() + { + Character.RemoveLinkDevice(); } #endregion diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/BottleShelf.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/BottleShelf.cs index 05b557bb6..dacc903f7 100644 --- a/Assets/Scripts/FixSystemNew/CoolingMachine/BottleShelf.cs +++ b/Assets/Scripts/FixSystemNew/CoolingMachine/BottleShelf.cs @@ -21,7 +21,6 @@ namespace AibisDream.FixSystem private void Awake() { - gameObject.SetActive(false); transform.localPosition = hidePos; InitRefs(); @@ -39,11 +38,7 @@ namespace AibisDream.FixSystem public IEnumerator Show() { gameObject.SetActive(true); - Tween tween = transform.DOLocalMove(showPos, showDuration); - while (tween.active && !tween.IsComplete()) - { - yield return null; - } + yield return transform.DOLocalMove(showPos, showDuration).WaitForCompletion(); } /// @@ -52,11 +47,7 @@ namespace AibisDream.FixSystem /// 隐藏 public IEnumerator Hide() { - Tween tween = transform.DOLocalMove(hidePos, showDuration); - while (tween.active && !tween.IsComplete()) - { - yield return null; - } + yield return transform.DOLocalMove(hidePos, showDuration).WaitForCompletion(); gameObject.SetActive(false); } } diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs index 5394e8d9c..08d790091 100644 --- a/Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs +++ b/Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs @@ -7,6 +7,7 @@ namespace AibisDream.FixSystem public class BottleSlot : MonoBehaviour { public event Action InsertSlotEvent; + public event Action RemoveSlotEvent; public CoolingBottleData initBottleData; private CoolingBottle _curBottle; @@ -74,6 +75,7 @@ namespace AibisDream.FixSystem public void RemoveBottle() { _curBottle = null; + RemoveSlotEvent?.Invoke(); } /// diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingBottle.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingBottle.cs index 5b03cdc88..abe43b792 100644 --- a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingBottle.cs +++ b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingBottle.cs @@ -50,7 +50,6 @@ namespace AibisDream.FixSystem public void StartMove() { _rb.isKinematic = false; - curSnapSlot.RemoveBottle(); // 开始移动时就切换成横版 Rotate(false); } @@ -75,11 +74,8 @@ namespace AibisDream.FixSystem sq.Join(rotate); Tween scaleTw = transform.DOScale(scale, RotateTime); sq.Join(scaleTw); - - while (sq.active && !sq.IsComplete()) - { - yield return null; - } + + yield return sq.WaitForCompletion(); } public void Move(Vector2 mousePos) @@ -91,6 +87,9 @@ namespace AibisDream.FixSystem { if (TryFindClosestSlot(out var targetSlot)) { + // 从原有Slot移出 + curSnapSlot.RemoveBottle(); + // 更新到新的Slot curSnapSlot = targetSlot; } diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs index b729f648b..a1dd1c030 100644 --- a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs +++ b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs @@ -1,7 +1,6 @@ using System.Collections; using AibisDream.FixSystem; using UnityEngine; -using Yarn.Unity; namespace AibisDream.Framework { @@ -28,7 +27,7 @@ namespace AibisDream.Framework FixSystemCenter.SystemDic.Register(this); InitRefs(); } - + private void InitRefs() { _pumpUI = transform.Find("Pump Part").GetComponent(); @@ -48,7 +47,6 @@ namespace AibisDream.Framework public IEnumerator LinkTube() { // 播放插线动画，完成后自动关闭 - // 立绘变化待补充 yield return _tubeUI.PlayLinkAnime(); } @@ -69,7 +67,15 @@ namespace AibisDream.Framework public void InsertBottle(CoolingBottle bottle) { - // 插入似乎没有太多逻辑？ + // 设置当前瓶子名称 + DialogController.Instance.SetVariable("curBottleName", bottle.data.name); + // 触发插入对话 + DialogController.Instance.StartDialogNode("插入冷却液"); + } + + public void RemoveBottle() + { + DialogController.Instance.SetVariable("curBottleName", ""); } public void Lock() @@ -90,27 +96,33 @@ namespace AibisDream.Framework { // 播放pump动画 _pumpUI.PlayPumpAnime(); + var clinicSystem = FixSystemCenter.SystemDic.Get(); + clinicSystem.StartTablePump(); // 播放泵机运行对话 - // DialogController.Instance.StartDialogNode($"泵机运行_{CurBottle.data.name}"); - Debug.Log($"泵机运行_{CurBottle.data.name}"); + DialogController.Instance.StartDialogNode($"泵机运行_{CurBottle.data.name}"); } } - [YarnCommand("close_bottle_ui")] public IEnumerator CloseBottleUI() { yield return _bottomUI.Hide(); } - [YarnCommand("close_cooling_system")] public IEnumerator CloseCoolingSystem() { yield return _pumpUI.Hide(); - _pumpUI.StopPumpAnime(); - _pumpUI.DestroyBottle(); } - [YarnCommand("pull_out_tube")] + public void StopPump() + { + // 冷却液界面 + _pumpUI.StopPumpAnime(); + _pumpUI.DestroyBottle(); + // 诊所界面 + var clinicSystem = FixSystemCenter.SystemDic.Get(); + clinicSystem.StopTablePump(); + } + public IEnumerator PullOutTube() { yield return _tubeUI.PlayPullOutAnime(); @@ -131,6 +143,8 @@ namespace AibisDream.Framework public void Unlock(); // 插入冷却液瓶子 public void InsertBottle(CoolingBottle bottle); + // 移出冷却液瓶子 + public void RemoveBottle(); // 关闭卡扣 public void Lock(); // 点击泵机开关 @@ -141,5 +155,7 @@ namespace AibisDream.Framework public IEnumerator CloseCoolingSystem(); // 拔管 public IEnumerator PullOutTube(); + // 停止泵机 + public void StopPump(); } } \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystemCommand.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystemCommand.cs new file mode 100644 index 000000000..f7e1610bf --- /dev/null +++ b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystemCommand.cs @@ -0,0 +1,87 @@ +using System.Collections; +using AibisDream.Framework; +using Yarn.Unity; + +namespace AibisDream.FixSystem +{ + public static class CoolingSystemCommand + { + // 打开冷却系统UI + [YarnCommand("open_cooling_system")] + public static IEnumerator OpenCoolingSystem() + { + var cooling = FixSystemCenter.SystemDic.Get(); + return cooling.OpenCoolingSystem(); + } + + // 插管 + [YarnCommand("link_tube")] + public static IEnumerator LinkTube() + { + var cooling = FixSystemCenter.SystemDic.Get(); + return cooling.LinkTube(); + } + + // 打开左侧冷却液界面 + [YarnCommand("open_bottle_ui")] + public static IEnumerator OpenBottleUI() + { + var cooling = FixSystemCenter.SystemDic.Get(); + return cooling.OpenBottleUI(); + } + + // 打开卡扣 + [YarnCommand("unlock")] + public static void Unlock() + { + var cooling = FixSystemCenter.SystemDic.Get(); + cooling.Unlock(); + } + + // 关闭卡扣 + [YarnCommand("lock")] + public static void Lock() + { + var cooling = FixSystemCenter.SystemDic.Get(); + cooling.Lock(); + } + + // 点击泵机开关 + [YarnCommand("start_pump")] + public static void StartPump() + { + var cooling = FixSystemCenter.SystemDic.Get(); + cooling.StartPump(); + } + + // 冷却液架收回 + [YarnCommand("close_bottle_ui")] + public static IEnumerator CloseBottleUI() + { + var cooling = FixSystemCenter.SystemDic.Get(); + return cooling.CloseBottleUI(); + } + + // 冷却系统UI收回 + [YarnCommand("close_cooling_system")] + public static IEnumerator CloseCoolingSystem() + { + var cooling = FixSystemCenter.SystemDic.Get(); + return cooling.CloseCoolingSystem(); + } + + // 拔管 + [YarnCommand("pull_out_tube")] + public static IEnumerator PullOutTube() + { + var cooling = FixSystemCenter.SystemDic.Get(); + return cooling.PullOutTube(); + } + + // 运行结束 + public static void StopPump() + { + var cooling = FixSystemCenter.SystemDic.Get(); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystemCommand.cs.meta b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystemCommand.cs.meta new file mode 100644 index 000000000..73995d647 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystemCommand.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4b0dd86fff64466d893bbba5891722c4 +timeCreated: 1735114274 \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/PumpController.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/PumpController.cs index f87f8487c..97c2fe23a 100644 --- a/Assets/Scripts/FixSystemNew/CoolingMachine/PumpController.cs +++ b/Assets/Scripts/FixSystemNew/CoolingMachine/PumpController.cs @@ -1,8 +1,8 @@ -using System.Collections; +using System; +using System.Collections; using AibisDream.Framework; using DG.Tweening; using UnityEngine; -using UnityEngine.Serialization; namespace AibisDream.FixSystem { @@ -45,8 +45,6 @@ namespace AibisDream.FixSystem private void Awake() { InitRefs(); - // 隐藏 - gameObject.SetActive(false); transform.localPosition = hidePos; } @@ -74,8 +72,15 @@ namespace AibisDream.FixSystem bottleSlot = GetComponentInChildren(); bottleSlot.InsertSlotEvent += _coolingSystem.InsertBottle; + bottleSlot.RemoveSlotEvent += _coolingSystem.RemoveBottle; } + // private void Start() + // { + // // 隐藏 + // gameObject.SetActive(false); + // } + #region 按钮 private void LockButtonDown() @@ -112,11 +117,7 @@ namespace AibisDream.FixSystem public IEnumerator Show() { gameObject.SetActive(true); - Tween tween = transform.DOLocalMove(showPos, showDuration); - while (tween.active && !tween.IsComplete()) - { - yield return null; - } + yield return transform.DOLocalMove(showPos, showDuration).WaitForCompletion(); } /// @@ -125,11 +126,7 @@ namespace AibisDream.FixSystem /// 隐藏 public IEnumerator Hide() { - Tween tween = transform.DOLocalMove(hidePos, showDuration); - while (tween.active && !tween.IsComplete()) - { - yield return null; - } + yield return transform.DOLocalMove(hidePos, showDuration).WaitForCompletion(); gameObject.SetActive(false); } diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/TubeController.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/TubeController.cs index 97b6816d6..4dc1d02d8 100644 --- a/Assets/Scripts/FixSystemNew/CoolingMachine/TubeController.cs +++ b/Assets/Scripts/FixSystemNew/CoolingMachine/TubeController.cs @@ -22,8 +22,6 @@ namespace AibisDream.FixSystem private void Awake() { - gameObject.SetActive(false); - InitRefs(); } @@ -61,7 +59,8 @@ namespace AibisDream.FixSystem { yield return null; } - // TODO 插完线后更新人物图片 + // 插完线后更新人物图片 + ClinicYarnCommand.AddLinkDevice(); } private IEnumerator PullOutAction() @@ -72,7 +71,8 @@ namespace AibisDream.FixSystem { yield return null; } - // TODO 插完线后更新人物图片 + // 插完线后更新人物图片 + ClinicYarnCommand.RemoveLinkDevice(); } private IEnumerator ShowAndHide(IEnumerator middleAction) diff --git a/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs b/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs index 53be469bf..051169ce7 100644 --- a/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs +++ b/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs @@ -83,11 +83,10 @@ namespace AibisDream.FixSystem // 移动相机 yield return CameraKit.Instance.TransCameraAsync(CameraPos, Duration); // 打开泵机 + coolingSystem.gameObject.SetActive(true); yield return coolingSystem.OpenCoolingSystem(); // 播放插线动画 yield return coolingSystem.LinkTube(); - // 打开冷却液架 - yield return coolingSystem.OpenBottleUI(); } public void SetArgs(string arg) diff --git a/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs b/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs index ff28a0746..ab326759b 100644 --- a/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs +++ b/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs @@ -17,7 +17,7 @@ namespace AibisDream.FixSystem Engine, Gear } - + public interface ITransitionCommand { IEnumerator Execute(); @@ -27,12 +27,12 @@ namespace AibisDream.FixSystem public struct BodyModuleToClinicCommand : ITransitionCommand { private const float FadeDuration = 0.5f; - + public IEnumerator Execute() { var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); var clinicSystem = FixSystemCenter.SystemDic.Get(); - + // 黑屏 yield return MainUIController.Instance.FadeInSync(FadeDuration); // 把线插回去 @@ -69,7 +69,7 @@ namespace AibisDream.FixSystem { yield return null; } - + // 打开引擎盖子 var coverSq = engineSystem.OpenCover(); while (coverSq.active && !coverSq.IsComplete()) @@ -84,21 +84,21 @@ namespace AibisDream.FixSystem } } - public partial struct EngineToBodyModuleCommand : ITransitionCommand + public struct EngineToBodyModuleCommand : ITransitionCommand { private const float Duration = 2f; - + public IEnumerator Execute() { var engineSystem = FixSystemCenter.SystemDic.Get(); - + // 关闭引擎盖 var coverSq = engineSystem.CloseCover(); while (coverSq.active && !coverSq.IsComplete()) { yield return null; } - + // 相机还原 var cameraSq = CameraKit.Instance.ReturnInitCamera(Duration); while (cameraSq.active && !cameraSq.IsComplete()) @@ -112,16 +112,16 @@ namespace AibisDream.FixSystem // 添加参数 } } - + public struct EngineToClinicCommand : ITransitionCommand { private const float FadeDuration = 0.5f; - + public IEnumerator Execute() { var clinicSystem = FixSystemCenter.SystemDic.Get(); var engineSystem = FixSystemCenter.SystemDic.Get(); - + // 盖上盖子 yield return engineSystem.CloseCoverAsync(); // 黑屏 @@ -139,9 +139,10 @@ namespace AibisDream.FixSystem // 无需参数 } } - public struct BodyModuleToEyeCommand : ITransitionCommand + + public struct BodyModuleToEyeCommand : ITransitionCommand { - // 引擎相机设置 + // 引擎相机设置 private static readonly Vector3 CameraPos = new(0f, 0.5f, -10); private const float OrthographicSize = 2.5f; private const float Duration = 2f; @@ -159,6 +160,7 @@ namespace AibisDream.FixSystem { yield return null; } + eyeSystem.OpenEyeView(); eyeSystem.OnEnter(); } @@ -168,24 +170,26 @@ namespace AibisDream.FixSystem // 添加参数 } } - public partial struct EyeToBodyModuleCommand : ITransitionCommand + + public struct EyeToBodyModuleCommand : ITransitionCommand { private const float Duration = 2f; - + public IEnumerator Execute() { var eyeSystem = FixSystemCenter.SystemDic.Get(); eyeSystem.CloseEyeView(); - + // 相机还原 var cameraSq = CameraKit.Instance.ReturnInitCamera(Duration); while (cameraSq.active && !cameraSq.IsComplete()) { yield return null; } + eyeSystem.OnExit(); } - + public void SetArgs(string arg) { // 添加参数 @@ -194,7 +198,7 @@ namespace AibisDream.FixSystem public struct BodyModuleToMemoryCommand : ITransitionCommand { - // 引擎相机设置 + // 引擎相机设置 private static readonly Vector3 CameraPos = new(0f, 0.5f, -10); private const float OrthographicSize = 2.5f; private const float Duration = 2f; @@ -212,6 +216,7 @@ namespace AibisDream.FixSystem { yield return null; } + memorySystem.OpenMemoryView(); memorySystem.OnShow(); } @@ -221,32 +226,30 @@ namespace AibisDream.FixSystem // 添加参数 } } - public partial struct MemoryToBodyModuleCommand : ITransitionCommand + + public struct MemoryToBodyModuleCommand : ITransitionCommand { private const float Duration = 2f; - + public IEnumerator Execute() { var memorySystem = FixSystemCenter.SystemDic.Get(); memorySystem.CloseMemoryView(); - + // 相机还原 - var cameraSq = CameraKit.Instance.ReturnInitCamera(Duration); - while (cameraSq.active && !cameraSq.IsComplete()) - { - yield return null; - } + yield return CameraKit.Instance.ReturnInitCamera(Duration).WaitForCompletion(); memorySystem.OnExit(); } - + public void SetArgs(string arg) { // 添加参数 } } + public struct BodyModuleToUFCommand : ITransitionCommand { - // 引擎相机设置 + // 引擎相机设置 private static readonly Vector3 CameraPos = new(0f, 0.5f, -10); private const float OrthographicSize = 2.5f; private const float Duration = 2f; @@ -258,13 +261,8 @@ namespace AibisDream.FixSystem // 插头回到初始插孔 bodyModuleSystem.ResetPlug(); // 相机聚焦到目标位 - var cameraSq = CameraKit.Instance.TransCamera(CameraPos, OrthographicSize, Duration); - while (cameraSq.active && !cameraSq.IsComplete()) - { - yield return null; - } + yield return CameraKit.Instance.TransCamera(CameraPos, OrthographicSize, Duration).WaitForCompletion(); UFSystem.OpenUFView(); - } public void SetArgs(string arg) @@ -272,15 +270,16 @@ namespace AibisDream.FixSystem // 添加参数 } } - public partial struct UFToBodyModuleCommand : ITransitionCommand + + public struct UFToBodyModuleCommand : ITransitionCommand { private const float Duration = 2f; - + public IEnumerator Execute() { - var UFSystem = FixSystemCenter.SystemDic.Get(); + var UFSystem = FixSystemCenter.SystemDic.Get(); UFSystem.CloseUFView(); - + // 相机还原 var cameraSq = CameraKit.Instance.ReturnInitCamera(Duration); while (cameraSq.active && !cameraSq.IsComplete()) @@ -288,14 +287,10 @@ namespace AibisDream.FixSystem yield return null; } } - + 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 ccde19f5b..4284f9847 100644 --- a/Assets/Scripts/Framework/OtherKit/CameraKit.cs +++ b/Assets/Scripts/Framework/OtherKit/CameraKit.cs @@ -59,12 +59,7 @@ namespace AibisDream.Framework public IEnumerator TransCameraAsync(Vector3 targetPos, float targetOrthographicSize, float duration) { - var sq = TransCamera(targetPos, targetOrthographicSize, duration); - // 协程 - while (sq.active && !sq.IsComplete()) - { - yield return null; - } + yield return TransCamera(targetPos, targetOrthographicSize, duration).WaitForCompletion(); } public IEnumerator ReturnInitCameraAsync(float duration) diff --git a/Assets/Scripts/Framework/OtherKit/MonoCenter.cs b/Assets/Scripts/Framework/OtherKit/MonoCenter.cs index 891986d78..9aa7ef41f 100644 --- a/Assets/Scripts/Framework/OtherKit/MonoCenter.cs +++ b/Assets/Scripts/Framework/OtherKit/MonoCenter.cs @@ -1,5 +1,4 @@ using System; -using System.Collections; using AibisDream.FixSystem; using UnityEngine; @@ -50,8 +49,7 @@ namespace AibisDream.Framework { if (Input.GetKeyDown(KeyCode.K)) { - var cooling = FixSystemCenter.SystemDic.Get(); - MonoCenter.Mono.StartCoroutine(cooling.OpenCoolingSystem()); + MonoCenter.Mono.StartCoroutine(FixSystemYarnCommand.SwitchFixSystemTo("CoolingMachine")); } if (Input.GetKeyDown(KeyCode.A))