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
This commit is contained in:
bzx
2025-08-30 19:38:26 +08:00
parent 2a787883ac 0fe214afac
commit fd2ab9dbf6
2 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Assets/_Zombie/Scenes/Anhui_Wuhu_Guanwei.unity
View File

@ -2693,6 +2693,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1622691998534612641, guid: 5c9931fbd41b76e4790021aaa5188fac,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1688188236995220107, guid: 5c9931fbd41b76e4790021aaa5188fac,
type: 3}
propertyPath: m_Layer
@ -3728,7 +3733,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:
@ -6158,7 +6163,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}
@ -6211,6 +6216,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 582171426}
m_PrefabAsset: {fileID: 0}
--- !u!1 &582171428 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
m_PrefabInstance: {fileID: 582171426}
m_PrefabAsset: {fileID: 0}
--- !u!1 &596881789
GameObject:
m_ObjectHideFlags: 0
@ -7902,7 +7913,7 @@ MonoBehaviour:
IncludeChildColliders: 0
RuntimeFollower: {fileID: 0}
colliderMaxDistance: 100
lastTimeMaxDistanceCalced: 638921714183007437
lastTimeMaxDistanceCalced: 638921751985608298
--- !u!1 &679496949
GameObject:
m_ObjectHideFlags: 0
@ -7969,7 +7980,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}
@ -8022,6 +8033,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 704269622}
m_PrefabAsset: {fileID: 0}
--- !u!1 &704269624 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
m_PrefabInstance: {fileID: 704269622}
m_PrefabAsset: {fileID: 0}
--- !u!1 &720035100
GameObject:
m_ObjectHideFlags: 0
@ -13896,6 +13913,11 @@ MonoBehaviour:
- {fileID: 1134898388}
- {fileID: 450657585}
doorPos: {fileID: 1128989868}
wu:
- {fileID: 1577191284}
- {fileID: 704269624}
- {fileID: 582171428}
- {fileID: 1571565997}
--- !u!1 &1292553882
GameObject:
m_ObjectHideFlags: 0
@ -15210,7 +15232,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}
@ -15263,6 +15285,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1571565995}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1571565997 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
m_PrefabInstance: {fileID: 1571565995}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1572885369
GameObject:
m_ObjectHideFlags: 0
@ -15494,12 +15522,12 @@ 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}
propertyPath: m_LocalPosition.z
value: 0
value: -2.31
objectReference: {fileID: 0}
- target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
@ -15547,6 +15575,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1577191282}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1577191284 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
m_PrefabInstance: {fileID: 1577191282}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1592170539
GameObject:
m_ObjectHideFlags: 0

2
ProjectSettings/ProjectSettings.asset
View File

@ -165,7 +165,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
Android: com.pineappletech.zombie.gongsi1lou
Android: com.pineappletech.zombie.anhuiwuhuguanwei
Standalone: com.DefaultCompany.com.unity.template.ar
buildNumber:
Standalone: 0