Merge remote-tracking branch 'origin/L-jiahuan' into main_ZYT

# Conflicts:
#	Assets/_Zombie/Scenes/Zhejiang_Hangzhou_Linping_Yintaicheng.unity
This commit is contained in:
ZYT
2025-09-30 16:26:00 +08:00
6 changed files with 413 additions and 21483 deletions

View File

@ -0,0 +1,201 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3133070423855331140
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7081584841205300155}
- component: {fileID: 6225132936236783411}
- component: {fileID: 817212975262513389}
m_Layer: 0
m_Name: "\u5BF9\u8C61001"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7081584841205300155
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3133070423855331140}
serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
m_LocalPosition: {x: -37.87267, y: 0, z: -39.30687}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4032537127673060268}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &6225132936236783411
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3133070423855331140}
m_Mesh: {fileID: 2112626415416172861, guid: 02ce7b261d015ab49ba97a42b6305f41, type: 3}
--- !u!23 &817212975262513389
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3133070423855331140}
m_Enabled: 1
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: -1077071695996795592, guid: 02ce7b261d015ab49ba97a42b6305f41, type: 3}
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!1 &6359572468577475881
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2377120381545997947}
- component: {fileID: 3394665484643665370}
- component: {fileID: 1049384112787637981}
m_Layer: 0
m_Name: Line002
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2377120381545997947
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6359572468577475881}
serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
m_LocalPosition: {x: -37.87267, y: 0, z: -39.30687}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4032537127673060268}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &3394665484643665370
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6359572468577475881}
m_Mesh: {fileID: 849032210722914114, guid: 02ce7b261d015ab49ba97a42b6305f41, type: 3}
--- !u!23 &1049384112787637981
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6359572468577475881}
m_Enabled: 1
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: 6425743629740809062, guid: 02ce7b261d015ab49ba97a42b6305f41, type: 3}
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!1 &8968122079600492246
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4032537127673060268}
m_Layer: 0
m_Name: "\u4E4C\u5170\u6D69\u7279\u6B27\u4E9A\u5730\u5F629.30"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4032537127673060268
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8968122079600492246}
serializedVersion: 2
m_LocalRotation: {x: 0, y: -1, z: 0, w: 0}
m_LocalPosition: {x: -39.215538, y: -0.00007081032, z: -33.044495}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2377120381545997947}
- {fileID: 7081584841205300155}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0}

View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 736e70df4955ee340a5f8502762c3607
DefaultImporter:
guid: d835c23e846f4754aa4ebe184ccd75a8
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:

View File

