DESKTOP-FB72PO8\Administrator 1 månad sedan
förälder
incheckning
72481beb2c
45 ändrade filer med 1025 tillägg och 82 borttagningar
  1. 0 0
      Assets/Art/UIAssets/TextrueJson/skillIcon.txt
  2. 0 0
      Assets/Art/UIAssets/icon/icon_s9001.png
  3. 189 0
      Assets/Art/UIAssets/icon/icon_s9001.png.meta
  4. 0 0
      Assets/Art/UIAssets/icon/icon_s9002.png
  5. 189 0
      Assets/Art/UIAssets/icon/icon_s9002.png.meta
  6. 0 0
      Assets/Art/UIAssets/icon/icon_s9003.png
  7. 189 0
      Assets/Art/UIAssets/icon/icon_s9003.png.meta
  8. 0 0
      Assets/Art/UIAssets/icon/icon_s9005.png
  9. 189 0
      Assets/Art/UIAssets/icon/icon_s9005.png.meta
  10. 0 0
      Assets/Art/UIAssets/icon/icon_s9006.png
  11. 189 0
      Assets/Art/UIAssets/icon/icon_s9006.png.meta
  12. 1 1
      Assets/Res/CombatScenes/CombatRoot.prefab
  13. 5 5
      Assets/Res/Config/HeroModelConfig.json
  14. 3 56
      Assets/Res/UI/CombatPanel.prefab
  15. 5 0
      Assets/Res/UIAtlas/skillIcon.spriteatlasv2
  16. 3 3
      Assets/Scenes/testCombat.scene
  17. 9 9
      Assets/Scripts/GameLogic/Combat/Buff/BuffBasic.cs
  18. 6 6
      Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillSlots.cs
  19. 1 0
      Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3101.cs
  20. 25 0
      Assets/Scripts/GameLogic/Combat/Skill/S9005.cs
  21. 3 0
      Assets/Scripts/GameLogic/Combat/Skill/S9005.cs.meta
  22. 4 0
      Assets/Scripts/GameLogic/Hero/SkillInfo.cs
  23. 2 1
      Assets/Scripts/GameUI/Combat/CombatDrive.cs
  24. 2 1
      Assets/Scripts/GameUI/UI/CombatPanel/BossHpWidget.cs
  25. 5 0
      Assets/Scripts/GameUI/UI/CombatPanel/BuffWidget.cs
  26. 5 0
      Assets/Scripts/GameUI/UI/CombatPanel/HeroHpWidget.cs
  27. 1 0
      Assets/Scripts/GameUI/UI/CombatPanel/gf_widget.cs
  28. BIN
      Excel2Json/Excel/HeroModel.xlsx
  29. 0 0
      UGUIPack/uguiconfig.db
  30. BIN
      美术/art_use_ui/skillIcon/icon_s9001.png
  31. BIN
      美术/art_use_ui/skillIcon/icon_s9002.png
  32. BIN
      美术/art_use_ui/skillIcon/icon_s9003.png
  33. BIN
      美术/art_use_ui/skillIcon/icon_s9005.png
  34. BIN
      美术/art_use_ui/skillIcon/icon_s9006.png
  35. 0 0
      美术/unity_use_ui/TextrueJson/skillIcon.txt
  36. BIN
      美术/unity_use_ui/icon/icon_s9001.png
  37. BIN
      美术/unity_use_ui/icon/icon_s9002.png
  38. BIN
      美术/unity_use_ui/icon/icon_s9003.png
  39. BIN
      美术/unity_use_ui/icon/icon_s9005.png
  40. BIN
      美术/unity_use_ui/icon/icon_s9006.png
  41. BIN
      美术/参考/icon_s9001.png
  42. BIN
      美术/参考/icon_s9002.png
  43. BIN
      美术/参考/icon_s9003.png
  44. BIN
      美术/参考/icon_s9005.png
  45. BIN
      美术/参考/icon_s9006.png

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/skillIcon.txt


+ 0 - 0
美术/参考/163061.png → Assets/Art/UIAssets/icon/icon_s9001.png


+ 189 - 0
Assets/Art/UIAssets/icon/icon_s9001.png.meta

