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

2025-10-16 21:32:02 +08:00 · 2025-10-16 21:32:02 +08:00 · 70083216c3
commit 70083216c3
parent fb15192cb0 b845ca91b3
33 changed files with 143 additions and 74 deletions
--- a/Assets/arts/effects/texture/fx_b10_b038.png.meta
+++ b/Assets/arts/effects/texture/fx_b10_b038.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/mask6037.png.meta
+++ b/Assets/arts/effects/texture/mask6037.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/ui/ui_main_btn_challenge/ui_main_btn_challenge.atlas.txt
+++ b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.atlas.txt
@ -1,34 +1,28 @@
 ui_main_btn_challenge.png
 size:256,256
 filter:Linear,Linear
-fang1
-bounds:98,196,6,6
-offsets:1,1,8,8
-fang2
-bounds:98,196,6,6
-offsets:1,1,8,8
-fang3
-bounds:98,196,6,6
-offsets:1,1,8,8
-fang4
-bounds:98,196,6,6
-offsets:1,1,8,8
-fang5
-bounds:98,196,6,6
-offsets:1,1,8,8
-fang7
-bounds:98,196,6,6
-offsets:1,1,8,8
-fang8
-bounds:98,196,6,6
-offsets:1,1,8,8
-fang6
-bounds:2,2,6,6
-offsets:1,1,8,8
-spine
-bounds:2,107,94,95
-offsets:1,1,96,97
-tiao
-bounds:98,188,5,6
+he_1
+bounds:2,2,114,45
+offsets:1,1,116,47
+he_2
+bounds:118,194,114,55
+offsets:1,1,116,57
+hero_1
+bounds:118,101,31,23
+offsets:1,1,33,25
+hero_2
+bounds:208,161,31,23
+offsets:1,1,33,25
+rotate:90
+hero_3
+bounds:118,77,31,22
+offsets:1,1,33,24
+ping
+bounds:118,126,88,66
+offsets:1,1,90,68
+yingzi
+bounds:2,150,114,99
+offsets:1,1,116,101
 zhihui
-bounds:2,10,94,95
+bounds:2,49,114,99
+offsets:1,1,116,101
--- a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.png
+++ b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.png
--- a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.skel.bytes
+++ b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.skel.bytes
--- a/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.atlas.txt
+++ b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.atlas.txt
@ -1,23 +1,48 @@
 ui_main_btn_company.png
 size:256,256
 filter:Linear,Linear
-jz_1
-bounds:103,189,56,49
-offsets:1,1,58,51
-jz_2
-bounds:103,155,24,32
-offsets:1,1,26,34
-jz_3
-bounds:2,2,16,10
-offsets:1,1,18,12
-jz_4
-bounds:161,203,9,35
-offsets:1,1,11,37
-jz_5
-bounds:2,48,92,89
-offsets:1,1,94,91
-jz_6
-bounds:2,14,59,32
-offsets:1,1,61,34
+eye_l
+bounds:37,30,15,6
+offsets:1,1,17,8
+eye_l_1
+bounds:198,175,6,15
+offsets:1,1,8,17
+eye_r_1
+bounds:198,175,6,15
+offsets:1,1,8,17
+eye_l_xx
+bounds:124,48,16,18
+offsets:2,2,19,21
+eye_r_xx
+bounds:124,48,16,18
+offsets:2,2,19,21
+eye_r
+bounds:231,248,15,6
+offsets:1,1,17,8
+face_1
+bounds:198,192,62,31
+offsets:1,1,64,33
+rotate:90
+face_2
+bounds:124,68,82,49
+offsets:1,1,84,51
+rotate:90
+men
+bounds:2,2,34,33
+offsets:1,1,36,35
+rotate:90
+spine_1
+bounds:124,152,72,102
+offsets:1,1,74,104
+spine_2
+bounds:175,77,57,73
+offsets:1,1,59,75
+spine_3
+bounds:175,2,57,73
+offsets:1,1,59,75
+yingzi
+bounds:2,38,120,102
+offsets:1,1,122,104
 zhihui
-bounds:2,139,99,99
+bounds:2,142,120,112
+offsets:1,1,122,114
--- a/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.png
+++ b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.png
--- a/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.skel.bytes
+++ b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.skel.bytes
--- a/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.atlas.txt
+++ b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.atlas.txt
@ -1,20 +1,21 @@
 ui_main_btn_shop.png
 size:256,256
 filter:Linear,Linear
