diff --git a/Assets/Resources/Art/Background/主界面尝试尝试最新导出.psb b/Assets/Resources/Art/Background/主界面尝试尝试最新导出.psb index f0de4491d..ce7a3f4f4 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:d24c630ae489d347f272034213a935d5d388db46848076661d01acca9c01b69d -size 238124431 +oid sha256:cea0e795a5f944dcd652c5b3458f75a93e41b78225fa73a267bab5a93f455efa +size 115765520 diff --git a/Assets/Resources/Art/Background/主界面尝试尝试最新导出.psb.meta b/Assets/Resources/Art/Background/主界面尝试尝试最新导出.psb.meta index 8812f2e49..bdab029bd 100644 --- a/Assets/Resources/Art/Background/主界面尝试尝试最新导出.psb.meta +++ b/Assets/Resources/Art/Background/主界面尝试尝试最新导出.psb.meta @@ -35,7 +35,7 @@ ScriptedImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 333 + spritePixelsToUnits: 215 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 0 generateCubemap: 6 @@ -101,10 +101,10 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 9032 - y: 3347 - width: 756 - height: 835 + x: 7235 + y: 2863 + width: 489 + height: 541 spriteID: afa6baf9ac620be41b97c6ca992c9e6f spriteBone: [] spriteOutline: [] @@ -113,8 +113,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 9032, y: 3347} - spritePosition: {x: 6658, y: 0} + uvTransform: {x: 7235, y: 2863} + spritePosition: {x: 4313, y: 0} - name: "\u684C\u9762\u7F69\u5B50" originalName: pivot: {x: 0.5, y: 0.5} @@ -122,10 +122,10 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 9796 - y: 3347 - width: 738 - height: 828 + x: 7235 + y: 3412 + width: 479 + height: 537 spriteID: d6f4a20ac2f34ca419c5597eb1d9412c spriteBone: [] spriteOutline: [] @@ -134,8 +134,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 9796, y: 3347} - spritePosition: {x: 6669, y: 0} + uvTransform: {x: 7235, y: 3412} + spritePosition: {x: 4319, y: 0} - name: "\u6CF5\u673A\u7EC4\u4EF6a" originalName: pivot: {x: 0.5, y: 0.5} @@ -143,11 +143,11 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 15573 - y: 3025 - width: 689 - height: 218 - spriteID: 411373c8e1da70e4388083d8c9713c90 + x: 7732 + y: 3244 + width: 446 + height: 140 + spriteID: c6eda028b9a2a4f4996f8891d70dad85 spriteBone: [] spriteOutline: [] vertices: [] @@ -155,8 +155,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 15573, y: 3025} - spritePosition: {x: 6695, y: 561} + uvTransform: {x: 7732, y: 3244} + spritePosition: {x: 4336, y: 363} - name: "\u684C\u9762\u6CF5\u673A\u906E\u7F69" originalName: pivot: {x: 0.5, y: 0.5} @@ -164,10 +164,10 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 13377 - y: 2629 - width: 602 - height: 637 + x: 7722 + y: 3412 + width: 392 + height: 267 spriteID: ae4fb1e78a413fe4aa30181741fd6389 spriteBone: [] spriteOutline: [] @@ -176,8 +176,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 13377, y: 2629} - spritePosition: {x: 7583, y: 33} + uvTransform: {x: 7722, y: 3412} + spritePosition: {x: 4992, y: 21} - name: "\u6CF5\u673A\u7EC4\u4EF6b" originalName: pivot: {x: 0.5, y: 0.5} @@ -185,11 +185,11 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 14569 - y: 2629 - width: 593 - height: 574 - spriteID: 71b6e75ad93ff924e83d4b54c883858d + x: 7732 + y: 2863 + width: 385 + height: 373 + spriteID: 6363441772c90ae468bafbab781ec90a spriteBone: [] spriteOutline: [] vertices: [] @@ -197,8 +197,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 14569, y: 2629} - spritePosition: {x: 6746, y: 33} + uvTransform: {x: 7732, y: 2863} + spritePosition: {x: 4369, y: 21} - name: "\u684C\u9762\u6CF5\u673A\u8FD0\u4F5C\u65F6\u4EAE\u706F" originalName: pivot: {x: 0.5, y: 0.5} @@ -206,10 +206,10 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 15170 - y: 3025 - width: 217 - height: 106 + x: 7235 + y: 3957 + width: 142 + height: 69 spriteID: 8b886be0d4dc69e4bbb860267b345302 spriteBone: [] spriteOutline: [] @@ -218,8 +218,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 15170, y: 3025} - spritePosition: {x: 6148, y: 229} + uvTransform: {x: 7235, y: 3957} + spritePosition: {x: 3981, y: 148} - name: "\u684C\u9762\u9ED1\u5C4F" originalName: pivot: {x: 0.5, y: 0.5} @@ -227,10 +227,10 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 15170 - y: 3139 - width: 217 - height: 106 + x: 7385 + y: 3957 + width: 142 + height: 69 spriteID: 7897ed12f592c9047b0a804941a55c45 spriteBone: [] spriteOutline: [] @@ -239,8 +239,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 15170, y: 3139} - spritePosition: {x: 6148, y: 229} + uvTransform: {x: 7385, y: 3957} + spritePosition: {x: 3981, y: 148} - name: "\u684C" originalName: pivot: {x: 0.5, y: 0.5} @@ -249,9 +249,9 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4 - y: 3347 - width: 9020 - height: 1053 + y: 2172 + width: 5842 + height: 683 spriteID: 7afaecef594b05342b0945b11fcc6388 spriteBone: [] spriteOutline: [] @@ -260,134 +260,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 3347} + uvTransform: {x: 4, y: 2172} spritePosition: {x: 0, y: 0} - - 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: 10542 - y: 3347 - width: 439 - height: 755 - spriteID: 849d9124528056c47955f41ba7a01605 - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 10542, y: 3347} - spritePosition: {x: 3997, y: 94} - - 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: 13987 - y: 2629 - width: 574 - height: 616 - spriteID: 70ad330e45088ab4aac40a7752b3dc7e - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 13987, y: 2629} - spritePosition: {x: 3652, y: 564} - - 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: 15170 - y: 2629 - width: 395 - height: 388 - spriteID: 011849e1953f10947809d9c264777e81 - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 15170, y: 2629} - spritePosition: {x: 2897, y: 2388} - - 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: 15573 - y: 2629 - width: 395 - height: 388 - spriteID: 7809c728ed9ff1a499326df1839c5a1f - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 15573, y: 2629} - spritePosition: {x: 2897, y: 2388} - - 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: 5505 - width: 516 - height: 1909 - spriteID: af7a6904172df1d4caccd3d00d088605 - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 4, y: 5505} - spritePosition: {x: 2261, y: 258} - - 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: 11767 - y: 4 - width: 1602 - height: 2912 - spriteID: 7e500db015e68d542b883749ec674aa9 - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 11767, y: 4} - spritePosition: {x: 2658, y: 167} - name: "\u5E18\u5B50" originalName: pivot: {x: 0.5, y: 0.5} @@ -395,10 +269,10 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 9032 + x: 5854 y: 4 - width: 2727 - height: 3335 + width: 1767 + height: 2160 spriteID: 30ecba081eac70440bfac7a7959ef31e spriteBone: [] spriteOutline: [] @@ -407,8 +281,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 9032, y: 4} - spritePosition: {x: 6257, y: 0} + uvTransform: {x: 5854, y: 4} + spritePosition: {x: 4052, y: 0} - name: "\u623F\u95F4\u5185" originalName: pivot: {x: 0.5, y: 0.5} @@ -418,8 +292,8 @@ ScriptedImporter: serializedVersion: 2 x: 4 y: 4 - width: 9020 - height: 3335 + width: 5842 + height: 2160 spriteID: ce0820a62e9a1e8499ebcccec53b565f spriteBone: [] spriteOutline: [] @@ -437,10 +311,10 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 13377 - y: 1416 - width: 2796 - height: 1205 + x: 1957 + y: 2863 + width: 1812 + height: 781 spriteID: df8833565709d2043ab02243abb14b3a spriteBone: [] spriteOutline: [] @@ -449,8 +323,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 13377, y: 1416} - spritePosition: {x: 41, y: 1236} + uvTransform: {x: 1957, y: 2863} + spritePosition: {x: 26, y: 800} - name: "\u51B0\u971C" originalName: pivot: {x: 0.5, y: 0.5} @@ -458,10 +332,10 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4 - y: 4408 - width: 2656 - height: 1089 + x: 3777 + y: 2863 + width: 1721 + height: 706 spriteID: fd6e3bf8757d8784c961b67ac3f55a9a spriteBone: [] spriteOutline: [] @@ -470,8 +344,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 4408} - spritePosition: {x: 115, y: 1293} + uvTransform: {x: 3777, y: 2863} + spritePosition: {x: 74, y: 837} - name: "\u96EA" originalName: pivot: {x: 0.5, y: 0.5} @@ -479,10 +353,10 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 13377 - y: 4 - width: 3001 - height: 1404 + x: 4 + y: 2863 + width: 1945 + height: 910 spriteID: d36bb45080605af44ad1d30a1ae5b069 spriteBone: [] spriteOutline: [] @@ -491,8 +365,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 13377, y: 4} - spritePosition: {x: 115, y: 1293} + uvTransform: {x: 4, y: 2863} + spritePosition: {x: 74, y: 837} - name: "\u591C\u665A" originalName: pivot: {x: 0.5, y: 0.5} @@ -500,10 +374,10 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 2668 - y: 4408 - width: 2656 - height: 1089 + x: 5506 + y: 2863 + width: 1721 + height: 706 spriteID: 413093f8377e48042825bd7ee5b637dd spriteBone: [] spriteOutline: [] @@ -512,8 +386,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 2668, y: 4408} - spritePosition: {x: 115, y: 1293} + uvTransform: {x: 5506, y: 2863} + spritePosition: {x: 74, y: 837} characterData: bones: [] parts: [] @@ -533,7 +407,7 @@ ScriptedImporter: - name: DefaultTexturePlatform overridden: 0 ignorePlatformSupport: 0 - maxTextureSize: 16384 + maxTextureSize: 8192 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 2 @@ -595,7 +469,7 @@ ScriptedImporter: documentPivot: {x: 0, y: 0} documentAlignment: 0 importHiddenLayers: 0 - layerMappingOption: 2 + layerMappingOption: 0 generatePhysicsShape: 0 paperDollMode: 0 keepDupilcateSpriteName: 1 @@ -605,7 +479,7 @@ ScriptedImporter: spriteCategoryList: categories: [] spritePackingTag: - resliceFromLayer: 0 + resliceFromLayer: 1 mosaicPSDLayers: [] rigPSDLayers: - name: "\u900F\u89C6\u7EBF" @@ -618,6 +492,36 @@ ScriptedImporter: flatten: 0 isImported: 0 isVisible: 0 + - name: "UF\u773C\u775B\u7279\u5199" + spriteName: + isGroup: 1 + parentIndex: -1 + spriteID: ba3c156de827c7e4d9d15ccef734a976 + layerID: 4969 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "UF\u773C\u775B\u7279\u5199" + spriteName: + isGroup: 0 + parentIndex: 1 + spriteID: 7204e7e570a3d4d49ba780a8704e17b7 + layerID: 4966 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u5BF9\u8BDD\u6846\u53C2\u8003" + spriteName: "\u5BF9\u8BDD\u6846\u53C2\u8003" + isGroup: 0 + parentIndex: -1 + spriteID: 8dc989a93ac048f41a98b15e98d33728 + layerID: 4952 + mosaicPosition: {x: 5854, y: 2172} + flatten: 0 + isImported: 0 + isVisible: 1 - name: "\u9ED1" spriteName: isGroup: 0 @@ -641,17 +545,17 @@ ScriptedImporter: - name: "\u6362\u6DB2UI" spriteName: isGroup: 1 - parentIndex: 2 + parentIndex: 5 spriteID: d9f7e8906a0c5464f9621d7df6402ff2 layerID: 1757 mosaicPosition: {x: 0, y: 0} flatten: 0 isImported: 0 - isVisible: 1 + isVisible: 0 - name: "\u56FE\u5C42 553" spriteName: isGroup: 0 - parentIndex: 3 + parentIndex: 6 spriteID: 35d6961a145f0a94e8de8ae2c702c216 layerID: 4042 mosaicPosition: {x: 0, y: 0} @@ -661,7 +565,7 @@ ScriptedImporter: - name: "\u6362\u6DB2\u6D41\u7A0B" spriteName: isGroup: 1 - parentIndex: 3 + parentIndex: 6 spriteID: d64491d233e33044daf9f89d7972b536 layerID: 4110 mosaicPosition: {x: 0, y: 0} @@ -671,7 +575,7 @@ ScriptedImporter: - name: "\u4E0A\u534A\u90E8\u5206\u9ED1\u8FB9" spriteName: isGroup: 0 - parentIndex: 5 + parentIndex: 8 spriteID: f45f212381b803e4d9103b70fea8b956 layerID: 4116 mosaicPosition: {x: 0, y: 0} @@ -681,7 +585,7 @@ ScriptedImporter: - name: "\u4E0B\u534A\u90E8\u5206\u9ED1\u8FB9" spriteName: isGroup: 0 - parentIndex: 5 + parentIndex: 8 spriteID: 422ea6d63452f724597ea7061c6bd6d2 layerID: 4351 mosaicPosition: {x: 0, y: 0} @@ -691,7 +595,7 @@ ScriptedImporter: - name: "\u6362\u6DB2\u8BBE\u5907\u63D2\u7BA1\u8499\u592A\u5947" spriteName: isGroup: 1 - parentIndex: 5 + parentIndex: 8 spriteID: e3465aa3f32348548aef31a8ca20257c layerID: 4240 mosaicPosition: {x: 0, y: 0} @@ -701,7 +605,7 @@ ScriptedImporter: - name: "\u63D2\u7EBF" spriteName: isGroup: 0 - parentIndex: 8 + parentIndex: 11 spriteID: 1911b984b562a214e957c62e7df80ff1 layerID: 4237 mosaicPosition: {x: 0, y: 0} @@ -711,7 +615,7 @@ ScriptedImporter: - name: "\u624B" spriteName: isGroup: 0 - parentIndex: 8 + parentIndex: 11 spriteID: cded0dec6458f6541b7cec7ad25b6080 layerID: 4236 mosaicPosition: {x: 0, y: 0} @@ -721,7 +625,7 @@ ScriptedImporter: - name: "\u8499\u592A\u5947\u80CC\u666Fa" spriteName: isGroup: 0 - parentIndex: 8 + parentIndex: 11 spriteID: 0e65faa540a392641a2ad92a72afde43 layerID: 4350 mosaicPosition: {x: 0, y: 0} @@ -731,7 +635,7 @@ ScriptedImporter: - name: "\u6CF5\u673A\u5F00\u5173\u4E4B\u540E\u8499\u592A\u5947" spriteName: isGroup: 1 - parentIndex: 5 + parentIndex: 8 spriteID: 21c5c01a5c121e94cafa762bb3078750 layerID: 4348 mosaicPosition: {x: 0, y: 0} @@ -741,7 +645,7 @@ ScriptedImporter: - name: "\u9ED1\u6846C" spriteName: isGroup: 0 - parentIndex: 12 + parentIndex: 15 spriteID: 348fb0dab11857a4dab934145634d361 layerID: 4734 mosaicPosition: {x: 0, y: 0} @@ -751,7 +655,7 @@ ScriptedImporter: - name: "\u9ED1\u6846b" spriteName: isGroup: 0 - parentIndex: 12 + parentIndex: 15 spriteID: 66ff11e6587d88f438a02d8315d05c19 layerID: 4737 mosaicPosition: {x: 0, y: 0} @@ -761,7 +665,7 @@ ScriptedImporter: - name: "\u9ED1\u6846A" spriteName: isGroup: 0 - parentIndex: 12 + parentIndex: 15 spriteID: fabba8e6b700ed140a2e21b7a177e2dd layerID: 4740 mosaicPosition: {x: 0, y: 0} @@ -771,7 +675,7 @@ ScriptedImporter: - name: "\u6309\u952E" spriteName: isGroup: 0 - parentIndex: 12 + parentIndex: 15 spriteID: 87e35084e356ef841a9aba68425fd486 layerID: 4727 mosaicPosition: {x: 0, y: 0} @@ -781,7 +685,7 @@ ScriptedImporter: - name: "\u6307\u9488\u6839\u90E8" spriteName: isGroup: 0 - parentIndex: 12 + parentIndex: 15 spriteID: 7f2ff54885782a04abf425aef992d401 layerID: 4398 mosaicPosition: {x: 0, y: 0} @@ -791,7 +695,7 @@ ScriptedImporter: - name: "\u6307\u9488" spriteName: isGroup: 0 - parentIndex: 12 + parentIndex: 15 spriteID: eb9c947e29316c2449369e362e7d8de1 layerID: 4400 mosaicPosition: {x: 0, y: 0} @@ -801,7 +705,7 @@ ScriptedImporter: - name: "\u8868 \u62F7\u8D1D" spriteName: isGroup: 0 - parentIndex: 12 + parentIndex: 15 spriteID: e0580630abace6040894c0b2e951d426 layerID: 4736 mosaicPosition: {x: 0, y: 0} @@ -811,7 +715,7 @@ ScriptedImporter: - name: "\u8F6C\u52A8\u6309\u94AE" spriteName: isGroup: 0 - parentIndex: 12 + parentIndex: 15 spriteID: cfea1b5709b98754384e2da129bd0151 layerID: 4730 mosaicPosition: {x: 0, y: 0} @@ -821,7 +725,7 @@ ScriptedImporter: - name: "\u6309\u952E\u5361\u6263\u7EC4" spriteName: isGroup: 1 - parentIndex: 5 + parentIndex: 8 spriteID: 1c81dc0a60c284a48af6784dfa501e1d layerID: 4364 mosaicPosition: {x: 0, y: 0} @@ -831,7 +735,7 @@ ScriptedImporter: - name: "\u4E0A\u4E0B\u5361\u6263" spriteName: isGroup: 0 - parentIndex: 21 + parentIndex: 24 spriteID: b3571b99277e9a146bb5c162ceea39ee layerID: 4144 mosaicPosition: {x: 0, y: 0} @@ -841,7 +745,7 @@ ScriptedImporter: - name: "\u5DE6\u53F3\u5361\u6263" spriteName: isGroup: 0 - parentIndex: 21 + parentIndex: 24 spriteID: 1ed2cb1cd868ae64a8dd1bafb7c3f45f layerID: 4119 mosaicPosition: {x: 0, y: 0} @@ -851,7 +755,7 @@ ScriptedImporter: - name: "\u5E9F\u6DB2 " spriteName: isGroup: 0 - parentIndex: 21 + parentIndex: 24 spriteID: 00cbe0ca3ac4270449f8ceb971b1a432 layerID: 4118 mosaicPosition: {x: 0, y: 0} @@ -861,7 +765,7 @@ ScriptedImporter: - name: "\u6CF5\u673A\u4E0A\u7684\u74F6\u5B50" spriteName: isGroup: 0 - parentIndex: 21 + parentIndex: 24 spriteID: 4a28ac4fd1ef61641908077affd00639 layerID: 4117 mosaicPosition: {x: 0, y: 0} @@ -871,7 +775,7 @@ ScriptedImporter: - name: "\u5F85\u62D3\u5C55\u6A21\u5757" spriteName: isGroup: 1 - parentIndex: 21 + parentIndex: 24 spriteID: 3c6861b926557f24796126853cdf48fa layerID: 4354 mosaicPosition: {x: 0, y: 0} @@ -881,7 +785,7 @@ ScriptedImporter: - name: "\u56FE\u5C42 670" spriteName: isGroup: 0 - parentIndex: 26 + parentIndex: 29 spriteID: 3410b3e7c7c854146a43d413f4882294 layerID: 4717 mosaicPosition: {x: 0, y: 0} @@ -891,7 +795,7 @@ ScriptedImporter: - name: "\u73BB\u7483\u7F69 \u62F7\u8D1D" spriteName: isGroup: 0 - parentIndex: 26 + parentIndex: 29 spriteID: a91e56a2a157fa642aad2f6b9da1720b layerID: 4273 mosaicPosition: {x: 0, y: 0} @@ -901,7 +805,7 @@ ScriptedImporter: - name: "\u6CF5\u673A\u7EC4\u4EF6I \u62F7\u8D1D" spriteName: isGroup: 0 - parentIndex: 26 + parentIndex: 29 spriteID: b92669f99e9ecb4439afd95a2a72a13d layerID: 4272 mosaicPosition: {x: 0, y: 0} @@ -911,7 +815,7 @@ ScriptedImporter: - name: "\u6CF5\u673A\u7EC4\u4EF6 \u62F7\u8D1D 2" spriteName: isGroup: 0 - parentIndex: 26 + parentIndex: 29 spriteID: 1725de7805b8b5a45872d5f35b0340a2 layerID: 4271 mosaicPosition: {x: 0, y: 0} @@ -921,7 +825,7 @@ ScriptedImporter: - name: "\u73BB\u7483\u7F69 " spriteName: isGroup: 0 - parentIndex: 26 + parentIndex: 29 spriteID: ceb13b7c3bd366d4fbe683e781c4bd3d layerID: 4141 mosaicPosition: {x: 0, y: 0} @@ -931,7 +835,7 @@ ScriptedImporter: - name: "\u6CF5\u673A\u7EC4\u4EF6I " spriteName: isGroup: 0 - parentIndex: 26 + parentIndex: 29 spriteID: 5268ffe6732185c4ba55bfbc1ef1098b layerID: 4140 mosaicPosition: {x: 0, y: 0} @@ -941,7 +845,7 @@ ScriptedImporter: - name: "\u6CF5\u673A\u7EC4\u4EF6 \u62F7\u8D1D" spriteName: isGroup: 0 - parentIndex: 26 + parentIndex: 29 spriteID: 328729fc274f8a44dae814021d1ee679 layerID: 4139 mosaicPosition: {x: 0, y: 0} @@ -951,7 +855,7 @@ ScriptedImporter: - name: "\u6DF7\u5408\u6DB2\u4F53" spriteName: isGroup: 0 - parentIndex: 26 + parentIndex: 29 spriteID: cd4a6d68fd75797498b38ce7f1e49967 layerID: 4274 mosaicPosition: {x: 0, y: 0} @@ -961,7 +865,7 @@ ScriptedImporter: - name: "\u6CF5\u673A\u5F00\u5173" spriteName: isGroup: 0 - parentIndex: 21 + parentIndex: 24 spriteID: 15a02a653d410f846a6dcd53840c48d0 layerID: 4591 mosaicPosition: {x: 0, y: 0} @@ -971,7 +875,7 @@ ScriptedImporter: - name: "\u5361\u6263\u5F00\u5173" spriteName: isGroup: 0 - parentIndex: 21 + parentIndex: 24 spriteID: d31e60af81653f54db8d33016e08162a layerID: 4344 mosaicPosition: {x: 0, y: 0} @@ -981,7 +885,7 @@ ScriptedImporter: - name: "\u6CF5\u673A\u5F00\u5173\u6309\u4E0B" spriteName: isGroup: 0 - parentIndex: 21 + parentIndex: 24 spriteID: 2bb898245078ce647af230f57a7b6dae layerID: 4928 mosaicPosition: {x: 0, y: 0} @@ -991,7 +895,7 @@ ScriptedImporter: - name: "\u5361\u6263\u5F00\u5173\u6309\u4E0B" spriteName: isGroup: 0 - parentIndex: 21 + parentIndex: 24 spriteID: a169d74c2bfcc7746aee87edf01bedbb layerID: 4927 mosaicPosition: {x: 0, y: 0} @@ -1001,7 +905,7 @@ ScriptedImporter: - name: "\u673A\u5668\u5E95\u56FE" spriteName: isGroup: 0 - parentIndex: 21 + parentIndex: 24 spriteID: 0fb76c3d38d668641a6f2d4e7f4307ff layerID: 4361 mosaicPosition: {x: 0, y: 0} @@ -1011,7 +915,7 @@ ScriptedImporter: - name: "\u6CF5\u673A\u7EC4" spriteName: isGroup: 1 - parentIndex: 5 + parentIndex: 8 spriteID: 98b40110c54be4e48a0ccb517a8d0c44 layerID: 4567 mosaicPosition: {x: 0, y: 0} @@ -1021,7 +925,7 @@ ScriptedImporter: - name: "\u6CF5" spriteName: isGroup: 1 - parentIndex: 40 + parentIndex: 43 spriteID: 2a32f51ba11437645a4be36995492399 layerID: 4587 mosaicPosition: {x: 0, y: 0} @@ -1031,7 +935,7 @@ ScriptedImporter: - name: "\u7F69\u5B50\u63CF\u8FB9" spriteName: isGroup: 0 - parentIndex: 41 + parentIndex: 44 spriteID: 5e17132d4347f9c4b92f87039ff89568 layerID: 4586 mosaicPosition: {x: 0, y: 0} @@ -1041,7 +945,7 @@ ScriptedImporter: - name: "\u7F69\u5B50" spriteName: isGroup: 0 - parentIndex: 41 + parentIndex: 44 spriteID: ee8ef0ebc221d164f9345e82c7e77a21 layerID: 4585 mosaicPosition: {x: 0, y: 0} @@ -1051,7 +955,7 @@ ScriptedImporter: - name: "\u6CF5\u673A\u7EC4\u4EF6a" spriteName: isGroup: 0 - parentIndex: 41 + parentIndex: 44 spriteID: c6eda028b9a2a4f4996f8891d70dad85 layerID: 4584 mosaicPosition: {x: 0, y: 0} @@ -1061,7 +965,7 @@ ScriptedImporter: - name: "\u6CF5\u673A\u7EC4\u4EF6b" spriteName: isGroup: 0 - parentIndex: 41 + parentIndex: 44 spriteID: 6363441772c90ae468bafbab781ec90a layerID: 4583 mosaicPosition: {x: 0, y: 0} @@ -1071,7 +975,7 @@ ScriptedImporter: - name: "\u6CF5\u673A\u8FD0\u4F5C\u65F6\u4EAE\u706F" spriteName: isGroup: 0 - parentIndex: 40 + parentIndex: 43 spriteID: 068e6763031883144accc1f9f94d0261 layerID: 4622 mosaicPosition: {x: 0, y: 0} @@ -1081,7 +985,7 @@ ScriptedImporter: - name: "\u9ED1\u5C4F" spriteName: isGroup: 0 - parentIndex: 40 + parentIndex: 43 spriteID: 381a5d390181c544b95215b4a126794f layerID: 4620 mosaicPosition: {x: 0, y: 0} @@ -1091,7 +995,7 @@ ScriptedImporter: - name: "\u684C\u9762\u5E95\u56FE" spriteName: isGroup: 0 - parentIndex: 40 + parentIndex: 43 spriteID: fcfc246183b8d324992ce5fd34cb2b9b layerID: 4563 mosaicPosition: {x: 0, y: 0} @@ -1101,7 +1005,7 @@ ScriptedImporter: - name: "\u51B7\u5374\u6DB2\u7EC4" spriteName: isGroup: 1 - parentIndex: 5 + parentIndex: 8 spriteID: 8d781af2c35f2f0468e2fa202c74ade9 layerID: 4366 mosaicPosition: {x: 0, y: 0} @@ -1111,7 +1015,7 @@ ScriptedImporter: - name: "\u74F6\u5B50a" spriteName: isGroup: 0 - parentIndex: 49 + parentIndex: 52 spriteID: 723af4d247ec19542a17b983198be480 layerID: 4133 mosaicPosition: {x: 0, y: 0} @@ -1121,7 +1025,7 @@ ScriptedImporter: - name: "\u74F6\u5B50b" spriteName: isGroup: 0 - parentIndex: 49 + parentIndex: 52 spriteID: 86aacfadb79d5a2498fa070098bbb5d4 layerID: 4135 mosaicPosition: {x: 0, y: 0} @@ -1131,7 +1035,7 @@ ScriptedImporter: - name: "\u74F6\u5B50c " spriteName: isGroup: 0 - parentIndex: 49 + parentIndex: 52 spriteID: f8c4bdc0f595f4a408a48603deab00f6 layerID: 4109 mosaicPosition: {x: 0, y: 0} @@ -1141,7 +1045,7 @@ ScriptedImporter: - name: "\u74F6\u5B50d" spriteName: isGroup: 0 - parentIndex: 49 + parentIndex: 52 spriteID: 0e6a840fa1298d74486101ba74e291ac layerID: 4597 mosaicPosition: {x: 0, y: 0} @@ -1151,7 +1055,7 @@ ScriptedImporter: - name: "\u74F6\u5B50e" spriteName: isGroup: 0 - parentIndex: 49 + parentIndex: 52 spriteID: 8bb864140315fe54997a1d6c1abb4296 layerID: 4596 mosaicPosition: {x: 0, y: 0} @@ -1161,7 +1065,7 @@ ScriptedImporter: - name: "\u74F6\u5B50f" spriteName: isGroup: 0 - parentIndex: 49 + parentIndex: 52 spriteID: 5e2125b4a0f0b1c41b730e5436017835 layerID: 4595 mosaicPosition: {x: 0, y: 0} @@ -1171,7 +1075,7 @@ ScriptedImporter: - name: F spriteName: isGroup: 0 - parentIndex: 49 + parentIndex: 52 spriteID: 1d59c6239f4ec3a478bab8f51cc6109f layerID: 4619 mosaicPosition: {x: 0, y: 0} @@ -1181,7 +1085,7 @@ ScriptedImporter: - name: E spriteName: isGroup: 0 - parentIndex: 49 + parentIndex: 52 spriteID: 831a7eeb5a763ef408f7875f2e3fbddf layerID: 4618 mosaicPosition: {x: 0, y: 0} @@ -1191,7 +1095,7 @@ ScriptedImporter: - name: D spriteName: isGroup: 0 - parentIndex: 49 + parentIndex: 52 spriteID: d5ea9182ebb3acd419e9cd1d21235530 layerID: 4617 mosaicPosition: {x: 0, y: 0} @@ -1201,7 +1105,7 @@ ScriptedImporter: - name: C spriteName: isGroup: 0 - parentIndex: 49 + parentIndex: 52 spriteID: 1e9648425edd72a42bbb233c035ba579 layerID: 4616 mosaicPosition: {x: 0, y: 0} @@ -1211,7 +1115,7 @@ ScriptedImporter: - name: B spriteName: isGroup: 0 - parentIndex: 49 + parentIndex: 52 spriteID: f8b500d14f641c646a392eb506afeeef layerID: 4615 mosaicPosition: {x: 0, y: 0} @@ -1221,7 +1125,7 @@ ScriptedImporter: - name: A spriteName: isGroup: 0 - parentIndex: 49 + parentIndex: 52 spriteID: d544711c1a31f474fbb27f3ac3371c8e layerID: 4614 mosaicPosition: {x: 0, y: 0} @@ -1231,7 +1135,7 @@ ScriptedImporter: - name: "\u684C\u9762\u5730\u56FE" spriteName: isGroup: 0 - parentIndex: 49 + parentIndex: 52 spriteID: 72d4c5cadf32c424ead202cb57900bac layerID: 4647 mosaicPosition: {x: 0, y: 0} @@ -1241,7 +1145,7 @@ ScriptedImporter: - name: "\u8FD1\u666F" spriteName: isGroup: 1 - parentIndex: 2 + parentIndex: 5 spriteID: 703787fa015814c48a3a3027208f3d14 layerID: 1484 mosaicPosition: {x: 0, y: 0} @@ -1251,7 +1155,7 @@ ScriptedImporter: - name: "\u684C\u4E0A\u6CF5" spriteName: isGroup: 1 - parentIndex: 63 + parentIndex: 66 spriteID: 3ae1fd3c8543f834e92d56ef0048c1e4 layerID: 4310 mosaicPosition: {x: 0, y: 0} @@ -1261,87 +1165,87 @@ ScriptedImporter: - name: "\u684C\u9762\u7F69\u5B50\u63CF\u8FB9" spriteName: "\u684C\u9762\u7F69\u5B50\u63CF\u8FB9" isGroup: 0 - parentIndex: 64 + parentIndex: 67 spriteID: afa6baf9ac620be41b97c6ca992c9e6f layerID: 4303 - mosaicPosition: {x: 9032, y: 3347} + mosaicPosition: {x: 7235, y: 2863} flatten: 0 isImported: 1 isVisible: 1 - name: "\u684C\u9762\u7F69\u5B50" spriteName: "\u684C\u9762\u7F69\u5B50" isGroup: 0 - parentIndex: 64 + parentIndex: 67 spriteID: d6f4a20ac2f34ca419c5597eb1d9412c layerID: 4300 - mosaicPosition: {x: 9796, y: 3347} + mosaicPosition: {x: 7235, y: 3412} flatten: 0 isImported: 1 isVisible: 1 - name: "\u6CF5\u673A\u7EC4\u4EF6a" spriteName: "\u6CF5\u673A\u7EC4\u4EF6a" isGroup: 0 - parentIndex: 64 - spriteID: 411373c8e1da70e4388083d8c9713c90 + parentIndex: 67 + spriteID: c6eda028b9a2a4f4996f8891d70dad85 layerID: 4306 - mosaicPosition: {x: 15573, y: 3025} + mosaicPosition: {x: 7732, y: 3244} flatten: 0 isImported: 1 isVisible: 1 - name: "\u684C\u9762\u6CF5\u673A\u906E\u7F69" spriteName: "\u684C\u9762\u6CF5\u673A\u906E\u7F69" isGroup: 0 - parentIndex: 64 + parentIndex: 67 spriteID: ae4fb1e78a413fe4aa30181741fd6389 - layerID: 4936 - mosaicPosition: {x: 13377, y: 2629} + layerID: 5025 + mosaicPosition: {x: 7722, y: 3412} flatten: 0 isImported: 1 isVisible: 1 - name: "\u6CF5\u673A\u7EC4\u4EF6b" spriteName: "\u6CF5\u673A\u7EC4\u4EF6b" isGroup: 0 - parentIndex: 64 - spriteID: 71b6e75ad93ff924e83d4b54c883858d + parentIndex: 67 + spriteID: 6363441772c90ae468bafbab781ec90a layerID: 4307 - mosaicPosition: {x: 14569, y: 2629} + mosaicPosition: {x: 7732, y: 2863} flatten: 0 isImported: 1 isVisible: 1 - name: "\u684C\u9762\u6CF5\u673A\u8FD0\u4F5C\u65F6\u4EAE\u706F" spriteName: "\u684C\u9762\u6CF5\u673A\u8FD0\u4F5C\u65F6\u4EAE\u706F" isGroup: 0 - parentIndex: 63 + parentIndex: 66 spriteID: 8b886be0d4dc69e4bbb860267b345302 layerID: 4621 - mosaicPosition: {x: 15170, y: 3025} + mosaicPosition: {x: 7235, y: 3957} flatten: 0 isImported: 1 isVisible: 1 - name: "\u684C\u9762\u9ED1\u5C4F" spriteName: "\u684C\u9762\u9ED1\u5C4F" isGroup: 0 - parentIndex: 63 + parentIndex: 66 spriteID: 7897ed12f592c9047b0a804941a55c45 layerID: 4877 - mosaicPosition: {x: 15170, y: 3139} + mosaicPosition: {x: 7385, y: 3957} flatten: 0 isImported: 1 isVisible: 1 - name: "\u684C" spriteName: "\u684C" isGroup: 0 - parentIndex: 63 + parentIndex: 66 spriteID: 7afaecef594b05342b0945b11fcc6388 layerID: 1976 - mosaicPosition: {x: 4, y: 3347} + mosaicPosition: {x: 4, y: 2172} flatten: 0 isImported: 1 isVisible: 1 - name: "\u4EBA\u7269" spriteName: isGroup: 1 - parentIndex: 2 + parentIndex: 5 spriteID: 06315b990315ef546847f5e765a35910 layerID: 171 mosaicPosition: {x: 0, y: 0} @@ -1351,7 +1255,7 @@ ScriptedImporter: - name: "\u4F69\u4F69" spriteName: isGroup: 1 - parentIndex: 73 + parentIndex: 76 spriteID: 78da49119eb0e7f4faaebc113abceabd layerID: 3835 mosaicPosition: {x: 0, y: 0} @@ -1361,7 +1265,7 @@ ScriptedImporter: - name: "\u4F69\u4F69\u6362\u6DB2\u8BBE\u5907" spriteName: isGroup: 1 - parentIndex: 74 + parentIndex: 77 spriteID: aaf69b738a32dad4b8e2005c4dee6816 layerID: 4329 mosaicPosition: {x: 0, y: 0} @@ -1371,7 +1275,7 @@ ScriptedImporter: - name: "\u7BA1\u5B50" spriteName: isGroup: 0 - parentIndex: 75 + parentIndex: 78 spriteID: 0041f8a0469ce7044b8247f100e56c74 layerID: 4332 mosaicPosition: {x: 0, y: 0} @@ -1381,7 +1285,7 @@ ScriptedImporter: - name: "\u6362\u6DB2\u8BBE\u5907" spriteName: isGroup: 0 - parentIndex: 75 + parentIndex: 78 spriteID: 2644bcfff31ffa241a91425aace0cfbc layerID: 4325 mosaicPosition: {x: 0, y: 0} @@ -1391,17 +1295,17 @@ ScriptedImporter: - name: "\u4F69\u4F69\u8868\u60C5" spriteName: isGroup: 1 - parentIndex: 74 + parentIndex: 77 spriteID: e4314ef6a95a56d4cbe413de73d82058 layerID: 4429 mosaicPosition: {x: 0, y: 0} flatten: 0 isImported: 0 - isVisible: 0 + isVisible: 1 - name: "\u95ED\u773C" spriteName: isGroup: 0 - parentIndex: 78 + parentIndex: 81 spriteID: 66b5c73cd17a6a44ab12b917cbe366ab layerID: 4884 mosaicPosition: {x: 0, y: 0} @@ -1411,7 +1315,7 @@ ScriptedImporter: - name: "\u5FAE\u7B11" spriteName: isGroup: 0 - parentIndex: 78 + parentIndex: 81 spriteID: 33175c17463e2214c86876a5d2947c75 layerID: 4437 mosaicPosition: {x: 0, y: 0} @@ -1421,17 +1325,27 @@ ScriptedImporter: - name: "\u5634\u5DF4\u7B11" spriteName: isGroup: 0 - parentIndex: 78 + parentIndex: 81 spriteID: 0f454dffacfe1ec438d61ea8ba8492e7 layerID: 4456 mosaicPosition: {x: 0, y: 0} flatten: 0 isImported: 0 isVisible: 1 + - name: "\u4E0D\u5F00\u5FC3" + spriteName: + isGroup: 0 + parentIndex: 81 + spriteID: e6a867d3b1190264987dbfc152d962b9 + layerID: 5010 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 - name: "\u4F69\u4F69\u52A8\u4F5C" spriteName: isGroup: 1 - parentIndex: 74 + parentIndex: 77 spriteID: 169d8c1a37bc7da4f854ae77f3d9ff90 layerID: 4750 mosaicPosition: {x: 0, y: 0} @@ -1441,7 +1355,7 @@ ScriptedImporter: - name: "\u753B\u753B\u52A8\u4F5C" spriteName: isGroup: 0 - parentIndex: 82 + parentIndex: 86 spriteID: 961cdc2500e8da84e94d473d9b5f71d5 layerID: 3082 mosaicPosition: {x: 0, y: 0} @@ -1451,7 +1365,7 @@ ScriptedImporter: - name: "\u5782\u624B" spriteName: isGroup: 0 - parentIndex: 74 + parentIndex: 77 spriteID: 16bf6c56291ffe24badbdbcb865c042b layerID: 4423 mosaicPosition: {x: 0, y: 0} @@ -1461,17 +1375,17 @@ ScriptedImporter: - name: "\u77F3\u5934" spriteName: isGroup: 1 - parentIndex: 73 + parentIndex: 76 spriteID: 62dd90536e9f8834cbd4fc5517fd3df9 layerID: 3129 mosaicPosition: {x: 0, y: 0} flatten: 0 isImported: 0 - isVisible: 1 + isVisible: 0 - name: "\u77F3\u5934\u6362\u6DB2\u8BBE\u5907" spriteName: isGroup: 1 - parentIndex: 85 + parentIndex: 89 spriteID: d9cfcfafb49c5a64c9dced846d71ab1d layerID: 4551 mosaicPosition: {x: 0, y: 0} @@ -1479,59 +1393,79 @@ ScriptedImporter: isImported: 0 isVisible: 1 - name: "\u7BA1\u5B50" - spriteName: "\u7BA1\u5B50" + spriteName: isGroup: 0 - parentIndex: 86 - spriteID: 849d9124528056c47955f41ba7a01605 + parentIndex: 90 + spriteID: 0041f8a0469ce7044b8247f100e56c74 layerID: 4550 - mosaicPosition: {x: 10542, y: 3347} + mosaicPosition: {x: 0, y: 0} flatten: 0 - isImported: 1 + isImported: 0 isVisible: 1 - name: "\u6362\u6DB2\u8BBE\u5907" - spriteName: "\u6362\u6DB2\u8BBE\u5907" + spriteName: isGroup: 0 - parentIndex: 86 - spriteID: 70ad330e45088ab4aac40a7752b3dc7e + parentIndex: 90 + spriteID: 2644bcfff31ffa241a91425aace0cfbc layerID: 4549 - mosaicPosition: {x: 13987, y: 2629} + mosaicPosition: {x: 0, y: 0} flatten: 0 - isImported: 1 + isImported: 0 isVisible: 1 - name: "\u77F3\u5934\u8868\u60C5" spriteName: isGroup: 1 - parentIndex: 85 + parentIndex: 89 spriteID: 0848d32c346258c46b77e8d5673e7325 layerID: 4465 mosaicPosition: {x: 0, y: 0} flatten: 0 isImported: 0 isVisible: 1 - - name: "\u601D\u7D22\u8D70\u795E" - spriteName: "\u601D\u7D22\u8D70\u795E" + - name: "\u77F3\u5934\u95ED\u773C" + spriteName: isGroup: 0 - parentIndex: 89 - spriteID: 011849e1953f10947809d9c264777e81 - layerID: 4472 - mosaicPosition: {x: 15170, y: 2629} + parentIndex: 93 + spriteID: 4b515fecf4287c242a3055b1123f457b + layerID: 5009 + mosaicPosition: {x: 0, y: 0} flatten: 0 - isImported: 1 + isImported: 0 isVisible: 1 - name: "\u6B63\u5E38\u5FAE\u5FAE\u7B11" spriteName: "\u6B63\u5E38\u5FAE\u5FAE\u7B11" isGroup: 0 - parentIndex: 89 + parentIndex: 93 spriteID: 7809c728ed9ff1a499326df1839c5a1f layerID: 4467 - mosaicPosition: {x: 15573, y: 2629} + mosaicPosition: {x: 13759, y: 4408} flatten: 0 - isImported: 1 + isImported: 0 + isVisible: 1 + - name: "\u601D\u7D22\u8D70\u795E" + spriteName: "\u601D\u7D22\u8D70\u795E" + isGroup: 0 + parentIndex: 93 + spriteID: 011849e1953f10947809d9c264777e81 + layerID: 4472 + mosaicPosition: {x: 13356, y: 4408} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u5927\u7B11" + spriteName: + isGroup: 0 + parentIndex: 93 + spriteID: 73a5566145ade3542a474556cef54556 + layerID: 4995 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 isVisible: 1 - name: "\u77F3\u5934\u52A8\u4F5C" spriteName: isGroup: 1 - parentIndex: 85 + parentIndex: 89 spriteID: 2052561990c216844817e3cdef1e2df6 layerID: 4752 mosaicPosition: {x: 0, y: 0} @@ -1541,7 +1475,7 @@ ScriptedImporter: - name: "\u6478\u5934" spriteName: isGroup: 0 - parentIndex: 92 + parentIndex: 98 spriteID: b974b37d1e7877244875a232e9c6b37b layerID: 3966 mosaicPosition: {x: 0, y: 0} @@ -1551,8 +1485,8 @@ ScriptedImporter: - name: "\u77F3\u5934" spriteName: isGroup: 1 - parentIndex: 85 - spriteID: 0585e5756b0ec354f8f04218171eb215 + parentIndex: 89 + spriteID: 62dd90536e9f8834cbd4fc5517fd3df9 layerID: 3185 mosaicPosition: {x: 0, y: 0} flatten: 0 @@ -1561,27 +1495,27 @@ ScriptedImporter: - name: "\u524D\u53F3\u624B" spriteName: "\u524D\u53F3\u624B" isGroup: 0 - parentIndex: 94 + parentIndex: 100 spriteID: af7a6904172df1d4caccd3d00d088605 layerID: 4260 - mosaicPosition: {x: 4, y: 5505} + mosaicPosition: {x: 15765, y: 4} flatten: 0 - isImported: 1 + isImported: 0 isVisible: 1 - name: "\u77F3\u5934" spriteName: "\u77F3\u5934" isGroup: 0 - parentIndex: 94 + parentIndex: 100 spriteID: 7e500db015e68d542b883749ec674aa9 layerID: 4261 - mosaicPosition: {x: 11767, y: 4} + mosaicPosition: {x: 4, y: 4408} flatten: 0 - isImported: 1 + isImported: 0 isVisible: 1 - name: "\u80CC\u666F" spriteName: isGroup: 1 - parentIndex: 2 + parentIndex: 5 spriteID: d582773d6dcf1cb40821f34ffc48a28f layerID: 2090 mosaicPosition: {x: 0, y: 0} @@ -1591,17 +1525,17 @@ ScriptedImporter: - name: "\u5E18\u5B50" spriteName: "\u5E18\u5B50" isGroup: 0 - parentIndex: 97 + parentIndex: 103 spriteID: 30ecba081eac70440bfac7a7959ef31e layerID: 4867 - mosaicPosition: {x: 9032, y: 4} + mosaicPosition: {x: 5854, y: 4} flatten: 0 isImported: 1 isVisible: 1 - name: "\u623F\u95F4\u5185" spriteName: "\u623F\u95F4\u5185" isGroup: 0 - parentIndex: 97 + parentIndex: 103 spriteID: ce0820a62e9a1e8499ebcccec53b565f layerID: 3813 mosaicPosition: {x: 4, y: 4} @@ -1621,57 +1555,69 @@ ScriptedImporter: - name: "\u7A97\u6846" spriteName: "\u7A97\u6846" isGroup: 0 - parentIndex: 100 + parentIndex: 106 spriteID: df8833565709d2043ab02243abb14b3a layerID: 3970 - mosaicPosition: {x: 13377, y: 1416} + mosaicPosition: {x: 1957, y: 2863} flatten: 0 isImported: 1 isVisible: 1 - name: "\u51B0\u971C" spriteName: "\u51B0\u971C" isGroup: 0 - parentIndex: 100 + parentIndex: 106 spriteID: fd6e3bf8757d8784c961b67ac3f55a9a layerID: 2394 - mosaicPosition: {x: 4, y: 4408} + mosaicPosition: {x: 3777, y: 2863} flatten: 0 isImported: 1 isVisible: 1 - name: "\u5915\u9633" - spriteName: + spriteName: "\u5915\u9633" isGroup: 0 - parentIndex: 100 + parentIndex: 106 spriteID: 8561221dcea436b4d8cc0439d0c8ac58 layerID: 3962 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 9032, y: 4} flatten: 0 isImported: 0 isVisible: 0 - name: "\u96EA" spriteName: "\u96EA" isGroup: 0 - parentIndex: 100 + parentIndex: 106 spriteID: d36bb45080605af44ad1d30a1ae5b069 layerID: 2449 - mosaicPosition: {x: 13377, y: 4} + mosaicPosition: {x: 4, y: 2863} flatten: 0 isImported: 1 isVisible: 1 - name: "\u591C\u665A" spriteName: "\u591C\u665A" isGroup: 0 - parentIndex: 100 + parentIndex: 106 spriteID: 413093f8377e48042825bd7ee5b637dd layerID: 2822 - mosaicPosition: {x: 2668, y: 4408} + mosaicPosition: {x: 5506, y: 2863} flatten: 0 isImported: 1 isVisible: 1 sharedRigPSDLayers: [] - pSDLayerImportSetting: [] + pSDLayerImportSetting: + - spriteId: 7204e7e570a3d4d49ba780a8704e17b7 + name: "UF\u773C\u775B\u7279\u5199" + layerId: 4966 + flatten: 0 + isGroup: 0 + importLayer: 0 + - spriteId: 8dc989a93ac048f41a98b15e98d33728 + name: "\u5BF9\u8BDD\u6846\u53C2\u8003" + layerId: 4952 + flatten: 0 + isGroup: 0 + importLayer: 0 importFileNodeState: 1 - platformSettingsDirtyTick: 638702238088597881 + platformSettingsDirtyTick: 638707663994218387 spriteSizeExpandChanged: 0 generateGOHierarchy: 1 textureAssetName: diff --git a/Assets/Resources/Art/Character/Peipei/佩佩-4K.psb b/Assets/Resources/Art/Character/Peipei/佩佩-4K.psb new file mode 100644 index 000000000..d42800850 --- /dev/null +++ b/Assets/Resources/Art/Character/Peipei/佩佩-4K.psb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2421885bac52dfb6575796e365cbc8383a4097cbbdc95d28a771834bb5654f6 +size 5058716 diff --git a/Assets/Resources/Characters/佩佩.psb.meta b/Assets/Resources/Art/Character/Peipei/佩佩-4K.psb.meta similarity index 85% rename from Assets/Resources/Characters/佩佩.psb.meta rename to Assets/Resources/Art/Character/Peipei/佩佩-4K.psb.meta index 91b974505..df8a78e6d 100644 --- a/Assets/Resources/Characters/佩佩.psb.meta +++ b/Assets/Resources/Art/Character/Peipei/佩佩-4K.psb.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7d6a918e16020614cb2713d3035203d9 +guid: 42e853dad9e30be4e9dc2afd08b0ee55 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} @@ -35,7 +35,7 @@ ScriptedImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 200 + spritePixelsToUnits: 215 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 0 generateCubemap: 6 @@ -105,7 +105,7 @@ ScriptedImporter: y: 837 width: 301 height: 478 - spriteID: 5ff657918905b3347982bd265943934b + spriteID: 7aac71a2d567f5f49b370c280902d0de spriteBone: [] spriteOutline: [] vertices: [] @@ -126,7 +126,7 @@ ScriptedImporter: y: 429 width: 361 height: 400 - spriteID: df7ea6ea89764e44e920ea7c23c2cf31 + spriteID: 093b357bb85963b479679bc467bbf343 spriteBone: [] spriteOutline: [] vertices: [] @@ -147,7 +147,7 @@ ScriptedImporter: y: 1911 width: 292 height: 132 - spriteID: f8503d351278f0b4eadabf8b6de21455 + spriteID: 67dc6f8208dd8a442bba49730aa9f7f2 spriteBone: [] spriteOutline: [] vertices: [] @@ -168,7 +168,7 @@ ScriptedImporter: y: 1624 width: 330 height: 279 - spriteID: 43444ae3d88d12c479d0b1f066ed541f + spriteID: 7dc0a4f646d9610479355d43491de8d3 spriteBone: [] spriteOutline: [] vertices: [] @@ -189,7 +189,7 @@ ScriptedImporter: y: 1869 width: 75 height: 49 - spriteID: 37a81dd7f7793334a8c148665d98d94c + spriteID: faf9cf13ee742f34db7ceab126fc27ef spriteBone: [] spriteOutline: [] vertices: [] @@ -210,7 +210,7 @@ ScriptedImporter: y: 1323 width: 347 height: 293 - spriteID: 4ab86294501fd534d82ffabcc7d05bac + spriteID: c25c2427a437b644981696b533111a0a spriteBone: [] spriteOutline: [] vertices: [] @@ -220,6 +220,27 @@ ScriptedImporter: tessellationDetail: 0 uvTransform: {x: 712, y: 1323} spritePosition: {x: 1907, y: 1220} + - name: "\u65E0\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: 1012 + y: 1911 + width: 0 + height: 0 + spriteID: 11cbcb0df6a09be459b60721825072d1 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1012, y: 1911} + spritePosition: {x: 0, y: 2160} - name: "\u753B\u753B\u52A8\u4F5C" originalName: pivot: {x: 0.5, y: 0.5} @@ -231,7 +252,7 @@ ScriptedImporter: y: 4 width: 963 height: 417 - spriteID: 2c3a65da5119f394794439c03b844707 + spriteID: 2c195a970a2a814438822f6ae7122f6a spriteBone: [] spriteOutline: [] vertices: [] @@ -252,7 +273,7 @@ ScriptedImporter: y: 4 width: 700 height: 1857 - spriteID: 7c8739ae35022bb4695845fa81c4beb3 + spriteID: 0137379654f28ba4a898c70e55bc0a8b spriteBone: [] spriteOutline: [] vertices: [] @@ -281,7 +302,7 @@ ScriptedImporter: - name: DefaultTexturePlatform overridden: 0 ignorePlatformSupport: 0 - maxTextureSize: 2048 + maxTextureSize: 8192 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -360,7 +381,7 @@ ScriptedImporter: spriteName: isGroup: 1 parentIndex: -1 - spriteID: 8862426db09b46c44a4b59fe089e43ce + spriteID: 21d06c1d654c3b8499cb0377337799e8 layerID: 3835 mosaicPosition: {x: 0, y: 0} flatten: 0 @@ -370,7 +391,7 @@ ScriptedImporter: spriteName: isGroup: 1 parentIndex: 0 - spriteID: 0ba35533c078ba24ba16ec97743b5836 + spriteID: a4ba9d4dc100fae438821b3535cdc483 layerID: 4329 mosaicPosition: {x: 0, y: 0} flatten: 0 @@ -380,7 +401,7 @@ ScriptedImporter: spriteName: "\u7BA1\u5B50" isGroup: 0 parentIndex: 1 - spriteID: 5ff657918905b3347982bd265943934b + spriteID: 7aac71a2d567f5f49b370c280902d0de layerID: 4332 mosaicPosition: {x: 712, y: 837} flatten: 0 @@ -390,7 +411,7 @@ ScriptedImporter: spriteName: "\u6362\u6DB2\u8BBE\u5907" isGroup: 0 parentIndex: 1 - spriteID: df7ea6ea89764e44e920ea7c23c2cf31 + spriteID: 093b357bb85963b479679bc467bbf343 layerID: 4325 mosaicPosition: {x: 712, y: 429} flatten: 0 @@ -400,7 +421,7 @@ ScriptedImporter: spriteName: isGroup: 1 parentIndex: 0 - spriteID: c1741b854d7128d479375fad4d2f3676 + spriteID: d0a0df983b648f644978d53f919d54de layerID: 4429 mosaicPosition: {x: 0, y: 0} flatten: 0 @@ -410,7 +431,7 @@ ScriptedImporter: spriteName: "\u95ED\u773C" isGroup: 0 parentIndex: 4 - spriteID: f8503d351278f0b4eadabf8b6de21455 + spriteID: 67dc6f8208dd8a442bba49730aa9f7f2 layerID: 4884 mosaicPosition: {x: 712, y: 1911} flatten: 0 @@ -420,7 +441,7 @@ ScriptedImporter: spriteName: "\u5FAE\u7B11" isGroup: 0 parentIndex: 4 - spriteID: 43444ae3d88d12c479d0b1f066ed541f + spriteID: 7dc0a4f646d9610479355d43491de8d3 layerID: 4437 mosaicPosition: {x: 712, y: 1624} flatten: 0 @@ -430,7 +451,7 @@ ScriptedImporter: spriteName: "\u5634\u5DF4\u7B11" isGroup: 0 parentIndex: 4 - spriteID: 37a81dd7f7793334a8c148665d98d94c + spriteID: faf9cf13ee742f34db7ceab126fc27ef layerID: 4456 mosaicPosition: {x: 4, y: 1869} flatten: 0 @@ -440,7 +461,7 @@ ScriptedImporter: spriteName: "\u4E0D\u5F00\u5FC3" isGroup: 0 parentIndex: 4 - spriteID: 4ab86294501fd534d82ffabcc7d05bac + spriteID: c25c2427a437b644981696b533111a0a layerID: 5010 mosaicPosition: {x: 712, y: 1323} flatten: 0 @@ -450,17 +471,27 @@ ScriptedImporter: spriteName: isGroup: 1 parentIndex: 0 - spriteID: 41b415c24753e704182b5d7114fdf6a8 + spriteID: 7e0d8565306108d4e826ed36e4d46444 layerID: 4750 mosaicPosition: {x: 0, y: 0} flatten: 0 isImported: 0 isVisible: 1 + - name: "\u65E0\u52A8\u4F5C" + spriteName: "\u65E0\u52A8\u4F5C" + isGroup: 0 + parentIndex: 9 + spriteID: 11cbcb0df6a09be459b60721825072d1 + layerID: 5023 + mosaicPosition: {x: 1012, y: 1911} + flatten: 0 + isImported: 1 + isVisible: 1 - name: "\u753B\u753B\u52A8\u4F5C" spriteName: "\u753B\u753B\u52A8\u4F5C" isGroup: 0 parentIndex: 9 - spriteID: 2c3a65da5119f394794439c03b844707 + spriteID: 2c195a970a2a814438822f6ae7122f6a layerID: 3082 mosaicPosition: {x: 712, y: 4} flatten: 0 @@ -470,7 +501,7 @@ ScriptedImporter: spriteName: "\u5782\u624B" isGroup: 0 parentIndex: 0 - spriteID: 7c8739ae35022bb4695845fa81c4beb3 + spriteID: 0137379654f28ba4a898c70e55bc0a8b layerID: 4423 mosaicPosition: {x: 4, y: 4} flatten: 0 @@ -479,9 +510,9 @@ ScriptedImporter: sharedRigPSDLayers: [] pSDLayerImportSetting: [] importFileNodeState: 1 - platformSettingsDirtyTick: 0 + platformSettingsDirtyTick: 638707677062964496 spriteSizeExpandChanged: 0 - generateGOHierarchy: 0 + generateGOHierarchy: 1 textureAssetName: prefabAssetName: spriteLibAssetName: diff --git a/Assets/Resources/Art/Character/Stone/石头-4K.psb b/Assets/Resources/Art/Character/Stone/石头-4K.psb new file mode 100644 index 000000000..c82a884cb --- /dev/null +++ b/Assets/Resources/Art/Character/Stone/石头-4K.psb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8f964eb2aedc065fd8375ee54d3b4f7306e9573839d8c3bb9aab2cfcdb340df +size 6190031 diff --git a/Assets/Resources/Characters/石头.psb.meta b/Assets/Resources/Art/Character/Stone/石头-4K.psb.meta similarity index 87% rename from Assets/Resources/Characters/石头.psb.meta rename to Assets/Resources/Art/Character/Stone/石头-4K.psb.meta index 657bfedb9..e5736c326 100644 --- a/Assets/Resources/Characters/石头.psb.meta +++ b/Assets/Resources/Art/Character/Stone/石头-4K.psb.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6fdcdcbb0ac7428489630aab7f76a33b +guid: a2bc22f41acbae14d8f40ae12d2abb6a ScriptedImporter: internalIDToNameTable: [] externalObjects: {} @@ -35,7 +35,7 @@ ScriptedImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 200 + spritePixelsToUnits: 215 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 0 generateCubemap: 6 @@ -105,7 +105,7 @@ ScriptedImporter: y: 2799 width: 286 height: 490 - spriteID: 0c53e782b3912634b9535f72b3d4d697 + spriteID: 48287ef2386cf3243846de68d78455ab spriteBone: [] spriteOutline: [] vertices: [] @@ -126,7 +126,7 @@ ScriptedImporter: y: 3308 width: 373 height: 398 - spriteID: f45023624212c234ea8d9de1285b2634 + spriteID: 2478c895e722d804395d8b8683db4b87 spriteBone: [] spriteOutline: [] vertices: [] @@ -147,7 +147,7 @@ ScriptedImporter: y: 3714 width: 361 height: 302 - spriteID: 836f3d4d7ac750d4f9fd08cc3d6c3e84 + spriteID: 0a5b9622a070d1f4bb638cd8c19bbb6f spriteBone: [] spriteOutline: [] vertices: [] @@ -168,7 +168,7 @@ ScriptedImporter: y: 3714 width: 257 height: 252 - spriteID: 5a3ec02baaa77a54bbfdc12783488238 + spriteID: 480b9a7196975ae49ba441af5ba08c3b spriteBone: [] spriteOutline: [] vertices: [] @@ -189,7 +189,7 @@ ScriptedImporter: y: 3308 width: 257 height: 252 - spriteID: a8d6b0e19be59a74a99d6a64801ab91d + spriteID: 0b33e22b657e4534caed9b052d3365e2 spriteBone: [] spriteOutline: [] vertices: [] @@ -210,7 +210,7 @@ ScriptedImporter: y: 2799 width: 361 height: 501 - spriteID: a0d5b1a1615688c4f92b4cc44db8e9ab + spriteID: 4146b513f6930924ba5fe30afe847050 spriteBone: [] spriteOutline: [] vertices: [] @@ -231,7 +231,7 @@ ScriptedImporter: y: 1899 width: 703 height: 892 - spriteID: 40941f331ae96ec4598adf25fc111a05 + spriteID: 7d99c7bdaa0b0f7468bc477fbd9f7c88 spriteBone: [] spriteOutline: [] vertices: [] @@ -252,7 +252,7 @@ ScriptedImporter: y: 2799 width: 334 height: 1237 - spriteID: 7844b22869d43f142bc5569e275ecffb + spriteID: aeaa86d1d6a2d5a4181237e9c46bd999 spriteBone: [] spriteOutline: [] vertices: [] @@ -273,7 +273,7 @@ ScriptedImporter: y: 4 width: 1039 height: 1887 - spriteID: 6a92284c8c7dca147a206973206deb58 + spriteID: 4f96baceb70251e48bc9e1c0f8accfa6 spriteBone: [] spriteOutline: [] vertices: [] @@ -302,7 +302,7 @@ ScriptedImporter: - name: DefaultTexturePlatform overridden: 0 ignorePlatformSupport: 0 - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -374,24 +374,14 @@ ScriptedImporter: spriteCategoryList: categories: [] spritePackingTag: - resliceFromLayer: 0 + resliceFromLayer: 1 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 + parentIndex: -1 + spriteID: eb60806d7c4997f468affe355dbc21b1 layerID: 4551 mosaicPosition: {x: 0, y: 0} flatten: 0 @@ -400,8 +390,8 @@ ScriptedImporter: - name: "\u7BA1\u5B50" spriteName: "\u7BA1\u5B50" isGroup: 0 - parentIndex: 1 - spriteID: 0c53e782b3912634b9535f72b3d4d697 + parentIndex: 0 + spriteID: 48287ef2386cf3243846de68d78455ab layerID: 4550 mosaicPosition: {x: 715, y: 2799} flatten: 0 @@ -410,8 +400,8 @@ ScriptedImporter: - name: "\u6362\u6DB2\u8BBE\u5907" spriteName: "\u6362\u6DB2\u8BBE\u5907" isGroup: 0 - parentIndex: 1 - spriteID: f45023624212c234ea8d9de1285b2634 + parentIndex: 0 + spriteID: 2478c895e722d804395d8b8683db4b87 layerID: 4549 mosaicPosition: {x: 346, y: 3308} flatten: 0 @@ -420,8 +410,8 @@ ScriptedImporter: - name: "\u77F3\u5934\u8868\u60C5" spriteName: isGroup: 1 - parentIndex: 0 - spriteID: dfe5690bbeef4b54ea7f1d398e668fc5 + parentIndex: -1 + spriteID: 687d17a75dbafbc4897872b13fec63ea layerID: 4465 mosaicPosition: {x: 0, y: 0} flatten: 0 @@ -430,8 +420,8 @@ ScriptedImporter: - name: "\u77F3\u5934\u95ED\u773C" spriteName: "\u77F3\u5934\u95ED\u773C" isGroup: 0 - parentIndex: 4 - spriteID: 836f3d4d7ac750d4f9fd08cc3d6c3e84 + parentIndex: 3 + spriteID: 0a5b9622a070d1f4bb638cd8c19bbb6f layerID: 5009 mosaicPosition: {x: 346, y: 3714} flatten: 0 @@ -440,8 +430,8 @@ ScriptedImporter: - name: "\u6B63\u5E38\u5FAE\u5FAE\u7B11" spriteName: "\u6B63\u5E38\u5FAE\u5FAE\u7B11" isGroup: 0 - parentIndex: 4 - spriteID: 5a3ec02baaa77a54bbfdc12783488238 + parentIndex: 3 + spriteID: 480b9a7196975ae49ba441af5ba08c3b layerID: 4467 mosaicPosition: {x: 715, y: 3714} flatten: 0 @@ -450,8 +440,8 @@ ScriptedImporter: - name: "\u601D\u7D22\u8D70\u795E" spriteName: "\u601D\u7D22\u8D70\u795E" isGroup: 0 - parentIndex: 4 - spriteID: a8d6b0e19be59a74a99d6a64801ab91d + parentIndex: 3 + spriteID: 0b33e22b657e4534caed9b052d3365e2 layerID: 4472 mosaicPosition: {x: 727, y: 3308} flatten: 0 @@ -460,8 +450,8 @@ ScriptedImporter: - name: "\u5927\u7B11" spriteName: "\u5927\u7B11" isGroup: 0 - parentIndex: 4 - spriteID: a0d5b1a1615688c4f92b4cc44db8e9ab + parentIndex: 3 + spriteID: 4146b513f6930924ba5fe30afe847050 layerID: 4995 mosaicPosition: {x: 346, y: 2799} flatten: 0 @@ -470,8 +460,8 @@ ScriptedImporter: - name: "\u77F3\u5934\u52A8\u4F5C" spriteName: isGroup: 1 - parentIndex: 0 - spriteID: d6767e8474622a34886829938eb66dcf + parentIndex: -1 + spriteID: 9a8c2451ef8f6244f82a183aeff4a2d3 layerID: 4752 mosaicPosition: {x: 0, y: 0} flatten: 0 @@ -480,8 +470,8 @@ ScriptedImporter: - name: "\u6478\u5934" spriteName: "\u6478\u5934" isGroup: 0 - parentIndex: 9 - spriteID: 40941f331ae96ec4598adf25fc111a05 + parentIndex: 8 + spriteID: 7d99c7bdaa0b0f7468bc477fbd9f7c88 layerID: 3966 mosaicPosition: {x: 4, y: 1899} flatten: 0 @@ -490,8 +480,8 @@ ScriptedImporter: - name: "\u524D\u53F3\u624B" spriteName: "\u524D\u53F3\u624B" isGroup: 0 - parentIndex: 9 - spriteID: 7844b22869d43f142bc5569e275ecffb + parentIndex: 8 + spriteID: aeaa86d1d6a2d5a4181237e9c46bd999 layerID: 4260 mosaicPosition: {x: 4, y: 2799} flatten: 0 @@ -500,8 +490,8 @@ ScriptedImporter: - name: "\u77F3\u5934" spriteName: "\u77F3\u5934" isGroup: 0 - parentIndex: 0 - spriteID: 6a92284c8c7dca147a206973206deb58 + parentIndex: -1 + spriteID: 4f96baceb70251e48bc9e1c0f8accfa6 layerID: 4261 mosaicPosition: {x: 4, y: 4} flatten: 0 @@ -510,9 +500,9 @@ ScriptedImporter: sharedRigPSDLayers: [] pSDLayerImportSetting: [] importFileNodeState: 1 - platformSettingsDirtyTick: 0 + platformSettingsDirtyTick: 638707693963108191 spriteSizeExpandChanged: 0 - generateGOHierarchy: 0 + generateGOHierarchy: 1 textureAssetName: prefabAssetName: spriteLibAssetName: diff --git a/Assets/Resources/Audio/voice_shitou_1.ogg b/Assets/Resources/Audio/voice_shitou_1.ogg new file mode 100644 index 000000000..ff2226573 --- /dev/null +++ b/Assets/Resources/Audio/voice_shitou_1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad7cf7eb213f43b97fef198ca28f687615ff04343b94dc3a4384120b8515b3c7 +size 655427 diff --git a/Assets/Resources/Audio/voice_shitou_1.ogg.meta b/Assets/Resources/Audio/voice_shitou_1.ogg.meta new file mode 100644 index 000000000..4e3c4a16b --- /dev/null +++ b/Assets/Resources/Audio/voice_shitou_1.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 057902cc83ed4f34280ed32f3d7f383e +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/voice_shitou_2.ogg b/Assets/Resources/Audio/voice_shitou_2.ogg new file mode 100644 index 000000000..42fc1ce93 --- /dev/null +++ b/Assets/Resources/Audio/voice_shitou_2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07e29d10517953e83d285ce23fe9e65e73af280a5e4b5940a3dc8e757c693571 +size 615404 diff --git a/Assets/Resources/Audio/voice_shitou_2.ogg.meta b/Assets/Resources/Audio/voice_shitou_2.ogg.meta new file mode 100644 index 000000000..131301e7c --- /dev/null +++ b/Assets/Resources/Audio/voice_shitou_2.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: cc235d74a4600aa419a295a7d0c74ef5 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/voice_shitou_3.ogg b/Assets/Resources/Audio/voice_shitou_3.ogg new file mode 100644 index 000000000..6fade7628 --- /dev/null +++ b/Assets/Resources/Audio/voice_shitou_3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:feca879e2a5ba66e61ec8a7840135cb70ce761e90d028923ebc828b7d5244bed +size 618597 diff --git a/Assets/Resources/Audio/voice_shitou_3.ogg.meta b/Assets/Resources/Audio/voice_shitou_3.ogg.meta new file mode 100644 index 000000000..f044ca7c3 --- /dev/null +++ b/Assets/Resources/Audio/voice_shitou_3.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: ac14a00e6427790448cd5a61e3d39cd9 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Characters/佩佩.prefab b/Assets/Resources/Characters/佩佩.prefab new file mode 100644 index 000000000..7082bdcb9 --- /dev/null +++ b/Assets/Resources/Characters/佩佩.prefab @@ -0,0 +1,894 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &557811152680814725 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8649489014485253777} + - component: {fileID: 8047043645737628767} + m_Layer: 0 + m_Name: "\u7BA1\u5B50" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8649489014485253777 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557811152680814725} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.713953, y: -3.9116278, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2332295300579816538} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8047043645737628767 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557811152680814725} + 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: 36 + m_Sprite: {fileID: 5679194226679333973, guid: 42e853dad9e30be4e9dc2afd08b0ee55, 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.4, y: 2.2232559} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &967729560883105931 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3734710417796081489} + - component: {fileID: 1313664728119756952} + m_Layer: 0 + m_Name: "\u5FAE\u7B11" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &3734710417796081489 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 967729560883105931} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.17674446, y: 1.3465114, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3666285362060119344} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1313664728119756952 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 967729560883105931} + 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: 25 + m_Sprite: {fileID: -924903249661114019, guid: 42e853dad9e30be4e9dc2afd08b0ee55, 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.5348837, y: 1.2976744} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1642047495357784741 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9031461657484495814} + - component: {fileID: 231323939426013932} + m_Layer: 0 + m_Name: "\u4E0D\u5F00\u5FC3" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9031461657484495814 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1642047495357784741} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.1511631, y: 1.3325582, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3666285362060119344} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &231323939426013932 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1642047495357784741} + 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: 23 + m_Sprite: {fileID: 5144746675807594993, guid: 42e853dad9e30be4e9dc2afd08b0ee55, 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.6139535, y: 1.3627907} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &2348111621459645816 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8680903603630250314} + - component: {fileID: 1627290595054690771} + m_Layer: 0 + m_Name: "\u5634\u5DF4\u7B11" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &8680903603630250314 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2348111621459645816} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.10465145, y: 0.9837208, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3666285362060119344} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1627290595054690771 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2348111621459645816} + 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: 24 + m_Sprite: {fileID: -5526678009032139697, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.3488372, y: 0.22790697} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &4411970595144166177 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8795770182358579953} + - component: {fileID: 1413954093436075760} + m_Layer: 0 + m_Name: "\u6362\u6DB2\u8BBE\u5907" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8795770182358579953 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4411970595144166177} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.8209305, y: -2.7441862, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2332295300579816538} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1413954093436075760 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4411970595144166177} + 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: 35 + m_Sprite: {fileID: -3889653487118935719, guid: 42e853dad9e30be4e9dc2afd08b0ee55, 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.6790698, y: 1.8604652} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &5403685471347567666 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3666285362060119344} + m_Layer: 0 + m_Name: "\u8868\u60C5" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3666285362060119344 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5403685471347567666} + 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: 9031461657484495814} + - {fileID: 3734710417796081489} + - {fileID: 8680903603630250314} + m_Father: {fileID: 7791994207577740999} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5911771441326825722 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4996673007509132405} + - component: {fileID: 8319638279403845131} + m_Layer: 0 + m_Name: "\u65E0\u52A8\u4F5C" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4996673007509132405 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5911771441326825722} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -9.525581, y: 5.023256, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7498364990616107940} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8319638279403845131 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5911771441326825722} + 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: 21 + m_Sprite: {fileID: -9218594420027392179, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0, y: 0} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &6325431244560787726 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7366726250224364727} + - component: {fileID: 7090541120531023695} + m_Layer: 0 + m_Name: "\u95ED\u773C" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &7366726250224364727 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6325431244560787726} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.08837223, y: 1.6139536, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7791994207577740999} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7090541120531023695 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6325431244560787726} + 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: 30 + m_Sprite: {fileID: 5521333373982119650, guid: 42e853dad9e30be4e9dc2afd08b0ee55, 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.3581395, y: 0.6139535} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &6510768970014138954 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5071299403598252135} + - component: {fileID: 4676805456159077868} + m_Layer: 0 + m_Name: "\u5782\u624B" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5071299403598252135 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6510768970014138954} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.21860504, y: -0.70465136, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7791994207577740999} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4676805456159077868 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6510768970014138954} + 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: 20 + m_Sprite: {fileID: -9093738620668558336, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.2558138, y: 8.637209} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &7272365558401409354 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2332295300579816538} + m_Layer: 0 + m_Name: "\u6362\u6DB2\u8BBE\u5907" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2332295300579816538 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7272365558401409354} + 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: 8649489014485253777} + - {fileID: 8795770182358579953} + m_Father: {fileID: 7791994207577740999} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7613302105064415414 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7791994207577740999} + m_Layer: 0 + m_Name: "\u4F69\u4F69" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7791994207577740999 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7613302105064415414} + 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: 2332295300579816538} + - {fileID: 7366726250224364727} + - {fileID: 3666285362060119344} + - {fileID: 7498364990616107940} + - {fileID: 5071299403598252135} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8631626869976514199 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3733962515578118272} + - component: {fileID: 6614847600047549232} + m_Layer: 0 + m_Name: "\u753B\u753B\u52A8\u4F5C" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &3733962515578118272 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8631626869976514199} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.6116276, y: -1.5976744, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7498364990616107940} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6614847600047549232 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8631626869976514199} + 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: 21 + m_Sprite: {fileID: -2733522326822389114, guid: 42e853dad9e30be4e9dc2afd08b0ee55, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 4.4790697, y: 1.9395349} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &8720874165894697604 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7498364990616107940} + m_Layer: 0 + m_Name: "\u52A8\u4F5C" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7498364990616107940 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8720874165894697604} + 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: 4996673007509132405} + - {fileID: 3733962515578118272} + m_Father: {fileID: 7791994207577740999} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Characters/佩佩.prefab.meta b/Assets/Resources/Characters/佩佩.prefab.meta new file mode 100644 index 000000000..0c55c9308 --- /dev/null +++ b/Assets/Resources/Characters/佩佩.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5f0cfa69279801245a17ed255a9c8640 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Characters/佩佩.psb b/Assets/Resources/Characters/佩佩.psb deleted file mode 100644 index b43e9ae4c..000000000 --- a/Assets/Resources/Characters/佩佩.psb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f4a44d72815ac121628605b9860b8638cec080324d64ce5e3203a1126eca8ef9 -size 5299624 diff --git a/Assets/Resources/Characters/石头.prefab b/Assets/Resources/Characters/石头.prefab new file mode 100644 index 000000000..e73905b4d --- /dev/null +++ b/Assets/Resources/Characters/石头.prefab @@ -0,0 +1,894 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1451478719797878087 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 321962101837076397} + - component: {fileID: 6212625998322904201} + m_Layer: 0 + m_Name: "\u6B63\u5E38\u5FAE\u5FAE\u7B11" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &321962101837076397 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1451478719797878087} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.20232582, y: 2.7534885, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1448356614083661040} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6212625998322904201 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1451478719797878087} + 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: 25 + m_Sprite: {fileID: -7611103898351507033, guid: a2bc22f41acbae14d8f40ae12d2abb6a, 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.1953489, y: 1.172093} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1740882592640480489 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1448356614083661040} + m_Layer: 0 + m_Name: "\u8868\u60C5" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1448356614083661040 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1740882592640480489} + 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: 6634575232287282363} + - {fileID: 321962101837076397} + - {fileID: 6255869994967285290} + m_Father: {fileID: 5600912769637424867} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2835183012969939138 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4328909841857740373} + m_Layer: 0 + m_Name: "\u52A8\u4F5C" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4328909841857740373 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2835183012969939138} + 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: 2122118248314564448} + - {fileID: 557159831907654330} + m_Father: {fileID: 5600912769637424867} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3132077341938079883 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7053611760725568351} + m_Layer: 0 + m_Name: "\u6362\u6DB2\u8BBE\u5907" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &7053611760725568351 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3132077341938079883} + 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: 7493873256272036854} + - {fileID: 217879962544951796} + m_Father: {fileID: 5600912769637424867} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3379449889712381375 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5600912769637424867} + m_Layer: 0 + m_Name: "\u77F3\u5934" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5600912769637424867 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3379449889712381375} + 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: 7053611760725568351} + - {fileID: 5100944589243527712} + - {fileID: 1448356614083661040} + - {fileID: 4328909841857740373} + - {fileID: 7927206515439171388} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3430476092807554933 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2122118248314564448} + - component: {fileID: 6825275805776952451} + m_Layer: 0 + m_Name: "\u524D\u53F3\u624B" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2122118248314564448 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3430476092807554933} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.9348836, y: -1.3697674, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4328909841857740373} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6825275805776952451 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3430476092807554933} + 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: 21 + m_Sprite: {fileID: 4393369410505694023, guid: a2bc22f41acbae14d8f40ae12d2abb6a, 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.5534884, y: 5.7534885} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &4448765728947465774 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 217879962544951796} + - component: {fileID: 4559093754623788869} + m_Layer: 0 + m_Name: "\u6362\u6DB2\u8BBE\u5907" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &217879962544951796 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4448765728947465774} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2.3418608, y: -2.3953488, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7053611760725568351} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4559093754623788869 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4448765728947465774} + 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: 31 + m_Sprite: {fileID: 7607947896240486083, guid: a2bc22f41acbae14d8f40ae12d2abb6a, 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.7348837, y: 1.8511628} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &4764593005598266761 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6255869994967285290} + - component: {fileID: 3479220583987766706} + m_Layer: 0 + m_Name: "\u601D\u7D22\u8D70\u795E" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &6255869994967285290 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4764593005598266761} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.20232582, y: 2.7534885, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1448356614083661040} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3479220583987766706 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4764593005598266761} + 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: 24 + m_Sprite: {fileID: 4931267513007321070, guid: a2bc22f41acbae14d8f40ae12d2abb6a, 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.1953489, y: 1.172093} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &4867671720407948898 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7927206515439171388} + - component: {fileID: 8485227325483059167} + m_Layer: 0 + m_Name: "\u77F3\u5934" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7927206515439171388 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4867671720407948898} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.89534855, y: -0.13255835, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5600912769637424867} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8485227325483059167 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4867671720407948898} + 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: 20 + m_Sprite: {fileID: 1959405141969136499, guid: a2bc22f41acbae14d8f40ae12d2abb6a, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 4.832558, y: 8.776744} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &4939196402876191855 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7493873256272036854} + - component: {fileID: 3427764724717700522} + m_Layer: 0 + m_Name: "\u7BA1\u5B50" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7493873256272036854 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4939196402876191855} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.1767445, y: -3.6046512, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7053611760725568351} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3427764724717700522 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4939196402876191855} + 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: 32 + m_Sprite: {fileID: -8509828229510040495, guid: a2bc22f41acbae14d8f40ae12d2abb6a, 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.3302325, y: 2.2790697} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &7793060191910935525 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6634575232287282363} + - component: {fileID: 7854156732401436166} + m_Layer: 0 + m_Name: "\u5927\u7B11" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6634575232287282363 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7793060191910935525} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.07209301, y: 3.0674415, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1448356614083661040} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7854156732401436166 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7793060191910935525} + 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: 23 + m_Sprite: {fileID: 4219750615971298691, guid: a2bc22f41acbae14d8f40ae12d2abb6a, 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.6790698, y: 2.3302326} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &7871526232765337157 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5100944589243527712} + - component: {fileID: 8344842049444723259} + m_Layer: 0 + m_Name: "\u95ED\u773C" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &5100944589243527712 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7871526232765337157} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.07209301, y: 3.530233, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5600912769637424867} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8344842049444723259 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7871526232765337157} + 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: 30 + m_Sprite: {fileID: 7294100382151977428, guid: a2bc22f41acbae14d8f40ae12d2abb6a, 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.6790698, y: 1.4046512} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &9090874070058067847 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 557159831907654330} + - component: {fileID: 8308007325688765332} + m_Layer: 0 + m_Name: "\u6478\u5934" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &557159831907654330 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9090874070058067847} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.9837208, y: 2.2139535, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4328909841857740373} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8308007325688765332 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9090874070058067847} + 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: 22 + m_Sprite: {fileID: -3724277086692316503, guid: a2bc22f41acbae14d8f40ae12d2abb6a, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.2697675, y: 4.148837} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Resources/Characters/石头.prefab.meta b/Assets/Resources/Characters/石头.prefab.meta new file mode 100644 index 000000000..de164b85c --- /dev/null +++ b/Assets/Resources/Characters/石头.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7baafb228c52f814caccd61b4c9aad58 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Characters/石头.psb b/Assets/Resources/Characters/石头.psb deleted file mode 100644 index 596b17144..000000000 --- a/Assets/Resources/Characters/石头.psb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e2ce7d4548bb96f770eb74bf2f41f34c37f96dab2e63074a5b51cd600e788a4 -size 6432299 diff --git a/Assets/Resources/Prefabs/Fix/Bottle.prefab b/Assets/Resources/Prefabs/Fix/Bottle.prefab index 1fd7a2e0a..37a3dd556 100644 --- a/Assets/Resources/Prefabs/Fix/Bottle.prefab +++ b/Assets/Resources/Prefabs/Fix/Bottle.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 6048524599704252402} - component: {fileID: 207758920267391891} - component: {fileID: 653930043964180535} - m_Layer: 0 + m_Layer: 8 m_Name: Bottle m_TagString: Moveable m_Icon: {fileID: 0} diff --git a/Assets/Resources/Yarn/ShitouFunctional1/PlugOptions.yarn b/Assets/Resources/Yarn/ShitouFunctional1/PlugOptions.yarn index 609efc7b2..a18465452 100644 --- a/Assets/Resources/Yarn/ShitouFunctional1/PlugOptions.yarn +++ b/Assets/Resources/Yarn/ShitouFunctional1/PlugOptions.yarn @@ -1,4 +1,4 @@ -title: LungPlugIn +title: LungPlugIn position: -359,-46 --- <> @@ -33,7 +33,7 @@ position: 470,-51 title: EngineSuccess position: -367,189 --- -引擎玩法成功。 +引擎玩法成功。 #line:03d7d6c <> <> <> @@ -42,42 +42,40 @@ position: -367,189 title: 插入冷却液 --- <> -喜达诺，澄清型透析剂。降低模块运转造成的反应，减轻患者痛苦。 +喜达诺，澄清型透析剂。降低模块运转造成的反应，减轻患者痛苦。 #line:0ba7bbd <> -可善，澄清型透析剂。降低循环系统压力，延长冷却液寿命。 +可善，澄清型透析剂。降低循环系统压力，延长冷却液寿命。 #line:0dc9b19 <> -强克，澄清型透析剂。降低动力系统压力，略微提高整体动力。 +强克，澄清型透析剂。降低动力系统压力，略微提高整体动力。 #line:04cfdf1 <> -息利康，澄清型透析剂。降低气体系统压力，减轻滤板积碳。 +息利康，澄清型透析剂。降低气体系统压力，减轻滤板积碳。 #line:05cecb0 <> -曲妥珠，澄清型透析剂。降低消化系统压力，降低摄入物造成的毒性。 +曲妥珠，澄清型透析剂。降低消化系统压力，降低摄入物造成的毒性。 #line:07664d1 <> -曲马多，强冷型透析剂。降低机体全局温度。 +曲马多，强冷型透析剂。降低机体全局温度。 #line:02016d3 <> === -title: 开启泵机 +title: 泵机运行 --- <> -希望这能让他好受一些。 +希望这能让他好受一些。 #line:079382d <> -希望这些冷却液能撑得更久一些。 +希望这些冷却液能撑得更久一些。 #line:0c69ba2 <> -好吧…如果他真的需要跑得再快一些。 +好吧…如果他真的需要跑得再快一些。 #line:07574c6 <> -希望能让他的滤板多坚持一会。 +希望能让他的滤板多坚持一会。 #line:056780d <> -希望这会有用。 +希望这会有用。 #line:000ad64 <> -【占位】降一下滴速，不然他会不舒服的。 +【占位】降一下滴速，不然他会不舒服的。 #line:04d8293 <> <> <> -<> -<> <> <> === diff --git a/Assets/Resources/Yarn/ShitouFunctional1/ShitouFunctional1.yarn b/Assets/Resources/Yarn/ShitouFunctional1/ShitouFunctional1.yarn index a98d67a26..dd3f7926f 100644 --- a/Assets/Resources/Yarn/ShitouFunctional1/ShitouFunctional1.yarn +++ b/Assets/Resources/Yarn/ShitouFunctional1/ShitouFunctional1.yarn @@ -1,4 +1,4 @@ -title: Start +title: Start tags: colorID: 8 position: 242,-2378 @@ -6,28 +6,26 @@ position: 242,-2378 //<> //<> <> -本demo为早期验证版本，其中文本，交互，画面,声音均为过程版 -// 本demo存在较多早期功能，如果遇到困惑或BUG等问题我们表示歉意 -// 可以微信联系：15209116298 或QQ群325268983进行反馈 -// 如果您能够在游玩过程中记录反馈，我们将不胜感激 -// 好了！游戏开始~ -// <> -// <> -// 2024已经是遥远的过去。数十年间，社会飞速发展，人体机械化技术已经臻于成熟。 -// 从简单的机械肢体，到脑区的电子模块化，人们竞相改造自身，直到完全机械化，以适应愈发残酷的社会竞争。 -// 纯洁的“人类”已经几乎不复存在。而这些机械化的人们，则被称为“机体”。 -// 这里是幸福罐头园区，你是园区的一名机器人医生。 -// 回到你的工作岗位上，开始你新一天的工作。 -//NOTE：房间界面的对话都单句写短一些（16字以内，参考CoffeeTalk），维修的可以长一些 -////新闻:balabalabala -///<> +本demo为早期验证版本，其中文本，交互，画面,声音均为过程版 #line:0cf11ef +本demo存在较多早期功能，如果遇到困惑或BUG等问题我们表示歉意 #line:04b7ed8 +可以微信联系：15209116298 或QQ群325268983进行反馈 #line:00d19e0 +如果您能够在游玩过程中记录反馈，我们将不胜感激 #line:00836c3 +好了！游戏开始~ #line:033d225 +<> +<> +2024已经是遥远的过去。数十年间，社会飞速发展，人体机械化技术已经臻于成熟。 #line:07be091 +从简单的机械肢体，到脑区的电子模块化，人们竞相改造自身，直到完全机械化，以适应愈发残酷的社会竞争。 #line:00473e6 +纯洁的“人类”已经几乎不复存在。而这些机械化的人们，则被称为“机体”。 #line:0f86fcc +这里是幸福罐头园区，你是园区的一名机器人医生。 #line:0b2b8c4 +回到你的工作岗位上，开始你新一天的工作。 #line:02ac5be +// NOTE：房间界面的对话都单句写短一些（16字以内，参考CoffeeTalk），维修的可以长一些 +新闻:balabalabala #line:0c86f90 +<> <> //<> === - - title: VarsInit tags: colorID: 4 @@ -131,43 +129,42 @@ position: 250,-1874 <> <> -shitou: 幸福诊所~幸福诊所~来到幸福诊所~病痛都离开我…… -（敲门声） -shitou: 您好！这是咱园区的员工诊所吗？ +shitou: 幸福诊所~幸福诊所~来到幸福诊所~病痛都离开我…… #line:0438add +（敲门声） #line:07a94a6 +shitou: 您好！这是咱园区的员工诊所吗？ #line:0c107da -me: 是的。看来我们来了一个音乐家？ +me: 是的。看来我们来了一个音乐家？ #line:0ebea4f <> <> -<> +<> <> -<> -shitou: 亲爱的医生~谢谢你夸奖~可我不是艺术家~也没有才华~🎵 -shitou: 音乐是我的爱好~送货是我的工作~🎵~石头是我的名字~幸福园区~我的家~🎵 -shitou: 清晨睁眼他便出门~送货送到傍晚时分~🎵~他不怕辛苦不怕累~只恨没有翅膀~也不能飞~🎵 -shitou: 更快~更快~更快~~再多的烦恼也抛到脑外~只要他的双腿跑的更快~🎵！ -shitou: 医生，听说咱诊所能让我跑得更快？ +shitou: 亲爱的医生~谢谢你夸奖~可我不是艺术家~也没有才华~🎵 #line:0d6aa75 +shitou: 音乐是我的爱好~送货是我的工作~🎵~石头是我的名字~幸福园区~我的家~🎵 #line:001e8d2 +shitou: 清晨睁眼他便出门~送货送到傍晚时分~🎵~他不怕辛苦不怕累~只恨没有翅膀~也不能飞~🎵 #line:061b3b1 +shitou: 更快~更快~更快~~再多的烦恼也抛到脑外~只要他的双腿跑的更快~🎵！ #line:0624f67 +shitou: 医生，听说咱诊所能让我跑得更快？ #line:058459b -me: 你好~快乐的送货员~我可以~…可以~…… -me: 算了，唱歌真的不是我的强项。 -me: 我可以帮你做一些检查和调整，但我不能保证会“跑得更快”。 +me: 你好~快乐的送货员~我可以~…可以~…… #line:0777aad +me: 算了，唱歌真的不是我的强项。 #line:04c34b1 +me: 我可以帮你做一些检查和调整，但我不能保证会“跑得更快”。 #line:034f4a3 -shitou: 啊！我还以为…可以来这里调理身体嘞！… +shitou: 啊！我还以为…可以来这里调理身体嘞！… #line:056989d -me: 调理？那当然是可以的。 -me: 理论上，我能处理你的“健康”，但不一定能让你“更快”。 -me: 毕竟这里是一个诊所，不是改造车间。 +me: 调理？那当然是可以的。 #line:0e7d768 +me: 理论上，我能处理你的“健康”，但不一定能让你“更快”。 #line:0cd2c27 +me: 毕竟这里是一个诊所，不是改造车间。 #line:00765db -shitou: 医生~调理完我的身体~我就能~重新快到飞起~🎵！不是这样么，医生？ +shitou: 医生~调理完我的身体~我就能~重新快到飞起~🎵！不是这样么，医生？ #line:03f2694 -me: （和病人解释这些…一时半说不明白啊。） -me: 这样吧。我先给你做检查，看怎样能让你跑得更快。 +me: （和病人解释这些…一时半说不明白啊。） #line:0d5db9d +me: 这样吧。我先给你做检查，看怎样能让你跑得更快。 #line:0e85ced -shitou: 医生，检查费贵吗？ -shitou: 我，口袋空空~但我，快乐好多~ +shitou: 医生，检查费贵吗？ #line:0872250 +shitou: 我，口袋空空~但我，快乐好多~ #line:0b3fcf9 -me: 放心，检查不收钱。我们直接开始吧。 +me: 放心，检查不收钱。我们直接开始吧。 #line:025bff1 <> <> @@ -185,17 +182,17 @@ position: 240,-1440 <> -shitou: 医生~不好意思~每次拆面板我都很害怕！你介意我~放声高歌吗？ +shitou: 医生~不好意思~每次拆面板我都很害怕！你介意我~放声高歌吗？ #line:01b850e -me: 没关系，其实你一直在唱歌。 +me: 没关系，其实你一直在唱歌。 #line:00c62ae -shitou: 啊！我们活在幸福镇的庇佑下~再多烦恼~只要工作~统统没掉~ +shitou: 啊！我们活在幸福镇的庇佑下~再多烦恼~只要工作~统统没掉~ #line:0cb1d44 <> <> -me: 检查一下他的身体，评估一下有什么能对他的速度造成影响吧。 -me: 影响速度的…最直接的应该就是动力系统了。除此之外还会有什么呢…… +me: 检查一下他的身体，评估一下有什么能对他的速度造成影响吧。 #line:0a6bd80 +me: 影响速度的…最直接的应该就是动力系统了。除此之外还会有什么呢…… #line:0542abe @@ -205,7 +202,6 @@ me: 影响速度的…最直接的应该就是动力系统了。除此之外还 <> - <> <> <> @@ -254,7 +250,7 @@ position: -237,-1007 --- <> - 好的…该检查的应该已经检查过了。 + 好的…该检查的应该已经检查过了。 #line:01ae363 <> <> <> @@ -279,19 +275,19 @@ tags: colorID: 8 position: -595,-1288 --- -气体循环系统，为动力系统供气。 -->整体状态 - 功能非常健壮，看起来经常运动。 -->检查滤板 +气体循环系统，为动力系统供气。 #line:0c63a81 +->整体状态 #line:079ab72 + 功能非常健壮，看起来经常运动。 #line:0cb422d +->检查滤板 #line:08ac4a7 <> - 进气管道内非常浑浊，动力系统需要运转到非常高的速度才能造成这么严重的积碳。 + 进气管道内非常浑浊，动力系统需要运转到非常高的速度才能造成这么严重的积碳。 #line:08fb5ff <> - 进气管道内很浑浊。他的动力系统过于强劲，这套基础的呼吸系统承受了过大的压力…… + 进气管道内很浑浊。他的动力系统过于强劲，这套基础的呼吸系统承受了过大的压力…… #line:0142b88 <> - me: 滤板脏到这种程度…他的呼吸应该很吃力吧。 - me: 更换滤板应该可以帮助他跑得更快。不过效果比较有限…主要还是会让他呼吸舒服一点。 + me: 滤板脏到这种程度…他的呼吸应该很吃力吧。 #line:0097314 + me: 更换滤板应该可以帮助他跑得更快。不过效果比较有限…主要还是会让他呼吸舒服一点。 #line:0e25809 <> -->返回 +->返回 #line:0b55cf7 <> <> === @@ -304,19 +300,19 @@ tags: colorID: 8 position: -609,-1099 --- -机体的能源模块，将机体的燃料转化为电能/机械能，驱动机体和内部模块运转。 -me: 石头的能源系统是被改造过的…这是为了用于为肢体提供高速动力的型号，非常强劲。 -me: 不过这么强劲的动力系统…也会需要同样高级的各种模块配套。 -->检查进气压力 - 目前压力设置偏低，这意味着石头能跑出的速度上限偏低，但这也让他体感更轻松。 - me: 可以重新调整压力值来提高石头的最高速度…提升会很大。 - me: 不过，这会给他带来更大的机械负担。 +机体的能源模块，将机体的燃料转化为电能/机械能，驱动机体和内部模块运转。 #line:0342c84 +me: 石头的能源系统是被改造过的…这是为了用于为肢体提供高速动力的型号，非常强劲。 #line:0a28db8 +me: 不过这么强劲的动力系统…也会需要同样高级的各种模块配套。 #line:0c4b2cf +->检查进气压力 #line:013c114 + 目前压力设置偏低，这意味着石头能跑出的速度上限偏低，但这也让他体感更轻松。 #line:0f428a5 + me: 可以重新调整压力值来提高石头的最高速度…提升会很大。 #line:0a867c9 + me: 不过，这会给他带来更大的机械负担。 #line:0d607e5 <> -->整体状态 - 模块似乎被经过了很多次拆卸，推测进行了了多次改装。 -->检查外壳上的伤痕 - 外表有明显的伤痕，似乎从内部炸开过，并经过了修复。 -->返回 +->整体状态 #line:082dd3e + 模块似乎被经过了很多次拆卸，推测进行了了多次改装。 #line:0168a34 +->检查外壳上的伤痕 #line:0b68142 + 外表有明显的伤痕，似乎从内部炸开过，并经过了修复。 #line:0205f5a +->返回 #line:066a5fe <> <> === @@ -329,14 +325,14 @@ tags: colorID: 8 position: -594,-907 --- -机体的物质和燃料摄入、储藏模块。 -->检查最近摄入燃料 - 机体体内的燃料纯度很低，能提供的动力较慢。 - me: 如果摄入更高纯度的燃料，他可以跑得快很多……这会是一条有效的建议。 +机体的物质和燃料摄入、储藏模块。 #line:0747ab5 +->检查最近摄入燃料 #line:0c54d51 + 机体体内的燃料纯度很低，能提供的动力较慢。 #line:022942f + me: 如果摄入更高纯度的燃料，他可以跑得快很多……这会是一条有效的建议。 #line:0ca5bd7 <> -->检查最近摄入物质 - 机体最近摄入的食物成分非常简单而健康，全是基础款罐头。 -->返回 +->检查最近摄入物质 #line:0a3a36e + 机体最近摄入的食物成分非常简单而健康，全是基础款罐头。 #line:0147296 +->返回 #line:01dcaeb <> <> === @@ -349,25 +345,25 @@ tags: colorID: 8 position: -603,-754 --- -冷却液循环的处理中枢，让模块保持良好的运行状态。 -->整体状态 - 冷却液过于浑浊，循环系统当前压力很大。 +冷却液循环的处理中枢，让模块保持良好的运行状态。 #line:05f0f98 +->整体状态 #line:0b4a52b + 冷却液过于浑浊，循环系统当前压力很大。 #line:020cd0a <> - 原因可能有很多…但如果提高他的速度，循环系统压力只会更大。 + 原因可能有很多…但如果提高他的速度，循环系统压力只会更大。 #line:02fecf4 <> - 这可能是因为动力系统过于强劲…也可能是因为别的什么原因。 - 如果提高他的速度，循环系统压力只会更大。 + 这可能是因为动力系统过于强劲…也可能是因为别的什么原因。 #line:0adbe14 + 如果提高他的速度，循环系统压力只会更大。 #line:046d04e <> <> -->检查冷却液 - 冷却液很新，推测不久前彻底换过，通常大修才会换到这种程度。 +->检查冷却液 #line:09c14e5 + 冷却液很新，推测不久前彻底换过，通常大修才会换到这种程度。 #line:0de9a29 <> -->返回 +->返回 #line:0ac3880 <> <> - me: 有点奇怪…新换的冷却液理应比较干净才对。 - me: 这意味着患者可能最近摄入了大量的药物…… + me: 有点奇怪…新换的冷却液理应比较干净才对。 #line:0c1700a + me: 这意味着患者可能最近摄入了大量的药物…… #line:0a53ea4 <> <> @@ -382,15 +378,14 @@ tags: colorID: 8 position: 626,-329 --- -//现在关于切换场景的数据保存还没有完成，建议先不切场景 <> -me: 来分析一下有什么可以提高他的速度吧…… +me: 来分析一下有什么可以提高他的速度吧…… #line:0426d14 //<> -医生对石头的身体指标进行了分析，得出了以下结论： -1. 可以建议患者更换纯度更高的油料 -2. 可以调整患者心脏的数值，但会带来更高的身体负担，需要平常更多休息 -3. 更换肺部滤板，不过效果也比较有限，主要是提高患者生活质量 -另外，患者的冷却液过于浑浊，出于健康考虑，提高速度之后需要进行透析 +医生对石头的身体指标进行了分析，得出了以下结论： #line:0de6454 +1. 可以建议患者更换纯度更高的油料 #line:0ead41d +2. 可以调整患者心脏的数值，但会带来更高的身体负担，需要平常更多休息 #line:05208e3 +3. 更换肺部滤板，不过效果也比较有限，主要是提高患者生活质量 #line:00afa10 +另外，患者的冷却液过于浑浊，出于健康考虑，提高速度之后需要进行透析 #line:0334de5 <> === @@ -399,59 +394,59 @@ tags: colorID: 8 position: 627,-80 --- -me: （供患者选择的方案已经列出来了。不过最让我担心的是这个改造过的心脏……） -me: （他的各个身体模块负担都很大，这可能都是这个被改造得过于强劲的心脏带来的。） +me: （供患者选择的方案已经列出来了。不过最让我担心的是这个改造过的心脏……） #line:023aa1e +me: （他的各个身体模块负担都很大，这可能都是这个被改造得过于强劲的心脏带来的。） #line:073613b -shitou: 医生，怎么样？现在是不是要给我做手术嘞？ +shitou: 医生，怎么样？现在是不是要给我做手术嘞？ #line:0bfd454 -me: 还没到那一步。有些事情我必须要先和你说明白。 -me: 你是什么时候开始对心脏做改造的？ +me: 还没到那一步。有些事情我必须要先和你说明白。 #line:07d5828 +me: 你是什么时候开始对心脏做改造的？ #line:0457d28 -shitou: 啊？…不好意思，我没听明白，医生！心脏…你是说引擎噻？不就是入职的时候送的嘛！ +shitou: 啊？…不好意思，我没听明白，医生！心脏…你是说引擎噻？不就是入职的时候送的嘛！ #line:0898570 -me: 送的？ +me: 送的？ #line:0b4930f -shitou: 啊！我第一次到站点报到的时候就说了要改造，要装一个引擎，那就装嘛！ -shitou: 装上了引擎~我跑得飞快~在唱点小曲儿~岂不美哉~🎵 -shitou: 后边我又自己做了一些升级啊什么的。引擎嘛！我吃饭的家伙，肯定要强劲些嘛！ +shitou: 啊！我第一次到站点报到的时候就说了要改造，要装一个引擎，那就装嘛！ #line:0f03c3e +shitou: 装上了引擎~我跑得飞快~在唱点小曲儿~岂不美哉~🎵 #line:033cb63 +shitou: 后边我又自己做了一些升级啊什么的。引擎嘛！我吃饭的家伙，肯定要强劲些嘛！ #line:0b43d65 -me: （免费装？有这回事吗…） -me: 好吧，总之…通俗地说，你的心脏太强劲了，给很多身体模块造成了负担。 +me: （免费装？有这回事吗…） #line:051bfcb +me: 好吧，总之…通俗地说，你的心脏太强劲了，给很多身体模块造成了负担。 #line:0b45e21 -shitou: 太强劲…反而是负担？…听不懂，医生。 +shitou: 太强劲…反而是负担？…听不懂，医生。 #line:0a8adfe -me: 这些负担反过来对你的心脏动力造成了阻碍，让你没办法跑得更快了。 +me: 这些负担反过来对你的心脏动力造成了阻碍，让你没办法跑得更快了。 #line:0c068cf -shitou: 啊？那也就是说…也就是说…… -shitou: 我跑得太快…身体吃不消了？ +shitou: 啊？那也就是说…也就是说…… #line:0ec1290 +shitou: 我跑得太快…身体吃不消了？ #line:0ffb8f2 -me: 你理解得还是很快嘛。 +me: 你理解得还是很快嘛。 #line:0eba829 -shitou: 那也没得办法嘛… -shitou: 我是来想办法跑得更快的…只有跑得更快，我才能赚积分，才能更健康是不是噻！ -shitou: 我还以为可以好简单…没有吃了就能跑得更快的药吗？ +shitou: 那也没得办法嘛… #line:0834870 +shitou: 我是来想办法跑得更快的…只有跑得更快，我才能赚积分，才能更健康是不是噻！ #line:000b7cb +shitou: 我还以为可以好简单…没有吃了就能跑得更快的药吗？ #line:0135f79 -me: …没有。 -me: 有三种方法可以让你跑得更快，你也可以全都做。 -me: 最好的方法是，换用更纯的油料。你的燃料提供的动力就会更高。 +me: …没有。 #line:072a0c4 +me: 有三种方法可以让你跑得更快，你也可以全都做。 #line:016f4ba +me: 最好的方法是，换用更纯的油料。你的燃料提供的动力就会更高。 #line:0ccf0c6 -shitou: 更纯的…医生你是说，更贵的？我没得那么多积分嘛……到时候跑一天赚的积分都不够吃油的。 +shitou: 更纯的…医生你是说，更贵的？我没得那么多积分嘛……到时候跑一天赚的积分都不够吃油的。 #line:05813bf -me: 是贵，不过这是最健康的方式了。 -me: 第二种是，更换肺部的空气滤板。你的肺部积太多碳了。这些碳让你进气不太充分，引擎动力就打了折扣。 -me: 不过换这个能提升的动力不多，主要是碳太多会让机体不舒服，影响生活质量。 +me: 是贵，不过这是最健康的方式了。 #line:0c9cda0 +me: 第二种是，更换肺部的空气滤板。你的肺部积太多碳了。这些碳让你进气不太充分，引擎动力就打了折扣。 #line:029cf64 +me: 不过换这个能提升的动力不多，主要是碳太多会让机体不舒服，影响生活质量。 #line:0c16d33 -shitou: 那不用咯！站点有送3次免费换滤板，我就不在你这里换咯，坚持到后年再到站点换。 +shitou: 那不用咯！站点有送3次免费换滤板，我就不在你这里换咯，坚持到后年再到站点换。 #line:0714b8f -shitou: 我跑货的，哪有什么不舒服？跑得太慢了~反倒不舒服~ +shitou: 我跑货的，哪有什么不舒服？跑得太慢了~反倒不舒服~ #line:074142d -me: 那就只有最后一种办法了…你的心脏压力系统目前压力偏低，重新校准一下可以跑出更高的速度上限。 +me: 那就只有最后一种办法了…你的心脏压力系统目前压力偏低，重新校准一下可以跑出更高的速度上限。 #line:041fb06 -shitou: 压力…校准…你老说这些我听不懂嘛！这个不贵吧，医生？ +shitou: 压力…校准…你老说这些我听不懂嘛！这个不贵吧，医生？ #line:07bd1e0 -me: 不贵…不过这需要你经常休息，不然身体的压力只会更大…… +me: 不贵…不过这需要你经常休息，不然身体的压力只会更大…… #line:02271d1 -shitou: 好！要得，那我就好好休息。那还等什么？医生，我们来吧。 +shitou: 好！要得，那我就好好休息。那还等什么？医生，我们来吧。 #line:0ba5340 <> <> @@ -467,8 +462,8 @@ tags: position: -204,339 --- <> -医生对引擎压力进行调试，提高了石头的最高速度 -调试期间，石头看起来有些吃力 +医生对引擎压力进行调试，提高了石头的最高速度 #line:0ef464a +调试期间，石头看起来有些吃力 #line:0a6b1b9 === @@ -478,49 +473,47 @@ title: 完成调速对话 tags: position: 208,775 --- -me: （他的心脏到底是经历了什么？为什么看起来这么破破烂烂的……） -me: （总之…眼下他的身体负担太重了，必须还要做一次冷却液透析才行。） +me: （他的心脏到底是经历了什么？为什么看起来这么破破烂烂的……） #line:0304232 +me: （总之…眼下他的身体负担太重了，必须还要做一次冷却液透析才行。） #line:0549e42 -me: 好了，试试吧，走两步。 +me: 好了，试试吧，走两步。 #line:0a072c3 -shitou: 感觉好不一样！我觉得浑身~都有力！ +shitou: 感觉好不一样！我觉得浑身~都有力！ #line:0199270 -<> -石头瞬间跑出视野 +<> +石头瞬间跑出视野 #line:02b1fbb -shitou: 喔喔~哈哈！ +shitou: 喔喔~哈哈！ #line:06c39fa -me: 别在诊室里乱跑！ +me: 别在诊室里乱跑！ #line:03fb0b5 -<> -石头瞬间跑回来 +<> +石头瞬间跑回来 #line:079f2b1 -shitou: 不好意思，医生…你让我跑两步，我就一下子没收住…… +shitou: 不好意思，医生…你让我跑两步，我就一下子没收住…… #line:09292e8 -me: …我让你走两步，没让你跑两步。 +me: …我让你走两步，没让你跑两步。 #line:04a5519 -shitou: 是，是，不好意思，医生…… -shitou: 医生…你太厉害咯！只花积分一点点~就跑得快好多~🎵…… -shitou: 我真是来对咯！本来还以为小诊所做不了什么大事情哩！太厉害了，医生！ +shitou: 是，是，不好意思，医生…… #line:02a3c08 +shitou: 医生…你太厉害咯！只花积分一点点~就跑得快好多~🎵…… #line:0038a82 +shitou: 我真是来对咯！本来还以为小诊所做不了什么大事情哩！太厉害了，医生！ #line:001073a -me: 不过你还不能走，还有透析要做。 +me: 不过你还不能走，还有透析要做。 #line:0b92c14 -shitou: 透析？干嘛用的…医生？我还急到去跑货…可以先不做吗？ +shitou: 透析？干嘛用的…医生？我还急到去跑货…可以先不做吗？ #line:042b422 -me: 你的冷却液已经稠得像泥一样，几乎不再有冷却效果了。透析可以让你的冷却液恢复性状，不同的透析剂还有不同的附带效果… -me: 你自己可以不在乎，但如果不做透析，用这么高的速度跑货，可能今晚引擎就会炸掉。 +me: 你的冷却液已经稠得像泥一样，几乎不再有冷却效果了。透析可以让你的冷却液恢复性状，不同的透析剂还有不同的附带效果… #line:0f2bc2a +me: 你自己可以不在乎，但如果不做透析，用这么高的速度跑货，可能今晚引擎就会炸掉。 #line:0678bad -shitou: 炸，炸掉？…那太吓人了！医生，那还是不要炸掉比较好。 -shitou: 来嘛，咋做？我听说像以前人类…打吊桶那样？ +shitou: 炸，炸掉？…那太吓人了！医生，那还是不要炸掉比较好。 #line:0515118 +shitou: 来嘛，咋做？我听说像以前人类…打吊桶那样？ #line:0f79a97 -我 +我: 你说的是吊瓶……不过确实有点像。 #line:0c0ad20 -你说的是吊瓶……不过确实有点像。 +我: 只是我们机体需要把身体里的冷却液抽出来，在透析机里和注射透析剂发生反应，再输回去。 #line:00cb563 -只是我们机体需要把身体里的冷却液抽出来，在透析机里和注射透析剂发生反应，再输回去。 +我: 你的状况…需要打三瓶澄清型才能行。让我看看给你第一瓶打什么… #line:0a67075 -你的状况…需要打三瓶澄清型才能行。让我看看给你第一瓶打什么… -<> <> === @@ -531,12 +524,13 @@ title: 冷却液初始化 tags: position: 208,775 --- +<> <> -shitou: 呼，好凉！医生，麻烦调慢点！ -me: 还没开始呢。 -me: （我需要找一瓶透析剂装上……任何一种澄清型的都行。） +shitou: 呼，好凉！医生，麻烦调慢点！ #line:067c094 +me: 还没开始呢。 #line:0b38a88 +<> +me: （我需要找一瓶透析剂装上……任何一种澄清型的都行。） #line:01badc3 <> -<> === @@ -546,58 +540,58 @@ tags: position: 208,775 --- <> -医生拉出冷却液架，上面摆满了各种颜色的冷却液罐 -->喜达诺透析剂 - 澄清型透析剂。降低模块运转造成的反应，减轻患者痛苦。 - ->装上透析剂 - me: 希望这能让他好受一些。 +医生拉出冷却液架，上面摆满了各种颜色的冷却液罐 #line:0c8183c +->喜达诺透析剂 #line:043477f + 澄清型透析剂。降低模块运转造成的反应，减轻患者痛苦。 #line:07c2810 + ->装上透析剂 #line:0f1d05c + me: 希望这能让他好受一些。 #line:0386b85 <> <> <> - ->重新选择 + ->重新选择 #line:02f4dfa <> -->可善挺透析剂 - 澄清型透析剂。降低循环系统压力，延长冷却液寿命。 - ->装上透析剂 - me: 希望这些冷却液能撑得更久一些。 +->可善挺透析剂 #line:0fa0ae0 + 澄清型透析剂。降低循环系统压力，延长冷却液寿命。 #line:0b967b4 + ->装上透析剂 #line:019b716 + me: 希望这些冷却液能撑得更久一些。 #line:0bbd05e <> <> <> - ->重新选择 + ->重新选择 #line:0ab1ab0 <> -->强克透析剂 - 澄清型透析剂。降低动力系统压力，略微提高整体动力。 - ->装上透析剂 - me: 好吧…如果他真的需要跑得再快一些。 +->强克透析剂 #line:04b3565 + 澄清型透析剂。降低动力系统压力，略微提高整体动力。 #line:069b600 + ->装上透析剂 #line:0d5980f + me: 好吧…如果他真的需要跑得再快一些。 #line:0a7257f <> <> <> - ->重新选择 + ->重新选择 #line:032f00e <> -->息利康透析剂 - 澄清型透析剂。降低气体系统压力，减轻滤板积碳。 - ->装上透析剂 - me: 希望能让他的滤板多坚持一会。 +->息利康透析剂 #line:09d0209 + 澄清型透析剂。降低气体系统压力，减轻滤板积碳。 #line:03a5ddd + ->装上透析剂 #line:00dbea6 + me: 希望能让他的滤板多坚持一会。 #line:09f9198 <> <> <> - ->重新选择 + ->重新选择 #line:02644e2 <> -->曲妥珠透析剂 - 澄清型透析剂。降低消化系统压力，降低摄入物造成的毒性。 - ->装上透析剂 - me: 希望这会有用。 +->曲妥珠透析剂 #line:0c065f8 + 澄清型透析剂。降低消化系统压力，降低摄入物造成的毒性。 #line:0b81f7b + ->装上透析剂 #line:031600b + me: 希望这会有用。 #line:04f3edc <> <> <> - ->重新选择 + ->重新选择 #line:0144633 <> -->曲马多透析剂 - 强冷型透析剂。降低机体全局温度。谨慎使用。 - ->装上透析剂 - me: 不…我肯定搞错了，不应该用这个。 +->曲马多透析剂 #line:0d120b9 + 强冷型透析剂。降低机体全局温度。谨慎使用。 #line:0c2b8a9 + ->装上透析剂 #line:02e9929 + me: 不…我肯定搞错了，不应该用这个。 #line:099fc55 <> - ->重新选择 + ->重新选择 #line:089d1bd <> === @@ -625,73 +619,79 @@ title: 透析对话1 tags: position: 1053,497 --- -【【启动透析机】】 -【【透析机开始工作】】 -shitou: 医生…你说透析让我感觉压力小一些？但我咋没感觉到呢…… +shitou: 医生…你说透析让我感觉压力小一些？但我咋没感觉到呢…… #line:0ecddad -me: 才刚开始打呢。而且，是让你的身体模块负担小一些，不只是你感受上舒服些。 -me: 等吧。打完三管…你就可以走了。…感觉怎样，透析痛不痛？ +me: 才刚开始打呢。而且，是让你的身体模块负担小一些，不只是你感受上舒服些。 #line:0ece83b +me: 等吧。打完三管…你就可以走了。…感觉怎样，透析痛不痛？ #line:0fde4ac -shitou: 完全不痛~医生，你太厉害啦！你比那些机体医院的医生厉害多咯~ -shitou: 我躺那里，他们只会不停地说什么静养啊…“补液”啊的，整完一通，我反倒更慢了。 +shitou: 完全不痛~医生，你太厉害啦！你比那些机体医院的医生厉害多咯~ #line:063077f +shitou: 我躺那里，他们只会不停地说什么静养啊…“补液”啊的，整完一通，我反倒更慢了。 #line:028f27a <> <> -me: …… -me: 手术？ +me: …… #line:0c388a5 +me: 手术？ #line:0882254 <> <> -shitou: 啊？医生，你说啥，我听不懂。 +shitou: 啊？医生，你说啥，我听不懂。 #line:05a2763 -me: 你一直在说机体医院…你去机体医院做了什么？ -me: 你不是一直都嫌贵吗，为什么会跑到机体医院去？ +me: 你一直在说机体医院…你去机体医院做了什么？ #line:01b071f +me: 你不是一直都嫌贵吗，为什么会跑到机体医院去？ #line:0303127 -shitou: 啊…医生。 -shitou: 是小问题啦…我前段时间…跟人撞了。 -shitou: 把引擎给撞坏了…修了挺久的。这个他们说只能在机体医院修。 +shitou: 啊…医生。 #line:04a22cd +shitou: 是小问题啦…我前段时间…跟人撞了。 #line:0e75024 +shitou: 把引擎给撞坏了…修了挺久的。这个他们说只能在机体医院修。 #line:0fd5bb6 -me: 为什么一开始不跟我说？ +me: 为什么一开始不跟我说？ #line:0979972 -shitou: 对不起嘛，医生…我以为这两件事情没有关系。 +shitou: 对不起嘛，医生…我以为这两件事情没有关系。 #line:0a786c4 -me: 你怎么撞的？ +me: 你怎么撞的？ #line:0fdd5ac -shitou: 是他跟我撞了嘛，不是我撞的他。 -shitou: 我从一个岔路口跑上主路，和主路交汇嘛，我肯定就往左观察是不咯。 -shitou: 路口有个好大的广告牌，刚好把视线全部挡住。我就降低速度，一直盯到左边嘛… -shitou: 结果谁想到嘛！他是逆行从右边跑过来的。 -shitou: 我回过头来看到他那一瞬间，我脑袋里面就想，坏咯。 -shitou: 然后一下子我就不知道自己在哪里了。 -shitou: 我跑这么快，从来没飞起来过。这还是我第一次飞上天嘞！ -shitou: 然后我就发现，我怎么忽然躺在地上了嘞？耳朵什么都听不到，能看到的东西全都在转！ -shitou: 哇，我从地上爬起来，满地都是手啊脚的…… -shitou: 我还以为是我的嘞！还好到处一摸，全都在，我竟然一个都没少！不然就贵咯…… -shitou: 我感觉是因为我速度慢，所以撞到力度就没那么大。 -shitou: 我就赶紧到处看，刚才那个人咧？ -shitou: 我转了两圈，满地都是零件和冷却液，找不到人在哪里。 -shitou: 这个时候我耳朵才恢复过来，听到好像有人在说话，不过一会就不说了。 -shitou: 我走过去看，发现是个头！ -shitou: 我就捡起来看…就是刚才那个人，他对到我一直眨眼睛，嘴巴好像还在说话，不过已经没声音了。 -shitou: 我想有个头应该还能修噻，就想去拦车… +shitou: 是他跟我撞了嘛，不是我撞的他。 #line:07bb908 +shitou: 我从一个岔路口跑上主路，和主路交汇嘛，我肯定就往左观察是不咯。 #line:0507517 +shitou: 路口有个好大的广告牌，刚好把视线全部挡住。我就降低速度，一直盯到左边嘛… #line:08dbd11 +shitou: 结果谁想到嘛！他是逆行从右边跑过来的。 #line:06fb359 +shitou: 我回过头来看到他那一瞬间，我脑袋里面就想，坏咯。 #line:06c1298 +shitou: 然后一下子我就不知道自己在哪里了。 #line:05a01ee +shitou: 我跑这么快，从来没飞起来过。这还是我第一次飞上天嘞！ #line:013f8ef +shitou: 然后我就发现，我怎么忽然躺在地上了嘞？耳朵什么都听不到，能看到的东西全都在转！ #line:0f568e0 +shitou: 哇，我从地上爬起来，满地都是手啊脚的…… #line:007b244 +shitou: 我还以为是我的嘞！还好到处一摸，全都在，我竟然一个都没少！不然就贵咯…… #line:08b2804 +shitou: 我感觉是因为我速度慢，所以撞到力度就没那么大。 #line:04ac804 +shitou: 我就赶紧到处看，刚才那个人咧？ #line:0a29180 +shitou: 我转了两圈，满地都是零件和冷却液，找不到人在哪里。 #line:0242551 +shitou: 这个时候我耳朵才恢复过来，听到好像有人在说话，不过一会就不说了。 #line:05e2d40 +shitou: 我走过去看，发现是个头！ #line:0375237 +shitou: 我就捡起来看…就是刚才那个人，他对到我一直眨眼睛，嘴巴好像还在说话，不过已经没声音了。 #line:08ace8a +shitou: 我想有个头应该还能修噻，就想去拦车… #line:07fbac0 -me: 修不了了。 +me: 修不了了。 #line:031fea0 -shitou: 我当时不知道嘛！我看到车来就想跑去拦，才跑两步就感觉心口好痛好痛！ -shitou: 痛到不行，我停下来也一直痛，腿一软就躺到地上了。 -shitou: 那辆车没看到我，它开过去，把那些零件哗——撞得到处都是！ +shitou: 我当时不知道嘛！我看到车来就想跑去拦，才跑两步就感觉心口好痛好痛！ #line:0be3d02 +shitou: 痛到不行，我停下来也一直痛，腿一软就躺到地上了。 #line:05e4d2a +shitou: 那辆车没看到我，它开过去，把那些零件哗——撞得到处都是！ #line:06bd154 -【提示一瓶打完】 +// 表现注射结束 +<> +<> +<> +<> +<> +<> +// 表现完成 -shitou: 医生，是不是打完啦？还是蛮快的嘛！ +shitou: 医生，是不是打完啦？还是蛮快的嘛！ #line:0729090 -me: …… -me: 我先给你换第二瓶。 -<> +me: …… #line:07e3304 +me: 我先给你换第二瓶。 #line:06f6769 +<> +<> === @@ -701,65 +701,73 @@ title: 透析对话2 tags: position: 1047,760 --- -me: 好了。 +me: 好了。 #line:014dfb5 -shitou: 嗯…医生，确实感觉舒服多了嘞！ -shitou: 比在大医院打得好多了。我一睡着那个机器就开始嘀嘀嘀响，烦的不行。 +shitou: 嗯…医生，确实感觉舒服多了嘞！ #line:0e03679 +shitou: 比在大医院打得好多了。我一睡着那个机器就开始嘀嘀嘀响，烦的不行。 #line:0f2b786 -me: 那个不是透析机，是心率仪。 -me: 所以，你应该是伤到了心脏？除了心脏呢，医生怎么说？ +me: 那个不是透析机，是心率仪。 #line:06f6070 +me: 所以，你应该是伤到了心脏？除了心脏呢，医生怎么说？ #line:0dc2215 -shitou: 哈哈，他说我特别抗造，除了心脏，只有一点皮外伤。 -shitou: 可惜啊…我这个心脏是花了好多功夫改装的…以前可厉害咯！ -shitou: 不过那个兄弟就可惜了…撞成那样，不知道有没有救回来。他要是不贪那点路程…… -shitou: 不过其实那条路我也经常跑，我也晓得他为什么这么跑。 -shitou: 这个路对向是没有机行道的。本来路设计出来就是给大车跑的嘛！ -shitou: 要不逆行的话，从改造路那边绕一大圈上天桥，多花七八分钟，一来一回就是15分钟了。 +shitou: 哈哈，他说我特别抗造，除了心脏，只有一点皮外伤。 #line:0d915d4 +shitou: 可惜啊…我这个心脏是花了好多功夫改装的…以前可厉害咯！ #line:0bac3c5 +shitou: 不过那个兄弟就可惜了…撞成那样，不知道有没有救回来。他要是不贪那点路程…… #line:099c699 +shitou: 不过其实那条路我也经常跑，我也晓得他为什么这么跑。 #line:0a7b817 +shitou: 这个路对向是没有机行道的。本来路设计出来就是给大车跑的嘛！ #line:0167086 +shitou: 要不逆行的话，从改造路那边绕一大圈上天桥，多花七八分钟，一来一回就是15分钟了。 #line:05567b1 -me: 救不回来的。你看到的时候已经死了。那些只是BIOS还没完全断电的反射行为。 +me: 救不回来的。你看到的时候已经死了。那些只是BIOS还没完全断电的反射行为。 #line:0724391 <> <> -me: …… +me: …… #line:0a0dc17 -shitou: 哎~我们跑货的，都是说不好的噻！ -shitou: 清晨睁眼他便出门~送货送到傍晚时分~🎵~他不怕辛苦不怕累~只恨没有翅膀~也不能飞~🎵 -shitou: 圆圆的大地~方方的天~大道的尽头看不见~🎵~他不觉得辛苦不觉得累~因为有朋友在身边~🎵 -shitou: 医生，现在我们就是朋友啦！ +shitou: 哎~我们跑货的，都是说不好的噻！ #line:02a48fc +shitou: 清晨睁眼他便出门~送货送到傍晚时分~🎵~他不怕辛苦不怕累~只恨没有翅膀~也不能飞~🎵 #line:01dbf24 +shitou: 圆圆的大地~方方的天~大道的尽头看不见~🎵~他不觉得辛苦不觉得累~因为有朋友在身边~🎵 #line:092dbbf +shitou: 医生，现在我们就是朋友啦！ #line:0d8ef4b <> <> -me: ……所以，你的心脏刚刚经过了一场大修。 -me: 这就是为什么心脏上有那么多痕迹…为什么冷却液这么浑浊… +me: ……所以，你的心脏刚刚经过了一场大修。 #line:0087bcb +me: 这就是为什么心脏上有那么多痕迹…为什么冷却液这么浑浊… #line:05b553b <> <> -me: …和为什么压力调得那么低。 +me: …和为什么压力调得那么低。 #line:09dca76 <> -me: …… -me: 那我岂不是… +me: …… #line:078c0a0 +me: 那我岂不是… #line:0e590d4 -【【提示一瓶打完】】 +// 表现注射结束 +<> +<> +<> +<> +<> +<> +// 表现完成 -shitou: 又打完一瓶了？真快呀！ +shitou: 又打完一瓶了？真快呀！ #line:0360212 -me: 别急，我需要重新评估一下……#auto_next +me: 别急，我需要重新评估一下……#auto_next #line:0bcd9df -shitou: 你不要调回来了，医生。 +shitou: 你不要调回来了，医生。 #line:0f8def0 <> <> -shitou: 哎呀！你帮我把最后一瓶打上吧，我一会告诉你为什么。 +shitou: 哎呀！你帮我把最后一瓶打上吧，我一会告诉你为什么。 #line:0bf5443 -me: …… -me: 哎，好吧。 -<> +me: …… #line:0679563 +me: 哎，好吧。 #line:0cb5d15 +<> +<> === @@ -769,74 +777,82 @@ title: 透析对话3 tags: position: 1041,1033 --- -me: 好了，这是最后一瓶了。 -me: 你最好能给出一个对你自己负责任的理由。 -me: 你这样子下去…身体肯定扛不住的。 +me: 好了，这是最后一瓶了。 #line:0d95c6f +me: 你最好能给出一个对你自己负责任的理由。 #line:049399a +me: 你这样子下去…身体肯定扛不住的。 #line:0920457 <> <> -shitou: 医生，我修这个心脏，医保不保的。 +shitou: 医生，我修这个心脏，医保不保的。 #line:0092877 -me: 所以？ +me: 所以？ #line:0d24213 -shitou: 医保只保了我的外伤什么的修复，心脏属于我个人改装的，不在医保范围内… -shitou: 医生说保费范围内，只能帮我换成基础的心脏。 -shitou: 但是我还要跑货的嘛…没有这个高级心脏…我还怎么跑货嘛。 -shitou: 那边有一个医生跟我说我可以签一个协议，借一笔钱，够我修好这个心脏… +shitou: 医保只保了我的外伤什么的修复，心脏属于我个人改装的，不在医保范围内… #line:01e55a8 +shitou: 医生说保费范围内，只能帮我换成基础的心脏。 #line:05ad3a4 +shitou: 但是我还要跑货的嘛…没有这个高级心脏…我还怎么跑货嘛。 #line:08bdc1e +shitou: 那边有一个医生跟我说我可以签一个协议，借一笔钱，够我修好这个心脏… #line:0674a68 -me: 医疗贷款？ +me: 医疗贷款？ #line:0a4987f -shitou: 对的，他就是这么说的…… +shitou: 对的，他就是这么说的…… #line:01946cb -me: 你借了多少积分？ +me: 你借了多少积分？ #line:02e9c6f -shitou: 32万积分。 +shitou: 32万积分。 #line:0d0643e -me: 利率多少？ +me: 利率多少？ #line:0b1016b <> <> -shitou: 百分之七。 +shitou: 百分之七。 #line:0fad969 -me: …… -me: 这也太高了。你怎么会… +me: …… #line:00db4ca +me: 这也太高了。你怎么会… #line:008c58f <> -me: 你就不能装那个普通的心脏吗？慢一点又会怎样呢…… +me: 你就不能装那个普通的心脏吗？慢一点又会怎样呢…… #line:0c50ea5 -shitou: 哎呀…医生…还好啦！我不晓得吗？钱没了，可以再赚嘛！ -shitou: 只不过现在跑货实在是越来越难咯！ -shitou: 我们现在跑一天的货，根本就存不下来多少积分。 -shitou: 油料，保养，生活……哪一样不要花积分？ -shitou: 是能省点就省点…但是现在靠省，根本省不下来啊！ -shitou: 我以前刚刚开始跑货的时候，一单能赚差不多十几积分，后来单价一直掉，现在一单只有七八分了。 -shitou: 有的人存一个月下来，不仅没多，去掉吃穿用度，还有倒扣的！ -shitou: 还好我跑得快，跑得多，每个月基本都能存点。 -shitou: 假如说这个心脏没了，要以后像这样下去，每单可能会掉到只有两三分了。 -shitou: 我要是没有这个高级心脏，到时候跑单也不行了，日子才苦嘞…都不知道怎么熬！ -shitou: 我肯定要把这个心脏保住先。多跑点单，等把借的积分赶紧还完，才能轻松嘛。 +shitou: 哎呀…医生…还好啦！我不晓得吗？钱没了，可以再赚嘛！ #line:0e9f273 +shitou: 只不过现在跑货实在是越来越难咯！ #line:05571c4 +shitou: 我们现在跑一天的货，根本就存不下来多少积分。 #line:0143f7c +shitou: 油料，保养，生活……哪一样不要花积分？ #line:02b6143 +shitou: 是能省点就省点…但是现在靠省，根本省不下来啊！ #line:0855ddf +shitou: 我以前刚刚开始跑货的时候，一单能赚差不多十几积分，后来单价一直掉，现在一单只有七八分了。 #line:0635589 +shitou: 有的人存一个月下来，不仅没多，去掉吃穿用度，还有倒扣的！ #line:0173b55 +shitou: 还好我跑得快，跑得多，每个月基本都能存点。 #line:0e0688e +shitou: 假如说这个心脏没了，要以后像这样下去，每单可能会掉到只有两三分了。 #line:0f6a6c8 +shitou: 我要是没有这个高级心脏，到时候跑单也不行了，日子才苦嘞…都不知道怎么熬！ #line:02f4ee0 +shitou: 我肯定要把这个心脏保住先。多跑点单，等把借的积分赶紧还完，才能轻松嘛。 #line:0aa3467 -me: …… -me: 也就是说，你保住这个高级心脏是为了应对未来的困难… -me: 而且要是我给你把速度调回去了，反而影响你还款了。 +me: …… #line:035dda6 +me: 也就是说，你保住这个高级心脏是为了应对未来的困难… #line:0768180 +me: 而且要是我给你把速度调回去了，反而影响你还款了。 #line:01ccdd2 -shitou: 对嘛！医生就是聪明，哈哈！ -shitou: （唱歌） +shitou: 对嘛！医生就是聪明，哈哈！ #line:0718070 +shitou: （唱歌） #line:0ef66b0 -【提示一瓶打完】 +// 表现注射结束 +<> +<> +<> +<> +<> +<> +<> +// 表现完成 -shitou: 医生，打完啦~哇，感觉确实舒服多了！（甩动双腿） -shitou: 那我就先走咯？ +shitou: 医生，打完啦~哇，感觉确实舒服多了！（甩动双腿） #line:0c06a29 +shitou: 那我就先走咯？ #line:05e7e7c -me: …你走吧。不过—— -me: 你要明天回来复查。 +me: …你走吧。不过—— #line:0846c2f +me: 你要明天回来复查。 #line:04c3f39 -shitou: 好，好……医生，真是太感谢你啦！ +shitou: 好，好……医生，真是太感谢你啦！ #line:0a0017d <> -me: 不客气…再见。 +me: 不客气…再见。 #line:082866e <> diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity index 21c8cb813..bb779d8c6 100644 --- a/Assets/Scenes/ExpressFixScene.unity +++ b/Assets/Scenes/ExpressFixScene.unity @@ -776,7 +776,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4070921155132268514, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4878312366005375122, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_SortingLayer @@ -793,7 +793,13 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3739177437028557049, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 2411966172391820548, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} --- !u!1 &199118572 GameObject: @@ -1515,7 +1521,7 @@ GameObject: - component: {fileID: 448946531} - component: {fileID: 448946532} - component: {fileID: 448946533} - m_Layer: 0 + m_Layer: 8 m_Name: Slot 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1693,7 +1699,7 @@ GameObject: m_Component: - component: {fileID: 488146692} - component: {fileID: 488146693} - m_Layer: 0 + m_Layer: 8 m_Name: "\u9501\u5B9A\u5360\u4F4D" m_TagString: Untagged m_Icon: {fileID: 0} @@ -2091,90 +2097,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &564511229 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 564511230} - - component: {fileID: 564511231} - m_Layer: 0 - m_Name: "\u8BCA\u6240\u80CC\u666F" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &564511230 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 564511229} - 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: 1027538763} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &564511231 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 564511229} - 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: 19 - m_Sprite: {fileID: -938042225230554273, guid: 3aee1fa72f2d3d7409533ba8197f66fc, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 41.135, y: 16.675} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &638818516 GameObject: m_ObjectHideFlags: 0 @@ -2795,7 +2717,7 @@ Transform: 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_LocalPosition: {x: 7.61, y: -5.398, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3715,56 +3637,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1027538762 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1027538763} - - component: {fileID: 1027538764} - m_Layer: 0 - m_Name: Clinic Scene - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1027538763 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1027538762} - 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: 564511230} - - {fileID: 1362020082} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1027538764 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1027538762} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ee95229f127bf4c45ab49816cd2ea8c8, type: 3} - 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 @@ -3985,7 +3857,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1112213369 Transform: m_ObjectHideFlags: 0 @@ -4734,50 +4606,6 @@ Transform: - {fileID: 1855379866570077322} m_Father: {fileID: 5866476691632637982} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1362020081 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1362020082} - - component: {fileID: 1362020083} - m_Layer: 0 - m_Name: Character - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1362020082 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1362020081} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.63, y: -1.33, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1027538763} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1362020083 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1362020081} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d109d83a617c845469dcde9ac20246be, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1410382568 GameObject: m_ObjectHideFlags: 0 @@ -6027,7 +5855,7 @@ GameObject: - component: {fileID: 1772405954} - component: {fileID: 1772405956} - component: {fileID: 1772405955} - m_Layer: 0 + m_Layer: 8 m_Name: Slot 2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -6526,7 +6354,7 @@ GameObject: - component: {fileID: 1932269924} - component: {fileID: 1932269926} - component: {fileID: 1932269925} - m_Layer: 0 + m_Layer: 8 m_Name: "\u74F6\u5B50\u63D2\u69FD" m_TagString: Untagged m_Icon: {fileID: 0} @@ -8414,7 +8242,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 27.087088, y: 10.015015} + m_Size: {x: 29.21, y: 10.8} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -8466,7 +8294,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 8.189189, y: 10.015015} + m_Size: {x: 8.835, y: 10.8} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -8513,12 +8341,12 @@ SpriteRenderer: m_SortingLayerID: 941243827 m_SortingLayer: 13 m_SortingOrder: 44 - m_Sprite: {fileID: -1355344570509163455, guid: cc12c4f35170969408e0dc663ac136b5, type: 3} + m_Sprite: {fileID: -2112830664448166309, guid: cc12c4f35170969408e0dc663ac136b5, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 2.0690691, y: 0.6546547} + m_Size: {x: 2.0744185, y: 0.6511628} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -9143,7 +8971,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &4112260238635059984 GameObject: m_ObjectHideFlags: 0 @@ -9373,7 +9201,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 2.2162163, y: 2.4864864} + m_Size: {x: 2.395, y: 2.685} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -9699,7 +9527,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!212 &4965776263762934416 SpriteRenderer: m_ObjectHideFlags: 0 @@ -9746,7 +9574,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 9.0120125, y: 4.216216} + m_Size: {x: 9.725, y: 4.55} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -9761,14 +9589,14 @@ Transform: m_GameObject: {fileID: 2741317479104502378} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.65, 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: - {fileID: 1223292340} - {fileID: 721921677827369965} - {fileID: 3425443257668001660} - m_Father: {fileID: 0} + m_Father: {fileID: 5393568355081744312} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5099857572599168637 MonoBehaviour: @@ -9916,6 +9744,7 @@ Transform: m_Children: - {fileID: 8173701869803289800} - {fileID: 1256907108225840196} + - {fileID: 5099857572599168636} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &5449320178873640439 @@ -10015,7 +9844,7 @@ GameObject: - component: {fileID: 5393568355081744312} - component: {fileID: 6490201648993155036} m_Layer: 0 - m_Name: "\u4E3B\u754C\u9762\u5C1D\u8BD5\u5C1D\u8BD5\u6700\u65B0\u5BFC\u51FA" + m_Name: Clinic System m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -10395,7 +10224,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 27.087088, y: 3.162162} + m_Size: {x: 29.21, y: 3.415} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -10712,7 +10541,7 @@ Transform: m_GameObject: {fileID: 5284943801058875444} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -3.5, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -10900,12 +10729,12 @@ SpriteRenderer: m_SortingLayerID: 941243827 m_SortingLayer: 13 m_SortingOrder: 43 - m_Sprite: {fileID: 1386028091417492230, guid: cc12c4f35170969408e0dc663ac136b5, type: 3} + m_Sprite: {fileID: 7883617568628749677, guid: cc12c4f35170969408e0dc663ac136b5, 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.7807808, y: 1.7237238} + m_Size: {x: 1.7906977, y: 1.7348837} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -11310,7 +11139,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4214753503693131867, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5795012028576405938, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} propertyPath: m_CameraType @@ -11390,11 +11219,9 @@ SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 7026926953013077400} - - {fileID: 1027538763} - {fileID: 154381820} - {fileID: 1410382569} - {fileID: 657112469} - {fileID: 1112213369} - {fileID: 9210352354887959608} - {fileID: 5393568355081744312} - - {fileID: 5099857572599168636} diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index df161820a..a251e89f4 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -1721,17 +1721,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 99451801} m_PrefabAsset: {fileID: 0} ---- !u!114 &99451806 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 99451801} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 99451805} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &114645688 GameObject: m_ObjectHideFlags: 0 @@ -2292,17 +2281,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 149374359} m_PrefabAsset: {fileID: 0} ---- !u!114 &149374364 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 149374359} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 149374363} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &152335402 PrefabInstance: m_ObjectHideFlags: 0 @@ -2682,17 +2660,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 188420210} m_PrefabAsset: {fileID: 0} ---- !u!114 &188420215 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 188420210} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 188420214} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &190090867 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -3173,17 +3140,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 216794752} m_PrefabAsset: {fileID: 0} ---- !u!114 &216794757 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 216794752} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 216794756} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &237392154 GameObject: m_ObjectHideFlags: 0 @@ -5323,17 +5279,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 475823254} m_PrefabAsset: {fileID: 0} ---- !u!114 &475823259 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 475823254} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 475823258} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &476337178 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -6622,7 +6567,7 @@ MonoBehaviour: m_Intensity: 1 m_LightVolumeIntensity: 1 m_LightVolumeIntensityEnabled: 0 - m_ApplyToSortingLayers: 00000000 + m_ApplyToSortingLayers: 00000000bbbb5032670b9971b7e66ab5d3878c191da0cc5f7740d514351d35393d533d9a7dc3a93dad9d9e43a55d9d3c8db9e11bb33d1a38cd4376e253b7f3d021d98fe13394c912c7af7730 m_LightCookieSprite: {fileID: 0} m_DeprecatedPointLightCookieSprite: {fileID: 0} m_LightOrder: 0 @@ -6947,17 +6892,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 629580921} m_PrefabAsset: {fileID: 0} ---- !u!114 &629580926 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 629580921} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 629580925} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &651726652 GameObject: m_ObjectHideFlags: 0 @@ -7697,7 +7631,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: runMode: 1 - firstTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} + firstTalkSo: {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2} clinicScene: ClinicScene testYarnProject: Re_LTS_Peipeiday1 --- !u!4 &719228339 @@ -8478,7 +8412,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0.4627451} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -9823,17 +9757,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 852388791} m_PrefabAsset: {fileID: 0} ---- !u!114 &852388796 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 852388791} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 852388795} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &855263533 GameObject: m_ObjectHideFlags: 0 @@ -10829,7 +10752,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 - m_SortingOrder: 8 + m_SortingOrder: 7 m_TargetDisplay: 0 --- !u!224 &984233631 RectTransform: @@ -11952,7 +11875,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1200911921 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15175,17 +15098,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 1556863295} m_PrefabAsset: {fileID: 0} ---- !u!114 &1556863300 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 1556863295} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1556863299} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1560719975 GameObject: m_ObjectHideFlags: 0 @@ -15862,17 +15774,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 1437328103} m_PrefabAsset: {fileID: 0} ---- !u!114 &1599989369 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 1437328103} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1599989368} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1604842425 GameObject: m_ObjectHideFlags: 0 @@ -15954,7 +15855,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 - m_SortingOrder: 7 + m_SortingOrder: 8 m_TargetDisplay: 0 --- !u!224 &1604842429 RectTransform: @@ -16290,19 +16191,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a2f82f623f7c479cb5d1935ee6067484, type: 3} m_Name: m_EditorClassIdentifier: - _nodes: - - {fileID: 99451806} - - {fileID: 149374364} - - {fileID: 188420215} - - {fileID: 216794757} - - {fileID: 475823259} - - {fileID: 500438203} - - {fileID: 629580926} - - {fileID: 852388796} - - {fileID: 1556863300} - - {fileID: 1592246587} - - {fileID: 1599989369} - - {fileID: 1989818787} + _nodes: [] _connections: [] _cacheRaycasters: 1 --- !u!4 &1620453322 @@ -19245,17 +19134,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 1989818781} m_PrefabAsset: {fileID: 0} ---- !u!114 &1989818787 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} - m_PrefabInstance: {fileID: 1989818781} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1989818785} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1990871918 GameObject: m_ObjectHideFlags: 0 @@ -23782,7 +23660,7 @@ RectTransform: m_Father: {fileID: 265254503306996572} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -30718,7 +30596,7 @@ MonoBehaviour: rectTransform: {fileID: 8007592087727081612} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -32414,7 +32292,7 @@ MonoBehaviour: rectTransform: {fileID: 7282059703919780462} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -34408,19 +34286,7 @@ MonoBehaviour: mainCamera: {fileID: 519420031} lineRenderer: {fileID: 3253743068496567163} contentPanel: {fileID: 243936684424215245} - localNodes: - - {fileID: 99451806} - - {fileID: 149374364} - - {fileID: 188420215} - - {fileID: 216794757} - - {fileID: 475823259} - - {fileID: 500438203} - - {fileID: 629580926} - - {fileID: 852388796} - - {fileID: 1556863300} - - {fileID: 1592246587} - - {fileID: 1599989369} - - {fileID: 1989818787} + localNodes: [] localConnections: [] pointer: customImage: {fileID: 1475193827753151906} @@ -34804,7 +34670,7 @@ MonoBehaviour: rectTransform: {fileID: 8980408154347076217} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -35287,7 +35153,7 @@ MonoBehaviour: rectTransform: {fileID: 9150678032829601296} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -36278,7 +36144,7 @@ MonoBehaviour: rectTransform: {fileID: 8305720147907504314} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -43137,7 +43003,7 @@ MonoBehaviour: rectTransform: {fileID: 2041500036121329234} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -46935,7 +46801,7 @@ MonoBehaviour: rectTransform: {fileID: 3037079921269169012} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -48903,7 +48769,7 @@ MonoBehaviour: rectTransform: {fileID: 2592852046776807969} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -50058,7 +49924,7 @@ RectTransform: m_Father: {fileID: 6498488201931268245} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -50332,7 +50198,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7966889870541532172 RectTransform: m_ObjectHideFlags: 0 @@ -52744,7 +52610,7 @@ MonoBehaviour: rectTransform: {fileID: 4596928483061751012} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -53660,7 +53526,7 @@ MonoBehaviour: rectTransform: {fileID: 3538142130825932876} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 3728315362672514892} + graphManager: {fileID: 0} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs index 936d7e6a7..381a426d6 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs @@ -67,7 +67,7 @@ namespace AibisDream.FixSystem CableSystem = transform.Find("Cable System").GetComponent(); bodyModuleGroup = transform.Find("Body Module Group"); oscilloscopeSystem = transform.Find("Oscilloscope System").GetComponent(); - heatMapController=transform.Find("HeatMapController").GetComponent(); + // heatMapController=transform.Find("HeatMapController").GetComponent(); FixSystemCenter.SystemDic.Register(this); } diff --git a/Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs b/Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs index aaf4ee92e..ca084ed43 100644 --- a/Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs +++ b/Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs @@ -42,7 +42,7 @@ namespace AibisDream.FixSystem // 初始化处理 _curCharacter.SetActive(false); - _blinkLayer = transform.Find("眨眼").GetComponent(); + _blinkLayer = _curCharacter.transform.Find("闭眼").GetComponent(); _blinkLayer.enabled = false; // 表情和动作只留一种 ActiveLayer(FaceGroup); diff --git a/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs b/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs index 9783c9d37..a383b25aa 100644 --- a/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs +++ b/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs @@ -9,6 +9,7 @@ namespace AibisDream { [HideInInspector] public CharacterViewer character; private Transform _pumpHead; + private GameObject _coolingScreen; public Vector3 pumpUpPos; public Vector3 pumpDownPos; @@ -20,6 +21,7 @@ namespace AibisDream character = transform.GetComponentInChildren(); _pumpHead = transform.Find("正图").Find("近景").Find("桌上泵头"); + _coolingScreen = transform.Find("正图").Find("近景").Find("桌面泵机运作时亮灯").gameObject; } public IEnumerator Indoor(float duration) @@ -41,12 +43,16 @@ namespace AibisDream { _pumpHead.DOLocalMove(pumpDownPos, pumpDuration).SetLoops(-1, LoopType.Yoyo) .SetEase(Ease.Linear); + // 点亮屏幕 + _coolingScreen.SetActive(true); } public void StopTablePump() { _pumpHead.DOKill(); _pumpHead.DOLocalMove(pumpUpPos, 0.5f); + // 熄灭屏幕 + _coolingScreen.SetActive(false); } } } \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/Clinic/ClinicYarnCommand.cs b/Assets/Scripts/FixSystemNew/Clinic/ClinicYarnCommand.cs index d1846d3f1..c66714eef 100644 --- a/Assets/Scripts/FixSystemNew/Clinic/ClinicYarnCommand.cs +++ b/Assets/Scripts/FixSystemNew/Clinic/ClinicYarnCommand.cs @@ -52,13 +52,13 @@ namespace AibisDream #region 角色动作调整 - [YarnCommand("character_face")] + [YarnCommand("character_face_new")] public static void CharacterFace(string state) { Character.SwitchFace(state); } - [YarnCommand("character_eye")] + [YarnCommand("character_eye_new")] public static void CharacterEye(string state) { // Character.SetEyeState(state); @@ -83,6 +83,12 @@ namespace AibisDream { Character.AutoBlink(); } + + [YarnCommand("character_stop_auto_blink")] + public static void StopAutoBlink() + { + Character.StopAutoBlink(); + } [YarnCommand("character_add_device")] public static void AddLinkDevice() diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs index 08d790091..b8dc0e5bf 100644 --- a/Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs +++ b/Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs @@ -85,6 +85,7 @@ namespace AibisDream.FixSystem public void InsertSlot(CoolingBottle coolingBottle) { _curBottle = coolingBottle; + _curBottle.transform.parent = transform; // 在架子上才正过来 if (_inShelf) { @@ -106,8 +107,9 @@ namespace AibisDream.FixSystem { if (_curBottle) { + _curBottle.transform.parent = null; + Destroy(_curBottle.gameObject); _curBottle = null; - Destroy(_curBottle); } } } diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingBottle.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingBottle.cs index abe43b792..5f7c7f64e 100644 --- a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingBottle.cs +++ b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingBottle.cs @@ -91,6 +91,8 @@ namespace AibisDream.FixSystem curSnapSlot.RemoveBottle(); // 更新到新的Slot curSnapSlot = targetSlot; + + curSnapSlot.InsertSlot(this); } targetSnapSlotSet.Clear(); @@ -98,7 +100,7 @@ namespace AibisDream.FixSystem // 吸附到目标位置 _rb.isKinematic = true; transform.DOMove(curSnapSlot.transform.position, SnapMoveTime); - curSnapSlot.InsertSlot(this); + // TODO 停止描边 } diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs index a1dd1c030..51f9e08d8 100644 --- a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs +++ b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs @@ -68,14 +68,14 @@ namespace AibisDream.Framework public void InsertBottle(CoolingBottle bottle) { // 设置当前瓶子名称 - DialogController.Instance.SetVariable("curBottleName", bottle.data.name); + DialogController.Instance.SetVariable("$curBottleName", bottle.data.name); // 触发插入对话 DialogController.Instance.StartDialogNode("插入冷却液"); } public void RemoveBottle() { - DialogController.Instance.SetVariable("curBottleName", ""); + DialogController.Instance.SetVariable("$curBottleName", ""); } public void Lock() @@ -99,7 +99,7 @@ namespace AibisDream.Framework var clinicSystem = FixSystemCenter.SystemDic.Get(); clinicSystem.StartTablePump(); // 播放泵机运行对话 - DialogController.Instance.StartDialogNode($"泵机运行_{CurBottle.data.name}"); + DialogController.Instance.StartDialogNode($"泵机运行"); } } diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystemCommand.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystemCommand.cs index f7e1610bf..89e09ba10 100644 --- a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystemCommand.cs +++ b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystemCommand.cs @@ -79,9 +79,11 @@ namespace AibisDream.FixSystem } // 运行结束 + [YarnCommand("stop_pump")] public static void StopPump() { var cooling = FixSystemCenter.SystemDic.Get(); + cooling.StopPump(); } } } \ No newline at end of file diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/PumpController.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/PumpController.cs index 97c2fe23a..56ee3958a 100644 --- a/Assets/Scripts/FixSystemNew/CoolingMachine/PumpController.cs +++ b/Assets/Scripts/FixSystemNew/CoolingMachine/PumpController.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections; +using System.Collections; using AibisDream.Framework; using DG.Tweening; using UnityEngine; @@ -39,6 +38,7 @@ namespace AibisDream.FixSystem private GameObject _lockBox; private Transform _pumpHead; + private GameObject _coolingScreen; #endregion @@ -69,18 +69,13 @@ namespace AibisDream.FixSystem var pumpGroup = transform.Find("泵机组"); _pumpHead = pumpGroup.Find("泵头"); + _coolingScreen = pumpGroup.Find("泵机运作时亮灯").gameObject; bottleSlot = GetComponentInChildren(); bottleSlot.InsertSlotEvent += _coolingSystem.InsertBottle; bottleSlot.RemoveSlotEvent += _coolingSystem.RemoveBottle; } - - // private void Start() - // { - // // 隐藏 - // gameObject.SetActive(false); - // } - + #region 按钮 private void LockButtonDown() @@ -153,12 +148,14 @@ namespace AibisDream.FixSystem { _pumpHead.DOLocalMove(pumpDownPos, pumpDuration).SetLoops(-1, LoopType.Yoyo) .SetEase(Ease.Linear); + _coolingScreen.SetActive(true); } public void StopPumpAnime() { _pumpHead.DOKill(); _pumpHead.localPosition = pumpUpPos; + _coolingScreen.SetActive(false); } public void DestroyBottle() diff --git a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs index 78267758c..3d024bbb1 100644 --- a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs +++ b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs @@ -43,6 +43,7 @@ namespace AibisDream.FixSystem TransitionDic.Add(FixState.BodyModule, FixState.UF, new BodyModuleToUFCommand()); TransitionDic.Add(FixState.UF, FixState.BodyModule, new UFToBodyModuleCommand()); TransitionDic.Add(FixState.Clinic, FixState.CoolingMachine, new ClinicToCoolingCommand()); + TransitionDic.Add(FixState.CoolingMachine, FixState.Clinic, new CoolingToClinicCommand()); } /// diff --git a/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs b/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs index 051169ce7..def56054b 100644 --- a/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs +++ b/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs @@ -21,6 +21,7 @@ namespace AibisDream.FixSystem bodyModuleSystem.Load(); // 隐藏诊所 clinicSystem.gameObject.SetActive(false); + // 黑屏淡出 yield return MainUIController.Instance.FadeOutSync(FadeDuration); } @@ -75,23 +76,44 @@ namespace AibisDream.FixSystem { private static readonly Vector3 CameraPos = new(6.61f, 0, -10); private const float Duration = 2f; + private bool _playLink; public IEnumerator Execute() { var coolingSystem = FixSystemCenter.SystemDic.Get(); - // 移动相机 yield return CameraKit.Instance.TransCameraAsync(CameraPos, Duration); // 打开泵机 coolingSystem.gameObject.SetActive(true); yield return coolingSystem.OpenCoolingSystem(); // 播放插线动画 - yield return coolingSystem.LinkTube(); + if (_playLink) + { + yield return coolingSystem.LinkTube(); + } } public void SetArgs(string arg) { - // 没有需要设置的参数 + _playLink = !string.IsNullOrEmpty(arg); + } + } + + public struct CoolingToClinicCommand : ITransitionCommand + { + public IEnumerator Execute() + { + var cooling = FixSystemCenter.SystemDic.Get(); + + yield return cooling.CloseBottleUI(); + yield return cooling.CloseCoolingSystem(); + yield return new WaitForSeconds(1f); + yield return CameraKit.Instance.ReturnInitCamera(2f); + } + + public void SetArgs(string arg) + { + // 没有需要设置的 } } } \ No newline at end of file diff --git a/Assets/Scripts/Framework/OtherKit/MonoCenter.cs b/Assets/Scripts/Framework/OtherKit/MonoCenter.cs index 9aa7ef41f..32b597702 100644 --- a/Assets/Scripts/Framework/OtherKit/MonoCenter.cs +++ b/Assets/Scripts/Framework/OtherKit/MonoCenter.cs @@ -49,7 +49,7 @@ namespace AibisDream.Framework { if (Input.GetKeyDown(KeyCode.K)) { - MonoCenter.Mono.StartCoroutine(FixSystemYarnCommand.SwitchFixSystemTo("CoolingMachine")); + MonoCenter.Mono.StartCoroutine(FixSystemYarnCommand.SwitchFixSystemTo("BodyModule")); } if (Input.GetKeyDown(KeyCode.A)) diff --git a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs index 4d8422308..64efdd6eb 100644 --- a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs +++ b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs @@ -57,8 +57,7 @@ namespace AibisDream engineData.CalcSpeed(config.acceleratedSpeed, config.resistance); // 判断是否成功 if (engineData.CheckSuccess(config.targetSpeed)) - { - Debug.Log("EngineSuccess"); + {; DialogController.Instance?.StartDialogNode("EngineSuccess"); } } @@ -219,7 +218,7 @@ namespace AibisDream [Serializable] public struct EngineData { - private const float SuccessDuration = 3f; + private const float SuccessDuration = 1.5f; public float curSpeed; public float curOil; diff --git a/Assets/StreamingAssets/Config/character.csv b/Assets/StreamingAssets/Config/character.csv index d927c8177..26ab5b3d0 100644 --- a/Assets/StreamingAssets/Config/character.csv +++ b/Assets/StreamingAssets/Config/character.csv @@ -8,3 +8,4 @@ tutorial,教学,Aside,,, docter,儿科医生,Aside,#FFCC00,, peipei_child,童年佩佩,Aside,#00FFFF,,voice_peipei unknown,？？？,Aside,#FFCC00,, +shitou,石头,Aside,,,voice_shitou diff --git a/Assets/StreamingAssets/LevelData/BodyModuleSystem/temp.json b/Assets/StreamingAssets/LevelData/BodyModuleSystem/temp.json index 71dcf88e8..13d07e501 100644 --- a/Assets/StreamingAssets/LevelData/BodyModuleSystem/temp.json +++ b/Assets/StreamingAssets/LevelData/BodyModuleSystem/temp.json @@ -1 +1 @@ -{"hasHotErr":false,"moduleDataArray":[{"moduleName":"Memory","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/记忆模块","modulePos":{"x":-2.524,"y":2.662,"z":0.0},"socketPos":{"x":0.092,"y":0.017,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":true},{"moduleName":"UF","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/UF底板","modulePos":{"x":-4.406,"y":0.431,"z":0.0},"socketPos":{"x":-0.243,"y":0.148,"z":0.0},"waveformType":2,"waveHasError":true,"ignoreWaveCheck":false},{"moduleName":"Eye","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/右眼","modulePos":{"x":-0.471,"y":0.604,"z":0.0},"socketPos":{"x":-0.879,"y":-0.57,"z":0.0},"waveformType":1,"waveHasError":true,"ignoreWaveCheck":false},{"moduleName":"Color","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/色觉","modulePos":{"x":-2.554,"y":0.689,"z":0.0},"socketPos":{"x":-0.003,"y":-0.744,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"Emo","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/情绪模块","modulePos":{"x":-4.5,"y":2.16,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":1,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"Logic","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/思维模块","modulePos":{"x":-0.67,"y":2.16,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":2,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"Speak","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/讲话模块","modulePos":{"x":-2.58,"y":-2.51,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":1,"waveHasError":false,"ignoreWaveCheck":false}]} \ No newline at end of file +{"hasHotErr":false,"moduleDataArray":[]} \ No newline at end of file diff --git a/ProjectSettings/BurstAotSettings_Android.json b/ProjectSettings/BurstAotSettings_Android.json new file mode 100644 index 000000000..ce2d8aa9e --- /dev/null +++ b/ProjectSettings/BurstAotSettings_Android.json @@ -0,0 +1,17 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "DebugDataKind": 1, + "EnableArmv9SecurityFeatures": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsArm64": 512, + "OptimizeFor": 0 + } +} diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset index 6cfcddaac..02392b898 100644 --- a/ProjectSettings/Physics2DSettings.asset +++ b/ProjectSettings/Physics2DSettings.asset @@ -3,7 +3,7 @@ --- !u!19 &1 Physics2DSettings: m_ObjectHideFlags: 0 - serializedVersion: 5 + serializedVersion: 6 m_Gravity: {x: 0, y: -9.81} m_DefaultMaterial: {fileID: 0} m_VelocityIterations: 8 @@ -44,13 +44,5 @@ Physics2DSettings: m_CallbacksOnDisable: 1 m_ReuseCollisionCallbacks: 1 m_AutoSyncTransforms: 0 - m_AlwaysShowColliders: 0 - m_ShowColliderSleep: 1 - m_ShowColliderContacts: 0 - m_ShowColliderAABB: 0 - m_ContactArrowScale: 0.2 - m_ColliderAwakeColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.7529412} - m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432} - m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745} - m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804} - m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_GizmoOptions: 10 + m_LayerCollisionMatrix: fffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index d12924c17..49550c5fe 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -19,7 +19,7 @@ TagManager: - UI - Post - ViewPost - - + - Clinic - - -