diff --git a/Assets/Resources/Art/SubWay/图层 7.png b/Assets/Resources/Art/SubWay/图层 7.png index 8b559b9dd..a6ca0ead6 100644 --- a/Assets/Resources/Art/SubWay/图层 7.png +++ b/Assets/Resources/Art/SubWay/图层 7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c1f3597394a5bd9b984d0d0c13d37b5cf8f0ce87e3485e30694fe50624aff48 -size 987304 +oid sha256:e52396deeb3f153d0a6323ee6bbc48c5303f7a099c8a576b506945ba2bd57d25 +size 2572054 diff --git a/Assets/Resources/Art/SubWay/栏杆.png b/Assets/Resources/Art/SubWay/栏杆.png new file mode 100644 index 000000000..2ef6935d6 --- /dev/null +++ b/Assets/Resources/Art/SubWay/栏杆.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11a91f206844814fd4d754d85e8542a2e3904d5a3a2306077bfb0012eb2210ef +size 24815 diff --git a/Assets/Resources/Art/SubWay/栏杆.png.meta b/Assets/Resources/Art/SubWay/栏杆.png.meta new file mode 100644 index 000000000..f7d9ba050 --- /dev/null +++ b/Assets/Resources/Art/SubWay/栏杆.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: c005aa50e11a3254ba5ece150b157628 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Art/SubWay/横板地铁夜晚导出.psb b/Assets/Resources/Art/SubWay/横板地铁夜晚导出.psb index d0f181a55..8dea9886b 100644 Binary files a/Assets/Resources/Art/SubWay/横板地铁夜晚导出.psb and b/Assets/Resources/Art/SubWay/横板地铁夜晚导出.psb differ diff --git a/Assets/Resources/Art/SubWay/横板地铁夜晚导出.psb.meta b/Assets/Resources/Art/SubWay/横板地铁夜晚导出.psb.meta index 73cef8dbb..639415b10 100644 --- a/Assets/Resources/Art/SubWay/横板地铁夜晚导出.psb.meta +++ b/Assets/Resources/Art/SubWay/横板地铁夜晚导出.psb.meta @@ -122,8 +122,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1607 - y: 3799 + x: 2013 + y: 3204 width: 3969 height: 137 spriteID: 73e4376e2cb5b4441a786c06da574ccc @@ -134,20 +134,20 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1607, y: 3799} + uvTransform: {x: 2013, y: 3204} spritePosition: {x: 0, y: 0} - - name: "\u4E3B\u4EBA\u516C" + - name: "\u5934\u53D1" originalName: pivot: {x: 0.5, y: 0.5} alignment: 0 border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 6748 - y: 3567 - width: 606 - height: 644 - spriteID: 281984e77829bab4d9b1c35a5413f991 + x: 4 + y: 4775 + width: 417 + height: 619 + spriteID: 5d853520ac59bcb488dc51cb91577f9a spriteBone: [] spriteOutline: [] vertices: [] @@ -155,8 +155,29 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 6699, y: 3567} - spritePosition: {x: 1617, y: 0} + uvTransform: {x: 4, y: 4775} + spritePosition: {x: 1681, y: 47} + - name: "\u8EAB\u4F53" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 7502 + y: 3205 + width: 620 + height: 344 + spriteID: 59fe46be69709164c8edb847a71e51fe + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 7454, y: 3205} + spritePosition: {x: 1585, y: 0} - name: "\u6276\u624Ba" originalName: pivot: {x: 0.5, y: 0.5} @@ -164,8 +185,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 6369 - y: 4352 + x: 5674 + y: 2918 width: 174 height: 195 spriteID: fa17fe89d56648943b0bdaf28abf53e8 @@ -176,7 +197,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 6369, y: 4352} + uvTransform: {x: 5674, y: 2918} spritePosition: {x: 2086, y: 1005} - name: "\u6276\u624Bb" originalName: @@ -185,8 +206,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 6551 - y: 4352 + x: 5856 + y: 2918 width: 103 height: 115 spriteID: fa87b5249dd87b744920f577b08ba53e @@ -197,7 +218,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 6551, y: 4352} + uvTransform: {x: 5856, y: 2918} spritePosition: {x: 2173, y: 835} - name: "\u6276\u624B\u680F\u6746" originalName: @@ -206,8 +227,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3981 - y: 2314 + x: 2013 + y: 3471 width: 2416 height: 26 spriteID: 4a37a45c175f8c14ea24d82d6c34b208 @@ -218,7 +239,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3981, y: 2314} + uvTransform: {x: 2013, y: 3471} spritePosition: {x: 1020, y: 950} - name: "\u8F66\u53A2" originalName: @@ -241,6 +262,69 @@ ScriptedImporter: tessellationDetail: 0 uvTransform: {x: 3981, y: 4} spritePosition: {x: 0, y: 0} + - name: "\u59D0\u59D0\u5012\u5F71" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 6934 + y: 3567 + width: 269 + height: 412 + spriteID: 196a7842d78fa064f80ab72e63ca3acb + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 6934, y: 3567} + spritePosition: {x: 2038, y: 236} + - name: "\u96A7\u6D1E\u706F" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 1607 + y: 3567 + width: 2521 + height: 703 + spriteID: 820e8ec11f5e05e439d5cdab4d8a2aaf + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1607, y: 3567} + spritePosition: {x: 1334, y: 401} + - name: "\u96A7\u6D1E" + 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: 1212 + width: 3969 + height: 1200 + spriteID: b784cf8b6259acd46a666f23d85062fc + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 4, y: 1212} + spritePosition: {x: 0, y: 0} - name: "\u680F\u6746a" originalName: pivot: {x: 0.5, y: 0.5} @@ -262,27 +346,6 @@ ScriptedImporter: tessellationDetail: 0 uvTransform: {x: 4, y: 2420} spritePosition: {x: 712, y: 61} - - name: "\u56FE\u5C42 7" - originalName: - pivot: {x: 0.5, y: 0.5} - alignment: 0 - border: {x: 0, y: 0, z: 0, w: 0} - rect: - serializedVersion: 2 - x: 3981 - y: 1212 - width: 2713 - height: 1094 - spriteID: a8010eb5097d4704c991e833f4d10314 - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 3981, y: 1212} - spritePosition: {x: 0, y: 0} - name: "\u680F\u6746b" originalName: pivot: {x: 0.5, y: 0.5} @@ -311,8 +374,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 6167 - y: 4352 + x: 5990 + y: 3155 width: 194 height: 401 spriteID: 8b5002ea1773ab941b086c796c8f06a2 @@ -323,7 +386,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 6167, y: 4352} + uvTransform: {x: 5990, y: 3155} spritePosition: {x: 1529, y: 277} - name: "\u9E1Fa" originalName: @@ -332,8 +395,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 6369 - y: 4555 + x: 5674 + y: 3121 width: 242 height: 64 spriteID: 3ed307cd7dec36943a3ef30b0f428a34 @@ -344,7 +407,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 6369, y: 4555} + uvTransform: {x: 5674, y: 3121} spritePosition: {x: 2186, y: 555} - name: "\u8FD1\u666F\u623F\u5B50b" originalName: @@ -374,8 +437,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 5584 - y: 3567 + x: 6919 + y: 2420 width: 575 height: 993 spriteID: 137cede1b483c5d4c96fccf9e13610e4 @@ -386,7 +449,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 5584, y: 3567} + uvTransform: {x: 6919, y: 2420} spritePosition: {x: 2884, y: 0} - name: "\u4E2D\u666F\u623F\u5B50a" originalName: @@ -395,8 +458,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 6167 - y: 3567 + x: 7502 + y: 2420 width: 573 height: 777 spriteID: 2e4ae7152ddc5ac44854b7a0e41e51a8 @@ -407,7 +470,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 6167, y: 3567} + uvTransform: {x: 7502, y: 2420} spritePosition: {x: 2654, y: 0} - name: "\u4E2D\u666F\u623F\u5B50b" originalName: @@ -416,8 +479,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 6702 - y: 1212 + x: 5990 + y: 2420 width: 921 height: 727 spriteID: a88ff2d065b58bc4ba485ad9d09ed550 @@ -428,7 +491,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 6702, y: 1212} + uvTransform: {x: 5990, y: 2420} spritePosition: {x: 1747, y: 0} - name: "\u4E2D\u666F\u623F\u5B50c" originalName: @@ -458,8 +521,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 5990 - y: 2706 + x: 4068 + y: 2918 width: 1598 height: 127 spriteID: 4e2a2df634a417c40b5b5b060e06b331 @@ -470,7 +533,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 5990, y: 2706} + uvTransform: {x: 4068, y: 2918} spritePosition: {x: 1488, y: 338} - name: "\u6865b" originalName: @@ -479,8 +542,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 1607 - y: 3567 + x: 4136 + y: 4008 width: 3969 height: 224 spriteID: 4b235ee80d274194cb52bb0a12cfd5a5 @@ -491,7 +554,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 1607, y: 3567} + uvTransform: {x: 4136, y: 4008} spritePosition: {x: 0, y: 297} - name: "\u4E91a" originalName: @@ -500,8 +563,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 2013 - y: 2918 + x: 4136 + y: 3567 width: 2790 height: 433 spriteID: 65be22f45d968b14487ca63cf48b8b43 @@ -512,7 +575,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 2013, y: 2918} + uvTransform: {x: 4136, y: 3567} spritePosition: {x: 980, y: 722} - name: "\u4E91b" originalName: @@ -521,8 +584,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 5990 - y: 2420 + x: 2013 + y: 2918 width: 2047 height: 278 spriteID: b096869af5873954a91da95e0f676331 @@ -533,7 +596,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 5990, y: 2420} + uvTransform: {x: 2013, y: 2918} spritePosition: {x: 980, y: 546} - name: "\u6700\u8FDC\u57CE\u5E02" originalName: @@ -542,8 +605,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 6702 - y: 1947 + x: 1607 + y: 4278 width: 1451 height: 330 spriteID: 9b3499460401c664b8ef60977b8a845c @@ -554,7 +617,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 6702, y: 1947} + uvTransform: {x: 1607, y: 4278} spritePosition: {x: 1575, y: 370} - name: "\u98DE\u8247" originalName: @@ -563,8 +626,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 6551 - y: 4475 + x: 6919 + y: 3421 width: 132 height: 57 spriteID: 7e7f1b1b448c7ff45a420af427d5c9b3 @@ -575,7 +638,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 6551, y: 4475} + uvTransform: {x: 6919, y: 3421} spritePosition: {x: 1712, y: 864} - name: "\u4E91c" originalName: @@ -584,8 +647,8 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4811 - y: 2918 + x: 2013 + y: 3349 width: 2533 height: 114 spriteID: b5d49ebf2a9e7cc4e8450162f65ef554 @@ -596,7 +659,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4811, y: 2918} + uvTransform: {x: 2013, y: 3349} spritePosition: {x: 1225, y: 630} - name: "\u80CC\u666F" originalName: @@ -605,7 +668,7 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4 + x: 3981 y: 1212 width: 3969 height: 1200 @@ -617,7 +680,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 1212} + uvTransform: {x: 3981, y: 1212} spritePosition: {x: 0, y: 0} characterData: bones: [] @@ -717,17 +780,27 @@ ScriptedImporter: parentIndex: -1 spriteID: 73e4376e2cb5b4441a786c06da574ccc layerID: 1168 - mosaicPosition: {x: 1607, y: 3799} + mosaicPosition: {x: 2013, y: 3204} flatten: 0 isImported: 1 isVisible: 1 - - name: "\u4E3B\u4EBA\u516C" - spriteName: "\u4E3B\u4EBA\u516C" + - name: "\u5934\u53D1" + spriteName: "\u5934\u53D1" isGroup: 0 parentIndex: -1 - spriteID: 281984e77829bab4d9b1c35a5413f991 - layerID: 245 - mosaicPosition: {x: 6748, y: 3567} + spriteID: 5d853520ac59bcb488dc51cb91577f9a + layerID: 2432 + mosaicPosition: {x: 4, y: 4775} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u8EAB\u4F53" + spriteName: "\u8EAB\u4F53" + isGroup: 0 + parentIndex: -1 + spriteID: 59fe46be69709164c8edb847a71e51fe + layerID: 2452 + mosaicPosition: {x: 7502, y: 3205} flatten: 0 isImported: 1 isVisible: 1 @@ -737,7 +810,7 @@ ScriptedImporter: parentIndex: -1 spriteID: fa17fe89d56648943b0bdaf28abf53e8 layerID: 2357 - mosaicPosition: {x: 6369, y: 4352} + mosaicPosition: {x: 5674, y: 2918} flatten: 0 isImported: 1 isVisible: 1 @@ -747,7 +820,7 @@ ScriptedImporter: parentIndex: -1 spriteID: fa87b5249dd87b744920f577b08ba53e layerID: 2346 - mosaicPosition: {x: 6551, y: 4352} + mosaicPosition: {x: 5856, y: 2918} flatten: 0 isImported: 1 isVisible: 1 @@ -757,7 +830,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 4a37a45c175f8c14ea24d82d6c34b208 layerID: 2338 - mosaicPosition: {x: 3981, y: 2314} + mosaicPosition: {x: 2013, y: 3471} flatten: 0 isImported: 1 isVisible: 1 @@ -771,6 +844,46 @@ ScriptedImporter: flatten: 0 isImported: 1 isVisible: 1 + - name: "\u96A7\u6D1E" + spriteName: + isGroup: 1 + parentIndex: -1 + spriteID: b27ddc9bbdb5f3d45aea5e47a5dd55aa + layerID: 2422 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 1 + - name: "\u59D0\u59D0\u5012\u5F71" + spriteName: "\u59D0\u59D0\u5012\u5F71" + isGroup: 0 + parentIndex: 8 + spriteID: 196a7842d78fa064f80ab72e63ca3acb + layerID: 2468 + mosaicPosition: {x: 6934, y: 3567} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u96A7\u6D1E\u706F" + spriteName: "\u96A7\u6D1E\u706F" + isGroup: 0 + parentIndex: 8 + spriteID: 820e8ec11f5e05e439d5cdab4d8a2aaf + layerID: 2419 + mosaicPosition: {x: 1607, y: 3567} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u96A7\u6D1E" + spriteName: "\u96A7\u6D1E" + isGroup: 0 + parentIndex: 8 + spriteID: b784cf8b6259acd46a666f23d85062fc + layerID: 2418 + mosaicPosition: {x: 4, y: 1212} + flatten: 0 + isImported: 1 + isVisible: 1 - name: "\u680F\u6746a" spriteName: "\u680F\u6746a" isGroup: 0 @@ -781,146 +894,16 @@ ScriptedImporter: flatten: 0 isImported: 1 isVisible: 1 - - name: "\u56FE\u5C42 7" - spriteName: "\u56FE\u5C42 7" + - name: "\u76F8\u9519\u5217\u8F66" + spriteName: isGroup: 0 parentIndex: -1 - spriteID: a8010eb5097d4704c991e833f4d10314 - layerID: 2411 - mosaicPosition: {x: 3981, y: 1212} - flatten: 0 - isImported: 1 - isVisible: 1 - - name: "\u5907\u4EFD" - spriteName: - isGroup: 1 - parentIndex: -1 - spriteID: 4e175f3f359f6de4086bf3f69a18ed5c - layerID: 2399 + spriteID: b4ba6899d80d7434791c559d5fb45d12 + layerID: 2413 mosaicPosition: {x: 0, y: 0} flatten: 0 isImported: 0 isVisible: 0 - - name: "\u8272\u9636 1 \u62F7\u8D1D" - spriteName: - isGroup: 0 - parentIndex: 9 - spriteID: 3e2a04d4e3c7a614d8f0660de5f027af - layerID: 2385 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 - isVisible: 1 - - name: "\u8272\u9636 1" - spriteName: - isGroup: 0 - parentIndex: 9 - spriteID: 1118423c1a92a8844abe2b4274920768 - layerID: 2367 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 - isVisible: 1 - - name: "\u8272\u9636 3" - spriteName: - isGroup: 0 - parentIndex: 9 - spriteID: 88d3afe8d42fbe646a40c28c235965ae - layerID: 2370 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 - isVisible: 1 - - name: "\u8272\u76F8/\u9971\u548C\u5EA6 2" - spriteName: - isGroup: 0 - parentIndex: 9 - spriteID: 15fa0c02c174db747994ec242c41b265 - layerID: 2373 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 - isVisible: 1 - - name: "\u56FE\u5C42 1" - spriteName: - isGroup: 0 - parentIndex: 9 - spriteID: fd143494a6570ef409399d7837b1e911 - layerID: 2366 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 - isVisible: 1 - - name: "\u8272\u76F8/\u9971\u548C\u5EA6 1" - spriteName: - isGroup: 0 - parentIndex: 9 - spriteID: 93907de9ed8ddaa4babe48af96c23c26 - layerID: 2365 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 - isVisible: 1 - - name: "\u8272\u9636 4" - spriteName: - isGroup: 0 - parentIndex: 9 - spriteID: 6c01c46e332bc4a45bce24ed3835d54a - layerID: 2374 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 - isVisible: 1 - - name: "\u56FE\u5C42 2" - spriteName: - isGroup: 0 - parentIndex: 9 - spriteID: c4f0772f431d8e7419aa3f2f67435a63 - layerID: 2372 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 - isVisible: 1 - - name: "\u8F66\u53A2b \u62F7\u8D1D" - spriteName: - isGroup: 0 - parentIndex: 9 - spriteID: c03d6d3d813f79e4ea26cc659ef559d7 - layerID: 2362 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 - isVisible: 1 - - name: "\u8F66\u53A2b \u62F7\u8D1D 3" - spriteName: - isGroup: 0 - parentIndex: 9 - spriteID: 3720a286c6a425f4d8a6d18854ffb817 - layerID: 2377 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 - isVisible: 1 - - name: "\u8F66\u53A2b \u62F7\u8D1D 2" - spriteName: - isGroup: 0 - parentIndex: 9 - spriteID: 696c1cdfc4b5e0e41b0bf6cfcde25b86 - layerID: 2376 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 - isVisible: 1 - - name: "\u8F66\u53A2b" - spriteName: - isGroup: 0 - parentIndex: 9 - spriteID: df1096ffaf2c95040a3ba58e93ff9b94 - layerID: 2361 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 - isVisible: 1 - name: "\u96EA" spriteName: isGroup: 0 @@ -947,17 +930,27 @@ ScriptedImporter: parentIndex: -1 spriteID: 8b5002ea1773ab941b086c796c8f06a2 layerID: 2294 - mosaicPosition: {x: 6167, y: 4352} + mosaicPosition: {x: 5990, y: 3155} flatten: 0 isImported: 1 isVisible: 1 + - name: "\u7AD9\u53F0" + spriteName: + isGroup: 0 + parentIndex: -1 + spriteID: 89037e93ad8081244bda44eb2d4da640 + layerID: 2416 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 - name: "\u9E1Fa" spriteName: "\u9E1Fa" isGroup: 0 parentIndex: -1 spriteID: 3ed307cd7dec36943a3ef30b0f428a34 layerID: 2293 - mosaicPosition: {x: 6369, y: 4555} + mosaicPosition: {x: 5674, y: 3121} flatten: 0 isImported: 1 isVisible: 1 @@ -987,7 +980,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 137cede1b483c5d4c96fccf9e13610e4 layerID: 2281 - mosaicPosition: {x: 5584, y: 3567} + mosaicPosition: {x: 6919, y: 2420} flatten: 0 isImported: 1 isVisible: 1 @@ -997,7 +990,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 2e4ae7152ddc5ac44854b7a0e41e51a8 layerID: 2275 - mosaicPosition: {x: 6167, y: 3567} + mosaicPosition: {x: 7502, y: 2420} flatten: 0 isImported: 1 isVisible: 1 @@ -1007,7 +1000,7 @@ ScriptedImporter: parentIndex: -1 spriteID: a88ff2d065b58bc4ba485ad9d09ed550 layerID: 2261 - mosaicPosition: {x: 6702, y: 1212} + mosaicPosition: {x: 5990, y: 2420} flatten: 0 isImported: 1 isVisible: 1 @@ -1027,7 +1020,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 4e2a2df634a417c40b5b5b060e06b331 layerID: 2257 - mosaicPosition: {x: 5990, y: 2706} + mosaicPosition: {x: 4068, y: 2918} flatten: 0 isImported: 1 isVisible: 1 @@ -1037,7 +1030,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 4b235ee80d274194cb52bb0a12cfd5a5 layerID: 2256 - mosaicPosition: {x: 1607, y: 3567} + mosaicPosition: {x: 4136, y: 4008} flatten: 0 isImported: 1 isVisible: 1 @@ -1047,7 +1040,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 65be22f45d968b14487ca63cf48b8b43 layerID: 2255 - mosaicPosition: {x: 2013, y: 2918} + mosaicPosition: {x: 4136, y: 3567} flatten: 0 isImported: 1 isVisible: 1 @@ -1057,7 +1050,7 @@ ScriptedImporter: parentIndex: -1 spriteID: b096869af5873954a91da95e0f676331 layerID: 2254 - mosaicPosition: {x: 5990, y: 2420} + mosaicPosition: {x: 2013, y: 2918} flatten: 0 isImported: 1 isVisible: 1 @@ -1067,7 +1060,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 9b3499460401c664b8ef60977b8a845c layerID: 2252 - mosaicPosition: {x: 6702, y: 1947} + mosaicPosition: {x: 1607, y: 4278} flatten: 0 isImported: 1 isVisible: 1 @@ -1077,7 +1070,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 7e7f1b1b448c7ff45a420af427d5c9b3 layerID: 2247 - mosaicPosition: {x: 6551, y: 4475} + mosaicPosition: {x: 6919, y: 3421} flatten: 0 isImported: 1 isVisible: 1 @@ -1087,7 +1080,7 @@ ScriptedImporter: parentIndex: -1 spriteID: b5d49ebf2a9e7cc4e8450162f65ef554 layerID: 2246 - mosaicPosition: {x: 4811, y: 2918} + mosaicPosition: {x: 2013, y: 3349} flatten: 0 isImported: 1 isVisible: 1 @@ -1097,7 +1090,7 @@ ScriptedImporter: parentIndex: -1 spriteID: 1e501c908be482c4599a3f27ee38e5a5 layerID: 2244 - mosaicPosition: {x: 4, y: 1212} + mosaicPosition: {x: 3981, y: 1212} flatten: 0 isImported: 1 isVisible: 1 diff --git a/Assets/Resources/Art/SubWay/隧洞灯.png b/Assets/Resources/Art/SubWay/隧洞灯.png new file mode 100644 index 000000000..455b6136b --- /dev/null +++ b/Assets/Resources/Art/SubWay/隧洞灯.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfdb3f555a4f3946751e1af414d408a241ebf4b24b418b5d4c75052ebb634851 +size 257342 diff --git a/Assets/Resources/Art/SubWay/隧洞灯.png.meta b/Assets/Resources/Art/SubWay/隧洞灯.png.meta new file mode 100644 index 000000000..cdbc5f5fb --- /dev/null +++ b/Assets/Resources/Art/SubWay/隧洞灯.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 6056f040a3b0aac4596e8f183a05eb51 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 04f79562d..debea3bdd 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -5588,7 +5588,7 @@ MonoBehaviour: runMode: 0 firstTalkSO: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} clinicScene: ClinicScene - testYarnProject: PeipeiNew2 + testYarnProject: SubWay --- !u!4 &719228339 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/SubWay.unity b/Assets/Scenes/SubWay.unity index 0e3fe667f..c77d1cdfe 100644 --- a/Assets/Scenes/SubWay.unity +++ b/Assets/Scenes/SubWay.unity @@ -123,16 +123,231 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &8824067 stripped +--- !u!1 &157917237 GameObject: - m_CorrespondingSourceObject: {fileID: -1996906440276204451, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - m_PrefabInstance: {fileID: 1444344157} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 157917238} + - component: {fileID: 157917239} + - component: {fileID: 157917240} + m_Layer: 0 + m_Name: "\u96A7\u6D1E (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &157917238 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 157917237} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -27, y: 6, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1444344160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &157917239 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 157917237} + 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: 1560193523 + m_SortingLayer: -1 + m_SortingOrder: 70 + m_Sprite: {fileID: -1171077001640871620, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 39.69, y: 12} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!331 &157917240 +SpriteMask: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 157917237} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -1171077001640871620, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + m_MaskAlphaCutoff: 0 + m_FrontSortingLayerID: 0 + m_BackSortingLayerID: 0 + m_FrontSortingLayer: 0 + m_BackSortingLayer: 0 + m_FrontSortingOrder: 0 + m_BackSortingOrder: 0 + m_IsCustomRangeActive: 0 + m_SpriteSortPoint: 0 --- !u!1 &264393910 stripped GameObject: m_CorrespondingSourceObject: {fileID: -5718755401224842811, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} m_PrefabInstance: {fileID: 1444344157} m_PrefabAsset: {fileID: 0} +--- !u!1 &329488974 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 329488975} + - component: {fileID: 329488976} + m_Layer: 0 + m_Name: "\u4E2D\u666F\u623F\u5B50b (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &329488975 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 329488974} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.2699997, y: 3.635, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1302373981} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &329488976 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 329488974} + 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: 1560193523 + m_SortingLayer: -1 + m_SortingOrder: 10 + m_Sprite: {fileID: 2414764197234308515, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 9.21, y: 7.27} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &408274514 GameObject: m_ObjectHideFlags: 0 @@ -306,7 +521,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &519420028 +--- !u!1 &522985921 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -314,135 +529,82 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 519420032} - - component: {fileID: 519420031} - - component: {fileID: 519420029} - - component: {fileID: 519420030} + - component: {fileID: 522985922} + - component: {fileID: 522985923} m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera + m_Name: "\u680F\u6746b (1)" + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!81 &519420029 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 ---- !u!114 &519420030 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 ---- !u!20 &519420031 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 34 - orthographic: 1 - orthographic size: 5.736044 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 0 - m_HDR: 1 - m_AllowMSAA: 0 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 0 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &519420032 +--- !u!4 &522985922 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} + m_GameObject: {fileID: 522985921} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.26, y: 0, z: -10} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -4.085, y: 6.22, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1444344160} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &522985923 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 522985921} + 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: 1560193523 + m_SortingLayer: -1 + m_SortingOrder: 17 + m_Sprite: {fileID: 2189642004801753847, guid: 3ef71b42553122d4b9fb9211680d703e, 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.86, y: 11.56} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &550416007 GameObject: m_ObjectHideFlags: 0 @@ -650,6 +812,90 @@ Transform: - {fileID: 550416008} m_Father: {fileID: 1444344160} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &719146787 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 719146788} + - component: {fileID: 719146789} + m_Layer: 0 + m_Name: "\u5E7F\u544A\u724Ca (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &719146788 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 719146787} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.2349992, y: 4.775, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1444344160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &719146789 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 719146787} + 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: 1560193523 + m_SortingLayer: -1 + m_SortingOrder: 16 + m_Sprite: {fileID: -799543738024352008, guid: 3ef71b42553122d4b9fb9211680d703e, 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.94, y: 4.01} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &734684620 GameObject: m_ObjectHideFlags: 0 @@ -720,8 +966,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: 1560193523 + m_SortingLayer: -1 m_SortingOrder: 7 m_Sprite: {fileID: -5620511163678177105, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -734,6 +980,39 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &779629287 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 779629288} + m_Layer: 0 + m_Name: NearBuilding + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &779629288 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 779629287} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.35, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1776055363} + - {fileID: 1721955123} + m_Father: {fileID: 1444344160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &896790803 stripped GameObject: m_CorrespondingSourceObject: {fileID: 325204245247115116, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} @@ -893,8 +1172,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: 1560193523 + m_SortingLayer: -1 m_SortingOrder: 7 m_Sprite: {fileID: -5620511163678177105, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -907,6 +1186,176 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1302373980 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1302373981} + m_Layer: 0 + m_Name: MidBuilding + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1302373981 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1302373980} + 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: 1794737219} + - {fileID: 329488975} + m_Father: {fileID: 1444344160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1335961263 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1335961267} + - component: {fileID: 1335961266} + - component: {fileID: 1335961265} + - component: {fileID: 1335961264} + m_Layer: 0 + m_Name: Main Camera (1) + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1335961264 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1335961263} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 64 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 1 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + quality: 3 + frameInfluence: 0.1 + jitterScale: 1 + mipBias: 0 + varianceClampScale: 0.9 + contrastAdaptiveSharpening: 0 +--- !u!81 &1335961265 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1335961263} + m_Enabled: 1 +--- !u!20 &1335961266 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1335961263} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 34 + orthographic: 1 + orthographic size: 4.88 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 0 + m_HDR: 1 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 0 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1335961267 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1335961263} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1353933377 GameObject: m_ObjectHideFlags: 0 @@ -952,11 +1401,6 @@ Transform: - {fileID: 1933601686} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1371830202 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 547352288642336102, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - m_PrefabInstance: {fileID: 1444344157} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1444344157 PrefabInstance: m_ObjectHideFlags: 0 @@ -1065,6 +1509,14 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: -5716637248054135790, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -5233266348993767057, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalPosition.x + value: 2.729999 + objectReference: {fileID: 0} - target: {fileID: -4630011535550576009, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} propertyPath: m_IsActive value: 0 @@ -1073,17 +1525,29 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: -4036889652799658792, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayer + value: -1 + objectReference: {fileID: 0} + - target: {fileID: -4036889652799658792, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayerID + value: 1560193523 + objectReference: {fileID: 0} + - target: {fileID: -2961953986958284860, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: -2815991242948295342, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - target: {fileID: -2631490737693695074, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} propertyPath: m_LocalPosition.x - value: 4.68 + value: 3.2699997 objectReference: {fileID: 0} - target: {fileID: -2166748036225056284, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} propertyPath: m_LocalPosition.x - value: 11.47 + value: 10.06 objectReference: {fileID: 0} - target: {fileID: -1996906440276204451, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} propertyPath: m_IsActive @@ -1097,10 +1561,22 @@ PrefabInstance: propertyPath: m_SortingLayerID value: 1560193523 objectReference: {fileID: 0} + - target: {fileID: -1007253325332242823, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: -625517454410272172, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: -589364704471287391, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayer + value: -1 + objectReference: {fileID: 0} + - target: {fileID: -589364704471287391, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayerID + value: 1560193523 + objectReference: {fileID: 0} - target: {fileID: 44416471842246233, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} propertyPath: m_SortingLayer value: -1 @@ -1117,6 +1593,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 993206881953173987, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1235888514548706139, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} propertyPath: m_SortingLayer value: -1 @@ -1133,6 +1613,18 @@ PrefabInstance: propertyPath: m_SortingLayerID value: 1560193523 objectReference: {fileID: 0} + - target: {fileID: 1329892728965888690, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalPosition.x + value: 4.61 + objectReference: {fileID: 0} + - target: {fileID: 1682857079708783346, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayer + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1682857079708783346, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayerID + value: 1560193523 + objectReference: {fileID: 0} - target: {fileID: 2074523089955896138, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} propertyPath: m_IsActive value: 0 @@ -1161,25 +1653,81 @@ PrefabInstance: propertyPath: m_SortingLayerID value: 1560193523 objectReference: {fileID: 0} + - target: {fileID: 5174627286053047076, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalPosition.x + value: 0.054998457 + objectReference: {fileID: 0} - target: {fileID: 5249595425162652436, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5360568992489953244, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c005aa50e11a3254ba5ece150b157628, type: 3} + - target: {fileID: 5360568992489953244, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayer + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 5360568992489953244, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayerID + value: 1560193523 + objectReference: {fileID: 0} + - target: {fileID: 6040431009139644796, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalPosition.x + value: 8.83 + objectReference: {fileID: 0} + - target: {fileID: 6114338901893956629, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalPosition.x + value: 4.14 + objectReference: {fileID: 0} + - target: {fileID: 6335209494765190406, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} - target: {fileID: 6786725401493528197, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 7785411108429510647, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + insertIndex: 10 + addedObject: {fileID: 157917238} + - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + insertIndex: 11 + addedObject: {fileID: 1759782837} + - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + insertIndex: 12 + addedObject: {fileID: 2131325287} - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} insertIndex: 17 - addedObject: {fileID: 633879431} + addedObject: {fileID: 719146788} + - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + insertIndex: 18 + addedObject: {fileID: 522985922} + - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + insertIndex: 19 + addedObject: {fileID: 1773696866} - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} insertIndex: 20 + addedObject: {fileID: 779629288} + - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + insertIndex: 23 + addedObject: {fileID: 1302373981} + - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + insertIndex: 25 + addedObject: {fileID: 633879431} + - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + insertIndex: 28 addedObject: {fileID: 2057142334} - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - insertIndex: 22 + insertIndex: 30 addedObject: {fileID: 1955111545} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: -8653719598885068355, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} @@ -1203,80 +1751,154 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 394cd5dc2104b444d89d10e6440161fd, type: 3} m_Name: m_EditorClassIdentifier: + speedMultiplier: 1 layerConfigs: - layer: {fileID: 633879430} - scrollSpeed: 100 + scrollSpeed: 0.02 scrollOffset: 39.69 - layer: {fileID: 2057142333} - scrollSpeed: 100 + scrollSpeed: 0.02 scrollOffset: 39.69 categoryConfigs: - - categoryName: CloudNear - objects: - - {fileID: 264393910} - - {fileID: 264393910} - generationThreshold: 16 - useIntervalGeneration: 0 - spawnInterval: 0 - speed: 60 - xSpawnRange: 24 - - categoryName: CloudMid - objects: - - {fileID: 627225183} - - {fileID: 627225183} - generationThreshold: 16 - useIntervalGeneration: 0 - spawnInterval: 0 - speed: 90 - xSpawnRange: 24 - categoryName: CloudFar + isEnabled: 1 objects: - {fileID: 481930317} - {fileID: 481930317} - generationThreshold: 16 + speed: 0.02 + xSpawnRange: 20 useIntervalGeneration: 0 spawnInterval: 5 - speed: 130 - xSpawnRange: 24 - - categoryName: BuildingNear + batchSize: 3 + batchInterval: 0.2 + delayAfterBatch: 2 + generationThreshold: 14 + - categoryName: CloudMid + isEnabled: 1 objects: - - {fileID: 1694076822} - - {fileID: 8824067} + - {fileID: 627225183} + - {fileID: 627225183} + speed: 0.03 + xSpawnRange: 24 + useIntervalGeneration: 0 + spawnInterval: 0 + batchSize: 3 + batchInterval: 0.2 + delayAfterBatch: 2 generationThreshold: 16 + - categoryName: CloudNear + isEnabled: 1 + objects: + - {fileID: 264393910} + - {fileID: 264393910} + speed: 1 + xSpawnRange: 24 + useIntervalGeneration: 0 + spawnInterval: 0 + batchSize: 3 + batchInterval: 0.2 + delayAfterBatch: 2 + generationThreshold: 16 + - categoryName: BuildingMid + isEnabled: 1 + objects: + - {fileID: 1302373980} + - {fileID: 1302373980} + - {fileID: 1302373980} + - {fileID: 1302373980} + - {fileID: 1302373980} + - {fileID: 1302373980} + speed: 1 + xSpawnRange: 24 + useIntervalGeneration: 1 + spawnInterval: 0 + batchSize: 3 + batchInterval: 10 + delayAfterBatch: 6 + generationThreshold: 16 + - categoryName: BuildingNear + isEnabled: 1 + objects: + - {fileID: 779629287} + - {fileID: 779629287} + - {fileID: 779629287} + speed: 50 + xSpawnRange: 24 useIntervalGeneration: 1 spawnInterval: 12 - speed: 2 - xSpawnRange: 24 - - categoryName: BuildingMid - objects: - - {fileID: 1371830202} - - {fileID: 1616261555} - - {fileID: 1616261555} - - {fileID: 1371830202} + batchSize: 3 + batchInterval: 3 + delayAfterBatch: 15 generationThreshold: 16 - useIntervalGeneration: 1 - spawnInterval: 4 - speed: 35 - xSpawnRange: 24 - categoryName: Bird + isEnabled: 1 objects: - - {fileID: 1371830202} - - {fileID: 1616261555} - generationThreshold: 16 - useIntervalGeneration: 1 - spawnInterval: 0.5 - speed: 10 + - {fileID: 896790803} + - {fileID: 896790803} + - {fileID: 896790803} + speed: 0.3 xSpawnRange: 24 - - categoryName: NearSmall - objects: - - {fileID: 896790803} - - {fileID: 896790803} - generationThreshold: 16 useIntervalGeneration: 1 - spawnInterval: 7 + spawnInterval: 30 + batchSize: 1 + batchInterval: 0 + delayAfterBatch: 10 + generationThreshold: 16 + - categoryName: "\u94C1\u8DEF\u680F\u6746" + isEnabled: 1 + objects: + - {fileID: 1773696865} + - {fileID: 1773696865} + speed: 100 + xSpawnRange: 21 + useIntervalGeneration: 1 + spawnInterval: 30 + batchSize: 1 + batchInterval: 1 + delayAfterBatch: 1 + generationThreshold: 20 + - categoryName: "\u96A7\u6D1E\u706F" + isEnabled: 0 + objects: + - {fileID: 1759782836} + speed: 65 + xSpawnRange: 21 + useIntervalGeneration: 1 + spawnInterval: 30 + batchSize: 1 + batchInterval: 0 + delayAfterBatch: 2 + generationThreshold: 20 + - categoryName: "\u5E7F\u544A\u724C" + isEnabled: 1 + objects: + - {fileID: 719146787} + speed: 1 + xSpawnRange: 21 + useIntervalGeneration: 1 + spawnInterval: 30 + batchSize: 1 + batchInterval: 1 + delayAfterBatch: 80 + generationThreshold: 20 + - categoryName: "\u7535\u7EBF\u6746" + isEnabled: 1 + objects: + - {fileID: 522985921} speed: 80 - xSpawnRange: 24 - speedMultiplier: 1 + xSpawnRange: 21 + useIntervalGeneration: 1 + spawnInterval: 30 + batchSize: 1 + batchInterval: 1 + delayAfterBatch: 50 + generationThreshold: 20 + tunnelSprite: {fileID: 157917237} + sisterSpriteRender: {fileID: 2131325288} + tunnelEnterPosition: {x: -27, y: 0, z: 0} + tunnelExitPosition: {x: 32, y: 0, z: 0} + tunnelKeepPosition: {x: 0, y: 0, z: 0} + tunnelDuration: 0.7 --- !u!4 &1444344160 stripped Transform: m_CorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} @@ -1352,8 +1974,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: 1560193523 + m_SortingLayer: -1 m_SortingOrder: 7 m_Sprite: {fileID: -5620511163678177105, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1366,11 +1988,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1616261555 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -9063945555078097574, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - m_PrefabInstance: {fileID: 1444344157} - m_PrefabAsset: {fileID: 0} --- !u!1 &1632768997 GameObject: m_ObjectHideFlags: 0 @@ -1539,11 +2156,426 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1694076822 stripped +--- !u!1 &1721955122 GameObject: - m_CorrespondingSourceObject: {fileID: -4447896487569900934, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - m_PrefabInstance: {fileID: 1444344157} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1721955123} + - component: {fileID: 1721955124} + m_Layer: 0 + m_Name: "\u8FD1\u666F\u623F\u5B50b_1 (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1721955123 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1721955122} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.14, y: 4.9649997, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 779629288} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1721955124 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1721955122} + 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: 1560193523 + m_SortingLayer: -1 + m_SortingOrder: 12 + m_Sprite: {fileID: -8162648328321023319, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.75, y: 9.93} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1759782836 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1759782837} + - component: {fileID: 1759782838} + m_Layer: 0 + m_Name: "\u96A7\u6D1E\u706F (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1759782837 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1759782836} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.37, y: 7.5250006, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1444344160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1759782838 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1759782836} + 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: 1560193523 + m_SortingLayer: -1 + m_SortingOrder: 71 + m_Sprite: {fileID: 21300000, guid: 6056f040a3b0aac4596e8f183a05eb51, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 25.21, y: 7.03} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 1 + m_SpriteSortPoint: 0 +--- !u!1 &1773696865 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1773696866} + - component: {fileID: 1773696867} + m_Layer: 0 + m_Name: "\u680F\u6746a (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1773696866 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1773696865} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.3699992, y: 6.305, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1444344160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1773696867 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1773696865} + 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: 1560193523 + m_SortingLayer: -1 + m_SortingOrder: 33 + m_Sprite: {fileID: 21300000, guid: c005aa50e11a3254ba5ece150b157628, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 20.01, y: 11.39} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1776055362 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1776055363} + - component: {fileID: 1776055364} + m_Layer: 0 + m_Name: "\u8FD1\u666F\u623F\u5B50b (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1776055363 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1776055362} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -11.04, y: 6, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 779629288} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1776055364 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1776055362} + 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: 1560193523 + m_SortingLayer: -1 + m_SortingOrder: 13 + m_Sprite: {fileID: -4416534655804982459, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 15.95, y: 12} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1794737218 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1794737219} + - component: {fileID: 1794737220} + m_Layer: 0 + m_Name: "\u4E2D\u666F\u623F\u5B50a (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1794737219 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1794737218} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 10.06, y: 3.885, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1302373981} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1794737220 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1794737218} + 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: 1560193523 + m_SortingLayer: -1 + m_SortingOrder: 11 + m_Sprite: {fileID: -3865629831265556034, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.73, y: 7.77} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &1933601685 PrefabInstance: m_ObjectHideFlags: 0 @@ -1750,6 +2782,90 @@ Transform: - {fileID: 1470742898} m_Father: {fileID: 1444344160} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2131325286 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2131325287} + - component: {fileID: 2131325288} + m_Layer: 0 + m_Name: "\u59D0\u59D0\u5012\u5F71 (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2131325287 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2131325286} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2.75, y: 4.42, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1444344160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2131325288 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2131325286} + 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: 1560193523 + m_SortingLayer: -1 + m_SortingOrder: 72 + m_Sprite: {fileID: -1136042716431462305, guid: 3ef71b42553122d4b9fb9211680d703e, 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.69, y: 4.12} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 1 + m_SpriteSortPoint: 0 --- !u!1 &2131382684 GameObject: m_ObjectHideFlags: 0 @@ -1785,7 +2901,7 @@ Transform: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 519420032} + - {fileID: 1335961267} - {fileID: 2131382685} - {fileID: 1228458713} - {fileID: 1353933379} diff --git a/Assets/Scripts/Clue/ClueBoardManager.cs b/Assets/Scripts/Clue/ClueBoardManager.cs index 54b0af593..d3a0fd534 100644 --- a/Assets/Scripts/Clue/ClueBoardManager.cs +++ b/Assets/Scripts/Clue/ClueBoardManager.cs @@ -10,15 +10,12 @@ using System; public class ClueBoardManager : MonoBehaviour { - public Canvas clueBoardUI; // ClueBoard UI的GameObject + // 单例实例 + public static ClueBoardManager Instance { get; private set; } + public Canvas clueBoardUI; // ClueBoard UI的GameObject public GameObject iamgePointer; // ClueBoard UI的GameObject [SerializeField] private Button toggleButton; // 开启/关闭ClueBoard的按钮 - //[SerializeField] private Button submitButton; // 提交按钮 - // [SerializeField] private TMP_Text conclue; // 提交按钮 - //[SerializeField] private ClueSlotBase initialClueSlotPrefab; // 初始的ClueSlot预制体 - // [SerializeField] private Transform clueSlotContainer; // ClueSlot的容器 - private RectTransform clueBoardRectTransform; // ClueBoard的RectTransform private List clueSlots = new List(); // 当前存在的所有ClueSlot private int currentStep = 0; // 当前步骤编号 @@ -30,8 +27,8 @@ public class ClueBoardManager : MonoBehaviour public event Action OnClueBoardOpen; public event Action OnClueBoardClose; - [YarnCommand("wait_for_ClueBoard_close")] + [YarnCommand("wait_for_ClueBoard_close")] public IEnumerator WaitForClose() { // 这里等待关闭按钮点击事件 @@ -40,30 +37,29 @@ public class ClueBoardManager : MonoBehaviour yield return null; // 每帧检查一次 } } + + private void Awake() + { + if (Instance != null && Instance != this) + { + Destroy(gameObject); // 确保单例唯一性 + return; + } + Instance = this; + //DontDestroyOnLoad(gameObject); // 如果需要跨场景保留 + } + private void Start() { - clueBoardRectTransform = clueBoardUI.transform.GetComponent(); - - // 定义ClueBoard UI的位置 - // hiddenPosition = new Vector2(-Screen.width, clueBoardRectTransform.anchoredPosition.y); // 屏幕右侧 - // visiblePosition = new Vector2(0, clueBoardRectTransform.anchoredPosition.y); // 屏幕内 - - // // 设置初始位置和状态 - // clueBoardRectTransform.anchoredPosition = hiddenPosition; - clueBoardUI.enabled=false; - iamgePointer.GetComponent().enabled=false; + clueBoardRectTransform = clueBoardUI.transform.GetComponent(); + clueBoardUI.enabled = false; + iamgePointer.GetComponent().enabled = false; toggleButton.onClick.AddListener(ToggleClueBoard); // 绑定按钮事件 - //submitButton.onClick.AddListener(CheckCurrentSlot); // 绑定提交事件 - - //conclue.text="待分析症状"; - - // 初始化第一个ClueSlot - //AddNewClueSlot(); } // 开启或关闭 ClueBoard - private void ToggleClueBoard() + private void ToggleClueBoard() { Debug.Log("触发打开关闭诊疗面板"); if (isBoardOpen) @@ -75,119 +71,30 @@ public class ClueBoardManager : MonoBehaviour OpenClueBoard(); } } + [YarnCommand("OpenClueBoard")] public void OpenClueBoard() { - clueBoardUI.enabled=true; - iamgePointer.GetComponent().enabled=true; + clueBoardUI.enabled = true; + iamgePointer.GetComponent().enabled = true; isBoardOpen = true; OnClueBoardOpen?.Invoke(); MouseCursorManager.Instance.ClueBoardIn(); - - // 用DOTween从右侧移动到可见区域 - // clueBoardRectTransform.DOAnchorPos(visiblePosition, 0.5f); } + [YarnCommand("CloseClueBoard")] public void CloseClueBoard() { isBoardOpen = false; - // 用DOTween移动回右侧屏幕外 - // clueBoardRectTransform.DOAnchorPos(hiddenPosition, 0.5f).OnComplete(() => - // { - // clueBoardUI.SetActive(false); // 移动完成后隐藏UI - // }); - clueBoardUI.enabled=false; - iamgePointer.GetComponent().enabled=false; + clueBoardUI.enabled = false; + iamgePointer.GetComponent().enabled = false; OnClueBoardClose?.Invoke(); MouseCursorManager.Instance.ClueBoardOut(); - } + [YarnCommand("SkipClueBoard")] public void SkipClueBoard() { DialogController.Instance.StartDialogNode("SkipClueBoard"); - } - - // 添加新的 ClueSlot -// [YarnCommand("AddNewClueSlot")] -// public void AddNewClueSlot() -// { -// ClueSlotBase newSlot = Instantiate(initialClueSlotPrefab, clueSlotContainer); -// newSlot.ReleaseSlot(); -// clueSlots.Add(newSlot); -// } -// [YarnCommand("SetSlotCorrect")] -// public void SetSlotCorrect() -// { -// clueSlots[currentStep].SetSlotCorrect(); -// currentStep++; -// } - -// private void CheckCurrentSlot() -// { -// if (currentStep >= clueSlots.Count) return; - -// ClueSlotBase currentSlot = clueSlots[currentStep]; -// Clue currentClue = currentSlot.GetComponentInChildren()?.GetClueData(); - -// if (currentClue == null) -// { -// TriggerDialogue("", "", "", currentStep); -// return; -// } - -// // Trigger Yarn to handle the current clue, name, and step -// TriggerDialogue(currentClue.Category, currentClue.MatchCode, currentClue.ClueName, currentStep); -// } -// private void TriggerDialogue(string clueCategory, string matchCode, string clueName, int step) -// { -// if (DialogController.Instance.CheckIfNodeExistInCurrentYarnProject("ClueBoard")) -// { -// // Set Yarn variables -// DialogController.Instance.SetVariable("$clueBoardStep", step); -// DialogController.Instance.SetVariable("$clueCategory", clueCategory); -// DialogController.Instance.SetVariable("$clueMatchCode", matchCode); -// DialogController.Instance.SetVariable("$clueName", clueName); - -// // Set the previous MatchCode for comparison in Yarn -// if (step > 0) -// { -// Clue previousClue = clueSlots[step - 1].GetComponentInChildren()?.GetClueData(); -// if (previousClue != null) -// { -// DialogController.Instance.SetVariable("$previousMatchCode", previousClue.MatchCode); -// } -// } - -// // Start the Yarn dialog node -// DialogController.Instance.StartDialogNode("ClueBoard"); -// } -// } - - // 根据步骤判定当前 Clue 是否符合条件 - // private bool IsValidClueForStep(int step, Clue clue) - // { - // switch (step) - // { - // case 0: - // return clue.Category == "UFView"; // 第一关要求Clue的Category为"UF" - // case 1: - // Clue previousClue = clueSlots[step - 1].GetComponentInChildren()?.GetClueData(); - // return clue.Category == "MemoryView" && clue.MatchCode == previousClue?.MatchCode; // 第二关要求Category为"Memory"且匹配MatchCode - // // 可以根据需要继续添加更多步骤和判定规则 - // case 2: - // Clue previousClue2 = clueSlots[step - 1].GetComponentInChildren()?.GetClueData(); - // return clue.Category == "EyeView" && clue.MatchCode == previousClue2?.MatchCode; // 第二关要求Category为"EyeView"且匹配MatchCode - // // 可以根据需要继续添加更多步骤和判定规则 - // default: - // return false; - // } - // } - - // // 检查是否包含下一步 - // private bool HasNextStep() - // { - // return currentStep < 3; - // } } diff --git a/Assets/Scripts/Dialog System/DialogController.cs b/Assets/Scripts/Dialog System/DialogController.cs index ca19d7316..9c917d4e8 100644 --- a/Assets/Scripts/Dialog System/DialogController.cs +++ b/Assets/Scripts/Dialog System/DialogController.cs @@ -332,6 +332,11 @@ namespace AibisDream { AudioManager.PlayAmb1Audio("amb_room"); } + // if(sceneName=="SubWay") + // { + // ClueBoardManager.Instance.CloseClueBoard(); + // // AudioManager.PlayAmb1Audio("subway"); + // } else { AudioManager.PlayAmb1Audio("amb_main"); diff --git a/Assets/Scripts/SubWay/ConditionalFieldAttribute.cs b/Assets/Scripts/SubWay/ConditionalFieldAttribute.cs new file mode 100644 index 000000000..185468523 --- /dev/null +++ b/Assets/Scripts/SubWay/ConditionalFieldAttribute.cs @@ -0,0 +1,11 @@ +using UnityEngine; + +public class ConditionalFieldAttribute : PropertyAttribute +{ + public string conditionField; // 条件字段名 + + public ConditionalFieldAttribute(string conditionField) + { + this.conditionField = conditionField; + } +} diff --git a/Assets/Scripts/SubWay/ConditionalFieldAttribute.cs.meta b/Assets/Scripts/SubWay/ConditionalFieldAttribute.cs.meta new file mode 100644 index 000000000..3c65feb39 --- /dev/null +++ b/Assets/Scripts/SubWay/ConditionalFieldAttribute.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5e47de83fb9b8ff4d808a534554b8a40 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SubWay/ConditionalFieldDrawer.cs b/Assets/Scripts/SubWay/ConditionalFieldDrawer.cs new file mode 100644 index 000000000..032741755 --- /dev/null +++ b/Assets/Scripts/SubWay/ConditionalFieldDrawer.cs @@ -0,0 +1,31 @@ +using UnityEditor; +using UnityEngine; + +[CustomPropertyDrawer(typeof(ConditionalFieldAttribute))] +public class ConditionalFieldDrawer : PropertyDrawer +{ + public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) +{ + ConditionalFieldAttribute conditional = (ConditionalFieldAttribute)attribute; + SerializedProperty conditionProperty = property.serializedObject.FindProperty(conditional.conditionField); + + if (conditionProperty != null && conditionProperty.boolValue) + { + EditorGUI.PropertyField(position, property, label, true); + } +} + + + public override float GetPropertyHeight(SerializedProperty property, GUIContent label) + { + ConditionalFieldAttribute conditional = (ConditionalFieldAttribute)attribute; + SerializedProperty conditionProperty = property.serializedObject.FindProperty(conditional.conditionField); + + if (conditionProperty != null && conditionProperty.boolValue) + { + return EditorGUI.GetPropertyHeight(property, label, true); + } + + return 0f; // 隐藏字段时的高度 + } +} diff --git a/Assets/Scripts/SubWay/ConditionalFieldDrawer.cs.meta b/Assets/Scripts/SubWay/ConditionalFieldDrawer.cs.meta new file mode 100644 index 000000000..0be411a65 --- /dev/null +++ b/Assets/Scripts/SubWay/ConditionalFieldDrawer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c68a0dc5fa65b484b9440cefc2e07a37 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SubWay/ParallaxManager.cs b/Assets/Scripts/SubWay/ParallaxManager.cs index cc12ba445..b412e4453 100644 --- a/Assets/Scripts/SubWay/ParallaxManager.cs +++ b/Assets/Scripts/SubWay/ParallaxManager.cs @@ -3,25 +3,133 @@ using System.Collections.Generic; using UnityEngine; using DG.Tweening; + + [System.Serializable] public class ParallaxLayerConfig { public GameObject layer; // 背景层的游戏对象 - public float scrollSpeed; // 每层的滚动速度 + [SerializeField, Range(0.01f, 1f)]public float scrollSpeed; // 每层的滚动速度 public float scrollOffset; // 每层的滚动偏移量 } - public class ParallaxManager : MonoBehaviour { + public float speedMultiplier = 1; // 加速系数 public ParallaxLayerConfig[] layerConfigs; // 背景层配置数组 public ParallaxObjectCategoryConfig[] categoryConfigs; // 多种物体配置类别 - public float speedMultiplier = 1; // 加速系数 + + public GameObject tunnelSprite; // 隧道的 Sprite 对象 + + public SpriteRenderer sisterSpriteRender; // 隧道的 Sprite 对象 + public Vector3 tunnelEnterPosition; // 隧道进入位置 + public Vector3 tunnelExitPosition; // 隧道退出位置 + + public Vector3 tunnelKeepPosition; // 隧道退出位置 + public float tunnelDuration = 2f; // 隧道移动的时间 + + private bool isInTunnel = false; // 是否在隧道状态 private Dictionary> objectPools = new Dictionary>(); // 物体池 + private float previousSpeedMultiplier; // 用于记录上一次的值 + + public void EnterTunnel() + { + if (tunnelSprite != null && !isInTunnel) + { + tunnelSprite.transform.position=tunnelEnterPosition; + isInTunnel = true; + // 使用 DOTween 播放隧道进入动画 + sisterSpriteRender.DOFade(1,tunnelDuration); + tunnelSprite.transform.DOMove(tunnelKeepPosition, tunnelDuration) + .SetEase(Ease.Linear) + .OnStart(() => Debug.Log("开始进入隧道")) + .OnKill(() => { + Debug.Log("已完成进入隧道"); + ToggleCategoryVisibility("隧洞灯",true); + + }); + } + } + + public void ExitTunnel() + { + if (tunnelSprite != null && isInTunnel) + { + isInTunnel = false; + ToggleCategoryVisibility("隧洞灯",false); + sisterSpriteRender.DOFade(0,tunnelDuration); + // 使用 DOTween 播放隧道退出动画 + tunnelSprite.transform.DOMove(tunnelExitPosition, tunnelDuration) + .SetEase(Ease.Linear) + .OnStart(() => Debug.Log("开始退出隧道")) + .OnKill(() => { + Debug.Log("已完成退出隧道"); + ToggleCategoryVisibility("隧洞灯",false); + tunnelSprite.transform.position=tunnelEnterPosition; + }); + } + } + + void Update() + { + // 检测 speedMultiplier 是否被修改 + if (!Mathf.Approximately(speedMultiplier, previousSpeedMultiplier)) + { + DOTween.timeScale = speedMultiplier; // 更新 DOTween 的全局时间缩放 + previousSpeedMultiplier = speedMultiplier; // 记录当前值 + Debug.Log($"运行时修改 DOTween.timeScale 为 {speedMultiplier}"); + } + if(Input.GetKeyDown(KeyCode.E)) + { + if(isInTunnel) + { + ExitTunnel(); + } + else + { + EnterTunnel(); + } + + } + } + private void OnValidate() + { + // 当新速度值变化时,实时更新背景层和物体的速度 + foreach (var config in layerConfigs) + { + StartLayerScroll(config); // 重新启动背景层滚动 + } + + foreach (var category in categoryConfigs) + { + // 使用 TryGetValue 来安全地访问 objectPools 字典 + if (objectPools.TryGetValue(category.categoryName, out var pool)) + { + ToggleCategoryVisibility(category.categoryName, category.isEnabled); + // foreach (var obj in pool) + // { + // if (obj.activeInHierarchy) + // { + // StartObjectMoveAnimation(obj, category); // 重新启动物体移动动画 + // } + // } + } + + } + } + void Start() { + // 初始化记录的值 + Color color = sisterSpriteRender.color; + color.a = 0; + sisterSpriteRender.color = color; + previousSpeedMultiplier = speedMultiplier; + DOTween.timeScale = speedMultiplier; // 确保启动时同步 + Debug.Log($"初始化 DOTween.timeScale 为 {speedMultiplier}"); + // 初始化背景层滚动 foreach (var config in layerConfigs) { @@ -40,8 +148,7 @@ public class ParallaxManager : MonoBehaviour { // 按照距离生成 StartCoroutine(ManageObjectGenerationByDistance(category)); - } - // category.SpawnObjects(this); // 启动物体生成 + } } } @@ -53,8 +160,8 @@ public class ParallaxManager : MonoBehaviour { GameObject prefab = categoryConfig.objects[i]; GameObject obj = Instantiate(prefab, prefab.transform.position, Quaternion.identity, transform); - obj.SetActive(false); pool.Add(obj); + obj.SetActive(false); // 初始时禁用物体 } objectPools[categoryConfig.categoryName] = pool; @@ -65,9 +172,14 @@ public class ParallaxManager : MonoBehaviour private void StartLayerScroll(ParallaxLayerConfig config) { Vector3 startPosition = config.layer.transform.position; - float endPositionX = startPosition.x - config.scrollOffset; + float endPositionX = - config.scrollOffset; + + // 计算需要的时间,基于速度和距离 + float distance = Mathf.Abs(endPositionX - startPosition.x); + float duration = distance / config.scrollSpeed; // 使用速度来计算时间 - config.layer.transform.DOLocalMoveX(endPositionX, config.scrollSpeed * speedMultiplier) + // 背景层滚动时不受 speedMultiplier 影响 + config.layer.transform.DOLocalMoveX(endPositionX, duration) .SetEase(Ease.Linear) .OnKill(() => ResetLayerPosition(config)); } @@ -76,42 +188,12 @@ public class ParallaxManager : MonoBehaviour private void ResetLayerPosition(ParallaxLayerConfig config) { Vector3 currentPosition = config.layer.transform.position; - config.layer.transform.position = new Vector3(currentPosition.x + config.scrollOffset * 2, currentPosition.y, currentPosition.z); + config.layer.transform.position = new Vector3(config.scrollOffset * 2, currentPosition.y, currentPosition.z); StartLayerScroll(config); } - // 管理物体生成(基于距离) - public IEnumerator ManageObjectGenerationByDistance(ParallaxObjectCategoryConfig categoryConfig) - { - var pool = objectPools[categoryConfig.categoryName]; - GameObject firstObject = pool[0]; - if (!firstObject.activeInHierarchy) - { - firstObject.transform.position = categoryConfig.objects[0].transform.position; - firstObject.SetActive(true); - StartObjectMoveAnimation(firstObject, categoryConfig); - Debug.Log($"生成了第一个物体: {firstObject.name}, 位置: {firstObject.transform.position}"); - } - GameObject lastObject = firstObject; - //GameObject lastObject = null; - - while (true) - { - // 检查是否需要生成新物体 - if (lastObject == null || lastObject.transform.position.x < categoryConfig.generationThreshold) - { - GameObject obj = GetInactiveObjectFromPool(categoryConfig.categoryName); - if (obj != null) - { - SpawnObject(obj, categoryConfig); - lastObject = obj; - } - } - yield return null; - } - } - // 管理物体生成:按时间间隔生成 +// 管理物体生成:按时间间隔生成 public IEnumerator ManageObjectGeneration(ParallaxObjectCategoryConfig categoryConfig) { if (!objectPools.ContainsKey(categoryConfig.categoryName)) @@ -121,39 +203,85 @@ public IEnumerator ManageObjectGeneration(ParallaxObjectCategoryConfig categoryC } var pool = objectPools[categoryConfig.categoryName]; + int batchSize = categoryConfig.batchSize; // 每次生成的物体数量 + float batchInterval = categoryConfig.batchInterval; // 每个物体之间的生成间隔 + float delayAfterBatch = categoryConfig.delayAfterBatch; // 每组生成后的等待时间 - // // 初始化生成第一个物体 - // GameObject firstObject = pool.Find(o => !o.activeInHierarchy); - // if (firstObject != null) - // { - // firstObject.SetActive(true); - // StartObjectMoveAnimation(firstObject, categoryConfig); - // //SpawnObject(firstObject, categoryConfig); - // Debug.Log($"初始生成物体: {firstObject.name}, 位置: {firstObject.transform.position}"); - // } - // else - // { - // Debug.LogWarning($"对象池 {categoryConfig.categoryName} 没有可用的初始物体!"); - // } + // 启动首个物体 + GameObject firstObject = pool[0]; + if (!firstObject.activeInHierarchy) + { + + firstObject.transform.position = firstObject.transform.position; // 保持编辑器中的初始位置 + firstObject.SetActive(true); // 启用物体 + StartObjectMoveAnimation(firstObject, categoryConfig); + Debug.Log($"初始化并激活首个物体: {firstObject.name}, 位置: {firstObject.transform.position}"); + ToggleCategoryVisibility(categoryConfig.categoryName,categoryConfig.isEnabled); + + // 根据 categoryConfig.isEnabled 控制 firstObject 的显示状态 + // if (categoryConfig.isEnabled) + // { + // firstObject.GetComponent().enabled=true; + // } + // else + // { + // firstObject.GetComponent().enabled=false; + // } + } - // 持续生成物体 while (true) { + // 连续生成多个物体 + for (int i = 0; i < batchSize; i++) + { + GameObject obj = GetInactiveObjectFromPool(categoryConfig.categoryName); + if (obj != null) + { + SpawnObject(obj, categoryConfig); + Debug.Log($"生成物体: {obj.name}, 当前池大小: {pool.Count}"); + } + else + { + Debug.LogWarning($"对象池 {categoryConfig.categoryName} 中没有可用物体!可能需要增加池中物体数量。"); + } - yield return new WaitForSeconds(categoryConfig.spawnInterval); - // 从池中查找未激活的对象 - // GameObject obj = pool.Find(o => !o.activeInHierarchy); - GameObject obj = GetInactiveObjectFromPool(categoryConfig.categoryName); - if (obj != null) - { - SpawnObject(obj, categoryConfig); - Debug.Log($"生成物体: {obj.name}, 当前池大小: {pool.Count}"); + // 每个物体之间的间隔 + yield return new WaitForSeconds(batchInterval / speedMultiplier); // 使用 speedMultiplier 来控制生成速率 } - else + + // 等待一段时间后再开始下一组生成 + yield return new WaitForSeconds(delayAfterBatch / speedMultiplier); // 使用 speedMultiplier 来控制生成间隔 + } +} + +// 管理物体生成(基于距离) +public IEnumerator ManageObjectGenerationByDistance(ParallaxObjectCategoryConfig categoryConfig) +{ + var pool = objectPools[categoryConfig.categoryName]; + GameObject firstObject = pool[0]; + if (!firstObject.activeInHierarchy) + { + firstObject.transform.position = categoryConfig.objects[0].transform.position; + firstObject.SetActive(true); // 启用物体 + StartObjectMoveAnimation(firstObject, categoryConfig); + ToggleCategoryVisibility(categoryConfig.categoryName,categoryConfig.isEnabled); + Debug.Log($"生成了第一个物体: {firstObject.name}, 位置: {firstObject.transform.position}"); + + } + GameObject lastObject = firstObject; + while (true) + { + // 检查是否需要生成新物体 + if (lastObject == null || lastObject.transform.position.x < -categoryConfig.generationThreshold) { - Debug.LogWarning($"对象池 {categoryConfig.categoryName} 中没有可用物体!可能需要增加池中物体数量。"); + GameObject obj = GetInactiveObjectFromPool(categoryConfig.categoryName); + if (obj != null) + { + SpawnObject(obj, categoryConfig); + lastObject = obj; + } } - + yield return null; } } @@ -174,28 +302,90 @@ public IEnumerator ManageObjectGeneration(ParallaxObjectCategoryConfig categoryC return null; // 如果没有未激活的对象 } - // 生成物体逻辑 private void SpawnObject(GameObject obj, ParallaxObjectCategoryConfig categoryConfig) { - float xStart = categoryConfig.xSpawnRange; - //float yStart = obj.objects; // 可配置的随机高度范围 - obj.transform.position = new Vector3(xStart, obj.transform.position.y, obj.transform.position.z); - obj.SetActive(true); - StartObjectMoveAnimation(obj, categoryConfig); + float xStart = categoryConfig.xSpawnRange; + obj.transform.localPosition = new Vector3(xStart, obj.transform.localPosition.y, obj.transform.localPosition.z); + obj.SetActive(true); + ToggleCategoryVisibility(categoryConfig.categoryName,categoryConfig.isEnabled); + StartObjectMoveAnimation(obj, categoryConfig); + + Debug.Log($"生成物体 {obj.name} 并开始移动, 初始位置: {obj.transform.position}"); + } // 启动物体移动动画 - private void StartObjectMoveAnimation(GameObject obj, ParallaxObjectCategoryConfig config) + private void StartObjectMoveAnimation(GameObject obj, ParallaxObjectCategoryConfig categoryConfig) { - float endX = -config.xSpawnRange; - obj.transform.DOMoveX(endX, config.speed * speedMultiplier) - .SetEase(Ease.Linear) - .OnKill(() => + // 计算目标位置 + Vector3 targetPosition = new Vector3(-categoryConfig.xSpawnRange, obj.transform.position.y, obj.transform.position.z); + + // 计算当前位置与目标位置的水平距离 + float distance = Mathf.Abs(obj.transform.position.x - targetPosition.x); + + // 计算动画的持续时间:距离 / 速度 + float duration = distance / categoryConfig.speed; + + // 执行动画 + obj.transform.DOMoveX(targetPosition.x, duration).SetEase(Ease.Linear) + .OnKill(() => HandleObjectCompletion(obj, categoryConfig)); + } + + // 物体移动完成后处理 + private void HandleObjectCompletion(GameObject obj, ParallaxObjectCategoryConfig categoryConfig) + { + obj.SetActive(false); // 隐藏物体 + Debug.Log($"物体 {obj.name} 移动完成,回收到池中"); + } + + // 控制分类的显示与隐藏 + public void ToggleCategoryVisibility(string categoryName, bool isEnabled) +{ + var category = System.Array.Find(categoryConfigs, config => config.categoryName == categoryName); + if (category != null) + { + category.isEnabled = isEnabled; + + // 遍历该分类的所有物体,并根据 isEnabled 控制它们的显示状态 + foreach (var obj in objectPools[categoryName]) + { + // 检查父物体是否有 SpriteRenderer + var renderer = obj.GetComponent(); + + // 如果父物体没有 SpriteRenderer,检查所有子物体 + if (renderer == null) { - obj.SetActive(false); - Debug.Log($"物体 {obj.name} 动画结束,回收到池中"); - }); + var childRenderers = obj.GetComponentsInChildren(); + if (childRenderers.Length > 0) + { + // 如果找到子物体的 SpriteRenderer,修改它们的显示状态 + foreach (var childRenderer in childRenderers) + { + childRenderer.enabled = isEnabled; + } + } + else + { + // 如果父物体和子物体都没有 SpriteRenderer,输出警告 + Debug.LogWarning($"物体 {obj.name} 及其子物体均未找到 SpriteRenderer"); + } + } + else + { + // 如果父物体有 SpriteRenderer,直接修改父物体的显示状态 + renderer.enabled = isEnabled; + } + } + + Debug.Log($"分类 {categoryName} 已{(isEnabled ? "启用" : "禁用")}"); + } + else + { + Debug.LogWarning($"未找到名为 {categoryName} 的分类"); } } + + +} diff --git a/Assets/Scripts/SubWay/ParallaxObjectConfig1.cs b/Assets/Scripts/SubWay/ParallaxObjectConfig1.cs index b93dfba86..062e8a97a 100644 --- a/Assets/Scripts/SubWay/ParallaxObjectConfig1.cs +++ b/Assets/Scripts/SubWay/ParallaxObjectConfig1.cs @@ -5,31 +5,23 @@ using UnityEngine; [System.Serializable] public class ParallaxObjectCategoryConfig { - public string categoryName; // 物体类别名称(例如:云、房子等) - public GameObject[] objects; // 配置数组,包含该类别下的所有物体预制体 - - //public int initialPoolSize; - public float generationThreshold; // 按照这个阈值来决定是否生成新物体 - public bool useIntervalGeneration; // 是否使用时间间隔来生成 - public float spawnInterval; // 时间间隔生成物体的时间间隔(如果使用此方式) - public float speed; // 最大滚动速度 + public string categoryName; // 分类名称 + public bool isEnabled = true; // 当前层是否启用 + public GameObject[] objects; // 物体预制体 + public float speed; // 移动速度 public float xSpawnRange; // X轴生成范围 - // 自定义生成逻辑:按距离生成或按时间生成 - // public void SpawnObjects(ParallaxManager manager) - // { - // foreach (var prefab in objects) - // { - // if (useIntervalGeneration) - // { - // manager.StartCoroutine(manager.ManageObjectGeneration(this)); - // } - // else - // { - // // 按照距离生成 - // manager.StartCoroutine(manager.ManageObjectGenerationByDistance(this)); - // } - // } - // } + public bool useIntervalGeneration; // 是否按时间间隔生成 + + public float spawnInterval; // 按时间间隔生成的时间间隔 + public int batchSize = 3; // 每组生成的物体数量 + + public float batchInterval = 0.2f; // 每个物体之间的生成间隔 + + public float delayAfterBatch = 2f; // 每组生成后的等待时间 + public float generationThreshold; // 基于距离生成的触发阈值 } + + +