diff --git a/Assets/AddressableAssetsData/AssetGroups/Actor Resources.asset b/Assets/AddressableAssetsData/AssetGroups/Actor Resources.asset index 858cb5c62..ebf18d10e 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Actor Resources.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Actor Resources.asset @@ -67,6 +67,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 5d9a18ab880ad194ca50a339a1bfc0cc + m_Address: "BubbleSprite/\u5916\u51FA\u5BF9\u8BDD\u6846" + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} m_SchemaSet: diff --git a/Assets/AddressableAssetsData/AssetGroups/Art Resources.asset b/Assets/AddressableAssetsData/AssetGroups/Art Resources.asset index ad98f87f5..b4b674e8a 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Art Resources.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Art Resources.asset @@ -37,13 +37,8 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 3fb22d1d71379f54f8dec756b08e3307 - m_Address: "BubbleSprite/\u5916\u51FA\u5BF9\u8BDD\u6846" - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 51bdc3878d1c5d840a88b624b61732fc - m_Address: "BubbleSprite/\u5BF9\u8BDD\u6846\u5E26\u6846" + m_Address: "Assets/RawResources/Art/\u5BF9\u8BDD\u6846/\u5BF9\u8BDD\u6846\u5E26\u6846.png" m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 @@ -67,8 +62,8 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: ca909870d485bde44b1e652490df203f - m_Address: "BubbleSprite/\u5927\u5BF9\u8BDD\u6846" + - m_GUID: ccf21927b7ddd1648b8133d790ef636e + m_Address: "Clinic/\u4E3B\u573A\u666F" m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 diff --git a/Assets/CameraData/Main Camera Blends.asset b/Assets/CameraData/Main Camera Blends.asset index ba5f637ec..af8cc3079 100644 --- a/Assets/CameraData/Main Camera Blends.asset +++ b/Assets/CameraData/Main Camera Blends.asset @@ -233,3 +233,14 @@ MonoBehaviour: m_PreInfinity: 0 m_PostInfinity: 0 m_RotationOrder: 0 + - m_From: '**ANY CAMERA**' + m_To: TV Camera + m_Blend: + m_Style: 0 + m_Time: 2 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 0 + m_PostInfinity: 0 + m_RotationOrder: 0 diff --git a/Assets/RawResources/Art/对话框/外出对话框.png b/Assets/RawResources/Art/对话框/外出对话框.png index b1dc41236..ee72a472e 100644 --- a/Assets/RawResources/Art/对话框/外出对话框.png +++ b/Assets/RawResources/Art/对话框/外出对话框.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08c77cc70f2ff5471cfa99a83671d906da786c68970ff531eb1edd963ec18b69 -size 3433 +oid sha256:a7306f4920cb449435fc638d0e5bbad55fc19b92ea7cfcd934f2d803ce0ea576 +size 5690 diff --git a/Assets/RawResources/Art/对话框/外出对话框.png.meta b/Assets/RawResources/Art/对话框/外出对话框.png.meta index c1147b80b..d7eb519b1 100644 --- a/Assets/RawResources/Art/对话框/外出对话框.png.meta +++ b/Assets/RawResources/Art/对话框/外出对话框.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3fb22d1d71379f54f8dec756b08e3307 +guid: 5d9a18ab880ad194ca50a339a1bfc0cc TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -50,7 +50,7 @@ TextureImporter: spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 43 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -139,40 +139,40 @@ TextureImporter: name: BottomRight rect: serializedVersion: 2 - x: 33 - y: 163 + x: 135 + y: 552 width: 88 height: 42 alignment: 8 pivot: {x: 1, y: 0} - border: {x: 3, y: 7, z: 9, w: 4} + border: {x: 6, y: 6, z: 11, w: 5} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: d6aa827700254e349937512aa4a8082d - internalID: -1307713994 + spriteID: a502d683693c0454db507070dc221b59 + internalID: 1591312824 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: Bottom + name: Bottom2 rect: serializedVersion: 2 - x: 158 - y: 155 - width: 84 - height: 50 + x: 569 + y: 546 + width: 83 + height: 48 alignment: 7 pivot: {x: 0.5, y: 0} - border: {x: 6, y: 12, z: 28, w: 6} + border: {x: 6, y: 11, z: 5, w: 6} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 4440cfbf04bb4fb4cb241649b0d5f05e - internalID: 1952918579 + spriteID: 99c12809e7955ad44b19953648af2133 + internalID: -862812597 vertices: [] indices: edges: [] @@ -181,19 +181,40 @@ TextureImporter: name: BottomLeft rect: serializedVersion: 2 - x: 267 - y: 163 - width: 89 + x: 998 + y: 552 + width: 88 height: 42 alignment: 6 pivot: {x: 0, y: 0} - border: {x: 9, y: 7, z: 6, w: 4} + border: {x: 11, y: 7, z: 5, w: 5} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 4efe67acf79e0924888b0bcc7796d9da - internalID: -426269108 + spriteID: cb17c8aff8b0e0448b1a367418a6ef87 + internalID: -837472110 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Bottom + rect: + serializedVersion: 2 + x: 569 + y: 427 + width: 83 + height: 50 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 6, y: 14, z: 6, w: 6} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5461fdf57a6fd4e4e8e0607bce97789e + internalID: -404523892 vertices: [] indices: edges: [] @@ -202,19 +223,19 @@ TextureImporter: name: Right rect: serializedVersion: 2 - x: 33 - y: 94 + x: 135 + y: 321 width: 88 - height: 43 + height: 42 alignment: 5 pivot: {x: 1, y: 0.5} - border: {x: 6, y: 14, z: 11, w: 6} + border: {x: 6, y: 14, z: 12, w: 6} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 00a76386e6c697647b38af5916a1a38a - internalID: -1360195508 + spriteID: 98c1ccf2bc918ce4e961dabbe0e8d60e + internalID: 2111922646 vertices: [] indices: edges: [] @@ -223,19 +244,19 @@ TextureImporter: name: Center rect: serializedVersion: 2 - x: 159 - y: 95 - width: 88 + x: 569 + y: 321 + width: 83 height: 42 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 5, y: 13, z: 11, w: 6} + border: {x: 6, y: 7, z: 7, w: 6} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 1a219988a23794e41813405fcfa54e06 - internalID: -688752402 + spriteID: a91a3daf69d56bf46921c8f1a530d95d + internalID: 975895584 vertices: [] indices: edges: [] @@ -244,40 +265,19 @@ TextureImporter: name: Left rect: serializedVersion: 2 - x: 267 - y: 94 - width: 89 - height: 43 - alignment: 4 - pivot: {x: 0, y: 0.5} - border: {x: 11, y: 14, z: 7, w: 5} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 7ec9f048ecd49274aa9b75fbc18b7224 - internalID: 1609261059 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: TopRight - rect: - serializedVersion: 2 - x: 33 - y: 23 + x: 998 + y: 321 width: 88 height: 42 - alignment: 3 - pivot: {x: 1, y: 1} - border: {x: 5, y: 5, z: 11, w: 7} + alignment: 4 + pivot: {x: 0, y: 0.5} + border: {x: 11, y: 14, z: 6, w: 6} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 00d51f8d2457cea43a03bb03d7dc39bf - internalID: 704217432 + spriteID: a4ce3a0ac0975c543a1cfffce88ee3ba + internalID: 508301791 vertices: [] indices: edges: [] @@ -286,19 +286,61 @@ TextureImporter: name: Top rect: serializedVersion: 2 - x: 159 - y: 23 - width: 82 - height: 49 + x: 569 + y: 196 + width: 83 + height: 50 alignment: 2 pivot: {x: 0.5, y: 1} - border: {x: 5, y: 5, z: 5, w: 12} + border: {x: 6, y: 6, z: 6, w: 14} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 028a712d132849d48aef12edf81f9a2d - internalID: -502950914 + spriteID: 212f15e41b036234c9c6f903a72ec707 + internalID: -1655195811 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: TopRight + rect: + serializedVersion: 2 + x: 135 + y: 79 + width: 88 + height: 42 + alignment: 3 + pivot: {x: 1, y: 1} + border: {x: 5, y: 5, z: 12, w: 7} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e60db5cc6bb479e4293f4ce660dd41fb + internalID: -49079412 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Top2 + rect: + serializedVersion: 2 + x: 569 + y: 79 + width: 83 + height: 48 + alignment: 2 + pivot: {x: 0.5, y: 1} + border: {x: 6, y: 6, z: 5, w: 11} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 76b64a1278881b04190e7a1be9ad8fe4 + internalID: 2064685287 vertices: [] indices: edges: [] @@ -307,19 +349,19 @@ TextureImporter: name: TopLeft rect: serializedVersion: 2 - x: 267 - y: 23 + x: 998 + y: 79 width: 88 height: 42 alignment: 1 pivot: {x: 0, y: 1} - border: {x: 10, y: 5, z: 5, w: 7} + border: {x: 12, y: 6, z: 6, w: 8} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 24e937d2bf2097c4db121ec49e27ce5c - internalID: 1347066937 + spriteID: 78fa1295147d95544a7b7450bde01897 + internalID: -1601881179 vertices: [] indices: edges: [] @@ -335,15 +377,17 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: - Bottom: 1952918579 - BottomLeft: -426269108 - BottomRight: -1307713994 - Center: -688752402 - Left: 1609261059 - Right: -1360195508 - Top: -502950914 - TopLeft: 1347066937 - TopRight: 704217432 + Bottom: -404523892 + Bottom2: -862812597 + BottomLeft: -837472110 + BottomRight: 1591312824 + Center: 975895584 + Left: 508301791 + Right: 2111922646 + Top: -1655195811 + Top2: 2064685287 + TopLeft: -1601881179 + TopRight: -49079412 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/RawResources/Art/对话框/大对话框.png b/Assets/RawResources/Art/对话框/大对话框.png index ae0c90776..989858e85 100644 --- a/Assets/RawResources/Art/对话框/大对话框.png +++ b/Assets/RawResources/Art/对话框/大对话框.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33517c4698cc5d8d997e10613422d35179f1857b9e6ccabebed6eda3ec178b7f -size 5289 +oid sha256:14e7c5d9b092a81acb3f8817e97ecca73f84e32bc6da82b116dd89b6269c6605 +size 4645 diff --git a/Assets/RawResources/Art/对话框/大对话框.png.meta b/Assets/RawResources/Art/对话框/大对话框.png.meta index f6597959e..025bf6321 100644 --- a/Assets/RawResources/Art/对话框/大对话框.png.meta +++ b/Assets/RawResources/Art/对话框/大对话框.png.meta @@ -139,40 +139,40 @@ TextureImporter: name: BottomRight rect: serializedVersion: 2 - x: 18 - y: 316 - width: 314 - height: 95 + x: 0 + y: 583 + width: 313 + height: 94 alignment: 8 pivot: {x: 1, y: 0} - border: {x: 5, y: 16, z: 13, w: 5} + border: {x: 6, y: 17, z: 12, w: 6} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 0c12eef4065276b4eaa83c941e9ec406 - internalID: -114707241 + spriteID: 1e815c68c2265774d93532308e76a4dc + internalID: 869897080 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: Bottom + name: Bottom2 rect: serializedVersion: 2 - x: 363 - y: 312 - width: 314 + x: 385 + y: 583 + width: 312 height: 96 alignment: 7 pivot: {x: 0.5, y: 0} - border: {x: 5, y: 18, z: 6, w: 5} + border: {x: 6, y: 17, z: 5, w: 6} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 65f6330b7b4bde649956f966c666e573 - internalID: 123030064 + spriteID: 92a7e137047b87f4e82ab3b1f1fcd21e + internalID: -1220492084 vertices: [] indices: edges: [] @@ -181,19 +181,40 @@ TextureImporter: name: BottomLeft rect: serializedVersion: 2 - x: 717 - y: 313 - width: 314 - height: 95 + x: 772 + y: 583 + width: 312 + height: 94 alignment: 6 pivot: {x: 0, y: 0} - border: {x: 11, y: 17, z: 6, w: 6} + border: {x: 13, y: 16, z: 6, w: 8} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 61e44fc2fb55dcc4fa5db65c7746f516 - internalID: -1942115731 + spriteID: 46fe155d1c6082641848452e60671400 + internalID: 1196934806 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: "\u5927\u5BF9\u8BDD\u6846_3" + rect: + serializedVersion: 2 + x: 385 + y: 451 + width: 312 + height: 95 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 6, y: 17, z: 6, w: 6} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c2b526592870e154181af74f5ed74e6e + internalID: 135456414 vertices: [] indices: edges: [] @@ -202,19 +223,19 @@ TextureImporter: name: Right rect: serializedVersion: 2 - x: 10 - y: 217 + x: 0 + y: 291 width: 325 - height: 84 + height: 83 alignment: 5 pivot: {x: 1, y: 0.5} - border: {x: 5, y: 6, z: 18, w: 5} + border: {x: 6, y: 6, z: 17, w: 5} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: a5b4553fafb8d4c44845f467a2a6f47e - internalID: -1258949514 + spriteID: 1aa5df4ba09d41b4cab0206ccb74f038 + internalID: 1879000663 vertices: [] indices: edges: [] @@ -223,61 +244,40 @@ TextureImporter: name: Center rect: serializedVersion: 2 - x: 362 - y: 218 - width: 314 - height: 84 + x: 385 + y: 291 + width: 312 + height: 83 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 6, y: 6, z: 6, w: 5} + border: {x: 6, y: 6, z: 7, w: 7} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: dbb0ef58368f3f4409cdd2f7dc5c72ad - internalID: 951630327 + spriteID: c87de94a65b71bb4f9ce4503f0c4406f + internalID: -123270858 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: Left + name: "\u5927\u5BF9\u8BDD\u6846_6" rect: serializedVersion: 2 - x: 705 - y: 217 - width: 326 - height: 84 + x: 760 + y: 291 + width: 324 + height: 83 alignment: 4 pivot: {x: 0, y: 0.5} - border: {x: 17, y: 6, z: 7, w: 5} + border: {x: 17, y: 5, z: 6, w: 6} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: e9b184b6b37e30c48b63b91c519c4d41 - internalID: 916968248 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: TopRight - rect: - serializedVersion: 2 - x: 10 - y: 111 - width: 314 - height: 94 - alignment: 3 - pivot: {x: 1, y: 1} - border: {x: 9, y: 8, z: 14, w: 18} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 600c7cdb6d0f25347a43445c8951d9dd - internalID: 128930187 + spriteID: 60168f3c9f7c91f4a9b1c9015460fc76 + internalID: -1653955880 vertices: [] indices: edges: [] @@ -286,19 +286,61 @@ TextureImporter: name: Top rect: serializedVersion: 2 - x: 362 - y: 111 - width: 314 - height: 96 - alignment: 9 - pivot: {x: 0.58, y: 1} - border: {x: 13, y: 7, z: 11, w: 20} + x: 384 + y: 123 + width: 312 + height: 95 + alignment: 2 + pivot: {x: 0.5, y: 1} + border: {x: 5, y: 5, z: 5, w: 17} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 6b264bcbac3f0264e909d6c9dc54a536 - internalID: 750363007 + spriteID: 955242032f71a8f43bbdd6f84520b111 + internalID: 1712156428 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: TopRight + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 313 + height: 93 + alignment: 3 + pivot: {x: 1, y: 1} + border: {x: 6, y: 6, z: 12, w: 16} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3bcbd7ae70d60284da71073a20a64d44 + internalID: 1153936987 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Top2 + rect: + serializedVersion: 2 + x: 385 + y: 0 + width: 312 + height: 95 + alignment: 2 + pivot: {x: 0.5, y: 1} + border: {x: 6, y: 6, z: 6, w: 17} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6dae4aa42fd96d3418b8a130b74e8e46 + internalID: -1649230750 vertices: [] indices: edges: [] @@ -307,19 +349,19 @@ TextureImporter: name: TopLeft rect: serializedVersion: 2 - x: 717 - y: 111 - width: 314 - height: 94 + x: 772 + y: 0 + width: 312 + height: 93 alignment: 1 pivot: {x: 0, y: 1} - border: {x: 14, y: 6, z: 8, w: 17} + border: {x: 12, y: 5, z: 5, w: 15} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 822316c09690e9d4baec57cb1f18e494 - internalID: 1208385023 + spriteID: d440775c05fcb4c40ad0346fa8b8f11d + internalID: 1941050635 vertices: [] indices: edges: [] @@ -335,15 +377,17 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: - Bottom: 123030064 - BottomLeft: -1942115731 - BottomRight: -114707241 - Center: 951630327 - Left: 916968248 - Right: -1258949514 - Top: 750363007 - TopLeft: 1208385023 - TopRight: 128930187 + Bottom2: -1220492084 + BottomLeft: 1196934806 + BottomRight: 869897080 + Center: -123270858 + Right: 1879000663 + Top: 1712156428 + Top2: -1649230750 + TopLeft: 1941050635 + TopRight: 1153936987 + "\u5927\u5BF9\u8BDD\u6846_3": 135456414 + "\u5927\u5BF9\u8BDD\u6846_6": -1653955880 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/RawResources/Art/对话框/对话框带框.png b/Assets/RawResources/Art/对话框/对话框带框.png index 8271ef188..d74567c47 100644 --- a/Assets/RawResources/Art/对话框/对话框带框.png +++ b/Assets/RawResources/Art/对话框/对话框带框.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8ecb7833c76a76e867a082dbdb56b3ed165ac52724ec9282063332eb41101ca -size 11152 +oid sha256:1eaeab7c44aebc6b6e99d35cfd6efc8ccf6cbff26a86a95aa9c307427a5b3e13 +size 9547 diff --git a/Assets/RawResources/Art/对话框/对话框带框.png.meta b/Assets/RawResources/Art/对话框/对话框带框.png.meta index 06171e0ce..823da25ad 100644 --- a/Assets/RawResources/Art/对话框/对话框带框.png.meta +++ b/Assets/RawResources/Art/对话框/对话框带框.png.meta @@ -139,40 +139,40 @@ TextureImporter: name: BottomRight rect: serializedVersion: 2 - x: 18 - y: 352 - width: 343 + x: 0 + y: 605 + width: 344 height: 99 alignment: 8 pivot: {x: 1, y: 0} - border: {x: 9, y: 18, z: 11, w: 8} + border: {x: 9, y: 18, z: 14, w: 10} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 32795f8599569384bab9a55f1d723f76 - internalID: 20397400 + spriteID: f81fb046efa0b9145aa250c3e683a2ad + internalID: -1450759838 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: Bottom + name: Bottom2 rect: serializedVersion: 2 - x: 386 - y: 350 + x: 395 + y: 603 width: 344 height: 101 alignment: 7 pivot: {x: 0.5, y: 0} - border: {x: 14, y: 21, z: 13, w: 8} + border: {x: 7, y: 20, z: 7, w: 7} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: bce110a9ebbb74a46bc5c1f4c415c61d - internalID: 1319383235 + spriteID: fe096f7a4b81b854cb7f54fa068350d7 + internalID: -2132818485 vertices: [] indices: edges: [] @@ -181,19 +181,40 @@ TextureImporter: name: BottomLeft rect: serializedVersion: 2 - x: 755 - y: 352 - width: 343 + x: 789 + y: 605 + width: 344 height: 99 alignment: 6 pivot: {x: 0, y: 0} - border: {x: 12, y: 17, z: 10, w: 9} + border: {x: 14, y: 17, z: 7, w: 8} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: d320be92aab7a61409f4f86804a239af - internalID: -416965605 + spriteID: a2bf15d02c10b1f4f85e95d405d026cf + internalID: -1039853837 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Bottom + rect: + serializedVersion: 2 + x: 392 + y: 437 + width: 344 + height: 101 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 9, y: 21, z: 8, w: 9} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 517259d5eb604bd4b8648fbc2a80f7fa + internalID: -665914134 vertices: [] indices: edges: [] @@ -202,19 +223,19 @@ TextureImporter: name: Right rect: serializedVersion: 2 - x: 18 - y: 236 - width: 356 - height: 88 + x: 0 + y: 286 + width: 357 + height: 89 alignment: 5 pivot: {x: 1, y: 0.5} - border: {x: 10, y: 7, z: 22, w: 7} + border: {x: 9, y: 8, z: 19, w: 8} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: f772939181051ed41ba0d3808666f957 - internalID: -1015283922 + spriteID: 2a8b92a34e89a794686a5472ad843399 + internalID: 1054768666 vertices: [] indices: edges: [] @@ -223,19 +244,19 @@ TextureImporter: name: Center rect: serializedVersion: 2 - x: 386 - y: 236 + x: 392 + y: 290 width: 344 - height: 88 + height: 89 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 12, y: 8, z: 10, w: 10} + border: {x: 9, y: 8, z: 9, w: 8} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 877d278c45af021438114281a51ffada - internalID: 671574281 + spriteID: 135578a73f07dca40ac24bdf8f343f17 + internalID: -2022344474 vertices: [] indices: edges: [] @@ -244,40 +265,19 @@ TextureImporter: name: Left rect: serializedVersion: 2 - x: 742 - y: 236 - width: 357 - height: 88 + x: 775 + y: 290 + width: 356 + height: 89 alignment: 4 pivot: {x: 0, y: 0.5} - border: {x: 23, y: 8, z: 10, w: 8} + border: {x: 21, y: 7, z: 7, w: 7} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: c4dae6a4285101f4daadbc980afbc3b1 - internalID: -971225009 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: TopRight - rect: - serializedVersion: 2 - x: 18 - y: 109 - width: 343 - height: 98 - alignment: 3 - pivot: {x: 1, y: 1} - border: {x: 10, y: 8, z: 13, w: 17} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 891ebd8c3856afb44a9b8471d64492e3 - internalID: -2003339022 + spriteID: 1d366d410e0ce754b9ae7fb6c1e4f929 + internalID: 896617414 vertices: [] indices: edges: [] @@ -286,19 +286,61 @@ TextureImporter: name: Top rect: serializedVersion: 2 - x: 386 - y: 109 + x: 392 + y: 139 width: 344 - height: 100 + height: 101 alignment: 2 pivot: {x: 0.5, y: 1} - border: {x: 11, y: 8, z: 11, w: 19} + border: {x: 9, y: 9, z: 10, w: 20} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 22207ee96b8452f46b740cd2868a0f87 - internalID: 263459914 + spriteID: abbe11b0123b5dc4a88a46ce07115f33 + internalID: 449389545 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: TopRight + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 344 + height: 99 + alignment: 3 + pivot: {x: 1, y: 1} + border: {x: 8, y: 7, z: 13, w: 17} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0627b1690e7464c4aba5b6ed0f58eb18 + internalID: 1923364482 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Top2 + rect: + serializedVersion: 2 + x: 395 + y: 0 + width: 344 + height: 101 + alignment: 2 + pivot: {x: 0.5, y: 1} + border: {x: 7, y: 7, z: 7, w: 19} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c80396cbda04516448906974a719f984 + internalID: 1667934559 vertices: [] indices: edges: [] @@ -307,19 +349,19 @@ TextureImporter: name: TopLeft rect: serializedVersion: 2 - x: 755 - y: 109 - width: 343 - height: 98 + x: 789 + y: 0 + width: 344 + height: 99 alignment: 1 pivot: {x: 0, y: 1} - border: {x: 13, y: 7, z: 11, w: 18} + border: {x: 13, y: 7, z: 8, w: 18} outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 45eaff9c8a4f35e4d92faf8ca45e0118 - internalID: -987705305 + spriteID: 50c42569cc167ff44bc335fa86994d0f + internalID: 518636561 vertices: [] indices: edges: [] @@ -335,15 +377,17 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: - Bottom: 1319383235 - BottomLeft: -416965605 - BottomRight: 20397400 - Center: 671574281 - Left: -971225009 - Right: -1015283922 - Top: 263459914 - TopLeft: -987705305 - TopRight: -2003339022 + Bottom: -665914134 + Bottom2: -2132818485 + BottomLeft: -1039853837 + BottomRight: -1450759838 + Center: -2022344474 + Left: 896617414 + Right: 1054768666 + Top: 449389545 + Top2: 1667934559 + TopLeft: 518636561 + TopRight: 1923364482 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 4c52b29e4..9e772ef0b 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -8093,7 +8093,7 @@ Transform: m_GameObject: {fileID: 519420028} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -20, z: -20} + m_LocalPosition: {x: -2.24, y: -20, z: -20} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scenes/SubWay.unity b/Assets/Scenes/SubWay.unity index de6840c0d..f31f12e7f 100644 --- a/Assets/Scenes/SubWay.unity +++ b/Assets/Scenes/SubWay.unity @@ -569,7 +569,7 @@ MonoBehaviour: - "Subway/\u767D\u5929\u7A97\u5916[HOUSEB]" offset: {x: 0, y: 0} sortingLayerId: 1560193523 - sortingOrder: 90 + sortingOrder: 47 isDistanceMode: 0 existTime: 0 existDistance: 0 @@ -1008,7 +1008,7 @@ MonoBehaviour: - "Subway/\u767D\u5929\u7A97\u5916[\u5E7F\u544A\u724C]" offset: {x: 0, y: -1.069767} sortingLayerId: 1560193523 - sortingOrder: 98 + sortingOrder: 48 isDistanceMode: 0 existTime: 0 existDistance: 0 @@ -1076,6 +1076,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1083043496} + - {fileID: 1425559488} - {fileID: 380972588} - {fileID: 226184626} - {fileID: 1254024539} @@ -1872,7 +1873,7 @@ GameObject: - component: {fileID: 1083043497} - component: {fileID: 1083043498} m_Layer: 0 - m_Name: "\u680F\u6746\u751F\u6210\u70B9" + m_Name: "\u680F\u6746\u751F\u6210\u70B91" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1887,7 +1888,7 @@ Transform: m_GameObject: {fileID: 1083043495} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 25, y: 5, z: 0} + m_LocalPosition: {x: 30, y: 5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1912,10 +1913,9 @@ MonoBehaviour: mobileType: 1 assetAddressArray: - "Subway/\u767D\u5929\u7A97\u5916[langanB]" - - "Subway/\u767D\u5929\u7A97\u5916[langanA]" offset: {x: 0, y: 0} sortingLayerId: 1560193523 - sortingOrder: 99 + sortingOrder: 50 isDistanceMode: 0 existTime: 0 existDistance: 0 @@ -2360,6 +2360,100 @@ Transform: - {fileID: 1852431471} m_Father: {fileID: 975479658} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1425559487 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1425559488} + - component: {fileID: 1425559490} + - component: {fileID: 1425559489} + m_Layer: 0 + m_Name: "\u680F\u6746\u751F\u6210\u70B92" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1425559488 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1425559487} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 25, y: 5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 441612920} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1425559489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1425559487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2973f622187142fd9230396685c3fdf6, type: 3} + m_Name: + m_EditorClassIdentifier: + spawnerPartAssets: + - time: 0 + weather: 0 + mobileAddressData: + - itemName: "\u680F\u6746" + assetAddressArray: + - "Subway/\u767D\u5929\u7A97\u5916[langanB]" + - "Subway/\u767D\u5929\u7A97\u5916[langanA]" + - time: 2 + weather: 0 + mobileAddressData: + - itemName: "\u680F\u6746" + assetAddressArray: + - "Subway/\u591C\u665A\u7A97\u5916[langanB]" + - "Subway/\u591C\u665A\u7A97\u5916[langanA]" +--- !u!114 &1425559490 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1425559487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 36a82fb65d2d45a8a6ce391835134c22, type: 3} + m_Name: + m_EditorClassIdentifier: + mobileObjectDatas: + - itemName: "\u680F\u6746" + direction: {x: -1, y: 0} + speed: {x: 70, y: 70} + mobileType: 1 + assetAddressArray: + - "Subway/\u767D\u5929\u7A97\u5916[langanA]" + offset: {x: 0, y: 0} + sortingLayerId: 1560193523 + sortingOrder: 50 + isDistanceMode: 0 + existTime: 0 + existDistance: 0 + weight: 1 + flipX: 0 + flipY: 0 + playOnAwake: 0 + initMode: 0 + isDistanceMode: 1 + existTime: 0 + existDistance: 50 + intervalRange: {x: 1, y: 1} --- !u!1 &1597021226 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs index ab5dbbd09..5f2c08767 100644 --- a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs +++ b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs @@ -62,12 +62,6 @@ namespace AibisDream.FixSystem { private FixState _curState; - public FixState CurState - { - get => FixSystemCenter.Instance.CurState; - set => _curState = value; - } - public IEnumerator Load() { yield return FixSystemCenter.StateMachine.SwitchState(_curState); diff --git a/Assets/Scripts/Framework/OtherKit/CameraKit.cs b/Assets/Scripts/Framework/OtherKit/CameraKit.cs index 037a762a3..c15f393e1 100644 --- a/Assets/Scripts/Framework/OtherKit/CameraKit.cs +++ b/Assets/Scripts/Framework/OtherKit/CameraKit.cs @@ -20,6 +20,7 @@ namespace AibisDream.Framework #region 相机组件 private static Camera _mainCam; + public static Camera UICamera => UIManager.Instance.UICamera; private CinemachineBrain _orthoCameraBrain; private CinemachineBrain _perspectiveCameraBrain; diff --git a/Assets/Scripts/Style/BubbleStyle.cs b/Assets/Scripts/Style/BubbleStyle.cs index 24452800d..e68fc9a98 100644 --- a/Assets/Scripts/Style/BubbleStyle.cs +++ b/Assets/Scripts/Style/BubbleStyle.cs @@ -5,6 +5,7 @@ namespace AibisDream [CreateAssetMenu(menuName = "Style/Bubble Style")] public class BubbleStyle : ScriptableObject { + public Color imageColor = Color.white; public Vector4 bubblePadding; public Vector4 linePadding; public float lineFontSize; diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs b/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs index 3aa74e3fd..633704c3c 100644 --- a/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs +++ b/Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs @@ -43,13 +43,15 @@ namespace AibisDream idx = data.idx; maxWidth = data.maxWidth; minWidth = data.minWidth; - transform.position = data.slotPosition; + var rect = transform as RectTransform; + rect.localPosition = UIManager.GetDialogUIPos(data.slotPosition); // 设置style SetStyle(data.bubbleStyle, data.pivotType); } private void SetStyle(BubbleStyle bubbleStyle, PivotType pivotType) { + _bubbleImage.color = bubbleStyle.imageColor; // padding内容 _layoutGroup.padding = bubbleStyle.BubblePadding; _lineText.margin = bubbleStyle.linePadding; @@ -61,7 +63,10 @@ namespace AibisDream // 锚点相关 _rect.pivot = CommonUtil.GetPivotByType(pivotType); - var spritePath = $"{bubbleStyle.bubbleSpriteAddress}[{pivotType.ToString()}]"; + var spritePath = bubbleStyle.bubbleSpriteAddress.EndsWith("]") + ? $"{bubbleStyle.bubbleSpriteAddress}" + : $"{bubbleStyle.bubbleSpriteAddress}[{pivotType.ToString()}]"; + _bubbleImage.sprite = ResourceKit.LoadAssetSync(spritePath); } diff --git a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOption.cs b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOption.cs index 0d538618b..b731d5080 100644 --- a/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOption.cs +++ b/Assets/Scripts/UI/DialogUI/Bubbles/BubbleOption.cs @@ -19,7 +19,7 @@ namespace AibisDream public void LoadData(BubbleOptionSlotData data) { - transform.position = data.slotPosition; + ((RectTransform)transform).localPosition = UIManager.GetDialogUIPos(data.slotPosition); } public void ShowOption(DialogOption dialogOption) diff --git a/Assets/Scripts/UI/UIManager.cs b/Assets/Scripts/UI/UIManager.cs index 2adbc5aca..3bdd65a14 100644 --- a/Assets/Scripts/UI/UIManager.cs +++ b/Assets/Scripts/UI/UIManager.cs @@ -15,6 +15,9 @@ namespace AibisDream public RectTransform Canvas { get; private set; } public Vector2 Resolution { get; set; } + public Camera UICamera { get; private set; } + public RectTransform DialogCanvas { get; private set; } + #endregion public override void OnSingletonInit() @@ -40,8 +43,10 @@ namespace AibisDream private void InitRefs() { + UICamera = transform.Find("UI Camera").GetComponent(); // 获取Canvas Canvas = transform.Find("UI Canvas").GetComponent(); + DialogCanvas = transform.Find("Dialog Canvas").GetComponent(); // 获取Panel var panels = Canvas.GetComponentsInChildren(true); _panelPool = new Dictionary(); @@ -137,6 +142,18 @@ namespace AibisDream Debug.Log($"没有找到{typeof(T)}"); return null; } + + public static Vector3 GetDialogUIPos(Vector3 screenPos) + { + // 转换为UI坐标 + RectTransformUtility.ScreenPointToLocalPointInRectangle( + Instance.DialogCanvas, + screenPos, + Instance.UICamera, + out Vector2 localPoint); + + return localPoint; + } } public interface IUIManager