优化工具栏UI更紧凑，棋盘回归原来大小，更新十月表

Assets/ArtSystem/superButton/toolBars/new_toolBar_duel_compact.prefab.meta

+fileFormatVersion: 2
+guid: 210cb43dabe1b4a8ea1b96acd7ca4110
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/NGUI/Scripts/Editor/UITextureInspector.cs

@@ -35,7 +35,7 @@ public class UITextureInspector : UIBasicSpriteEditor
             {
                 mTex.mainTexture = UIHelper.getTexture2D("textures/ui/" + startPath + ".png");//YGOMobile Paths
             }
-            Debug.Log("force delay read");
+            // Debug.Log("force delay read");
         }
         NGUIEditorTools.DrawProperty("Material", serializedObject, "mMat");
 

Assets/SibylSystem/Ocgcore/Ocgcore.cs

@@ -962,7 +962,8 @@ public class Ocgcore : ServantWithCardDescription
     public override void preFrameFunction()
     {
         base.preFrameFunction();
-        Program.reMoveCam(getScreenCenter(), 0.03f);
+        // Program.reMoveCam(getScreenCenter(), 0.03f);
+        Program.reMoveCam2(getScreenCenter());
         Program.cameraPosition.z += Program.wheelValue;
         if (Program.cameraPosition.z < camera_min)
         {
@@ -9117,7 +9118,8 @@ public class Ocgcore : ServantWithCardDescription
         Program.I().main_camera.transform.position = Program.cameraPosition * 1.5f;
         Program.cameraRotation = new Vector3(60, 0, 0);
         Program.I().main_camera.transform.eulerAngles = Program.cameraRotation;
-        Program.reMoveCam(getScreenCenter(), 0.03f);
+        // Program.reMoveCam(getScreenCenter(), 0.03f);
+        Program.reMoveCam2(getScreenCenter());
         gameField = new GameField();
         if (paused)
         {

Assets/SibylSystem/Program.cs

@@ -599,7 +599,7 @@ public class Program : MonoBehaviour
         bool lflistUpdated = false;
         bool stringsUpdated = false;
         // 1. 下载 cards.cdb
-        string cardsUrl = "https://cdntx.moecube.com/koishipro/content/cards.cdb";
+        string cardsUrl = "https://cdntx.moecube.com/koishipro/ygopro-database/zh-CN/cards.cdb";
         string cardsPath = Path.Combine(dbDir, "cards.cdb");
         yield return StartCoroutine(
             UnityFileDownloader.DownloadFileWithHeadCheck(
@@ -617,7 +617,7 @@ public class Program : MonoBehaviour
         );
 
         // 2. 下载 lflist.conf
-        string lflistUrl = "https://cdntx.moecube.com/koishipro/content/lflist.conf";
+        string lflistUrl = "https://cdntx.moecube.com/koishipro/ygopro-database/zh-CN/lflist.conf";
         string lflistPath = Path.Combine(dbDir, "lflist.conf");
         yield return StartCoroutine(
             UnityFileDownloader.DownloadFileWithHeadCheck(
@@ -635,7 +635,7 @@ public class Program : MonoBehaviour
         );
         // 3. 下载 strings.conf
         string stringsUrl =
-            "https://cdntx.moecube.com/koishipro/content/strings.conf";
+            "https://cdntx.moecube.com/koishipro/ygopro-database/zh-CN/strings.conf";
         string stringsPath = Path.Combine(dbDir, "strings.conf");
         yield return StartCoroutine(
             UnityFileDownloader.DownloadFileWithHeadCheck(
@@ -1006,15 +1006,62 @@ public class Program : MonoBehaviour
         }
     }
 
-    // public static void reMoveCam(float xINscreen)
-    // {
+    public static void reMoveCam2(float targetCenterX_pixels)
+    {
         // float all = (float)Screen.width / 2f;
         // float it = xINscreen - (float)Screen.width / 2f;
         // float val = it / all;
         // camera_game_main.rect = new Rect(val, 0, 1, 1);
         // camera_container_3d.rect = camera_game_main.rect;
         // camera_main_3d.rect = camera_game_main.rect;
-    // }
+        // Debug.Log("reMoveCam fixedRightOffset: " + fixedRightOffset);
+        if (camera_game_main == null) return;
+
+        // 1. 获取屏幕的安全区域 (像素单位)
+        Rect safeArea = Screen.safeArea;
+
+        // 2. 计算在安全区域内，3D视图可用的总宽度
+        // 这是我们可以在其中移动和缩放3D场景的“画布”
+        float availableWidth_pixels = safeArea.width;
+
+        // 3. 计算3D场景本身的宽度
+        // 默认情况下，我们希望3D场景宽度等于安全区宽度。
+        float viewWidth_pixels = availableWidth_pixels;
+
+        // 但是，我们需要考虑targetCenterX_pixels左右两侧的空间，取较小的一边乘以2作为视图宽度，
+        // 以确保目标中心点始终在视图内并且视图不会超出安全区。
+        float spaceToLeft = targetCenterX_pixels - safeArea.x;
+        float spaceToRight = (safeArea.x + safeArea.width) - targetCenterX_pixels;
+
+        // 如果目标中心点在安全区内
+        if (spaceToLeft >= 0 && spaceToRight >= 0)
+        {
+            viewWidth_pixels = Mathf.Min(spaceToLeft, spaceToRight) * 2;
+        }
+        else // 如果目标中心点在安全区外，说明UI面板已经挤压得非常严重
+        {
+            viewWidth_pixels = 0; // 视图宽度为0，不显示
+        }
+
+        // 4. 计算视图的起始X坐标 (像素单位)
+        // 视图的左边缘 = 目标中心点 - 视图宽度的一半
+        float viewX_pixels = targetCenterX_pixels - (viewWidth_pixels / 2f);
+        // 基于安全区域计算目标屏幕坐标，让 finalViewport 往下移一点
+        float verticalOffset = safeArea.height * 0.02f;
+
+        // 5. 将计算出的像素坐标转换为标准化的 Rect(0-1范围)
+        Rect finalViewport = new Rect(
+            viewX_pixels / Screen.width + 0.03f,   // 整理向右偏移一点点
+            0,
+            viewWidth_pixels / Screen.width,
+            1
+        );
+
+        // 6. 应用到所有相关的3D相机
+        camera_game_main.rect = finalViewport;
+        if (camera_container_3d != null) camera_container_3d.rect = finalViewport;
+        if (camera_main_3d != null) camera_main_3d.rect = finalViewport;
+    }
 
     public static void reMoveCam(float targetCenterX_pixels)
     {
@@ -1305,7 +1352,7 @@ public class Program : MonoBehaviour
             FPS = FPS.Substring(0, 5);
         }
         catch { }
-        GUI.Label(new Rect(Screen.safeArea.x + 10, 5, 400, 200), "[Ver 1.036.2-TCube 2509] " + "FPS: " + FPS);
+        GUI.Label(new Rect(Screen.safeArea.x + 10, 5, 400, 200), "[Ver 1.036.2-TCube 2510] " + "FPS: " + FPS);
     }
 
 

Assets/SibylSystem/Servant.cs

@@ -104,14 +104,15 @@ public class Servant
             //     0
             // );
             // 1. 获取安全区域
-            Rect safeArea = Screen.safeArea;
+            // Rect safeArea = Screen.safeArea;
 
             // 2. 基于安全区域计算目标屏幕坐标，让 toolbar 往下移一点
-            float verticalOffset = safeArea.height * 0.02f;
+            // float verticalOffset = safeArea.height * 0.02f;
+            // float verticalOffset = 0f;
             float targetScreenX = Screen.width - RightToScreen;
-            float targetScreenY = safeArea.y + buttomToScreen - verticalOffset;
+            // float targetScreenY = safeArea.y + buttomToScreen - verticalOffset;
 
-            Vector3 vectorOfShowedBar_Screen = new Vector3(targetScreenX, targetScreenY, 0);
+            Vector3 vectorOfShowedBar_Screen = new Vector3(targetScreenX, buttomToScreen, 0);
 
             // 这里的Debug日志现在会显示正确的、适配后的坐标
             // Debug.Log("SafeArea-Adjusted vectorOfShowedBar_Screen: " + vectorOfShowedBar_Screen);
@@ -292,7 +293,7 @@ public class Servant
 
     public void SetBar(GameObject mod, float buttomToScreen, float RightToScreen)
     {
-        // Debug.Log("SetBar buttomToScreen: " + buttomToScreen);
+        // Debug.Log("SetBar buttomToScreen: " + buttomToScreen + " mod: " + mod);
         this.buttomToScreen = buttomToScreen;
         this.RightToScreen = RightToScreen;
         if (toolBar != null)

Assets/SibylSystem/deckManager/DeckManager.cs

@@ -232,12 +232,16 @@ public class DeckManager : ServantWithCardDescription
 
     public void shiftCondition(Condition condition)
     {
+        Rect safeArea = Screen.safeArea;
+        //  基于安全区域计算目标屏幕坐标，让 toolbar 往下移一点
+        float verticalOffset = safeArea.height * 0.02f;
+        float targetScreenY = safeArea.y - verticalOffset;
         this.condition = condition;
         switch (condition)
         {
             case Condition.editDeck:
                 UIHelper.setParent(gameObjectSearch, Program.I().ui_back_ground_2d);
-                SetBar(Program.I().new_bar_editDeck, 0, 230);
+                SetBar(Program.I().new_bar_editDeck, targetScreenY, 230);
                 UIPopupList_banlist = UIHelper.getByName<UIPopupList>(toolBar, "lfList_");
                 var banlistNames = YGOSharp.BanlistManager.GetFilteredBanlistNames();
                 UIPopupList_banlist.items = banlistNames;
@@ -260,7 +264,7 @@ public class DeckManager : ServantWithCardDescription
                 break;
             case Condition.changeSide:
                 UIHelper.setParent(gameObjectSearch, Program.I().ui_main_2d);
-                SetBar(Program.I().new_bar_changeSide, 0, 230);
+                SetBar(Program.I().new_bar_changeSide, targetScreenY, 230);
                 UIPopupList_banlist = null;
                 UIHelper.registEvent(toolBar, "rand_", rand);
                 UIHelper.registEvent(toolBar, "sort_", sort);
@@ -520,6 +524,9 @@ public class DeckManager : ServantWithCardDescription
 
         // --- 1. 获取通用变量和关键UI元素 ---
         Rect safeArea = Screen.safeArea;
+        //  基于安全区域计算目标屏幕坐标，让 toolbar 往下移一点
+        float verticalOffset = safeArea.height * 0.02f;
+        float targetScreenY = safeArea.y - verticalOffset;
         UITexture searchPanelTexture = UIHelper.getByName<UITexture>(gameObjectSearch, "under_");
         UITexture detailedPanelTexture = gameObjectDetailedSearch.GetComponent<UITexture>();
 
@@ -574,7 +581,7 @@ public class DeckManager : ServantWithCardDescription
             targetScreenPos = new Vector3(visibleTargetX, visibleTargetY, 0);
 
             // 更新底部Bar的右边距，使其避开两个面板的总宽度
-            reShowBar(0, searchPanelActualWidth + (DETAILED_SEARCH_PANEL_WIDTH * scaleFactor));
+            reShowBar(targetScreenY, searchPanelActualWidth + (DETAILED_SEARCH_PANEL_WIDTH * scaleFactor));
         }
         else
         {
@@ -582,7 +589,7 @@ public class DeckManager : ServantWithCardDescription
             targetScreenPos = new Vector3(visibleTargetX, hiddenTargetY, 0);
 
             // 更新底部Bar的右边距，使其仅避开主搜索面板
-            reShowBar(0, CAMERA_MARGIN_RIGHT_NORMAL);
+            reShowBar(targetScreenY, CAMERA_MARGIN_RIGHT_NORMAL);
         }
 
         // --- 4. 执行动画 ---

Assets/main.unity

@@ -577,7 +577,8 @@ PrefabInstance:
     - target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
       propertyPath: new_bar_duel
       value: 
-      objectReference: {fileID: 123392, guid: 829bf6713f5afeb40840803e21e03092, type: 3}
+      objectReference: {fileID: 4412631813711794958, guid: 210cb43dabe1b4a8ea1b96acd7ca4110,
+        type: 3}
     - target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 3}
       propertyPath: new_bar_room
       value: 

Assets/old/UiverseAssests/art_plugin/attack_light_line/ocgcore/mod_ocgcore_atk_fire.prefab

@@ -25,7 +25,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 125240}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.32103002, y: 0, z: 6.71785}
+  m_LocalPosition: {x: -0.27, y: 0, z: 5.65}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -4966,7 +4966,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 137080}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.32103002, y: 0, z: -10.794931}
+  m_LocalPosition: {x: 0, y: 0, z: -20}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

UserSettings/Layouts/default-2021.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 1512
     height: 916
   m_ShowMode: 4
-  m_Title: Simulator
+  m_Title: Inspector
   m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -119,7 +119,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 18
+  controlID: 14
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -144,7 +144,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 19
+  controlID: 15
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -169,7 +169,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 20
+  controlID: 16
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -189,8 +189,8 @@ MonoBehaviour:
     y: 0
     width: 282
     height: 576
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 13}
   m_Panes:
   - {fileID: 13}
