fix bug

2025-10-28 15:38:29 +08:00 · 2025-10-28 15:38:29 +08:00 · 3dc8c37011
commit 3dc8c37011
parent db8e86b49d
21 changed files with 451 additions and 1 deletions
--- a/Assets/arts/atlas/icon/buff.asset
+++ b/Assets/arts/atlas/icon/buff.asset
@ -13,11 +13,14 @@ MonoBehaviour:
  m_Name: buff
  m_EditorClassIdentifier: 
  spriteList:
+  - {fileID: 21300000, guid: 23b2f464f0fc140a581e2141bccdb23c, type: 3}
  - {fileID: 21300000, guid: 911e4ba1e8f5c594a9068ef0d20bbc25, type: 3}
  - {fileID: 21300000, guid: 935c4b50a06bc7549803a7e9c87d7fbb, type: 3}
  - {fileID: 21300000, guid: 06765e0298a373a468ed0efca3170681, type: 3}
  - {fileID: 21300000, guid: 8fdd1e80536a26b408316f82b84113ea, type: 3}
  - {fileID: 21300000, guid: df597c1485f572f4faf4cdda764f1022, type: 3}
+  - {fileID: 21300000, guid: 7958fad7cc4c0491ea22bcad5e968af5, type: 3}
+  - {fileID: 21300000, guid: 7e91bb376e02142c5ae9713cdf7060bb, type: 3}
  - {fileID: 21300000, guid: c70ea649b4ac6ba4cb17164f11d555a9, type: 3}
  - {fileID: 21300000, guid: 0e68ebc982e8cac4d92bc662d3ca5b2f, type: 3}
  - {fileID: 21300000, guid: 4d5743e9d0a6ae447bad491b2a0c6cc6, type: 3}
@ -38,4 +41,4 @@ MonoBehaviour:
  - {fileID: 21300000, guid: 020a89104d6668248bc2518cce1fc6cc, type: 3}
  - {fileID: 21300000, guid: 6568b6c56e8900547b76bf3fc6307823, type: 3}
  - {fileID: 21300000, guid: 232ebdf92251f9446aa2ff109a3a189f, type: 3}
-  spriteNameList: 3a9f9705cf512e00d7d7a3050de6ee3844d744fc9200aa050cc1401e9ed464f6a01289b4832c60b9cfbbd3ea10d4ad7d2bc532008284f110e38ff110086f6cc56c4e7640fb662f9b691f28ca9f86e95dba0836005ce3dfcb7d16e4cd48c7da9d21aecdd0
+  spriteNameList: 3bb554de3a9f9705cf512e00d7d7a3050de6ee3844d744fcbce45674f4b873f69200aa050cc1401e9ed464f6a01289b4832c60b9cfbbd3ea10d4ad7d2bc532008284f110e38ff110086f6cc56c4e7640fb662f9b691f28ca9f86e95dba0836005ce3dfcb7d16e4cd48c7da9d21aecdd0
--- a/Assets/arts/atlas/icon/buff.spriteatlas
+++ b/Assets/arts/atlas/icon/buff.spriteatlas
@ -72,10 +72,13 @@ SpriteAtlas:
  - {fileID: 21300000, guid: ebec38e2bfdafd246a9ec89135a5714e, type: 3}
  - {fileID: 21300000, guid: fd824a83cca762246afe64ce585ccccf, type: 3}
  - {fileID: 21300000, guid: df597c1485f572f4faf4cdda764f1022, type: 3}
+  - {fileID: 21300000, guid: 23b2f464f0fc140a581e2141bccdb23c, type: 3}
  - {fileID: 21300000, guid: e82b2ad42c23ffe4f99f87bee23939d2, type: 3}
  - {fileID: 21300000, guid: 043179a56ef8e8d42ae09358dff341bf, type: 3}
  - {fileID: 21300000, guid: c7ad3ea55309c6a42977ac94d536e405, type: 3}
  - {fileID: 21300000, guid: 6568b6c56e8900547b76bf3fc6307823, type: 3}
