PineappleTech/Zombie
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main_ZYT'

Browse Source 
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
This commit is contained in:
bzx
2025-08-30 19:59:26 +08:00
parent b926717db2 9c80c426db
commit a299697363
2 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Assets/_Zombie/Scenes/Hunan_Jishou_Qianzhou_Tianhong.unity
View File

@@ -218,7 +218,7 @@ PrefabInstance:
- target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.7
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
@@ -271,6 +271,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 3646196}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3646198 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
m_PrefabInstance: {fileID: 3646196}
m_PrefabAsset: {fileID: 0}
--- !u!1 &23765528
GameObject:
m_ObjectHideFlags: 0
@@ -2697,7 +2703,7 @@ Transform:
m_GameObject: {fileID: 370075174}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.906825, y: -1.5108736, z: 6.832659}
m_LocalPosition: {x: -1.906825, y: 0, z: 6.832659}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -6582,7 +6588,7 @@ MonoBehaviour:
IncludeChildColliders: 0
RuntimeFollower: {fileID: 0}
colliderMaxDistance: 100
lastTimeMaxDistanceCalced: 638921698016177045
lastTimeMaxDistanceCalced: 638921765283094395
--- !u!1 &679496949
GameObject:
m_ObjectHideFlags: 0
@@ -12502,6 +12508,11 @@ MonoBehaviour:
- {fileID: 1134898388}
- {fileID: 450657585}
doorPos: {fileID: 1128989868}
wu:
- {fileID: 1780781159}
- {fileID: 3646198}
- {fileID: 1584984357}
- {fileID: 1821262838}
--- !u!1 &1292553882
GameObject:
m_ObjectHideFlags: 0
@@ -14231,6 +14242,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8198207478962880744, guid: 3b74860d97b10a24e9a5d99e21379c72,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8210137722427109325, guid: 3b74860d97b10a24e9a5d99e21379c72,
type: 3}
propertyPath: m_Layer
@@ -14957,7 +14973,7 @@ PrefabInstance:
- target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.7
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
@@ -15010,6 +15026,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1584984355}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1584984357 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
m_PrefabInstance: {fileID: 1584984355}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1592170539
GameObject:
m_ObjectHideFlags: 0
@@ -16663,7 +16685,7 @@ PrefabInstance:
- target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.7
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
@@ -16716,6 +16738,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1780781157}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1780781159 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
m_PrefabInstance: {fileID: 1780781157}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1787188875
GameObject:
m_ObjectHideFlags: 0
@@ -17466,7 +17494,7 @@ PrefabInstance:
- target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.7
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
@@ -17519,6 +17547,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1821262836}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1821262838 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
m_PrefabInstance: {fileID: 1821262836}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1845709050
GameObject:
m_ObjectHideFlags: 0

8
ProjectSettings/EditorBuildSettings.asset
View File

@@ -12,11 +12,11 @@ EditorBuildSettings:
path: Assets/_Zombie/Scenes/Zhejiang_Shaoxing_Shengzhou_Wuyueguangchang.unity
guid: df8c4c84bf9690442a51ed602038e198
- enabled: 0
path: Assets/_Zombie/Scenes/Shandong_Jining_Shangchang_nei.unity
guid: c58727a975cdcca41b42f70a2fc91ab1
path: Assets/_Zombie/Scenes/Anhui_Wuhu_Guanwei.unity
guid: 7ea2631ade6db9644a2fed780a53099a
- enabled: 1
path: Assets/_Zombie/Scenes/Shandong_Jining_Shangchang.unity
guid: 774ba51685c4dca4484fd78833301ede
path: Assets/_Zombie/Scenes/Hunan_Jishou_Qianzhou_Tianhong.unity
guid: ec7cacc9f19fc2f4685128b564c49ba3
m_configObjects:
Unity.XR.PXR.Settings: {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2,
type: 2}