From eaeab955e36ac9737880e79e1b1948e5ec3e2097 Mon Sep 17 00:00:00 2001
From: ypsdf1 <nihaoshidifu@gitee.com>
Date: Fri, 10 Jul 2026 23:16:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DPHP=E4=B8=89=E4=B8=AAbug?=
 =?UTF-8?q?=EF=BC=9A1.changeVisitorRole=E6=94=AF=E6=8C=81=E4=B8=89?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=87=E6=8D=A2=EF=BC=88admin/member/visit?=
 =?UTF-8?q?or=EF=BC=89=E5=B9=B6=E5=85=81=E8=AE=B8=E9=A2=86=E5=9C=B0?=
 =?UTF-8?q?=E4=B8=BB=E8=87=AA=E7=94=B1=E5=88=87=E6=8D=A2=EF=BC=9B2.token?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=85=BC=E5=AE=B9POST=EF=BC=9B3.=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E6=9D=83=E9=99=90toggleMemberPerm=20DOM=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/land_api.php | 26 +++++++++++++++++++++-----
 player.php       | 10 +++++++---
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/api/land_api.php b/api/land_api.php
index f73c9a1..cd0b92e 100644
--- a/api/land_api.php
+++ b/api/land_api.php
@@ -1570,10 +1570,26 @@ function handleChangeVisitorRole($db, $playerName, $post) {
     $currentRole = $permRow ? ($permRow['role'] ?? '') : '';
     error_log("[领地权限][切换角色] land=$landName visitor=$visitor newRole=$newRole currentRole=$currentRole");
 
-    // 已授权玩家（管理员/成员）不能被强制降级为访客；仅允许把访客提升为 admin
-    if ($newRole === 'visitor' && ($currentRole === 'admin' || $currentRole === 'member')) {
-        error_log("[领地权限][切换角色] 拦截降级: $visitor 当前为 $currentRole，拒绝强制设为访客");
-        echo json_encode(['success' => false, 'error' => '已授权玩家(管理员/成员)不能通过切换访客角色降级，请通过成员管理手动处理']);
+    // ★ 领地主可自由切换任何角色（admin↔member↔visitor）
+    // 如果是访客且当前无记录，先插入一条
+    if (empty($currentRole) && $permRow === null) {
+        $stmtIns = $db->prepare("INSERT OR IGNORE INTO web_area_permissions (land_id, player_name, role, permissions, granted_at)
+            VALUES (:land_id, :player, :role, '', :now)");
+        $stmtIns->bindValue(':land_id', (int)$land['id'], SQLITE3_INTEGER);
+        $stmtIns->bindValue(':player', $visitor, SQLITE3_TEXT);
+        $stmtIns->bindValue(':role', $newRole, SQLITE3_TEXT);
+        $stmtIns->bindValue(':now', time(), SQLITE3_INTEGER);
+        $stmtIns->execute();
+        // 写入变更队列通知Java
+        $changeData = json_encode(['player' => $visitor, 'role' => $newRole, 'land_name' => $landName]);
+        $stmtC = $db->prepare("INSERT INTO web_admin_changes (change_type, target_id, target_name, change_data, created_at) VALUES ('perm_change', :id, :name, :data, :now)");
+        $stmtC->bindValue(':id', (int)$land['id'], SQLITE3_INTEGER);
+        $stmtC->bindValue(':name', $landName, SQLITE3_TEXT);
+        $stmtC->bindValue(':data', $changeData, SQLITE3_TEXT);
+        $stmtC->bindValue(':now', time(), SQLITE3_INTEGER);
+        $stmtC->execute();
+        $roleLabel = $newRole === 'admin' ? '管理员' : ($newRole === 'member' ? '成员' : '访客');
+        echo json_encode(['success' => true, 'message' => "已将 $visitor 设为$roleLabel"]);
         return;
     }
 
@@ -1596,7 +1612,7 @@ function handleChangeVisitorRole($db, $playerName, $post) {
     $stmt3->bindValue(':now', $now, SQLITE3_INTEGER);
     $stmt3->execute();
 
-    $roleLabel = $newRole === 'admin' ? '管理员' : '访客';
+    $roleLabel = $newRole === 'admin' ? '管理员' : ($newRole === 'member' ? '成员' : '访客');
     echo json_encode(['success' => true, 'message' => "已将 $visitor 设为$roleLabel"]);
 }
 
diff --git a/player.php b/player.php
index 1bbcd9f..d87f30a 100644
--- a/player.php
+++ b/player.php
@@ -3086,9 +3086,13 @@ async function addLandVisitor(landName) {
 }
 
 async function changeVisitorRole(landName, player, currentRole) {
-    const newRole = currentRole === 'admin' ? 'visitor' : 'admin';
-    const roleLabel = newRole === 'admin' ? '管理员' : '访客';
-    if (!await glassConfirm(`确定将 ${player} 设为${roleLabel}吗？${newRole === 'admin' ? '\n管理员将拥有领地管理权限！' : ''}`)) return;
+    // 三角色循环: visitor → admin → member → visitor
+    const roleOrder = ['visitor', 'admin', 'member'];
+    const roleLabels = {visitor: '访客', admin: '管理员', member: '成员'};
+    const nextIdx = (roleOrder.indexOf(currentRole) + 1) % roleOrder.length;
+    const newRole = roleOrder[nextIdx];
+    const roleLabel = roleLabels[newRole];
+    if (!await glassConfirm(`确定将 ${player} 设为${roleLabel}吗？${newRole === 'admin' ? '\n管理员将拥有领地管理权限！' : ''}${newRole === 'member' ? '\n成员将拥有独立权限控制。' : ''}`)) return;
     try {
         const url = new URL(API + 'land_api.php', location.href);
         const body = new URLSearchParams();