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

2025-10-18 14:37:33 +08:00 · 2025-10-18 14:37:33 +08:00 · 974db01487
commit 974db01487
parent 6c75f30ffe 29ded94b59
33 changed files with 1166 additions and 161 deletions
--- a/Assets/arts/effects/texture/fire_yjs_0001_1.png.meta
+++ b/Assets/arts/effects/texture/fire_yjs_0001_1.png.meta
@ -6,7 +6,7 @@ TextureImporter:
  serializedVersion: 12
  mipmaps:
    mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
@ -101,6 +101,30 @@ TextureImporter:
    overridden: 0
    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: Android
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: 47
    textureCompression: 0
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 1
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/Assets/arts/effects/texture/fx_b10_c014.png.meta
+++ b/Assets/arts/effects/texture/fx_b10_c014.png.meta
@ -6,7 +6,7 @@ TextureImporter:
  serializedVersion: 12
  mipmaps:
    mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
@ -101,6 +101,30 @@ TextureImporter:
    overridden: 0
    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: Android
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: 47
    textureCompression: 0
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 1
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/Assets/arts/spines/characters/p55002/p55002.skel.bytes
+++ b/Assets/arts/spines/characters/p55002/p55002.skel.bytes
--- a/Assets/lua/app/common/bi_report.lua.bytes
+++ b/Assets/lua/app/common/bi_report.lua.bytes
--- a/Assets/lua/app/config/buff.lua.bytes
+++ b/Assets/lua/app/config/buff.lua.bytes
--- a/Assets/lua/app/config/chapter.lua.bytes
+++ b/Assets/lua/app/config/chapter.lua.bytes
--- a/Assets/lua/app/config/fx.lua.bytes
+++ b/Assets/lua/app/config/fx.lua.bytes
--- a/Assets/lua/app/config/localization/localization_global_const.lua.bytes
+++ b/Assets/lua/app/config/localization/localization_global_const.lua.bytes
--- a/Assets/lua/app/config/skill.lua.bytes
+++ b/Assets/lua/app/config/skill.lua.bytes
--- a/Assets/lua/app/config/skill_rogue.lua.bytes
+++ b/Assets/lua/app/config/skill_rogue.lua.bytes
--- a/Assets/lua/app/config/strings/cn/global.lua.bytes
+++ b/Assets/lua/app/config/strings/cn/global.lua.bytes
--- a/Assets/lua/app/config/strings/cn/skill_rogue.lua.bytes
+++ b/Assets/lua/app/config/strings/cn/skill_rogue.lua.bytes
--- a/Assets/lua/app/global/global_func.lua.bytes
+++ b/Assets/lua/app/global/global_func.lua.bytes
--- a/Assets/lua/app/module/battle/battle_const.lua.bytes
+++ b/Assets/lua/app/module/battle/battle_const.lua.bytes
--- a/Assets/lua/app/module/battle/battle_manager.lua.bytes
+++ b/Assets/lua/app/module/battle/battle_manager.lua.bytes
--- 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/helper/battle_buff_handle.lua.bytes
+++ b/Assets/lua/app/module/battle/helper/battle_buff_handle.lua.bytes
--- a/Assets/lua/app/module/battle/skill/battle_rogue_skill_handle.lua.bytes
+++ b/Assets/lua/app/module/battle/skill/battle_rogue_skill_handle.lua.bytes
--- a/Assets/lua/app/module/gm/gm_const.lua.bytes
+++ b/Assets/lua/app/module/gm/gm_const.lua.bytes
--- a/Assets/lua/app/module/hero/hero_manager.lua.bytes
+++ b/Assets/lua/app/module/hero/hero_manager.lua.bytes
--- a/Assets/lua/app/ui/battle/battle_pause_ui.lua.bytes
+++ b/Assets/lua/app/ui/battle/battle_pause_ui.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/battle_select_skill_cell.lua.bytes
+++ b/Assets/lua/app/ui/battle/cell/battle_select_skill_cell.lua.bytes
--- a/Assets/lua/app/ui/equip/equip_growth_ui.lua.bytes
+++ b/Assets/lua/app/ui/equip/equip_growth_ui.lua.bytes
--- a/Assets/lua/app/ui/equip/equip_info_ui.lua.bytes
+++ b/Assets/lua/app/ui/equip/equip_info_ui.lua.bytes
--- a/Assets/lua/app/ui/gm/gm_tool_ui.lua.bytes
+++ b/Assets/lua/app/ui/gm/gm_tool_ui.lua.bytes
--- a/Assets/lua/app/ui/hero/hero_attr_all_ui.lua.bytes
+++ b/Assets/lua/app/ui/hero/hero_attr_all_ui.lua.bytes
--- a/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes
+++ b/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes
--- a/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes
+++ b/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes
--- a/Assets/lua/app/userdata/battle/battle_base_data.lua.bytes
+++ b/Assets/lua/app/userdata/battle/battle_base_data.lua.bytes
--- a/Assets/lua/app/userdata/hero/hero_entity.lua.bytes
+++ b/Assets/lua/app/userdata/hero/hero_entity.lua.bytes
--- a/Assets/prefabs/ui/battle/battle_ui.prefab
+++ b/Assets/prefabs/ui/battle/battle_ui.prefab