Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat   resolved by master version

Assets/Art/Environment/360Textures/yj_shan1.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: CihJ4SOrVnPdQeIITvnVRWPHvuPJqsMf5PAXO4CUeK69e7T2XLEwDbtMJjFM
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  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: 1
+  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
+    maxPlaceholderSize: 32
+    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
+    maxPlaceholderSize: 32
+    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: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    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: 

Assets/Art/Environment/360Textures/yj_shan2.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: CnhM43v8AXLAsA3JZWE+SjKCvBO/97SdFnEt1wCoUgL9qEDG6cG5622M5bV9
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  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: 1
+  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
+    maxPlaceholderSize: 32
+    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
+    maxPlaceholderSize: 32
+    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: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    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: 

Assets/Art/Environment/Sky/Clouds/tiankong02.mat → Assets/Art/Environment/Sky/Clouds/tiankongLevelBattle01.mat

@@ -7,8 +7,8 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: tiankong02
-  m_Shader: {fileID: 4800000, guid: 54e59f65585b87c479bfb75710b91a47, type: 3}
+  m_Name: tiankongLevelBattle01
+  m_Shader: {fileID: 4800000, guid: 5d87fa370d4d0bd48bd6506f96ad47a7, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
@@ -51,14 +51,6 @@ Material:
         m_Texture: {fileID: 2800000, guid: f8317325c1c3eb945a0fa35dfcf2de31, type: 3}
         m_Scale: {x: 3, y: 2}
         m_Offset: {x: 0.65, y: 0.03}
-    - _Main_Tex:
-        m_Texture: {fileID: 2800000, guid: f8317325c1c3eb945a0fa35dfcf2de31, type: 3}
-        m_Scale: {x: 1, y: 2}
-        m_Offset: {x: 0, y: 0.09}
-    - _Mask:
-        m_Texture: {fileID: 2800000, guid: fc22f6ee15890544eb128ed36ae8e9a6, type: 3}
-        m_Scale: {x: 1, y: 2}
-        m_Offset: {x: 0, y: -0.01}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -71,66 +63,28 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - _Turb_Noise:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _dissolve:
-        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:
     - _AMultiplier: 0.8
-    - _Alpha: 1
-    - _AlphaCutoff: 0.5
     - _BumpScale: 1
-    - _CTime: 1
-    - _CustomDataDissolve: 0
-    - _CustomDataMainUV: 0
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
-    - _Diss_value: 0
     - _DstBlend: 0
     - _Glossiness: 0.5
     - _Metallic: 0
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _QueueControl: 0
-    - _QueueOffset: 0
-    - _ReceiveShadows: 1
     - _Scroll2X: 1
     - _Scroll2Y: 0
     - _ScrollX: 0
     - _ScrollY: 0
-    - _Soft_value: 0
     - _SrcBlend: 1
     - _Tiling: 1
-    - _Turb_Value: 0
     - _UVSec: 0
     - _ZWrite: 1
-    - _ca: 1
-    - _light: 1
     m_Colors:
     - _Color: {r: 0.588, g: 0.588, b: 0.588, a: 1}
     - _ColorTint: {r: 0.908, g: 0.9643004, b: 1, a: 1}
-    - _Diss_UV: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _Main_Color: {r: 1, g: 1, b: 1, a: 1}
-    - _Main_UV: {r: 0.001, g: 0, b: 0, a: 0}
-    - _Mask_UV: {r: 0, g: 0, b: 0, a: 0}
-    - _Turb_UV: {r: 0, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []

Assets/Art/Environment/Sky/Clouds/tiankong01.mat → Assets/Art/Environment/Sky/Clouds/tiankongLevelBattle02.mat

@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: tiankong01
+  m_Name: tiankongLevelBattle02
   m_Shader: {fileID: 4800000, guid: 5d87fa370d4d0bd48bd6506f96ad47a7, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
@@ -48,7 +48,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: f8317325c1c3eb945a0fa35dfcf2de31, type: 3}
+        m_Texture: {fileID: 2800000, guid: 5fba08ba1be4e2749862eae0ce02e359, type: 3}
         m_Scale: {x: 3, y: 2}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

Assets/Art/Environment/Sky/Clouds/tiankongLevelBattle03.mat

@@ -0,0 +1,90 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: tiankongLevelBattle03
+  m_Shader: {fileID: 4800000, guid: 5d87fa370d4d0bd48bd6506f96ad47a7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 5
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _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}
+    - _DetailTex:
+        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: 97e6ae0b7e635ee48aa02165170dd44d, type: 3}
+        m_Scale: {x: 3, y: 2}
+        m_Offset: {x: 0, y: -0.04}
+    - _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}
+    m_Ints: []
+    m_Floats:
+    - _AMultiplier: 0.8
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _Glossiness: 0.5
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _Scroll2X: 1
+    - _Scroll2Y: 0
+    - _ScrollX: 0.03
+    - _ScrollY: 0
+    - _SrcBlend: 1
+    - _Tiling: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.588, g: 0.588, b: 0.588, a: 1}
+    - _ColorTint: {r: 0.908, g: 0.9643004, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []

Assets/Art/Environment/Sky/Clouds/tiankongLevelBattle03.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DitK4SP5W3OtsrP2+mzmPlj49i9ALxnII4Xc325EK9uzc9VlMt2l7UyWK3ii
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Environment/shader/yj_LevelBattle01.mat

@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: yj_LevelBattle01
+  m_Shader: {fileID: 4800000, guid: b53bf3c118b453340a7165e3b9fe15b3, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 52cfaab97c530194eb8448f57225e214, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats: []
+    m_Colors:
+    - _Color: {r: 0.25311485, g: 0.58406645, b: 0.7452829, a: 0.49411765}
+    - _TilingCustom: {r: 5.09, g: 1, b: 0, a: 0}
+  m_BuildTextureStacks: []

Assets/Art/Environment/shader/yj_LevelBattle01.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DCwXvXurVnzrgCl38APfTiuIE3zKDZgHM37Tp6E1Eoedf+YM+bHNLTe3x0TP
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Environment/shader/yj_LevelBattle02.mat

@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: yj_LevelBattle02
+  m_Shader: {fileID: 4800000, guid: b53bf3c118b453340a7165e3b9fe15b3, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 52cfaab97c530194eb8448f57225e214, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats: []
+    m_Colors:
+    - _Color: {r: 0.21929498, g: 0.55338323, b: 0.7264149, a: 0.8352941}
+    - _TilingCustom: {r: 5, g: 1, b: 0, a: 0}
+  m_BuildTextureStacks: []

Assets/Art/Environment/shader/yj_LevelBattle02.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: BnsYsiilUXL1lbp8Ig/V+3bttB44V/VWGAZDR6x0paWWx76jqCOoQcKgZD7o
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Environment/shader/yj_LevelBattle03.mat

@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: yj_LevelBattle03
+  m_Shader: {fileID: 4800000, guid: b53bf3c118b453340a7165e3b9fe15b3, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 52cfaab97c530194eb8448f57225e214, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats: []
+    m_Colors:
+    - _Color: {r: 0.8160376, g: 0.45429054, b: 0.33873248, a: 0.6509804}
+    - _TilingCustom: {r: 5, g: 1, b: 0, a: 0}
+  m_BuildTextureStacks: []

Assets/Art/Environment/shader/yj_LevelBattle03.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DiwW5yOtVS7+Ku02JHCYFvLRCfbLIs928jK+wqIMIUuHnIloB2xjhXyXVgoD
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Environment/shader/yj_shan1.mat

@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: yj_shan1
+  m_Shader: {fileID: 4800000, guid: b53bf3c118b453340a7165e3b9fe15b3, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 5bfd96589af924f40a151971972f41ce, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats: []
+    m_Colors:
+    - _Color: {r: 0.8301885, g: 0.64556396, b: 0.5873975, a: 0.7647059}
+    - _TilingCustom: {r: 1, g: 1, b: 0, a: 0}
+  m_BuildTextureStacks: []

Assets/Art/Environment/shader/yj_shan1.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Bn8a4H6rByozL2JvM++sbtqGZTt3YKhsz5BNsD9LBHISKE3R/VQxbqwrQ7Ti
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_juxing16_miaobian2.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 16, y: 18, z: 19, w: 18}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -189,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

Assets/Art/UIAssets/decorate/dec_juxing_miaobian3.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: Wnsas3ytUC6zTn+dM0KflRTwrNeC2W+lexAN+/AMdNBbAIQqQ4AMSf2E/OaI
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  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: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 3, y: 3, z: 3, w: 3}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  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
+    maxPlaceholderSize: 32
+    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
+    maxPlaceholderSize: 32
+    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: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    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: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.42118084
+    - _Alpha: 0.7652023
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.118317604
+    - _Alpha: 0.57886076
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Res/CombatScenes/LevelBattle01.prefab

@@ -48,13 +48,100 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   skyObejct: {fileID: 4787834087060179975}
   fogColor: {r: 0.26950002, g: 0.3349501, b: 0.55, a: 1}
-  fogStartDistance: 10
-  fogEndDistance: 50
+  fogStartDistance: 80
+  fogEndDistance: 150
   allObject:
   - {fileID: 354955946429195138, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
   - {fileID: 8855316551847403815, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
   - {fileID: 8291995275029873607, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
-  radius: 35
+  radius: 45
+--- !u!1 &2814510134427997610
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 642287652830482507}
+  - component: {fileID: 4680905504009489264}
+  - component: {fileID: 2877345063359395945}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: SkyDome (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &642287652830482507
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2814510134427997610}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -10, z: 0}
+  m_LocalScale: {x: 3.5, y: 3, z: 3.5}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8368877462968469787}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &4680905504009489264
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2814510134427997610}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 5a16164fb0d247546b40d8c8ff8f3065, 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!33 &2877345063359395945
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2814510134427997610}
+  m_Mesh: {fileID: 4300000, guid: 1ded84720cc566a43b26b59b94db5f19, type: 2}
 --- !u!1001 &1744782095462081170
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -67,6 +154,26 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1602202008091483024, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 3f88a657b1010fe4190c6ecc0bf7c0a5, type: 2}
+    - target: {fileID: 2337934842038808926, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: fogColor.a
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2337934842038808926, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: fogColor.b
+      value: 0.716981
+      objectReference: {fileID: 0}
+    - target: {fileID: 2337934842038808926, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: fogColor.g
+      value: 0.60791194
+      objectReference: {fileID: 0}
+    - target: {fileID: 2337934842038808926, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: fogColor.r
+      value: 0.28070474
+      objectReference: {fileID: 0}
     - target: {fileID: 2585829135472063271, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalScale.x
       value: 0.17513
@@ -81,19 +188,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3298137866772214669, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalScale.x
-      value: 1.4596
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3298137866772214669, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.7298
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 3298137866772214669, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalScale.z
-      value: 1.4596
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3298137866772214669, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -50.33
+      value: -41
       objectReference: {fileID: 0}
     - target: {fileID: 4154994230707482304, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_Layer
@@ -103,10 +210,34 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4425146815379131757, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6505304175637704341, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_Name
       value: cj02 (1)
       objectReference: {fileID: 0}
+    - target: {fileID: 6990107168611760729, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 665.36066
+      objectReference: {fileID: 0}
+    - target: {fileID: 6990107168611760729, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 56.032154
+      objectReference: {fileID: 0}
+    - target: {fileID: 6990107168611760729, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 665.36066
+      objectReference: {fileID: 0}
+    - target: {fileID: 6990107168611760729, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.000014835
+      objectReference: {fileID: 0}
+    - target: {fileID: 6990107168611760729, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 56
+      objectReference: {fileID: 0}
     - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -148,8 +279,13 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
+    m_RemovedGameObjects:
+    - {fileID: 6014684991204939609, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+    - {fileID: 4425146815379131757, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 642287652830482507}
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
 --- !u!1 &4787834087060179975 stripped

Assets/Res/CombatScenes/LevelBattle02.prefab

@@ -62,88 +62,6 @@ MonoBehaviour:
   - {fileID: 3683907582521372588, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
   radius: 45
   dec: 
---- !u!1001 &3986193909677313104
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 5852812303139096713}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.99754554
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.99754554
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.99754554
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -7.6
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: -0.0009873678
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.0009873678
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0.7071061
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0.7071061
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: -180.16
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -7511558181221131132, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: c9fb8078a489c764e9c5286bb9821001, type: 2}
-    - target: {fileID: 919132149155446097, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_Name
-      value: yuanjing_huan (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
---- !u!4 &3520538653813713851 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-  m_PrefabInstance: {fileID: 3986193909677313104}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7548215640007385694
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -152,6 +70,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 8260501188212286327}
     m_Modifications:
+    - target: {fileID: 879977783264322425, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1398171176346647818, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
       propertyPath: m_LocalScale.x
       value: 1000
@@ -164,6 +86,26 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2466693982673891355, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 624.41
+      objectReference: {fileID: 0}
+    - target: {fileID: 2466693982673891355, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 53.80233
+      objectReference: {fileID: 0}
+    - target: {fileID: 2466693982673891355, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 624.41
+      objectReference: {fileID: 0}
+    - target: {fileID: 2466693982673891355, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.000049207
+      objectReference: {fileID: 0}
+    - target: {fileID: 2466693982673891355, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 65
+      objectReference: {fileID: 0}
     - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -232,6 +174,10 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6121734615867636914, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6899256924629427720, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -240,16 +186,21 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7053224253262756889, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 917728294fc27df44acf209e4899e361, type: 2}
     - target: {fileID: 8929588464290711568, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
       propertyPath: m_Name
       value: cj01 (1)
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects:
-    - targetCorrespondingSourceObject: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 3520538653813713851}
+    m_RemovedGameObjects:
+    - {fileID: 7153538565988912838, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+    - {fileID: 747153756437657183, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+    - {fileID: 6121734615867636914, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+    - {fileID: 4917829007436643089, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+    m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
 --- !u!1 &1381729068282112590 stripped

Assets/Res/CombatScenes/LevelBattle03.prefab

@@ -134,9 +134,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   skyObejct: {fileID: 6547143922713598540}
-  fogColor: {r: 0.21600002, g: 0.29280004, b: 0.6, a: 1}
-  fogStartDistance: 30
-  fogEndDistance: 80
+  fogColor: {r: 0.21568628, g: 0.29411766, b: 0.6, a: 1}
+  fogStartDistance: 80
+  fogEndDistance: 150
   allObject:
   - {fileID: 5829875553534260591, guid: 96fc37aadb9bc8840ad5fa98172cd16f, type: 3}
   radius: 45
@@ -150,7 +150,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 7169143794090459126}
-  m_Layer: 0
+  m_Layer: 7
   m_HasEditorInfo: 1
   m_Name: Landscape
   m_TagString: Untagged
@@ -174,93 +174,6 @@ Transform:
   - {fileID: 3271622544173978875}
   m_Father: {fileID: 7319546472223068688}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &4509268593997191767
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3585384551010318200}
-  - component: {fileID: 4077837472308421636}
-  - component: {fileID: 4513731945305176033}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: yun_qiu
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &3585384551010318200
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4509268593997191767}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 7319546472223068688}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &4077837472308421636
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4509268593997191767}
-  m_Mesh: {fileID: -6740526933416455741, guid: f8c594ef52ebfc44e98bdc02acc2a16c, type: 3}
---- !u!23 &4513731945305176033
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4509268593997191767}
-  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_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: afd2d3f979649ab47b32169c16a1b2ed, 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 &5999680719607194215
 GameObject:
   m_ObjectHideFlags: 0
@@ -279,7 +192,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &8284061920447749403
 Transform:
   m_ObjectHideFlags: 0
@@ -318,7 +231,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 4ebb2e35dc241aa4c9310f57ae11706a, type: 2}
+  - {fileID: 2100000, guid: 1aed9d88725f87842a544e4dc8ccd47f, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -359,7 +272,7 @@ GameObject:
   - component: {fileID: 3271622544173978875}
   - component: {fileID: 3485194297984294891}
   - component: {fileID: 6475305682505242889}
-  m_Layer: 0
+  m_Layer: 7
   m_HasEditorInfo: 1
   m_Name: Mesh
   m_TagString: Untagged
@@ -376,8 +289,8 @@ Transform:
   m_GameObject: {fileID: 6046298269311816277}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -12.5, z: 0}
-  m_LocalScale: {x: 500, y: 96.43, z: 500}
+  m_LocalPosition: {x: 0.000025568, y: 40, z: 0}
+  m_LocalScale: {x: 633.19, y: 61.05851, z: 633.19}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7169143794090459126}
@@ -413,7 +326,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 63837601a8b53204d813f3789422f179, type: 2}
+  - {fileID: 2100000, guid: 1f9b906e78879654ab40f5dadfd5341a, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -469,7 +382,6 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6405123835914438810}
-  - {fileID: 3585384551010318200}
   - {fileID: 6635004569205135084}
   - {fileID: 7169143794090459126}
   - {fileID: 8284061920447749403}
@@ -579,7 +491,7 @@ Transform:
   m_GameObject: {fileID: 9011782773388340285}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 5, z: 0}
+  m_LocalPosition: {x: 0, y: 6, z: 0}
   m_LocalScale: {x: 1000, y: 30, z: 500}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -662,7 +574,7 @@ MonoBehaviour:
   sortingLayer: Default
   sortingOrder: 0
   renderingLayerMask: 4294967295
-  fogColor: {r: 0.9056602, g: 0.551289, b: 0.3332145, a: 0.83137256}
+  fogColor: {r: 0.9056602, g: 0.551289, b: 0.3332145, a: 1}
   blendType: 0
   fogMeshType: 0
   customMesh: {fileID: 0}

Assets/Res/Config/EventConfig.json

@@ -6601,16 +6601,16 @@
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
-      "EventQuality": 2,
+      "EventQuality": 1,
       "PrizeIDs": [
         1001,
         1003
       ],
       "PrizeNums": [
-        -5000,
-        -5000
+        -10000,
+        -6000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -6685,7 +6685,7 @@
       "Score": 0,
       "EventQuality": 2,
       "PrizeIDs": [
-        1402,
+        1401,
         1001,
         1003
       ],
@@ -6734,7 +6734,7 @@
       "Score": 0,
       "EventQuality": 2,
       "PrizeIDs": [
-        1402,
+        1401,
         1001,
         1003
       ],
@@ -6823,16 +6823,14 @@
       "Score": 0,
       "EventQuality": 2,
       "PrizeIDs": [
-        1403,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
-        -5000,
-        -5000
+        -15000,
+        -9000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -6863,18 +6861,16 @@
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
-      "EventQuality": 2,
+      "EventQuality": 3,
       "PrizeIDs": [
-        1403,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
-        -5000,
-        -5000
+        -20000,
+        -12000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -6896,18 +6892,16 @@
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
-      "EventQuality": 2,
+      "EventQuality": 4,
       "PrizeIDs": [
-        1404,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
-        -5000,
-        -5000
+        -30000,
+        -20000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -6929,18 +6923,16 @@
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
-      "EventQuality": 2,
+      "EventQuality": 1,
       "PrizeIDs": [
-        1404,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
-        -5000,
-        -5000
+        -10000,
+        -6000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -6964,16 +6956,14 @@
       "Score": 0,
       "EventQuality": 2,
       "PrizeIDs": [
-        1404,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
-        -5000,
-        -5000
+        -15000,
+        -9000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -6996,18 +6986,16 @@
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
-      "EventQuality": 2,
+      "EventQuality": 3,
       "PrizeIDs": [
-        1404,
         1001,
         1003
       ],
       "PrizeNums": [
-        2,
-        -5000,
-        -5000
+        -20000,
+        -12000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -7030,18 +7018,16 @@
       "EventTag": 3,
       "EventType": 1,
       "Score": 0,
-      "EventQuality": 2,
+      "EventQuality": 4,
       "PrizeIDs": [
-        1404,
         1001,
         1003
       ],
       "PrizeNums": [
-        2,
-        -5000,
-        -5000
+        -30000,
+        -20000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 0,
       "SmallPlacesId": 0,
@@ -7066,16 +7052,14 @@
       "Score": 0,
       "EventQuality": 2,
       "PrizeIDs": [
-        1404,
         1001,
         1003
       ],
       "PrizeNums": [
-        2,
-        -5000,
-        -5000
+        -15000,
+        -9000
       ],
-      "RefreshProbability": 100,
+      "RefreshProbability": 50,
       "RefreshCount": 1,
       "placeID": 0,
       "SmallPlacesId": 0,

Assets/Res/Config/LanguageChineseConfig.json

@@ -13150,47 +13150,47 @@
     },
     {
       "ID": 4028,
-      "txt": "鲲鹏何在"
+      "txt": "鲲鹏何在.神识未灭"
     },
     {
       "ID": 4029,
-      "txt": "北海迷径1"
+      "txt": "北海密径.御剑而行"
     },
     {
       "ID": 4030,
-      "txt": "北海迷径2"
+      "txt": "北海密径.雀笑大鹏"
     },
     {
       "ID": 4031,
-      "txt": "古径阵法"
+      "txt": "古径阵法.击败结界兽"
     },
     {
       "ID": 4032,
-      "txt": "浮空之岛1"
+      "txt": "浮空之岛.初见疯道人"
     },
     {
       "ID": 4033,
-      "txt": "浮空之岛2"
+      "txt": "浮空之岛.达到练气"
     },
     {
       "ID": 4034,
-      "txt": "风中洞府1"
+      "txt": "风中洞府.击败痴道人"
     },
     {
       "ID": 4035,
-      "txt": "风中洞府2"
+      "txt": "风中洞府.疯痴相聚"
     },
     {
       "ID": 4036,
-      "txt": "风灵之力"
+      "txt": "风灵之力.练气后期"
     },
     {
       "ID": 4037,
-      "txt": "北海深处1"
+      "txt": "北海深处.妖兽横行"
     },
     {
       "ID": 4038,
-      "txt": "北海深处2"
+      "txt": "北海深处.遇见鲲鹏"
     },
     {
       "ID": 4039,
@@ -13198,63 +13198,63 @@
     },
     {
       "ID": 4040,
-      "txt": "尧之都"
+      "txt": "尧之都.尧让天下"
     },
     {
       "ID": 4041,
-      "txt": "山林清音"
+      "txt": "山林清音.访贤许由"
     },
     {
       "ID": 4042,
-      "txt": "山中劳作"
+      "txt": "山中劳作.割草喝茶"
     },
     {
       "ID": 4043,
-      "txt": "风起夜战"
+      "txt": "风起夜战.再来一杯"
     },
     {
       "ID": 4044,
-      "txt": "吃茶三问"
+      "txt": "吃茶三问.战胜妖王"
     },
     {
       "ID": 4045,
-      "txt": "尧让天下"
+      "txt": "尧让天下.复命尧帝"
     },
     {
       "ID": 4046,
-      "txt": "无用之树"
+      "txt": "无用之树.树下闲话"
     },
     {
       "ID": 4047,
-      "txt": "樗木之灵"
+      "txt": "樗木之灵.切磋"
     },
     {
       "ID": 4048,
-      "txt": "游尧都"
+      "txt": "游尧都.结丹中期"
     },
     {
       "ID": 4049,
-      "txt": "再见尧帝"
+      "txt": "再见尧帝.仙山传说"
     },
     {
       "ID": 4050,
-      "txt": "云海漫行"
+      "txt": "云海漫行.入山幻阵"
     },
     {
       "ID": 4051,
-      "txt": "初见惠子"
+      "txt": "初见惠子.葫芦种子"
     },
     {
       "ID": 4052,
-      "txt": "葫芦肥料"
+      "txt": "葫芦肥料.天肥地肥"
     },
     {
       "ID": 4053,
-      "txt": "藐姑射山"
+      "txt": "藐姑射山.登山"
     },
     {
       "ID": 4054,
-      "txt": "藐姑射山"
+      "txt": "藐姑射山.雾中幻径"
     },
     {
       "ID": 4055,
@@ -13266,7 +13266,7 @@
     },
     {
       "ID": 4057,
-      "txt": "心魔之战"
+      "txt": "心魔之战.破除枷锁"
     },
     {
       "ID": 4058,
@@ -13450,111 +13450,111 @@
     },
     {
       "ID": 4103,
-      "txt": "神识未灭"
+      "txt": "风铃一响，随它去寻北海鲲鹏。"
     },
     {
       "ID": 4104,
-      "txt": "御剑而行"
+      "txt": "神识所及，古径蜿蜒云雾间，隐有兽影沉浮，气息森然。"
     },
     {
       "ID": 4105,
-      "txt": "雀笑大鹏"
+      "txt": "风过结界开，古径云雾散，前路现。"
     },
     {
       "ID": 4106,
-      "txt": "击败结界兽"
+      "txt": "心意决，战凤鸟，破阻扰，仙途重开。"
     },
     {
       "ID": 4107,
-      "txt": "初见疯道人"
+      "txt": "风停见疯道，赠书修道，静待来日。"
     },
     {
       "ID": 4108,
-      "txt": "筑基中期"
+      "txt": "获赠半珠，承风之志，前往搜寻另一半灵珠。"
     },
     {
       "ID": 4109,
-      "txt": "击败痴道人"
+      "txt": "双珠相引，宿命相逢，此战难免。"
     },
     {
       "ID": 4110,
-      "txt": "疯痴相聚"
+      "txt": "心结解开，灵气自来，师兄携师弟乘风归去。"
     },
     {
       "ID": 4111,
-      "txt": "筑基后期"
+      "txt": "灵珠引路破狂风，七道心境寻鲲踪。"
     },
     {
       "ID": 4112,
-      "txt": "妖兽横行"
+      "txt": "灵珠破浪斩妖途，北海深处现真章。"
     },
     {
       "ID": 4113,
-      "txt": "遇见鲲鹏"
+      "txt": "北海缘已结，携风灵珠，向尧都寻心境。"
     },
     {
       "ID": 4114,
-      "txt": "问道尧都"
+      "txt": "踏出北海，御剑抵尧都，寻一方人间仙境，问道尧都。"
     },
     {
       "ID": 4115,
-      "txt": "尧让天下"
+      "txt": "受帝尧之托，入深山寻访避世贤士许由。"
     },
     {
       "ID": 4116,
-      "txt": "访贤许由"
+      "txt": "许由一言成谶，只得愣在古松下，水声潺潺。"
     },
     {
       "ID": 4117,
-      "txt": "割草喝茶"
+      "txt": "为许由前辈开荒辟地，除草采药，有茶有修行。"
     },
     {
       "ID": 4118,
-      "txt": "再来一杯"
+      "txt": "击退妖兽，又得灵茶一饮"
     },
     {
       "ID": 4119,
-      "txt": "战胜妖王"
+      "txt": "三杯清茶饮尽，了悟心净即是道。"
     },
     {
       "ID": 4120,
-      "txt": "复命尧帝"
+      "txt": "带回许由的话，帝尧听了，低头沉默不语。"
     },
     {
       "ID": 4121,
-      "txt": "树下闲话"
+      "txt": "歪树笑着活了三千年，无用才是大用。"
     },
     {
       "ID": 4122,
-      "txt": "切磋切磋"
+      "txt": "千年树灵想活动，小友陪它过两招。"
     },
     {
       "ID": 4123,
-      "txt": "结丹中期"
+      "txt": "在灵气里泡够了，找尧帝指条明路。"
     },
     {
       "ID": 4124,
-      "txt": "仙山传说"
+      "txt": "尧帝说起那座仙山，心便飘向了云海间。"
     },
     {
       "ID": 4125,
-      "txt": "入山幻阵"
+      "txt": "拨开云海见仙山，循着铃声访隐者。"
     },
     {
       "ID": 4126,
-      "txt": "葫芦种子"
+      "txt": "为种一颗仙葫芦，上天入地去寻觅。"
     },
     {
       "ID": 4127,
-      "txt": "天肥地肥"
+      "txt": "仙种灵根何处寻，再向樗木借春秋。"
     },
     {
       "ID": 4128,
-      "txt": "登山寻神"
+      "txt": "灵肥俱备始开阵，方见云深有路通。"
     },
     {
       "ID": 4129,
-      "txt": "雾中幻径"
+      "txt": "雾中忽闻燕雀语，笑我何必效鲲鹏。"
     },
     {
       "ID": 4130,
@@ -13566,7 +13566,7 @@
     },
     {
       "ID": 4132,
-      "txt": "破除枷锁"
+      "txt": "破妄得逍遥，心御天地宽。"
     },
     {
       "ID": 4133,
@@ -14066,11 +14066,11 @@
     },
     {
       "ID": 4257,
-      "txt": "找到血海宗的人"
+      "txt": "血海丹心护秘钥"
     },
     {
       "ID": 4258,
-      "txt": "找到血海宗的人2"
+      "txt": "北海劫钥"
     },
     {
       "ID": 4259,
@@ -14086,7 +14086,7 @@
     },
     {
       "ID": 4262,
-      "txt": "散修劫掠2"
+      "txt": "劫掠覆来"
     },
     {
       "ID": 4263,
@@ -14130,11 +14130,11 @@
     },
     {
       "ID": 4273,
-      "txt": "夺晶之战2-援军"
+      "txt": "夺晶援军"
     },
     {
       "ID": 4274,
-      "txt": "灵泉"
+      "txt": "探访灵泉"
     },
     {
       "ID": 4275,
@@ -14146,7 +14146,7 @@
     },
     {
       "ID": 4277,
-      "txt": "灵泉异动平息"
+      "txt": "灵泉异动"
     },
     {
       "ID": 4278,
@@ -14170,11 +14170,11 @@
     },
     {
       "ID": 4283,
-      "txt": "发光的鱼2"
+      "txt": "发光的鱼"
     },
     {
       "ID": 4284,
-      "txt": "发光的鱼3"
+      "txt": "发光的鱼"
     },
     {
       "ID": 4285,
@@ -39830,7 +39830,7 @@
     },
     {
       "ID": 10698,
-      "txt": "突破时提升{2}%概率，如果失败会损失当前{3}%修为。"
+      "txt": "突破时提升{2}%概率。"
     },
     {
       "ID": 10699,

Assets/Res/UI/DivineSence/DivineSenceHuoQuWidget.prefab

@@ -106,7 +106,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.35488594, g: 0.56374943, b: 0.6839621, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -123,7 +123,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_shengji
+  _icon_name: dec_juxing
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -204,10 +204,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 39
-    m_FontStyle: 1
+    m_FontSize: 36
+    m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0

Assets/Res/UI/GuidePanel/GuidePanel.prefab

@@ -281,7 +281,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8980392, g: 0.8745098, b: 0.81960785, a: 1}
+  m_Color: {r: 0.8254715, g: 0.78102595, b: 0.6852971, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -298,7 +298,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang_hujiao
+  _icon_name: dec_juxing_miaobian3
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -387,7 +387,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.43921572, g: 0.42352945, b: 0.36862746, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -397,7 +397,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 28
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -407,7 +407,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u4F60"
+  m_Text: "\u4F60\u8BF4\u4EC0\u4E48\u624B\u673A\u5C31\u662F\u4EC0\u4E48"
 --- !u!114 &6543867474228140514
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2834,7 +2834,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &5518757894177767966
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -76,6 +76,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 8858058a836c6694a8c89b729ced8ac4, type: 3}
     - {fileID: 2800000, guid: 4d8e93c4b2e2c9e419e1b179a90007ae, type: 3}
     - {fileID: 2800000, guid: 89ccfa926f8b59447b9f0dc1d73e5544, type: 3}
+    - {fileID: 2800000, guid: e156f03efc10122489ec6605806cfbfd, type: 3}
     - {fileID: 2800000, guid: 56fa5ad2eb0770747a94b9281ce1d73e, type: 3}
     - {fileID: 2800000, guid: d51eb6e6d30732e42b4d39217df82220, type: 3}
     - {fileID: 2800000, guid: e1e3be226b84b7d4eb369470fdca7ca3, type: 3}