Revert "修正数字关键词冲突"

This reverts commit 3248b146, reversing
changes made to 45e9ba05.

Classes/gframe/game.cpp

@@ -688,18 +688,18 @@ bool Game::Initialize() {
 //dont merge
 	btnANCardOK = env->addButton(rect<s32>(140 * xScale, 260 * yScale, 270 * xScale, 295 * yScale), wANCard, BUTTON_ANCARD_OK, dataManager.GetSysString(1211));
 	//announce attribute
-	wANAttribute = env->addWindow(rect<s32>(500 * xScale, 200 * yScale, 750 * xScale, 380 * yScale), false, dataManager.GetSysString(562));
+	wANAttribute = env->addWindow(rect<s32>(500 * xScale, 200 * yScale, 830 * xScale, 295 * yScale), false, dataManager.GetSysString(562));
 	wANAttribute->getCloseButton()->setVisible(false);
 	wANAttribute->setVisible(false);
 	for(int filter = 0x1, i = 0; i < 7; filter <<= 1, ++i)
-		chkAttribute[i] = env->addCheckBox(false, rect<s32>((10 + (i % 4) * 80) * xScale, (50 + (i / 4) * 55) * yScale, (90 + (i % 4) * 80) * xScale, (75 + (i / 4) * 55) * yScale),
+		chkAttribute[i] = env->addCheckBox(false, rect<s32>((10 + (i % 4) * 80) * xScale, (25 + (i / 4) * 25) * yScale, (90 + (i % 4) * 80) * xScale, (50 + (i / 4) * 25) * yScale),
 		                                   wANAttribute, CHECK_ATTRIBUTE, dataManager.FormatAttribute(filter));
 	//announce race
-	wANRace = env->addWindow(rect<s32>(480 * xScale, 100 * yScale, 850 * xScale, 530 * yScale), false, dataManager.GetSysString(563));
+	wANRace = env->addWindow(rect<s32>(480 * xScale, 200 * yScale, 850 * xScale, 430 * yScale), false, dataManager.GetSysString(563));
 	wANRace->getCloseButton()->setVisible(false);
 	wANRace->setVisible(false);
 	for(int filter = 0x1, i = 0; i < 25; filter <<= 1, ++i)
-		chkRace[i] = env->addCheckBox(false, rect<s32>((10 + (i % 4) * 90) * xScale, (50 + (i / 4) * 55) * yScale, (100 + (i % 4) * 90) * xScale, (75 + (i / 4) * 55) * yScale),
+		chkRace[i] = env->addCheckBox(false, rect<s32>((10 + (i % 4) * 90) * xScale, (25 + (i / 4) * 25) * yScale, (100 + (i % 4) * 90) * xScale, (50 + (i / 4) * 25) * yScale),
 		                              wANRace, CHECK_RACE, dataManager.FormatRace(filter));
 	//selection hint
 	stHintMsg = env->addStaticText(L"", rect<s32>(500 * xScale, 90 * yScale, 820 * xScale, 120 * yScale), true, false, 0, -1, false);

mobile/assets/changelog.html

@@ -17,14 +17,17 @@
     特别感谢： 菜菜,尸体,废话多,大毛,龙道香姐,晓L,幻兽L 的支持与努力.
 </pre>
 <ul>
-    <li style="color:#ffff00">3.3.5</li>
+    <li style="color:#ffff00">3.3.4</li>
 </ul>
 <pre>
     更新：
     1.更新ygo内核；
-    4.新卡SHVA+VJ；
+    4.新卡T1005+DBHS+SJ；
     优化：
-    1.卡密搜索与关键词数字搜索冲突的问题；
+    1.卡密搜索可以搜到它规则上的同名卡和异画卡；
+    2.筛选效果怪兽分类不显示其他种类；
+    3.调整部分UI适应新机型屏幕；
+    4.移除失效服务器；
 </pre>
 </body>
 </html>
\ No newline at end of file

mobile/assets_en/data/conf/strings.conf

@@ -243,8 +243,8 @@
 !system 1164 Synchro Summon
 !system 1165 Xyz Summon
 !system 1166 Link Summon
-!system 1190 Add to hand
-!system 1191 Send to GY
+!system 1190 Add to Hand
+!system 1191 Send to Graveyard
 !system 1192 Banish
 #menu
 !system 1200 LAN Mode
@@ -892,8 +892,8 @@
 !setname 0x114 Fur Hire
 !setname 0x115 Sky Striker
 !setname 0x1115 Sky Striker Ace
-!setname 0x116 Crusadia
-!setname 0x117 Impcantation
+!setname 0x116 Palladion
+!setname 0x117 Deviritual
 !setname 0x118 Cynet
 !setname 0x119 Salamangreat
 !setname 0x11a Dinowrestler

mobile/build.gradle

@@ -8,7 +8,7 @@ android {
         applicationId "cn.garymb.ygomobile"
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 33040818
+        versionCode 33040817
         versionName "3.3.4"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true

mobile/src/main/java/cn/garymb/ygomobile/loader/CardSearchInfo.java

@@ -31,7 +31,7 @@ class CardSearchInfo {
             return false;
         }
         if (!TextUtils.isEmpty(word)) {
-            if (TextUtils.isDigitsOnly(word) && word.length() >= 5) {
+            if (TextUtils.isDigitsOnly(word)) {
                 //code
                 long code = Long.parseLong(word);
                 return card.Code == code || card.Alias == code;