Merge remote-tracking branch 'origin/main_ZYT'

# Conflicts: # Assets/Plugins/Android/AndroidManifest.xml # ProjectSettings/EditorBuildSettings.asset # ProjectSettings/ProjectSettings.asset
2025-10-20 15:14:45 +08:00
parent da37270b63 188858c7f8
commit 8bbb954c15
18 changed files with 455586 additions and 306 deletions
--- 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: f957d875dcd6a5d45a1bd9d10c8376c6
+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 &4410441779922023144
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8254017899901908901}
+  m_Layer: 0
+  m_Name: "\u6E56\u5357\u7701\u8861\u9633\u5E02\u4E1C\u6D32\u5C9B\u65C5\u6E38\u666F\u70B9(\u7B2C\u4E8C\u573A\u573A\u5730\uFF09\u5730\u5F62"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8254017899901908901
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4410441779922023144}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: -0.66, y: 0, z: 3.2}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7532791733307075520}
+  - {fileID: 8069517385212424050}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+--- !u!1 &4542830012670033275
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8069517385212424050}
+  - component: {fileID: 2557136029053411674}
+  - component: {fileID: 295171634492260743}
+  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 &8069517385212424050
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4542830012670033275}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -0.020095633, y: 0, z: 0.4062454}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8254017899901908901}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &2557136029053411674
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4542830012670033275}
+  m_Mesh: {fileID: 2112626415416172861, guid: edcf6de876bdc364da476e529525f445, type: 3}
+--- !u!23 &295171634492260743
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4542830012670033275}
+  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: -7258330650309571861, guid: edcf6de876bdc364da476e529525f445, 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 &5239229093045226645
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7532791733307075520}
+  - component: {fileID: 2723179907069633402}
+  - component: {fileID: 3036314933531561143}
+  m_Layer: 0
+  m_Name: Box001
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7532791733307075520
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5239229093045226645}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -0.020095633, y: 0, z: 0.4062454}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8254017899901908901}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &2723179907069633402
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5239229093045226645}
+  m_Mesh: {fileID: 5060444177187149915, guid: edcf6de876bdc364da476e529525f445, type: 3}
+--- !u!23 &3036314933531561143
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5239229093045226645}
+  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: -4944585057258547126, guid: edcf6de876bdc364da476e529525f445, 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}
--- a/Assets/DC/湖南省衡阳市东洲岛旅游景点(第二场场地）地形.prefab.meta
+++ b/Assets/DC/湖南省衡阳市东洲岛旅游景点(第二场场地）地形.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7334b3b4789ee35488224319cdb18dc4
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/Android/AndroidManifest.xml
+++ b/Assets/Plugins/Android/AndroidManifest.xml
@ -9,7 +9,7 @@
                <category android:name="android.intent.category.LAUNCHER"/>
            </intent-filter>
            <intent-filter>
-                <data android:scheme="picoapp" android:host="launch" android:path="/com.pineappletech.defendnj.zhejiangshaoxingshengzhouwuyueguangchang"/>
+                <data android:scheme="picoapp" android:host="launch" android:path="/com.pineappletech.defendnj.hunanhengyangzhuhuidongzhoudaonei"/>
                <action android:name="android.intent.action.VIEW"/>
                <category android:name="android.intent.category.DEFAULT"/>
            </intent-filter>
--- a/Assets/_DefendNJ/Scenes/Hunan_Hengyang_Zhuhui_Dongzhoudao_nei.unity
+++ b/Assets/_DefendNJ/Scenes/Hunan_Hengyang_Zhuhui_Dongzhoudao_nei.unity
--- a/Assets/_DefendNJ/Scenes/Hunan_Hengyang_Zhuhui_Dongzhoudao_nei.unity.meta
+++ b/Assets/_DefendNJ/Scenes/Hunan_Hengyang_Zhuhui_Dongzhoudao_nei.unity.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 45555d63952653747baa76b836c5673e
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_DefendNJ/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang.unity
+++ b/Assets/_DefendNJ/Scenes/Nanjing_Qixia_Yaohuamen_Jindiguangchang.unity
@ -5414,6 +5414,11 @@ PrefabInstance:
      propertyPath: m_Layer
      value: 3
      objectReference: {fileID: 0}
+    - target: {fileID: 771804179795237630, guid: 6a2ede1050dc83d4aa3686aaf0063e7e,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 771804179795237630, guid: 6a2ede1050dc83d4aa3686aaf0063e7e,
        type: 3}
      propertyPath: m_StaticEditorFlags
@ -5744,6 +5749,11 @@ PrefabInstance:
      propertyPath: m_Layer
      value: 3
      objectReference: {fileID: 0}
+    - target: {fileID: 4168868050571145340, guid: 6a2ede1050dc83d4aa3686aaf0063e7e,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 4168868050571145340, guid: 6a2ede1050dc83d4aa3686aaf0063e7e,
        type: 3}
      propertyPath: m_StaticEditorFlags
@ -5814,6 +5824,11 @@ PrefabInstance:
      propertyPath: m_Layer
      value: 3
      objectReference: {fileID: 0}
+    - target: {fileID: 4759822955563069507, guid: 6a2ede1050dc83d4aa3686aaf0063e7e,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 4759822955563069507, guid: 6a2ede1050dc83d4aa3686aaf0063e7e,
        type: 3}
      propertyPath: m_StaticEditorFlags
@ -5854,6 +5869,11 @@ PrefabInstance:
      propertyPath: m_Layer
      value: 3
      objectReference: {fileID: 0}
+    - target: {fileID: 5280679453764258446, guid: 6a2ede1050dc83d4aa3686aaf0063e7e,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 5280679453764258446, guid: 6a2ede1050dc83d4aa3686aaf0063e7e,
        type: 3}
      propertyPath: m_StaticEditorFlags
@ -6044,6 +6064,11 @@ PrefabInstance:
      propertyPath: m_Layer
      value: 3
      objectReference: {fileID: 0}
+    - target: {fileID: 6761768085133263109, guid: 6a2ede1050dc83d4aa3686aaf0063e7e,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 6761768085133263109, guid: 6a2ede1050dc83d4aa3686aaf0063e7e,
        type: 3}
      propertyPath: m_StaticEditorFlags
@ -6114,6 +6139,11 @@ PrefabInstance:
      propertyPath: m_Layer
      value: 3
      objectReference: {fileID: 0}
+    - target: {fileID: 8064647820465219959, guid: 6a2ede1050dc83d4aa3686aaf0063e7e,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 8064647820465219959, guid: 6a2ede1050dc83d4aa3686aaf0063e7e,
        type: 3}
      propertyPath: m_StaticEditorFlags
@ -6432,7 +6462,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &486593705
 Transform:
  m_ObjectHideFlags: 0
@ -10577,7 +10607,7 @@ MonoBehaviour:
  IncludeChildColliders: 0
  RuntimeFollower: {fileID: 0}
  colliderMaxDistance: 100
-  lastTimeMaxDistanceCalced: 638948461663121199
+  lastTimeMaxDistanceCalced: 638961427658230744
 --- !u!82 &675942809
 AudioSource:
  m_ObjectHideFlags: 0
@ -18897,6 +18927,7 @@ MonoBehaviour:
  doorPos: {fileID: 1128989868}
  pkPos: {fileID: 107388154}
  gQPos: {fileID: 508421177}
+  endPkPos: []
  doorAnim: {fileID: 477182737}
 --- !u!1 &1318686166
 GameObject:
--- 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: edcf6de876bdc364da476e529525f445
+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: 
--- a/Assets/sucai/素材/ExplosiveRealPack/Materials/sprite_realEmberSheet_a.mat
+++ b/Assets/sucai/素材/ExplosiveRealPack/Materials/sprite_realEmberSheet_a.mat
@ -8,79 +8,28 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: sprite_realEmberSheet_a
-  m_Shader: {fileID: 4800000, guid: 5c692a25a9ad5834ba12210de0e9ea87, type: 3}
+  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - _EMISSION
-  - _SURFACE_TYPE_TRANSPARENT
-  m_InvalidKeywords:
-  - _FLIPBOOKBLENDING_OFF
-  m_LightmapFlags: 1
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 5
  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 1
-  m_CustomRenderQueue: 3000
-  stringTagMap:
-    RenderType: Transparent
-  disabledShaderPasses:
-  - DepthOnly
-  - SHADOWCASTER
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
-    - _BaseMap:
-        m_Texture: {fileID: 2800000, guid: 2d3c1be660dfa0f44a3f08d94263972f, type: 3}
-        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}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 2d3c1be660dfa0f44a3f08d94263972f, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Ints: []
    m_Floats:
-    - _AlphaClip: 0
-    - _AlphaToMask: 0
-    - _Blend: 0
-    - _BlendOp: 0
-    - _CameraFadingEnabled: 0
-    - _CameraFarFadeDistance: 2
-    - _CameraNearFadeDistance: 1
-    - _ColorMode: 0
-    - _Cull: 0
-    - _Cutoff: 0.5
-    - _DistortionBlend: 0.5
-    - _DistortionEnabled: 0
-    - _DistortionStrength: 1
-    - _DistortionStrengthScaled: 0.1
-    - _DstBlend: 10
-    - _DstBlendAlpha: 10
-    - _FlipbookBlending: 0
-    - _FlipbookMode: 0
    - _InvFade: 3
-    - _Mode: 0
-    - _QueueOffset: 0
-    - _SoftParticlesEnabled: 0
-    - _SoftParticlesFarFadeDistance: 1
-    - _SoftParticlesNearFadeDistance: 0
-    - _SrcBlend: 5
-    - _SrcBlendAlpha: 1
-    - _Surface: 1
-    - _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, g: 0, b: 0, a: 1}
-    - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
    - _TintColor: {r: 1, g: 1, b: 1, a: 0.5019608}
  m_BuildTextureStacks: []
