Merge https://github.com/Fluorohydride/ygopro into server

gframe/client_field.cpp

@@ -1108,7 +1108,7 @@ bool ClientField::CheckSelectSum() {
 		selable.insert(selectsum_all[i]);
 	}
 	for(size_t i = 0; i < selected_cards.size(); ++i) {
-		if(i < must_select_count)
+		if((int)i < must_select_count)
 			selected_cards[i]->is_selectable = false;
 		else
 			selected_cards[i]->is_selectable = true;

gframe/duelclient.cpp

@@ -1871,7 +1871,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 			mainGame->btnM1->setVisible(true);
 			mainGame->showcardcode = 6;
 			break;
-		case PHASE_BATTLE:
+		case PHASE_BATTLE_START:
 			mainGame->btnBP->setVisible(true);
 			mainGame->btnBP->setPressed(true);
 			mainGame->btnBP->setEnabled(false);

strings.conf

@@ -21,6 +21,7 @@
 !system 26 结束阶段中
 !system 27 抽卡前
 !system 28 战斗阶段开始
+!system 29 即将结束战斗步骤
 !system 30 战斗回卷，是否继续攻击？
 !system 31 是否直接攻击？
 !system 40 伤害步骤开始时