@@ -0,0 +1,189 @@
+fileFormatVersion: 2
+guid: DXhMtHz7VS1uWUkmECUagS83dE5g2eAjY8qVAf2cYQE25cu7vs+JGB4QgGbL
+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: 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
+  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
+  - serializedVersion: 3
+    buildTarget: Android
+    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: WeixinMiniGame
+    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: HMIAndroid
+    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: OpenHarmony
+    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: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
美术/参考/141051.png → Assets/Art/UIAssets/icon/icon_s9002.png


+ 189 - 0
Assets/Art/UIAssets/icon/icon_s9002.png.meta

@@ -0,0 +1,189 @@
+fileFormatVersion: 2
+guid: CHMbsXupVnK+j4H2Kja/QSiHfSMA+RdgCfXfx+vrHCmo26GwR15X8+y8wUf0
+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: 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
+  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
+  - serializedVersion: 3
+    buildTarget: Android
+    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: WeixinMiniGame
+    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: HMIAndroid
+    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: OpenHarmony
+    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: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
美术/参考/151051.png → Assets/Art/UIAssets/icon/icon_s9003.png


+ 189 - 0
Assets/Art/UIAssets/icon/icon_s9003.png.meta

@@ -0,0 +1,189 @@
+fileFormatVersion: 2
+guid: DClLtCOrAnroeqF4Vp8Pz187dnugepFSKRa9Pw9o057c91ct2amLI6oLlEDl
+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: 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
+  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
+  - serializedVersion: 3
+    buildTarget: Android
+    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: WeixinMiniGame
+    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: HMIAndroid
+    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: OpenHarmony
+    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: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
美术/参考/1012 #78928.png → Assets/Art/UIAssets/icon/icon_s9005.png


+ 189 - 0
Assets/Art/UIAssets/icon/icon_s9005.png.meta

@@ -0,0 +1,189 @@
+fileFormatVersion: 2
+guid: Wn5KvXmsBXjqNzZNX21Qr9FnecGtZTK5Tqz+YcUt/gMVlktdFOXvyD+6fr+4
+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: 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
+  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
+  - serializedVersion: 3
+    buildTarget: Android
+    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: WeixinMiniGame
+    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: HMIAndroid
+    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: OpenHarmony
+    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: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
美术/参考/163081.png → Assets/Art/UIAssets/icon/icon_s9006.png


+ 189 - 0
Assets/Art/UIAssets/icon/icon_s9006.png.meta

@@ -0,0 +1,189 @@
+fileFormatVersion: 2
+guid: Wy8X5yz7VHwnFxub7nPyp5jI1w6EAWbN4z6QNN3yyKr8oeQyKqJPbdqIZ4vA
+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: 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
+  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
+  - serializedVersion: 3
+    buildTarget: Android
+    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: WeixinMiniGame
+    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: HMIAndroid
+    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: OpenHarmony
+    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: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/Res/CombatScenes/CombatRoot.prefab

@@ -30,7 +30,7 @@ Transform:
   m_GameObject: {fileID: 65994213146227239}
   serializedVersion: 2
   m_LocalRotation: {x: 0.17364816, y: 0, z: 0, w: 0.9848078}
-  m_LocalPosition: {x: -0, y: 0, z: -0.7}
+  m_LocalPosition: {x: -0, y: -2, z: -0.7}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:

+ 5 - 5
Assets/Res/Config/HeroModelConfig.json

@@ -16,7 +16,7 @@
       "attack": 100,
       "def": 50,
       "shield": 100,
