Compare commits

base: pan:c3960f1b470aff3c17b832b4bee0b5638ca827fd

Branches Tags

pan:main pan:card0614 pan:card0515 pan:card pan:oh/0_7_1 pan:oneHero1010 pan:new0602 pan:one pan:new2025 pan:new pan:master

...

compare: pan:048595887e6472ac584b698b0fe60f51c2267e7e

Branches Tags

pan:card0614 pan:card0515 pan:card pan:main pan:oh/0_7_1 pan:oneHero1010 pan:new0602 pan:one pan:new2025 pan:new pan:master

4 Commits

c3960f1b47 ... 048595887e

Author	SHA1	Message	Date
walkpan	048595887e	fix(hero cast): 调整敌我单位的目标选择逻辑 ... 重构了SCastSystem中的目标查找逻辑，区分英雄和怪物的目标选择规则：英雄仅按X轴距离选择最近目标，怪物优先选择中路目标后再比较距离，同时更新了对应注释说明。	2026-05-17 21:36:58 +08:00
walkpan	a32eaf3bae	feat(hero, map): 修复FlashSprite查找逻辑，新增英雄升级触发特效 ... 优化HeroViewComp中的FlashSprite查找逻辑，统一为先查找自身节点再遍历子节点 将HeroViewComp的lv_up方法改为公有以支持外部调用 在MissionHeroComp的英雄升级流程中添加升级特效触发代码	2026-05-17 21:27:31 +08:00
walkpan	1cee010e9f	feat(hero): 更新英雄资源与配置，清理废弃文件 ... 更新hk5英雄的图片资源和预制体尺寸为128×128，修正精灵配置元数据 重构英雄配置表HeroInfo，调整现有英雄数据并新增两款辅助英雄 更新卡牌池配置CardPoolList，新增多款英雄卡牌条目 删除废弃的me1.prefab及其元数据文件 清理heros预制体中的旧精灵与动画引用 为mud5预制体添加轮廓材质配置字段	2026-05-17 21:04:58 +08:00
walkpan	76829ad192	英雄动画调整	2026-05-17 16:15:29 +08:00

212 changed files with 600 additions and 1412 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Expand all files Collapse all files

0

assets/resources/game/heros/hero/a1.meta → assets/resources/game/heros/hero/ha1.meta

0

assets/resources/game/heros/hero/a1/atk0.anim → assets/resources/game/heros/hero/ha1/atk0.anim

0

assets/resources/game/heros/hero/a1/atk0.anim.meta → assets/resources/game/heros/hero/ha1/atk0.anim.meta

0

assets/resources/game/heros/hero/a1/idle.anim → assets/resources/game/heros/hero/ha1/idle.anim

0

assets/resources/game/heros/hero/a1/idle.anim.meta → assets/resources/game/heros/hero/ha1/idle.anim.meta

0

assets/resources/game/heros/hero/a1/max0.anim → assets/resources/game/heros/hero/ha1/max0.anim

0

assets/resources/game/heros/hero/a1/max0.anim.meta → assets/resources/game/heros/hero/ha1/max0.anim.meta

0

assets/resources/game/heros/hero/a1/max1.anim → assets/resources/game/heros/hero/ha1/max1.anim

0

assets/resources/game/heros/hero/a1/max1.anim.meta → assets/resources/game/heros/hero/ha1/max1.anim.meta

0

assets/resources/game/heros/hero/a1/move.anim → assets/resources/game/heros/hero/ha1/move.anim

0

assets/resources/game/heros/hero/a1/move.anim.meta → assets/resources/game/heros/hero/ha1/move.anim.meta

0

assets/resources/game/heros/hero/a2.meta → assets/resources/game/heros/hero/ha2.meta

0

assets/resources/game/heros/hero/a2/atk0.anim → assets/resources/game/heros/hero/ha2/atk0.anim

0

assets/resources/game/heros/hero/a2/atk0.anim.meta → assets/resources/game/heros/hero/ha2/atk0.anim.meta

0

assets/resources/game/heros/hero/a2/idle.anim → assets/resources/game/heros/hero/ha2/idle.anim

0

assets/resources/game/heros/hero/a2/idle.anim.meta → assets/resources/game/heros/hero/ha2/idle.anim.meta

0

assets/resources/game/heros/hero/a2/max0.anim → assets/resources/game/heros/hero/ha2/max0.anim

0

assets/resources/game/heros/hero/a2/max0.anim.meta → assets/resources/game/heros/hero/ha2/max0.anim.meta

0

assets/resources/game/heros/hero/a2/max1.anim → assets/resources/game/heros/hero/ha2/max1.anim

0

assets/resources/game/heros/hero/a2/max1.anim.meta → assets/resources/game/heros/hero/ha2/max1.anim.meta

0

assets/resources/game/heros/hero/a2/move.anim → assets/resources/game/heros/hero/ha2/move.anim

0

assets/resources/game/heros/hero/a2/move.anim.meta → assets/resources/game/heros/hero/ha2/move.anim.meta

0