@@ -215,8 +215,8 @@ MonoBehaviour:
     y: 0
     width: 865
     height: 576
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 14}
   m_Panes:
   - {fileID: 12}
@@ -233,7 +233,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ConsoleWindow
+  m_Name: ProjectBrowser
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -242,14 +242,14 @@ MonoBehaviour:
     y: 576
     width: 1147
     height: 290
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 16}
+  m_MinSize: {x: 231, y: 271}
+  m_MaxSize: {x: 10001, y: 10021}
+  m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
   - {fileID: 16}
-  m_Selected: 1
-  m_LastSelected: 0
+  m_Selected: 0
+  m_LastSelected: 1
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -269,8 +269,8 @@ MonoBehaviour:
     y: 0
     width: 365
     height: 866
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 17}
   m_Panes:
   - {fileID: 17}
@@ -558,9 +558,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.3683279, y: -0.19390088, z: 0.078879856}
+    m_Target: {x: -0.65800685, y: -0.19995081, z: 0.0072034774}
     speed: 2
-    m_Value: {x: 0.3683279, y: -0.19390088, z: 0.078879856}
+    m_Value: {x: -0.65800685, y: -0.19995081, z: 0.0072034774}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -611,9 +611,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 2.1120198
+    m_Target: 0.4122567
     speed: 2