-      "speed_atk": 3.0,
+      "speed_atk": 12.0,
       "skillID": [
         -1,
         -1,
@@ -53,7 +53,7 @@
       "attack": 60,
       "def": 50,
       "shield": 100,
-      "speed_atk": 3.0,
+      "speed_atk": 12.0,
       "skillID": [
         1201,
         2001,
@@ -90,7 +90,7 @@
       "attack": 60,
       "def": 50,
       "shield": 100,
-      "speed_atk": 3.0,
+      "speed_atk": 12.0,
       "skillID": [
         1202,
         2002,
@@ -127,7 +127,7 @@
       "attack": 60,
       "def": 50,
       "shield": 100,
-      "speed_atk": 3.0,
+      "speed_atk": 12.0,
       "skillID": [
         1201,
         2003,
@@ -164,7 +164,7 @@
       "attack": 100,
       "def": 50,
       "shield": 200,
-      "speed_atk": 3.0,
+      "speed_atk": 12.0,
       "skillID": [
         9003,
         9004,

+ 3 - 56
Assets/Res/UI/CombatPanel.prefab

@@ -11596,7 +11596,7 @@ MonoBehaviour:
   m_FillOrigin: 2
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_skill_40001
+  _icon_name: icon_s1101
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
   packInfo:
@@ -13457,7 +13457,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 164.1}
+  m_AnchoredPosition: {x: 0, y: 126.56}
   m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1171805579305711683
@@ -21516,8 +21516,6 @@ GameObject:
   m_Component:
   - component: {fileID: 7763150337150662885}
   - component: {fileID: 3744416999800622053}
-  - component: {fileID: 2718479782146046007}
-  - component: {fileID: 7650928643542360659}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: myImage (2)
@@ -21555,57 +21553,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6644248539060616968}
   m_CullTransparentMesh: 1
---- !u!114 &2718479782146046007
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6644248539060616968}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.87076914, b: 0, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_slot_01
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
-  packInfo:
-    packName: battle
-    packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
-    packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
-    lasetJsonGUID: b16af8f38185cf96d8030bb6e121b19f
---- !u!114 &7650928643542360659
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6644248539060616968}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_ShowMaskGraphic: 0
 --- !u!1 &6676190800533273310
 GameObject:
   m_ObjectHideFlags: 0
@@ -22672,7 +22619,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_skill_40001
+  _icon_name: icon_s1101
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
   packInfo:

+ 5 - 0
Assets/Res/UIAtlas/skillIcon.spriteatlasv2

@@ -42,6 +42,11 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 167da93c49d99d74c978e58dd4b824e6, type: 3}
     - {fileID: 2800000, guid: 1c63b8f7ba1be4f4f86c42e0c11111d5, type: 3}
     - {fileID: 2800000, guid: ca708542b22399b46b6cf2dba4e06763, type: 3}
+    - {fileID: 2800000, guid: 22c1ff6f9ac2cef41bb81f1ec2bc0dc7, type: 3}
+    - {fileID: 2800000, guid: 7944a45953ca79d42a1f323ee8ec1faa, type: 3}
+    - {fileID: 2800000, guid: 3cd196a137d74fa4dbd77603b3930142, type: 3}
+    - {fileID: 2800000, guid: e4e8c1f36ceb6e640b61c0f0d521aa38, type: 3}
+    - {fileID: 2800000, guid: de8b6f772b2ae474b8abc384aab515d3, type: 3}
     - {fileID: 2800000, guid: b76941c63ba5ced44833915a303f4c2b, type: 3}
     - {fileID: 2800000, guid: 7252158098dbcb34cad5374d3976f610, type: 3}
     - {fileID: 2800000, guid: 26e0f7c71e95f4b67b429f478069bc93, type: 3}

+ 3 - 3
Assets/Scenes/testCombat.scene

@@ -2185,7 +2185,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].hp
-      value: 0
+      value: 14055
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].att
@@ -2193,7 +2193,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].hp
-      value: 0
+      value: 14055
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].att
@@ -2225,7 +2225,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

+ 9 - 9
Assets/Scripts/GameLogic/Combat/Buff/BuffBasic.cs

@@ -131,6 +131,15 @@ namespace GameLogic.Combat.Buff
 
         public void Update(float t)
         {
+        
+
+           
+            _currTime += t;
+            if (buffInf.buffTime > 0 && _currTime > buffInf.buffTime)
+            {
+                combatHeroEntity.BuffControl.RemoveBuff(this);
+                return;
+            }
             if (_jianGe > 0)
             {
                 _time += t;
@@ -140,15 +149,6 @@ namespace GameLogic.Combat.Buff
                     UpdateJumping();
                 }
             }