assets/resources/game/heros/hero/a3.meta → assets/resources/game/heros/hero/ha3.meta

0

assets/resources/game/heros/hero/a3/atk0.anim → assets/resources/game/heros/hero/ha3/atk0.anim

0

assets/resources/game/heros/hero/a3/atk0.anim.meta → assets/resources/game/heros/hero/ha3/atk0.anim.meta

0

assets/resources/game/heros/hero/a3/idle.anim → assets/resources/game/heros/hero/ha3/idle.anim

0

assets/resources/game/heros/hero/a3/idle.anim.meta → assets/resources/game/heros/hero/ha3/idle.anim.meta

0

assets/resources/game/heros/hero/a3/max0.anim → assets/resources/game/heros/hero/ha3/max0.anim

0

assets/resources/game/heros/hero/a3/max0.anim.meta → assets/resources/game/heros/hero/ha3/max0.anim.meta

0

assets/resources/game/heros/hero/a3/max1.anim → assets/resources/game/heros/hero/ha3/max1.anim

0

assets/resources/game/heros/hero/a3/max1.anim.meta → assets/resources/game/heros/hero/ha3/max1.anim.meta

0

assets/resources/game/heros/hero/a3/move.anim → assets/resources/game/heros/hero/ha3/move.anim

0

assets/resources/game/heros/hero/a3/move.anim.meta → assets/resources/game/heros/hero/ha3/move.anim.meta

0

assets/resources/game/heros/hero/a4.meta → assets/resources/game/heros/hero/ha4.meta

0

assets/resources/game/heros/hero/a4/atk0.anim → assets/resources/game/heros/hero/ha4/atk0.anim

0

assets/resources/game/heros/hero/a4/atk0.anim.meta → assets/resources/game/heros/hero/ha4/atk0.anim.meta

0

assets/resources/game/heros/hero/a4/idle.anim → assets/resources/game/heros/hero/ha4/idle.anim

0

assets/resources/game/heros/hero/a4/idle.anim.meta → assets/resources/game/heros/hero/ha4/idle.anim.meta

0

assets/resources/game/heros/hero/a4/max0.anim → assets/resources/game/heros/hero/ha4/max0.anim

0

assets/resources/game/heros/hero/a4/max0.anim.meta → assets/resources/game/heros/hero/ha4/max0.anim.meta

0

assets/resources/game/heros/hero/a4/max1.anim → assets/resources/game/heros/hero/ha4/max1.anim

0

assets/resources/game/heros/hero/a4/max1.anim.meta → assets/resources/game/heros/hero/ha4/max1.anim.meta

0

assets/resources/game/heros/hero/a4/move.anim → assets/resources/game/heros/hero/ha4/move.anim

0

assets/resources/game/heros/hero/a4/move.anim.meta → assets/resources/game/heros/hero/ha4/move.anim.meta

0

assets/resources/game/heros/hero/c1.meta → assets/resources/game/heros/hero/hc1.meta

0

assets/resources/game/heros/hero/c1/atk0.anim → assets/resources/game/heros/hero/hc1/atk0.anim

0

assets/resources/game/heros/hero/c1/atk0.anim.meta → assets/resources/game/heros/hero/hc1/atk0.anim.meta

0

assets/resources/game/heros/hero/c1/idle.anim → assets/resources/game/heros/hero/hc1/idle.anim

0

assets/resources/game/heros/hero/c1/idle.anim.meta → assets/resources/game/heros/hero/hc1/idle.anim.meta

0

assets/resources/game/heros/hero/c1/max0.anim → assets/resources/game/heros/hero/hc1/max0.anim

0

assets/resources/game/heros/hero/c1/max0.anim.meta → assets/resources/game/heros/hero/hc1/max0.anim.meta

0

assets/resources/game/heros/hero/c1/max1.anim → assets/resources/game/heros/hero/hc1/max1.anim

0

assets/resources/game/heros/hero/c1/max1.anim.meta → assets/resources/game/heros/hero/hc1/max1.anim.meta

0

assets/resources/game/heros/hero/c1/move.anim → assets/resources/game/heros/hero/hc1/move.anim

0

assets/resources/game/heros/hero/c1/move.anim.meta → assets/resources/game/heros/hero/hc1/move.anim.meta

0

assets/resources/game/heros/hero/c2.meta → assets/resources/game/heros/hero/hc2.meta

0

assets/resources/game/heros/hero/c2/atk0.anim → assets/resources/game/heros/hero/hc2/atk0.anim

0

assets/resources/game/heros/hero/c2/atk0.anim.meta → assets/resources/game/heros/hero/hc2/atk0.anim.meta

0

assets/resources/game/heros/hero/c2/idle.anim → assets/resources/game/heros/hero/hc2/idle.anim

0

assets/resources/game/heros/hero/c2/idle.anim.meta → assets/resources/game/heros/hero/hc2/idle.anim.meta

0

assets/resources/game/heros/hero/c2/max0.anim → assets/resources/game/heros/hero/hc2/max0.anim

0