+  - {fileID: 21300000, guid: 7e91bb376e02142c5ae9713cdf7060bb, type: 3}
+  - {fileID: 21300000, guid: 7958fad7cc4c0491ea22bcad5e968af5, type: 3}
  - {fileID: 21300000, guid: 5f894bd8341956645b5f8643c6442326, type: 3}
  - {fileID: 21300000, guid: 6bd6b8f81811c3f49a743cb13b3d16cc, type: 3}
  - {fileID: 21300000, guid: c70ea649b4ac6ba4cb17164f11d555a9, type: 3}
@ -98,10 +101,13 @@ SpriteAtlas:
  - Imprison
  - poison
  - counterattack
+  - attr_normal_hurtp_all_add
  - stun
  - rebirth
  - lock
  - vulnerable
+  - crit_time_add
+  - crit_add
  - normal_attack_dec
  - thorns
  - curse
--- a/Assets/arts/textures/icon/buff/attr_normal_hurtp_all_add.png
+++ b/Assets/arts/textures/icon/buff/attr_normal_hurtp_all_add.png
--- a/Assets/arts/textures/icon/buff/attr_normal_hurtp_all_add.png.meta
+++ b/Assets/arts/textures/icon/buff/attr_normal_hurtp_all_add.png.meta
@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 23b2f464f0fc140a581e2141bccdb23c
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0, y: 0, z: 0, w: 0}
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    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: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/textures/icon/buff/crit_add.png
+++ b/Assets/arts/textures/icon/buff/crit_add.png
--- a/Assets/arts/textures/icon/buff/crit_add.png.meta
+++ b/Assets/arts/textures/icon/buff/crit_add.png.meta
@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 7958fad7cc4c0491ea22bcad5e968af5
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0, y: 0, z: 0, w: 0}
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    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: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/textures/icon/buff/crit_time_add.png
+++ b/Assets/arts/textures/icon/buff/crit_time_add.png
--- a/Assets/arts/textures/icon/buff/crit_time_add.png.meta
+++ b/Assets/arts/textures/icon/buff/crit_time_add.png.meta
@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 7e91bb376e02142c5ae9713cdf7060bb
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 0, y: 0, z: 0, w: 0}
+  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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    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: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/arts/textures/ui/battle/battle_skill_bg_blue_2.png
+++ b/Assets/arts/textures/ui/battle/battle_skill_bg_blue_2.png
--- a/Assets/arts/textures/ui/battle/battle_skill_bg_green_2.png
+++ b/Assets/arts/textures/ui/battle/battle_skill_bg_green_2.png
--- a/Assets/arts/textures/ui/battle/battle_skill_bg_purple_2.png
+++ b/Assets/arts/textures/ui/battle/battle_skill_bg_purple_2.png
--- a/Assets/arts/textures/ui/battle/battle_skill_bg_red_2.png
+++ b/Assets/arts/textures/ui/battle/battle_skill_bg_red_2.png
--- a/Assets/arts/textures/ui/battle/battle_skill_bg_yellow_2.png
+++ b/Assets/arts/textures/ui/battle/battle_skill_bg_yellow_2.png
--- a/Assets/arts/textures/ui/battle/battle_skill_colorful.png
+++ b/Assets/arts/textures/ui/battle/battle_skill_colorful.png
--- a/Assets/arts/textures/ui/battle/battle_skill_colorful_2.png
+++ b/Assets/arts/textures/ui/battle/battle_skill_colorful_2.png
--- a/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
+++ b/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
--- a/Assets/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua.bytes
+++ b/Assets/lua/app/module/battle/controller/battle_controller_dungeon_gold.lua.bytes
--- a/Assets/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua.bytes
+++ b/Assets/lua/app/module/battle/controller/battle_controller_dungeon_rune.lua.bytes
--- a/Assets/lua/app/ui/battle/battle_skill_select_comp.lua.bytes
+++ b/Assets/lua/app/ui/battle/battle_skill_select_comp.lua.bytes
--- a/Assets/lua/app/ui/battle/battle_ui.lua.bytes
+++ b/Assets/lua/app/ui/battle/battle_ui.lua.bytes
--- a/Assets/lua/app/ui/battle/cell/grid_cell.lua.bytes
+++ b/Assets/lua/app/ui/battle/cell/grid_cell.lua.bytes