-    m_Value: 2.1120198
+    m_Value: 0.4122567
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -671,23 +671,23 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
-      m_LastClickedID: 0
-      m_ExpandedIDs: 304ceeff804ceeff5050eeff9a2ef1ffea2ef1ffb832f1ffb2daf5ff2edbf5ff52dbf5ff58dbf5ff64dbf5ffecdcf5ff10ddf5ff105cf7ff085ff7ff2062f7ff4462f7ff4a62f7ff5662f7ffcc63f7ffde63f7ff5087f7ff5687f7ff6287f7ffea88f7ffa004f9ffb00af9ffd40af9ffda0af9ffe60af9ff6e0cf9ff4417f9ff1a9ff9ff2ccaf9ff50caf9ff56caf9ff62caf9ffeacbf9ff4e93faff9e93faff6e97faffd898faff2899fafff89cfaff8071fbffda71fbffaa75fbff96f0fcff9cf0fcffa6f0fcff8cf8fcff90b3fdff96b3fdffa0b3fdff86bbfdffaabbfdffbcbbfdff02bdfdff52bdfdff66bdfdff3abefdff8abefdff60c2fdffc643ffffc644ffffd044ffffe844ffff4845ffff5a45ffff6c45ffff58f7ffff7cf7ffff82f7ffff64f8ffff6ef8ffffa4f8fffff2f8ffff04f9ffff16f9ffff28f9ffff3af9fffff8faffff
+      m_SelectedIDs: 72dfecff
+      m_LastClickedID: -1253518
+      m_ExpandedIDs: 74dfecff967eefffa47eefffb07eefffc07eefffcc7eefffde7eefffea7eeffffc7eefff087fefff187fefff387fefff487fefff547fefff627fefff6e7fefff7e7fefff8a7fefff9a7fefffd07fefffb497efffee99effffe99efff569aefffdc9aefffa83af0ffde3af0ffe23af0ff5e51f0ff7051f0ff8251f0ffb251f0ff0604f6ff0e04f6ff90a9f6ff58c0f6ffb4c1f6ff04c2f6ff18c2f6ff00c3f6ff50c3f6ff26c7f6ffa67af7fff67af7ff0a7bf7ffe47bf7ff347cf7ff487cf7ff4e7df7ff9e7df7ff7481f7ff04fbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: trans_setting(Clone)
-        m_OriginalName: trans_setting(Clone)
+        m_Name: 
+        m_OriginalName: 
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: -2162
+        m_UserData: 0
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 8}
       m_SearchString: 
@@ -799,23 +799,23 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/SibylSystem/Ocgcore
+    - Assets/ArtSystem/superButton/toolBars
     m_Globs: []
     m_OriginalText: 
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 64
   m_LastFolders:
-  - Assets/SibylSystem/Ocgcore
+  - Assets/ArtSystem/superButton/toolBars
   m_LastFoldersGridSize: -1
   m_LastProjectPath: /Users/hexzhou/Workplace/ygopro2_unity2021
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 1159}
-    m_SelectedIDs: 0aaf0000
-    m_LastClickedID: 44810
-    m_ExpandedIDs: 0000000006af000008af00000aaf00000caf00000eaf000010af000012af00001aaf000026af00004caf000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 541.3339}
+    m_SelectedIDs: e0c60000
+    m_LastClickedID: 50912
+    m_ExpandedIDs: 00000000feae000002af000004af000006af000008af00000aaf0000f8c30000d2c60000e0c6000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -843,7 +843,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000006af000008af00000aaf00000caf00000eaf000010af000012af0000
+    m_ExpandedIDs: 00000000feae000000af000002af000004af000006af000008af00000aaf0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: