diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index da8f52d79..ff20280cf 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -42,6 +42,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 1df1eddcbfb714743a3d146cbea2b6a2 + m_Address: SubWay + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} m_SchemaSet: diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml deleted file mode 100644 index 325df3f09..000000000 --- a/Assets/AddressableAssetsData/link.xml +++ /dev/null @@ -1,338 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/Resources/Art/SubWay/图层 7.png b/Assets/Resources/Art/SubWay/图层 7.png new file mode 100644 index 000000000..8b559b9dd --- /dev/null +++ b/Assets/Resources/Art/SubWay/图层 7.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c1f3597394a5bd9b984d0d0c13d37b5cf8f0ce87e3485e30694fe50624aff48 +size 987304 diff --git a/Assets/Resources/Art/SubWay/图层 7.png.meta b/Assets/Resources/Art/SubWay/图层 7.png.meta new file mode 100644 index 000000000..cd6e6dbb4 --- /dev/null +++ b/Assets/Resources/Art/SubWay/图层 7.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 3c6590fe7fc54e2449aeed1080d3fe9c +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 f4a8ad961..d0f181a55 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 9f638c9eb..73cef8dbb 100644 --- a/Assets/Resources/Art/SubWay/横板地铁夜晚导出.psb.meta +++ b/Assets/Resources/Art/SubWay/横板地铁夜晚导出.psb.meta @@ -105,7 +105,7 @@ ScriptedImporter: y: 4 width: 3969 height: 1200 - spriteID: e0de37e25a9b8a34eaadf63bf652e1b3 + spriteID: e7a0ab994677fec4995ab54944c00839 spriteBone: [] spriteOutline: [] vertices: [] @@ -122,11 +122,11 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 2013 - y: 3359 + x: 1607 + y: 3799 width: 3969 height: 137 - spriteID: 5b402bbf4b7a77d4191195fa45fc12ef + spriteID: 73e4376e2cb5b4441a786c06da574ccc spriteBone: [] spriteOutline: [] vertices: [] @@ -134,7 +134,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 2013, y: 3359} + uvTransform: {x: 1607, y: 3799} spritePosition: {x: 0, y: 0} - name: "\u4E3B\u4EBA\u516C" originalName: @@ -143,11 +143,11 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3357 - y: 3799 + x: 6748 + y: 3567 width: 606 height: 644 - spriteID: bb2b19742bbaeb644be341dc1aaedd34 + spriteID: 281984e77829bab4d9b1c35a5413f991 spriteBone: [] spriteOutline: [] vertices: [] @@ -155,7 +155,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3308, y: 3799} + uvTransform: {x: 6699, y: 3567} spritePosition: {x: 1617, y: 0} - name: "\u6276\u624Ba" originalName: @@ -164,11 +164,11 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3981 - y: 3567 - width: 3600 - height: 154 - spriteID: 3629f3fc26e0c5d42801f6d56131b38c + x: 6369 + y: 4352 + width: 174 + height: 195 + spriteID: fa17fe89d56648943b0bdaf28abf53e8 spriteBone: [] spriteOutline: [] vertices: [] @@ -176,8 +176,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3981, y: 3567} - spritePosition: {x: 336, y: 1046} + uvTransform: {x: 6369, y: 4352} + spritePosition: {x: 2086, y: 1005} - name: "\u6276\u624Bb" originalName: pivot: {x: 0.5, y: 0.5} @@ -185,11 +185,11 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 933 - y: 3799 - width: 2416 - height: 197 - spriteID: d52379fdaa1eec34297e412eb96b5a5d + x: 6551 + y: 4352 + width: 103 + height: 115 + spriteID: fa87b5249dd87b744920f577b08ba53e spriteBone: [] spriteOutline: [] vertices: [] @@ -197,8 +197,29 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 933, y: 3799} - spritePosition: {x: 1020, y: 779} + uvTransform: {x: 6551, y: 4352} + spritePosition: {x: 2173, y: 835} + - name: "\u6276\u624B\u680F\u6746" + 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: 2314 + width: 2416 + height: 26 + spriteID: 4a37a45c175f8c14ea24d82d6c34b208 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 3981, y: 2314} + spritePosition: {x: 1020, y: 950} - name: "\u8F66\u53A2" originalName: pivot: {x: 0.5, y: 0.5} @@ -210,7 +231,7 @@ ScriptedImporter: y: 4 width: 3969 height: 1200 - spriteID: 33a564e61d4ee7c40a23a378636eafae + spriteID: 11d8777c0eac20d409ca2290a1128dcd spriteBone: [] spriteOutline: [] vertices: [] @@ -231,7 +252,7 @@ ScriptedImporter: y: 2420 width: 2001 height: 1139 - spriteID: d586beb7d14f6e941805a06c595747fd + spriteID: 6abae02c2ba20e343980d566d261a6e8 spriteBone: [] spriteOutline: [] vertices: [] @@ -241,6 +262,27 @@ 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} @@ -252,7 +294,7 @@ ScriptedImporter: y: 4 width: 86 height: 1156 - spriteID: baeec9b2c86b3324db7ad010325c5725 + spriteID: 1d9f1bbebf99e504b905fc0534d23cbb spriteBone: [] spriteOutline: [] vertices: [] @@ -269,11 +311,11 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 7875 - y: 1212 + x: 6167 + y: 4352 width: 194 height: 401 - spriteID: cf98a08660be1c4418c65c553a2f59db + spriteID: 8b5002ea1773ab941b086c796c8f06a2 spriteBone: [] spriteOutline: [] vertices: [] @@ -281,7 +323,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 7875, y: 1212} + uvTransform: {x: 6167, y: 4352} spritePosition: {x: 1529, y: 277} - name: "\u9E1Fa" originalName: @@ -290,11 +332,11 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3357 - y: 4451 + x: 6369 + y: 4555 width: 242 height: 64 - spriteID: 1551289ee786326438c8d523b5abe1a8 + spriteID: 3ed307cd7dec36943a3ef30b0f428a34 spriteBone: [] spriteOutline: [] vertices: [] @@ -302,29 +344,8 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3357, y: 4451} + uvTransform: {x: 6369, y: 4555} spritePosition: {x: 2186, y: 555} - - name: "\u8FD1\u666F\u623F\u5B50a" - 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: 3886 - height: 1200 - spriteID: 9a90d9c5b8e1432439925e856d95d823 - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 3981, y: 1212} - spritePosition: {x: 83, y: 0} - name: "\u8FD1\u666F\u623F\u5B50b" originalName: pivot: {x: 0.5, y: 0.5} @@ -333,10 +354,10 @@ ScriptedImporter: rect: serializedVersion: 2 x: 4 - y: 4534 - width: 575 - height: 993 - spriteID: 4518c275b5bdf6f4e893793aa5344d78 + y: 3567 + width: 1595 + height: 1200 + spriteID: f1e9a3a2752989a4cbff26faf5ee9a69 spriteBone: [] spriteOutline: [] vertices: [] @@ -344,7 +365,28 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 4534} + uvTransform: {x: 4, y: 3567} + spritePosition: {x: 83, y: 0} + - name: "\u8FD1\u666F\u623F\u5B50b" + originalName: + pivot: {x: 0.5, y: 0.5} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 5584 + y: 3567 + width: 575 + height: 993 + spriteID: 137cede1b483c5d4c96fccf9e13610e4 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 5584, y: 3567} spritePosition: {x: 2884, y: 0} - name: "\u4E2D\u666F\u623F\u5B50a" originalName: @@ -353,11 +395,11 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 587 - y: 4534 + x: 6167 + y: 3567 width: 573 height: 777 - spriteID: 2be0f81180f387d49abce348a23f0a9d + spriteID: 2e4ae7152ddc5ac44854b7a0e41e51a8 spriteBone: [] spriteOutline: [] vertices: [] @@ -365,7 +407,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 587, y: 4534} + uvTransform: {x: 6167, y: 3567} spritePosition: {x: 2654, y: 0} - name: "\u4E2D\u666F\u623F\u5B50b" originalName: @@ -374,11 +416,11 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4 - y: 3799 + x: 6702 + y: 1212 width: 921 height: 727 - spriteID: fdab11808e0254142931e3dadc2c48a9 + spriteID: a88ff2d065b58bc4ba485ad9d09ed550 spriteBone: [] spriteOutline: [] vertices: [] @@ -386,7 +428,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 3799} + uvTransform: {x: 6702, y: 1212} spritePosition: {x: 1747, y: 0} - name: "\u4E2D\u666F\u623F\u5B50c" originalName: @@ -399,7 +441,7 @@ ScriptedImporter: y: 2420 width: 3969 height: 490 - spriteID: d0c600dc70989c54b8fd82ebacf8bca8 + spriteID: 9e9a927528e39094c8990316501eb517 spriteBone: [] spriteOutline: [] vertices: [] @@ -409,18 +451,18 @@ ScriptedImporter: tessellationDetail: 0 uvTransform: {x: 2013, y: 2420} spritePosition: {x: 0, y: 311} - - name: "\u6865b" + - name: "\u6865a\u6709\u706B\u8F66\u901A\u8FC7" 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: 3567 - width: 3969 - height: 224 - spriteID: c00233ff7e9b45045825691d1cd49c9d + x: 5990 + y: 2706 + width: 1598 + height: 127 + spriteID: 4e2a2df634a417c40b5b5b060e06b331 spriteBone: [] spriteOutline: [] vertices: [] @@ -428,7 +470,28 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4, y: 3567} + uvTransform: {x: 5990, y: 2706} + spritePosition: {x: 1488, y: 338} + - name: "\u6865b" + 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: 3969 + height: 224 + spriteID: 4b235ee80d274194cb52bb0a12cfd5a5 + spriteBone: [] + spriteOutline: [] + vertices: [] + spritePhysicsOutline: [] + indices: + edges: [] + tessellationDetail: 0 + uvTransform: {x: 1607, y: 3567} spritePosition: {x: 0, y: 297} - name: "\u4E91a" originalName: @@ -441,7 +504,7 @@ ScriptedImporter: y: 2918 width: 2790 height: 433 - spriteID: 631696f94bfb6274caa616186e9a4d06 + spriteID: 65be22f45d968b14487ca63cf48b8b43 spriteBone: [] spriteOutline: [] vertices: [] @@ -462,7 +525,7 @@ ScriptedImporter: y: 2420 width: 2047 height: 278 - spriteID: 8511675b7195bee428a941d224ec0bd1 + spriteID: b096869af5873954a91da95e0f676331 spriteBone: [] spriteOutline: [] vertices: [] @@ -479,11 +542,11 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 4811 - y: 2918 + x: 6702 + y: 1947 width: 1451 height: 330 - spriteID: 0a9d68e3f23fc3b43bbbb0ad5ed2320d + spriteID: 9b3499460401c664b8ef60977b8a845c spriteBone: [] spriteOutline: [] vertices: [] @@ -491,7 +554,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 4811, y: 2918} + uvTransform: {x: 6702, y: 1947} spritePosition: {x: 1575, y: 370} - name: "\u98DE\u8247" originalName: @@ -500,11 +563,11 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 8045 - y: 2420 + x: 6551 + y: 4475 width: 132 height: 57 - spriteID: 1542b77cfc7c3d547955dabbf51cbd48 + spriteID: 7e7f1b1b448c7ff45a420af427d5c9b3 spriteBone: [] spriteOutline: [] vertices: [] @@ -512,7 +575,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 8045, y: 2420} + uvTransform: {x: 6551, y: 4475} spritePosition: {x: 1712, y: 864} - name: "\u4E91c" originalName: @@ -521,11 +584,11 @@ ScriptedImporter: border: {x: 0, y: 0, z: 0, w: 0} rect: serializedVersion: 2 - x: 3971 - y: 3799 + x: 4811 + y: 2918 width: 2533 height: 114 - spriteID: b21460a30b544c8469bbbbc1b98db20f + spriteID: b5d49ebf2a9e7cc4e8450162f65ef554 spriteBone: [] spriteOutline: [] vertices: [] @@ -533,7 +596,7 @@ ScriptedImporter: indices: edges: [] tessellationDetail: 0 - uvTransform: {x: 3971, y: 3799} + uvTransform: {x: 4811, y: 2918} spritePosition: {x: 1225, y: 630} - name: "\u80CC\u666F" originalName: @@ -546,7 +609,7 @@ ScriptedImporter: y: 1212 width: 3969 height: 1200 - spriteID: 766fff1160d10ca43b84d3497e83d324 + spriteID: 1e501c908be482c4599a3f27ee38e5a5 spriteBone: [] spriteOutline: [] vertices: [] @@ -575,7 +638,7 @@ ScriptedImporter: - name: DefaultTexturePlatform overridden: 0 ignorePlatformSupport: 0 - maxTextureSize: 8192 + maxTextureSize: 16384 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -642,7 +705,7 @@ ScriptedImporter: spriteName: "\u53D6\u666F\u6846" isGroup: 0 parentIndex: -1 - spriteID: e0de37e25a9b8a34eaadf63bf652e1b3 + spriteID: e7a0ab994677fec4995ab54944c00839 layerID: 736 mosaicPosition: {x: 4, y: 4} flatten: 0 @@ -652,9 +715,9 @@ ScriptedImporter: spriteName: "\u524D\u6392\u5EA7\u4F4D" isGroup: 0 parentIndex: -1 - spriteID: 5b402bbf4b7a77d4191195fa45fc12ef + spriteID: 73e4376e2cb5b4441a786c06da574ccc layerID: 1168 - mosaicPosition: {x: 2013, y: 3359} + mosaicPosition: {x: 1607, y: 3799} flatten: 0 isImported: 1 isVisible: 1 @@ -662,9 +725,9 @@ ScriptedImporter: spriteName: "\u4E3B\u4EBA\u516C" isGroup: 0 parentIndex: -1 - spriteID: bb2b19742bbaeb644be341dc1aaedd34 + spriteID: 281984e77829bab4d9b1c35a5413f991 layerID: 245 - mosaicPosition: {x: 3357, y: 3799} + mosaicPosition: {x: 6748, y: 3567} flatten: 0 isImported: 1 isVisible: 1 @@ -672,9 +735,9 @@ ScriptedImporter: spriteName: "\u6276\u624Ba" isGroup: 0 parentIndex: -1 - spriteID: 3629f3fc26e0c5d42801f6d56131b38c - layerID: 2341 - mosaicPosition: {x: 3981, y: 3567} + spriteID: fa17fe89d56648943b0bdaf28abf53e8 + layerID: 2357 + mosaicPosition: {x: 6369, y: 4352} flatten: 0 isImported: 1 isVisible: 1 @@ -682,9 +745,19 @@ ScriptedImporter: spriteName: "\u6276\u624Bb" isGroup: 0 parentIndex: -1 - spriteID: d52379fdaa1eec34297e412eb96b5a5d + spriteID: fa87b5249dd87b744920f577b08ba53e + layerID: 2346 + mosaicPosition: {x: 6551, y: 4352} + flatten: 0 + isImported: 1 + isVisible: 1 + - name: "\u6276\u624B\u680F\u6746" + spriteName: "\u6276\u624B\u680F\u6746" + isGroup: 0 + parentIndex: -1 + spriteID: 4a37a45c175f8c14ea24d82d6c34b208 layerID: 2338 - mosaicPosition: {x: 933, y: 3799} + mosaicPosition: {x: 3981, y: 2314} flatten: 0 isImported: 1 isVisible: 1 @@ -692,37 +765,177 @@ ScriptedImporter: spriteName: "\u8F66\u53A2" isGroup: 0 parentIndex: -1 - spriteID: 33a564e61d4ee7c40a23a378636eafae + spriteID: 11d8777c0eac20d409ca2290a1128dcd layerID: 2308 mosaicPosition: {x: 3981, y: 4} flatten: 0 isImported: 1 isVisible: 1 - - name: "\u96EA" - spriteName: - isGroup: 0 - parentIndex: -1 - spriteID: b28d65188e87d8b459f32629644b49bf - layerID: 2297 - mosaicPosition: {x: 0, y: 0} - flatten: 0 - isImported: 0 - isVisible: 0 - name: "\u680F\u6746a" spriteName: "\u680F\u6746a" isGroup: 0 parentIndex: -1 - spriteID: d586beb7d14f6e941805a06c595747fd + spriteID: 6abae02c2ba20e343980d566d261a6e8 layerID: 2295 mosaicPosition: {x: 4, y: 2420} flatten: 0 isImported: 1 isVisible: 1 + - name: "\u56FE\u5C42 7" + spriteName: "\u56FE\u5C42 7" + 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 + 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 + parentIndex: -1 + spriteID: 2876912eb2e3ce9469b19a3b350306f1 + layerID: 2297 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 - name: "\u680F\u6746b" spriteName: "\u680F\u6746b" isGroup: 0 parentIndex: -1 - spriteID: baeec9b2c86b3324db7ad010325c5725 + spriteID: 1d9f1bbebf99e504b905fc0534d23cbb layerID: 2296 mosaicPosition: {x: 7958, y: 4} flatten: 0 @@ -732,9 +945,9 @@ ScriptedImporter: spriteName: "\u5E7F\u544A\u724Ca" isGroup: 0 parentIndex: -1 - spriteID: cf98a08660be1c4418c65c553a2f59db + spriteID: 8b5002ea1773ab941b086c796c8f06a2 layerID: 2294 - mosaicPosition: {x: 7875, y: 1212} + mosaicPosition: {x: 6167, y: 4352} flatten: 0 isImported: 1 isVisible: 1 @@ -742,19 +955,29 @@ ScriptedImporter: spriteName: "\u9E1Fa" isGroup: 0 parentIndex: -1 - spriteID: 1551289ee786326438c8d523b5abe1a8 + spriteID: 3ed307cd7dec36943a3ef30b0f428a34 layerID: 2293 - mosaicPosition: {x: 3357, y: 4451} + mosaicPosition: {x: 6369, y: 4555} flatten: 0 isImported: 1 isVisible: 1 - name: "\u8FD1\u666F\u623F\u5B50a" - spriteName: "\u8FD1\u666F\u623F\u5B50a" + spriteName: isGroup: 0 parentIndex: -1 - spriteID: 9a90d9c5b8e1432439925e856d95d823 - layerID: 2285 - mosaicPosition: {x: 3981, y: 1212} + spriteID: 2bcd262cb1bad3244bddceb64bb66eb1 + layerID: 2359 + mosaicPosition: {x: 0, y: 0} + flatten: 0 + isImported: 0 + isVisible: 0 + - name: "\u8FD1\u666F\u623F\u5B50b" + spriteName: "\u8FD1\u666F\u623F\u5B50b" + isGroup: 0 + parentIndex: -1 + spriteID: f1e9a3a2752989a4cbff26faf5ee9a69 + layerID: 2360 + mosaicPosition: {x: 4, y: 3567} flatten: 0 isImported: 1 isVisible: 1 @@ -762,9 +985,9 @@ ScriptedImporter: spriteName: "\u8FD1\u666F\u623F\u5B50b" isGroup: 0 parentIndex: -1 - spriteID: 4518c275b5bdf6f4e893793aa5344d78 + spriteID: 137cede1b483c5d4c96fccf9e13610e4 layerID: 2281 - mosaicPosition: {x: 4, y: 4534} + mosaicPosition: {x: 5584, y: 3567} flatten: 0 isImported: 1 isVisible: 1 @@ -772,9 +995,9 @@ ScriptedImporter: spriteName: "\u4E2D\u666F\u623F\u5B50a" isGroup: 0 parentIndex: -1 - spriteID: 2be0f81180f387d49abce348a23f0a9d + spriteID: 2e4ae7152ddc5ac44854b7a0e41e51a8 layerID: 2275 - mosaicPosition: {x: 587, y: 4534} + mosaicPosition: {x: 6167, y: 3567} flatten: 0 isImported: 1 isVisible: 1 @@ -782,9 +1005,9 @@ ScriptedImporter: spriteName: "\u4E2D\u666F\u623F\u5B50b" isGroup: 0 parentIndex: -1 - spriteID: fdab11808e0254142931e3dadc2c48a9 + spriteID: a88ff2d065b58bc4ba485ad9d09ed550 layerID: 2261 - mosaicPosition: {x: 4, y: 3799} + mosaicPosition: {x: 6702, y: 1212} flatten: 0 isImported: 1 isVisible: 1 @@ -792,29 +1015,29 @@ ScriptedImporter: spriteName: "\u4E2D\u666F\u623F\u5B50c" isGroup: 0 parentIndex: -1 - spriteID: d0c600dc70989c54b8fd82ebacf8bca8 + spriteID: 9e9a927528e39094c8990316501eb517 layerID: 2258 mosaicPosition: {x: 2013, y: 2420} flatten: 0 isImported: 1 isVisible: 1 - name: "\u6865a\u6709\u706B\u8F66\u901A\u8FC7" - spriteName: + spriteName: "\u6865a\u6709\u706B\u8F66\u901A\u8FC7" isGroup: 0 parentIndex: -1 - spriteID: df2e3f673cac254438fcfd5cc1e207c9 + spriteID: 4e2a2df634a417c40b5b5b060e06b331 layerID: 2257 - mosaicPosition: {x: 0, y: 0} + mosaicPosition: {x: 5990, y: 2706} flatten: 0 - isImported: 0 - isVisible: 0 + isImported: 1 + isVisible: 1 - name: "\u6865b" spriteName: "\u6865b" isGroup: 0 parentIndex: -1 - spriteID: c00233ff7e9b45045825691d1cd49c9d + spriteID: 4b235ee80d274194cb52bb0a12cfd5a5 layerID: 2256 - mosaicPosition: {x: 4, y: 3567} + mosaicPosition: {x: 1607, y: 3567} flatten: 0 isImported: 1 isVisible: 1 @@ -822,7 +1045,7 @@ ScriptedImporter: spriteName: "\u4E91a" isGroup: 0 parentIndex: -1 - spriteID: 631696f94bfb6274caa616186e9a4d06 + spriteID: 65be22f45d968b14487ca63cf48b8b43 layerID: 2255 mosaicPosition: {x: 2013, y: 2918} flatten: 0 @@ -832,7 +1055,7 @@ ScriptedImporter: spriteName: "\u4E91b" isGroup: 0 parentIndex: -1 - spriteID: 8511675b7195bee428a941d224ec0bd1 + spriteID: b096869af5873954a91da95e0f676331 layerID: 2254 mosaicPosition: {x: 5990, y: 2420} flatten: 0 @@ -842,9 +1065,9 @@ ScriptedImporter: spriteName: "\u6700\u8FDC\u57CE\u5E02" isGroup: 0 parentIndex: -1 - spriteID: 0a9d68e3f23fc3b43bbbb0ad5ed2320d + spriteID: 9b3499460401c664b8ef60977b8a845c layerID: 2252 - mosaicPosition: {x: 4811, y: 2918} + mosaicPosition: {x: 6702, y: 1947} flatten: 0 isImported: 1 isVisible: 1 @@ -852,9 +1075,9 @@ ScriptedImporter: spriteName: "\u98DE\u8247" isGroup: 0 parentIndex: -1 - spriteID: 1542b77cfc7c3d547955dabbf51cbd48 + spriteID: 7e7f1b1b448c7ff45a420af427d5c9b3 layerID: 2247 - mosaicPosition: {x: 8045, y: 2420} + mosaicPosition: {x: 6551, y: 4475} flatten: 0 isImported: 1 isVisible: 1 @@ -862,9 +1085,9 @@ ScriptedImporter: spriteName: "\u4E91c" isGroup: 0 parentIndex: -1 - spriteID: b21460a30b544c8469bbbbc1b98db20f + spriteID: b5d49ebf2a9e7cc4e8450162f65ef554 layerID: 2246 - mosaicPosition: {x: 3971, y: 3799} + mosaicPosition: {x: 4811, y: 2918} flatten: 0 isImported: 1 isVisible: 1 @@ -872,7 +1095,7 @@ ScriptedImporter: spriteName: "\u80CC\u666F" isGroup: 0 parentIndex: -1 - spriteID: 766fff1160d10ca43b84d3497e83d324 + spriteID: 1e501c908be482c4599a3f27ee38e5a5 layerID: 2244 mosaicPosition: {x: 4, y: 1212} flatten: 0 @@ -881,7 +1104,7 @@ ScriptedImporter: sharedRigPSDLayers: [] pSDLayerImportSetting: [] importFileNodeState: 1 - platformSettingsDirtyTick: 638649705730822835 + platformSettingsDirtyTick: 638683170726185647 spriteSizeExpandChanged: 0 generateGOHierarchy: 0 textureAssetName: diff --git a/Assets/AddressableAssetsData/link.xml.meta b/Assets/Resources/Yarn/SubWay.meta similarity index 57% rename from Assets/AddressableAssetsData/link.xml.meta rename to Assets/Resources/Yarn/SubWay.meta index c855d2e95..fe75cca45 100644 --- a/Assets/AddressableAssetsData/link.xml.meta +++ b/Assets/Resources/Yarn/SubWay.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: cd966470c04680c4a97c0568dc56e6eb -TextScriptImporter: +guid: 2c99bb256d7eae145a3c3e601cd2680b +folderAsset: yes +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Resources/Yarn/SubWay/SubWay.yarn b/Assets/Resources/Yarn/SubWay/SubWay.yarn new file mode 100644 index 000000000..6507e5f06 --- /dev/null +++ b/Assets/Resources/Yarn/SubWay/SubWay.yarn @@ -0,0 +1,9 @@ +title: Start +tags: +--- +<> +<> +<> +<> +me:风景真美啊 +=== diff --git a/Assets/Resources/Yarn/SubWay/SubWay.yarn.meta b/Assets/Resources/Yarn/SubWay/SubWay.yarn.meta new file mode 100644 index 000000000..41f545276 --- /dev/null +++ b/Assets/Resources/Yarn/SubWay/SubWay.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 91e000047f5dfe14da2deea230d92aec +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/SubWay/SubWay.yarnproject b/Assets/Resources/Yarn/SubWay/SubWay.yarnproject new file mode 100644 index 000000000..016b7ab29 --- /dev/null +++ b/Assets/Resources/Yarn/SubWay/SubWay.yarnproject @@ -0,0 +1,12 @@ +{ + "projectFileVersion": 2, + "sourceFiles": [ + "*.yarn" + ], + "excludeFiles": [ + "**/*~/*" + ], + "localisation": {}, + "baseLanguage": "zh-CHS", + "compilerOptions": {} +} \ No newline at end of file diff --git a/Assets/Resources/Yarn/SubWay/SubWay.yarnproject.meta b/Assets/Resources/Yarn/SubWay/SubWay.yarnproject.meta new file mode 100644 index 000000000..37dfda51c --- /dev/null +++ b/Assets/Resources/Yarn/SubWay/SubWay.yarnproject.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 4783494fd4bd4f94e9218e451b9cf3bb +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 053561912b1654d80a424bb0696a74ae, type: 3} + useAddressableAssets: 0 + UseUnityLocalisationSystem: 0 + unityLocalisationStringTableCollection: {instanceID: 0} diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index ab5241958..04f79562d 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -4955,7 +4955,7 @@ MonoBehaviour: m_Intensity: 1 m_LightVolumeIntensity: 1 m_LightVolumeIntensityEnabled: 0 - m_ApplyToSortingLayers: 00000000 + m_ApplyToSortingLayers: 00000000f3a9fe5c m_LightCookieSprite: {fileID: 0} m_DeprecatedPointLightCookieSprite: {fileID: 0} m_LightOrder: 0 @@ -5585,7 +5585,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 18a3ec3914131d44199ae33902edf159, type: 3} m_Name: m_EditorClassIdentifier: - runMode: 1 + runMode: 0 firstTalkSO: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} clinicScene: ClinicScene testYarnProject: PeipeiNew2 diff --git a/Assets/Scenes/SubWay.unity b/Assets/Scenes/SubWay.unity index 3a5e45f20..0e3fe667f 100644 --- a/Assets/Scenes/SubWay.unity +++ b/Assets/Scenes/SubWay.unity @@ -123,27 +123,17 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &58125953 stripped +--- !u!1 &8824067 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -1996906440276204451, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + m_PrefabInstance: {fileID: 1444344157} + m_PrefabAsset: {fileID: 0} +--- !u!1 &264393910 stripped GameObject: m_CorrespondingSourceObject: {fileID: -5718755401224842811, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - m_PrefabInstance: {fileID: 536374639} + m_PrefabInstance: {fileID: 1444344157} m_PrefabAsset: {fileID: 0} ---- !u!1 &142947443 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -9063945555078097574, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - m_PrefabInstance: {fileID: 536374639} - m_PrefabAsset: {fileID: 0} ---- !u!1 &157997105 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2074523089955896138, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - m_PrefabInstance: {fileID: 536374639} - m_PrefabAsset: {fileID: 0} ---- !u!4 &157997106 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8487395040691516746, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - m_PrefabInstance: {fileID: 536374639} - m_PrefabAsset: {fileID: 0} ---- !u!1 &227210795 +--- !u!1 &408274514 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -151,37 +141,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 227210796} - - component: {fileID: 227210797} + - component: {fileID: 408274515} + - component: {fileID: 408274516} m_Layer: 0 - m_Name: "\u4E2D\u666F\u623F\u5B50c (1)" + m_Name: "\u4E2D\u666F\u623F\u5B50c (2)" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &227210796 +--- !u!4 &408274515 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 227210795} + m_GameObject: {fileID: 408274514} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 39.69, y: 0, z: 0} + m_LocalPosition: {x: -39.69, y: 5.56, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 157997106} + m_Father: {fileID: 633879431} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &227210797 +--- !u!212 &408274516 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 227210795} + m_GameObject: {fileID: 408274514} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -213,10 +203,10 @@ 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: 9 - m_Sprite: {fileID: 2370016723441380704, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + m_Sprite: {fileID: 8947911918279386999, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -227,65 +217,12 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &237218952 stripped +--- !u!1 &481930317 stripped GameObject: - m_CorrespondingSourceObject: {fileID: -8653719598885068355, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - m_PrefabInstance: {fileID: 536374639} + m_CorrespondingSourceObject: {fileID: -4630011535550576009, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + m_PrefabInstance: {fileID: 1444344157} m_PrefabAsset: {fileID: 0} ---- !u!114 &237218953 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 237218952} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 394cd5dc2104b444d89d10e6440161fd, type: 3} - m_Name: - m_EditorClassIdentifier: - layerConfigs: - - layer: {fileID: 1954492069} - scrollSpeed: 0.05 - scrollOffset: 20.69 - - layer: {fileID: 242344940} - scrollSpeed: 0.1 - scrollOffset: 18 - - layer: {fileID: 58125953} - scrollSpeed: 0.1 - scrollOffset: 18 - - layer: {fileID: 943486026} - scrollSpeed: 0.12 - scrollOffset: 39.69 - - layer: {fileID: 157997105} - scrollSpeed: 0.12 - scrollOffset: 39.69 - - layer: {fileID: 142947443} - scrollSpeed: 0.4 - scrollOffset: 14 - - layer: {fileID: 1010024708} - scrollSpeed: 0.5 - scrollOffset: 10 - - layer: {fileID: 572317245} - scrollSpeed: 8 - scrollOffset: 14 - - layer: {fileID: 1735818476} - scrollSpeed: 10 - scrollOffset: 33 - - layer: {fileID: 419759788} - scrollSpeed: 12 - scrollOffset: 18 ---- !u!1 &242344940 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -8231584699883671269, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - m_PrefabInstance: {fileID: 536374639} - m_PrefabAsset: {fileID: 0} ---- !u!1 &419759788 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -2815991242948295342, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - m_PrefabInstance: {fileID: 536374639} - m_PrefabAsset: {fileID: 0} ---- !u!1 &430237772 +--- !u!1 &503297645 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -293,37 +230,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 430237773} - - component: {fileID: 430237774} + - component: {fileID: 503297646} + - component: {fileID: 503297647} m_Layer: 0 - m_Name: "\u6865b (1)" + m_Name: "\u4E91a (3)" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &430237773 +--- !u!4 &503297646 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 430237772} + m_GameObject: {fileID: 503297645} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 39.69, y: 0, z: 0} + m_LocalPosition: {x: 3.9050007, y: 9.385001, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 943486027} + m_Father: {fileID: 1955111545} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &430237774 +--- !u!212 &503297647 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 430237772} + m_GameObject: {fileID: 503297645} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -355,15 +292,15 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 7 - m_Sprite: {fileID: -7667869420355073921, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + m_SortingLayerID: 1560193523 + m_SortingLayer: -1 + m_SortingOrder: 6 + m_Sprite: {fileID: -7285583515880930503, 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: 2.24} + m_Size: {x: 27.9, y: 4.33} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -387,7 +324,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!81 &519420029 AudioListener: m_ObjectHideFlags: 0 @@ -506,180 +443,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &536374639 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -9063945555078097574, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8653719598885068355, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_Name - value: "\u6A2A\u677F\u5730\u94C1\u591C\u665A\u5BFC\u51FA" - objectReference: {fileID: 0} - - target: {fileID: -8231584699883671269, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8162503859121663669, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7698481951365108870, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_LocalPosition.x - value: -2.41 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_LocalPosition.y - value: -6 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -6821908442077761030, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -5718755401224842811, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4862327791144935419, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4630011535550576009, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4447896487569900934, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -2815991242948295342, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -2631490737693695074, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_LocalPosition.x - value: 0.89 - objectReference: {fileID: 0} - - target: {fileID: -2166748036225056284, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_LocalPosition.x - value: 8.22 - objectReference: {fileID: 0} - - target: {fileID: -625517454410272172, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 325204245247115116, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 547352288642336102, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2074523089955896138, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4579775814565668306, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4608365778358819183, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_LocalPosition.x - value: -6.36 - objectReference: {fileID: 0} - - target: {fileID: 6786725401493528197, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8487395040691516746, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8872724520353089036, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 8487395040691516746, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - insertIndex: -1 - addedObject: {fileID: 227210796} - - targetCorrespondingSourceObject: {fileID: 8487395040691516746, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - insertIndex: -1 - addedObject: {fileID: 997769768} - - targetCorrespondingSourceObject: {fileID: 480400884948740926, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - insertIndex: -1 - addedObject: {fileID: 430237773} - - targetCorrespondingSourceObject: {fileID: 480400884948740926, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - insertIndex: -1 - addedObject: {fileID: 828947904} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: -8653719598885068355, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - insertIndex: -1 - addedObject: {fileID: 237218953} - m_SourcePrefab: {fileID: 4843985084834002234, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} ---- !u!1 &572317245 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -4447896487569900934, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - m_PrefabInstance: {fileID: 536374639} - m_PrefabAsset: {fileID: 0} ---- !u!1 &619394800 +--- !u!1 &550416007 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -687,119 +451,244 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 619394802} - - component: {fileID: 619394801} + - component: {fileID: 550416008} + - component: {fileID: 550416009} m_Layer: 0 - m_Name: Global Light 2D + m_Name: "\u4E2D\u666F\u623F\u5B50c (1)" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &619394801 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 619394800} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ComponentVersion: 1 - m_LightType: 4 - m_BlendStyleIndex: 0 - m_FalloffIntensity: 0.5 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 1 - m_LightVolumeIntensity: 1 - m_LightVolumeIntensityEnabled: 0 - m_ApplyToSortingLayers: 00000000 - m_LightCookieSprite: {fileID: 0} - m_DeprecatedPointLightCookieSprite: {fileID: 0} - m_LightOrder: 0 - m_AlphaBlendOnOverlap: 0 - m_OverlapOperation: 0 - m_NormalMapDistance: 3 - m_NormalMapQuality: 2 - m_UseNormalMap: 0 - m_ShadowIntensityEnabled: 0 - m_ShadowIntensity: 0.75 - m_ShadowVolumeIntensityEnabled: 0 - m_ShadowVolumeIntensity: 0.75 - m_LocalBounds: - m_Center: {x: 0, y: -0.00000011920929, z: 0} - m_Extent: {x: 0.9985302, y: 0.99853027, z: 0} - m_PointLightInnerAngle: 360 - m_PointLightOuterAngle: 360 - m_PointLightInnerRadius: 0 - m_PointLightOuterRadius: 1 - m_ShapeLightParametricSides: 5 - m_ShapeLightParametricAngleOffset: 0 - m_ShapeLightParametricRadius: 1 - m_ShapeLightFalloffSize: 0.5 - m_ShapeLightFalloffOffset: {x: 0, y: 0} - m_ShapePath: - - {x: -0.5, y: -0.5, z: 0} - - {x: 0.5, y: -0.5, z: 0} - - {x: 0.5, y: 0.5, z: 0} - - {x: -0.5, y: 0.5, z: 0} ---- !u!4 &619394802 +--- !u!4 &550416008 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 619394800} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &828947903 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 828947904} - - component: {fileID: 828947905} - m_Layer: 0 - m_Name: "\u6865b (2)" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &828947904 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 828947903} + m_GameObject: {fileID: 550416007} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -39.69, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 5.56, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 943486027} + m_Father: {fileID: 633879431} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &828947905 +--- !u!212 &550416009 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 828947903} + m_GameObject: {fileID: 550416007} + 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: 9 + m_Sprite: {fileID: 8947911918279386999, 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: 4.9} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &625299933 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 625299934} + - component: {fileID: 625299935} + m_Layer: 0 + m_Name: "\u4E91a (2)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &625299934 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625299933} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 31.76, y: 9.385001, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1955111545} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &625299935 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625299933} + 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: 6 + m_Sprite: {fileID: -7285583515880930503, 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: 27.9, y: 4.33} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &627225183 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -8231584699883671269, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + m_PrefabInstance: {fileID: 1444344157} + m_PrefabAsset: {fileID: 0} +--- !u!1 &633879430 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 633879431} + m_Layer: 0 + m_Name: CityFar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &633879431 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633879430} + 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: 1691655662} + - {fileID: 408274515} + - {fileID: 550416008} + m_Father: {fileID: 1444344160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &734684620 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 734684621} + - component: {fileID: 734684622} + m_Layer: 0 + m_Name: "\u6865b (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &734684621 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 734684620} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 39.69, y: 4.0899997, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2057142334} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &734684622 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 734684620} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -834,7 +723,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 7 - m_Sprite: {fileID: -7667869420355073921, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + m_Sprite: {fileID: -5620511163678177105, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -845,17 +734,12 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &943486026 stripped +--- !u!1 &896790803 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 6786725401493528197, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - m_PrefabInstance: {fileID: 536374639} + m_CorrespondingSourceObject: {fileID: 325204245247115116, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + m_PrefabInstance: {fileID: 1444344157} m_PrefabAsset: {fileID: 0} ---- !u!4 &943486027 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 480400884948740926, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - m_PrefabInstance: {fileID: 536374639} - m_PrefabAsset: {fileID: 0} ---- !u!1 &997769767 +--- !u!1 &1228458712 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -863,37 +747,121 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 997769768} - - component: {fileID: 997769769} + - component: {fileID: 1228458713} + - component: {fileID: 1228458714} m_Layer: 0 - m_Name: "\u4E2D\u666F\u623F\u5B50c (2)" + m_Name: TempMask m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &997769768 + m_IsActive: 0 +--- !u!4 &1228458713 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 997769767} + m_GameObject: {fileID: 1228458712} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -39.69, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: -0.9920243, y: -0.12943697, z: 0} + m_LocalScale: {x: 25.82566, y: 11.351938, z: 11.351938} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 157997106} + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &997769769 +--- !u!212 &1228458714 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 997769767} + m_GameObject: {fileID: 1228458712} + 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: 30 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1235177170 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1235177171} + - component: {fileID: 1235177172} + m_Layer: 0 + m_Name: "\u6865b (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1235177171 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1235177170} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 4.0899997, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2057142334} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1235177172 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1235177170} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -927,8 +895,640 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 + m_SortingOrder: 7 + m_Sprite: {fileID: -5620511163678177105, 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: 2.24} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1353933377 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1353933379} + - component: {fileID: 1353933378} + m_Layer: 0 + m_Name: character + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &1353933378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1353933377} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d109d83a617c845469dcde9ac20246be, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1353933379 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1353933377} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.46, y: -6.07, z: 0} + m_LocalScale: {x: 0.29999998, y: 0.29999998, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {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 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -9140347323760948405, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -9063945555078097574, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8653719598885068355, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_Name + value: "\u6A2A\u677F\u5730\u94C1\u591C\u665A\u5BFC\u51FA" + objectReference: {fileID: 0} + - target: {fileID: -8231584699883671269, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8162503859121663669, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8118801080199693423, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayer + value: -1 + objectReference: {fileID: 0} + - target: {fileID: -8118801080199693423, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayerID + value: 1560193523 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalScale.x + value: 0.86162716 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalScale.y + value: 0.86162716 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalScale.z + value: 0.86162716 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalPosition.x + value: -2.25 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalPosition.y + value: -5.2992 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7248541552594970621, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalPosition.x + value: 2.62 + objectReference: {fileID: 0} + - target: {fileID: -6821908442077761030, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -5848607182944202463, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayer + value: -1 + objectReference: {fileID: 0} + - target: {fileID: -5848607182944202463, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayerID + value: 1560193523 + objectReference: {fileID: 0} + - target: {fileID: -5718755401224842811, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4630011535550576009, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4447896487569900934, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_IsActive + value: 0 + 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 + objectReference: {fileID: 0} + - target: {fileID: -2166748036225056284, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalPosition.x + value: 11.47 + objectReference: {fileID: 0} + - target: {fileID: -1996906440276204451, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1900129310140004759, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayer + value: -1 + objectReference: {fileID: 0} + - target: {fileID: -1900129310140004759, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayerID + value: 1560193523 + objectReference: {fileID: 0} + - target: {fileID: -625517454410272172, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 44416471842246233, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayer + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 44416471842246233, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayerID + value: 1560193523 + objectReference: {fileID: 0} + - target: {fileID: 325204245247115116, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 547352288642336102, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1235888514548706139, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayer + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1235888514548706139, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayerID + value: 1560193523 + objectReference: {fileID: 0} + - target: {fileID: 1315217856183850106, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayer + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1315217856183850106, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayerID + value: 1560193523 + objectReference: {fileID: 0} + - target: {fileID: 2074523089955896138, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2377420210290071747, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayer + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 2377420210290071747, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayerID + value: 1560193523 + objectReference: {fileID: 0} + - target: {fileID: 2643210315887907914, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_LocalPosition.x + value: -1.59 + objectReference: {fileID: 0} + - target: {fileID: 4579775814565668306, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5124131617179788017, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayer + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 5124131617179788017, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_SortingLayerID + value: 1560193523 + objectReference: {fileID: 0} + - target: {fileID: 5249595425162652436, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6786725401493528197, 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: 17 + addedObject: {fileID: 633879431} + - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + insertIndex: 20 + addedObject: {fileID: 2057142334} + - targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + insertIndex: 22 + addedObject: {fileID: 1955111545} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: -8653719598885068355, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + insertIndex: -1 + addedObject: {fileID: 1444344159} + m_SourcePrefab: {fileID: 4843985084834002234, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} +--- !u!1 &1444344158 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -8653719598885068355, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + m_PrefabInstance: {fileID: 1444344157} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1444344159 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1444344158} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 394cd5dc2104b444d89d10e6440161fd, type: 3} + m_Name: + m_EditorClassIdentifier: + layerConfigs: + - layer: {fileID: 633879430} + scrollSpeed: 100 + scrollOffset: 39.69 + - layer: {fileID: 2057142333} + scrollSpeed: 100 + 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 + objects: + - {fileID: 481930317} + - {fileID: 481930317} + generationThreshold: 16 + useIntervalGeneration: 0 + spawnInterval: 5 + speed: 130 + xSpawnRange: 24 + - categoryName: BuildingNear + objects: + - {fileID: 1694076822} + - {fileID: 8824067} + generationThreshold: 16 + useIntervalGeneration: 1 + spawnInterval: 12 + speed: 2 + xSpawnRange: 24 + - categoryName: BuildingMid + objects: + - {fileID: 1371830202} + - {fileID: 1616261555} + - {fileID: 1616261555} + - {fileID: 1371830202} + generationThreshold: 16 + useIntervalGeneration: 1 + spawnInterval: 4 + speed: 35 + xSpawnRange: 24 + - categoryName: Bird + objects: + - {fileID: 1371830202} + - {fileID: 1616261555} + generationThreshold: 16 + useIntervalGeneration: 1 + spawnInterval: 0.5 + speed: 10 + xSpawnRange: 24 + - categoryName: NearSmall + objects: + - {fileID: 896790803} + - {fileID: 896790803} + generationThreshold: 16 + useIntervalGeneration: 1 + spawnInterval: 7 + speed: 80 + xSpawnRange: 24 + speedMultiplier: 1 +--- !u!4 &1444344160 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + m_PrefabInstance: {fileID: 1444344157} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1470742897 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1470742898} + - component: {fileID: 1470742899} + m_Layer: 0 + m_Name: "\u6865b (2)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1470742898 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1470742897} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -39.69, y: 4.0899997, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2057142334} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1470742899 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1470742897} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 7 + m_Sprite: {fileID: -5620511163678177105, 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: 2.24} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + 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 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1632768998} + - component: {fileID: 1632768999} + m_Layer: 0 + m_Name: "\u4E91a (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1632768998 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1632768997} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -25.780003, y: 9.385001, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1955111545} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1632768999 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1632768997} + 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: 6 + m_Sprite: {fileID: -7285583515880930503, 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: 27.9, y: 4.33} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1691655661 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1691655662} + - component: {fileID: 1691655663} + m_Layer: 0 + m_Name: "\u4E2D\u666F\u623F\u5B50c (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1691655662 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1691655661} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 39.69, y: 5.56, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 633879431} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1691655663 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1691655661} + 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: 9 - m_Sprite: {fileID: 2370016723441380704, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + m_Sprite: {fileID: 8947911918279386999, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -939,25 +1539,254 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1010024708 stripped +--- !u!1 &1694076822 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 547352288642336102, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - m_PrefabInstance: {fileID: 536374639} + m_CorrespondingSourceObject: {fileID: -4447896487569900934, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} + m_PrefabInstance: {fileID: 1444344157} m_PrefabAsset: {fileID: 0} ---- !u!1 &1735818476 stripped +--- !u!1001 &1933601685 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1353933379} + m_Modifications: + - target: {fileID: 4317540227848418303, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_Color.a + value: 0.94509804 + objectReference: {fileID: 0} + - target: {fileID: 4317540227848418303, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4317540227848418303, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_SortingLayerID + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5565320778957245006, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_Color.a + value: 0.94509804 + objectReference: {fileID: 0} + - target: {fileID: 5565320778957245006, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5565320778957245006, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_SortingLayerID + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5653948678888943850, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_Name + value: Peipei + objectReference: {fileID: 0} + - target: {fileID: 5653948678888943850, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6275938354197419466, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_Color.a + value: 0.94509804 + objectReference: {fileID: 0} + - target: {fileID: 6275938354197419466, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6275938354197419466, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_SortingLayerID + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6286600052644157049, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_Color.a + value: 0.94509804 + objectReference: {fileID: 0} + - target: {fileID: 6286600052644157049, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6286600052644157049, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_SortingLayerID + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6827111284924590217, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_LocalPosition.x + value: -0.54 + objectReference: {fileID: 0} + - target: {fileID: 6827111284924590217, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6827111284924590217, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6827111284924590217, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6827111284924590217, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6827111284924590217, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6827111284924590217, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6827111284924590217, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6827111284924590217, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6827111284924590217, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7989620579053831138, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_Color.a + value: 0.94509804 + objectReference: {fileID: 0} + - target: {fileID: 7989620579053831138, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7989620579053831138, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_SortingLayerID + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8232568468667960423, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_Color.a + value: 0.94509804 + objectReference: {fileID: 0} + - target: {fileID: 8232568468667960423, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8232568468667960423, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + propertyPath: m_SortingLayerID + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} +--- !u!4 &1933601686 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6827111284924590217, guid: 2d37fa5e0719f8344bba937001b3a5e7, type: 3} + m_PrefabInstance: {fileID: 1933601685} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1955111544 GameObject: - m_CorrespondingSourceObject: {fileID: -4862327791144935419, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - m_PrefabInstance: {fileID: 536374639} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!1 &1954492069 stripped + serializedVersion: 6 + m_Component: + - component: {fileID: 1955111545} + m_Layer: 0 + m_Name: cloudMid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1955111545 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1955111544} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -21.47, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 503297646} + - {fileID: 1632768998} + - {fileID: 625299934} + m_Father: {fileID: 1444344160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2057142333 GameObject: - m_CorrespondingSourceObject: {fileID: -4630011535550576009, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3} - m_PrefabInstance: {fileID: 536374639} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2057142334} + m_Layer: 0 + m_Name: "\u6865" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2057142334 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057142333} + 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: 1235177171} + - {fileID: 734684621} + - {fileID: 1470742898} + m_Father: {fileID: 1444344160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2131382684 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2131382685} + m_Layer: 0 + m_Name: SubWayManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2131382685 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2131382684} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.25, y: -5.2992, z: 0} + m_LocalScale: {x: 0.86162716, y: 0.86162716, z: 0.86162716} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 519420032} - - {fileID: 619394802} - - {fileID: 536374639} + - {fileID: 2131382685} + - {fileID: 1228458713} + - {fileID: 1353933379} + - {fileID: 1444344157} diff --git a/Assets/Scripts/SubWay/DynamicParallaxManager.cs b/Assets/Scripts/SubWay/DynamicParallaxManager.cs new file mode 100644 index 000000000..61417ea39 --- /dev/null +++ b/Assets/Scripts/SubWay/DynamicParallaxManager.cs @@ -0,0 +1,86 @@ +// using System.Collections; +// using System.Collections.Generic; +// using UnityEngine; + +// public class DynamicParallaxManager : MonoBehaviour +// { +// public ParallaxObjectConfig[] objectConfigs; // 配置数组 +// private Dictionary> objectPools = new Dictionary>(); + +// void Start() +// { +// // 初始化对象池并激活第一个物体 +// foreach (var config in objectConfigs) +// { +// var pool = new List(); +// // 创建对象池 +// for (int i = 0; i < config.poolSize; i++) +// { +// GameObject obj = Instantiate(config.prefab, transform.position, Quaternion.identity); +// obj.SetActive(false); // 初始状态为禁用 +// pool.Add(obj); +// } + +// // 激活第一个物体并开始移动 +// GameObject firstObject = pool[0]; // 获取池中的第一个物体 +// firstObject.transform.position = config.prefab.transform.position; // 使用编辑器中设置的位置 +// firstObject.SetActive(true); // 激活第一个物体 +// StartCoroutine(MoveObject(firstObject, config, config.maxSpeed)); // 启动移动协程 + +// objectPools[config] = pool; + +// // 启动生成其他物体的协程 +// StartCoroutine(ManageObjectGeneration(config)); +// } +// } + +// private IEnumerator ManageObjectGeneration(ParallaxObjectConfig config) +// { +// // 获取池中的对象 +// var pool = objectPools[config]; +// GameObject lastObject = pool[0]; // 最后一个激活的物体 + +// // 初始位置检查，第一个物体直接开始 +// while (true) +// { +// // 检查最后一个激活的物体的 x 坐标 +// if (lastObject.transform.position.x < -config.xGenerationThreshold) +// { +// // 找到一个未激活的物体并生成 +// GameObject obj = pool.Find(o => !o.activeInHierarchy); +// if (obj != null) +// { +// obj.SetActive(true); // 激活对象 +// float xStart = config.xSpawnRange; +// float yStart = config.prefab.transform.position.y; +// obj.transform.position = new Vector3(xStart, yStart, obj.transform.position.z); + +// // 设置物体的移动速度 +// float speed = Random.Range(config.minSpeed, config.maxSpeed); +// StartCoroutine(MoveObject(obj, config, speed)); // 启动移动协程 + +// lastObject = obj; // 更新最后一个激活物体为新生成的物体 +// } +// } + +// yield return null; // 等待下一帧 +// } +// } + +// private IEnumerator MoveObject(GameObject obj, ParallaxObjectConfig config, float speed) +// { +// while (obj.activeInHierarchy) +// { +// // 物体沿X轴向左移动 +// obj.transform.Translate(Vector3.left * speed * Time.deltaTime); + +// // 如果对象超出屏幕范围则禁用 +// if (obj.transform.position.x < -config.xSpawnRange) +// { +// obj.SetActive(false); // 禁用对象 +// } + +// yield return null; +// } +// } +// } diff --git a/Assets/Scripts/SubWay/DynamicParallaxManager.cs.meta b/Assets/Scripts/SubWay/DynamicParallaxManager.cs.meta new file mode 100644 index 000000000..9ec9e7aca --- /dev/null +++ b/Assets/Scripts/SubWay/DynamicParallaxManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b17e776259951544d9a95e39f64dd95a +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 fe93b4125..cc12ba445 100644 --- a/Assets/Scripts/SubWay/ParallaxManager.cs +++ b/Assets/Scripts/SubWay/ParallaxManager.cs @@ -1,33 +1,201 @@ +using System.Collections; +using System.Collections.Generic; using UnityEngine; +using DG.Tweening; [System.Serializable] public class ParallaxLayerConfig { public GameObject layer; // 背景层的游戏对象 public float scrollSpeed; // 每层的滚动速度 - - public float scrollOffset; + public float scrollOffset; // 每层的滚动偏移量 } + public class ParallaxManager : MonoBehaviour { public ParallaxLayerConfig[] layerConfigs; // 背景层配置数组 - //public float scrollOffset = 39.69f; // 背景循环的偏移量 - + public ParallaxObjectCategoryConfig[] categoryConfigs; // 多种物体配置类别 + public float speedMultiplier = 1; // 加速系数 - void Update() + private Dictionary> objectPools = new Dictionary>(); // 物体池 + + void Start() { + // 初始化背景层滚动 foreach (var config in layerConfigs) { - // 根据配置的速度滚动背景 - float parallax = config.scrollSpeed * Time.deltaTime; - config.layer.transform.position += new Vector3(-parallax, 0, 0); + StartLayerScroll(config); + } - // 如果背景移出视野范围，则将其重新放到另一边 - if (config.layer.transform.position.x <= -config.scrollOffset) + // 初始化物体池并启动物体生成逻辑 + foreach (var category in categoryConfigs) + { + InitializeObjectPool(category); + if (category.useIntervalGeneration) { - config.layer.transform.position = new Vector3(config.layer.transform.position.x + 2 * config.scrollOffset, config.layer.transform.position.y, config.layer.transform.position.z); + StartCoroutine(ManageObjectGeneration(category)); } + else + { + // 按照距离生成 + StartCoroutine(ManageObjectGenerationByDistance(category)); + } + // category.SpawnObjects(this); // 启动物体生成 } } + + // 初始化物体池 + private void InitializeObjectPool(ParallaxObjectCategoryConfig categoryConfig) + { + List pool = new List(); + for (int i = 0; i < categoryConfig.objects.Length; i++) + { + GameObject prefab = categoryConfig.objects[i]; + GameObject obj = Instantiate(prefab, prefab.transform.position, Quaternion.identity, transform); + obj.SetActive(false); + pool.Add(obj); + } + objectPools[categoryConfig.categoryName] = pool; + + Debug.Log($"为分类 {categoryConfig.categoryName} 初始化池子，池中物体数：{pool.Count}"); + } + + // 开始背景层滚动 + private void StartLayerScroll(ParallaxLayerConfig config) + { + Vector3 startPosition = config.layer.transform.position; + float endPositionX = startPosition.x - config.scrollOffset; + + config.layer.transform.DOLocalMoveX(endPositionX, config.scrollSpeed * speedMultiplier) + .SetEase(Ease.Linear) + .OnKill(() => ResetLayerPosition(config)); + } + + // 重置背景层位置 + 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); + + 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)) + { + Debug.LogError($"没有为分类 {categoryConfig.categoryName} 初始化对象池！"); + yield break; + } + + var pool = objectPools[categoryConfig.categoryName]; + + // // 初始化生成第一个物体 + // 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} 没有可用的初始物体！"); + // } + + // 持续生成物体 + while (true) + { + + 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}"); + } + else + { + Debug.LogWarning($"对象池 {categoryConfig.categoryName} 中没有可用物体！可能需要增加池中物体数量。"); + } + + } +} + + // 获取池中未激活的物体 + private GameObject GetInactiveObjectFromPool(string categoryName) + { + if (objectPools.TryGetValue(categoryName, out var pool)) + { + // 筛选出所有未激活的对象 + var inactiveObjects = pool.FindAll(o => !o.activeInHierarchy); + + if (inactiveObjects.Count > 0) + { + // 从未激活的对象中随机选择一个 + return inactiveObjects[Random.Range(0, inactiveObjects.Count)]; + } + } + 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); + } + + // 启动物体移动动画 + private void StartObjectMoveAnimation(GameObject obj, ParallaxObjectCategoryConfig config) + { + float endX = -config.xSpawnRange; + obj.transform.DOMoveX(endX, config.speed * speedMultiplier) + .SetEase(Ease.Linear) + .OnKill(() => + { + obj.SetActive(false); + Debug.Log($"物体 {obj.name} 动画结束，回收到池中"); + }); + } } diff --git a/Assets/Scripts/SubWay/ParallaxObjectConfig1.cs b/Assets/Scripts/SubWay/ParallaxObjectConfig1.cs new file mode 100644 index 000000000..b93dfba86 --- /dev/null +++ b/Assets/Scripts/SubWay/ParallaxObjectConfig1.cs @@ -0,0 +1,35 @@ +using System.Collections; +using System.Collections.Generic; +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 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)); + // } + // } + // } +} + diff --git a/Assets/Scripts/SubWay/ParallaxObjectConfig1.cs.meta b/Assets/Scripts/SubWay/ParallaxObjectConfig1.cs.meta new file mode 100644 index 000000000..8c696c9ce --- /dev/null +++ b/Assets/Scripts/SubWay/ParallaxObjectConfig1.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e77f0924838c6344d9796d0cff023f2d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 3a045dc68..9edb70350 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -44,6 +44,9 @@ TagManager: - - m_SortingLayers: + - name: Subway + uniqueID: 1560193523 + locked: 0 - name: Default uniqueID: 0 locked: 0