From e37234a18e5bd4da03b9954e37570dd589d47b69 Mon Sep 17 00:00:00 2001 From: bzx <496597135@qq.com> Date: Sun, 25 Jan 2026 13:15:06 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E6=95=88=E9=9F=B3=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/Impacts/GatlingImpact.prefab | 97 +--------------- .../Impacts/GrenadeBulletImpact.prefab | 17 --- .../_Zombie/Prefabs/Impacts/HR01Impact.prefab | 23 +--- .../Impacts/LightSphereBulletImpact.prefab | 17 --- .../Prefabs/Impacts/PHR01Impact.prefab | 97 +--------------- .../Prefabs/Impacts/PistolBulletImpact.prefab | 17 --- Assets/_Zombie/Scenes/Company1Floor.unity | 2 +- ...ng_Panjin_Shuangtaizi_Shuangtaicheng.unity | 15 +++ ...Yinchuang_Shizuishan_WandaGuangchang.unity | 107 ++++++++++++++++++ .../Scenes/Shandong_Weihai_Jingqu_W37.unity | 18 +++ Assets/sucai/Materials/主体金属.mat | 2 +- Assets/sucai/Materials/橙.mat | 2 +- Assets/sucai/Materials/灰.mat | 2 +- Assets/sucai/Materials/绿.mat | 2 +- Assets/sucai/Materials/黄光.mat | 2 +- Assets/sucai/Materials/黑灰.mat | 2 +- ProjectSettings/EditorBuildSettings.asset | 5 +- ProjectSettings/ProjectSettings.asset | 8 +- 18 files changed, 165 insertions(+), 270 deletions(-) diff --git a/Assets/_Zombie/Prefabs/Impacts/GatlingImpact.prefab b/Assets/_Zombie/Prefabs/Impacts/GatlingImpact.prefab index 408aca53..4666c0e0 100644 --- a/Assets/_Zombie/Prefabs/Impacts/GatlingImpact.prefab +++ b/Assets/_Zombie/Prefabs/Impacts/GatlingImpact.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 5130507435534210339} - component: {fileID: 8727038508284285864} - component: {fileID: 1470727741629204945} - - component: {fileID: 4494557829122282976} m_Layer: 0 m_Name: GatlingImpact m_TagString: Untagged @@ -26,14 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2619052377131353835} + 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: 5195174399973659470} + m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8727038508284285864 MonoBehaviour: @@ -110,94 +108,3 @@ MonoBehaviour: useLocalTransformOnly: 0 ownerChangeIndicator: 1 receivedStatesCounter: 0 ---- !u!114 &4494557829122282976 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2619052377131353835} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 006428c8f7c4f8a4e80d5fe40c4871de, type: 3} - m_Name: - m_EditorClassIdentifier: - syncDirection: 0 - syncMode: 0 - syncInterval: 0 - impactSound: gatling_impact ---- !u!1001 &1455026741861140619 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 5130507435534210339} - m_Modifications: - - target: {fileID: 6641046433538628549, guid: 5459233a4f312704bb3a70cf1c2e2e0f, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6641046433538628549, guid: 5459233a4f312704bb3a70cf1c2e2e0f, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6641046433538628549, guid: 5459233a4f312704bb3a70cf1c2e2e0f, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6641046433538628549, guid: 5459233a4f312704bb3a70cf1c2e2e0f, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6641046433538628549, guid: 5459233a4f312704bb3a70cf1c2e2e0f, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 6641046433538628549, guid: 5459233a4f312704bb3a70cf1c2e2e0f, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 6641046433538628549, guid: 5459233a4f312704bb3a70cf1c2e2e0f, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6641046433538628549, guid: 5459233a4f312704bb3a70cf1c2e2e0f, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6641046433538628549, guid: 5459233a4f312704bb3a70cf1c2e2e0f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 6641046433538628549, guid: 5459233a4f312704bb3a70cf1c2e2e0f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6641046433538628549, guid: 5459233a4f312704bb3a70cf1c2e2e0f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6641046433538781091, guid: 5459233a4f312704bb3a70cf1c2e2e0f, - type: 3} - propertyPath: m_Name - value: Starfire_ChainGun_T2_NoOutImpact - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5459233a4f312704bb3a70cf1c2e2e0f, type: 3} ---- !u!4 &5195174399973659470 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6641046433538628549, guid: 5459233a4f312704bb3a70cf1c2e2e0f, - type: 3} - m_PrefabInstance: {fileID: 1455026741861140619} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/_Zombie/Prefabs/Impacts/GrenadeBulletImpact.prefab b/Assets/_Zombie/Prefabs/Impacts/GrenadeBulletImpact.prefab index 41b1e8ce..67783a1d 100644 --- a/Assets/_Zombie/Prefabs/Impacts/GrenadeBulletImpact.prefab +++ b/Assets/_Zombie/Prefabs/Impacts/GrenadeBulletImpact.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 5130507435534210339} - component: {fileID: 8727038508284285864} - component: {fileID: 1470727741629204945} - - component: {fileID: 7245500583419995623} m_Layer: 0 m_Name: GrenadeBulletImpact m_TagString: Untagged @@ -110,22 +109,6 @@ MonoBehaviour: useLocalTransformOnly: 0 ownerChangeIndicator: 1 receivedStatesCounter: 0 ---- !u!114 &7245500583419995623 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2619052377131353835} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c1cc3c7eda8f8264caa152f3886f5776, type: 3} - m_Name: - m_EditorClassIdentifier: - syncDirection: 0 - syncMode: 0 - syncInterval: 0 - impactSound: doubleTube_impact --- !u!1001 &8780066980386951906 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/_Zombie/Prefabs/Impacts/HR01Impact.prefab b/Assets/_Zombie/Prefabs/Impacts/HR01Impact.prefab index 37b6e673..7e973fed 100644 --- a/Assets/_Zombie/Prefabs/Impacts/HR01Impact.prefab +++ b/Assets/_Zombie/Prefabs/Impacts/HR01Impact.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 5130507435534210339} - component: {fileID: 8727038508284285864} - component: {fileID: 1470727741629204945} - - component: {fileID: 4509613241652422359} m_Layer: 0 m_Name: HR01Impact m_TagString: Untagged @@ -26,6 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2619052377131353835} + 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} @@ -33,7 +33,6 @@ Transform: m_Children: - {fileID: 4438995580496668363} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8727038508284285864 MonoBehaviour: @@ -110,27 +109,12 @@ MonoBehaviour: useLocalTransformOnly: 0 ownerChangeIndicator: 1 receivedStatesCounter: 0 ---- !u!114 &4509613241652422359 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2619052377131353835} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 03579a70c59d0e14db78dce5de9f7b0b, type: 3} - m_Name: - m_EditorClassIdentifier: - syncDirection: 0 - syncMode: 0 - syncInterval: 0 - impactSound: hr01_impact --- !u!1001 &6395424915654398368 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5130507435534210339} m_Modifications: - target: {fileID: 7303545456679401323, guid: 856700db5e8293b4fb5529029b783235, @@ -194,6 +178,9 @@ PrefabInstance: value: Hermit Robot_BulletImpact objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 856700db5e8293b4fb5529029b783235, type: 3} --- !u!4 &4438995580496668363 stripped Transform: diff --git a/Assets/_Zombie/Prefabs/Impacts/LightSphereBulletImpact.prefab b/Assets/_Zombie/Prefabs/Impacts/LightSphereBulletImpact.prefab index 3359ed42..104a5db4 100644 --- a/Assets/_Zombie/Prefabs/Impacts/LightSphereBulletImpact.prefab +++ b/Assets/_Zombie/Prefabs/Impacts/LightSphereBulletImpact.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 5130507435534210339} - component: {fileID: 8727038508284285864} - component: {fileID: 1470727741629204945} - - component: {fileID: 4494557829122282976} m_Layer: 0 m_Name: LightSphereBulletImpact m_TagString: Untagged @@ -110,22 +109,6 @@ MonoBehaviour: useLocalTransformOnly: 0 ownerChangeIndicator: 1 receivedStatesCounter: 0 ---- !u!114 &4494557829122282976 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2619052377131353835} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 006428c8f7c4f8a4e80d5fe40c4871de, type: 3} - m_Name: - m_EditorClassIdentifier: - syncDirection: 0 - syncMode: 0 - syncInterval: 0 - impactSound: gatling_impact --- !u!1001 &4974205117222326789 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/_Zombie/Prefabs/Impacts/PHR01Impact.prefab b/Assets/_Zombie/Prefabs/Impacts/PHR01Impact.prefab index b6d58bb0..e2cbcce5 100644 --- a/Assets/_Zombie/Prefabs/Impacts/PHR01Impact.prefab +++ b/Assets/_Zombie/Prefabs/Impacts/PHR01Impact.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 5130507435534210339} - component: {fileID: 8727038508284285864} - component: {fileID: 1470727741629204945} - - component: {fileID: 205343288008607188} m_Layer: 0 m_Name: PHR01Impact m_TagString: Untagged @@ -26,14 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2619052377131353835} + 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: 5819093651898548885} + m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8727038508284285864 MonoBehaviour: @@ -110,94 +108,3 @@ MonoBehaviour: useLocalTransformOnly: 0 ownerChangeIndicator: 1 receivedStatesCounter: 0 ---- !u!114 &205343288008607188 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2619052377131353835} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0d0dabee1e67797469a22bad485708f1, type: 3} - m_Name: - m_EditorClassIdentifier: - syncDirection: 0 - syncMode: 0 - syncInterval: 0 - impactSound: PHR01_impact ---- !u!1001 &8905282528151980718 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 5130507435534210339} - m_Modifications: - - target: {fileID: 3122254163448760379, guid: f4d9e036b776f964eba732d3721c467f, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3122254163448760379, guid: f4d9e036b776f964eba732d3721c467f, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3122254163448760379, guid: f4d9e036b776f964eba732d3721c467f, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3122254163448760379, guid: f4d9e036b776f964eba732d3721c467f, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3122254163448760379, guid: f4d9e036b776f964eba732d3721c467f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3122254163448760379, guid: f4d9e036b776f964eba732d3721c467f, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3122254163448760379, guid: f4d9e036b776f964eba732d3721c467f, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3122254163448760379, guid: f4d9e036b776f964eba732d3721c467f, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3122254163448760379, guid: f4d9e036b776f964eba732d3721c467f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3122254163448760379, guid: f4d9e036b776f964eba732d3721c467f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3122254163448760379, guid: f4d9e036b776f964eba732d3721c467f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3122254163449053941, guid: f4d9e036b776f964eba732d3721c467f, - type: 3} - propertyPath: m_Name - value: Grid RobotImpact - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f4d9e036b776f964eba732d3721c467f, type: 3} ---- !u!4 &5819093651898548885 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3122254163448760379, guid: f4d9e036b776f964eba732d3721c467f, - type: 3} - m_PrefabInstance: {fileID: 8905282528151980718} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/_Zombie/Prefabs/Impacts/PistolBulletImpact.prefab b/Assets/_Zombie/Prefabs/Impacts/PistolBulletImpact.prefab index 0eb2507e..05061944 100644 --- a/Assets/_Zombie/Prefabs/Impacts/PistolBulletImpact.prefab +++ b/Assets/_Zombie/Prefabs/Impacts/PistolBulletImpact.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 5130507435534210339} - component: {fileID: 8727038508284285864} - component: {fileID: 1470727741629204945} - - component: {fileID: 4494557829122282976} m_Layer: 0 m_Name: PistolBulletImpact m_TagString: Untagged @@ -110,22 +109,6 @@ MonoBehaviour: useLocalTransformOnly: 0 ownerChangeIndicator: 1 receivedStatesCounter: 0 ---- !u!114 &4494557829122282976 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2619052377131353835} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 006428c8f7c4f8a4e80d5fe40c4871de, type: 3} - m_Name: - m_EditorClassIdentifier: - syncDirection: 0 - syncMode: 0 - syncInterval: 0 - impactSound: gatling_impact --- !u!1001 &6223301368057065203 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/_Zombie/Scenes/Company1Floor.unity b/Assets/_Zombie/Scenes/Company1Floor.unity index 244a3c9c..347f87bb 100644 --- a/Assets/_Zombie/Scenes/Company1Floor.unity +++ b/Assets/_Zombie/Scenes/Company1Floor.unity @@ -6708,7 +6708,7 @@ MonoBehaviour: IncludeChildColliders: 0 RuntimeFollower: {fileID: 0} colliderMaxDistance: 100 - lastTimeMaxDistanceCalced: 639040214663384235 + lastTimeMaxDistanceCalced: 639046172308796953 --- !u!1 &679496949 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_Zombie/Scenes/Liaoning_Panjin_Shuangtaizi_Shuangtaicheng.unity b/Assets/_Zombie/Scenes/Liaoning_Panjin_Shuangtaizi_Shuangtaicheng.unity index 12e6f569..5722301b 100644 --- a/Assets/_Zombie/Scenes/Liaoning_Panjin_Shuangtaizi_Shuangtaicheng.unity +++ b/Assets/_Zombie/Scenes/Liaoning_Panjin_Shuangtaizi_Shuangtaicheng.unity @@ -15223,6 +15223,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1079918815} + - component: {fileID: 1079918816} m_Layer: 0 m_Name: HttpServer m_TagString: Untagged @@ -15245,6 +15246,18 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1079918816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1079918814} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a0de683bcf8bae408b2ed43e059e04d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1090897016 PrefabInstance: m_ObjectHideFlags: 0 @@ -17937,7 +17950,9 @@ MonoBehaviour: BGMState: {fileID: 541392504} Version: 1.0.0 place: 55 + curGameTime: 0 gameId: 0 + vistAllTime: 900 enemyStartPos: - {fileID: 1304609849} - {fileID: 793457653} diff --git a/Assets/_Zombie/Scenes/Ningxia_Yinchuang_Shizuishan_WandaGuangchang.unity b/Assets/_Zombie/Scenes/Ningxia_Yinchuang_Shizuishan_WandaGuangchang.unity index 89710b33..d5f6a489 100644 --- a/Assets/_Zombie/Scenes/Ningxia_Yinchuang_Shizuishan_WandaGuangchang.unity +++ b/Assets/_Zombie/Scenes/Ningxia_Yinchuang_Shizuishan_WandaGuangchang.unity @@ -12806,6 +12806,80 @@ Transform: - {fileID: 1577191283} m_Father: {fileID: 370075175} m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!1001 &1315297894 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4114246107692749439, guid: 24a043ef358ba4b4ab5e684dec7412a4, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5165808986182949337, guid: 24a043ef358ba4b4ab5e684dec7412a4, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5165808986182949337, guid: 24a043ef358ba4b4ab5e684dec7412a4, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5165808986182949337, guid: 24a043ef358ba4b4ab5e684dec7412a4, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5165808986182949337, guid: 24a043ef358ba4b4ab5e684dec7412a4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5165808986182949337, guid: 24a043ef358ba4b4ab5e684dec7412a4, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5165808986182949337, guid: 24a043ef358ba4b4ab5e684dec7412a4, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5165808986182949337, guid: 24a043ef358ba4b4ab5e684dec7412a4, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5165808986182949337, guid: 24a043ef358ba4b4ab5e684dec7412a4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5165808986182949337, guid: 24a043ef358ba4b4ab5e684dec7412a4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5165808986182949337, guid: 24a043ef358ba4b4ab5e684dec7412a4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5547154134752609123, guid: 24a043ef358ba4b4ab5e684dec7412a4, + type: 3} + propertyPath: m_Name + value: "\u5B81\u590F\u94F6\u5DDD\u91D1\u51E4\u65B0\u534E\u8054\u5E7F\u573A + (1)" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 24a043ef358ba4b4ab5e684dec7412a4, type: 3} --- !u!1 &1363236047 GameObject: m_ObjectHideFlags: 0 @@ -12837,6 +12911,37 @@ Transform: m_Children: [] m_Father: {fileID: 1000933900} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1366646924 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1366646925} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1366646925 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1366646924} + 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!1001 &1371790771 PrefabInstance: m_ObjectHideFlags: 0 @@ -19842,3 +19947,5 @@ SceneRoots: - {fileID: 1055672620} - {fileID: 1371790771} - {fileID: 2138461846} + - {fileID: 1315297894} + - {fileID: 1366646925} diff --git a/Assets/_Zombie/Scenes/Shandong_Weihai_Jingqu_W37.unity b/Assets/_Zombie/Scenes/Shandong_Weihai_Jingqu_W37.unity index 613134dc..3ac0ac0e 100644 --- a/Assets/_Zombie/Scenes/Shandong_Weihai_Jingqu_W37.unity +++ b/Assets/_Zombie/Scenes/Shandong_Weihai_Jingqu_W37.unity @@ -12692,6 +12692,7 @@ GameObject: m_Component: - component: {fileID: 1288110339} - component: {fileID: 1288110340} + - component: {fileID: 1288110341} m_Layer: 0 m_Name: GameLocal m_TagString: Untagged @@ -12753,6 +12754,18 @@ MonoBehaviour: - {fileID: 710314434} - {fileID: 1084803297} - {fileID: 696072029} +--- !u!114 &1288110341 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288110334} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a0de683bcf8bae408b2ed43e059e04d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1292553882 GameObject: m_ObjectHideFlags: 0 @@ -16318,6 +16331,11 @@ PrefabInstance: propertyPath: m_Layer value: 3 objectReference: {fileID: 0} + - target: {fileID: 7807343830224486492, guid: c9e9c2ea7b0f8fa4eb7d4d785b8fbf72, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7816140112196994424, guid: c9e9c2ea7b0f8fa4eb7d4d785b8fbf72, type: 3} propertyPath: m_Layer diff --git a/Assets/sucai/Materials/主体金属.mat b/Assets/sucai/Materials/主体金属.mat index 2ee7f8d6..abdb19ad 100644 --- a/Assets/sucai/Materials/主体金属.mat +++ b/Assets/sucai/Materials/主体金属.mat @@ -129,7 +129,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.3577239, g: 0.39269394, b: 0.49131614, a: 1} - - _Color: {r: 0.3577239, g: 0.39269394, b: 0.49131614, a: 1} + - _Color: {r: 0.35772386, g: 0.3926939, b: 0.49131608, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/sucai/Materials/橙.mat b/Assets/sucai/Materials/橙.mat index f3ebcec0..c15f9ca6 100644 --- a/Assets/sucai/Materials/橙.mat +++ b/Assets/sucai/Materials/橙.mat @@ -129,7 +129,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 0.68986857, b: 0.42758563, a: 1} - - _Color: {r: 1, g: 0.68986857, b: 0.42758563, a: 1} + - _Color: {r: 1, g: 0.6898685, b: 0.4275856, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/sucai/Materials/灰.mat b/Assets/sucai/Materials/灰.mat index e677375b..927fe8eb 100644 --- a/Assets/sucai/Materials/灰.mat +++ b/Assets/sucai/Materials/灰.mat @@ -129,7 +129,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.4030052, g: 0.4030052, b: 0.4030052, a: 1} - - _Color: {r: 0.4030052, g: 0.4030052, b: 0.4030052, a: 1} + - _Color: {r: 0.40300518, g: 0.40300518, b: 0.40300518, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/sucai/Materials/绿.mat b/Assets/sucai/Materials/绿.mat index dd6dca32..59b96c7d 100644 --- a/Assets/sucai/Materials/绿.mat +++ b/Assets/sucai/Materials/绿.mat @@ -129,7 +129,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.3537566, g: 0.4145975, b: 0.5751445, a: 1} - - _Color: {r: 0.3537566, g: 0.4145975, b: 0.5751445, a: 1} + - _Color: {r: 0.35375658, g: 0.41459748, b: 0.5751445, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/sucai/Materials/黄光.mat b/Assets/sucai/Materials/黄光.mat index 7d53b2b3..39dd8423 100644 --- a/Assets/sucai/Materials/黄光.mat +++ b/Assets/sucai/Materials/黄光.mat @@ -130,7 +130,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 0.6425672, b: 0.26268855, a: 1} - - _Color: {r: 1, g: 0.6425672, b: 0.26268855, a: 1} + - _Color: {r: 1, g: 0.6425672, b: 0.26268852, a: 1} - _EmissionColor: {r: 1, g: 1, b: 0.027375858, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/sucai/Materials/黑灰.mat b/Assets/sucai/Materials/黑灰.mat index e5dd8ef1..d38e079e 100644 --- a/Assets/sucai/Materials/黑灰.mat +++ b/Assets/sucai/Materials/黑灰.mat @@ -129,7 +129,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.23716182, g: 0.24047169, b: 0.27302277, a: 1} - - _Color: {r: 0.23716182, g: 0.24047169, b: 0.27302277, a: 1} + - _Color: {r: 0.23716179, g: 0.24047166, b: 0.27302274, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index dccb35d2..df3b541f 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -200,9 +200,12 @@ EditorBuildSettings: - enabled: 0 path: Assets/_Zombie/Scenes/Jiangxi_Nanchang_Xinjian_XvhuiGuangchang.unity guid: a1efb35d61bc53242bde4c7a560f8ea1 - - enabled: 1 + - enabled: 0 path: Assets/_Zombie/Scenes/Liaoning_Panjin_Shuangtaizi_Shuangtaicheng.unity guid: 80cd9808beb80334abb8f88cd83ed76e + - enabled: 1 + path: Assets/_Zombie/Scenes/Shandong_Weihai_Jingqu_W37.unity + guid: 5f72fa3b7ee25d7428f3411e27e937d1 m_configObjects: Unity.XR.PXR.Settings: {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2, type: 2} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 76ec9404..7e53f087 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -141,8 +141,10 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 1.0.2 - preloadedAssets: [] + bundleVersion: 1.0.3 + preloadedAssets: + - {fileID: 1814176829808956018, guid: 58f40b12bbc864f3c96c6505a9a1e1e3, type: 2} + - {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -163,7 +165,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.pineappletech.zombie.liaoningpanjinshuangtaizishuangtaicheng + Android: com.pineappletech.zombie.shandongweihaijinquw37 Standalone: com.DefaultCompany.com.unity.template.ar buildNumber: Standalone: 0