--- a/Assets/sucai/素材/ExplosiveRealPack/Materials/sprite_realExplosion_a.mat
+++ b/Assets/sucai/素材/ExplosiveRealPack/Materials/sprite_realExplosion_a.mat
@ -8,79 +8,28 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: sprite_realExplosion_a
-  m_Shader: {fileID: 4800000, guid: 5c692a25a9ad5834ba12210de0e9ea87, type: 3}
+  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - _EMISSION
-  - _SURFACE_TYPE_TRANSPARENT
-  m_InvalidKeywords:
-  - _FLIPBOOKBLENDING_OFF
-  m_LightmapFlags: 1
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 5
  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 1
-  m_CustomRenderQueue: 3000
-  stringTagMap:
-    RenderType: Transparent
-  disabledShaderPasses:
-  - DepthOnly
-  - SHADOWCASTER
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
-    - _BaseMap:
-        m_Texture: {fileID: 2800000, guid: c33998dc088221e4dafa153e7237454b, type: 3}
-        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}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: c33998dc088221e4dafa153e7237454b, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Ints: []
    m_Floats:
-    - _AlphaClip: 0
-    - _AlphaToMask: 0
-    - _Blend: 0
-    - _BlendOp: 0
-    - _CameraFadingEnabled: 0
-    - _CameraFarFadeDistance: 2
-    - _CameraNearFadeDistance: 1
-    - _ColorMode: 0
-    - _Cull: 0
-    - _Cutoff: 0.5
-    - _DistortionBlend: 0.5
-    - _DistortionEnabled: 0
-    - _DistortionStrength: 1
-    - _DistortionStrengthScaled: 0.1
-    - _DstBlend: 10
-    - _DstBlendAlpha: 10
-    - _FlipbookBlending: 0
-    - _FlipbookMode: 0
    - _InvFade: 3
