From f66312b593104f4557b3f8863d4e52ad3b848980 Mon Sep 17 00:00:00 2001 From: liyang <390792612@qq.com> Date: Tue, 20 Jan 2026 14:25:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B2=B3=E5=8D=97=E5=95=86?= =?UTF-8?q?=E4=B8=98=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...enan_Shangqiu_Juyang_WuyueGuangchang.unity | 346 ++++++++++++------ ...Shangqiu_Juyang_WuyueGuangchang.unity.meta | 2 +- Assets/_Zombie/Scripts/GameLocal.cs | 3 + ProjectSettings/EditorBuildSettings.asset | 228 +----------- ProjectSettings/GraphicsSettings.asset | 9 +- ProjectSettings/InputManager.asset | 192 ++++++++++ ProjectSettings/ProjectSettings.asset | 128 +++---- 7 files changed, 474 insertions(+), 434 deletions(-) diff --git a/Assets/_Zombie/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity b/Assets/_Zombie/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity index 9eebc301..69af1dc8 100644 --- a/Assets/_Zombie/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity +++ b/Assets/_Zombie/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity @@ -2558,6 +2558,7 @@ Transform: - {fileID: 466215208} - {fileID: 297121735} - {fileID: 1936570581} + - {fileID: 1406440708} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &373623969 @@ -3516,7 +3517,7 @@ Transform: m_GameObject: {fileID: 450657584} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.34, y: 0, z: 6.47} + m_LocalPosition: {x: 2.64, y: 0, z: 5.46} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -6467,7 +6468,7 @@ MonoBehaviour: IncludeChildColliders: 0 RuntimeFollower: {fileID: 0} colliderMaxDistance: 100 - lastTimeMaxDistanceCalced: 639044416152097508 + lastTimeMaxDistanceCalced: 639045154691048452 --- !u!1 &679496949 GameObject: m_ObjectHideFlags: 0 @@ -6513,6 +6514,91 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac1c6beffb6ba9f48af54b14f4a90a18, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &696072027 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1406440708} + m_Modifications: + - target: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + propertyPath: m_Name + value: "\u70DF\u96FE" + objectReference: {fileID: 0} + - target: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.09 + objectReference: {fileID: 0} + - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + propertyPath: m_LocalPosition.z + value: 2.69 + objectReference: {fileID: 0} + - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.5030146 + objectReference: {fileID: 0} + - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.5030146 + objectReference: {fileID: 0} + - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.4969671 + objectReference: {fileID: 0} + - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.4969671 + objectReference: {fileID: 0} + - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.693 + objectReference: {fileID: 0} + - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} +--- !u!4 &696072028 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + m_PrefabInstance: {fileID: 696072027} + m_PrefabAsset: {fileID: 0} +--- !u!1 &696072029 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9, + type: 3} + m_PrefabInstance: {fileID: 696072027} + m_PrefabAsset: {fileID: 0} --- !u!1001 &710314432 PrefabInstance: m_ObjectHideFlags: 0 @@ -6534,7 +6620,7 @@ PrefabInstance: - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} propertyPath: m_LocalPosition.x - value: 4.05 + value: 4.32 objectReference: {fileID: 0} - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} @@ -6544,7 +6630,7 @@ PrefabInstance: - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} propertyPath: m_LocalPosition.z - value: -0.89 + value: 2.28 objectReference: {fileID: 0} - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} @@ -8175,7 +8261,7 @@ PrefabInstance: - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} propertyPath: m_LocalPosition.x - value: 1.35 + value: 0.11 objectReference: {fileID: 0} - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} @@ -8185,27 +8271,27 @@ PrefabInstance: - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} propertyPath: m_LocalPosition.z - value: 4.49 + value: 3.35 objectReference: {fileID: 0} - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} propertyPath: m_LocalRotation.w - value: 0.70709383 + value: 0.5030146 objectReference: {fileID: 0} - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} propertyPath: m_LocalRotation.x - value: -0.0042762305 + value: -0.5030146 objectReference: {fileID: 0} - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} propertyPath: m_LocalRotation.y - value: -0.0042762305 + value: 0.4969671 objectReference: {fileID: 0} - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} propertyPath: m_LocalRotation.z - value: -0.70709383 + value: -0.4969671 objectReference: {fileID: 0} - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} @@ -8215,7 +8301,7 @@ PrefabInstance: - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} @@ -8338,6 +8424,74 @@ MonoBehaviour: soundPlayedCustomEvent: willCleanUpDelegatesAfterStop: 1 frames: 178 +--- !u!1001 &912569406 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, + type: 3} + propertyPath: m_LocalPosition.z + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6480501167749381553, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, + type: 3} + propertyPath: m_Name + value: "\u6CB3\u5357\u5546\u4E18" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, type: 3} --- !u!1 &922782298 GameObject: m_ObjectHideFlags: 0 @@ -8672,7 +8826,7 @@ MonoBehaviour: m_EditorClassIdentifier: version: 1073741824 data: - dataString: UEsDBBQAAAgIAABAIez8ilylxAIAAAEGAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVNtu4jAQ/RXk522VlFu7b7tA6T60RaWrPix9cO0JsTB25EuBVvz7jh2HpFRCSjgzZ+bMLZ9EKFsBc9rMjeD3mgP52SPhnfzotcY72NO1VkvxAY3Pi+CuDE40+jxRJzTieaBZvQVnBPul1jI4Zwh6JQpttjO+hom2ziJcUGkBTUa7wFYIffbIPhEO6fkRnr0jvjFQDkzH63I0Ho9Hw/6Z9+BymA8GN8P+ONK8YpJuK+BBfsseJVZeB1dYV3IINTAtpbBJFHGHKhY9oZX1WBI6cEGxyCgnu8wHiJQg1qWL/7NRN8RjUVhwSaChh6kw2LE6Nvmt6zZuqd3U4t6p9CHb8KpWVse9/2YfDaK5MHp716TOs5DDlYJtnuiBUes6fe7C01Z+Hnu0o3JD3yS8lKAe9NxorzganfGB6i1cTTuhTrVNSmCb1q/W2oCNt6++jzZvR3uM5e+XDqpTIVmL/bVgl1LHCaQ0wZKQm+AJBqf3B8uJe2QTH9EgEfnPdN1duGS4FcY6NCU1CQ2+CxwQcFAMUtsvgoMK4t60NyEWmUWloRfeTbRREOEksAJFpTssMKI734AzW0fXmeWWhttL6pKtOakzSoRb/yw7My307jRrgxts41o3b/9ewwhsqXf3YMtH76RQnW4HwwM2eKKVqhe328yGtvSmoKxDc7B33sCUOhqzoRzcL96lYi8jQ3kpwyrHAqIiLCD8XkN/S4p5ZYTJg1bx/L48o/y1F/zrgZD8uj+6pqNhlvOMZfTmgvGCX2es6A+h6LO3IYkXJBS2m8pF3a80Jdwu1dai8FqaL2NvbmgVb5YbupuLj63uTF6oQi+ZAVCPdYRTsWAwCX5h+IwLLHMJzgkV95J8rojUbAN8dQq0io2d7Z2hqzbKilTiXbuArMgkfg9XJMCng8TVfRewC8m/BAOJowP+LCRsaRVM2ZEc/wNQSwMEFAAACAgAAEAh7M4y5JNsAAAAdwAAAAkAJABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQGrVipLLSrOzM9TslIw1TPUM9NRUEovSizIKAYKGII4pZkpIHa0kqGFsZlFopmpgWGKQbJBoqVuckpaioVBcpqxaWqacXKSqVIsUH1JZUGqX2JuKkRPQGJJRlpmXkpmXrqee1FmijvIaKXYWgBQSwECLQAUAAAICAAAQCHs/IpcpcQCAAABBgAACwAkAAAAAAAAAAAAAAAAAAAAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwECLQAUAAAICAAAQCHszjLkk2wAAAB3AAAACQAkAAAAAAAAAAAAAAARAwAAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsFBgAAAAACAAIAuAAAAMgDAAAAAA== + dataString: UEsDBBQAAAgIAABAIez35Dj0xQIAAAMGAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVMtu4jAU/RXk9bRKeA2d3QxQOou2aOioi6EL174hFsaO/CjQin+fa8chKZWQEu65j3PuIx9EKFsBc9osjOD3mgP50SPhnXzrteAdHOhGq5V4h8bnWXBXBicaff5QJzTa8xBm9Q6cEeyn2sjgnKHRK1Fos5vzDUy1dRbNBZUWEDLahWiFpo8eOaSAY3q+h2fvhG8MlAPTel1l11l/eDOYDIaji4AhIv3BuP89j5FeMUl3FfCgoE0wSVGT6KRQWcKDCqalFDbRIu5YRdlTWlmPotCBC4oyI6HsOh+ipQSxKV38n427KR6LwoJL/Aw9zoTBntW5yS9dN3JH7bbm9kalD9VG/Vp4nff+Cz4eRrgwenfXlM6zUMOVgm3/0COj1nU63TXPWvp5bNGeyi19lfBcgnrQC6O94gg640Oot9CfdVKdtU1LYNvWr+baGBtvX30dbt4O9xTlH1YOqrOQrLX9tWBXUscJpDIBSZab4AkGp/cb5cRNsikerYEixj/RTXflEnArjHUIJTbJGnyXOCDgoBiktl8FBxXIvWpvQi4yj0xDL7ybaqMgmhPBChSV7rjEjO5yAy6wDq8L5JaG60vsEtYc1UVINLf+WXYBLfX+PGuDG2zjWjdv/17CCGyp9/dgy0fvpFCdbgfgARs81UrVi9ttZhO28qagrBPm4OC8gRl1NFZDOrhfvBuKvYwRyksZVjkKiIxQQPi9hP6WFOvKaCYPWsXz+/SM9Dde8M8HQvLJYDyh41GW84xl9OaK8YJPMlYMRlAM2OuIxAsSCttN5bLuV5oSbpdqtSi8lubb2FsYWsWb5YbuF+J9pzuTF6rQK2YA1GOd4SwWDBbBLwyfc4EyV+CcUHEvyceaSM22wNfnROvY2PnBGbpus6xJJd60C5Y1mcYv4poE8/kgcXXfBOxD8U/JQOLogD8JCTtaBSg7kdN/UEsDBBQAAAgIAABAIezOMuSTbAAAAHcAAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNUz1DPTUVBKL0osyCgGChiCOKWZKSB2tJKhhbGZRaKZqYFhikGyQaKlbnJKWoqFQXKasWlqmnFykqlSLFB9SWVBql9ibipET0BiSUZaZl5KZl66nntRZoo7yGil2FoAUEsBAi0AFAAACAgAAEAh7PfkOPTFAgAAAwYAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEAh7M4y5JNsAAAAdwAAAAkAJAAAAAAAAAAAAAAAEgMAAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAAAgACALgAAADJAwAAAAA= file_cachedStartup: {fileID: 0} cacheStartup: 0 showNavGraphs: 1 @@ -9700,7 +9854,7 @@ Transform: m_GameObject: {fileID: 1055672619} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.43, y: 0, z: 3.88} + m_LocalPosition: {x: -0.77, y: 0, z: 5.14} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -10247,7 +10401,7 @@ PrefabInstance: - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} propertyPath: m_LocalPosition.x - value: -1.01 + value: -0.94 objectReference: {fileID: 0} - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} @@ -10257,7 +10411,7 @@ PrefabInstance: - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} propertyPath: m_LocalPosition.z - value: 2.25 + value: -1.61 objectReference: {fileID: 0} - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} @@ -10367,7 +10521,7 @@ Transform: m_GameObject: {fileID: 1134898387} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.62, y: 0, z: 1.26} + m_LocalPosition: {x: -1.01, y: 0, z: 0.69} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -12518,82 +12672,6 @@ MonoBehaviour: soundPlayedCustomEvent: willCleanUpDelegatesAfterStop: 1 frames: 178 ---- !u!1001 &1252552949 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.5 - objectReference: {fileID: 0} - - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, - type: 3} - propertyPath: m_LocalPosition.z - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5194050618163714016, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6480501167749381553, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, - type: 3} - propertyPath: m_Name - value: "\u6CB3\u5357\u5546\u4E18" - objectReference: {fileID: 0} -<<<<<<< HEAD - - target: {fileID: 6480501167749381553, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} -======= ->>>>>>> eb1566f0a79cad39f10ab740ee7ab9f8ec97e8f8 - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e463e2a5a50d0a244a1b3a5cc5f681a1, type: 3} --- !u!1 &1288110334 GameObject: m_ObjectHideFlags: 0 @@ -12654,6 +12732,7 @@ MonoBehaviour: - {fileID: 1936570581} - {fileID: 466215208} - {fileID: 297121735} + - {fileID: 1406440708} gunPropPos: - {fileID: 1134898388} - {fileID: 450657585} @@ -12663,6 +12742,7 @@ MonoBehaviour: - {fileID: 890782822} - {fileID: 710314434} - {fileID: 1084803297} + - {fileID: 696072029} --- !u!1 &1292553882 GameObject: m_ObjectHideFlags: 0 @@ -12865,32 +12945,32 @@ PrefabInstance: - target: {fileID: 340669047994179028, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.x - value: -14.83 + value: -15.66 objectReference: {fileID: 0} - target: {fileID: 340669047994179028, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.z - value: 23.02 + value: 22.71 objectReference: {fileID: 0} - target: {fileID: 527052192552557174, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.x - value: -14.1 + value: -14.14 objectReference: {fileID: 0} - target: {fileID: 527052192552557174, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.z - value: 21.5 + value: 21.76 objectReference: {fileID: 0} - target: {fileID: 550134570259398289, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.x - value: -16.95 + value: -15.05 objectReference: {fileID: 0} - target: {fileID: 550134570259398289, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.z - value: 19.59 + value: 19.49 objectReference: {fileID: 0} - target: {fileID: 603740574968958451, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} @@ -12950,12 +13030,12 @@ PrefabInstance: - target: {fileID: 1418826633505794655, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.x - value: -19.95 + value: -18.18 objectReference: {fileID: 0} - target: {fileID: 1418826633505794655, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.z - value: 24.63 + value: 20.74 objectReference: {fileID: 0} - target: {fileID: 1460124374668027194, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} @@ -13010,12 +13090,12 @@ PrefabInstance: - target: {fileID: 2397255075310497217, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.x - value: -21.04 + value: -20.86 objectReference: {fileID: 0} - target: {fileID: 2397255075310497217, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.z - value: 26.32 + value: 26.46 objectReference: {fileID: 0} - target: {fileID: 2428268733805549258, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} @@ -13095,12 +13175,12 @@ PrefabInstance: - target: {fileID: 3344426755912547733, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.x - value: -19.4 + value: -19.68 objectReference: {fileID: 0} - target: {fileID: 3344426755912547733, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.z - value: 22.12 + value: 21.72 objectReference: {fileID: 0} - target: {fileID: 3365267755638529792, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} @@ -13270,12 +13350,12 @@ PrefabInstance: - target: {fileID: 5838157120385253294, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.x - value: -17.73 + value: -17.26 objectReference: {fileID: 0} - target: {fileID: 5838157120385253294, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.z - value: 21.41 + value: 21.94 objectReference: {fileID: 0} - target: {fileID: 5892106269951912061, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} @@ -13395,12 +13475,12 @@ PrefabInstance: - target: {fileID: 6908305672861718618, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.x - value: -19.3 + value: -19.15 objectReference: {fileID: 0} - target: {fileID: 6908305672861718618, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.z - value: 20.15 + value: 19.69 objectReference: {fileID: 0} - target: {fileID: 7113555013171373022, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} @@ -13485,12 +13565,12 @@ PrefabInstance: - target: {fileID: 8098145906284391620, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.x - value: -16.79 + value: -15.74 objectReference: {fileID: 0} - target: {fileID: 8098145906284391620, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.z - value: 23.25 + value: 21.61 objectReference: {fileID: 0} - target: {fileID: 8141526384183047376, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} @@ -13525,12 +13605,12 @@ PrefabInstance: - target: {fileID: 8275263869681320989, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.x - value: -20.11 + value: -19.86 objectReference: {fileID: 0} - target: {fileID: 8275263869681320989, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.z - value: 23.39 + value: 23.17 objectReference: {fileID: 0} - target: {fileID: 8339161178062075028, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} @@ -13540,12 +13620,12 @@ PrefabInstance: - target: {fileID: 8343313140825114118, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.x - value: -16.41 + value: -16.63 objectReference: {fileID: 0} - target: {fileID: 8343313140825114118, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} propertyPath: m_LocalPosition.z - value: 24.22 + value: 25.04 objectReference: {fileID: 0} - target: {fileID: 8486657180417946989, guid: 066a37b76345c5a4ca14d7d545aaba0b, type: 3} @@ -14014,6 +14094,38 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &1406440707 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1406440708} + m_Layer: 0 + m_Name: Pos1 (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1406440708 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1406440707} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.99991876, z: -0, w: 0.012746878} + m_LocalPosition: {x: 1.99, y: 0, z: -2.84} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 696072028} + m_Father: {fileID: 370075175} + m_LocalEulerAnglesHint: {x: 0, y: 178.539, z: 0} --- !u!1 &1435427328 GameObject: m_ObjectHideFlags: 0 @@ -14704,7 +14816,7 @@ PrefabInstance: - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} propertyPath: m_LocalPosition.x - value: -1.73 + value: -1.4 objectReference: {fileID: 0} - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} @@ -14714,7 +14826,7 @@ PrefabInstance: - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} propertyPath: m_LocalPosition.z - value: 0.67 + value: 0.68 objectReference: {fileID: 0} - target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, type: 3} @@ -19719,4 +19831,4 @@ SceneRoots: - {fileID: 1611275467} - {fileID: 1055672620} - {fileID: 1371790771} - - {fileID: 1252552949} + - {fileID: 912569406} diff --git a/Assets/_Zombie/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity.meta b/Assets/_Zombie/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity.meta index cfe347a4..a2e1a84c 100644 --- a/Assets/_Zombie/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity.meta +++ b/Assets/_Zombie/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ebe09b16f5fee374db343fdbea8e3f07 +guid: f2b684a9a0ead31429b5d81504e9b4e0 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/_Zombie/Scripts/GameLocal.cs b/Assets/_Zombie/Scripts/GameLocal.cs index 598b1eab..ab08d68d 100644 --- a/Assets/_Zombie/Scripts/GameLocal.cs +++ b/Assets/_Zombie/Scripts/GameLocal.cs @@ -101,6 +101,9 @@ public enum Place Jiangxi_Ganzhou_Longnan_WandaGuangchang_Shinei = 58, Jiangxi_Ganzhou_Zhanggong_GanzhouShucheng = 59, Henan_Shangqiu_Juyang_WuyueGuangchang = 60, + Guangdong_Meizhou_Meixian_TianhongShangchang = 61, + Beijing_Tongzhou_Luyijie_XiangrikuiGuangchang = 62, + Ningxia_Yinchuang_Shizuishan_WandaGuangchang = 63, } public class GameLocal : MonoBehaviour diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 3787b4e0..0147887e 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -4,229 +4,5 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: - - enabled: 0 - path: Assets/_Zombie/Scenes/Company1Floor.unity - guid: 386a8fdea01af8a4e8d4a9835407ddec - - enabled: 0 - path: Assets/_Zombie/Scenes/Zhejiang_Shaoxing_Shengzhou_Wuyueguangchang.unity - guid: df8c4c84bf9690442a51ed602038e198 - - enabled: 0 - path: Assets/_Zombie/Scenes/Anhui_Wuhu_Guanwei.unity - guid: 7ea2631ade6db9644a2fed780a53099a - - enabled: 0 - path: Assets/_Zombie/Scenes/Hunan_Jishou_Qianzhou_Tianhong.unity - guid: ec7cacc9f19fc2f4685128b564c49ba3 - - enabled: 0 - path: Assets/_Zombie/Scenes/Liaoning_Anshan.unity - guid: b67f2736a3840ad409ed5ee16be306b1 - - enabled: 0 - path: Assets/_Zombie/Scenes/Zhejiang_Jinhua_Kejiguan.unity - guid: 745618b4d2230094fae3279122f05891 - - enabled: 0 - path: Assets/_Zombie/Scenes/Henan_Xinzheng_Shuanghudadao_Longhujinyicheng.unity - guid: 1fb22fde5a33cd049a812602cafb9da0 - - enabled: 0 - path: Assets/_Zombie/Scenes/Shandong_Langfang_QingzhouTaihuacheng.unity - guid: e0c90b79158dec949be7c3689ebd8533 - - enabled: 0 - path: Assets/_Zombie/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang.unity - guid: 500d39ce16eab414a8e9699a7cb7a89b - - enabled: 0 - path: Assets/_Zombie/Scenes/Anhui_Suzhou_Dangshan_Guchengshangyejie.unity - guid: 9415ad06710d25145b01a301d76ac358 - - enabled: 0 - path: Assets/_Zombie/Scenes/Shandong_Jinan_Kuiyin_Shengfutongshangmao_wai.unity - guid: ee440b17ff6cc2d4b8f2b6eaae905c82 - - enabled: 0 - path: Assets/_Zombie/Scenes/Shandong_Jinan_Kuiyin_Shengfutongshangmao.unity - guid: 8d2f28b9ea2813544b7c74ecf6fd19ab - - enabled: 0 - path: Assets/_Zombie/Scenes/Shandong_Heze_Yuncheng_Gefuli.unity - guid: d780bd1524554924da1f1e1eef752c52 - - enabled: 0 - path: Assets/_Zombie/Scenes/Yangzhou_Hanjiang_Tansuozhongxin.unity - guid: 9c4f1e022cfbbfa43ae0cdbdc32b9393 - - enabled: 0 - path: Assets/_Zombie/Scenes/Yangzhou_Hanjiang_Tansuozhongxin_wai.unity - guid: f91a83be024791e4d8cb2fdf633abae7 - - enabled: 0 - path: Assets/_Zombie/Scenes/Shandong_Jining_Shangchang.unity - guid: 774ba51685c4dca4484fd78833301ede - - enabled: 0 - path: Assets/_Zombie/Scenes/Shandong_Jining_Shangchang_nei.unity - guid: c58727a975cdcca41b42f70a2fc91ab1 - - enabled: 0 - path: Assets/_Zombie/Scenes/Wulanhaote_Ouya_Shangchang.unity - guid: 9a7ed958e8570894b9819e34e841e6a8 - - enabled: 0 - path: Assets/_Zombie/Scenes/Wulanhaote_Wanda_Shangchang.unity - guid: 4a65e2f41ff253c4e9fc50dcad6c9dca - - enabled: 0 - path: Assets/_Zombie/Scenes/Yunnan_Mile_Jinchen_Shidaiguangchang.unity - guid: 73bb2b1a81924f24d93f8d429dcaf047 - - enabled: 0 - path: Assets/_Zombie/Scenes/Xinjiang_Yili_Yining_Wanrong.unity - guid: a3479669e78b4624da28d977f18898d0 - - enabled: 0 - path: Assets/_Zombie/Scenes/Hunan_Hengyang_Zhuhui_Dongzhoudao.unity - guid: 9b102d624455d774cac1cc8b974d592b - - enabled: 0 - path: Assets/_Zombie/Scenes/Yunnan_Lincang_Linxiang_Hengji.unity - guid: 6e1707f73b498fe4695ca9f6fbd8b357 - - enabled: 0 - path: Assets/_Zombie/Scenes/Yunnan_Lincang_Linxiang_Hengji_Dixia.unity - guid: 5731503aab594514cba53bebf8808815 - - enabled: 0 - path: Assets/_Zombie/Scenes/Gangxi_Guilin_Gongcheng_Shijixincheng.unity - guid: 1397eb73d7fc29e46a5be0c0bef42fde - - enabled: 0 - path: Assets/_Zombie/Scenes/Guangdong_Shenzhen_Guangming_Wanda.unity - guid: 995bbf9799c3ac1499c7cc6ae106b287 - - enabled: 0 - path: Assets/_Zombie/Scenes/Liaoning_Anshan_Lishan_Dayuecheng.unity - guid: 15bf1ed07b1f77145a49bd818389da0d - - enabled: 0 - path: Assets/_Zombie/Scenes/Jiangsu_Xvzhou_Fengxian_Wuyueguangchang.unity - guid: fe8dcd2afd9d23041a8a7d393070adbe - - enabled: 0 - path: Assets/_Zombie/Scenes/Hebei_Tangshan_Qianan_Tianyuangu.unity - guid: 16ae4845ded7ba848aa2668b4d9e37af - - enabled: 0 - path: Assets/_Zombie/Scenes/Guangdong_Guangzhou_Yanghaiyan.unity - guid: 9e724d594fa47884096ceb515c8198f6 - - enabled: 0 - path: Assets/_Zombie/Scenes/Gansu_Jinchang_Jinchuan_Shijiguangchang.unity - guid: a61655fb5241f6846a2bef9bf7adeec5 - - enabled: 0 - path: Assets/_Zombie/Scenes/Henan_Xinxiang_Wandaguangchang.unity - guid: f493564e8adf4424686b72f603e5d480 - - enabled: 0 - path: Assets/_Zombie/Scenes/Zhejiang_Hangzhou_Linping_Yintaicheng_Shinei.unity - guid: f6269dec5e4bf1b42a126f227b3b3db4 - - enabled: 0 - path: Assets/_Zombie/Scenes/Yangzhou_Hanjiang_TansuoZhongxin_Waidai.unity - guid: 1b58b41fa69bb6a418075c30f5123fe8 - - enabled: 0 - path: Assets/_Zombie/Scenes/Gansu_Jinchang_Jinchuan_Shijiguangchang_Shiwai.unity - guid: 6a778f8cfd2e06c4b8b416eacb4f2e2d - - enabled: 0 - path: Assets/_Zombie/Scenes/Hunan_Hengyang_Zhuhui_Dongzhoudao_nei.unity - guid: 0e66495d9e76e0f46b3a4c0038c3f5a4 - - enabled: 0 - path: Assets/_Zombie/Scenes/Henan_Xinxiang_Wandaguangchang_Shinei.unity - guid: 90becf78a8aabc3429c7ec3d7b311410 - - enabled: 0 - path: Assets/_Zombie/Scenes/Guangdong_Guangzhou_Yanghaiyan_Lihu.unity - guid: 1dfd4ec6861514b4c89d62fbeecea377 - - enabled: 0 - path: Assets/_Zombie/Scenes/Nanjing_Pukou_Longhutianjie.unity - guid: 4ae9b0be2cc71e9438fff1176a8a8653 - - enabled: 0 - path: Assets/_Zombie/Scenes/Jiangsu_Xvzhou_Guolou_Oulebao.unity - guid: fbdb52f52b0e8bf4099589c47dd0b100 - - enabled: 0 - path: Assets/_Zombie/Scenes/Jiangsu_Xvzhou_Suning_Guangchang.unity - guid: 3e764d2e576c55d42ac480fd881a8de8 - - enabled: 0 - path: Assets/_Zombie/Scenes/Jiangsu_Xvzhou_Guolou_Oulebao_2.unity - guid: eea24a0caaa160a478d020e86b1ea08b - - enabled: 0 - path: Assets/_Zombie/Scenes/Shanxi_Baoji_Meixian_TianlongShangcheng.unity - guid: 3a6302bd164e60e448981159ec10e4ea - - enabled: 0 - path: Assets/_Zombie/Scenes/Hunan_Changde_Lixian_WandaGuangchang.unity - guid: cc3770d0e34d60840b2fba2cc340025d - - enabled: 0 - path: Assets/_Zombie/Scenes/Jiangsu_Xvzhou_Suning_Guangchang_1.unity - guid: 36f0dec5056be5f42aad8e5d1d72dad4 - - enabled: 0 - path: Assets/_Zombie/Scenes/Jilin_Changchun_Beihu_WuyueGuangchang.unity - guid: 4ccf2413638f4a74a9b54eea4722658e - - enabled: 0 - path: Assets/_Zombie/Scenes/Chongqing_Yuzhong_Hongyadong_Xiakexing.unity - guid: ea7144ccc37aa02459fe416f33210900 - - enabled: 0 - path: Assets/_Zombie/Scenes/Chengdu_Shuangliu_ShengfeiXuexiao.unity - guid: f224f82d542238a4e869c4b9617d6faf - - enabled: 0 - path: Assets/_Zombie/Scenes/Chongqing_Yuzhong_Hongyadong_Xiakexing_shiwan.unity - guid: a7368db6071c73747973386c47a6bae6 - - enabled: 0 - path: Assets/_Zombie/Scenes/Anhui_Suzhou_Yueshan_Guchengshangyejie_2.unity - guid: 4ad6de98e3b542446a2f0ca0ddb71cb0 - - enabled: 0 - path: Assets/_Zombie/Scenes/Ningxia_Yinchuan_Jinfeng_XinhualianGuangchang.unity - guid: ca022f8aab4d4ef4dbb1db4f2b40b830 - - enabled: 0 - path: Assets/_Zombie/Scenes/Hebei_Hengshui_Xinji_WandaGuangchang.unity - guid: 00b4d07998a09a642b0bd082839aa746 - - enabled: 0 - path: Assets/_Zombie/Scenes/Hunan_Zhuzhou_Wanda_Shennongcheng_Chaowanshe.unity - guid: 2206c238fc5ec89499e72612cb581e1c - - enabled: 0 - path: Assets/_Zombie/Scenes/Anhui_Suzhou_Yueshan_Guchengshangyejie_Shinei.unity - guid: 0289e84001db74c489cf72163b28f1ee - - enabled: 0 - path: Assets/_Zombie/Scenes/Shandong_Jining_Shangchang_3.unity - guid: d8110e0cfb874e34380d2e88a95b5f17 - - enabled: 0 - path: Assets/_Zombie/Scenes/Hebei_Hengshui_Taocheng_WandaGuangchang.unity - guid: 7c10f40b769ed9043ad4037a9148333b - - enabled: 0 - path: Assets/_Zombie/Scenes/Anhui_Manshan_XingyueGuangchang.unity - guid: 996cbd80afcf84749a220936b7e23eee - - enabled: 0 - path: Assets/_Zombie/Scenes/Zhejiang_Wenzhou_Cangnan_Yintaicheng.unity - guid: 99eb5858976e04742a32945251a36abf - - enabled: 0 - path: Assets/_Zombie/Scenes/Shandong_Weifang_Linqu_WandaGuangchang.unity - guid: 011be3366ec2d0e449cbcf5b7d6e0832 - - enabled: 0 - path: Assets/_Zombie/Scenes/Jilin_Changchun_Chaoyang_OuyaMaichang.unity - guid: f0cf3e00b0d43214ea395039dfdd573a - - enabled: 0 - path: Assets/_Zombie/Scenes/Shandong_Weifang_Linqu_WandaGuangchang_Shinei.unity - guid: 75df82cb2511b9540bd6a7f17b80f2ba - - enabled: 0 - path: Assets/_Zombie/Scenes/Liaoning_Panjin_Shuangtaizi_Shuangtaicheng.unity - guid: 80cd9808beb80334abb8f88cd83ed76e - - enabled: 0 - path: Assets/_Zombie/Scenes/Liaoning_Dalian_Pulandian_WandaGuangchang.unity - guid: 92f8c8ee268499642acffd96748346e2 - - enabled: 0 - path: Assets/_Zombie/Scenes/Jiangxi_Ganzhou_Longnan_WandaGuangchang_Shinei.unity - guid: 8ba211bdfe6b5204d9f3eaf3667fe51d -<<<<<<< HEAD - - enabled: 0 - path: Assets/_Zombie/Scenes/Jiangxi_Ganzhou_Zhanggong_GanzhouShucheng.unity - guid: 72cacd349decdb941938da562d3ce54f - - enabled: 1 - path: Assets/_Zombie/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity - guid: ebe09b16f5fee374db343fdbea8e3f07 -======= - - enabled: 1 - path: Assets/_Zombie/Scenes/Jiangxi_Ganzhou_Zhanggong_GanzhouShucheng.unity - guid: 72cacd349decdb941938da562d3ce54f ->>>>>>> eb1566f0a79cad39f10ab740ee7ab9f8ec97e8f8 - m_configObjects: - Unity.XR.PXR.Settings: {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2, - type: 2} - Unity.XR.WindowsMR.Settings: {fileID: 11400000, guid: 744b813df90924c169af73489b8325de, - type: 2} - UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: 89a6d18d3df8d3e4fa917b0f9a963bc0, - type: 2} - UnityEditor.XR.ARKit.ARKitSettings: {fileID: 11400000, guid: de8a8e4f987434338a4b1062feb8d069, - type: 2} - com.htc.upm.wave.xrsdk.xrsettings: {fileID: 11400000, guid: d77c23cbf41fa9a43b899fb48cd4032f, - type: 2} - com.unity.xr.arcore.PlayerSettings: {fileID: 11400000, guid: c2f7b8d7c0bff4d10874cbcf3f24af78, - type: 2} - com.unity.xr.arkit.PlayerSettings: {fileID: 11400000, guid: b27ec7d82a91a48e69fd689ad6808e5e, - type: 2} - com.unity.xr.magicleap.magic_leap_settings: {fileID: 11400000, guid: 1eb95d77acb39444e8cf44313496a874, - type: 2} - com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 58f40b12bbc864f3c96c6505a9a1e1e3, - type: 2} - com.unity.xr.openxr.settings4: {fileID: 11400000, guid: 6bb381a8ba31f114d9724357633b4625, - type: 2} + m_Scenes: [] + m_configObjects: {} diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index a70b683d..0f46a10a 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 14 + serializedVersion: 15 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -13,9 +13,6 @@ GraphicsSettings: m_ScreenSpaceShadows: m_Mode: 1 m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} - m_LegacyDeferred: - m_Mode: 1 - m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} m_DepthNormals: m_Mode: 1 m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} @@ -54,6 +51,7 @@ GraphicsSettings: m_LightmapStripping: 0 m_FogStripping: 0 m_InstancingStripping: 0 + m_BrgStripping: 0 m_LightmapKeepPlain: 1 m_LightmapKeepDirCombined: 1 m_LightmapKeepDynamicPlain: 1 @@ -64,12 +62,13 @@ GraphicsSettings: m_FogKeepExp: 1 m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] - m_LightsUseLinearIntensity: 1 + m_LightsUseLinearIntensity: 0 m_LightsUseColorTemperature: 1 m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 m_SRPDefaultSettings: UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 0f423533b364f6b47aeb75def967c61c, type: 2} + m_LightProbeOutsideHullStrategy: 0 m_CameraRelativeLightCulling: 0 m_CameraRelativeShadowCulling: 0 diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index b00cb797..05cf9550 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -293,4 +293,196 @@ InputManager: type: 0 axis: 0 joyNum: 0 + - serializedVersion: 3 + m_Name: Enable Debug Button 1 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left ctrl + altNegativeButton: + altPositiveButton: joystick button 8 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Enable Debug Button 2 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: backspace + altNegativeButton: + altPositiveButton: joystick button 9 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Reset + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left alt + altNegativeButton: + altPositiveButton: joystick button 1 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Next + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: page down + altNegativeButton: + altPositiveButton: joystick button 5 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Previous + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: page up + altNegativeButton: + altPositiveButton: joystick button 4 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Validate + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: return + altNegativeButton: + altPositiveButton: joystick button 0 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Persistent + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: right shift + altNegativeButton: + altPositiveButton: joystick button 2 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Multiplier + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left shift + altNegativeButton: + altPositiveButton: joystick button 3 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Horizontal + descriptiveName: + descriptiveNegativeName: + negativeButton: left + positiveButton: right + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: down + positiveButton: up + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: down + positiveButton: up + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 2 + axis: 6 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Horizontal + descriptiveName: + descriptiveNegativeName: + negativeButton: left + positiveButton: right + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 2 + axis: 5 + joyNum: 0 m_UsePhysicalKeys: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 38490947..73c8cf3f 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -4,7 +4,7 @@ PlayerSettings: m_ObjectHideFlags: 0 serializedVersion: 26 - productGUID: 4eabccb8ed7d44b47baaff48b0c8cf7e + productGUID: 9cd7f930db052c74c9afb6f41568dc4b AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 AndroidEnableSustainedPerformanceMode: 0 @@ -12,11 +12,11 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: pineappletech - productName: "\u50F5\u5C38\u6765\u4E86" + companyName: DefaultCompany + productName: Zombie defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} - m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} + m_SplashScreenBackgroundColor: {r: 0.12156863, g: 0.12156863, b: 0.1254902, a: 1} m_ShowUnitySplashScreen: 1 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 @@ -40,15 +40,14 @@ PlayerSettings: width: 1 height: 1 m_SplashScreenLogos: [] - m_VirtualRealitySplashScreen: {fileID: 2800000, guid: 2153ee1f650ed95488a2f806551b4cc9, - type: 3} + m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} - defaultScreenWidth: 1024 - defaultScreenHeight: 768 + defaultScreenWidth: 1920 + defaultScreenHeight: 1080 defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 - m_ActiveColorSpace: 1 + m_ActiveColorSpace: 0 unsupportedMSAAFallback: 0 m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 @@ -69,7 +68,7 @@ PlayerSettings: disableDepthAndStencilBuffers: 0 androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 - androidUseSwappy: 0 + androidUseSwappy: 1 androidBlitType: 0 androidResizableWindow: 0 androidDefaultWindowWidth: 1920 @@ -141,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 1.0.2 + bundleVersion: 1.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -162,22 +161,16 @@ PlayerSettings: resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: -<<<<<<< HEAD - Android: com.pineappletech.zombie.henanshangqiujuyangwuyueguangchang -======= - Android: com.pineappletech.zombie.jiangxiganzhouzhanggongganzhoushucheng ->>>>>>> eb1566f0a79cad39f10ab740ee7ab9f8ec97e8f8 - Standalone: com.DefaultCompany.com.unity.template.ar + applicationIdentifier: {} buildNumber: Standalone: 0 VisionOS: 0 iPhone: 0 tvOS: 0 - overrideDefaultApplicationIdentifier: 1 - AndroidBundleVersionCode: 103 - AndroidMinSdkVersion: 29 - AndroidTargetSdkVersion: 33 + overrideDefaultApplicationIdentifier: 0 + AndroidBundleVersionCode: 1 + AndroidMinSdkVersion: 22 + AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: stripEngineCode: 1 @@ -255,10 +248,10 @@ PlayerSettings: iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 shaderPrecisionModel: 0 - clonedFromGUID: 513da609dad384f5694c9cb4841b1830 - templatePackageId: com.unity.template.ar@3.0.2 + clonedFromGUID: 00000000000000000000000000000000 + templatePackageId: templateDefaultScene: - useCustomMainManifest: 1 + useCustomMainManifest: 0 useCustomLauncherManifest: 0 useCustomMainGradleTemplate: 0 useCustomLauncherGradleManifest: 0 @@ -266,12 +259,12 @@ PlayerSettings: useCustomGradlePropertiesTemplate: 0 useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 - AndroidTargetArchitectures: 2 + AndroidTargetArchitectures: 1 AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: F:/source/boluo.keystore - AndroidKeyaliasName: boluo + AndroidKeystoreName: + AndroidKeyaliasName: AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 @@ -289,15 +282,8 @@ PlayerSettings: AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 - AndroidAppBundleSizeToValidate: 150 - m_BuildTargetIcons: - - m_BuildTarget: - m_Icons: - - serializedVersion: 2 - m_Icon: {fileID: 2800000, guid: c339fa028be346e49b4a8670353a7e6e, type: 3} - m_Width: 128 - m_Height: 128 - m_Kind: 0 + AndroidAppBundleSizeToValidate: 200 + m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: - m_BuildTarget: Android m_Icons: @@ -395,22 +381,17 @@ PlayerSettings: m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: [] m_BuildTargetGraphicsJobMode: [] - m_BuildTargetGraphicsAPIs: - - m_BuildTarget: iOSSupport - m_APIs: 10000000 - m_Automatic: 1 - - m_BuildTarget: AndroidPlayer - m_APIs: 0b000000 - m_Automatic: 0 + m_BuildTargetGraphicsAPIs: [] m_BuildTargetVRSettings: [] m_DefaultShaderChunkSizeInMB: 16 m_DefaultShaderChunkCount: 0 - openGLRequireES31: 1 - openGLRequireES31AEP: 1 - openGLRequireES32: 1 + openGLRequireES31: 0 + openGLRequireES31AEP: 0 + openGLRequireES32: 0 m_TemplateCustomTags: {} mobileMTRendering: Android: 1 + VisionOS: 1 iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] @@ -425,7 +406,7 @@ PlayerSettings: enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 - cameraUsageDescription: Required For AR. + cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: @@ -554,7 +535,7 @@ PlayerSettings: switchSystemResourceMemory: 16777216 switchSupportedNpadStyles: 22 switchNativeFsCacheSize: 32 - switchIsHoldTypeHorizontal: 0 + switchIsHoldTypeHorizontal: 1 switchSupportedNpadCount: 8 switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 @@ -567,8 +548,8 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchUseNewStyleFilepaths: 0 - switchUseLegacyFmodPriorities: 1 + switchUseNewStyleFilepaths: 1 + switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 @@ -613,7 +594,7 @@ PlayerSettings: ps4GarlicHeapSize: 2048 ps4ProGarlicHeapSize: 2560 playerPrefsMaxSize: 32768 - ps4Passcode: Fswuzleht6xGbotuQQgmO6GkdAqwedXN + ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 ps4pnFriends: 1 @@ -664,7 +645,7 @@ PlayerSettings: webGLTemplate: APPLICATION:Default webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 - webGLCompressionFormat: 0 + webGLCompressionFormat: 1 webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 @@ -677,49 +658,32 @@ PlayerSettings: webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 scriptingDefineSymbols: - Android: MIRROR;MIRROR_57_0_OR_NEWER;MIRROR_58_0_OR_NEWER;MIRROR_65_0_OR_NEWER;MIRROR_66_0_OR_NEWER;MIRROR_2022_9_OR_NEWER;MIRROR_2022_10_OR_NEWER;MIRROR_70_0_OR_NEWER;MIRROR_71_0_OR_NEWER;MIRROR_73_OR_NEWER;MIRROR_78_OR_NEWER;MIRROR_79_OR_NEWER;MIRROR_81_OR_NEWER;PICO;PHY3D_ENABLED;MULTIPLAYER_ENABLED - Standalone: PHY3D_ENABLED;MULTIPLAYER_ENABLED;MIRROR;MIRROR_57_0_OR_NEWER;MIRROR_58_0_OR_NEWER;MIRROR_65_0_OR_NEWER;MIRROR_66_0_OR_NEWER;MIRROR_2022_9_OR_NEWER;MIRROR_2022_10_OR_NEWER;MIRROR_70_0_OR_NEWER;MIRROR_71_0_OR_NEWER;MIRROR_73_OR_NEWER;MIRROR_78_OR_NEWER;MIRROR_79_OR_NEWER;MIRROR_81_OR_NEWER + Android: MIRROR;MIRROR_57_0_OR_NEWER;MIRROR_58_0_OR_NEWER;MIRROR_65_0_OR_NEWER;MIRROR_66_0_OR_NEWER;MIRROR_2022_9_OR_NEWER;MIRROR_2022_10_OR_NEWER;MIRROR_70_0_OR_NEWER;MIRROR_71_0_OR_NEWER;MIRROR_73_OR_NEWER;MIRROR_78_OR_NEWER;MIRROR_79_OR_NEWER;MIRROR_81_OR_NEWER additionalCompilerArguments: {} - platformArchitecture: - iPhone: 1 - scriptingBackend: - Android: 1 + platformArchitecture: {} + scriptingBackend: {} il2cppCompilerConfiguration: {} il2cppCodeGeneration: {} - managedStrippingLevel: - Android: 1 - EmbeddedLinux: 1 - GameCoreScarlett: 1 - GameCoreXboxOne: 1 - Lumin: 1 - Nintendo Switch: 1 - PS4: 1 - PS5: 1 - Stadia: 1 - WebGL: 1 - Windows Store Apps: 1 - XboxOne: 1 - iPhone: 1 - tvOS: 1 + managedStrippingLevel: {} incrementalIl2cppBuild: {} suppressCommonWarnings: 1 - allowUnsafeCode: 1 + allowUnsafeCode: 0 useDeterministicCompilation: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 - gcIncremental: 0 + gcIncremental: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 - metroPackageName: com.unity.template.ar + metroPackageName: Zombie metroPackageVersion: metroCertificatePath: metroCertificatePassword: metroCertificateSubject: metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 - metroApplicationDescription: com.unity.template.ar + metroApplicationDescription: Zombie wsaImages: {} metroTileShortName: metroTileShowName: 0 @@ -791,13 +755,7 @@ PlayerSettings: windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 - qualitySettingsNames: - - Very Low - - Low - - Medium - - High - - Very High - - Ultra + qualitySettingsNames: [] projectName: organizationId: cloudEnabled: 0