@@ -862,29 +876,68 @@ function updateCharPanel() {
panel.querySelectorAll('.charActBtn').forEach(btn => {
btn.addEventListener('click', () => { triggerCharAction(ch.id, btn.dataset.act); updateCharPanel(); });
});
+ panel.querySelector('#charFreeMoveBtn').addEventListener('click', () => {
+ if (ch.freeMove !== false) {
+ // 停止自由移动：立即打断漫游行走 + 重置计时（freeMove=false 后漫游分支不再进入）
+ ch.freeMove = false;
+ ch.wanderT = 0;
+ if (!ch._userMove && ch.state === 'walk') {
+ ch.state = 'idle';
+ ch.frame = 0;
+ ch.frameT = 0;
+ }
+ } else {
+ // 开启自由移动：重置计时，取消选中后即可漫游
+ ch.freeMove = true;
+ ch.wanderT = 0;
+ ch.wanderInterval = 2 + Math.random() * 4;
+ }
+ updateCharPanel();
+ });
panel.querySelector('#charDelBtn').addEventListener('click', () => deleteChar(ch.id));
}
-// ---- 放置面板 ----
+// ---- 放置面板（右侧建筑面板"角色"分类下） ----
+// 新放置角色默认是否自由移动（面板上的自由移动按钮切换此值）
+let charPlaceFreeMove = true;
function updateCharPlacePanel() {
const panel = document.getElementById('charPlacePanel');
if (!panel) return;
const races = Object.keys(RACE_CONFIG);
+ const fmBtnStyle = charPlaceFreeMove
+ ? 'background:#1d4a2a;color:#7ef0a0;border:1px solid #3a8a5e;'
+ : 'background:#3a3a4a;color:#aab;border:1px solid #5a5a7a;';
panel.innerHTML = `
-
-
+
+
+
`;
panel.querySelectorAll('.charRaceBtn').forEach(btn => {
- btn.addEventListener('click', () => { charPlaceRace = btn.dataset.race; charPlaceMode = true; updateCharPlacePanel(); });
+ btn.addEventListener('click', () => {
+ charPlaceRace = btn.dataset.race;
+ charPlaceMode = true; // 点击种族直接进入放置模式（简化：无需再点"开始放置"）
+ updateCharPlacePanel();
+ });
+ });
+ panel.querySelector('#charFreeMoveToggle').addEventListener('click', () => {
+ charPlaceFreeMove = !charPlaceFreeMove;
+ updateCharPlacePanel();
+ });
+ panel.querySelector('#charClearAll').addEventListener('click', () => {
+ clearChars();
+ updateCharPlacePanel();
});
- panel.querySelector('#charPlaceToggle').addEventListener('click', () => { charPlaceMode = !charPlaceMode; updateCharPlacePanel(); });
- panel.querySelector('#charClearAll').addEventListener('click', () => { clearChars(); updateCharPlacePanel(); });
}
// 导出到 window
diff --git a/assets/characters/demon/demon_idle_attack_1x6.png b/assets/characters/demon/demon_idle_attack_1x6.png
index a1a24cd..99249ec 100644
Binary files a/assets/characters/demon/demon_idle_attack_1x6.png and b/assets/characters/demon/demon_idle_attack_1x6.png differ
diff --git a/assets/characters/demon/demon_walk_1x6.png b/assets/characters/demon/demon_walk_1x6.png
index 4bb7373..4cc1ebd 100644
Binary files a/assets/characters/demon/demon_walk_1x6.png and b/assets/characters/demon/demon_walk_1x6.png differ
diff --git a/assets/characters/demon/demon_work_comm_1x6.png b/assets/characters/demon/demon_work_comm_1x6.png
index 899578b..79d8843 100644
Binary files a/assets/characters/demon/demon_work_comm_1x6.png and b/assets/characters/demon/demon_work_comm_1x6.png differ
diff --git a/assets/characters/dragon/dragon_idle_attack_1x6.png b/assets/characters/dragon/dragon_idle_attack_1x6.png
index 82bb794..dec3816 100644
Binary files a/assets/characters/dragon/dragon_idle_attack_1x6.png and b/assets/characters/dragon/dragon_idle_attack_1x6.png differ
diff --git a/assets/characters/dragon/dragon_walk_1x6.png b/assets/characters/dragon/dragon_walk_1x6.png
index 6fc257a..9f4c8cc 100644
Binary files a/assets/characters/dragon/dragon_walk_1x6.png and b/assets/characters/dragon/dragon_walk_1x6.png differ
diff --git a/assets/characters/dragon/dragon_work_comm_1x6.png b/assets/characters/dragon/dragon_work_comm_1x6.png
index f5cd915..34a8363 100644
Binary files a/assets/characters/dragon/dragon_work_comm_1x6.png and b/assets/characters/dragon/dragon_work_comm_1x6.png differ
diff --git a/assets/characters/dwarf/dwarf_idle_attack_1x6.png b/assets/characters/dwarf/dwarf_idle_attack_1x6.png
index 9244631..726ad47 100644
Binary files a/assets/characters/dwarf/dwarf_idle_attack_1x6.png and b/assets/characters/dwarf/dwarf_idle_attack_1x6.png differ
diff --git a/assets/characters/dwarf/dwarf_walk_1x6.png b/assets/characters/dwarf/dwarf_walk_1x6.png
index 4b9e16b..d9864fe 100644
Binary files a/assets/characters/dwarf/dwarf_walk_1x6.png and b/assets/characters/dwarf/dwarf_walk_1x6.png differ
diff --git a/assets/characters/dwarf/dwarf_work_comm_1x6.png b/assets/characters/dwarf/dwarf_work_comm_1x6.png
index 942d03c..e0068ca 100644
Binary files a/assets/characters/dwarf/dwarf_work_comm_1x6.png and b/assets/characters/dwarf/dwarf_work_comm_1x6.png differ
diff --git a/assets/characters/elf/elf_idle_attack_1x6.png b/assets/characters/elf/elf_idle_attack_1x6.png
index 5245850..8be0674 100644
Binary files a/assets/characters/elf/elf_idle_attack_1x6.png and b/assets/characters/elf/elf_idle_attack_1x6.png differ
diff --git a/assets/characters/elf/elf_walk_1x6.png b/assets/characters/elf/elf_walk_1x6.png
index e655a79..037bbec 100644
Binary files a/assets/characters/elf/elf_walk_1x6.png and b/assets/characters/elf/elf_walk_1x6.png differ
diff --git a/assets/characters/elf/elf_work_comm_1x6.png b/assets/characters/elf/elf_work_comm_1x6.png
index c4da278..e14820e 100644
Binary files a/assets/characters/elf/elf_work_comm_1x6.png and b/assets/characters/elf/elf_work_comm_1x6.png differ
diff --git a/assets/characters/human/human_idle_attack_1x6.png b/assets/characters/human/human_idle_attack_1x6.png
index aca3d96..b09679d 100644
Binary files a/assets/characters/human/human_idle_attack_1x6.png and b/assets/characters/human/human_idle_attack_1x6.png differ
diff --git a/assets/characters/human/human_walk_1x6.png b/assets/characters/human/human_walk_1x6.png
index f98927c..5239e23 100644
Binary files a/assets/characters/human/human_walk_1x6.png and b/assets/characters/human/human_walk_1x6.png differ
diff --git a/assets/characters/human/human_work_comm_1x6.png b/assets/characters/human/human_work_comm_1x6.png
index 532e167..2eaba71 100644
Binary files a/assets/characters/human/human_work_comm_1x6.png and b/assets/characters/human/human_work_comm_1x6.png differ
diff --git a/assets/characters/undead/undead_idle_attack_1x6.png b/assets/characters/undead/undead_idle_attack_1x6.png
index 274f48a..9531ed9 100644
Binary files a/assets/characters/undead/undead_idle_attack_1x6.png and b/assets/characters/undead/undead_idle_attack_1x6.png differ
diff --git a/assets/characters/undead/undead_walk_1x6.png b/assets/characters/undead/undead_walk_1x6.png
index cc8e8ee..684d2db 100644
Binary files a/assets/characters/undead/undead_walk_1x6.png and b/assets/characters/undead/undead_walk_1x6.png differ
diff --git a/assets/characters/undead/undead_work_comm_1x6.png b/assets/characters/undead/undead_work_comm_1x6.png
index c3e9a37..6947805 100644
Binary files a/assets/characters/undead/undead_work_comm_1x6.png and b/assets/characters/undead/undead_work_comm_1x6.png differ
diff --git a/world.html b/world.html
index 379cce6..3370126 100644
--- a/world.html
+++ b/world.html
@@ -1749,10 +1749,10 @@ const MICRO_BUILD_ITEMS = [
// 建筑 / 设施 目录（兜底：未登录或 Odoo 未提供时直接用此；登录后由 /yt_world/api/micro/catalog 覆盖）。
// flat=true 表示平面俯视，岛上压成菱形贴地；否则为 3/4 立绘，竖直站立。
const MICRO_BUILD_EXTRA = [
- { id: 'cottage', cat: 'build', icon: 'assets/buildings/spring/cottage/cottage_l.png', name: '农舍', desc: '村民起居的基本居所，提供人口上限与夜间休息。', flat: false, w: 2, h: 2, statLevel: 1, statHp: 120, statYield: { population: 4 } },
- { id: 'windmill', cat: 'build', icon: 'assets/buildings/spring/windmill/windmill_l.png', name: '风车', desc: '利用风力磨粉与提水，提升粮食加工效率。', flat: false, w: 2, h: 2, statLevel: 1, statHp: 110, statYield: { flour: 2 } },
- { id: 'blacksmith', cat: 'build', icon: 'assets/buildings/spring/blacksmith/blacksmith_l.png',name: '铁匠铺', desc: '锻造工具与武器，产出金属制品。', flat: false, w: 2, h: 2, statLevel: 1, statHp: 130, statYield: { metal: 2 } },
- { id: 'grocery', cat: 'build', icon: 'assets/buildings/spring/grocery/grocery_l.png', name: '杂货铺', desc: '交易日用物资的小型商铺，促进经济流通。', flat: false, w: 2, h: 2, statLevel: 1, statHp: 90, statYield: { coin: 2 } },
+ { id: 'cottage', cat: 'build', icon: 'assets/buildings/spring/cottage/cottage_l.png?v=2', name: '农舍', desc: '村民起居的基本居所，提供人口上限与夜间休息。', flat: false, w: 2, h: 2, statLevel: 1, statHp: 120, statYield: { population: 4 } },
+ { id: 'windmill', cat: 'build', icon: 'assets/buildings/spring/windmill/windmill_l.png?v=2', name: '风车', desc: '利用风力磨粉与提水，提升粮食加工效率。', flat: false, w: 2, h: 2, statLevel: 1, statHp: 110, statYield: { flour: 2 } },
+ { id: 'blacksmith', cat: 'build', icon: 'assets/buildings/spring/blacksmith/blacksmith_l.png?v=2',name: '铁匠铺', desc: '锻造工具与武器，产出金属制品。', flat: false, w: 2, h: 2, statLevel: 1, statHp: 130, statYield: { metal: 2 } },
+ { id: 'grocery', cat: 'build', icon: 'assets/buildings/spring/grocery/grocery_l.png?v=2', name: '杂货铺', desc: '交易日用物资的小型商铺，促进经济流通。', flat: false, w: 2, h: 2, statLevel: 1, statHp: 90, statYield: { coin: 2 } },
{ id: 'temple', cat: 'build', icon: 'assets/buildings/spring/temple/temple_l.png', name: '神庙', desc: '供奉信仰的场所，提升居民精神状态与领地声望。', flat: false, w: 2, h: 2, statLevel: 1, statHp: 160, statYield: { prestige: 3 } },
{ id: 'clinic', cat: 'build', icon: 'assets/buildings/spring/clinic/clinic_l.png', name: '医务室', desc: '诊治伤病，恢复居民生命值。', flat: false, w: 2, h: 2, statLevel: 1, statHp: 100, statYield: { heal: 2 } },
{ id: 'restaurant', cat: 'build', icon: 'assets/buildings/spring/restaurant/restaurant_l.png',name: '酒馆', desc: '烹制料理，为居民提供饱食与心情加成。', flat: false, w: 2, h: 2, statLevel: 1, statHp: 95, statYield: { satiety: 3 } },
@@ -1764,7 +1764,18 @@ const MICRO_BUILD_EXTRA = [
{ id: 'library', cat: 'build', icon: 'assets/buildings/spring/library/library_l.png', name: '图书馆', desc: '收藏典籍与卷轴，提升领地科研与知识产出。', flat: false, w: 2, h: 2, statLevel: 1, statHp: 110, statYield: { research: 4 } },
{ id: 'barracks', cat: 'build', icon: 'assets/buildings/spring/barracks/barracks_l.png', name: '兵营', desc: '训练士兵与储备武备的军事建筑，提升领地军事产出。', flat: false, w: 2, h: 2, statLevel: 1, statHp: 130, statYield: { military: 4 } },
{ id: 'guild', cat: 'build', icon: 'assets/buildings/spring/guild/guild_l.png', name: '公会', desc: '冒险者与住民集结之所，可发布委托与招募成员。', flat: false, w: 2, h: 2, statLevel: 1, statHp: 140, statYield: { prestige: 2, coin: 1 } },
- { id: 'village', cat: 'build', icon: 'assets/buildings/spring/village/village_l.png', name: '村庄', desc: '族群聚落的核心，提升人口上限与基础产出。', flat: false, w: 2, h: 2, statLevel: 1, statHp: 150, statYield: { population: 6, food: 1 } }
+ { id: 'village', cat: 'build', icon: 'assets/buildings/spring/village/village_l.png', name: '村庄', desc: '族群聚落的核心，提升人口上限与基础产出。', flat: false, w: 2, h: 2, statLevel: 1, statHp: 150, statYield: { population: 6, food: 1 } },
+ // 生物分类：9 种族角色（点击进入"点地面放置"模式，不进入建筑模式）
+ { id: 'race_human', cat: 'bio', icon: 'assets/characters/human/human_thumb.png', name: '人族', isChar: true, race: 'human' },
+ { id: 'race_demon', cat: 'bio', icon: 'assets/characters/demon/demon_thumb.png', name: '妖族', isChar: true, race: 'demon' },
+ { id: 'race_dwarf', cat: 'bio', icon: 'assets/characters/dwarf/dwarf_thumb.png', name: '矮人', isChar: true, race: 'dwarf' },
+ { id: 'race_elf', cat: 'bio', icon: 'assets/characters/elf/elf_thumb.png', name: '精灵', isChar: true, race: 'elf' },
+ { id: 'race_dragon', cat: 'bio', icon: 'assets/characters/dragon/dragon_thumb.png', name: '龙族', isChar: true, race: 'dragon' },
+ { id: 'race_undead', cat: 'bio', icon: 'assets/characters/undead/undead_thumb.png', name: '不死族', isChar: true, race: 'undead' },
+ { id: 'race_orc', cat: 'bio', icon: 'assets/characters/orc/orc_thumb.png', name: '兽人', isChar: true, race: 'orc' },
+ { id: 'race_angel', cat: 'bio', icon: 'assets/characters/angel/angel_thumb.png', name: '天使', isChar: true, race: 'angel' },
+ { id: 'race_werewolf',cat: 'bio', icon: 'assets/characters/werewolf/werewolf_thumb.png', name: '狼人', isChar: true, race: 'werewolf' },
+ { id: 'race_golem', cat: 'bio', icon: 'assets/characters/golem/golem_thumb.png', name: '石傀儡', isChar: true, race: 'golem' },
];
// 建筑交互配置（数据驱动，与后端 BUILD_EFFECTS 的 (code,action) 对应）。
@@ -5750,6 +5761,25 @@ function microRenderBuildPanel() {
gridEl.querySelectorAll('.mv-cell').forEach(el => {
el.addEventListener('click', () => {
const id = el.dataset.build;
+ const item = microAllBuildItems().find(x => x.id === id);
+ // 角色素材（生物栏）：进入"点地面放置"模式，不进建筑模式
+ if (item && item.isChar) {
+ // characters.js 顶层 let charPlaceRace/charPlaceMode 在同全局词法环境可直接读写
+ charPlaceRace = item.race;
+ charPlaceMode = true;
+ // 退出建造模式（如果有）+ 清掉建筑选中态
+ microBuildSel = null;
+ microEditRef = null;
+ microGhost = null;
+ microGhostFrozen = false;
+ if (microBuildMode) microSetBuildMode(false);
+ clearBuildSelUI();
+ microRenderBuildPanel();
+ if (typeof updateCharPlacePanel === 'function') updateCharPlacePanel();
+ const raceName = (window.RACE_CONFIG && window.RACE_CONFIG[item.race]) ? window.RACE_CONFIG[item.race].name : item.name;
+ microToast('👤 点地面放置' + raceName);
+ return;
+ }
microBuildSel = (microBuildSel === id) ? null : id;
microEditRef = null; // 选新素材退出编辑
microGhostFrozen = false; // 进入跟随模式，移动鼠标，点一下才冻结