From 105082d009b28d8926a5e232fda428da74c0e816 Mon Sep 17 00:00:00 2001
From: walkpan <panfudan0209@qq.com>
Date: Sat, 28 Mar 2026 15:00:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8UI=E5=85=83=E7=B4=A0=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=B9=B6=E7=A6=81=E7=94=A8=E5=8D=A1=E7=89=8C=E9=94=81?=
 =?UTF-8?q?=E5=AE=9AUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释掉卡牌锁定/解锁按钮的显示逻辑，暂时禁用该功能
- 调整角色控制器界面中多个UI元素的位置坐标，优化布局
---
 assets/resources/gui/role_controller.prefab | 34 ++++++++++-----------
 assets/script/game/map/CardComp.ts          |  4 +--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab
index 46ce01b0..0936ec6a 100644
--- a/assets/resources/gui/role_controller.prefab
+++ b/assets/resources/gui/role_controller.prefab
@@ -1056,7 +1056,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 477.943,
+      "y": 459.545,
       "z": 0
     },
     "_lrot": {
@@ -1589,7 +1589,7 @@
     "_left": 0,
     "_right": 0,
     "_top": 0,
-    "_bottom": 477.943,
+    "_bottom": 459.545,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -1925,7 +1925,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 427.529,
+      "y": 37.166,
       "z": 0
     },
     "_lrot": {
@@ -2080,7 +2080,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 427.529,
+      "y": 37.166,
       "z": 0
     },
     "_lrot": {
@@ -3044,7 +3044,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 427.529,
+      "y": 37.166,
       "z": 0
     },
     "_lrot": {
@@ -3999,7 +3999,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -271.695,
-      "y": 428.955,
+      "y": 38.592,
       "z": 0
     },
     "_lrot": {
@@ -5025,7 +5025,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 272.07,
-      "y": 428.955,
+      "y": 38.592,
       "z": 0
     },
     "_lrot": {
@@ -5626,7 +5626,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -259,
-      "y": 277.425,
+      "y": 307.022,
       "z": 0
     },
     "_lrot": {
@@ -5902,7 +5902,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -85,
-      "y": 277.425,
+      "y": 307.022,
       "z": 0
     },
     "_lrot": {
@@ -6178,7 +6178,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 85,
-      "y": 277.425,
+      "y": 307.022,
       "z": 0
     },
     "_lrot": {
@@ -6454,7 +6454,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 259,
-      "y": 277.425,
+      "y": 307.022,
       "z": 0
     },
     "_lrot": {
@@ -6991,7 +6991,7 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": -260,
-      "y": 277.425,
+      "y": 307.022,
       "z": 0
     }
   },
@@ -7312,7 +7312,7 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": -86,
-      "y": 277.425,
+      "y": 307.022,
       "z": 0
     }
   },
@@ -7633,7 +7633,7 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 86,
-      "y": 277.425,
+      "y": 307.022,
       "z": 0
     }
   },
@@ -7954,7 +7954,7 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 260,
-      "y": 277.425,
+      "y": 307.022,
       "z": 0
     }
   },
@@ -8208,7 +8208,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 3.595,
+      "y": 66.789,
       "z": 0
     },
     "_lrot": {
@@ -11692,7 +11692,7 @@
     "_left": 10,
     "_right": 10,
     "_top": 1230,
-    "_bottom": 3.595,
+    "_bottom": 66.789,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
diff --git a/assets/script/game/map/CardComp.ts b/assets/script/game/map/CardComp.ts
index a6a680c8..def18e65 100644
--- a/assets/script/game/map/CardComp.ts
+++ b/assets/script/game/map/CardComp.ts
@@ -345,8 +345,8 @@ export class CardComp extends CCComp {
 
     /** 根据锁态刷新 Lock / unLock 显示（Lock=可点击上锁，unLock=可点击解锁） */
     private updateLockUI() {
-        if (this.Lock) this.Lock.active = !this.isLocked;
-        if (this.unLock) this.unLock.active = this.isLocked;
+        // if (this.Lock) this.Lock.active = !this.isLocked;
+        // if (this.unLock) this.unLock.active = this.isLocked;
     }
 
     /** 根据当前 cardData 渲染卡面文字与图标 */