添加genesys模式服务器

微调布局

Classes/gframe/drawing.cpp

@@ -1636,14 +1636,14 @@ void Game::DrawDeckBd() {
     auto it = deckBuilder.filterList->credit_limits.find(L"genesys");
     if (it != deckBuilder.filterList->credit_limits.end()) {
         // Genesys计分板背景
-        driver->draw2DRectangle(Resize(420, 136, 628, 157), 0xff000000, 0xff000000, 0x40000000, 0x40000000);
+        driver->draw2DRectangle(Resize(415, 136, 633, 157), 0xff000000, 0xff000000, 0x80000000, 0x80000000);
         // Genesys计分板外框
-        driver->draw2DRectangleOutline(Resize(420, 136, 628, 157));
+        driver->draw2DRectangleOutline(Resize(415, 136, 633, 157));
 
         // 显示“限”的文字图标
-        driver->draw2DImage(imageManager.tGSC, Resize_X_Y(425, 137, 445, 156), irr::core::recti(0, 0, 64, 64), 0, 0, true);
+        driver->draw2DImage(imageManager.tGSC, Resize_X_Y(420, 137, 440, 156), irr::core::recti(0, 0, 64, 64), 0, 0, true);
         int intValue = static_cast<int>(it->second);//获取被选定的genesys禁卡表的上限值，并显示在界面上
-        DrawShadowText(guiFont, std::to_wstring(intValue), Resize_X_Y(450, 137, 470, 156), Resize(0, 1, 2, 0), 0xffffffff, 0xff000000, true,true);
+        DrawShadowText(guiFont, std::to_wstring(intValue), Resize_X_Y(445, 137, 465, 156), Resize(0, 1, 2, 0), 0xffffffff, 0xff000000, true,true);
 
         //遍历genesys禁卡表的卡片点数表，统计当前卡组点数合计值
         int totalCredits = 0;
@@ -1699,18 +1699,19 @@ void Game::DrawDeckBd() {
             }
         }
         irr::video::SColor color = 0xffffffff;// 设置默认数字颜色值为白色
-        driver->draw2DImage(imageManager.tGSC, Resize_X_Y(480, 137, 500, 156), irr::core::recti(64, 0, 128, 64), 0, 0, true);
+        // 显示“计”文字图标和卡组合计点数值
+        driver->draw2DImage(imageManager.tGSC, Resize_X_Y(475, 137, 495, 156), irr::core::recti(64, 0, 128, 64), 0, 0, true);
         color = totalCredits > intValue ? 0xffff0000 : 0xffffffff;// 如果点数总和超过上限则设置数字颜色为红色，否则为白色
-        DrawShadowText(guiFont, std::to_wstring(totalCredits), Resize_X_Y(505, 137, 525, 156), Resize(0, 1, 2, 0), color, 0xff000000, true,true);
+        DrawShadowText(guiFont, std::to_wstring(totalCredits), Resize_X_Y(500, 137, 520, 156), Resize(0, 1, 2, 0), color, 0xff000000, true,true);
 
-        // 显示剩余点数
-        driver->draw2DImage(imageManager.tGSC, Resize_X_Y(535, 137, 555, 156), irr::core::recti(128, 0, 192, 64), 0, 0, true);
+        // 显示“余”文字图标和剩余点数值
+        driver->draw2DImage(imageManager.tGSC, Resize_X_Y(530, 137, 550, 156), irr::core::recti(128, 0, 192, 64), 0, 0, true);
         int remaining = intValue - totalCredits;
         color = remaining < 0 ? 0xffff0000 : 0xffffffff;// 剩余点数小于0则设置数字颜色为红色，否则为白色
-        DrawShadowText(guiFont, std::to_wstring(remaining), Resize_X_Y(560, 137, 580, 156), Resize(0, 1, 2, 0), color, 0xff000000, true,true);
+        DrawShadowText(guiFont, std::to_wstring(remaining), Resize_X_Y(555, 137, 575, 156), Resize(0, 1, 2, 0), color, 0xff000000, true,true);
 
-        // Genesys标志
-        driver->draw2DImage(imageManager.tGSC, Resize(590, 137, 623, 156), irr::core::recti(192, 0, 448, 64), 0, 0, true);
+        // Genesys标志，仅提示这是用于genesys的计分板
+        driver->draw2DImage(imageManager.tGSC, Resize(580, 139, 628, 154), irr::core::recti(192, 0, 448, 64), 0, 0, true);
     }
 
     // 主卡组内容区背景与边框

mobile/assets/en/serverlist.xml

@@ -18,6 +18,14 @@
         <port>888</port>
         <keep>true</keep>
     </server>
+    <server>
+        <player-name>Knight of Hanoi</player-name>
+        <name>GENESYS Format Server</name>
+        <desc>Construct decks with restrictions according to the GENESYS Point List.</desc>
+        <ip>exp.baldlee.top</ip>
+        <port>23333</port>
+        <keep>true</keep>
+    </server>
     <server>
         <player-name>Knight of Hanoi</player-name>
         <name>Duel Chronicles</name>

mobile/assets/es/serverlist.xml

@@ -18,6 +18,14 @@
         <port>888</port>
         <keep>true</keep>
     </server>
+    <server>
+        <player-name>Knight of Hanoi</player-name>
+        <name>Servidor oficial del formato GENESYS</name>
+        <desc>Construye mazos con restricciones según la Tabla de Puntos GENESYS.</desc>
+        <ip>exp.baldlee.top</ip>
+        <port>23333</port>
+        <keep>true</keep>
+    </server>
     <server>
         <player-name>Knight of Hanoi</player-name>
         <name>Evolution TCG Server</name>

mobile/assets/kor/serverlist.xml

@@ -18,6 +18,14 @@
         <port>888</port>
         <keep>true</keep>
     </server>
+    <server>
+        <player-name>Knight of Hanoi</player-name>
+        <name>GENESYS 포맷 정식 서버</name>
+        <desc>GENESYS 포인트표 기준 제한 적용하여 덱 구성. TCG 환경</desc>
+        <ip>exp.baldlee.top</ip>
+        <port>23333</port>
+        <keep>true</keep>
+    </server>
     <server>
         <player-name>신선한 고기</player-name>
         <name>YGOPRO 중국 서버 1</name>
@@ -34,12 +42,4 @@
         <port>2333</port>
         <keep>true</keep>
     </server>
-    <server>
-        <player-name>신선한 고기</player-name>
-        <name>2 Pick MyCard 모에</name>
-        <desc>build new deck to duel</desc>
-        <ip>2pick.moecube.com</ip>
-        <port>765</port>
-        <keep>true</keep>
-    </server>
 </servers>

mobile/assets/pt/serverlist.xml

@@ -18,6 +18,14 @@
         <port>888</port>
         <keep>true</keep>
     </server>
+    <server>
+        <player-name>Knight of Hanoi</player-name>
+        <name>Servidor oficial do formato GENESYS</name>
+        <desc>Construa decks com restrições de acordo com a Tabela de Pontos GENESYS.</desc>
+        <ip>exp.baldlee.top</ip>
+        <port>23333</port>
+        <keep>true</keep>
+    </server>
     <server>
         <player-name>Cavaleiro de Hanoi</player-name>
         <name>Servidor Evolution TCG</name>

mobile/assets/serverlist.xml

@@ -18,6 +18,14 @@
         <port>888</port>
         <keep>true</keep>
     </server>
+    <server>
+        <player-name>Knight of Hanoi</player-name>
+        <name>起源赛制正式服</name>
+        <desc>按照genesys点数表禁限构筑牌组。TCG环境</desc>
+        <ip>exp.baldlee.top</ip>
+        <port>23333</port>
+        <keep>true</keep>
+    </server>
     <server>
         <player-name>Knight of Hanoi</player-name>
         <name>决斗编年史</name>

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerFragment.java

@@ -836,11 +836,19 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
         int currentCredit = 0;
         int creditLimit = 0;
 
+        // 禁卡表为空值以防止空指针异常
+        if (limitList == null) {
+            // 如果limitList为null，隐藏计分板并返回
+            if (ll_genesys_scoreboard != null) {
+                ll_genesys_scoreboard.setVisibility(View.GONE);
+            }
+            return;
+        }
         if (limitList.getCreditLimits() != null && limitList.getCreditLimits() > 0) {
             creditLimit = limitList.getCreditLimits();
             currentCredit = getCreditCount(mDeckAdapater.getCurrentState());
 
-            // 当当前信用分超过限制时，设置文本为红色
+            // 当当前点数超过限制时，设置文本为红色
             if (currentCredit > creditLimit) {
                 tv_credit_count.setTextColor(Color.RED);
                 tv_credit_remain.setTextColor(Color.RED);