diff --git a/.gitignore b/.gitignore index e94999005..b050acdab 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,6 @@ crashlytics-build.properties # Log files can be ignored. fmod_editor.log + +# 排除Sim的自动保存 +.history/* diff --git a/Assets/RawResources/Art/佩佩最新.psb b/Assets/RawResources/Art/佩佩最新.psb index a52b3936a..43b01c5d5 100644 --- a/Assets/RawResources/Art/佩佩最新.psb +++ b/Assets/RawResources/Art/佩佩最新.psb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f827bfc20daa5c76895b81f5ddab3a7c855ebf69f9b518415378791f8c937ff4 -size 24667270 +oid sha256:7e274f1e7facc91932b1bc52b873780180bfa0d533211d3968c69ace0b9dd73e +size 21283491 diff --git a/Assets/RawResources/Art/佩佩最新.psb.meta b/Assets/RawResources/Art/佩佩最新.psb.meta index 97cb0cd05..453e327c5 100644 --- a/Assets/RawResources/Art/佩佩最新.psb.meta +++ b/Assets/RawResources/Art/佩佩最新.psb.meta @@ -94,7 +94,7 @@ ScriptedImporter: spritePosition: {x: 0, y: 0} mosaicSpriteImportData: [] rigSpriteImportData: - - name: "\u8272\u5F69\u5E73\u8861 2" + - name: "\u4FA7\u4F4E\u5934\u6D41\u6CEA" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 @@ -102,10 +102,10 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4 - y: 4340 - width: 5840 - height: 859 - spriteID: d4d4aea2c2016e649b8e0cfe63fb5d88 + y: 3742 + width: 184 + height: 118 + spriteID: eaf067e870cce344d96a242bb24b655b spriteBone: [] spriteOutline: [] vertices: [] @@ -113,8 +113,239 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 4340} - spritePosition: {x: 0, y: 0} + uvTransform: {x: 4, y: 3742} + spritePosition: {x: 1963, y: 1169} + - name: "\u4FA7\u4F4E\u5934\u9634\u90C1\u6392\u7EBF\u9634\u5F71" + 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: 3326 + width: 204 + height: 201 + spriteID: 3de014ab6330ed3468e914407f0ce870 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 3326} + spritePosition: {x: 1959, y: 1201} + - name: "\u5F00\u5FC3\u7709\u6BDB" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 830 + y: 3535 + width: 227 + height: 67 + spriteID: cfbb978486aa09f418831ff2fcb76cac + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 830, y: 3535} + spritePosition: {x: 1927, y: 1298} + - name: "\u4FA7\u4F4E\u5934\u95ED\u773C" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 4 + y: 3535 + width: 234 + height: 94 + spriteID: 926d3c1901b595646b165f453eb36796 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 3535} + spritePosition: {x: 1936, y: 1252} + - name: "\u4FA7\u4F4E\u5934\u4FA7\u773C\u84DD\u8272\u773C\u775B" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 809 + y: 3637 + width: 212 + height: 71 + spriteID: 936784ce9e30ebd40a141f04912e459f + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 809, y: 3637} + spritePosition: {x: 1961, y: 1265} + - name: "\u6D4B\u4F4E\u5934\u4FA7\u773C" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 196 + y: 3742 + width: 188 + height: 49 + spriteID: 3667672aff98acf42a94fab8d506aaa3 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 196, y: 3742} + spritePosition: {x: 1961, y: 1265} + - name: "\u4FA7\u4F4E\u5934\u84DD\u8272\u773C\u775B" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 908 + y: 3326 + width: 111 + height: 67 + spriteID: 5060421e7f2980843bef53d63d95c961 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 908, y: 3326} + spritePosition: {x: 2062, y: 1269} + - name: "\u4FA7\u4F4E\u5934\u4E0D\u723D\u5634\u578B" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 943 + y: 3464 + width: 60 + height: 25 + spriteID: 330a0cfdcb6617a4a9ab8fddfa3b99f0 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 943, y: 3464} + spritePosition: {x: 2041, y: 1177} + - name: "\u4FA7\u4F4E\u5934\u82E6\u7B11\u5634\u578B" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 943 + y: 3497 + width: 60 + height: 25 + spriteID: cc75923725bc38b47a45e1a42d717fe5 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 943, y: 3497} + spritePosition: {x: 2041, y: 1177} + - name: "\u4FA7\u4F4E\u5934\u5F20\u5634 " + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1011 + y: 3464 + width: 49 + height: 14 + spriteID: e0614013db635444ba040e033d8ebedc + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1011, y: 3464} + spritePosition: {x: 2046, y: 1181} + - name: "\u5927\u6C57\u6DCB\u6F13\u6D41\u6C57" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 216 + y: 3326 + width: 198 + height: 192 + spriteID: 9a48007df5cee634fa3dbecf25eb6cfd + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 216, y: 3326} + spritePosition: {x: 1961, y: 1211} + - name: "\u6D41\u6C57" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 422 + y: 3326 + width: 181 + height: 150 + spriteID: 73a4ecbba4bd73844967c63a0963264e + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 422, y: 3326} + spritePosition: {x: 1971, y: 1253} - name: "\u7AD9\u59FF\u6D41\u6CEA" originalName: pivot: {x: 0.5, y: 0.5} @@ -122,8 +353,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 5852 - y: 1813 + x: 4 + y: 3637 width: 225 height: 97 spriteID: c511e4ebed16e5b4d8b21ef98f2c3645 @@ -134,17 +365,101 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 5852, y: 1813} + uvTransform: {x: 4, y: 3637} spritePosition: {x: 1943, y: 1230} - - name: "\u6709\u773C\u888B\u65E0\u795E\u773C\u775B" + - name: "\u751F\u6C14\u7709\u6BDB" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 5852 - y: 1722 + x: 533 + y: 3535 + width: 289 + height: 70 + spriteID: c1c0dbb88f13ac04690ba50ad107bf38 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 533, y: 3535} + spritePosition: {x: 1914, y: 1341} + - name: "\u5F00\u5FC3\u7709\u6BDB" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 512 + y: 3637 + width: 289 + height: 65 + spriteID: 107b5362b04957543aa194ffc1dd6b97 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 512, y: 3637} + spritePosition: {x: 1914, y: 1341} + - name: "\u95ED\u773C" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 611 + y: 3326 + width: 289 + height: 90 + spriteID: 13759f6778e6434439215d15d1ce7e61 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 611, y: 3326} + spritePosition: {x: 1908, y: 1293} + - name: "\u65E0\u795E\u773C\u775B" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 246 + y: 3535 + width: 279 + height: 74 + spriteID: b177f24eaa693dd449349b94b196180e + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 246, y: 3535} + spritePosition: {x: 1922, y: 1305} + - name: "\u96BE\u53D7\u773C\u775B" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 611 + y: 3424 width: 267 height: 83 spriteID: 409e6df1a694ca145811e0c423eb1ba6 @@ -155,7 +470,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 5852, y: 1722} + uvTransform: {x: 611, y: 3424} spritePosition: {x: 1928, y: 1296} - name: "\u65E0\u8868\u60C5\u773C\u775B" originalName: @@ -164,8 +479,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 6127 - y: 1722 + x: 237 + y: 3637 width: 267 height: 74 spriteID: 55e6657952d657b4abde3b8daa4c819e @@ -176,8 +491,176 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 6127, y: 1722} + uvTransform: {x: 237, y: 3637} spritePosition: {x: 1928, y: 1305} + - name: "UF\u4FEE\u597D\u540E\u84DD\u8272\u773C\u775B" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 886 + y: 3464 + width: 49 + height: 42 + spriteID: 6ae2beecc4d7d0147b315b5af62b82c0 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 886, y: 3464} + spritePosition: {x: 2113, y: 1320} + - name: "\u5634\u578BD" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 496 + y: 3484 + width: 65 + height: 37 + spriteID: 7d55ccfc1b0a47a47bd5927a1fff8638 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 496, y: 3484} + spritePosition: {x: 2028, y: 1213} + - name: "\u5634\u578BC" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 422 + y: 3484 + width: 66 + height: 40 + spriteID: a58b4e2f5ca03ea44a1a151a611bedbc + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 422, y: 3484} + spritePosition: {x: 2029, y: 1211} + - name: "\u5634\u578BB" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 886 + y: 3424 + width: 65 + height: 32 + spriteID: de971eda7485fb448aab553e1cf2300c + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 886, y: 3424} + spritePosition: {x: 2029, y: 1213} + - name: "\u5634\u578BA" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 959 + y: 3424 + width: 64 + height: 32 + spriteID: f3bb04fe9065d984ead423ef233bd3e3 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 959, y: 3424} + spritePosition: {x: 2029, y: 1213} + - name: "\u753B\u753B\u5934\u75BC" + 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: 1722 + width: 1055 + height: 1596 + spriteID: 7e76955e527cd434699c7a4c250935b4 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 1690} + spritePosition: {x: 1501, y: 32} + - name: "\u4FA7\u4F4E\u5934\u80CC\u624B" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1075 + y: 4 + width: 1091 + height: 1480 + spriteID: d8011c55562e9f04fa646fcf82d15561 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1075, y: -215} + spritePosition: {x: 1593, y: 219} + - name: "\u4FA7\u4F4E\u5934\u62B1\u624B" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 2174 + y: 4 + width: 911 + height: 1699 + spriteID: e42f0ccc35e1cd1459ec680ca4e4fc4d + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 2174, y: 4} + spritePosition: {x: 1745, y: 0} - name: "\u753B\u753B\u59FF\u52BF" originalName: pivot: {x: 0.5, y: 0.5} @@ -185,7 +668,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 5852 + x: 4 y: 4 width: 1063 height: 1710 @@ -197,20 +680,20 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 5852, y: -28} + uvTransform: {x: 4, y: -28} spritePosition: {x: 1505, y: 32} - - name: "\u591C\u665A" + - name: "\u4F69\u4F69\u9ED8\u8BA4\u59FF\u52BF" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4 - y: 4 - width: 5840 - height: 2160 - spriteID: 4abfec19be86e564d982e7542b781aa3 + x: 1075 + y: 1492 + width: 911 + height: 1742 + spriteID: 19e6a5f6ca2b72741b99c5a69d2db805 spriteBone: [] spriteOutline: [] vertices: [] @@ -218,29 +701,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 4} - spritePosition: {x: 0, y: 0} - - name: "\u767D\u5929" - 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: 2172 - width: 5840 - height: 2160 - spriteID: 550c4d98b1bb1004e85b77df14d2ea5f - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 4, y: 2172} - spritePosition: {x: 0, y: 0} + uvTransform: {x: 1075, y: 1492} + spritePosition: {x: 1681, y: 0} characterData: bones: [] parts: [] @@ -343,8 +805,8 @@ ScriptedImporter: layerID: 890 mosaicPosition: {x: 4, y: 4340} flatten: 0 - isImported: 1 - isVisible: 1 + isImported: 0 + isVisible: 0 - name: "\u4F69\u4F69" spriteName: isGroup: 1 @@ -374,16 +836,16 @@ ScriptedImporter: mosaicPosition: {x: 0, y: 0} flatten: 0 isImported: 0 - isVisible: 0 + isVisible: 1 - name: "\u4FA7\u4F4E\u5934\u6D41\u6CEA" spriteName: "\u4FA7\u4F4E\u5934\u6D41\u6CEA" isGroup: 0 parentIndex: 3 spriteID: eaf067e870cce344d96a242bb24b655b layerID: 550 - mosaicPosition: {x: 4, y: 3410} + mosaicPosition: {x: 4, y: 3742} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u4FA7\u4F4E\u5934\u9634\u90C1\u6392\u7EBF\u9634\u5F71" spriteName: "\u4FA7\u4F4E\u5934\u9634\u90C1\u6392\u7EBF\u9634\u5F71" @@ -391,49 +853,49 @@ ScriptedImporter: parentIndex: 3 spriteID: 3de014ab6330ed3468e914407f0ce870 layerID: 776 - mosaicPosition: {x: 4, y: 3119} + mosaicPosition: {x: 4, y: 3326} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u5F00\u5FC3\u7709\u6BDB" spriteName: "\u5F00\u5FC3\u7709\u6BDB" isGroup: 0 parentIndex: 3 spriteID: cfbb978486aa09f418831ff2fcb76cac layerID: 858 - mosaicPosition: {x: 778, y: 3315} + mosaicPosition: {x: 830, y: 3535} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u4FA7\u4F4E\u5934\u95ED\u773C" spriteName: "\u4FA7\u4F4E\u5934\u95ED\u773C" isGroup: 0 parentIndex: 3 spriteID: 926d3c1901b595646b165f453eb36796 layerID: 874 - mosaicPosition: {x: 4, y: 3315} + mosaicPosition: {x: 4, y: 3535} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u4FA7\u4F4E\u5934\u4FA7\u773C\u84DD\u8272\u773C\u775B" spriteName: "\u4FA7\u4F4E\u5934\u4FA7\u773C\u84DD\u8272\u773C\u775B" isGroup: 0 parentIndex: 3 spriteID: 936784ce9e30ebd40a141f04912e459f layerID: 875 - mosaicPosition: {x: 718, y: 3410} + mosaicPosition: {x: 809, y: 3637} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u6D4B\u4F4E\u5934\u4FA7\u773C" spriteName: "\u6D4B\u4F4E\u5934\u4FA7\u773C" isGroup: 0 parentIndex: 3 spriteID: 3667672aff98acf42a94fab8d506aaa3 layerID: 787 - mosaicPosition: {x: 4, y: 3528} + mosaicPosition: {x: 196, y: 3742} flatten: 0 - isImported: 0 + isImported: 1 isVisible: 1 - name: "\u4FA7\u4F4E\u5934\u84DD\u8272\u773C\u775B" spriteName: "\u4FA7\u4F4E\u5934\u84DD\u8272\u773C\u775B" @@ -441,40 +903,40 @@ ScriptedImporter: parentIndex: 3 spriteID: 5060421e7f2980843bef53d63d95c961 layerID: 865 - mosaicPosition: {x: 850, y: 3119} + mosaicPosition: {x: 908, y: 3326} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u4FA7\u4F4E\u5934\u4E0D\u723D\u5634\u578B" spriteName: "\u4FA7\u4F4E\u5934\u4E0D\u723D\u5634\u578B" isGroup: 0 parentIndex: 3 spriteID: 330a0cfdcb6617a4a9ab8fddfa3b99f0 layerID: 862 - mosaicPosition: {x: 924, y: 3454} + mosaicPosition: {x: 943, y: 3464} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u4FA7\u4F4E\u5934\u82E6\u7B11\u5634\u578B" spriteName: "\u4FA7\u4F4E\u5934\u82E6\u7B11\u5634\u578B" isGroup: 0 parentIndex: 3 spriteID: cc75923725bc38b47a45e1a42d717fe5 layerID: 861 - mosaicPosition: {x: 896, y: 3210} + mosaicPosition: {x: 943, y: 3497} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u4FA7\u4F4E\u5934\u5F20\u5634 " spriteName: "\u4FA7\u4F4E\u5934\u5F20\u5634 " isGroup: 0 parentIndex: 3 spriteID: e0614013db635444ba040e033d8ebedc layerID: 555 - mosaicPosition: {x: 882, y: 3247} + mosaicPosition: {x: 1011, y: 3464} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u9ED8\u8BA4\u548C\u753B\u753B\u59FF\u52BF\u8868\u60C5" spriteName: isGroup: 1 @@ -491,27 +953,27 @@ ScriptedImporter: parentIndex: 14 spriteID: 9a48007df5cee634fa3dbecf25eb6cfd layerID: 974 - mosaicPosition: {x: 202, y: 3119} + mosaicPosition: {x: 216, y: 3326} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u6D41\u6C57" spriteName: "\u6D41\u6C57" isGroup: 0 parentIndex: 14 spriteID: 73a4ecbba4bd73844967c63a0963264e layerID: 968 - mosaicPosition: {x: 395, y: 3119} + mosaicPosition: {x: 422, y: 3326} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u7AD9\u59FF\u6D41\u6CEA" spriteName: "\u7AD9\u59FF\u6D41\u6CEA" isGroup: 0 parentIndex: 14 spriteID: c511e4ebed16e5b4d8b21ef98f2c3645 layerID: 983 - mosaicPosition: {x: 5852, y: 1813} + mosaicPosition: {x: 4, y: 3637} flatten: 0 isImported: 1 isVisible: 1 @@ -521,47 +983,47 @@ ScriptedImporter: parentIndex: 14 spriteID: c1c0dbb88f13ac04690ba50ad107bf38 layerID: 948 - mosaicPosition: {x: 500, y: 3315} + mosaicPosition: {x: 533, y: 3535} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u5F00\u5FC3\u7709\u6BDB" spriteName: "\u5F00\u5FC3\u7709\u6BDB" isGroup: 0 parentIndex: 14 spriteID: 107b5362b04957543aa194ffc1dd6b97 layerID: 945 - mosaicPosition: {x: 440, y: 3410} + mosaicPosition: {x: 512, y: 3637} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u95ED\u773C" spriteName: "\u95ED\u773C" isGroup: 0 parentIndex: 14 spriteID: 13759f6778e6434439215d15d1ce7e61 layerID: 788 - mosaicPosition: {x: 572, y: 3119} + mosaicPosition: {x: 611, y: 3326} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u65E0\u795E\u773C\u775B" spriteName: "\u65E0\u795E\u773C\u775B" isGroup: 0 parentIndex: 14 spriteID: b177f24eaa693dd449349b94b196180e layerID: 965 - mosaicPosition: {x: 231, y: 3315} + mosaicPosition: {x: 246, y: 3535} flatten: 0 - isImported: 0 - isVisible: 0 - - name: "\u6709\u773C\u888B\u65E0\u795E\u773C\u775B" - spriteName: "\u6709\u773C\u888B\u65E0\u795E\u773C\u775B" + isImported: 1 + isVisible: 1 + - name: "\u96BE\u53D7\u773C\u775B" + spriteName: "\u96BE\u53D7\u773C\u775B" isGroup: 0 parentIndex: 14 spriteID: 409e6df1a694ca145811e0c423eb1ba6 layerID: 969 - mosaicPosition: {x: 5852, y: 1722} + mosaicPosition: {x: 611, y: 3424} flatten: 0 isImported: 1 isVisible: 1 @@ -571,7 +1033,7 @@ ScriptedImporter: parentIndex: 14 spriteID: 55e6657952d657b4abde3b8daa4c819e layerID: 936 - mosaicPosition: {x: 6127, y: 1722} + mosaicPosition: {x: 237, y: 3637} flatten: 0 isImported: 1 isVisible: 1 @@ -581,50 +1043,50 @@ ScriptedImporter: parentIndex: 14 spriteID: 6ae2beecc4d7d0147b315b5af62b82c0 layerID: 854 - mosaicPosition: {x: 829, y: 3247} + mosaicPosition: {x: 886, y: 3464} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u5634\u578BD" spriteName: "\u5634\u578BD" isGroup: 0 parentIndex: 14 spriteID: 7d55ccfc1b0a47a47bd5927a1fff8638 layerID: 842 - mosaicPosition: {x: 395, y: 3267} + mosaicPosition: {x: 496, y: 3484} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u5634\u578BC" spriteName: "\u5634\u578BC" isGroup: 0 parentIndex: 14 spriteID: a58b4e2f5ca03ea44a1a151a611bedbc layerID: 850 - mosaicPosition: {x: 924, y: 3410} + mosaicPosition: {x: 422, y: 3484} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u5634\u578BB" spriteName: "\u5634\u578BB" isGroup: 0 parentIndex: 14 spriteID: de971eda7485fb448aab553e1cf2300c layerID: 971 - mosaicPosition: {x: 463, y: 3267} + mosaicPosition: {x: 886, y: 3424} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u5634\u578BA" spriteName: "\u5634\u578BA" isGroup: 0 parentIndex: 14 spriteID: f3bb04fe9065d984ead423ef233bd3e3 layerID: 815 - mosaicPosition: {x: 829, y: 3210} + mosaicPosition: {x: 959, y: 3424} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: " \u4F69\u4F69\u52A8\u4F5C" spriteName: isGroup: 1 @@ -641,37 +1103,37 @@ ScriptedImporter: parentIndex: 29 spriteID: 7e76955e527cd434699c7a4c250935b4 layerID: 980 - mosaicPosition: {x: 4, y: 1615} + mosaicPosition: {x: 4, y: 1722} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u4FA7\u4F4E\u5934\u80CC\u624B" spriteName: "\u4FA7\u4F4E\u5934\u80CC\u624B" isGroup: 0 parentIndex: 29 spriteID: d8011c55562e9f04fa646fcf82d15561 layerID: 829 - mosaicPosition: {x: 1008, y: 4} + mosaicPosition: {x: 1075, y: 4} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u4FA7\u4F4E\u5934\u62B1\u624B" spriteName: "\u4FA7\u4F4E\u5934\u62B1\u624B" isGroup: 0 parentIndex: 29 spriteID: e42f0ccc35e1cd1459ec680ca4e4fc4d layerID: 660 - mosaicPosition: {x: 2038, y: 4} + mosaicPosition: {x: 2174, y: 4} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u753B\u753B\u59FF\u52BF" spriteName: "\u753B\u753B\u59FF\u52BF" isGroup: 0 parentIndex: 29 spriteID: 32fe2e7d226d63e44992bb1b15c2bb42 layerID: 579 - mosaicPosition: {x: 5852, y: 4} + mosaicPosition: {x: 4, y: 4} flatten: 0 isImported: 1 isVisible: 1 @@ -681,10 +1143,10 @@ ScriptedImporter: parentIndex: 29 spriteID: 19e6a5f6ca2b72741b99c5a69d2db805 layerID: 608 - mosaicPosition: {x: 1008, y: 1399} + mosaicPosition: {x: 1075, y: 1492} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u591C\u665A" spriteName: "\u591C\u665A" isGroup: 0 @@ -693,8 +1155,8 @@ ScriptedImporter: layerID: 932 mosaicPosition: {x: 4, y: 4} flatten: 0 - isImported: 1 - isVisible: 1 + isImported: 0 + isVisible: 0 - name: "\u767D\u5929" spriteName: "\u767D\u5929" isGroup: 0 @@ -703,8 +1165,8 @@ ScriptedImporter: layerID: 753 mosaicPosition: {x: 4, y: 2172} flatten: 0 - isImported: 1 - isVisible: 1 + isImported: 0 + isVisible: 0 sharedRigPSDLayers: [] pSDLayerImportSetting: [] importFileNodeState: 1 diff --git a/Assets/Resources/SpriteGroup/佩佩最新.prefab b/Assets/Resources/SpriteGroup/佩佩最新.prefab index d627cb96f..2dab8bc8c 100644 --- a/Assets/Resources/SpriteGroup/佩佩最新.prefab +++ b/Assets/Resources/SpriteGroup/佩佩最新.prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 157075282340020701} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.7488375, y: 0.9906974, z: 0} + m_LocalPosition: {x: -4, y: 1.0558138, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -72,13 +72,13 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 941243827 m_SortingLayer: 13 - m_SortingOrder: 117 + m_SortingOrder: 118 m_Sprite: {fileID: 6323271751243769601, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, 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.8604651, y: 0.83255816} + m_Size: {x: 0.9209302, y: 0.89302325} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -143,7 +143,7 @@ Transform: m_GameObject: {fileID: 270670824853948101} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.9802332, y: 0.47674417, z: 0} + m_LocalPosition: {x: -3.9488373, y: 0.50930214, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -189,13 +189,13 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 941243827 m_SortingLayer: 13 - m_SortingOrder: 119 + m_SortingOrder: 120 m_Sprite: {fileID: 4137787962559099257, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, 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.25581396, y: 0.10232558} + m_Size: {x: 0.27906978, y: 0.11627907} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -259,7 +259,7 @@ Transform: m_GameObject: {fileID: 644434809706691464} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.7395353, y: 0.6581392, z: 0} + m_LocalPosition: {x: -3.9906979, y: 0.70232534, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -311,7 +311,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.28372094, y: 0.16744186} + m_Size: {x: 0.30697674, y: 0.18604651} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -343,7 +343,7 @@ Transform: m_GameObject: {fileID: 903628299271071472} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.7755823, y: 0.9697671, z: 0} + m_LocalPosition: {x: -3.7325583, y: 1.0348835, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -389,13 +389,13 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 941243827 m_SortingLayer: 13 - m_SortingOrder: 121 + m_SortingOrder: 122 m_Sprite: {fileID: -8788223535012521681, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, 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.47906977, y: 0.2883721} + m_Size: {x: 0.51627904, y: 0.3116279} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -427,7 +427,7 @@ Transform: m_GameObject: {fileID: 1170779367817585914} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.8860464, y: -1.0906978, z: 0} + m_LocalPosition: {x: -4.146511, y: -1.1627908, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -479,7 +479,91 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 4.595349, y: 6.9581394} + m_Size: {x: 4.9069767, y: 7.423256} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1716420422405966358 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 196527894278548243} + - component: {fileID: 485870075382970873} + m_Layer: 0 + m_Name: "\u7AD9\u59FF\u6D41\u6CEA" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &196527894278548243 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1716420422405966358} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -4.0209303, y: 0.9232559, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7406185544307191824} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &485870075382970873 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1716420422405966358} + 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: 116 + m_Sprite: {fileID: 8962918017820446866, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0.7058824} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.0465117, y: 0.4511628} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -511,7 +595,7 @@ Transform: m_GameObject: {fileID: 1777193406989277668} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.7418604, y: 0.6511626, z: 0} + m_LocalPosition: {x: -3.993023, y: 0.6930232, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -563,7 +647,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.27906978, y: 0.13488372} + m_Size: {x: 0.30232558, y: 0.14883721} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -595,7 +679,7 @@ Transform: m_GameObject: {fileID: 1777405628933045690} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.7441864, y: 1.1418605, z: 0} + m_LocalPosition: {x: -3.993023, y: 1.2186046, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -647,7 +731,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1.2139535, y: 0.31627908} + m_Size: {x: 1.2976744, y: 0.34418604} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -678,7 +762,7 @@ Transform: m_GameObject: {fileID: 1966780468182411203} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -0.31348848, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -710,7 +794,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &5416047270864748350 Transform: m_ObjectHideFlags: 0 @@ -720,7 +804,7 @@ Transform: m_GameObject: {fileID: 2262327210236854715} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.7441864, y: 0.6511626, z: 0} + m_LocalPosition: {x: -3.995349, y: 0.6930232, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -772,7 +856,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.2744186, y: 0.13488372} + m_Size: {x: 0.29767442, y: 0.14883721} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -794,7 +878,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &6935038814569141959 Transform: m_ObjectHideFlags: 0 @@ -804,7 +888,7 @@ Transform: m_GameObject: {fileID: 2402834795484191132} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.853489, y: -0.84186053, z: 0} + m_LocalPosition: {x: -4.1093025, y: -0.89767456, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -856,7 +940,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 4.6325583, y: 7.455814} + m_Size: {x: 4.944186, y: 7.9534883} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -888,7 +972,7 @@ Transform: m_GameObject: {fileID: 2654324608659633263} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.9802332, y: 0.47674417, z: 0} + m_LocalPosition: {x: -3.9488373, y: 0.50930214, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -934,13 +1018,13 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 941243827 m_SortingLayer: 13 - m_SortingOrder: 120 + m_SortingOrder: 121 m_Sprite: {fileID: 1334166003218808176, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, 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.25581396, y: 0.10232558} + m_Size: {x: 0.27906978, y: 0.11627907} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -972,7 +1056,7 @@ Transform: m_GameObject: {fileID: 2685491168148541651} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.415, y: -1.0069768, z: 0} + m_LocalPosition: {x: -3.66, y: -1.072093, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1024,7 +1108,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 3.972093, y: 7.404651} + m_Size: {x: 4.2372093, y: 7.9023256} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1056,7 +1140,7 @@ Transform: m_GameObject: {fileID: 3147388757753214017} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.7441864, y: 1.1418605, z: 0} + m_LocalPosition: {x: -3.993023, y: 1.2186046, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1108,7 +1192,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1.1581396, y: 0.31627908} + m_Size: {x: 1.2418605, y: 0.34418604} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1145,6 +1229,7 @@ Transform: m_Children: - {fileID: 3478372740268396347} - {fileID: 2645535491742514511} + - {fileID: 196527894278548243} - {fileID: 7032835691251129166} - {fileID: 1768653872334917077} - {fileID: 4009632713096831653} @@ -1184,7 +1269,7 @@ Transform: m_GameObject: {fileID: 3731560189141743791} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.05, y: 0.91162777, z: 0} + m_LocalPosition: {x: -4.0232553, y: 0.97441864, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1230,13 +1315,13 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 941243827 m_SortingLayer: 13 - m_SortingOrder: 122 + m_SortingOrder: 123 m_Sprite: {fileID: 1510002135873676259, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, 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.81395346, y: 0.20930232} + m_Size: {x: 0.8744186, y: 0.22790697} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1301,7 +1386,7 @@ Transform: m_GameObject: {fileID: 4368274950211164135} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.4139538, y: 1.1372094, z: 0} + m_LocalPosition: {x: -3.639535, y: 1.2139535, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1353,7 +1438,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.20930232, y: 0.1767442} + m_Size: {x: 0.22790697, y: 0.19534884} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1385,7 +1470,7 @@ Transform: m_GameObject: {fileID: 4608205336904579852} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.112791, y: 1.0953488, z: 0} + m_LocalPosition: {x: -4.0906973, y: 1.1697674, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1431,13 +1516,13 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 941243827 m_SortingLayer: 13 - m_SortingOrder: 125 + m_SortingOrder: 126 m_Sprite: {fileID: -23736826301380022, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, 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.9860465, y: 0.2883721} + m_Size: {x: 1.0558139, y: 0.3116279} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1459,7 +1544,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &8799637200375709963 Transform: m_ObjectHideFlags: 0 @@ -1469,7 +1554,7 @@ Transform: m_GameObject: {fileID: 4647080187147235313} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.7441864, y: 1.1209302, z: 0} + m_LocalPosition: {x: -3.993023, y: 1.1976743, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1521,7 +1606,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1.1581396, y: 0.35813954} + m_Size: {x: 1.2418605, y: 0.3860465} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1553,7 +1638,7 @@ Transform: m_GameObject: {fileID: 4853573204786867104} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.9965124, y: 0.96046495, z: 0} + m_LocalPosition: {x: -3.9674416, y: 1.0255814, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1599,13 +1684,13 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 941243827 m_SortingLayer: 13 - m_SortingOrder: 123 + m_SortingOrder: 124 m_Sprite: {fileID: 3474121723572056905, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, 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.9209302, y: 0.30697674} + m_Size: {x: 0.9860465, y: 0.33023256} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1637,7 +1722,7 @@ Transform: m_GameObject: {fileID: 4873017592926150579} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.4162788, y: -0.911628, z: 0} + m_LocalPosition: {x: -3.66, y: -0.9720931, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1689,7 +1774,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 3.972093, y: 7.595349} + m_Size: {x: 4.2372093, y: 8.102325} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1721,7 +1806,7 @@ Transform: m_GameObject: {fileID: 5680119214677526763} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.7558146, y: 1.2813954, z: 0} + m_LocalPosition: {x: -4.006976, y: 1.3651161, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1773,7 +1858,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1.255814, y: 0.27906978} + m_Size: {x: 1.3441861, y: 0.30232558} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1795,7 +1880,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &8350166737951538443 Transform: m_ObjectHideFlags: 0 @@ -1805,7 +1890,7 @@ Transform: m_GameObject: {fileID: 6531299957704211549} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.05, y: 0.644186, z: 0} + m_LocalPosition: {x: -4.0232553, y: 0.68837214, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1851,13 +1936,13 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 941243827 m_SortingLayer: 13 - m_SortingOrder: 127 + m_SortingOrder: 128 m_Sprite: {fileID: -3590090846338729505, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, 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.7953488, y: 0.5116279} + m_Size: {x: 0.855814, y: 0.5488372} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1879,7 +1964,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &6943040293172856464 Transform: m_ObjectHideFlags: 0 @@ -1889,7 +1974,7 @@ Transform: m_GameObject: {fileID: 6709917434676327321} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.0593033, y: 0.95348835, z: 0} + m_LocalPosition: {x: -4.0325584, y: 1.0186048, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1935,13 +2020,13 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 941243827 m_SortingLayer: 13 - m_SortingOrder: 124 + m_SortingOrder: 125 m_Sprite: {fileID: -7231693895997857733, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, 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.0186046, y: 0.40465117} + m_Size: {x: 1.0883721, y: 0.4372093} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1963,7 +2048,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &653750857460872601 Transform: m_ObjectHideFlags: 0 @@ -1973,7 +2058,7 @@ Transform: m_GameObject: {fileID: 6838688359436157542} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.024419, y: 0.965116, z: 0} + m_LocalPosition: {x: -3.995349, y: 1.0302324, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2019,13 +2104,13 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 941243827 m_SortingLayer: 13 - m_SortingOrder: 126 + m_SortingOrder: 127 m_Sprite: {fileID: 3468312634236209334, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, 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.88372093, y: 0.8744186} + m_Size: {x: 0.9488372, y: 0.9348837} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2093,7 +2178,7 @@ Transform: m_GameObject: {fileID: 7648977586330753841} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.7465115, y: 0.66046476, z: 0} + m_LocalPosition: {x: -3.997674, y: 0.70465136, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2145,7 +2230,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.27906978, y: 0.15348837} + m_Size: {x: 0.30232558, y: 0.17209302} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2167,7 +2252,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &5310136728925613857 Transform: m_ObjectHideFlags: 0 @@ -2177,7 +2262,7 @@ Transform: m_GameObject: {fileID: 7835211489071332129} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.6846, y: -0.5302329, z: 0} + m_LocalPosition: {x: -3.9483724, y: -0.5627909, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2229,7 +2314,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 4.7534885, y: 6.451163} + m_Size: {x: 5.0744185, y: 6.883721} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2261,7 +2346,7 @@ Transform: m_GameObject: {fileID: 8037456360253519160} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.783721, y: 1.1255813, z: 0} + m_LocalPosition: {x: -4.0348835, y: 1.1999998, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2313,7 +2398,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1.255814, y: 0.3860465} + m_Size: {x: 1.3441861, y: 0.41860464} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2335,7 +2420,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &7133885259711726990 Transform: m_ObjectHideFlags: 0 @@ -2345,7 +2430,7 @@ Transform: m_GameObject: {fileID: 8260813992734842594} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.9802332, y: 0.4720931, z: 0} + m_LocalPosition: {x: -3.9511623, y: 0.50232553, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2391,13 +2476,13 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 941243827 m_SortingLayer: 13 - m_SortingOrder: 118 + m_SortingOrder: 119 m_Sprite: {fileID: -2452535401947224898, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, 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.20930232, y: 0.055813953} + m_Size: {x: 0.22790697, y: 0.06511628} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2429,7 +2514,7 @@ Transform: m_GameObject: {fileID: 8766002211321198767} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.7558146, y: 1.2906976, z: 0} + m_LocalPosition: {x: -4.006976, y: 1.3767443, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2481,7 +2566,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1.255814, y: 0.29767442} + m_Size: {x: 1.3441861, y: 0.3255814} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2503,7 +2588,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &2645535491742514511 Transform: m_ObjectHideFlags: 0 @@ -2513,7 +2598,7 @@ Transform: m_GameObject: {fileID: 9022937497975902483} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.7441864, y: 1.0813951, z: 0} + m_LocalPosition: {x: -3.993023, y: 1.1534882, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2559,13 +2644,13 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 941243827 m_SortingLayer: 13 - m_SortingOrder: 116 + m_SortingOrder: 117 m_Sprite: {fileID: -793228827355489120, guid: 60a6ffef0b9f47a4fa3b16c30d12bf04, 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.7860465, y: 0.6511628} + m_Size: {x: 0.8418605, y: 0.6976744} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 diff --git a/Assets/Resources/Yarn/FP_Peipei2/Stage1_佩佩开场对话.yarn b/Assets/Resources/Yarn/FP_Peipei2/Stage1_佩佩开场对话.yarn index 9dadb7112..20fe8ff5d 100644 --- a/Assets/Resources/Yarn/FP_Peipei2/Stage1_佩佩开场对话.yarn +++ b/Assets/Resources/Yarn/FP_Peipei2/Stage1_佩佩开场对话.yarn @@ -5,7 +5,7 @@ position: 272,-1156 --- <> <> -<> +<> <> <> <> @@ -28,18 +28,27 @@ peipei: 第二天早上一觉起来,它就又开始变得不正常了。 <> <> +<> +<> <> -<> +<> <> <> -<> -peipei: 啊,头……好痛!又开始了… +peipei: 啊…#auto_next +<> +<> +<> +<> +<> +<> +<> +<> +peipei: 头……好痛!又开始了… <> -<> -<> +<> peipei: 一开始还只是不太灵敏了,画的内容不太准确…… peipei: 然后它就变得越来越怪了,一张比一张怪。 -<> +<> peipei: …这头怎么…痛得停不下来… <> @@ -47,51 +56,70 @@ peipei: …这头怎么…痛得停不下来… <> <> <> -<> - +<> +<> +<> +<> +<> +<> +<> +<> peipei: 我是不是…修不好了?我是不是要死了? +<> +<> +<> peipei: 一切都太突然了。我的工作死线就要到了,我还不能死…… me: 头痛?听起来很严重…最好现在就检查一下。 <> peipei: 不…医生!来不及了,先别管什么头痛了,你要先修好我的UF…… <> -<> <> -<> +<> +<> +<> +<> +<> +<> +<> <> +<> peipei: …你看这个。 <> +<> <> -<> +<> <> <> <> <> +me: 这是…什么? peipei: 嘶…还记得昨天你让我画的图吗? -me: 鱼肉罐头…广告?可是为什么…这里面有个大象?罐头又… +me: 这是那个鱼肉罐头广告?
可是为什么…这里面有个大象?
罐头又… peipei: 根本没有罐头!对吧? <> <> me: UF…又出新的问题了? -<> +<> peipei: 何止是新的…你再看这个! <> <> +<> <> +<> peipei: 好痛…好痛……#auto_next -<> +<> <> <> <> <> me: 这又是…
你怎么把自己画进去了? -<> +<> peipei: 不是我把自己…不是我,是UF!
医生,你忘了吗? <> @@ -99,13 +127,16 @@ peipei: 不是我把自己…不是我,是UF!
医生,你忘了吗? me: 我明白,我只是说着急了…… me: 可是UF…为什么会…把你画进广告里……#auto_next +<> peipei: 再看这个!医生…… <> -<> +<> +<> +<> <> peipei: 这真是…痛得快睁不开眼睛了…#auto_next -<> +<> <> <> <> @@ -122,9 +153,17 @@ peipei: 别管什么痛了! <> <> <> -<> +<> +<> +<> +<> +<> <> -<> +<> +<> +<> +<> +<> peipei: 医生…求求你,我不能没有UF……我必须修好它。 me: 好吧…无论如何,先到治疗室来吧。 diff --git a/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn b/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn index 461ae43a2..f1b4101fc 100644 --- a/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn +++ b/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn @@ -305,7 +305,6 @@ EyeModule: 已与视觉模块建立连接! <> <> EyeModule: 检查完成!未发现错误。 - <> EyeModule: #auto_next EyeModule: 报告传输完毕。 diff --git a/Assets/Scenes/ClinicScene.unity b/Assets/Scenes/ClinicScene.unity index 73408e7d5..056711c91 100644 --- a/Assets/Scenes/ClinicScene.unity +++ b/Assets/Scenes/ClinicScene.unity @@ -141,7 +141,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 208936720767673838, guid: d61ec1d045b2bfc4bb2db8718f017f2b, type: 3} propertyPath: m_LocalPosition.x - value: -3.78 + value: -1.44 objectReference: {fileID: 0} - target: {fileID: 208936720767673838, guid: d61ec1d045b2bfc4bb2db8718f017f2b, type: 3} propertyPath: m_LocalPosition.y @@ -153,12 +153,12 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1879757483991260023, guid: d61ec1d045b2bfc4bb2db8718f017f2b, type: 3} propertyPath: config.key - value: "\u77F3\u5934" + value: "\u4F69\u4F69\u6700\u65B0" objectReference: {fileID: 0} - target: {fileID: 1879757483991260023, guid: d61ec1d045b2bfc4bb2db8718f017f2b, type: 3} propertyPath: spriteGroup value: - objectReference: {fileID: -8653719598885068355, guid: 2d3d7f9199e56554098528708d850bd7, type: 3} + objectReference: {fileID: 484818901331367303, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} - target: {fileID: 5664960779156270250, guid: d61ec1d045b2bfc4bb2db8718f017f2b, type: 3} propertyPath: m_Name value: Clinic System @@ -208,7 +208,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 208936720767673838, guid: d61ec1d045b2bfc4bb2db8718f017f2b, type: 3} insertIndex: -1 - addedObject: {fileID: 8067254642231218396} + addedObject: {fileID: 6908783520524829982} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d61ec1d045b2bfc4bb2db8718f017f2b, type: 3} --- !u!4 &1284968267 stripped @@ -216,7 +216,7 @@ Transform: m_CorrespondingSourceObject: {fileID: 208936720767673838, guid: d61ec1d045b2bfc4bb2db8718f017f2b, type: 3} m_PrefabInstance: {fileID: 1284968266} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8067254642231218395 +--- !u!1001 &6908783520524829981 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -224,59 +224,79 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1284968267} m_Modifications: - - target: {fileID: 2004020600827105472, guid: ae7c98b4bbd159c40954e9a3564b5b7a, type: 3} + - target: {fileID: 484818901331367303, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + propertyPath: m_Name + value: "\u4F69\u4F69\u6700\u65B0(Clone)" + objectReference: {fileID: 0} + - target: {fileID: 644434809706691464, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1777193406989277668, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2262327210236854715, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2402834795484191132, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2004020600827105472, guid: ae7c98b4bbd159c40954e9a3564b5b7a, type: 3} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2004020600827105472, guid: ae7c98b4bbd159c40954e9a3564b5b7a, type: 3} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2004020600827105472, guid: ae7c98b4bbd159c40954e9a3564b5b7a, type: 3} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2004020600827105472, guid: ae7c98b4bbd159c40954e9a3564b5b7a, type: 3} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2004020600827105472, guid: ae7c98b4bbd159c40954e9a3564b5b7a, type: 3} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2004020600827105472, guid: ae7c98b4bbd159c40954e9a3564b5b7a, type: 3} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2004020600827105472, guid: ae7c98b4bbd159c40954e9a3564b5b7a, type: 3} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2004020600827105472, guid: ae7c98b4bbd159c40954e9a3564b5b7a, type: 3} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2004020600827105472, guid: ae7c98b4bbd159c40954e9a3564b5b7a, type: 3} + - target: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3259275819111110517, guid: ae7c98b4bbd159c40954e9a3564b5b7a, type: 3} - propertyPath: m_Name - value: "\u77F3\u5934(Clone)" + - target: {fileID: 4873017592926150579, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ae7c98b4bbd159c40954e9a3564b5b7a, type: 3} ---- !u!4 &8067254642231218396 stripped + m_SourcePrefab: {fileID: 100100000, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} +--- !u!4 &6908783520524829982 stripped Transform: - m_CorrespondingSourceObject: {fileID: 2004020600827105472, guid: ae7c98b4bbd159c40954e9a3564b5b7a, type: 3} - m_PrefabInstance: {fileID: 8067254642231218395} + m_CorrespondingSourceObject: {fileID: 3367790813836740543, guid: 2c6a43c0915e4a049840d1aa8ba592dd, type: 3} + m_PrefabInstance: {fileID: 6908783520524829981} m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: diff --git a/Assets/StreamingAssets/Config/sprite_group.json b/Assets/StreamingAssets/Config/sprite_group.json index f24cbfc42..07c076215 100644 --- a/Assets/StreamingAssets/Config/sprite_group.json +++ b/Assets/StreamingAssets/Config/sprite_group.json @@ -380,6 +380,175 @@ "侧低头闭眼", "侧低头张嘴 ", "侧低头背手" + ], + "默认皱眉流汗无神": [ + "流汗", + "生气眉毛", + "无表情眼睛", + "佩佩默认姿势" + ], + "默认皱眉流泪流汗闭眼I": [ + "流汗", + "站姿流泪", + "生气眉毛", + "闭眼", + "嘴型A", + "佩佩默认姿势" + ], + "低头张嘴闭眼": [ + "侧低头闭眼", + "侧低头张嘴 ", + "侧低头抱手" + ], + "默认皱眉流泪流汗难受": [ + "流汗", + "站姿流泪", + "生气眉毛", + "难受眼睛", + "佩佩默认姿势" + ], + "默认皱眉流泪流汗难受I": [ + "流汗", + "站姿流泪", + "生气眉毛", + "难受眼睛", + "嘴型A", + "佩佩默认姿势" + ], + "默认皱眉流泪流汗闭眼": [ + "流汗", + "站姿流泪", + "生气眉毛", + "闭眼", + "佩佩默认姿势" + ], + "背手黑线流泪张嘴闭眼": [ + "侧低头流泪", + "侧低头阴郁排线阴影", + "侧低头闭眼", + "侧低头张嘴 ", + "侧低头背手" + ], + "背手黑线流泪张嘴": [ + "侧低头流泪", + "侧低头阴郁排线阴影", + "侧低头张嘴 ", + "侧低头背手" + ], + "低头黑线流泪张嘴闭眼": [ + "侧低头流泪", + "侧低头阴郁排线阴影", + "侧低头闭眼", + "侧低头张嘴 ", + "侧低头抱手" + ], + "背手黑线流泪闭眼": [ + "侧低头流泪", + "侧低头阴郁排线阴影", + "侧低头闭眼", + "侧低头背手" + ], + "背手黑线闭眼张嘴流泪": [ + "侧低头流泪", + "侧低头阴郁排线阴影", + "侧低头闭眼", + "侧低头张嘴 ", + "侧低头背手" + ], + "默认流泪流汗难受": [ + "流汗", + "站姿流泪", + "难受眼睛", + "佩佩默认姿势" + ], + "默认流泪流汗闭眼": [ + "流汗", + "站姿流泪", + "闭眼", + "佩佩默认姿势" + ], + "画画流汗无神A": [ + "流汗", + "无表情眼睛", + "嘴型B", + "画画姿势" + ], + "画画流汗无神": [ + "流汗", + "无表情眼睛", + "画画姿势" + ], + "画画流泪流汗无神": [ + "大汗淋漓流汗", + "站姿流泪", + "生气眉毛", + "无表情眼睛", + "画画姿势" + ], + "画画流泪流汗难受": [ + "流汗", + "站姿流泪", + "难受眼睛", + "画画姿势" + ], + "画画流泪流汗难受A": [ + "流汗", + "站姿流泪", + "难受眼睛", + "嘴型B", + "画画姿势" + ], + "画画皱眉流泪流汗闭眼": [ + "大汗淋漓流汗", + "站姿流泪", + "生气眉毛", + "闭眼", + "画画姿势" + ], + "默认流泪流汗难受E": [ + "流汗", + "站姿流泪", + "难受眼睛", + "嘴型C", + "嘴型A", + "佩佩默认姿势" + ], + "默认流泪流汗难受A": [ + "流汗", + "站姿流泪", + "难受眼睛", + "嘴型B", + "嘴型A", + "佩佩默认姿势" + ], + "画画流泪流汗闭眼": [ + "流汗", + "站姿流泪", + "闭眼", + "画画姿势" + ], + "画画皱眉流泪流汗垂眼": [ + "大汗淋漓流汗", + "站姿流泪", + "生气眉毛", + "无神眼睛", + "画画姿势" + ], + "画画皱眉流泪大汗淋漓闭眼I": [ + "大汗淋漓流汗", + "流汗", + "站姿流泪", + "生气眉毛", + "闭眼", + "嘴型A", + "画画姿势" + ], + "画画流泪流汗难受I": [ + "流汗", + "站姿流泪", + "难受眼睛", + "嘴型A", + "画画姿势" ] } }, diff --git a/Assets/StreamingAssets/FMOD/Desktop/Music.bank b/Assets/StreamingAssets/FMOD/Desktop/Music.bank index 2c3f95b8f..ddb909c8d 100644 Binary files a/Assets/StreamingAssets/FMOD/Desktop/Music.bank and b/Assets/StreamingAssets/FMOD/Desktop/Music.bank differ