调整genesys服务器信息

修正没有正确添加etag的问题

Classes/gframe/deck_con.cpp

@@ -1717,23 +1717,23 @@ void DeckBuilder::FilterCards() {
                 }
             }
 
-            // filter_lm == 5 表示只显示OCG卡
+            // filter_lm == 5 表示只显示OCG卡+非独有卡
             if(filter_lm == 5 && !(data.ot & AVAIL_OCG))
                 continue;
 
-            // filter_lm == 6 表示只显示TCG卡
+            // filter_lm == 6 表示只显示TCG卡+非独有卡
             if(filter_lm == 6 && !(data.ot & AVAIL_TCG))
                 continue;
 
-            // filter_lm == 7 表示只显示SC卡（可能是简体中文卡）
+            // filter_lm == 7 表示只显示简体中文卡
             if(filter_lm == 7 && !(data.ot & AVAIL_SC))
                 continue;
 
-            // filter_lm == 8 表示只显示CUSTOM卡（自定义卡）
+            // filter_lm == 8 表示只显示自定义卡
             if(filter_lm == 8 && !(data.ot & AVAIL_CUSTOM))
                 continue;
 
-            // filter_lm == 9 表示只显示同时属于OCG和TCG的卡片
+            // filter_lm == 9 表示只显示同时属于OCG和TCG的卡片（无独有卡）
             if(filter_lm == 9 && ((data.ot & AVAIL_OCGTCG) != AVAIL_OCGTCG))
                 continue;
         }

mobile/assets/en/serverlist.xml

@@ -22,8 +22,8 @@
         <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>
+        <ip>e.ygo.pro</ip>
+        <port>13518</port>
         <keep>true</keep>
     </server>
     <server>

mobile/assets/es/serverlist.xml

@@ -22,8 +22,8 @@
         <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>
+        <ip>e.ygo.pro</ip>
+        <port>13518</port>
         <keep>true</keep>
     </server>
     <server>

mobile/assets/kor/serverlist.xml

@@ -22,8 +22,8 @@
         <player-name>Knight of Hanoi</player-name>
         <name>GENESYS 포맷 정식 서버</name>
         <desc>GENESYS 포인트표 기준 제한 적용하여 덱 구성. TCG 환경</desc>
-        <ip>exp.baldlee.top</ip>
-        <port>23333</port>
+        <ip>e.ygo.pro</ip>
+        <port>13518</port>
         <keep>true</keep>
     </server>
     <server>

mobile/assets/pt/serverlist.xml

@@ -22,8 +22,8 @@
         <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>
+        <ip>e.ygo.pro</ip>
+        <port>13518</port>
         <keep>true</keep>
     </server>
     <server>

mobile/assets/serverlist.xml

@@ -22,8 +22,8 @@
         <player-name>Knight of Hanoi</player-name>
         <name>起源赛制正式服</name>
         <desc>按照genesys点数表禁限构筑牌组。TCG环境</desc>
-        <ip>exp.baldlee.top</ip>
-        <port>23333</port>
+        <ip>e.ygo.pro</ip>
+        <port>13518</port>
         <keep>true</keep>
     </server>
     <server>

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

@@ -631,8 +631,8 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
             DataManager.get().load();
 
             // 设置限制卡表列表，使用第一个可用的限制列表
-            if (activity.getmLimitManager().getCount() > 0) {
-                mCardLoader.setLimitList(activity.getmLimitManager().getLastLimit());
+            if (activity.getmLimitManager().getCount() > 0 || activity.getmLimitManager().getGenesysCount() > 0) {
+                mCardLoader.setLimitList(mSettings.getGenesysMode() == 1 ? activity.getmLimitManager().getLastGenesysLimit() : activity.getmLimitManager().getLastLimit());
             }
 
             // 处理卡组文件加载逻辑
@@ -654,7 +654,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
 
             // 读取卡组文件内容
             if (mCardLoader.isOpen() && file.exists()) {
-                return mDeckAdapater.read(mCardLoader, file, mCardLoader.getLimitList());
+                return mDeckAdapater.read(mCardLoader, file, mSettings.getGenesysMode() == 1 ? mCardLoader.getGenesysLimitList() : mCardLoader.getLimitList());
             } else {
                 return new DeckInfo();
             }
@@ -1622,18 +1622,15 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
                 mDeckAdapater.notifyItemRangeChanged(DeckItem.ExtraStart, DeckItem.ExtraEnd);
                 mDeckAdapater.notifyItemRangeChanged(DeckItem.SideStart, DeckItem.SideEnd);
             });
+            // 更新卡片列表适配器的限制列表并通知数据变更
+            mCardListAdapter.setLimitList(limitList);
+            requireActivity().runOnUiThread(() -> mCardListAdapter.notifyDataSetChanged());
         }
 
-        // 更新卡片列表适配器的限制列表并通知数据变更
-        mCardListAdapter.setLimitList(limitList);
-        requireActivity().runOnUiThread(() -> mCardListAdapter.notifyDataSetChanged());
-
         // 根据是否有Genesys信用分上限值来显示计分板
         if (limitList.getCreditLimits() != null && limitList.getCreditLimits() > 0) {
             refreshDeckCreditCount();
             ll_genesys_scoreboard.setVisibility(View.VISIBLE);
-            // 重新初始化卡片搜索器中的限制类型下拉框//TODO 功能未实现
-            //mCardSearcher.initItems();
         } else {
             ll_genesys_scoreboard.setVisibility(View.GONE);
         }

mobile/src/main/java/cn/garymb/ygomobile/utils/DownloadUtil.java

@@ -63,6 +63,8 @@ public class DownloadUtil {
         // 添加 If-None-Match 头部（如果有保存的 ETag）
         String savedETag = getSavedETag(url);
         if (!TextUtils.isEmpty(savedETag)) {
+            Log.d("cc 当前etag", savedETag);
+
             builder.addHeader("If-None-Match", savedETag);
         }
 
@@ -77,9 +79,8 @@ public class DownloadUtil {
             }
         }
         // 构建HTTP请求对象
-        Request request = new Request.Builder()
-                .url(url)
-                .build();
+        Request request = builder.build();
+
         // 异步执行网络请求
         Call call = okHttpClient.newCall(request);
         call.enqueue(new Callback() {
@@ -99,7 +100,7 @@ public class DownloadUtil {
                 Log.e("DownloadUtil", "onResponse:" + response.code() + "  eTag:" + response.header("ETag"));
                 if (response.code() == 304) {
                     // 内容未修改，无需重新下载
-                    listener.onDownloadSuccess(new File(destFileDir, destFileName));
+                    Log.d("cc 下载genesys表", "If-None-Match = " + request.header("If-None-Match"));
                     return;
                 }
                 // 响应无效则直接回调失败