assets/resources/game/heros/hero/c2/max0.anim.meta → assets/resources/game/heros/hero/hc2/max0.anim.meta

0

assets/resources/game/heros/hero/c2/max1.anim → assets/resources/game/heros/hero/hc2/max1.anim

0

assets/resources/game/heros/hero/c2/max1.anim.meta → assets/resources/game/heros/hero/hc2/max1.anim.meta

0

assets/resources/game/heros/hero/c2/move.anim → assets/resources/game/heros/hero/hc2/move.anim

0

assets/resources/game/heros/hero/c2/move.anim.meta → assets/resources/game/heros/hero/hc2/move.anim.meta

0

assets/resources/game/heros/hero/h1.meta → assets/resources/game/heros/hero/hh1.meta

0

assets/resources/game/heros/hero/h1/atk0.anim → assets/resources/game/heros/hero/hh1/atk0.anim

0

assets/resources/game/heros/hero/h1/atk0.anim.meta → assets/resources/game/heros/hero/hh1/atk0.anim.meta

0

assets/resources/game/heros/hero/h1/idle.anim → assets/resources/game/heros/hero/hh1/idle.anim

0

assets/resources/game/heros/hero/h1/idle.anim.meta → assets/resources/game/heros/hero/hh1/idle.anim.meta

0

assets/resources/game/heros/hero/h1/max0.anim → assets/resources/game/heros/hero/hh1/max0.anim

0

assets/resources/game/heros/hero/h1/max0.anim.meta → assets/resources/game/heros/hero/hh1/max0.anim.meta

0

assets/resources/game/heros/hero/h1/max1.anim → assets/resources/game/heros/hero/hh1/max1.anim

0

assets/resources/game/heros/hero/h1/max1.anim.meta → assets/resources/game/heros/hero/hh1/max1.anim.meta

0

assets/resources/game/heros/hero/h1/move.anim → assets/resources/game/heros/hero/hh1/move.anim

0

assets/resources/game/heros/hero/h1/move.anim.meta → assets/resources/game/heros/hero/hh1/move.anim.meta

0

assets/resources/game/heros/hero/h2.meta → assets/resources/game/heros/hero/hh2.meta

0

assets/resources/game/heros/hero/h2/atk0.anim → assets/resources/game/heros/hero/hh2/atk0.anim

0

assets/resources/game/heros/hero/h2/atk0.anim.meta → assets/resources/game/heros/hero/hh2/atk0.anim.meta

0

assets/resources/game/heros/hero/h2/idle.anim → assets/resources/game/heros/hero/hh2/idle.anim

0

assets/resources/game/heros/hero/h2/idle.anim.meta → assets/resources/game/heros/hero/hh2/idle.anim.meta

0

assets/resources/game/heros/hero/h2/max0.anim → assets/resources/game/heros/hero/hh2/max0.anim

0

assets/resources/game/heros/hero/h2/max0.anim.meta → assets/resources/game/heros/hero/hh2/max0.anim.meta

0

assets/resources/game/heros/hero/h2/max1.anim → assets/resources/game/heros/hero/hh2/max1.anim

0

assets/resources/game/heros/hero/h2/max1.anim.meta → assets/resources/game/heros/hero/hh2/max1.anim.meta

0

assets/resources/game/heros/hero/h2/move.anim → assets/resources/game/heros/hero/hh2/move.anim

0

assets/resources/game/heros/hero/h2/move.anim.meta → assets/resources/game/heros/hero/hh2/move.anim.meta

0

assets/resources/game/heros/hero/k1.meta → assets/resources/game/heros/hero/hk1.meta

0

assets/resources/game/heros/hero/k1/atk0.anim → assets/resources/game/heros/hero/hk1/atk0.anim

0

assets/resources/game/heros/hero/k1/atk0.anim.meta → assets/resources/game/heros/hero/hk1/atk0.anim.meta

0

assets/resources/game/heros/hero/k1/idle.anim → assets/resources/game/heros/hero/hk1/idle.anim

0

assets/resources/game/heros/hero/k1/idle.anim.meta → assets/resources/game/heros/hero/hk1/idle.anim.meta

0

assets/resources/game/heros/hero/k1/max0.anim → assets/resources/game/heros/hero/hk1/max0.anim

0

assets/resources/game/heros/hero/k1/max0.anim.meta → assets/resources/game/heros/hero/hk1/max0.anim.meta

0

assets/resources/game/heros/hero/k1/max1.anim → assets/resources/game/heros/hero/hk1/max1.anim

0

assets/resources/game/heros/hero/k1/max1.anim.meta → assets/resources/game/heros/hero/hk1/max1.anim.meta

0

assets/resources/game/heros/hero/k1/move.anim → assets/resources/game/heros/hero/hk1/move.anim

0

assets/resources/game/heros/hero/k1/move.anim.meta → assets/resources/game/heros/hero/hk1/move.anim.meta

0

assets/resources/game/heros/hero/k2.meta → assets/resources/game/heros/hero/hk2.meta

Some files were not shown because too many files have changed in this diff Show More