Merge remote-tracking branch 'origin/main_ZYT'

2025-08-30 16:22:45 +08:00
parent e506d0d625 9a599f059b
commit 5949cb138e
22 changed files with 118929 additions and 43 deletions
--- a/Assets/DC/浙江绍兴嵊州.meta
+++ b/Assets/DC/浙江绍兴嵊州.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d00f9da54fe0c6545bda4ee8bec7dfb0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/DC/浙江绍兴嵊州/僵尸_绍兴嵊州市.prefab
+++ b/Assets/DC/浙江绍兴嵊州/僵尸_绍兴嵊州市.prefab
--- a/Assets/DC/浙江绍兴嵊州/僵尸_绍兴嵊州市.prefab.meta
+++ b/Assets/DC/浙江绍兴嵊州/僵尸_绍兴嵊州市.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 76c46b2a8134dfd40a035877aaaa32de
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/DC/浙江绍兴嵊州/绍兴嵊州市地形.prefab
+++ b/Assets/DC/浙江绍兴嵊州/绍兴嵊州市地形.prefab
@ -0,0 +1,201 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &90447407957429846
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3953044043284487985}
+  m_Layer: 0
+  m_Name: "\u7ECD\u5174\u5D4A\u5DDE\u5E02\u5730\u5F62"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3953044043284487985
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 90447407957429846}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: -0.9999978, z: 0, w: 0.0021119374}
+  m_LocalPosition: {x: -5.27, y: 0, z: 1.32}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6085459737985803083}
+  - {fileID: 7420316340238350676}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: -179.758, z: 0}
+--- !u!1 &3507162499965051577
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7420316340238350676}
+  - component: {fileID: 8297756139494981833}
+  - component: {fileID: 7149421714478770240}
+  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 &7420316340238350676
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3507162499965051577}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -4.167794, y: -0.0000000028248204, z: -0.832097}
+  m_LocalScale: {x: 0.945135, y: 0.945135, z: 0.945135}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3953044043284487985}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &8297756139494981833
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3507162499965051577}
+  m_Mesh: {fileID: 2112626415416172861, guid: 0d688bad851716642bef03b872161296, type: 3}
+--- !u!23 &7149421714478770240
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3507162499965051577}
+  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: 2100000, guid: af2a8d8152d64d9489249aecd75275b4, 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!1 &8544242438586074432
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6085459737985803083}
+  - component: {fileID: 6237610470550370747}
+  - component: {fileID: 8321186638036459959}
+  m_Layer: 0
+  m_Name: Line001
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6085459737985803083
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8544242438586074432}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -4.167794, y: -0.0000000028248204, z: -0.832097}
+  m_LocalScale: {x: 0.945135, y: 0.945135, z: 0.945135}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3953044043284487985}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &6237610470550370747
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8544242438586074432}
+  m_Mesh: {fileID: -7553716758358721678, guid: 0d688bad851716642bef03b872161296, type: 3}
+--- !u!23 &8321186638036459959
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8544242438586074432}
+  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: 2100000, guid: af2a8d8152d64d9489249aecd75275b4, 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}
--- a/Assets/DC/浙江绍兴嵊州/绍兴嵊州市地形.prefab.meta
+++ b/Assets/DC/浙江绍兴嵊州/绍兴嵊州市地形.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: bd5bb05b679ac964f864c7233b064967
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Zombie/Scenes/Zhejiang_Shaoxing_Shengzhou_Wuyueguangchang.unity
+++ b/Assets/_Zombie/Scenes/Zhejiang_Shaoxing_Shengzhou_Wuyueguangchang.unity
--- a/Assets/_Zombie/Scenes/Zhejiang_Shaoxing_Shengzhou_Wuyueguangchang.unity.meta
+++ b/Assets/_Zombie/Scenes/Zhejiang_Shaoxing_Shengzhou_Wuyueguangchang.unity.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: df8c4c84bf9690442a51ed602038e198
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Zombie/Scripts/GameLocal.cs
+++ b/Assets/_Zombie/Scripts/GameLocal.cs
@ -21,6 +21,17 @@ public enum Place
    Shandong_Jining_Shangchang_nei = -9,
    Shandong_Langfang_QingzhouTaihuacheng = 10,
    Hubei_Xiangyang_Kejiguan=11,
+    Zhejiang_Shaoxing_Shengzhou_WuyueGuangchang = 12,
+    Hunan_Jishou_Qianzhou_Tianhong = 13,
+    Jilin_Tonghua_Liuhe = 14,
+    Shandong_Jinan_Huaiyin_ShengfutongShangmao = 15,
+    Shandong_Jinan_Huaiyin_ShengfutongShangmao_wai = -15,
+    Henan_Xinzheng_Shuanghudadao_Longhujinyicheng = 16,
+    Nanjing_Qixia_Yaohuamen_Jindiguangchang = 17,
+    Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei = -17,
+    Anhui_Suzhou_Yueshan_Guchengshangyejie = 18,
+    Gansu_Longnan_Shicheng_Dongsheng = 19,
+    Shandong_Heze_Yuncheng_Gefuli = 20,
 }

 public class GameLocal : MonoBehaviour
