diff --git a/.gitignore b/.gitignore index a354e23..1917c29 100644 --- a/.gitignore +++ b/.gitignore @@ -88,9 +88,5 @@ crashlytics-build.properties ~$*.xlsx Assets/GameMain/Configs/ResourceBuilder.xml -/.dotnet -/.omx /.vscode -/openspec/changes/archive -/.omc -/.claude +/Tools/make_atlas/input diff --git a/AGENTS.md b/AGENTS.md index 3a44e76..8900a17 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -24,7 +24,7 @@ - UGF 只对顶级 Form 调用 `OnInit/OnOpen/OnClose` 生命周期;**嵌套 Form 的这些方法永远不会执行**。事件绑定用幂等模式(`_listenersBound` 标志 + `EnsureXxx()`),放在能力入口(如 `Refresh`)里。 - 子 Form 只提供能力(public 方法,幂等可重入),数据由调用方传入;只有顶级 Form 有编排权。子组件向上通信用 `GameEntry.Event.Fire` + `XxxEventArgs`(放 `Scripts/Base/Event/UIForm/`,`ReferencePool` + `Create`/`Clear`),禁止反向持有父 Form。 -## Luban 约定(详见 `Docs/Tech/01_LubanDataTable.md`) +## Luban 约定(详见 `docs/tech/01_LubanDataTable.md`) - 表名小写 `tbxxxconfig`:Excel 表名、导出文件名、`Tables` 构造参数、`TableNames` 数组四处必须一致。 - 访问入口 `GameEntry.Luban.Get(id)` / `GetTable()`;单行表(`mode=one`,如 `tbglobalconfig`)不注册访问器,走 `Tables.TbXxxConfig.Data`。 diff --git a/Tools/make_atlas/input/love-song.png b/Tools/make_atlas/input/love-song.png deleted file mode 100644 index d2977a1..0000000 Binary files a/Tools/make_atlas/input/love-song.png and /dev/null differ diff --git a/Tools/make_atlas/input/lyre.png b/Tools/make_atlas/input/lyre.png deleted file mode 100644 index 7a2f39e..0000000 Binary files a/Tools/make_atlas/input/lyre.png and /dev/null differ diff --git a/Tools/make_atlas/input/mace-head.png b/Tools/make_atlas/input/mace-head.png deleted file mode 100644 index d6a603c..0000000 Binary files a/Tools/make_atlas/input/mace-head.png and /dev/null differ diff --git a/Tools/make_atlas/input/machete.png b/Tools/make_atlas/input/machete.png deleted file mode 100644 index 1c9a9be..0000000 Binary files a/Tools/make_atlas/input/machete.png and /dev/null differ diff --git a/Tools/make_atlas/input/mad-scientist.png b/Tools/make_atlas/input/mad-scientist.png deleted file mode 100644 index 99cb10f..0000000 Binary files a/Tools/make_atlas/input/mad-scientist.png and /dev/null differ diff --git a/Tools/make_atlas/input/maggot.png b/Tools/make_atlas/input/maggot.png deleted file mode 100644 index de6af87..0000000 Binary files a/Tools/make_atlas/input/maggot.png and /dev/null differ diff --git a/Tools/make_atlas/input/magic-gate.png b/Tools/make_atlas/input/magic-gate.png deleted file mode 100644 index 80faa37..0000000 Binary files a/Tools/make_atlas/input/magic-gate.png and /dev/null differ diff --git a/Tools/make_atlas/input/magic-lamp.png b/Tools/make_atlas/input/magic-lamp.png deleted file mode 100644 index c7c6644..0000000 Binary files a/Tools/make_atlas/input/magic-lamp.png and /dev/null differ diff --git a/Tools/make_atlas/input/magic-palm.png b/Tools/make_atlas/input/magic-palm.png deleted file mode 100644 index aebc9aa..0000000 Binary files a/Tools/make_atlas/input/magic-palm.png and /dev/null differ diff --git a/Tools/make_atlas/input/magic-portal.png b/Tools/make_atlas/input/magic-portal.png deleted file mode 100644 index 568406e..0000000 Binary files a/Tools/make_atlas/input/magic-portal.png and /dev/null differ diff --git a/Tools/make_atlas/input/magic-shield.png b/Tools/make_atlas/input/magic-shield.png deleted file mode 100644 index fd81999..0000000 Binary files a/Tools/make_atlas/input/magic-shield.png and /dev/null differ diff --git a/Tools/make_atlas/input/magic-swirl.png b/Tools/make_atlas/input/magic-swirl.png deleted file mode 100644 index c69c0e5..0000000 Binary files a/Tools/make_atlas/input/magic-swirl.png and /dev/null differ diff --git a/Tools/make_atlas/input/magnet-blast.png b/Tools/make_atlas/input/magnet-blast.png deleted file mode 100644 index 2f0a583..0000000 Binary files a/Tools/make_atlas/input/magnet-blast.png and /dev/null differ diff --git a/Tools/make_atlas/input/magnet.png b/Tools/make_atlas/input/magnet.png deleted file mode 100644 index 85bbc14..0000000 Binary files a/Tools/make_atlas/input/magnet.png and /dev/null differ diff --git a/Tools/make_atlas/input/magnifying-glass.png b/Tools/make_atlas/input/magnifying-glass.png deleted file mode 100644 index 6b32e66..0000000 Binary files a/Tools/make_atlas/input/magnifying-glass.png and /dev/null differ diff --git a/Tools/make_atlas/input/mail-shirt.png b/Tools/make_atlas/input/mail-shirt.png deleted file mode 100644 index 0485adb..0000000 Binary files a/Tools/make_atlas/input/mail-shirt.png and /dev/null differ diff --git a/Tools/make_atlas/input/mailed-fist.png b/Tools/make_atlas/input/mailed-fist.png deleted file mode 100644 index 147e49c..0000000 Binary files a/Tools/make_atlas/input/mailed-fist.png and /dev/null differ diff --git a/Tools/make_atlas/input/manacles.png b/Tools/make_atlas/input/manacles.png deleted file mode 100644 index 38bfee8..0000000 Binary files a/Tools/make_atlas/input/manacles.png and /dev/null differ diff --git a/Tools/make_atlas/input/mantrap.png b/Tools/make_atlas/input/mantrap.png deleted file mode 100644 index fceae13..0000000 Binary files a/Tools/make_atlas/input/mantrap.png and /dev/null differ diff --git a/Tools/make_atlas/input/maple-leaf.png b/Tools/make_atlas/input/maple-leaf.png deleted file mode 100644 index 73563ec..0000000 Binary files a/Tools/make_atlas/input/maple-leaf.png and /dev/null differ diff --git a/Tools/make_atlas/input/marrow-drain.png b/Tools/make_atlas/input/marrow-drain.png deleted file mode 100644 index 9fca547..0000000 Binary files a/Tools/make_atlas/input/marrow-drain.png and /dev/null differ diff --git a/Tools/make_atlas/input/martini.png b/Tools/make_atlas/input/martini.png deleted file mode 100644 index 8fde4cd..0000000 Binary files a/Tools/make_atlas/input/martini.png and /dev/null differ diff --git a/Tools/make_atlas/input/masked-spider.png b/Tools/make_atlas/input/masked-spider.png deleted file mode 100644 index 5416ad2..0000000 Binary files a/Tools/make_atlas/input/masked-spider.png and /dev/null differ diff --git a/Tools/make_atlas/input/master-of-arms.png b/Tools/make_atlas/input/master-of-arms.png deleted file mode 100644 index 9c21808..0000000 Binary files a/Tools/make_atlas/input/master-of-arms.png and /dev/null differ diff --git a/Tools/make_atlas/input/match-head.png b/Tools/make_atlas/input/match-head.png deleted file mode 100644 index 25e400b..0000000 Binary files a/Tools/make_atlas/input/match-head.png and /dev/null differ diff --git a/Tools/make_atlas/input/match-tip.png b/Tools/make_atlas/input/match-tip.png deleted file mode 100644 index 8f564f3..0000000 Binary files a/Tools/make_atlas/input/match-tip.png and /dev/null differ diff --git a/Tools/make_atlas/input/materials-science.png b/Tools/make_atlas/input/materials-science.png deleted file mode 100644 index ce923ac..0000000 Binary files a/Tools/make_atlas/input/materials-science.png and /dev/null differ diff --git a/Tools/make_atlas/input/maze-cornea.png b/Tools/make_atlas/input/maze-cornea.png deleted file mode 100644 index fb61b0b..0000000 Binary files a/Tools/make_atlas/input/maze-cornea.png and /dev/null differ diff --git a/Tools/make_atlas/input/maze-saw.png b/Tools/make_atlas/input/maze-saw.png deleted file mode 100644 index 00dd0d4..0000000 Binary files a/Tools/make_atlas/input/maze-saw.png and /dev/null differ diff --git a/Tools/make_atlas/input/maze.png b/Tools/make_atlas/input/maze.png deleted file mode 100644 index 244ebe4..0000000 Binary files a/Tools/make_atlas/input/maze.png and /dev/null differ diff --git a/Tools/make_atlas/input/meat-cleaver.png b/Tools/make_atlas/input/meat-cleaver.png deleted file mode 100644 index ecea4a0..0000000 Binary files a/Tools/make_atlas/input/meat-cleaver.png and /dev/null differ diff --git a/Tools/make_atlas/input/meat-hook.png b/Tools/make_atlas/input/meat-hook.png deleted file mode 100644 index 3c5dd55..0000000 Binary files a/Tools/make_atlas/input/meat-hook.png and /dev/null differ diff --git a/Tools/make_atlas/input/meat.png b/Tools/make_atlas/input/meat.png deleted file mode 100644 index eaa2e13..0000000 Binary files a/Tools/make_atlas/input/meat.png and /dev/null differ diff --git a/Tools/make_atlas/input/mechanical-arm.png b/Tools/make_atlas/input/mechanical-arm.png deleted file mode 100644 index 8aa095d..0000000 Binary files a/Tools/make_atlas/input/mechanical-arm.png and /dev/null differ diff --git a/Tools/make_atlas/input/medal-skull.png b/Tools/make_atlas/input/medal-skull.png deleted file mode 100644 index 416499f..0000000 Binary files a/Tools/make_atlas/input/medal-skull.png and /dev/null differ diff --git a/Tools/make_atlas/input/medal.png b/Tools/make_atlas/input/medal.png deleted file mode 100644 index a342f69..0000000 Binary files a/Tools/make_atlas/input/medal.png and /dev/null differ diff --git a/Tools/make_atlas/input/meditation.png b/Tools/make_atlas/input/meditation.png deleted file mode 100644 index 3f70409..0000000 Binary files a/Tools/make_atlas/input/meditation.png and /dev/null differ diff --git a/Tools/make_atlas/input/megabot.png b/Tools/make_atlas/input/megabot.png deleted file mode 100644 index 3e25129..0000000 Binary files a/Tools/make_atlas/input/megabot.png and /dev/null differ diff --git a/Tools/make_atlas/input/mesh-ball.png b/Tools/make_atlas/input/mesh-ball.png deleted file mode 100644 index d245302..0000000 Binary files a/Tools/make_atlas/input/mesh-ball.png and /dev/null differ diff --git a/Tools/make_atlas/input/metal-bar.png b/Tools/make_atlas/input/metal-bar.png deleted file mode 100644 index d924e56..0000000 Binary files a/Tools/make_atlas/input/metal-bar.png and /dev/null differ diff --git a/Tools/make_atlas/input/metal-disc.png b/Tools/make_atlas/input/metal-disc.png deleted file mode 100644 index 83f5ef9..0000000 Binary files a/Tools/make_atlas/input/metal-disc.png and /dev/null differ diff --git a/Tools/make_atlas/input/metal-hand.png b/Tools/make_atlas/input/metal-hand.png deleted file mode 100644 index e13c825..0000000 Binary files a/Tools/make_atlas/input/metal-hand.png and /dev/null differ diff --git a/Tools/make_atlas/input/metal-scales.png b/Tools/make_atlas/input/metal-scales.png deleted file mode 100644 index acf90b9..0000000 Binary files a/Tools/make_atlas/input/metal-scales.png and /dev/null differ diff --git a/Tools/make_atlas/input/meteor-impact.png b/Tools/make_atlas/input/meteor-impact.png deleted file mode 100644 index c9340bb..0000000 Binary files a/Tools/make_atlas/input/meteor-impact.png and /dev/null differ diff --git a/Tools/make_atlas/input/microchip.png b/Tools/make_atlas/input/microchip.png deleted file mode 100644 index 2f34c91..0000000 Binary files a/Tools/make_atlas/input/microchip.png and /dev/null differ diff --git a/Tools/make_atlas/input/microscope-lens.png b/Tools/make_atlas/input/microscope-lens.png deleted file mode 100644 index 0f7ab6f..0000000 Binary files a/Tools/make_atlas/input/microscope-lens.png and /dev/null differ diff --git a/Tools/make_atlas/input/middle-arrow.png b/Tools/make_atlas/input/middle-arrow.png deleted file mode 100644 index 438e484..0000000 Binary files a/Tools/make_atlas/input/middle-arrow.png and /dev/null differ diff --git a/Tools/make_atlas/input/midnight-claw.png b/Tools/make_atlas/input/midnight-claw.png deleted file mode 100644 index 015df84..0000000 Binary files a/Tools/make_atlas/input/midnight-claw.png and /dev/null differ diff --git a/Tools/make_atlas/input/mighty-spanner.png b/Tools/make_atlas/input/mighty-spanner.png deleted file mode 100644 index 0b96230..0000000 Binary files a/Tools/make_atlas/input/mighty-spanner.png and /dev/null differ diff --git a/Tools/make_atlas/input/mine-explosion.png b/Tools/make_atlas/input/mine-explosion.png deleted file mode 100644 index 45878d0..0000000 Binary files a/Tools/make_atlas/input/mine-explosion.png and /dev/null differ diff --git a/Tools/make_atlas/input/mineral-heart.png b/Tools/make_atlas/input/mineral-heart.png deleted file mode 100644 index 1a09d83..0000000 Binary files a/Tools/make_atlas/input/mineral-heart.png and /dev/null differ diff --git a/Tools/make_atlas/input/minigun.png b/Tools/make_atlas/input/minigun.png deleted file mode 100644 index d2d34ac..0000000 Binary files a/Tools/make_atlas/input/minigun.png and /dev/null differ diff --git a/Tools/make_atlas/input/mining.png b/Tools/make_atlas/input/mining.png deleted file mode 100644 index fc3c57a..0000000 Binary files a/Tools/make_atlas/input/mining.png and /dev/null differ diff --git a/Tools/make_atlas/input/minions.png b/Tools/make_atlas/input/minions.png deleted file mode 100644 index 0fc13b1..0000000 Binary files a/Tools/make_atlas/input/minions.png and /dev/null differ diff --git a/Tools/make_atlas/input/minotaur.png b/Tools/make_atlas/input/minotaur.png deleted file mode 100644 index 4f70a8b..0000000 Binary files a/Tools/make_atlas/input/minotaur.png and /dev/null differ diff --git a/Tools/make_atlas/input/miracle-medecine.png b/Tools/make_atlas/input/miracle-medecine.png deleted file mode 100644 index 8c70b99..0000000 Binary files a/Tools/make_atlas/input/miracle-medecine.png and /dev/null differ diff --git a/Tools/make_atlas/input/mirror-mirror.png b/Tools/make_atlas/input/mirror-mirror.png deleted file mode 100644 index a6ac5be..0000000 Binary files a/Tools/make_atlas/input/mirror-mirror.png and /dev/null differ diff --git a/Tools/make_atlas/input/missile-mech.png b/Tools/make_atlas/input/missile-mech.png deleted file mode 100644 index 6a5ac94..0000000 Binary files a/Tools/make_atlas/input/missile-mech.png and /dev/null differ diff --git a/Tools/make_atlas/input/missile-pod.png b/Tools/make_atlas/input/missile-pod.png deleted file mode 100644 index ac2617e..0000000 Binary files a/Tools/make_atlas/input/missile-pod.png and /dev/null differ diff --git a/Tools/make_atlas/input/missile-swarm.png b/Tools/make_atlas/input/missile-swarm.png deleted file mode 100644 index fc4c30d..0000000 Binary files a/Tools/make_atlas/input/missile-swarm.png and /dev/null differ diff --git a/Tools/make_atlas/input/mite.png b/Tools/make_atlas/input/mite.png deleted file mode 100644 index c601a5b..0000000 Binary files a/Tools/make_atlas/input/mite.png and /dev/null differ diff --git a/Tools/make_atlas/input/moebius-star.png b/Tools/make_atlas/input/moebius-star.png deleted file mode 100644 index 24f10fb..0000000 Binary files a/Tools/make_atlas/input/moebius-star.png and /dev/null differ diff --git a/Tools/make_atlas/input/moebius-trefoil.png b/Tools/make_atlas/input/moebius-trefoil.png deleted file mode 100644 index 8df5838..0000000 Binary files a/Tools/make_atlas/input/moebius-trefoil.png and /dev/null differ diff --git a/Tools/make_atlas/input/moebius-triangle.png b/Tools/make_atlas/input/moebius-triangle.png deleted file mode 100644 index 0777043..0000000 Binary files a/Tools/make_atlas/input/moebius-triangle.png and /dev/null differ diff --git a/Tools/make_atlas/input/molecule.png b/Tools/make_atlas/input/molecule.png deleted file mode 100644 index 4d1c3a5..0000000 Binary files a/Tools/make_atlas/input/molecule.png and /dev/null differ diff --git a/Tools/make_atlas/input/molotov.png b/Tools/make_atlas/input/molotov.png deleted file mode 100644 index 238367a..0000000 Binary files a/Tools/make_atlas/input/molotov.png and /dev/null differ diff --git a/Tools/make_atlas/input/monkey.png b/Tools/make_atlas/input/monkey.png deleted file mode 100644 index 836ad6a..0000000 Binary files a/Tools/make_atlas/input/monkey.png and /dev/null differ diff --git a/Tools/make_atlas/input/monster-grasp.png b/Tools/make_atlas/input/monster-grasp.png deleted file mode 100644 index 0b930e4..0000000 Binary files a/Tools/make_atlas/input/monster-grasp.png and /dev/null differ diff --git a/Tools/make_atlas/input/moon-claws.png b/Tools/make_atlas/input/moon-claws.png deleted file mode 100644 index 7240e41..0000000 Binary files a/Tools/make_atlas/input/moon-claws.png and /dev/null differ diff --git a/Tools/make_atlas/input/moon.png b/Tools/make_atlas/input/moon.png deleted file mode 100644 index 49872c5..0000000 Binary files a/Tools/make_atlas/input/moon.png and /dev/null differ diff --git a/Tools/make_atlas/input/morbid-humour.png b/Tools/make_atlas/input/morbid-humour.png deleted file mode 100644 index 0649ff7..0000000 Binary files a/Tools/make_atlas/input/morbid-humour.png and /dev/null differ diff --git a/Tools/make_atlas/input/mountains.png b/Tools/make_atlas/input/mountains.png deleted file mode 100644 index 0e8cd59..0000000 Binary files a/Tools/make_atlas/input/mountains.png and /dev/null differ diff --git a/Tools/make_atlas/input/mountaintop.png b/Tools/make_atlas/input/mountaintop.png deleted file mode 100644 index bc955fb..0000000 Binary files a/Tools/make_atlas/input/mountaintop.png and /dev/null differ diff --git a/Tools/make_atlas/input/mouse.png b/Tools/make_atlas/input/mouse.png deleted file mode 100644 index 46c1725..0000000 Binary files a/Tools/make_atlas/input/mouse.png and /dev/null differ diff --git a/Tools/make_atlas/input/mouth-watering.png b/Tools/make_atlas/input/mouth-watering.png deleted file mode 100644 index f940485..0000000 Binary files a/Tools/make_atlas/input/mouth-watering.png and /dev/null differ diff --git a/Tools/make_atlas/input/movement-sensor.png b/Tools/make_atlas/input/movement-sensor.png deleted file mode 100644 index d6eab4b..0000000 Binary files a/Tools/make_atlas/input/movement-sensor.png and /dev/null differ diff --git a/Tools/make_atlas/input/mucous-pillar.png b/Tools/make_atlas/input/mucous-pillar.png deleted file mode 100644 index 8e3f86b..0000000 Binary files a/Tools/make_atlas/input/mucous-pillar.png and /dev/null differ diff --git a/Tools/make_atlas/input/muscle-fat.png b/Tools/make_atlas/input/muscle-fat.png deleted file mode 100644 index afba6d3..0000000 Binary files a/Tools/make_atlas/input/muscle-fat.png and /dev/null differ diff --git a/Tools/make_atlas/input/muscle-up.png b/Tools/make_atlas/input/muscle-up.png deleted file mode 100644 index 34c34ac..0000000 Binary files a/Tools/make_atlas/input/muscle-up.png and /dev/null differ diff --git a/Tools/make_atlas/input/mushroom-cloud.png b/Tools/make_atlas/input/mushroom-cloud.png deleted file mode 100644 index 6205289..0000000 Binary files a/Tools/make_atlas/input/mushroom-cloud.png and /dev/null differ diff --git a/Tools/make_atlas/input/mushroom-gills.png b/Tools/make_atlas/input/mushroom-gills.png deleted file mode 100644 index b8d37c9..0000000 Binary files a/Tools/make_atlas/input/mushroom-gills.png and /dev/null differ diff --git a/Tools/make_atlas/input/mushroom.png b/Tools/make_atlas/input/mushroom.png deleted file mode 100644 index 2c0dbd2..0000000 Binary files a/Tools/make_atlas/input/mushroom.png and /dev/null differ diff --git a/Tools/make_atlas/input/music-spell.png b/Tools/make_atlas/input/music-spell.png deleted file mode 100644 index 7877ed7..0000000 Binary files a/Tools/make_atlas/input/music-spell.png and /dev/null differ diff --git a/Tools/make_atlas/input/nailed-foot.png b/Tools/make_atlas/input/nailed-foot.png deleted file mode 100644 index 57c5f10..0000000 Binary files a/Tools/make_atlas/input/nailed-foot.png and /dev/null differ diff --git a/Tools/make_atlas/input/nailed-head.png b/Tools/make_atlas/input/nailed-head.png deleted file mode 100644 index 3f8cdfb..0000000 Binary files a/Tools/make_atlas/input/nailed-head.png and /dev/null differ diff --git a/Tools/make_atlas/input/nails.png b/Tools/make_atlas/input/nails.png deleted file mode 100644 index ae56028..0000000 Binary files a/Tools/make_atlas/input/nails.png and /dev/null differ diff --git a/Tools/make_atlas/input/needle-drill.png b/Tools/make_atlas/input/needle-drill.png deleted file mode 100644 index ddcf9eb..0000000 Binary files a/Tools/make_atlas/input/needle-drill.png and /dev/null differ diff --git a/Tools/make_atlas/input/needle-jaws.png b/Tools/make_atlas/input/needle-jaws.png deleted file mode 100644 index 6be66a2..0000000 Binary files a/Tools/make_atlas/input/needle-jaws.png and /dev/null differ diff --git a/Tools/make_atlas/input/nested-eclipses.png b/Tools/make_atlas/input/nested-eclipses.png deleted file mode 100644 index cc0094a..0000000 Binary files a/Tools/make_atlas/input/nested-eclipses.png and /dev/null differ diff --git a/Tools/make_atlas/input/new-shoot.png b/Tools/make_atlas/input/new-shoot.png deleted file mode 100644 index 03263a9..0000000 Binary files a/Tools/make_atlas/input/new-shoot.png and /dev/null differ diff --git a/Tools/make_atlas/input/night-sky.png b/Tools/make_atlas/input/night-sky.png deleted file mode 100644 index 0293c02..0000000 Binary files a/Tools/make_atlas/input/night-sky.png and /dev/null differ diff --git a/Tools/make_atlas/input/ninja-mask.png b/Tools/make_atlas/input/ninja-mask.png deleted file mode 100644 index 82452f7..0000000 Binary files a/Tools/make_atlas/input/ninja-mask.png and /dev/null differ diff --git a/Tools/make_atlas/input/noodle-ball.png b/Tools/make_atlas/input/noodle-ball.png deleted file mode 100644 index c762978..0000000 Binary files a/Tools/make_atlas/input/noodle-ball.png and /dev/null differ diff --git a/Tools/make_atlas/input/nothing-to-say.png b/Tools/make_atlas/input/nothing-to-say.png deleted file mode 100644 index e7463b9..0000000 Binary files a/Tools/make_atlas/input/nothing-to-say.png and /dev/null differ diff --git a/Tools/make_atlas/input/oak.png b/Tools/make_atlas/input/oak.png deleted file mode 100644 index 8dff0db..0000000 Binary files a/Tools/make_atlas/input/oak.png and /dev/null differ diff --git a/Tools/make_atlas/input/oat.png b/Tools/make_atlas/input/oat.png deleted file mode 100644 index 8685985..0000000 Binary files a/Tools/make_atlas/input/oat.png and /dev/null differ diff --git a/Tools/make_atlas/input/octogonal-eye.png b/Tools/make_atlas/input/octogonal-eye.png deleted file mode 100644 index b51cf0e..0000000 Binary files a/Tools/make_atlas/input/octogonal-eye.png and /dev/null differ diff --git a/Tools/make_atlas/input/octoman.png b/Tools/make_atlas/input/octoman.png deleted file mode 100644 index 36a88d2..0000000 Binary files a/Tools/make_atlas/input/octoman.png and /dev/null differ diff --git a/Tools/make_atlas/input/octopus.png b/Tools/make_atlas/input/octopus.png deleted file mode 100644 index 86fb13f..0000000 Binary files a/Tools/make_atlas/input/octopus.png and /dev/null differ diff --git a/Tools/make_atlas/input/oily-spiral.png b/Tools/make_atlas/input/oily-spiral.png deleted file mode 100644 index c64932d..0000000 Binary files a/Tools/make_atlas/input/oily-spiral.png and /dev/null differ diff --git a/Tools/make_atlas/input/omega.png b/Tools/make_atlas/input/omega.png deleted file mode 100644 index 5ea8cce..0000000 Binary files a/Tools/make_atlas/input/omega.png and /dev/null differ diff --git a/Tools/make_atlas/input/on-target.png b/Tools/make_atlas/input/on-target.png deleted file mode 100644 index b1ead6b..0000000 Binary files a/Tools/make_atlas/input/on-target.png and /dev/null differ diff --git a/Tools/make_atlas/input/one-eyed.png b/Tools/make_atlas/input/one-eyed.png deleted file mode 100644 index 6efa2b2..0000000 Binary files a/Tools/make_atlas/input/one-eyed.png and /dev/null differ diff --git a/Tools/make_atlas/input/open-book.png b/Tools/make_atlas/input/open-book.png deleted file mode 100644 index 5dc3ab7..0000000 Binary files a/Tools/make_atlas/input/open-book.png and /dev/null differ diff --git a/Tools/make_atlas/input/open-wound.png b/Tools/make_atlas/input/open-wound.png deleted file mode 100644 index b833101..0000000 Binary files a/Tools/make_atlas/input/open-wound.png and /dev/null differ diff --git a/Tools/make_atlas/input/opening-shell.png b/Tools/make_atlas/input/opening-shell.png deleted file mode 100644 index 0d52be2..0000000 Binary files a/Tools/make_atlas/input/opening-shell.png and /dev/null differ diff --git a/Tools/make_atlas/input/oppression.png b/Tools/make_atlas/input/oppression.png deleted file mode 100644 index 09e4cae..0000000 Binary files a/Tools/make_atlas/input/oppression.png and /dev/null differ diff --git a/Tools/make_atlas/input/orb-direction.png b/Tools/make_atlas/input/orb-direction.png deleted file mode 100644 index 739fdf5..0000000 Binary files a/Tools/make_atlas/input/orb-direction.png and /dev/null differ diff --git a/Tools/make_atlas/input/orbital-rays.png b/Tools/make_atlas/input/orbital-rays.png deleted file mode 100644 index 59f7aee..0000000 Binary files a/Tools/make_atlas/input/orbital-rays.png and /dev/null differ diff --git a/Tools/make_atlas/input/orbital.png b/Tools/make_atlas/input/orbital.png deleted file mode 100644 index c37af2a..0000000 Binary files a/Tools/make_atlas/input/orbital.png and /dev/null differ diff --git a/Tools/make_atlas/input/ouroboros.png b/Tools/make_atlas/input/ouroboros.png deleted file mode 100644 index 9d8358b..0000000 Binary files a/Tools/make_atlas/input/ouroboros.png and /dev/null differ diff --git a/Tools/make_atlas/input/over-infinity.png b/Tools/make_atlas/input/over-infinity.png deleted file mode 100644 index b6f284f..0000000 Binary files a/Tools/make_atlas/input/over-infinity.png and /dev/null differ diff --git a/Tools/make_atlas/input/overdose.png b/Tools/make_atlas/input/overdose.png deleted file mode 100644 index 76b02f1..0000000 Binary files a/Tools/make_atlas/input/overdose.png and /dev/null differ diff --git a/Tools/make_atlas/input/overdrive.png b/Tools/make_atlas/input/overdrive.png deleted file mode 100644 index f222882..0000000 Binary files a/Tools/make_atlas/input/overdrive.png and /dev/null differ diff --git a/Tools/make_atlas/input/owl.png b/Tools/make_atlas/input/owl.png deleted file mode 100644 index d50f71e..0000000 Binary files a/Tools/make_atlas/input/owl.png and /dev/null differ diff --git a/Tools/make_atlas/input/padlock.png b/Tools/make_atlas/input/padlock.png deleted file mode 100644 index 44da412..0000000 Binary files a/Tools/make_atlas/input/padlock.png and /dev/null differ diff --git a/Tools/make_atlas/input/palm.png b/Tools/make_atlas/input/palm.png deleted file mode 100644 index 0e48d47..0000000 Binary files a/Tools/make_atlas/input/palm.png and /dev/null differ diff --git a/Tools/make_atlas/input/paper-arrow.png b/Tools/make_atlas/input/paper-arrow.png deleted file mode 100644 index 911b180..0000000 Binary files a/Tools/make_atlas/input/paper-arrow.png and /dev/null differ diff --git a/Tools/make_atlas/input/paper-bomb.png b/Tools/make_atlas/input/paper-bomb.png deleted file mode 100644 index 01019a0..0000000 Binary files a/Tools/make_atlas/input/paper-bomb.png and /dev/null differ diff --git a/Tools/make_atlas/input/paper-lantern.png b/Tools/make_atlas/input/paper-lantern.png deleted file mode 100644 index 10397e4..0000000 Binary files a/Tools/make_atlas/input/paper-lantern.png and /dev/null differ diff --git a/Tools/make_atlas/input/papers.png b/Tools/make_atlas/input/papers.png deleted file mode 100644 index f456c82..0000000 Binary files a/Tools/make_atlas/input/papers.png and /dev/null differ diff --git a/Tools/make_atlas/input/parachute.png b/Tools/make_atlas/input/parachute.png deleted file mode 100644 index a55b838..0000000 Binary files a/Tools/make_atlas/input/parachute.png and /dev/null differ diff --git a/Tools/make_atlas/input/paranoia.png b/Tools/make_atlas/input/paranoia.png deleted file mode 100644 index 4f0ce78..0000000 Binary files a/Tools/make_atlas/input/paranoia.png and /dev/null differ diff --git a/Tools/make_atlas/input/parmecia.png b/Tools/make_atlas/input/parmecia.png deleted file mode 100644 index 5b9e9f2..0000000 Binary files a/Tools/make_atlas/input/parmecia.png and /dev/null differ diff --git a/Tools/make_atlas/input/parrot-head.png b/Tools/make_atlas/input/parrot-head.png deleted file mode 100644 index abc7020..0000000 Binary files a/Tools/make_atlas/input/parrot-head.png and /dev/null differ diff --git a/Tools/make_atlas/input/paw-front.png b/Tools/make_atlas/input/paw-front.png deleted file mode 100644 index d036883..0000000 Binary files a/Tools/make_atlas/input/paw-front.png and /dev/null differ diff --git a/Tools/make_atlas/input/paw-heart.png b/Tools/make_atlas/input/paw-heart.png deleted file mode 100644 index a51c2f1..0000000 Binary files a/Tools/make_atlas/input/paw-heart.png and /dev/null differ diff --git a/Tools/make_atlas/input/paw-print.png b/Tools/make_atlas/input/paw-print.png deleted file mode 100644 index eb63df4..0000000 Binary files a/Tools/make_atlas/input/paw-print.png and /dev/null differ diff --git a/Tools/make_atlas/input/paw.png b/Tools/make_atlas/input/paw.png deleted file mode 100644 index 69f36a2..0000000 Binary files a/Tools/make_atlas/input/paw.png and /dev/null differ diff --git a/Tools/make_atlas/input/pawn.png b/Tools/make_atlas/input/pawn.png deleted file mode 100644 index c704314..0000000 Binary files a/Tools/make_atlas/input/pawn.png and /dev/null differ diff --git a/Tools/make_atlas/input/peaks.png b/Tools/make_atlas/input/peaks.png deleted file mode 100644 index 5ae3ddb..0000000 Binary files a/Tools/make_atlas/input/peaks.png and /dev/null differ diff --git a/Tools/make_atlas/input/pentagram-rose.png b/Tools/make_atlas/input/pentagram-rose.png deleted file mode 100644 index 4c7fd5c..0000000 Binary files a/Tools/make_atlas/input/pentagram-rose.png and /dev/null differ diff --git a/Tools/make_atlas/input/pentarrows-tornado.png b/Tools/make_atlas/input/pentarrows-tornado.png deleted file mode 100644 index 5b22591..0000000 Binary files a/Tools/make_atlas/input/pentarrows-tornado.png and /dev/null differ diff --git a/Tools/make_atlas/input/perfume-bottle.png b/Tools/make_atlas/input/perfume-bottle.png deleted file mode 100644 index 83a3acf..0000000 Binary files a/Tools/make_atlas/input/perfume-bottle.png and /dev/null differ diff --git a/Tools/make_atlas/input/perpendicular-rings.png b/Tools/make_atlas/input/perpendicular-rings.png deleted file mode 100644 index 1a63271..0000000 Binary files a/Tools/make_atlas/input/perpendicular-rings.png and /dev/null differ diff --git a/Tools/make_atlas/input/person-in-blizzard.png b/Tools/make_atlas/input/person-in-blizzard.png deleted file mode 100644 index 5223236..0000000 Binary files a/Tools/make_atlas/input/person-in-blizzard.png and /dev/null differ diff --git a/Tools/make_atlas/input/pie-slice.png b/Tools/make_atlas/input/pie-slice.png deleted file mode 100644 index 46fb2b0..0000000 Binary files a/Tools/make_atlas/input/pie-slice.png and /dev/null differ diff --git a/Tools/make_atlas/input/piece-skull.png b/Tools/make_atlas/input/piece-skull.png deleted file mode 100644 index a9d031f..0000000 Binary files a/Tools/make_atlas/input/piece-skull.png and /dev/null differ diff --git a/Tools/make_atlas/input/pierced-body.png b/Tools/make_atlas/input/pierced-body.png deleted file mode 100644 index aa8bca5..0000000 Binary files a/Tools/make_atlas/input/pierced-body.png and /dev/null differ diff --git a/Tools/make_atlas/input/pierced-heart.png b/Tools/make_atlas/input/pierced-heart.png deleted file mode 100644 index eab2f14..0000000 Binary files a/Tools/make_atlas/input/pierced-heart.png and /dev/null differ diff --git a/Tools/make_atlas/input/piercing-sword.png b/Tools/make_atlas/input/piercing-sword.png deleted file mode 100644 index 79d8197..0000000 Binary files a/Tools/make_atlas/input/piercing-sword.png and /dev/null differ diff --git a/Tools/make_atlas/input/pig-face.png b/Tools/make_atlas/input/pig-face.png deleted file mode 100644 index b145171..0000000 Binary files a/Tools/make_atlas/input/pig-face.png and /dev/null differ diff --git a/Tools/make_atlas/input/pill-drop.png b/Tools/make_atlas/input/pill-drop.png deleted file mode 100644 index 25e8c3b..0000000 Binary files a/Tools/make_atlas/input/pill-drop.png and /dev/null differ diff --git a/Tools/make_atlas/input/pill.png b/Tools/make_atlas/input/pill.png deleted file mode 100644 index d481fd1..0000000 Binary files a/Tools/make_atlas/input/pill.png and /dev/null differ diff --git a/Tools/make_atlas/input/pincers.png b/Tools/make_atlas/input/pincers.png deleted file mode 100644 index 46f8de4..0000000 Binary files a/Tools/make_atlas/input/pincers.png and /dev/null differ diff --git a/Tools/make_atlas/input/pine-tree.png b/Tools/make_atlas/input/pine-tree.png deleted file mode 100644 index 66a5eb7..0000000 Binary files a/Tools/make_atlas/input/pine-tree.png and /dev/null differ diff --git a/Tools/make_atlas/input/pirate-grave.png b/Tools/make_atlas/input/pirate-grave.png deleted file mode 100644 index 10d8639..0000000 Binary files a/Tools/make_atlas/input/pirate-grave.png and /dev/null differ diff --git a/Tools/make_atlas/input/pirate-skull.png b/Tools/make_atlas/input/pirate-skull.png deleted file mode 100644 index 0723553..0000000 Binary files a/Tools/make_atlas/input/pirate-skull.png and /dev/null differ diff --git a/Tools/make_atlas/input/pizza-cutter.png b/Tools/make_atlas/input/pizza-cutter.png deleted file mode 100644 index 1e2dcd8..0000000 Binary files a/Tools/make_atlas/input/pizza-cutter.png and /dev/null differ diff --git a/Tools/make_atlas/input/plain-dagger.png b/Tools/make_atlas/input/plain-dagger.png deleted file mode 100644 index 128e9a0..0000000 Binary files a/Tools/make_atlas/input/plain-dagger.png and /dev/null differ diff --git a/Tools/make_atlas/input/plasma-bolt.png b/Tools/make_atlas/input/plasma-bolt.png deleted file mode 100644 index 0821a6d..0000000 Binary files a/Tools/make_atlas/input/plasma-bolt.png and /dev/null differ diff --git a/Tools/make_atlas/input/plastron.png b/Tools/make_atlas/input/plastron.png deleted file mode 100644 index 54600e9..0000000 Binary files a/Tools/make_atlas/input/plastron.png and /dev/null differ diff --git a/Tools/make_atlas/input/plate-claw.png b/Tools/make_atlas/input/plate-claw.png deleted file mode 100644 index da28239..0000000 Binary files a/Tools/make_atlas/input/plate-claw.png and /dev/null differ diff --git a/Tools/make_atlas/input/pocket-bow.png b/Tools/make_atlas/input/pocket-bow.png deleted file mode 100644 index 27c13da..0000000 Binary files a/Tools/make_atlas/input/pocket-bow.png and /dev/null differ diff --git a/Tools/make_atlas/input/pointing.png b/Tools/make_atlas/input/pointing.png deleted file mode 100644 index 377d1c4..0000000 Binary files a/Tools/make_atlas/input/pointing.png and /dev/null differ diff --git a/Tools/make_atlas/input/pointy-hat.png b/Tools/make_atlas/input/pointy-hat.png deleted file mode 100644 index c440a53..0000000 Binary files a/Tools/make_atlas/input/pointy-hat.png and /dev/null differ diff --git a/Tools/make_atlas/input/pointy-sword.png b/Tools/make_atlas/input/pointy-sword.png deleted file mode 100644 index 13ec8c3..0000000 Binary files a/Tools/make_atlas/input/pointy-sword.png and /dev/null differ diff --git a/Tools/make_atlas/input/poison-bottle.png b/Tools/make_atlas/input/poison-bottle.png deleted file mode 100644 index 34f5b81..0000000 Binary files a/Tools/make_atlas/input/poison-bottle.png and /dev/null differ diff --git a/Tools/make_atlas/input/poison-gas.png b/Tools/make_atlas/input/poison-gas.png deleted file mode 100644 index f2612fe..0000000 Binary files a/Tools/make_atlas/input/poison-gas.png and /dev/null differ diff --git a/Tools/make_atlas/input/pokecog.png b/Tools/make_atlas/input/pokecog.png deleted file mode 100644 index 18176aa..0000000 Binary files a/Tools/make_atlas/input/pokecog.png and /dev/null differ diff --git a/Tools/make_atlas/input/poker-hand.png b/Tools/make_atlas/input/poker-hand.png deleted file mode 100644 index 75e1588..0000000 Binary files a/Tools/make_atlas/input/poker-hand.png and /dev/null differ diff --git a/Tools/make_atlas/input/pollen-dust.png b/Tools/make_atlas/input/pollen-dust.png deleted file mode 100644 index c0b1dd9..0000000 Binary files a/Tools/make_atlas/input/pollen-dust.png and /dev/null differ diff --git a/Tools/make_atlas/input/portal.png b/Tools/make_atlas/input/portal.png deleted file mode 100644 index 7648c75..0000000 Binary files a/Tools/make_atlas/input/portal.png and /dev/null differ diff --git a/Tools/make_atlas/input/portculis.png b/Tools/make_atlas/input/portculis.png deleted file mode 100644 index 55fd688..0000000 Binary files a/Tools/make_atlas/input/portculis.png and /dev/null differ diff --git a/Tools/make_atlas/input/potion-ball.png b/Tools/make_atlas/input/potion-ball.png deleted file mode 100644 index 9e597b1..0000000 Binary files a/Tools/make_atlas/input/potion-ball.png and /dev/null differ diff --git a/Tools/make_atlas/input/pouring-chalice.png b/Tools/make_atlas/input/pouring-chalice.png deleted file mode 100644 index 9a90b5d..0000000 Binary files a/Tools/make_atlas/input/pouring-chalice.png and /dev/null differ diff --git a/Tools/make_atlas/input/powder.png b/Tools/make_atlas/input/powder.png deleted file mode 100644 index e2ec856..0000000 Binary files a/Tools/make_atlas/input/powder.png and /dev/null differ diff --git a/Tools/make_atlas/input/power-lightning.png b/Tools/make_atlas/input/power-lightning.png deleted file mode 100644 index c1f212b..0000000 Binary files a/Tools/make_atlas/input/power-lightning.png and /dev/null differ diff --git a/Tools/make_atlas/input/prayer.png b/Tools/make_atlas/input/prayer.png deleted file mode 100644 index 37c7a6d..0000000 Binary files a/Tools/make_atlas/input/prayer.png and /dev/null differ diff --git a/Tools/make_atlas/input/pretty-fangs.png b/Tools/make_atlas/input/pretty-fangs.png deleted file mode 100644 index 6332582..0000000 Binary files a/Tools/make_atlas/input/pretty-fangs.png and /dev/null differ diff --git a/Tools/make_atlas/input/processor.png b/Tools/make_atlas/input/processor.png deleted file mode 100644 index 07f3a1d..0000000 Binary files a/Tools/make_atlas/input/processor.png and /dev/null differ diff --git a/Tools/make_atlas/input/profit.png b/Tools/make_atlas/input/profit.png deleted file mode 100644 index 1b964c7..0000000 Binary files a/Tools/make_atlas/input/profit.png and /dev/null differ diff --git a/Tools/make_atlas/input/psychic-waves.png b/Tools/make_atlas/input/psychic-waves.png deleted file mode 100644 index be07aa1..0000000 Binary files a/Tools/make_atlas/input/psychic-waves.png and /dev/null differ diff --git a/Tools/make_atlas/input/pummeled.png b/Tools/make_atlas/input/pummeled.png deleted file mode 100644 index b7e0111..0000000 Binary files a/Tools/make_atlas/input/pummeled.png and /dev/null differ diff --git a/Tools/make_atlas/input/pumpkin-lantern.png b/Tools/make_atlas/input/pumpkin-lantern.png deleted file mode 100644 index 970ab94..0000000 Binary files a/Tools/make_atlas/input/pumpkin-lantern.png and /dev/null differ diff --git a/Tools/make_atlas/input/pumpkin-mask.png b/Tools/make_atlas/input/pumpkin-mask.png deleted file mode 100644 index 91ef430..0000000 Binary files a/Tools/make_atlas/input/pumpkin-mask.png and /dev/null differ diff --git a/Tools/make_atlas/input/punch-blast.png b/Tools/make_atlas/input/punch-blast.png deleted file mode 100644 index 39ccbf5..0000000 Binary files a/Tools/make_atlas/input/punch-blast.png and /dev/null differ diff --git a/Tools/make_atlas/input/punch.png b/Tools/make_atlas/input/punch.png deleted file mode 100644 index 5056440..0000000 Binary files a/Tools/make_atlas/input/punch.png and /dev/null differ diff --git a/Tools/make_atlas/input/puppet.png b/Tools/make_atlas/input/puppet.png deleted file mode 100644 index b766f00..0000000 Binary files a/Tools/make_atlas/input/puppet.png and /dev/null differ diff --git a/Tools/make_atlas/input/pyromaniac.png b/Tools/make_atlas/input/pyromaniac.png deleted file mode 100644 index e1068aa..0000000 Binary files a/Tools/make_atlas/input/pyromaniac.png and /dev/null differ diff --git a/Tools/make_atlas/input/quake-stomp.png b/Tools/make_atlas/input/quake-stomp.png deleted file mode 100644 index 820274e..0000000 Binary files a/Tools/make_atlas/input/quake-stomp.png and /dev/null differ diff --git a/Tools/make_atlas/input/queen-crown.png b/Tools/make_atlas/input/queen-crown.png deleted file mode 100644 index 22a12f8..0000000 Binary files a/Tools/make_atlas/input/queen-crown.png and /dev/null differ diff --git a/Tools/make_atlas/input/quick-slash.png b/Tools/make_atlas/input/quick-slash.png deleted file mode 100644 index e24ff32..0000000 Binary files a/Tools/make_atlas/input/quick-slash.png and /dev/null differ diff --git a/Tools/make_atlas/input/quicksand.png b/Tools/make_atlas/input/quicksand.png deleted file mode 100644 index 0742e7b..0000000 Binary files a/Tools/make_atlas/input/quicksand.png and /dev/null differ diff --git a/Tools/make_atlas/input/quill-ink.png b/Tools/make_atlas/input/quill-ink.png deleted file mode 100644 index a20aae2..0000000 Binary files a/Tools/make_atlas/input/quill-ink.png and /dev/null differ diff --git a/Tools/make_atlas/input/quill.png b/Tools/make_atlas/input/quill.png deleted file mode 100644 index 2b2e973..0000000 Binary files a/Tools/make_atlas/input/quill.png and /dev/null differ diff --git a/Tools/make_atlas/input/radar-dish.png b/Tools/make_atlas/input/radar-dish.png deleted file mode 100644 index 7bb8e33..0000000 Binary files a/Tools/make_atlas/input/radar-dish.png and /dev/null differ diff --git a/Tools/make_atlas/input/radar-sweep.png b/Tools/make_atlas/input/radar-sweep.png deleted file mode 100644 index 8d307e1..0000000 Binary files a/Tools/make_atlas/input/radar-sweep.png and /dev/null differ diff --git a/Tools/make_atlas/input/radial-balance.png b/Tools/make_atlas/input/radial-balance.png deleted file mode 100644 index e6a50e9..0000000 Binary files a/Tools/make_atlas/input/radial-balance.png and /dev/null differ diff --git a/Tools/make_atlas/input/radioactive.png b/Tools/make_atlas/input/radioactive.png deleted file mode 100644 index ff901c8..0000000 Binary files a/Tools/make_atlas/input/radioactive.png and /dev/null differ diff --git a/Tools/make_atlas/input/ragged-wound.png b/Tools/make_atlas/input/ragged-wound.png deleted file mode 100644 index acf289e..0000000 Binary files a/Tools/make_atlas/input/ragged-wound.png and /dev/null differ diff --git a/Tools/make_atlas/input/rainbow-star.png b/Tools/make_atlas/input/rainbow-star.png deleted file mode 100644 index a882d0f..0000000 Binary files a/Tools/make_atlas/input/rainbow-star.png and /dev/null differ diff --git a/Tools/make_atlas/input/raining.png b/Tools/make_atlas/input/raining.png deleted file mode 100644 index 4d628de..0000000 Binary files a/Tools/make_atlas/input/raining.png and /dev/null differ diff --git a/Tools/make_atlas/input/rally-the-troops.png b/Tools/make_atlas/input/rally-the-troops.png deleted file mode 100644 index c14200f..0000000 Binary files a/Tools/make_atlas/input/rally-the-troops.png and /dev/null differ diff --git a/Tools/make_atlas/input/ram.png b/Tools/make_atlas/input/ram.png deleted file mode 100644 index d8db2fb..0000000 Binary files a/Tools/make_atlas/input/ram.png and /dev/null differ diff --git a/Tools/make_atlas/input/rapidshare-arrow.png b/Tools/make_atlas/input/rapidshare-arrow.png deleted file mode 100644 index 0b8d085..0000000 Binary files a/Tools/make_atlas/input/rapidshare-arrow.png and /dev/null differ diff --git a/Tools/make_atlas/input/raven.png b/Tools/make_atlas/input/raven.png deleted file mode 100644 index 44cbf01..0000000 Binary files a/Tools/make_atlas/input/raven.png and /dev/null differ diff --git a/Tools/make_atlas/input/ray-gun.png b/Tools/make_atlas/input/ray-gun.png deleted file mode 100644 index c1f6b8e..0000000 Binary files a/Tools/make_atlas/input/ray-gun.png and /dev/null differ diff --git a/Tools/make_atlas/input/razor-blade.png b/Tools/make_atlas/input/razor-blade.png deleted file mode 100644 index fb01fcf..0000000 Binary files a/Tools/make_atlas/input/razor-blade.png and /dev/null differ diff --git a/Tools/make_atlas/input/reaper-scythe.png b/Tools/make_atlas/input/reaper-scythe.png deleted file mode 100644 index 5333e4a..0000000 Binary files a/Tools/make_atlas/input/reaper-scythe.png and /dev/null differ diff --git a/Tools/make_atlas/input/rear-aura.png b/Tools/make_atlas/input/rear-aura.png deleted file mode 100644 index f790fd8..0000000 Binary files a/Tools/make_atlas/input/rear-aura.png and /dev/null differ diff --git a/Tools/make_atlas/input/recycle.png b/Tools/make_atlas/input/recycle.png deleted file mode 100644 index 7aa2c6a..0000000 Binary files a/Tools/make_atlas/input/recycle.png and /dev/null differ diff --git a/Tools/make_atlas/input/relationship-bounds.png b/Tools/make_atlas/input/relationship-bounds.png deleted file mode 100644 index 3a55a97..0000000 Binary files a/Tools/make_atlas/input/relationship-bounds.png and /dev/null differ diff --git a/Tools/make_atlas/input/relic-blade.png b/Tools/make_atlas/input/relic-blade.png deleted file mode 100644 index 37bc43e..0000000 Binary files a/Tools/make_atlas/input/relic-blade.png and /dev/null differ diff --git a/Tools/make_atlas/input/resonance.png b/Tools/make_atlas/input/resonance.png deleted file mode 100644 index 10ca610..0000000 Binary files a/Tools/make_atlas/input/resonance.png and /dev/null differ diff --git a/Tools/make_atlas/input/reticule.png b/Tools/make_atlas/input/reticule.png deleted file mode 100644 index 1b3ab79..0000000 Binary files a/Tools/make_atlas/input/reticule.png and /dev/null differ diff --git a/Tools/make_atlas/input/return-arrow.png b/Tools/make_atlas/input/return-arrow.png deleted file mode 100644 index 7012ac4..0000000 Binary files a/Tools/make_atlas/input/return-arrow.png and /dev/null differ diff --git a/Tools/make_atlas/input/ribbon.png b/Tools/make_atlas/input/ribbon.png deleted file mode 100644 index 0046239..0000000 Binary files a/Tools/make_atlas/input/ribbon.png and /dev/null differ diff --git a/Tools/make_atlas/input/ribcage.png b/Tools/make_atlas/input/ribcage.png deleted file mode 100644 index 79c22d5..0000000 Binary files a/Tools/make_atlas/input/ribcage.png and /dev/null differ diff --git a/Tools/make_atlas/input/ringed-beam.png b/Tools/make_atlas/input/ringed-beam.png deleted file mode 100644 index 564ffbf..0000000 Binary files a/Tools/make_atlas/input/ringed-beam.png and /dev/null differ diff --git a/Tools/make_atlas/input/ringed-planet.png b/Tools/make_atlas/input/ringed-planet.png deleted file mode 100644 index ac4e139..0000000 Binary files a/Tools/make_atlas/input/ringed-planet.png and /dev/null differ diff --git a/Tools/make_atlas/input/ringing-bell.png b/Tools/make_atlas/input/ringing-bell.png deleted file mode 100644 index cdec031..0000000 Binary files a/Tools/make_atlas/input/ringing-bell.png and /dev/null differ diff --git a/Tools/make_atlas/input/riot-shield.png b/Tools/make_atlas/input/riot-shield.png deleted file mode 100644 index 0afd430..0000000 Binary files a/Tools/make_atlas/input/riot-shield.png and /dev/null differ diff --git a/Tools/make_atlas/input/roast-chicken.png b/Tools/make_atlas/input/roast-chicken.png deleted file mode 100644 index ce9461c..0000000 Binary files a/Tools/make_atlas/input/roast-chicken.png and /dev/null differ diff --git a/Tools/make_atlas/input/robe.png b/Tools/make_atlas/input/robe.png deleted file mode 100644 index 6252cf3..0000000 Binary files a/Tools/make_atlas/input/robe.png and /dev/null differ diff --git a/Tools/make_atlas/input/robot-golem.png b/Tools/make_atlas/input/robot-golem.png deleted file mode 100644 index 75c0b1f..0000000 Binary files a/Tools/make_atlas/input/robot-golem.png and /dev/null differ diff --git a/Tools/make_atlas/input/rock.png b/Tools/make_atlas/input/rock.png deleted file mode 100644 index 0ae6032..0000000 Binary files a/Tools/make_atlas/input/rock.png and /dev/null differ diff --git a/Tools/make_atlas/input/rocket-flight.png b/Tools/make_atlas/input/rocket-flight.png deleted file mode 100644 index 4cd5e85..0000000 Binary files a/Tools/make_atlas/input/rocket-flight.png and /dev/null differ diff --git a/Tools/make_atlas/input/rocket.png b/Tools/make_atlas/input/rocket.png deleted file mode 100644 index 4315723..0000000 Binary files a/Tools/make_atlas/input/rocket.png and /dev/null differ diff --git a/Tools/make_atlas/input/rogue.png b/Tools/make_atlas/input/rogue.png deleted file mode 100644 index 6f95485..0000000 Binary files a/Tools/make_atlas/input/rogue.png and /dev/null differ diff --git a/Tools/make_atlas/input/rolling-bomb.png b/Tools/make_atlas/input/rolling-bomb.png deleted file mode 100644 index c50e4ef..0000000 Binary files a/Tools/make_atlas/input/rolling-bomb.png and /dev/null differ diff --git a/Tools/make_atlas/input/rolling-energy.png b/Tools/make_atlas/input/rolling-energy.png deleted file mode 100644 index c539cf8..0000000 Binary files a/Tools/make_atlas/input/rolling-energy.png and /dev/null differ diff --git a/Tools/make_atlas/input/root-tip.png b/Tools/make_atlas/input/root-tip.png deleted file mode 100644 index b77eb8e..0000000 Binary files a/Tools/make_atlas/input/root-tip.png and /dev/null differ diff --git a/Tools/make_atlas/input/rosa-shield.png b/Tools/make_atlas/input/rosa-shield.png deleted file mode 100644 index 83b559f..0000000 Binary files a/Tools/make_atlas/input/rosa-shield.png and /dev/null differ diff --git a/Tools/make_atlas/input/rose.png b/Tools/make_atlas/input/rose.png deleted file mode 100644 index 85bcd63..0000000 Binary files a/Tools/make_atlas/input/rose.png and /dev/null differ diff --git a/Tools/make_atlas/input/rough-wound.png b/Tools/make_atlas/input/rough-wound.png deleted file mode 100644 index 9fe41f5..0000000 Binary files a/Tools/make_atlas/input/rough-wound.png and /dev/null differ diff --git a/Tools/make_atlas/input/round-bottom-flask.png b/Tools/make_atlas/input/round-bottom-flask.png deleted file mode 100644 index 5a828c1..0000000 Binary files a/Tools/make_atlas/input/round-bottom-flask.png and /dev/null differ diff --git a/Tools/make_atlas/input/round-struck.png b/Tools/make_atlas/input/round-struck.png deleted file mode 100644 index aff2b7d..0000000 Binary files a/Tools/make_atlas/input/round-struck.png and /dev/null differ diff --git a/Tools/make_atlas/input/royal-love.png b/Tools/make_atlas/input/royal-love.png deleted file mode 100644 index 33c6709..0000000 Binary files a/Tools/make_atlas/input/royal-love.png and /dev/null differ diff --git a/Tools/make_atlas/input/rss.png b/Tools/make_atlas/input/rss.png deleted file mode 100644 index e2743f0..0000000 Binary files a/Tools/make_atlas/input/rss.png and /dev/null differ diff --git a/Tools/make_atlas/input/run.png b/Tools/make_atlas/input/run.png deleted file mode 100644 index 415d6fb..0000000 Binary files a/Tools/make_atlas/input/run.png and /dev/null differ diff --git a/Tools/make_atlas/input/rune-stone.png b/Tools/make_atlas/input/rune-stone.png deleted file mode 100644 index 17742d3..0000000 Binary files a/Tools/make_atlas/input/rune-stone.png and /dev/null differ diff --git a/Tools/make_atlas/input/rune-sword.png b/Tools/make_atlas/input/rune-sword.png deleted file mode 100644 index f784eb3..0000000 Binary files a/Tools/make_atlas/input/rune-sword.png and /dev/null differ diff --git a/Tools/make_atlas/input/saber-slash.png b/Tools/make_atlas/input/saber-slash.png deleted file mode 100644 index 7d21eb2..0000000 Binary files a/Tools/make_atlas/input/saber-slash.png and /dev/null differ diff --git a/Tools/make_atlas/input/saber-tooth.png b/Tools/make_atlas/input/saber-tooth.png deleted file mode 100644 index f252ae9..0000000 Binary files a/Tools/make_atlas/input/saber-tooth.png and /dev/null differ diff --git a/Tools/make_atlas/input/sabers-choc.png b/Tools/make_atlas/input/sabers-choc.png deleted file mode 100644 index 349e19a..0000000 Binary files a/Tools/make_atlas/input/sabers-choc.png and /dev/null differ diff --git a/Tools/make_atlas/input/sacrificial-dagger.png b/Tools/make_atlas/input/sacrificial-dagger.png deleted file mode 100644 index 355e5dc..0000000 Binary files a/Tools/make_atlas/input/sacrificial-dagger.png and /dev/null differ diff --git a/Tools/make_atlas/input/sad-crab.png b/Tools/make_atlas/input/sad-crab.png deleted file mode 100644 index c61dd6b..0000000 Binary files a/Tools/make_atlas/input/sad-crab.png and /dev/null differ diff --git a/Tools/make_atlas/input/salamander.png b/Tools/make_atlas/input/salamander.png deleted file mode 100644 index 9d23114..0000000 Binary files a/Tools/make_atlas/input/salamander.png and /dev/null differ diff --git a/Tools/make_atlas/input/salt-shaker.png b/Tools/make_atlas/input/salt-shaker.png deleted file mode 100644 index a9d65fc..0000000 Binary files a/Tools/make_atlas/input/salt-shaker.png and /dev/null differ diff --git a/Tools/make_atlas/input/sands-of-time.png b/Tools/make_atlas/input/sands-of-time.png deleted file mode 100644 index 98885b4..0000000 Binary files a/Tools/make_atlas/input/sands-of-time.png and /dev/null differ diff --git a/Tools/make_atlas/input/saphir.png b/Tools/make_atlas/input/saphir.png deleted file mode 100644 index a083fa5..0000000 Binary files a/Tools/make_atlas/input/saphir.png and /dev/null differ diff --git a/Tools/make_atlas/input/satellite.png b/Tools/make_atlas/input/satellite.png deleted file mode 100644 index 33415b1..0000000 Binary files a/Tools/make_atlas/input/satellite.png and /dev/null differ diff --git a/Tools/make_atlas/input/saw-claw.png b/Tools/make_atlas/input/saw-claw.png deleted file mode 100644 index 68f2d8a..0000000 Binary files a/Tools/make_atlas/input/saw-claw.png and /dev/null differ diff --git a/Tools/make_atlas/input/scale-mail.png b/Tools/make_atlas/input/scale-mail.png deleted file mode 100644 index 230e16e..0000000 Binary files a/Tools/make_atlas/input/scale-mail.png and /dev/null differ diff --git a/Tools/make_atlas/input/scales.png b/Tools/make_atlas/input/scales.png deleted file mode 100644 index 4857311..0000000 Binary files a/Tools/make_atlas/input/scales.png and /dev/null differ diff --git a/Tools/make_atlas/input/scallop.png b/Tools/make_atlas/input/scallop.png deleted file mode 100644 index 255f905..0000000 Binary files a/Tools/make_atlas/input/scallop.png and /dev/null differ diff --git a/Tools/make_atlas/input/scalpel-strike.png b/Tools/make_atlas/input/scalpel-strike.png deleted file mode 100644 index c660161..0000000 Binary files a/Tools/make_atlas/input/scalpel-strike.png and /dev/null differ diff --git a/Tools/make_atlas/input/scalpel.png b/Tools/make_atlas/input/scalpel.png deleted file mode 100644 index 1e014bc..0000000 Binary files a/Tools/make_atlas/input/scalpel.png and /dev/null differ diff --git a/Tools/make_atlas/input/scar-wound.png b/Tools/make_atlas/input/scar-wound.png deleted file mode 100644 index d91b383..0000000 Binary files a/Tools/make_atlas/input/scar-wound.png and /dev/null differ diff --git a/Tools/make_atlas/input/scarab-beetle.png b/Tools/make_atlas/input/scarab-beetle.png deleted file mode 100644 index 619710f..0000000 Binary files a/Tools/make_atlas/input/scarab-beetle.png and /dev/null differ diff --git a/Tools/make_atlas/input/scarecrow.png b/Tools/make_atlas/input/scarecrow.png deleted file mode 100644 index fda8653..0000000 Binary files a/Tools/make_atlas/input/scarecrow.png and /dev/null differ diff --git a/Tools/make_atlas/input/scissors.png b/Tools/make_atlas/input/scissors.png deleted file mode 100644 index 3c1e6ac..0000000 Binary files a/Tools/make_atlas/input/scissors.png and /dev/null differ diff --git a/Tools/make_atlas/input/scorpion-tail.png b/Tools/make_atlas/input/scorpion-tail.png deleted file mode 100644 index 6c3833c..0000000 Binary files a/Tools/make_atlas/input/scorpion-tail.png and /dev/null differ diff --git a/Tools/make_atlas/input/scorpion.png b/Tools/make_atlas/input/scorpion.png deleted file mode 100644 index 2b8466b..0000000 Binary files a/Tools/make_atlas/input/scorpion.png and /dev/null differ diff --git a/Tools/make_atlas/input/screaming.png b/Tools/make_atlas/input/screaming.png deleted file mode 100644 index 78ead57..0000000 Binary files a/Tools/make_atlas/input/screaming.png and /dev/null differ diff --git a/docs/tech/01_LubanDataTable.md b/docs/tech/01_LubanDataTable.md new file mode 100644 index 0000000..0d4a5c8 --- /dev/null +++ b/docs/tech/01_LubanDataTable.md @@ -0,0 +1,80 @@ +# Luban 数据表组件 + +> 负责加载 Luban 导出的二进制配置表(.bytes),向业务提供统一访问入口。 +> 相关组件:`Assets/GameMain/Scripts/Runtime/CustomComponent/Luban/LubanComponent.cs` + +## 数据流 + +``` +Datas/*.xlsx (Excel 配置源) + │ gen_cli.sh(Luban 导出,产出 代码 + 数据) + ▼ +┌──────────────────────┬────────────────────────────────┐ +│ Assets/GameMain/ │ Assets/GameMain/Scripts/Base/Gen│ +│ DataTables/tb*.bytes │ Tables.cs + Tb* + *Config bean │ +└──────────────────────┴────────────────────────────────┘ + │ GameEntry.Luban.LoadTables()(运行时加载) + ▼ + GameEntry.Luban.Get(id) / GetTable() +``` + +## 目录约定 + +| 路径 | 内容 | +| --- | --- | +| `数据表/Datas/` | 配置源 xlsx(`__tables__.xlsx` 注册所有表) | +| `数据表/Defines/` | Luban 类型定义(枚举、结构) | +| `数据表/luban.conf` | 导出配置(target=client,topModule=`SepCore.Definition`) | +| `数据表/gen_cli.sh` | 导出脚本;`path.txt` 指定输出根目录(`../Assets/GameMain/`) | +| `Assets/GameMain/DataTables/` | 导出数据:`tb*.bytes`(运行时用)+ `tb*.json`(调试对照用) | +| `Assets/GameMain/Scripts/Base/Gen/` | 生成代码:`Tables` 门面、`Tb*` 表类、`*Config` 数据行类、枚举 | +| `Assets/GameMain/Scripts/ThirdParty/Luban/` | Luban 运行时(`ByteBuf`、`BeanBase` 等,程序集 `Luban.Runtime`) | +| `Assets/GameMain/Scripts/Runtime/CustomComponent/Luban/` | `LubanComponent` 运行时组件 | + +## 组件 API + +| API | 说明 | +| --- | --- | +| `LoadTables(onSuccess, onFailure)` | 异步并发加载全部表并构建 `Tables`,完成后回调 | +| `IsReady` | `Tables` 是否已构建完成 | +| `Get(int id)` | 单行查询;未找到返回 `null`;表未加载抛 `InvalidOperationException`;未注册类型抛 `NotSupportedException` | +| `GetTable()` | 整表查询,返回 `IReadOnlyList`(怪物池、掉落池等需要遍历的场景用) | + +用法示例: + +```csharp +EnemyConfig enemy = GameEntry.Luban.Get(3001); +IReadOnlyList allItems = GameEntry.Luban.GetTable(); +UIFormConfig form = GameEntry.Luban.Get(UIFormType.DialogForm); // enum 可转 int +``` + +## 命名与结构约定 + +- 表名统一小写 `tbxxxconfig`(Excel 表名、导出文件名、`Tables` 构造参数、`TableNames` 数组四者必须一致)。 +- 生成类型命名:数据行 `XxxConfig`(如 `EnemyConfig`)、表类 `TbXxxConfig`(如 `TbEnemyConfig`)、枚举直接命名(`Rarity`、`DifficultyTier`),全部在命名空间 `SepCore.Definition`。 +- 主键绝大多数为 `int`;枚举主键的表(`tbrarityconfig`、`tbdifficultyconfig`)在 `TableAccessors` 注册时做显式转换,业务侧仍传 `int`。 +- 单行表(`mode=one`,如 `tbglobalconfig`)无主键 `Get`,**不注册**进访问器,通过 `Tables.TbGlobalConfig.Data` 访问。 +- 数据行类继承 `Luban.BeanBase`。 + +## 新增一张表的完整流程(4 步) + +1. **建表**:在 `数据表/Datas/` 新增 `XxxConfig_xx.xlsx`,并在 `__tables__.xlsx` 注册表名与结构。 +2. **导出**:运行 `数据表/gen_cli.sh`(两个 Luban 命令都要跑:先 `-c cs-bin` 生成代码,再 `-d json -d bin` 导出数据)。 +3. **登记表名**:`LubanComponent.TableNames` 追加小写表名(`"tbxxxconfig"`)。 +4. **注册访问器**:`LubanComponent.TableAccessors` 追加一行: + ```csharp + { typeof(XxxConfig), Accessor(tables => id => tables.TbXxxConfig.GetOrDefault(id), tables => tables.TbXxxConfig.DataList) }, + // 枚举主键:Accessor(tables => id => tables.TbXxxConfig.GetOrDefault((YyyEnum)id), tables => tables.TbXxxConfig.DataList) + ``` + +## 资源与打包约定 + +- 运行时按 `Assets/GameMain/DataTables/{表名}.bytes` 路径经 `GameEntry.Resource.LoadAsset` 加载,`Constant.AssetPriority.DataTableAsset` 作为优先级。 +- 正式打包需资源收集包含全部 `tb*.bytes`,否则打包后加载失败。 +- 加载中途某张表失败会走 `onFailure` 回调,预加载流程(`ProcedurePreload`)会停在加载界面,需排查表名/路径/资源收集。 + +## 与旧 DataTable 组件的关系 + +- 旧的 GameFramework `DataTableComponent` + txt 表 + 手写 `DR*` 行类已全部移除(2026-08 迁移)。 +- `DataTableComponent` 组件本身仍挂在场景(框架内置组件,GameEntry 初始化需要),但已无任何数据加载。 +- 预加载与所有消费方(Entity/Sound/UI/Scene 扩展)均走 `GameEntry.Luban`。 \ No newline at end of file