diff --git a/Assets/DC/地形/定西市安定区万达广场 (新).prefab b/Assets/DC/地形/定西市安定区万达广场 (新).prefab
new file mode 100644
index 00000000..5ad4d169
--- /dev/null
+++ b/Assets/DC/地形/定西市安定区万达广场 (新).prefab
@@ -0,0 +1,67 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &7006527841038631881
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -3901992563441801604, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 2bb3eed0404231447a5670edef51ff1c, type: 2}
+ - target: {fileID: -3119236414387510727, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: fb8c6fc9a9a57a04aa81ead6f0796e95, type: 2}
+ - target: {fileID: 919132149155446097, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_Name
+ value: "\u5B9A\u897F\u5E02\u5B89\u5B9A\u533A\u4E07\u8FBE\u5E7F\u573A (1)"
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
diff --git a/Assets/DC/地形/定西市安定区万达广场 (新).prefab.meta b/Assets/DC/地形/定西市安定区万达广场 (新).prefab.meta
new file mode 100644
index 00000000..c857aeb9
--- /dev/null
+++ b/Assets/DC/地形/定西市安定区万达广场 (新).prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: be5cd1f0d4f38884daaac5a9ceea805d
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/DC/地形/定西市安定区万达广场.fbx b/Assets/DC/地形/定西市安定区万达广场.fbx
index bb865af5..0a2c8ba1 100644
Binary files a/Assets/DC/地形/定西市安定区万达广场.fbx and b/Assets/DC/地形/定西市安定区万达广场.fbx differ
diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml
index 487b5a1b..78b2e0b9 100644
--- a/Assets/Plugins/Android/AndroidManifest.xml
+++ b/Assets/Plugins/Android/AndroidManifest.xml
@@ -8,7 +8,7 @@
-
+
diff --git a/Assets/StreamingAssets/build_info b/Assets/StreamingAssets/build_info
index 9ed64f53..9116d18c 100644
--- a/Assets/StreamingAssets/build_info
+++ b/Assets/StreamingAssets/build_info
@@ -1 +1 @@
-Build from ZTT at 2026/3/11 11:06:15
\ No newline at end of file
+Build from ZTT at 2026/3/14 9:42:08
\ No newline at end of file
diff --git a/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/DeathKnightBoss.prefab b/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/DeathKnightBoss.prefab
index e0a608f7..33560f49 100644
--- a/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/DeathKnightBoss.prefab
+++ b/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/DeathKnightBoss.prefab
@@ -6066,7 +6066,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1.8, y: 1.8, z: 1.8}
+ m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 4038051567966124574}
diff --git a/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/DeathKnightPhantom.prefab b/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/DeathKnightPhantom.prefab
index 57f60537..7713de64 100644
--- a/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/DeathKnightPhantom.prefab
+++ b/Assets/_FutureMen2/Prefabs/Enemys/DeathKnightBoss/DeathKnightPhantom.prefab
@@ -4232,7 +4232,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1.8, y: 1.8, z: 1.8}
+ m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 8732222001177498588}
diff --git a/Assets/_FutureMen2/Prefabs/Enemys/FrogBoss/FrogBoss.prefab b/Assets/_FutureMen2/Prefabs/Enemys/FrogBoss/FrogBoss.prefab
index 68dfec88..a03549a2 100644
--- a/Assets/_FutureMen2/Prefabs/Enemys/FrogBoss/FrogBoss.prefab
+++ b/Assets/_FutureMen2/Prefabs/Enemys/FrogBoss/FrogBoss.prefab
@@ -32294,7 +32294,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 3, y: 3, z: 3}
+ m_LocalScale: {x: 2.3, y: 2.3, z: 2.3}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 8814151823842215044}
diff --git a/Assets/_FutureMen2/Prefabs/Enemys/OctopusBoss/OctopusBoss.prefab b/Assets/_FutureMen2/Prefabs/Enemys/OctopusBoss/OctopusBoss.prefab
index 489d3cea..44c550df 100644
--- a/Assets/_FutureMen2/Prefabs/Enemys/OctopusBoss/OctopusBoss.prefab
+++ b/Assets/_FutureMen2/Prefabs/Enemys/OctopusBoss/OctopusBoss.prefab
@@ -22359,7 +22359,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
+ m_LocalScale: {x: 0.9, y: 0.9, z: 0.9}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 4496741784546641191}
diff --git a/Assets/_FutureMen2/Scenes/Gansu_Dingxi_Anding_WandaGuangchang.unity b/Assets/_FutureMen2/Scenes/Gansu_Dingxi_Anding_WandaGuangchang.unity
index e4c6c49e..d0c545b8 100644
--- a/Assets/_FutureMen2/Scenes/Gansu_Dingxi_Anding_WandaGuangchang.unity
+++ b/Assets/_FutureMen2/Scenes/Gansu_Dingxi_Anding_WandaGuangchang.unity
@@ -1660,6 +1660,111 @@ MonoBehaviour:
soundPlayedCustomEvent:
willCleanUpDelegatesAfterStop: 1
frames: 178
+--- !u!1 &254633363
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 254633364}
+ - component: {fileID: 254633367}
+ - component: {fileID: 254633366}
+ - component: {fileID: 254633365}
+ m_Layer: 21
+ m_Name: wall (1)
+ m_TagString: Wall
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &254633364
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 254633363}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: 0.09621052, z: -0, w: 0.99536103}
+ m_LocalPosition: {x: -1.6380001, y: 0, z: 0.101}
+ m_LocalScale: {x: 9.776007, y: 1, z: 0.5547}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1657300549}
+ m_LocalEulerAnglesHint: {x: 0, y: 11.042, z: 0}
+--- !u!65 &254633365
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 254633363}
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
+ m_IsTrigger: 0
+ m_ProvidesContacts: 0
+ m_Enabled: 1
+ serializedVersion: 3
+ m_Size: {x: 1, y: 1, z: 1}
+ m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &254633366
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 254633363}
+ m_Enabled: 0
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &254633367
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 254633363}
+ m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &258394718
GameObject:
m_ObjectHideFlags: 0
@@ -1687,13 +1792,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 258394718}
serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -1.47, y: -0, z: 1.05}
+ m_LocalRotation: {x: -0, y: 0.09041333, z: -0, w: 0.9959044}
+ m_LocalPosition: {x: -1.71, y: 0, z: 1.254}
m_LocalScale: {x: 9.776007, y: 1, z: 0.5547}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1657300549}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 10.375, z: 0}
--- !u!65 &258394720
BoxCollider:
m_ObjectHideFlags: 0
@@ -2000,7 +2105,7 @@ Transform:
m_GameObject: {fileID: 266120907}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -30.04, y: 0, z: -1.86}
+ m_LocalPosition: {x: -23.2, y: 0, z: 3.15}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -6196,7 +6301,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1278657786741136949, guid: a7a84068b5a10554195ba5c9f189d30c, type: 3}
propertyPath: m_LocalPosition.x
- value: -6.02
+ value: -5.902
objectReference: {fileID: 0}
- target: {fileID: 1278657786741136949, guid: a7a84068b5a10554195ba5c9f189d30c, type: 3}
propertyPath: m_LocalPosition.y
@@ -6204,7 +6309,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1278657786741136949, guid: a7a84068b5a10554195ba5c9f189d30c, type: 3}
propertyPath: m_LocalPosition.z
- value: 0.248
+ value: 1.101
objectReference: {fileID: 0}
- target: {fileID: 1278657786741136949, guid: a7a84068b5a10554195ba5c9f189d30c, type: 3}
propertyPath: m_LocalRotation.w
@@ -7725,7 +7830,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
version: 1073741824
data:
- dataString: UEsDBBQAAAgIAABAIezHKgB8ygIAAAcGAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVNtu4jAQ/RXk56VKuBTYt12gdB/aotJVH5Y+mHhCLIwd+VKgFf++Y8chKZWQEs7czpyZySfh0pSQWaUXmrMHxYD87BD/Tn50GuM9HOlWyRX/gNrnlTNbeCcafJ6p5Qrx1IcZtQerefZLboV3ThB0kudK7+dsC1NlrEE4p8IAmrSyPloi9Nkhxxhwis8P/+yc8S0DaUE3Xt00uUmS/ng86F/5pzej3ihJbwfDEOhkJui+BOYbaOIHaQyrvCR2Fh28IVNCcBNpEXsqQ9tTWhqHTaED4xTbDISSmyECBfBtYS9/Lwme8tyAjfQ0Pc24RsWqzOS3qmTcU7OrqL1T4XytXjIZpcNe4Falfvjm002DOddqf19XTxNfxxY82z3TU0aNbWndhmdNA2lQ6UDFjm4EvBYgH9VCKycZGq12PtQZ6M1aqS79TQvIdo1fxbUGa29Xfh9v2oz3HCQ4riyU942Mgwb9a8CshApTiIW8JSITnxI0TvAPNhS2ycRCiHqSGP9Ct+21i4Y7ro1FU+QTUe+7xDEBA5lBFL7rHaSnt1FO+1xkHrh6NZydKi0hwJFgCZIKe1piRnu9B1e2Fq8ryx31FxjZRVt9WFchAW78k+TKtFSHy7Q1brEJq12//XvzQzCFOjyAKZ6cFVy21PaGRxR4qqSs1rctZh22cjqnWSvMwtE6DTNqaaiGdHDDWDsUtQwR0gnhlzk0EBhhA/735vUtKNYVASaPSoYT/PIM9LeOs68nQgaQjBnrJYPeZshGbNwdb/Lb3iSjyaC/6d/mExJuiEuUm4plpVecEm6XbHqReC/197Gz0LQMl8s0PSz4x161Js9lrlaZBpBPVYZLs6CxCH5l2JxxbHMF1nIZ9pJ8rolQ2Q7Y+pJoHYSdH62m6ybLmpT8XVmPrMk0fBXXxMOXk8TVfedw8MW/JAOBowP2wgXsaelNyZmc/wNQSwMEFAAACAgAAEAh7GzWSDdsAAAAdwAAAAkAJABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQGrVipLLSrOzM9TslIw1TPRM9VRUEovSizIKAYKGII4pZkpIHa0kkmqgUVKipGBiVGSaYp5ioWuRVKamZFlcqKBiXGSsVmapVIsUH1JZUGqX2JuKkRPQGJJRlpmXkpmXrqee1FmijvIaKXYWgBQSwECLQAUAAAICAAAQCHsxyoAfMoCAAAHBgAACwAkAAAAAAAAAAAAAAAAAAAAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwECLQAUAAAICAAAQCHsbNZIN2wAAAB3AAAACQAkAAAAAAAAAAAAAAAXAwAAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsFBgAAAAACAAIAuAAAAM4DAAAAAA==
+ dataString: UEsDBBQAAAgIAABAIexpzfRR0QIAAAsGAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFtVE1v4jAQ/SvI5wUlAVqyt12gdA9tUemqh6UHE0+IhbEj2ynQiv++Y8chKbsSEsmbrzdvZvJJuDQlZFbphebsQTEg33vEPZNvvdZ4D0e6VXLFP6DxeeXMFs6Jep9narlCPHZhRu3Bap79kFvhnCMEK8lzpfdztoWpMtYgnFNhAE1aWRctEfrskWMIOLls8SAaRekEXz8c3DvjUwbSgm6d++lgnN7EURKCouA9HIyHaTocJj6qkpmg+xKYa6INHsUhauS9JHYXHJwhU0JwE6gReyp961NamgobQwfGKbbq2USDMQIF8G1hL6+XBE95bsAGdpqeZlyjanVm8lPVUu6p2dXU3qmoXK0kSm/jcd1BnfrhH59+7M25Vvv7pnocuTq24NnumZ4yamxH7y48axuIvUoHKnZ0I+C1APmoFlpVkqHR6sqFVgaSWSfVpb9pAdmu9au5NmDjXZX/GXE727OX4LiyUN63Mo5a9LcBsxLKTyEUcpaApC4laJzgL2zIb5QJhRB1JDH+hW67qxcMd1wbi6bAJ6DOd4ljAgYygyB83zlIR2+jKu1ykbnn6tSo7FRpCR4OBEuQVNjTEjPa6z24snV4XVnuqLvCwC7YmuO6CvFw6x9FV6alOlymrXGLjV/t5unPmxuCKdThAUzxVFnBZUdtZ3hEgadKynp9u2I2YatK5zTrhFk42krDjFrqqyEd3DDWDUUtfYSshHDL7BvwjLAB93tz+hYU6woPk0cl/Ql++ff0txVnX0+EjCCaMJZEo2QzZrds0p9s8pskzWg0Gm6GN3lK/A1xiXJTsaz1ClPC7ZJtLxLvpflG9haalv5ymaaHBf/Yq87kuczVKtMA8qnOcGkWNBbBrwybM45trsBaLv1eks81ESrbAVtfEq29sPOj1XTdZlmTkr8r65A1mfpP4po4+HKSuLrvHA6u+JdkIHB0wF64gD0tnSk6k/NfUEsDBBQAAAgIAABAIexs1kg3bAAAAHcAAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNUz0TPVUVBKL0osyCgGChiCOKWZKSB2tJJJqoFFSoqRgYlRkmmKeYqFrkVSmpmRZXKigYlxkrFZmqVSLFB9SWVBql9ibipET0BiSUZaZl5KZl66nntRZoo7yGil2FoAUEsBAi0AFAAACAgAAEAh7GnN9FHRAgAACwYAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEAh7GzWSDdsAAAAdwAAAAkAJAAAAAAAAAAAAAAAHgMAAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAAAgACALgAAADVAwAAAAA=
file_cachedStartup: {fileID: 0}
cacheStartup: 0
showNavGraphs: 1
@@ -11535,111 +11640,6 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
---- !u!1 &904798701
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 904798702}
- - component: {fileID: 904798705}
- - component: {fileID: 904798704}
- - component: {fileID: 904798703}
- m_Layer: 21
- m_Name: wall (2)
- m_TagString: Wall
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &904798702
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 904798701}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -4.8154, y: -0, z: -0.015}
- m_LocalScale: {x: 6.831474, y: 1, z: 0.5547}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1657300549}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!65 &904798703
-BoxCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 904798701}
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_IsTrigger: 0
- m_ProvidesContacts: 0
- m_Enabled: 1
- serializedVersion: 3
- m_Size: {x: 1, y: 1, z: 1}
- m_Center: {x: 0, y: 0, z: 0}
---- !u!23 &904798704
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 904798701}
- m_Enabled: 0
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 2
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &904798705
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 904798701}
- m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &905117436
GameObject:
m_ObjectHideFlags: 0
@@ -12301,7 +12301,7 @@ Transform:
m_GameObject: {fileID: 939601574}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 6.61, y: 0, z: -1.75}
+ m_LocalPosition: {x: 7.12, y: 0, z: -2.92}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -13109,7 +13109,7 @@ Transform:
m_GameObject: {fileID: 996034926}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -8.1, y: 0, z: -0.91}
+ m_LocalPosition: {x: -4.79, y: 0, z: -1.04}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -14231,7 +14231,7 @@ Transform:
m_GameObject: {fileID: 1074567468}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -12.42, y: 0, z: 0.27}
+ m_LocalPosition: {x: -4.49, y: 0, z: -0.09}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -14267,7 +14267,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3089698615847714298, guid: 508f9bf5c3e46e544a3404669ee014c9, type: 3}
propertyPath: m_LocalPosition.x
- value: 2.228
+ value: 1.982
objectReference: {fileID: 0}
- target: {fileID: 3089698615847714298, guid: 508f9bf5c3e46e544a3404669ee014c9, type: 3}
propertyPath: m_LocalPosition.y
@@ -14275,7 +14275,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3089698615847714298, guid: 508f9bf5c3e46e544a3404669ee014c9, type: 3}
propertyPath: m_LocalPosition.z
- value: 0.764
+ value: 0.265
objectReference: {fileID: 0}
- target: {fileID: 3089698615847714298, guid: 508f9bf5c3e46e544a3404669ee014c9, type: 3}
propertyPath: m_LocalRotation.w
@@ -16158,111 +16158,6 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
---- !u!1 &1159449459
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1159449460}
- - component: {fileID: 1159449463}
- - component: {fileID: 1159449462}
- - component: {fileID: 1159449461}
- m_Layer: 21
- m_Name: wall (1)
- m_TagString: Wall
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1159449460
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1159449459}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -1.47, y: -0, z: -0.285}
- m_LocalScale: {x: 9.776007, y: 1, z: 0.5547}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1657300549}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!65 &1159449461
-BoxCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1159449459}
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_IsTrigger: 0
- m_ProvidesContacts: 0
- m_Enabled: 1
- serializedVersion: 3
- m_Size: {x: 1, y: 1, z: 1}
- m_Center: {x: 0, y: 0, z: 0}
---- !u!23 &1159449462
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1159449459}
- m_Enabled: 0
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 2
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &1159449463
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1159449459}
- m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1179459843
GameObject:
m_ObjectHideFlags: 0
@@ -16540,7 +16435,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 5453642231650818711, guid: 8ceff4ed7638f374e8d594e14b9ce101, type: 3}
propertyPath: m_LocalPosition.x
- value: -1.46
+ value: -1.53
objectReference: {fileID: 0}
- target: {fileID: 5453642231650818711, guid: 8ceff4ed7638f374e8d594e14b9ce101, type: 3}
propertyPath: m_LocalPosition.y
@@ -16548,11 +16443,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5453642231650818711, guid: 8ceff4ed7638f374e8d594e14b9ce101, type: 3}
propertyPath: m_LocalPosition.z
- value: 3.19
+ value: 2.86
objectReference: {fileID: 0}
- target: {fileID: 5453642231650818711, guid: 8ceff4ed7638f374e8d594e14b9ce101, type: 3}
propertyPath: m_LocalRotation.w
- value: 1
+ value: 0.995065
objectReference: {fileID: 0}
- target: {fileID: 5453642231650818711, guid: 8ceff4ed7638f374e8d594e14b9ce101, type: 3}
propertyPath: m_LocalRotation.x
@@ -16560,7 +16455,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5453642231650818711, guid: 8ceff4ed7638f374e8d594e14b9ce101, type: 3}
propertyPath: m_LocalRotation.y
- value: -0
+ value: 0.09922613
objectReference: {fileID: 0}
- target: {fileID: 5453642231650818711, guid: 8ceff4ed7638f374e8d594e14b9ce101, type: 3}
propertyPath: m_LocalRotation.z
@@ -16572,7 +16467,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5453642231650818711, guid: 8ceff4ed7638f374e8d594e14b9ce101, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 0
+ value: 11.389
objectReference: {fileID: 0}
- target: {fileID: 5453642231650818711, guid: 8ceff4ed7638f374e8d594e14b9ce101, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
@@ -16619,13 +16514,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1204834577}
serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+ m_LocalRotation: {x: -0, y: 0.7428431, z: -0, w: 0.66946566}
m_LocalPosition: {x: -6.1, y: 0, z: -0.05}
m_LocalScale: {x: 9.776007, y: 1, z: 0.2593}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1657300549}
- m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 95.948, z: 0}
--- !u!65 &1204834579
BoxCollider:
m_ObjectHideFlags: 0
@@ -16810,7 +16705,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1794610959263681679, guid: ae0326fbcbd3aad43b68000909884e36, type: 3}
propertyPath: m_LocalPosition.x
- value: 12.3
+ value: 9.05
objectReference: {fileID: 0}
- target: {fileID: 1794610959263681679, guid: ae0326fbcbd3aad43b68000909884e36, type: 3}
propertyPath: m_LocalPosition.y
@@ -16818,7 +16713,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1794610959263681679, guid: ae0326fbcbd3aad43b68000909884e36, type: 3}
propertyPath: m_LocalPosition.z
- value: 1.59
+ value: -0.07
objectReference: {fileID: 0}
- target: {fileID: 1794610959263681679, guid: ae0326fbcbd3aad43b68000909884e36, type: 3}
propertyPath: m_LocalRotation.w
@@ -18178,13 +18073,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1437568239}
serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
- m_LocalPosition: {x: 2.16, y: 0, z: -0.05}
+ m_LocalRotation: {x: -0, y: 0.7842993, z: -0, w: 0.62038255}
+ m_LocalPosition: {x: 2.259, y: 0, z: -0.053}
m_LocalScale: {x: 9.776007, y: 1, z: 0.4891}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1657300549}
- m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 103.312, z: 0}
--- !u!65 &1437568241
BoxCollider:
m_ObjectHideFlags: 0
@@ -18266,7 +18161,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1197163409674756043, guid: 0428e950fd808a24d86511976e7c63f8, type: 3}
propertyPath: m_LocalPosition.x
- value: -29.53
+ value: -28.1
objectReference: {fileID: 0}
- target: {fileID: 1197163409674756043, guid: 0428e950fd808a24d86511976e7c63f8, type: 3}
propertyPath: m_LocalPosition.y
@@ -18274,7 +18169,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1197163409674756043, guid: 0428e950fd808a24d86511976e7c63f8, type: 3}
propertyPath: m_LocalPosition.z
- value: 2.48
+ value: 6.23
objectReference: {fileID: 0}
- target: {fileID: 1197163409674756043, guid: 0428e950fd808a24d86511976e7c63f8, type: 3}
propertyPath: m_LocalRotation.w
@@ -19579,7 +19474,7 @@ Transform:
m_GameObject: {fileID: 1612419517}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -15.57, y: 0, z: -2.06}
+ m_LocalPosition: {x: -9.58, y: 0, z: -0.31}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -20143,8 +20038,7 @@ Transform:
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 258394719}
- - {fileID: 1159449460}
- - {fileID: 904798702}
+ - {fileID: 254633364}
- {fileID: 1204834578}
- {fileID: 1437568240}
- {fileID: 1768932201}
@@ -21674,15 +21568,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2406068065512559259, guid: 90d1538cd2153d744895bb5754a9c019, type: 3}
propertyPath: m_LocalPosition.x
- value: -5.94
+ value: -5.695
objectReference: {fileID: 0}
- target: {fileID: 2406068065512559259, guid: 90d1538cd2153d744895bb5754a9c019, type: 3}
propertyPath: m_LocalPosition.y
- value: -0
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2406068065512559259, guid: 90d1538cd2153d744895bb5754a9c019, type: 3}
propertyPath: m_LocalPosition.z
- value: 0.753
+ value: 1.616
objectReference: {fileID: 0}
- target: {fileID: 2406068065512559259, guid: 90d1538cd2153d744895bb5754a9c019, type: 3}
propertyPath: m_LocalRotation.w
@@ -23838,6 +23732,67 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1884147466
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 929060893691511981, guid: be5cd1f0d4f38884daaac5a9ceea805d, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7925568034942697112, guid: be5cd1f0d4f38884daaac5a9ceea805d, type: 3}
+ propertyPath: m_Name
+ value: "\u5B9A\u897F\u5E02\u5B89\u5B9A\u533A\u4E07\u8FBE\u5E7F\u573A (\u65B0)"
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: be5cd1f0d4f38884daaac5a9ceea805d, type: 3}
--- !u!1 &1893426886
GameObject:
m_ObjectHideFlags: 0
@@ -25289,7 +25244,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3119183276359661904, guid: f1be31cc45a57c346b1092b29dccccba, type: 3}
propertyPath: m_LocalPosition.x
- value: 2.17
+ value: 1.98
objectReference: {fileID: 0}
- target: {fileID: 3119183276359661904, guid: f1be31cc45a57c346b1092b29dccccba, type: 3}
propertyPath: m_LocalPosition.y
@@ -25297,7 +25252,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3119183276359661904, guid: f1be31cc45a57c346b1092b29dccccba, type: 3}
propertyPath: m_LocalPosition.z
- value: -0.22
+ value: -0.136
objectReference: {fileID: 0}
- target: {fileID: 3119183276359661904, guid: f1be31cc45a57c346b1092b29dccccba, type: 3}
propertyPath: m_LocalRotation.w
@@ -26703,3 +26658,4 @@ SceneRoots:
- {fileID: 727780346}
- {fileID: 2110442825}
- {fileID: 1078064563}
+ - {fileID: 1884147466}
diff --git a/Assets/_FutureMen2/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity b/Assets/_FutureMen2/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity
index 835ab278..d78b3d60 100644
--- a/Assets/_FutureMen2/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity
+++ b/Assets/_FutureMen2/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity
@@ -1716,7 +1716,7 @@ GameObject:
- component: {fileID: 258394722}
- component: {fileID: 258394721}
- component: {fileID: 258394720}
- m_Layer: 8
+ m_Layer: 21
m_Name: wall
m_TagString: Wall
m_Icon: {fileID: 0}
@@ -2680,7 +2680,7 @@ GameObject:
- component: {fileID: 345606888}
- component: {fileID: 345606887}
- component: {fileID: 345606886}
- m_Layer: 8
+ m_Layer: 21
m_Name: wall
m_TagString: Wall
m_Icon: {fileID: 0}
@@ -16389,7 +16389,7 @@ GameObject:
- component: {fileID: 1204834581}
- component: {fileID: 1204834580}
- component: {fileID: 1204834579}
- m_Layer: 8
+ m_Layer: 21
m_Name: wall
m_TagString: Wall
m_Icon: {fileID: 0}
@@ -17948,7 +17948,7 @@ GameObject:
- component: {fileID: 1437568243}
- component: {fileID: 1437568242}
- component: {fileID: 1437568241}
- m_Layer: 8
+ m_Layer: 21
m_Name: wall
m_TagString: Wall
m_Icon: {fileID: 0}
diff --git a/Assets/_FutureMen2/Scenes/Nanjing_Pukou_Longhutianjie.unity b/Assets/_FutureMen2/Scenes/Nanjing_Pukou_Longhutianjie.unity
index 9e1db7fa..2c2fe34d 100644
--- a/Assets/_FutureMen2/Scenes/Nanjing_Pukou_Longhutianjie.unity
+++ b/Assets/_FutureMen2/Scenes/Nanjing_Pukou_Longhutianjie.unity
@@ -744,6 +744,10 @@ PrefabInstance:
propertyPath: m_Name
value: "\u6D66\u53E3\u9F99\u6E56\u5929\u8857"
objectReference: {fileID: 0}
+ - target: {fileID: 7493155681200699418, guid: abb252804fe801f49b0165e1a5eeb65a, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 7833688058533421728, guid: abb252804fe801f49b0165e1a5eeb65a, type: 3}
propertyPath: m_LocalPosition.x
value: -0
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index ceef1bea..d602f868 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -11,6 +11,12 @@ EditorBuildSettings:
- enabled: 0
path: Assets/_FutureMen2/Scenes/Gansu_Dingxi_Anding_WandaGuangchang.unity
guid: 1527494fda4b834449c95c5778eab24d
+ - enabled: 0
+ path: Assets/_FutureMen2/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity
+ guid: c94ce830222b3574baee4ca0bc148d71
+ - enabled: 1
+ path: Assets/_FutureMen2/Scenes/Nanjing_Pukou_Longhutianjie.unity
+ guid: 588881595f76e994a8b7c61d3655ad33
m_configObjects:
Unity.XR.PXR.Settings: {fileID: 11400000, guid: 394d00ed08bdcde4c96c9952ff9a20ce, type: 2}
com.unity.xr.openxr.settings4: {fileID: 11400000, guid: 7d54fe958ff70274898aedb4739d2f73, type: 2}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index a2932472..584f3fb5 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -162,7 +162,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
- Android: com.pineappletech.xmen2.gansudingxiandingwandaguangchang
+ Android: com.pineappletech.xmen2.nanjingpukoulonghutianjie
Standalone: com.PineappleGame.---------------2------
buildNumber:
Standalone: 0