@ -149,7 +149,7 @@ Transform:
m_GameObject: {fileID: 13194462}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.84, y: 0, z: -1.92}
m_LocalPosition: {x: -0.26, y: 0, z: -0.17}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -2123,6 +2123,79 @@ MonoBehaviour:
soundPlayedCustomEvent:
willCleanUpDelegatesAfterStop: 1
frames: 178
--- !u!1001 &302251910
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8,
type: 3}
propertyPath: m_LocalPosition.x
value: -39.215538
objectReference: {fileID: 0}
- target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.00007081032
objectReference: {fileID: 0}
- target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8,
type: 3}
propertyPath: m_LocalPosition.z
value: -33.044495
objectReference: {fileID: 0}
- target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8,
type: 3}
propertyPath: m_LocalRotation.y
value: -1
objectReference: {fileID: 0}
- target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -180
objectReference: {fileID: 0}
- target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8968122079600492246, guid: d835c23e846f4754aa4ebe184ccd75a8,
type: 3}
propertyPath: m_Name
value: "\u4E4C\u5170\u6D69\u7279\u6B27\u4E9A\u5730\u5F629.30"
objectReference: {fileID: 0}
- target: {fileID: 8968122079600492246, guid: d835c23e846f4754aa4ebe184ccd75a8,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d835c23e846f4754aa4ebe184ccd75a8, type: 3}
--- !u!1 &321927068
GameObject:
m_ObjectHideFlags: 0
@ -6954,6 +7027,16 @@ PrefabInstance:
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7768860374615923972, guid: 3838fe0104ea0a549a9ea8232903df26,
type: 3}
propertyPath: m_LocalPosition.x
value: -15.56
objectReference: {fileID: 0}
- target: {fileID: 7768860374615923972, guid: 3838fe0104ea0a549a9ea8232903df26,
type: 3}
propertyPath: m_LocalPosition.z
value: 21.22
objectReference: {fileID: 0}
- target: {fileID: 7773178187796093907, guid: 3838fe0104ea0a549a9ea8232903df26,
type: 3}
propertyPath: m_Layer
@ -7234,6 +7317,16 @@ PrefabInstance:
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 9145490238753664937, guid: 3838fe0104ea0a549a9ea8232903df26,
type: 3}
propertyPath: m_LocalPosition.x
value: -20.84
objectReference: {fileID: 0}
- target: {fileID: 9145490238753664937, guid: 3838fe0104ea0a549a9ea8232903df26,
type: 3}
propertyPath: m_LocalPosition.z
value: 24.07
objectReference: {fileID: 0}
- target: {fileID: 9152273766735539119, guid: 3838fe0104ea0a549a9ea8232903df26,
type: 3}
propertyPath: m_Layer
@ -7270,6 +7363,11 @@ PrefabInstance:
- {fileID: 7597583827923288767, guid: 3838fe0104ea0a549a9ea8232903df26, type: 3}
- {fileID: 6602700830941984027, guid: 3838fe0104ea0a549a9ea8232903df26, type: 3}
- {fileID: 8622101372974227570, guid: 3838fe0104ea0a549a9ea8232903df26, type: 3}
- {fileID: 5939552800284622571, guid: 3838fe0104ea0a549a9ea8232903df26, type: 3}
- {fileID: 6815175465877200201, guid: 3838fe0104ea0a549a9ea8232903df26, type: 3}
- {fileID: 5089381733612888711, guid: 3838fe0104ea0a549a9ea8232903df26, type: 3}
- {fileID: 1929140809830986701, guid: 3838fe0104ea0a549a9ea8232903df26, type: 3}
- {fileID: 2234590823351868015, guid: 3838fe0104ea0a549a9ea8232903df26, type: 3}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3838fe0104ea0a549a9ea8232903df26, type: 3}
@ -8604,7 +8702,7 @@ MonoBehaviour:
IncludeChildColliders: 0
RuntimeFollower: {fileID: 0}
colliderMaxDistance: 100
lastTimeMaxDistanceCalced: 638938166436817113
lastTimeMaxDistanceCalced: 638948457826967515
--- !u!1 &679496949
GameObject:
m_ObjectHideFlags: 0
@ -20556,79 +20654,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2067685221}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &2104895093
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8132434717407719304, guid: d2720925ee4ca364da604a4a512c5248,
type: 3}
propertyPath: m_Name
value: "\u4E4C\u5170\u6D69\u7279\u6B27\u4E9A\u5730\u5F62"
objectReference: {fileID: 0}
- target: {fileID: 8132434717407719304, guid: d2720925ee4ca364da604a4a512c5248,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9164534718847489468, guid: d2720925ee4ca364da604a4a512c5248,
type: 3}
propertyPath: m_LocalPosition.x
value: 33.3
objectReference: {fileID: 0}
- target: {fileID: 9164534718847489468, guid: d2720925ee4ca364da604a4a512c5248,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9164534718847489468, guid: d2720925ee4ca364da604a4a512c5248,
type: 3}
propertyPath: m_LocalPosition.z
value: 34
objectReference: {fileID: 0}
- target: {fileID: 9164534718847489468, guid: d2720925ee4ca364da604a4a512c5248,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9164534718847489468, guid: d2720925ee4ca364da604a4a512c5248,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9164534718847489468, guid: d2720925ee4ca364da604a4a512c5248,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9164534718847489468, guid: d2720925ee4ca364da604a4a512c5248,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9164534718847489468, guid: d2720925ee4ca364da604a4a512c5248,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9164534718847489468, guid: d2720925ee4ca364da604a4a512c5248,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9164534718847489468, guid: d2720925ee4ca364da604a4a512c5248,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d2720925ee4ca364da604a4a512c5248, type: 3}
--- !u!1 &2110827879
GameObject:
m_ObjectHideFlags: 0
@ -21180,5 +21205,5 @@ SceneRoots:
- {fileID: 370075175}
- {fileID: 1611275467}
- {fileID: 1055672620}
- {fileID: 2104895093}
- {fileID: 616684385}
- {fileID: 302251910}

Binary file not shown.

View File

@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: 02ce7b261d015ab49ba97a42b6305f41
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant: