修改枚举、添加山东潍坊地形资源

2025-09-29 20:39:34 +08:00
parent 34e404b7e0
commit 75bc9c85ad
14 changed files with 274283 additions and 107 deletions
--- a/Assets/DC/场地.meta
+++ b/Assets/DC/场地.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 80b5060d8dfe2d54db11149085977a5b
+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: 63a0db952222f5d4787c97b5c197d0dd
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_DefendNJ/Scripts/GameLocal.cs
+++ b/Assets/_DefendNJ/Scripts/GameLocal.cs
@@ -7,20 +7,21 @@ using UnityEngine;

 public enum Place
 {
-    Company1Floor= 0,
-    LiaoNing_AnShan=1,
-    HangZhou_LongHuTianJie=2,
-    Nanjing_Yuhua_Wanxiang=3,
-    Nanjing_Xianlin_WanDaMao=4,
-    Yangzhou_Hanjiang_Tansuozhongxin=5,
-    Yangzhou_Hanjiang_Tansuozhongxin_wai=-5,
-    Zhejiang_Jinhua_KeJiGuan=6,
-    Guangzhou_Panyv_Zhanting=7,
-    Anhui_Wuhu_Guanwei=8,
+    Company1Floor = 0,
+    LiaoningAnShan = 1,
+    Liaoning_AnShan_Lishan_Dayuecheng = -1,
+    HangZhouLongHuTianJie = 2,
+    Nanjing_Yuhua_Wanxiang = 3,
+    Nanjing_Xianlin_WanDaMao = 4,
+    Yangzhou_Hanjiang_Tansuozhongxin = 5,
+    Yangzhou_Hanjiang_TansuoZhongxin_wai = -5,
+    Zhejiang_Jinhua_KeJiGuan = 6,
+    Guangzhou_Panyv_Zhanting = 7,
+    Anhui_Wuhu_Guanwei = 8,
    Shandong_Jining_Shangchang = 9,
    Shandong_Jining_Shangchang_nei = -9,
-    Shandong_Langfang_QingzhouTaihuacheng = 10,
-    Hubei_Xiangyang_Kejiguan=11,
+    ShanDong_Langfang_QingzhouTaihuacheng = 10,
+    Hubei_Xiangyang_Kejiguan = 11,
    Zhejiang_Shaoxing_Shengzhou_WuyueGuangchang = 12,
    Hunan_Jishou_Qianzhou_Tianhong = 13,
    Jilin_Tonghua_Liuhe = 14,
@@ -29,9 +30,24 @@ public enum Place
    Henan_Xinzheng_Shuanghudadao_Longhujinyicheng = 16,
    Nanjing_Qixia_Yaohuamen_Jindiguangchang = 17,
    Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei = -17,
-    Anhui_Suzhou_Yueshan_Guchengshangyejie = 18,
+    Anshan_Suzhou_Yueshan_Guchengshangyejie = 18,
    Gansu_Longnan_Shicheng_Dongsheng = 19,
    Shandong_Heze_Yuncheng_Gefuli = 20,
+    Wulanhaote_Ouya_Shangchang = 21,
+    Wulanhaote_Wanda_Shangchang = -21,
+    Yunnan_Mile_Jinchen_Shidaiguangchang = 22,
+    Xinjiang_Yili_Yining_Wanrong = 23,
+    Hunan_Hengyang_Zhuhui_Dongzhoudao = 24,
+    Hunan_Hengyang_Zhuhui_Dongzhoudao_nei = -24,
+    Yunnan_Lincang_Linxiang_Hengji = 25,
+    Yunnan_Lincang_Linxiang_Hengji_Dixia = -25,
+    Guangxi_Guilin_Gongcheng_Shijixincheng = 26,
+    Guangdong_Shenzhen_Guangming_Wanda = 27,
+    Gansu_Jinchang_Jinchuan_Shijiguangchang = 28,
+    Jiangsu_Xvzhou_Fengxian_Wuyueguangchang = 29,
+    Hebei_Tangshan_Qianan_Tianyuangu = 30,
+    Guangdong_Guangzhou_Yanghaiyan = 31,
+    Zhejiang_Hangzhou_Linping_Yintaicheng = 32,
 }

 public class GameLocal : MonoBehaviour
--- a/Assets/sucai/场景/城门2.controller
+++ b/Assets/sucai/场景/城门2.controller
@@ -11,10 +11,7 @@ AnimatorStateMachine:
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: 5429871227428060119}
-    m_Position: {x: 390, y: 110, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: -6575686392318189644}
-    m_Position: {x: 320, y: -10, z: 0}
+    m_Position: {x: 200, y: 0, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
@@ -24,34 +21,7 @@ AnimatorStateMachine:
  m_EntryPosition: {x: 50, y: 120, z: 0}
  m_ExitPosition: {x: 800, y: 120, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: -6575686392318189644}
--- !u!1102 &-6575686392318189644
-AnimatorState:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: New State
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 150252282201095800}
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 0}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
+  m_DefaultState: {fileID: 5429871227428060119}
 --- !u!91 &9100000
 AnimatorController:
  m_ObjectHideFlags: 0
@@ -60,13 +30,7 @@ AnimatorController:
  m_PrefabAsset: {fileID: 0}
  m_Name: "\u57CE\u95E82"
  serializedVersion: 5
-  m_AnimatorParameters:
-  - m_Name: isOpen
-    m_Type: 4
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+  m_AnimatorParameters: []
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
@@ -80,31 +44,6 @@ AnimatorController:
    m_IKPass: 0
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
--- !u!1101 &150252282201095800
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: isOpen
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 5429871227428060119}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.75
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
 --- !u!1102 &5429871227428060119
 AnimatorState:
  serializedVersion: 6
--- a/Assets/sucai/场景/城门2.fbm/_Concr01.jpg.meta
+++ b/Assets/sucai/场景/城门2.fbm/_Concr01.jpg.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/场景/城门2.fbm/复件两色砖ff副本.jpg.meta
+++ b/Assets/sucai/场景/城门2.fbm/复件两色砖ff副本.jpg.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/场景/配楼.fbm/45.jpg.meta
+++ b/Assets/sucai/场景/配楼.fbm/45.jpg.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/场景/配楼.fbm/Archinteriors3_0500.jpg.meta
+++ b/Assets/sucai/场景/配楼.fbm/Archinteriors3_0500.jpg.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/场景/配楼.fbm/wal156m.jpg.meta
+++ b/Assets/sucai/场景/配楼.fbm/wal156m.jpg.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/场景/配楼.fbm/青石板3.jpg.meta
+++ b/Assets/sucai/场景/配楼.fbm/青石板3.jpg.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/场景/马车.fbm/木板_04.psd.meta
+++ b/Assets/sucai/场景/马车.fbm/木板_04.psd.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/场景/马车.fbm/石材黑白_03_弥娜.psd.meta
+++ b/Assets/sucai/场景/马车.fbm/石材黑白_03_弥娜.psd.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/素材/ExplosiveRealPack/Materials/sprite_realGlow_a.mat
+++ b/Assets/sucai/素材/ExplosiveRealPack/Materials/sprite_realGlow_a.mat
@@ -8,29 +8,26 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: sprite_realGlow_a
-  m_Shader: {fileID: 4800000, guid: 050a1819cb9a36e4b8fefcefd0d896f7, type: 3}
+  m_Shader: {fileID: 4800000, guid: 5c692a25a9ad5834ba12210de0e9ea87, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
  m_ValidKeywords:
  - _EMISSION
-  - _SURFACE_TYPE_TRANSPARENT
  m_InvalidKeywords:
  - _FLIPBOOKBLENDING_OFF
  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
+  m_CustomRenderQueue: -1
  stringTagMap:
-    RenderType: Transparent
-  disabledShaderPasses:
-  - DepthOnly
-  - SHADOWCASTER
+    RenderType: Opaque
+  disabledShaderPasses: []
  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
    - _BaseMap:
-        m_Texture: {fileID: 2800000, guid: 20a0856b0513cf046a4547d2134d0218, type: 3}
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _BumpMap:
@@ -61,8 +58,8 @@ Material:
    - _DistortionEnabled: 0
    - _DistortionStrength: 1
    - _DistortionStrengthScaled: 0.1
-    - _DstBlend: 10
-    - _DstBlendAlpha: 10
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
    - _FlipbookBlending: 0
    - _FlipbookMode: 0
    - _InvFade: 1
@@ -71,14 +68,14 @@ Material:
    - _SoftParticlesEnabled: 0
    - _SoftParticlesFarFadeDistance: 1
    - _SoftParticlesNearFadeDistance: 0
-    - _SrcBlend: 5
+    - _SrcBlend: 1
    - _SrcBlendAlpha: 1
-    - _Surface: 1
-    - _ZWrite: 0
+    - _Surface: 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}
+    - _CameraFadeParams: {r: 0, g: 0, 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}