@ -96,17 +107,21 @@ public class GameLocal : MonoBehaviour
            //request.AddHeader("Authorization", Author);
            authInfo.deviceSn = GetSn();
            authInfo.startAt = ConvertTimestampToDateTime(GetTimestamp()) + "";
-            //authInfo.paid = 2;
-            //authInfo.uuid = GetSn() + GetTimestamp();
-            //authInfo.shop =17;
+        //authInfo.paid = 2;
+        //authInfo.uuid = GetSn() + GetTimestamp();
+        //authInfo.shop =17;
 #if !UNITY_EDITOR && UNITY_ANDROID && PICO
            authInfo.shop = (int)place;
            if (place == Place.Yangzhou_Hanjiang_Tansuozhongxin_wai)
                authInfo.shop = 5;
            if (place == Place.Shandong_Jining_Shangchang_nei)
                authInfo.shop = 9;
+            if (place == Place.Shandong_Jinan_Huaiyin_ShengfutongShangmao_wai)
+                authInfo.shop = 15;
+            if (place == Place.Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei)
+                authInfo.shop = 17;
 #endif
-            authInfo.gameId = 7;
+        authInfo.gameId = 7;
            string authJson = JsonUtility.ToJson(authInfo);
            Debug.Log("发送数据 -> " + authJson);
            request.RawData = System.Text.Encoding.UTF8.GetBytes(authJson);
--- a/Assets/sucai/Apocalyptic_World/Art/Materials/Flag_Lockdown.mat
+++ b/Assets/sucai/Apocalyptic_World/Art/Materials/Flag_Lockdown.mat
@ -46,7 +46,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _BaseMap:
-        m_Texture: {fileID: 2800000, guid: d35376172361af441ae5ceaae8e8380e, type: 3}
+        m_Texture: {fileID: 2800000, guid: 8a687a98f24896d4eb525d3f08d2bbd5, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _BumpMap:
@ -119,7 +119,7 @@ Material:
    - _Glossiness: 0.25
    - _GlossyReflections: 1
    - _LightingEnabled: 1
-    - _Metallic: 0.22
+    - _Metallic: 0.019
    - _Mode: 1
    - _OcclusionStrength: 1
    - _Parallax: 0.02
@ -137,10 +137,10 @@ Material:
    - _UVSec: 0
    - _ZWrite: 1
    m_Colors:
-    - _BaseColor: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1}
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
    - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
    - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