-cp_1
-bounds:92,93,40,12
-offsets:1,1,42,14
+ding
+bounds:111,31,107,55
 rotate:90
-cp_2
-bounds:110,147,41,21
+men
+bounds:213,216,36,33
+offsets:1,1,38,35
+pengying
+bounds:168,36,102,49
+offsets:1,1,104,51
 rotate:90
-cp_3
-bounds:2,2,43,27
-cp_4
-bounds:110,190,40,47
-shouqiang
-bounds:2,31,88,102
-offsets:1,1,90,104
+spine
+bounds:111,140,100,109
+yingzi
+bounds:2,25,107,108
+offsets:1,1,109,110
 zhihui
-bounds:2,135,106,102
-offsets:1,1,108,104
+bounds:2,135,107,114
+offsets:1,1,109,116
--- a/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.png
+++ b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.png
--- a/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.skel.bytes
+++ b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.skel.bytes
--- a/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop_material.mat
+++ b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop_material.mat
@ -9,7 +9,8 @@ Material:
  m_PrefabAsset: {fileID: 0}
  m_Name: ui_main_btn_shop_material
  m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _STRAIGHT_ALPHA_INPUT
  m_InvalidKeywords:
  - _USE8NEIGHBOURHOOD_ON
  m_LightmapFlags: 4
@ -36,7 +37,7 @@ Material:
    - _OutlineWidth: 3
    - _StencilComp: 8
    - _StencilRef: 1
-    - _StraightAlphaInput: 0
+    - _StraightAlphaInput: 1
    - _ThresholdEnd: 0.25
    - _Use8Neighbourhood: 1
    - _UseScreenSpaceOutlineWidth: 0
--- a/Assets/arts/spines/ui/ui_main_btn_summon/ui_main_btn_summon.skel.bytes
+++ b/Assets/arts/spines/ui/ui_main_btn_summon/ui_main_btn_summon.skel.bytes
--- a/Assets/lua/app/config/buff.lua.bytes
+++ b/Assets/lua/app/config/buff.lua.bytes
--- a/Assets/lua/app/config/item.lua.bytes
+++ b/Assets/lua/app/config/item.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/module/battle/battle_const.lua.bytes
+++ b/Assets/lua/app/module/battle/battle_const.lua.bytes
--- a/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
+++ b/Assets/lua/app/module/battle/component/battle_unit_comp.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_board_touch_helper.lua.bytes
+++ b/Assets/lua/app/module/battle/helper/battle_board_touch_helper.lua.bytes
--- a/Assets/lua/app/module/battle/helper/battle_passive.lua.bytes
+++ b/Assets/lua/app/module/battle/helper/battle_passive.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/battle/team/battle_team.lua.bytes
+++ b/Assets/lua/app/module/battle/team/battle_team.lua.bytes
--- a/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes
+++ b/Assets/lua/app/ui/battle/battle_base_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/battle/cell/grid_cell.lua.bytes
+++ b/Assets/lua/app/ui/battle/cell/grid_cell.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/battle/battle_grid_entity.lua.bytes
+++ b/Assets/lua/app/userdata/battle/battle_grid_entity.lua.bytes
--- a/Assets/lua/app/userdata/battle/skill/battle_buff_entity.lua.bytes
+++ b/Assets/lua/app/userdata/battle/skill/battle_buff_entity.lua.bytes
--- a/Assets/lua/app/userdata/battle/skill/battle_skill_entity.lua.bytes
+++ b/Assets/lua/app/userdata/battle/skill/battle_skill_entity.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_result_ui.prefab
+++ b/Assets/prefabs/ui/battle/battle_result_ui.prefab
@ -2050,8 +2050,8 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 6494950659398821500}
-  - {fileID: 6911264791947976490}
  - {fileID: 7770004333418327666}
+  - {fileID: 6911264791947976490}
  - {fileID: 1903267056959353055}
  - {fileID: 4710100049825492546}
  m_Father: {fileID: 4165930251451731960}
@ -4870,17 +4870,17 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7921166426620139622}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: 8.428379e-12, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 445959573539459069}
-  m_RootOrder: 1
+  m_RootOrder: 2
  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: 0}
+  m_AnchoredPosition: {x: 0, y: 133.41003}
  m_SizeDelta: {x: 598, y: 492}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8701922404334855556
@ -6488,7 +6488,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
      propertyPath: m_RootOrder
-      value: 2
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
      propertyPath: m_AnchorMax.x