-    - _Mode: 0
-    - _QueueOffset: 0
-    - _SoftParticlesEnabled: 0
-    - _SoftParticlesFarFadeDistance: 1
-    - _SoftParticlesNearFadeDistance: 0
-    - _SrcBlend: 5
-    - _SrcBlendAlpha: 1
-    - _Surface: 1
-    - _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, g: 0, b: 0, a: 1}
-    - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
    - _TintColor: {r: 1, g: 1, b: 1, a: 0.5019608}
  m_BuildTextureStacks: []
--- a/Assets/sucai/素材/ExplosiveRealPack/Materials/sprite_realFireBall_a.mat
+++ b/Assets/sucai/素材/ExplosiveRealPack/Materials/sprite_realFireBall_a.mat
@ -8,79 +8,28 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: sprite_realFireBall_a
-  m_Shader: {fileID: 4800000, guid: 5c692a25a9ad5834ba12210de0e9ea87, type: 3}
+  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - _EMISSION
-  - _SURFACE_TYPE_TRANSPARENT
-  m_InvalidKeywords:
-  - _FLIPBOOKBLENDING_OFF
-  m_LightmapFlags: 1
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 5
  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: dca2fa188bcbc6a4c8abaa237a31235c, type: 3}
-        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}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: dca2fa188bcbc6a4c8abaa237a31235c, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Ints: []
    m_Floats:
-    - _AlphaClip: 0
-    - _AlphaToMask: 0
-    - _Blend: 0
-    - _BlendOp: 0
-    - _CameraFadingEnabled: 0
-    - _CameraFarFadeDistance: 2
-    - _CameraNearFadeDistance: 1
-    - _ColorMode: 0
-    - _Cull: 2
-    - _Cutoff: 0.5
-    - _DistortionBlend: 0.5
-    - _DistortionEnabled: 0
-    - _DistortionStrength: 1
-    - _DistortionStrengthScaled: 0.1
-    - _DstBlend: 10
-    - _DstBlendAlpha: 10
-    - _FlipbookBlending: 0
-    - _FlipbookMode: 0
    - _InvFade: 1
-    - _Mode: 0
-    - _QueueOffset: 0
-    - _SoftParticlesEnabled: 0
-    - _SoftParticlesFarFadeDistance: 1
-    - _SoftParticlesNearFadeDistance: 0
-    - _SrcBlend: 5
-    - _SrcBlendAlpha: 1
-    - _Surface: 1
-    - _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, g: 0, b: 0, a: 1}
-    - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
    - _TintColor: {r: 1, g: 1, b: 1, a: 0.5019608}
  m_BuildTextureStacks: []
--- a/Assets/sucai/素材/ExplosiveRealPack/Materials/sprite_realSmokeTrail_a.mat
+++ b/Assets/sucai/素材/ExplosiveRealPack/Materials/sprite_realSmokeTrail_a.mat
@ -8,31 +8,21 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: sprite_realSmokeTrail_a
-  m_Shader: {fileID: 4800000, guid: 5c692a25a9ad5834ba12210de0e9ea87, type: 3}
+  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - _EMISSION
-  - _SURFACE_TYPE_TRANSPARENT
-  m_InvalidKeywords:
-  - _FLIPBOOKBLENDING_OFF
-  m_LightmapFlags: 1
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 5
  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: ed6fb9fd1f9520146b7ab501cdb46445, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
    - _BumpMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
@ -71,49 +61,23 @@ Material:
        m_Offset: {x: 0, y: 0}
    m_Ints: []
    m_Floats:
-    - _AlphaClip: 0
-    - _AlphaToMask: 0
-    - _Blend: 0
-    - _BlendOp: 0
    - _BumpScale: 1
-    - _CameraFadingEnabled: 0
-    - _CameraFarFadeDistance: 2
-    - _CameraNearFadeDistance: 1
-    - _ColorMode: 0
-    - _Cull: 2
    - _Cutoff: 0.5
    - _DetailNormalMapScale: 1
-    - _DistortionBlend: 0.5
-    - _DistortionEnabled: 0
-    - _DistortionStrength: 1
-    - _DistortionStrengthScaled: 0.1
-    - _DstBlend: 10
-    - _DstBlendAlpha: 10
+    - _DstBlend: 0
    - _EmissionScaleUI: 0
-    - _FlipbookBlending: 0
-    - _FlipbookMode: 0
    - _Glossiness: 0.5
    - _InvFade: 1
    - _Metallic: 0
    - _Mode: 0
    - _OcclusionStrength: 1
    - _Parallax: 0.02
-    - _QueueOffset: 0
-    - _SoftParticlesEnabled: 0
-    - _SoftParticlesFarFadeDistance: 1
-    - _SoftParticlesNearFadeDistance: 0
-    - _SrcBlend: 5
-    - _SrcBlendAlpha: 1
-    - _Surface: 1
+    - _SrcBlend: 1
    - _UVSec: 0
-    - _ZWrite: 0
+    - _ZWrite: 1
    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, g: 0, b: 0, a: 1}
    - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1}
-    - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
    - _TintColor: {r: 1, g: 1, b: 1, a: 0.5019608}
  m_BuildTextureStacks: []
--- a/Assets/sucai/素材/ExplosiveRealPack/Materials/sprite_realSmoke_b.mat
+++ b/Assets/sucai/素材/ExplosiveRealPack/Materials/sprite_realSmoke_b.mat
@ -8,79 +8,28 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: sprite_realSmoke_b
-  m_Shader: {fileID: 4800000, guid: 5c692a25a9ad5834ba12210de0e9ea87, type: 3}
+  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - _EMISSION
-  - _SURFACE_TYPE_TRANSPARENT
-  m_InvalidKeywords:
-  - _FLIPBOOKBLENDING_OFF
-  m_LightmapFlags: 1
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 5
  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: 761b443ac6721754aa1849bc07cebdaf, type: 3}
-        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}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 2800000, guid: 761b443ac6721754aa1849bc07cebdaf, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Ints: []
    m_Floats:
-    - _AlphaClip: 0
-    - _AlphaToMask: 0
-    - _Blend: 0
-    - _BlendOp: 0
-    - _CameraFadingEnabled: 0
-    - _CameraFarFadeDistance: 2
-    - _CameraNearFadeDistance: 1
-    - _ColorMode: 0
-    - _Cull: 2
-    - _Cutoff: 0.5
-    - _DistortionBlend: 0.5
-    - _DistortionEnabled: 0
-    - _DistortionStrength: 1
-    - _DistortionStrengthScaled: 0.1
-    - _DstBlend: 10
-    - _DstBlendAlpha: 10
-    - _FlipbookBlending: 0
-    - _FlipbookMode: 0
    - _InvFade: 1
-    - _Mode: 0
-    - _QueueOffset: 0
-    - _SoftParticlesEnabled: 0
-    - _SoftParticlesFarFadeDistance: 1
-    - _SoftParticlesNearFadeDistance: 0
-    - _SrcBlend: 5
-    - _SrcBlendAlpha: 1
-    - _Surface: 1
-    - _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, g: 0, b: 0, a: 1}
-    - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
    - _TintColor: {r: 1, g: 1, b: 1, a: 0.5019608}
  m_BuildTextureStacks: []
--- a/Assets/sucai/素材/PolygonWarMap/Materials/Misc/PolygonWarMap_FX_Emission.mat
+++ b/Assets/sucai/素材/PolygonWarMap/Materials/Misc/PolygonWarMap_FX_Emission.mat
@ -21,14 +21,15 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: PolygonWarMap_FX_Emission
-  m_Shader: {fileID: 4800000, guid: 050a1819cb9a36e4b8fefcefd0d896f7, type: 3}
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
  - _EMISSION
  - _SURFACE_TYPE_TRANSPARENT
  m_InvalidKeywords:
-  - _FLIPBOOKBLENDING_OFF
+  - _ALPHABLEND_ON
  m_LightmapFlags: 0
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
@ -104,27 +105,16 @@ Material:
    - _AlphaToMask: 0
    - _Blend: 0
    - _BlendModePreserveSpecular: 1
-    - _BlendOp: 0
    - _BumpScale: 1
-    - _CameraFadingEnabled: 0
-    - _CameraFarFadeDistance: 2
-    - _CameraNearFadeDistance: 1
    - _ClearCoatMask: 0
    - _ClearCoatSmoothness: 0
-    - _ColorMode: 0
    - _Cull: 2
    - _Cutoff: 0.5
    - _DetailAlbedoMapScale: 1
    - _DetailNormalMapScale: 1
-    - _DistortionBlend: 0.5
-    - _DistortionEnabled: 0
-    - _DistortionStrength: 1
-    - _DistortionStrengthScaled: 0.1
    - _DstBlend: 10
    - _DstBlendAlpha: 10
    - _EnvironmentReflections: 1
-    - _FlipbookBlending: 0
-    - _FlipbookMode: 0
    - _GlossMapScale: 1
    - _Glossiness: 0
    - _GlossyReflections: 1
@ -136,11 +126,8 @@ Material:
    - _ReceiveShadows: 1
    - _Smoothness: 0
    - _SmoothnessTextureChannel: 0
-    - _SoftParticlesEnabled: 0
-    - _SoftParticlesFarFadeDistance: 1
-    - _SoftParticlesNearFadeDistance: 0
    - _SpecularHighlights: 1
-    - _SrcBlend: 5
+    - _SrcBlend: 1
    - _SrcBlendAlpha: 1
    - _Surface: 1
    - _UVSec: 0
@ -148,10 +135,7 @@ Material:
    - _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: 3, g: 2.3470588, b: 1.3676472, a: 1}
-    - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@ -63,8 +63,8 @@ EditorBuildSettings:
    path: Assets/_DefendNJ/Scenes/Yangzhou_Hanjiang_TansuoZhongxin_Waidai.unity
    guid: 0fe651c1fb955904688361a328dc07f7
  - enabled: 1
-    path: Assets/_DefendNJ/Scenes/Zhejiang_Shaoxing_Shengzhou_WuyueGuangchang.unity
-    guid: 526bb168d35701b4e93732c35c91281f
+    path: Assets/_DefendNJ/Scenes/Hunan_Hengyang_Zhuhui_Dongzhoudao_nei.unity
+    guid: 45555d63952653747baa76b836c5673e
  m_configObjects:
    Unity.XR.PXR.Settings: {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2,
      type: 2}
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -163,7 +163,7 @@ PlayerSettings:
  androidSupportedAspectRatio: 1
  androidMaxAspectRatio: 2.1
  applicationIdentifier:
-    Android: com.pineappletech.defendnj.zhejiangshaoxingshengzhouwuyueguangchang
+    Android: com.pineappletech.defendnj.hunanhengyangzhuhuidongzhoudaonei
    Standalone: com.DefaultCompany.com.unity.template.ar
  buildNumber:
    Standalone: 0