-    - _Color: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _Flip: {r: 1, g: 1, b: 1, a: 1}
--- a/Assets/sucai/Apocalyptic_World/Art/Textures/Your
+++ b/Assets/sucai/Apocalyptic_World/Art/Textures/Your
--- a/Assets/sucai/Apocalyptic_World/Art/Textures/Your
+++ b/Assets/sucai/Apocalyptic_World/Art/Textures/Your
@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 8a687a98f24896d4eb525d3f08d2bbd5
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/sucai/Better-Fog/Resources/Particles/Showcase/Materials/Particles/Dust.mat
+++ b/Assets/sucai/Better-Fog/Resources/Particles/Showcase/Materials/Particles/Dust.mat
@ -21,33 +21,24 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: Dust
-  m_Shader: {fileID: 4800000, guid: 6b3d13467631aae42ac32950866b2835, type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: ade0b32f7c0346e41885c2cf8f01efe0,
+    type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
  m_ValidKeywords:
-  - _EMISSION
-  - _FADING_ON
-  - _SOFTPARTICLES_ON
-  - _SURFACE_TYPE_TRANSPARENT
-  m_InvalidKeywords:
-  - _FLIPBOOKBLENDING_OFF
+  - _FLIP_BOOK_WITH_BLENDING
+  - _SOFT_PARTICLES
+  m_InvalidKeywords: []
  m_LightmapFlags: 0
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
-  stringTagMap:
-    RenderType: Transparent
-  disabledShaderPasses:
-  - DepthOnly
-  - SHADOWCASTER
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
-    - _BaseMap:
-        m_Texture: {fileID: 2800000, guid: c904f5c1f19e8fc42865cf6d70b4fcb6, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
    - _BumpMap:
        m_Texture: {fileID: 2800000, guid: ec0fffbfc1b9f9f4d82b1328a0fa87ab, type: 3}
        m_Scale: {x: 1, y: 1}
@ -102,11 +93,8 @@ Material:
        m_Offset: {x: 0, y: 0}
    m_Ints: []
    m_Floats:
-    - _AlphaClip: 0
-    - _AlphaToMask: 0
    - _BUILTIN_QueueControl: 0
    - _BUILTIN_QueueOffset: 0
-    - _Blend: 0
    - _BlendOp: 0
    - _BumpScale: 1
    - _CAMERA_FADING: 0
@ -115,7 +103,6 @@ Material:
    - _CameraNearFadeDistance: 1
    - _Camera_Depth_Fade_Offset: 0
    - _Camera_Depth_Fade_Range: 0
-    - _ColorMode: 0
    - _Cull: 2
    - _Cutoff: 0.5
    - _DetailNormalMapScale: 1
@ -124,10 +111,8 @@ Material:
    - _DistortionStrength: 1
    - _DistortionStrengthScaled: 0.1
    - _DstBlend: 10
-    - _DstBlendAlpha: 10
    - _EmissionEnabled: 0
    - _FLIP_BOOK_WITH_BLENDING: 1
-    - _FlipbookBlending: 0
    - _FlipbookMode: 1
    - _GlossMapScale: 1
    - _Glossiness: 0
@ -146,14 +131,10 @@ Material:
    - _SoftParticlesNearFadeDistance: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 5
-    - _SrcBlendAlpha: 1
-    - _Surface: 1
    - _Surface_Depth_Fade: 1.9
    - _UVSec: 0
    - _ZWrite: 0
    m_Colors:
-    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
-    - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
    - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0.3679245, g: 0.311658, b: 0.23429155, a: 1}
--- a/Assets/sucai/Materials/01
+++ b/Assets/sucai/Materials/01
@ -0,0 +1,139 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-4881343502787576288
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 01 - Defa32432423432ult
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  - _SURFACE_TYPE_TRANSPARENT
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses:
+  - DepthOnly
+  - SHADOWCASTER
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _DstBlendAlpha: 10
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0.14142135
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.14142135
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 1
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 0
+    m_Colors:
+    - _BaseColor: {r: 0.79073066, g: 0.79073066, b: 0.79073066, a: 0.3}
+    - _Color: {r: 0.79073066, g: 0.79073066, b: 0.79073066, a: 0.3}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
--- a/Defa32432423432ult.mat.meta
+++ b/Defa32432423432ult.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: af2a8d8152d64d9489249aecd75275b4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Effects/Textures/SmokePuff04Normal.tif
+++ b/Effects/Textures/SmokePuff04Normal.tif
--- a/Effects/Textures/SmokePuff04Normal.tif.meta
+++ b/Effects/Textures/SmokePuff04Normal.tif.meta
@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: ec0fffbfc1b9f9f4d82b1328a0fa87ab
+timeCreated: 1472826695
+licenseType: Store
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 1
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/sucai/僵尸/SK_UrbanZombie2.fbm/T_UrbanZombie2_Skin1_Body_Normal.png.meta
+++ b/Assets/sucai/僵尸/SK_UrbanZombie2.fbm/T_UrbanZombie2_Skin1_Body_Normal.png.meta
@ -7,7 +7,7 @@ TextureImporter:
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
    linearTexture: 0
    fadeOut: 0
    borderMipMap: 0
@ -54,7 +54,7 @@ TextureImporter:
  alphaUsage: 1
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
  textureShape: 1
  singleChannelComponent: 0
  flipbookRows: 1
--- a/Assets/sucai/僵尸/SK_UrbanZombie2.fbm/T_UrbanZombie2_Skin1_Cap_Normal.png.meta
+++ b/Assets/sucai/僵尸/SK_UrbanZombie2.fbm/T_UrbanZombie2_Skin1_Cap_Normal.png.meta
@ -7,7 +7,7 @@ TextureImporter:
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
    linearTexture: 0
    fadeOut: 0
    borderMipMap: 0
@ -54,7 +54,7 @@ TextureImporter:
  alphaUsage: 1
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
  textureShape: 1
  singleChannelComponent: 0
  flipbookRows: 1
--- a/Assets/sucai/僵尸/SK_UrbanZombie2.fbm/T_UrbanZombie2_Skin1_Cloth_Normal.png.meta
+++ b/Assets/sucai/僵尸/SK_UrbanZombie2.fbm/T_UrbanZombie2_Skin1_Cloth_Normal.png.meta
@ -7,7 +7,7 @@ TextureImporter:
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
    linearTexture: 0
    fadeOut: 0
    borderMipMap: 0
@ -54,7 +54,7 @@ TextureImporter:
  alphaUsage: 1
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
  textureShape: 1
  singleChannelComponent: 0
  flipbookRows: 1
--- a/Assets/sucai/绍兴嵊州市地形.FBX
+++ b/Assets/sucai/绍兴嵊州市地形.FBX
--- a/Assets/sucai/绍兴嵊州市地形.FBX.meta
+++ b/Assets/sucai/绍兴嵊州市地形.FBX.meta
@ -0,0 +1,109 @@
+fileFormatVersion: 2
+guid: 0d688bad851716642bef03b872161296
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 1
+    materialSearch: 1
+    materialLocation: 0
+  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: 
--- a/ProjectSettings/ShaderGraphSettings.asset
+++ b/ProjectSettings/ShaderGraphSettings.asset
@ -9,9 +9,9 @@ MonoBehaviour:
  m_GameObject: {fileID: 0}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 0}
+  m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3}
  m_Name: 
-  m_EditorClassIdentifier: Unity.ShaderGraph.Editor:UnityEditor.ShaderGraph:ShaderGraphProjectSettings
+  m_EditorClassIdentifier: 
  shaderVariantLimit: 2048
  customInterpolatorErrorThreshold: 32
  customInterpolatorWarningThreshold: 16