-
-           
-            _currTime += t;
-            if (buffInf.buffTime > 0 && _currTime > buffInf.buffTime)
-            {
-                combatHeroEntity.BuffControl.RemoveBuff(this);
-                return;
-            }
-
             ProUpdate(t);
         }
 

+ 6 - 6
Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillSlots.cs

@@ -111,8 +111,8 @@ namespace GameLogic.Combat.Hero.Turntable
             {
                 finishAngle = (jd - targetAngle);
             }
-
-            return finishAngle / 360f;
+            float allT = SkillBasic.SelfSkillConfig.cd * 360;
+            return (finishAngle+triggerCount*360) / allT;
         }
 
         public float GetFinishAngle()
@@ -140,7 +140,8 @@ namespace GameLogic.Combat.Hero.Turntable
                 finishAngle = (jd - targetAngle);
             }
 
-            return 360f - finishAngle;
+            float allT = SkillBasic.SelfSkillConfig.cd * 360;
+            return allT - (finishAngle+triggerCount*360);
         }
 
         private void Angle(float addAngle)
@@ -176,11 +177,10 @@ namespace GameLogic.Combat.Hero.Turntable
         {
             if (SkillBasic != null)
             {
-                
-                TriggerSkillSlotsEventData triggerSkillSlotsEventData= TriggerSkillSlotsEventData.Create();
+                TriggerSkillSlotsEventData triggerSkillSlotsEventData = TriggerSkillSlotsEventData.Create();
                 triggerSkillSlotsEventData.SkillBasic = SkillBasic;
                 triggerSkillSlotsEventData.SkillSlots = this;
-                triggerSkillSlotsEventData.triggerType= triggerType;
+                triggerSkillSlotsEventData.triggerType = triggerType;
                 CombatEventManager.Instance.Dispatch(CombatEventType.TriggerSkillSlots, triggerSkillSlotsEventData);
                 switch (SkillBasic.wuXingType)
                 {

+ 1 - 0
Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3101.cs

@@ -45,6 +45,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
             BuffInfo buffInfo = BuffInfo.GetBuffInfo(10091, effectValue[0], 1);
 
             target.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
+            SkillPlayFinish();
             // Debug.Log("法宝对敌人照成伤害");
             // ILifetCycleHitPoint lifetCycleHitPoint = target.GetMainHotPoin<ILifetCycleHitPoint>();
             // if (lifetCycleHitPoint == null)

+ 25 - 0
Assets/Scripts/GameLogic/Combat/Skill/S9005.cs

@@ -0,0 +1,25 @@
+using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
+
+namespace GameLogic.Combat.Skill
+{
+    public class S9005: SkillBasic
+    {
+        protected override void ProUseSkill()
+        {
+            ActivationTimeLineData("sk4");
+        }
+
+        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
+            ITimelineFxLogic timelineFxLogic,
+            TriggerData triggerData)
+        {
+            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+                effectValue[0]);
+            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData, wuXingType,
+                HarmType.Default);
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameLogic/Combat/Skill/S9005.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: fc39695289c84524b40ffb5b3c8608ca
+timeCreated: 1747384175

+ 4 - 0
Assets/Scripts/GameLogic/Hero/SkillInfo.cs

@@ -54,6 +54,10 @@ namespace GameLogic.Hero
             SkillData = skillId;
             skillConfig = ConfigComponent.Instance.Get<SkillConfig>(skillId.id * 10 + skillId.star - 1);
             SkillPowerupConfig = ConfigComponent.Instance.Get<SkillPowerupConfig>(skillId.level);
+            if (skillConfig.effectValue == null)
+            {
+                skillConfig.effectValue = new float[1];
+            }
             if (skillConfig.effectValue != null)
             {
                 effectValue = new float[skillConfig.effectValue.Length];

+ 2 - 1
Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -59,6 +59,7 @@ namespace GameLogic.Combat
 
         public async CTask LoadLevelBattleCombat(int levelBattleId, System.Action<bool> caombatFinish)
         {
+            UIManager.Instance.HindCurrAllShowPanel();
             StartCombatInfo startCombatInfo = new StartCombatInfo();
             startCombatInfo.CombatType = CombatType.CombatType.LevelBattle;
             await StartCombat(startCombatInfo);
@@ -83,7 +84,7 @@ namespace GameLogic.Combat
             // await cTaskAwaitBuffer.WaitAll();
             // await CombatHPPanel.OpenCombatHPPanel();
 
-            UIManager.Instance.HindCurrAllShowPanel();
+           
             await CombatPanel.OpenCombatPanel();
             ///播放动画
 

+ 2 - 1
Assets/Scripts/GameUI/UI/CombatPanel/BossHpWidget.cs

@@ -41,6 +41,7 @@ namespace Fort23.Mono
             UIManager.Instance.DormancyGComponent(heroHpWidget);
             heroHpWidget = null;
             UIManager.Instance.DormancyAllGComponent<gf_widget>("bossWidget");
+            UIManager.Instance.DormancyAllGComponent<MagicWeaponWidget>("bossFaBao");
         }
 
 
@@ -153,7 +154,7 @@ namespace Fort23.Mono
                 combatHeroEntity.CombatHeroSkillControl as CombatHeroSkillControl;
             heroHpWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroHpWidget>(HeroHpWidget, null);
-            heroHpWidget.size = 250;
+            heroHpWidget.size = 330;
             heroHpWidget.shieldSize = 100;
             heroHpWidget.isFollowTarget = false;
             heroHpWidget.Init(combatHeroEntity);

+ 5 - 0
Assets/Scripts/GameUI/UI/CombatPanel/BuffWidget.cs

@@ -48,6 +48,11 @@ namespace Fort23.Mono
 
         public void Update()
         {
+            if (buffBasic == null)
+            {
+                return;
+            }
+
             if (buffBasic.buffInf.buffTime > 0)
             {
                 cd.fillAmount = 1 - buffBasic._currTime / buffBasic.buffInf.buffTime;

+ 5 - 0
Assets/Scripts/GameUI/UI/CombatPanel/HeroHpWidget.cs

@@ -45,6 +45,11 @@ namespace Fort23.Mono
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.RemoveBuff,
                 RemoveBuff);
             StaticUpdater.Instance.RemoveRenderUpdateCallBack(Update);
+            for (int i = 0; i < buBetterList.Count; i++)
+            {
+                UIManager.Instance.DormancyGComponent(buBetterList[i]);
+            }
+            buBetterList.Clear();
             base.DormancyObj();
         }
 

+ 1 - 0
Assets/Scripts/GameUI/UI/CombatPanel/gf_widget.cs

@@ -96,6 +96,7 @@ namespace Fort23.Mono
 
             useSkillIcon.transform.parent.gameObject.SetActive(true);
             useSkillIcon.icon_name = SkillBasic.SelfSkillConfig.icon;
+            cd.icon_name=SkillBasic.SelfSkillConfig.icon;
             cd.fillAmount = 0;
             if (SkillBasic.SelfSkillConfig.SkillType == 2)
             {

BIN
Excel2Json/Excel/HeroModel.xlsx


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
UGUIPack/uguiconfig.db


BIN
美术/art_use_ui/skillIcon/icon_s9001.png


BIN
美术/art_use_ui/skillIcon/icon_s9002.png


BIN
美术/art_use_ui/skillIcon/icon_s9003.png


BIN
美术/art_use_ui/skillIcon/icon_s9005.png


BIN
美术/art_use_ui/skillIcon/icon_s9006.png


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
美术/unity_use_ui/TextrueJson/skillIcon.txt


BIN
美术/unity_use_ui/icon/icon_s9001.png


BIN
美术/unity_use_ui/icon/icon_s9002.png


BIN
美术/unity_use_ui/icon/icon_s9003.png


BIN
美术/unity_use_ui/icon/icon_s9005.png


BIN
美术/unity_use_ui/icon/icon_s9006.png


BIN
美术/参考/icon_s9001.png


BIN
美术/参考/icon_s9002.png


BIN
美术/参考/icon_s9003.png


BIN
美术/参考/icon_s9005.png


BIN
美术/参考/icon_s9006.png


Vissa filer visades inte eftersom för många filer har ändrats