Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero

2025-08-28 16:37:18 +08:00 · 2025-08-28 16:37:18 +08:00 · e9244b18c4
commit e9244b18c4
parent bbcb866671 7998dee76a
16 changed files with 80 additions and 77 deletions
--- a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.atlas.txt.meta
+++ b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.atlas.txt.meta
@ -3,5 +3,5 @@ guid: 86ed21a582598d94cb17c98ba4598b0e
 TextScriptImporter:
  externalObjects: {}
  userData: 
-  assetBundleName: arts/spines/ui/ui_battle_obstacle_firesnake.ab
+  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.png.meta
+++ b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.png.meta
@ -36,9 +36,9 @@ TextureImporter:
    filterMode: 1
    aniso: 1
    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
  nPOTScale: 0
  lightmap: 0
  compressionQuality: 50
@ -63,20 +63,44 @@ TextureImporter:
  textureFormatSet: 0
  ignorePngGamma: 0
  applyGammaDecoding: 0
-  cookieLightType: 1
+  cookieLightType: 0
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
  - serializedVersion: 3
    buildTarget: Android
    maxTextureSize: 2048
@ -101,30 +125,6 @@ TextureImporter:
    overridden: 1
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
@ -143,5 +143,5 @@ TextureImporter:
  pSDRemoveMatte: 0
  pSDShowRemoveMatteOption: 0
  userData: 
-  assetBundleName: arts/spines/ui/ui_battle_obstacle_firesnake.ab
+  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.skel.bytes
+++ b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.skel.bytes
--- a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.skel.bytes.meta
+++ b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake.skel.bytes.meta
@ -3,5 +3,5 @@ guid: 2712e76af21e0b74490cb458b6ae7dc1
 TextScriptImporter:
  externalObjects: {}
  userData: 
-  assetBundleName: arts/spines/ui/ui_battle_obstacle_firesnake.ab
+  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_atlas.asset.meta
+++ b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_atlas.asset.meta
@ -4,5 +4,5 @@ NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
  userData: 
-  assetBundleName: arts/spines/ui/ui_battle_obstacle_firesnake.ab
+  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_material.mat
+++ b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_material.mat
@ -8,7 +8,7 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: ui_battle_obstacle_firesnake_material
-  m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3}
+  m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
  m_ValidKeywords:
  - _STRAIGHT_ALPHA_INPUT
  m_InvalidKeywords:
@ -29,6 +29,7 @@ Material:
    m_Ints: []
    m_Floats:
    - _Cutoff: 0.1
+    - _Fill: 0
    - _OutlineMipLevel: 0
    - _OutlineOpaqueAlpha: 1
    - _OutlineReferenceTexWidth: 1024
@ -39,6 +40,7 @@ Material:
    - _StraightAlphaInput: 1
    - _ThresholdEnd: 0.25
    - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
    m_Colors:
    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
  m_BuildTextureStacks: []
--- a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_material.mat.meta
+++ b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_material.mat.meta
@ -4,5 +4,5 @@ NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 2100000
  userData: 
-  assetBundleName: arts/spines/ui/ui_battle_obstacle_firesnake.ab
+  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_skeletondata.asset.meta
+++ b/Assets/arts/spines/ui/ui_battle_obstacle_firesnake/ui_battle_obstacle_firesnake_skeletondata.asset.meta
@ -4,5 +4,5 @@ NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
  userData: 
-  assetBundleName: arts/spines/ui/ui_battle_obstacle_firesnake.ab
+  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.atlas.txt.meta
+++ b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.atlas.txt.meta
@ -3,5 +3,5 @@ guid: 3ed10442ee9581f47a6444d6b5b652d9
 TextScriptImporter:
  externalObjects: {}
  userData: 
-  assetBundleName: arts/spines/ui/ui_battle_obstacle_waternake.ab
+  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.png.meta
+++ b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.png.meta
@ -36,9 +36,9 @@ TextureImporter:
    filterMode: 1
    aniso: 1
    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
  nPOTScale: 0
  lightmap: 0
  compressionQuality: 50
@ -63,20 +63,44 @@ TextureImporter:
  textureFormatSet: 0
  ignorePngGamma: 0
  applyGammaDecoding: 0
-  cookieLightType: 1
+  cookieLightType: 0
  platformSettings:
  - serializedVersion: 3
    buildTarget: DefaultTexturePlatform
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
  - serializedVersion: 3
    buildTarget: Android
    maxTextureSize: 2048
@ -101,30 +125,6 @@ TextureImporter:
    overridden: 1
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
@ -143,5 +143,5 @@ TextureImporter:
  pSDRemoveMatte: 0
  pSDShowRemoveMatteOption: 0
  userData: 
-  assetBundleName: arts/spines/ui/ui_battle_obstacle_waternake.ab
+  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.skel.bytes
+++ b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.skel.bytes
--- a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.skel.bytes.meta
+++ b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake.skel.bytes.meta
@ -3,5 +3,5 @@ guid: 2816dc8db3ede0045b0b050a5a1b516c
 TextScriptImporter:
  externalObjects: {}
  userData: 
-  assetBundleName: arts/spines/ui/ui_battle_obstacle_waternake.ab
+  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_atlas.asset.meta
+++ b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_atlas.asset.meta
@ -4,5 +4,5 @@ NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
  userData: 
-  assetBundleName: arts/spines/ui/ui_battle_obstacle_waternake.ab
+  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_material.mat
+++ b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_material.mat
@ -8,9 +8,8 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: ui_battle_obstacle_waternake_material
-  m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3}
-  m_ValidKeywords:
-  - _STRAIGHT_ALPHA_INPUT
+  m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
+  m_ValidKeywords: []
  m_InvalidKeywords:
  - _USE8NEIGHBOURHOOD_ON
  m_LightmapFlags: 4
@ -29,6 +28,7 @@ Material:
    m_Ints: []
    m_Floats:
    - _Cutoff: 0.1
+    - _Fill: 0
    - _OutlineMipLevel: 0
    - _OutlineOpaqueAlpha: 1
    - _OutlineReferenceTexWidth: 1024
@ -36,9 +36,10 @@ Material:
    - _OutlineWidth: 3
    - _StencilComp: 8
    - _StencilRef: 1
-    - _StraightAlphaInput: 1
+    - _StraightAlphaInput: 0
    - _ThresholdEnd: 0.25
    - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
    m_Colors:
    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
  m_BuildTextureStacks: []
--- a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_material.mat.meta
+++ b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_material.mat.meta
@ -4,5 +4,5 @@ NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 2100000
  userData: 
-  assetBundleName: arts/spines/ui/ui_battle_obstacle_waternake.ab
+  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_skeletondata.asset.meta
+++ b/Assets/arts/spines/ui/ui_battle_obstacle_waternake/ui_battle_obstacle_waternake_skeletondata.asset.meta
@ -4,5 +4,5 @@ NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
  userData: 
-  assetBundleName: arts/spines/ui/ui_battle_obstacle_waternake.ab
+  assetBundleName: 
  assetBundleVariant: