Merge branch '0.3'

.gitignore

@@ -4,6 +4,7 @@ Thumbs.db
 # Ignore files build by Visual Studio
 *.obj
 *.exe
+*.dll
 *.pdb
 *.aps
 *.vcproj.*.user
@@ -35,6 +36,7 @@ _ReSharper*/
 ipch/
 *.opensdf
 *.opendb
+*.db
 SubmissionInfo
 Generated Files
 AppPackages
@@ -155,4 +157,7 @@ cocos2d/
 
 # node.js
 node_modules/
-.ntvs_analysis.dat
+.ntvs_analysis.dat
+
+# Do not ignore Win10 Assets
+!/proj.win10/App/Assets/

Classes/AppDelegate.cpp

@@ -1,6 +1,6 @@
 #include "AppDelegate.h"
 #include "MainScene.h"
-#include "Text.h"
+#include "Lang.h"
 USING_NS_CC;
 
 static const cocos2d::Size designResolutionSize = cocos2d::Size(800, 600);
@@ -64,15 +64,7 @@ bool AppDelegate::applicationDidFinishLaunching() {
 	searchPaths.push_back("res/");
 	FileUtils::getInstance()->setSearchPaths(searchPaths);
 	srand(unsigned(time(0)));
-	switch (Application::getInstance()->getCurrentLanguage()) {
-	case LanguageType::CHINESE:
-		Text::loadLang("zh_CN");
-		break;
-	case LanguageType::ENGLISH:
-	default:
-		Text::loadLang("en_US");
-		break;
-	}
+	Lang::init();
 
 	auto scene = MainScene::create();
 

Classes/GameDefinitions.h

@@ -2,12 +2,16 @@
 const int defaultLCol = 6, defaultRCol = 6;//默认棋盘大小
 const int maxLCol = 10, maxRCol = 10;//最大棋盘大小
 const int minLCol = 3, minRCol = 3;//最小棋盘大小
-const float movingCooling = 0.3f;//移动冷却时间
+const float movingCooling = 0.4f;//移动冷却时间
 const float movingTime = 0.3f;//移动用时
 const int maxMovementTimes = 5;//最大移动数量
 const int timeLimit = 20;//超时时间
+const float boardScaleTime = 0.2f;//缩放动画时间
+const float boardFilpTime = 0.8f;//翻转动画时间
+const float nextChessmanChangeTime = 0.5f;//切换下一个棋子提示的时间
 
 enum Side { left, right };
-enum class Chessman { unknown, common, key, addCol, delCol };
+enum class Chessman { unknown, common, key, addCol, delCol, flip };
+enum class ActionState { nothing, moving, cooling };
 enum class GameMode { pvp, pva, pvo };
 enum class EndGameReason { unknown, opponentLeft, youWin, youLose, timeOut };