diff --git a/Classes/AppDelegate.cpp b/Classes/AppDelegate.cpp index 5ea44063..268397dc 100644 --- a/Classes/AppDelegate.cpp +++ b/Classes/AppDelegate.cpp @@ -1,4 +1,4 @@ -#include "AppDelegate.h" +#include "AppDelegate.h" #include "MainScene.h" #include "GameFrameBase.h" #include "LogoScene.h" @@ -19,9 +19,9 @@ USING_NS_CC; -/*******************************Ϸ****************************************/ +/*******************************注册游戏****************************************/ -// Ϸѡ +// 游戏选项 struct tagGameItem { WORD wKindID; @@ -31,19 +31,19 @@ struct tagGameItem static tagGameItem s_GameList[] = { - // ; + // 斗地主; { DDZ_KIND_ID, GAME_CREATE_SELECTOR(DDZ_SPACE::DDZGameScene::create), GAME_CREATE_NODE(nullptr) }, - // 齫; + // 万年麻将; { WNMJ_SPACE::KIND_ID, GAME_CREATE_SELECTOR(WNMJ_SPACE::WN_GameScene::create), GAME_CREATE_NODE(nullptr) }, - // ţţ; + // 牛牛; { NN_KIND_ID, GAME_CREATE_SELECTOR(NiuNiu_SPACE::NNGameScene::create), GAME_CREATE_NODE(nullptr) }, - // ը; + // 打炸; { DZ_KIND_ID, GAME_CREATE_SELECTOR(DZ_SPACE::DZGameScene::create), GAME_CREATE_NODE(nullptr) }, - // ʮ; + // 十三水; { SSS_KIND_ID, GAME_CREATE_SELECTOR(SSS_SPACE::SSSGameScene::create), GAME_CREATE_NODE(nullptr) }, - // ը; + // 炸金花; { ZJH_KIND_ID, GAME_CREATE_SELECTOR(ZJH_SPACE::ZJHGameScene::create), GAME_CREATE_NODE(nullptr) }, - // ܵÿ; + // 跑得快; { PDK_KIND_ID, GAME_CREATE_SELECTOR(PDK_SPACE::PDKGameScene::create), GAME_CREATE_NODE(nullptr) }, }; /******************************************************************************/ @@ -55,7 +55,7 @@ AppDelegate::AppDelegate() AppDelegate::~AppDelegate() { - //// ͷ; + //// 释放资源; //YvVoiceManager::GetInstance()->Cleanup(); if (m_dispathMsgNode != NULL) @@ -104,7 +104,7 @@ bool AppDelegate::applicationDidFinishLaunching() { // set FPS. the default value is 1.0/60 if you don't call this director->setAnimationInterval(1.0f / 60); - //Դ· + //设置资源搜索路径 //FileUtils::getInstance()->addSearchPath("UI/"); //FileUtils::getInstance()->addSearchPath("NCMJ/"); @@ -114,7 +114,7 @@ bool AppDelegate::applicationDidFinishLaunching() { GlobalJosn::getInstance()->loadConfig(); - // + //设置常亮不锁屏 Device::setKeepScreenOn(true); // create a scene. it's an autorelease object @@ -174,7 +174,7 @@ void AppDelegate::applicationWillEnterForeground() { #if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) - // + //设置常亮不锁屏 Device::setKeepScreenOn(true); Scene* pScene = Director::getInstance()->getRunningScene(); @@ -202,10 +202,10 @@ void AppDelegate::applicationWillEnterForeground() { void AppDelegate::initGameConfig() { - // Ϸ + // 注册游戏 int gameCount = sizeof(s_GameList) / sizeof(tagGameItem); for (int i = 0; i < gameCount; i++) { CGameCreator::getInstance()->addGame(s_GameList[i].wKindID, CGameCreator::PRIVATE, s_GameList[i].create, s_GameList[i].createNode); } -} \ No newline at end of file +} diff --git a/Classes/Define/Platform.h b/Classes/Define/Platform.h index 1b395983..5a0fa0fc 100644 --- a/Classes/Define/Platform.h +++ b/Classes/Define/Platform.h @@ -29,19 +29,19 @@ #define VERSION_EFFICACY 0 //效验版本; #define VERSION_FRAME_SDK INTERFACE_VERSION(6,3) //框架版本; -#define LOGON_SERVER_ADDRESS "47.100.47.128" //登录服务器地址; -#define WEB_SERVER_ADDRESS "http://queyi.ppxq.net" //WEB服务器地址; +#define LOGON_SERVER_ADDRESS "121.40.40.53" //登录服务器地址; +#define WEB_SERVER_ADDRESS "http://queyi.ppxq.net" //WEB服务器地址; -//#define LOGON_SERVER_ADDRESS "106.15.35.78" //登录服务器地址; -//#define WEB_SERVER_ADDRESS "http://106.15.35.78:8066" //WEB服务器地址; +//#define LOGON_SERVER_ADDRESS "47.100.47.128" //登录服务器地址; +//#define WEB_SERVER_ADDRESS "http://queyi.ppxq.net" //WEB服务器地址; #define PAY_TO_PLAYER_HTTP_ADDRESS "http://queyi.ppxq.net/Lobby/PayToPlayer" //转账给玩家; #define PAY_LOG_HTTP_ADDRESS "http://queyi.ppxq.net/Lobby/GetPayLog" //充值记录; #define GET_NICKNAME_HTTP_ADDRESS "http://queyi.ppxq.net/Lobby/GetPlayerNickName" //获取昵称; #define DUI_HUAN_HTTP_ADDRESS "http://queyi.ppxq.net/duihuan.html" //兑换地址; #define GONG_HUI_HTTP_ADDRESS "http://queyi.ppxq.net/gonghui.html" //公会地址; -#define HEAD_HTTP_ADDRESS "http://qy.ppxq.net/b.php?id=%d" //公会地址; -#define SHARE_HTTP_ADDRESS "http://queyi.ppkdy.com/qy.html" //分享地址; +#define HEAD_HTTP_ADDRESS "http://queyi.ppxq.net/b.php?id=%d" //头像地址; +#define SHARE_HTTP_ADDRESS "http://queyi.ppxq.net/qy.html" //分享地址; #define LOGON_SERVER_PORT 10086 //登录服务器端口; //#define LOGON_SERVER_PORT 10090 //登录服务器端口; diff --git a/Classes/Define/Types.h b/Classes/Define/Types.h index ec862701..80f60a30 100644 --- a/Classes/Define/Types.h +++ b/Classes/Define/Types.h @@ -4,6 +4,8 @@ ////////////////////////////////////////////////////////////// #include #include +#include +#include #ifndef ASSERT #define ASSERT(f) assert(f) diff --git a/Classes/Utils/Utility.cpp b/Classes/Utils/Utility.cpp index a1649224..2267b069 100644 --- a/Classes/Utils/Utility.cpp +++ b/Classes/Utils/Utility.cpp @@ -1,13 +1,18 @@ -#include "Utility.h" +#include "Utility.h" #include "ui/CocosGUI.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) #include "iconv.h" +#else +#include +#include "platform/android/jni/JniHelper.h" +#endif #include "Helps.h" ////////////////////////////////////////////////////////////////////////// /** - * utf8ַ - * @param utf8 utf8ַ - * @return ַ + * 获取utf8字符串长度 + * @param utf8 utf8字符串 + * @return 字符串长度 */ int utf8_len(const char *utf8) { @@ -34,9 +39,9 @@ int utf8_cmp(const char* str1, const char* str2) } /** - * ucs2ַ - * @param ucs2 ucs2ַ - * @return ַ + * 获取ucs2字符串长度 + * @param ucs2 ucs2字符串 + * @return 字符串长度 */ int ucs2_len(const unsigned short* ucs2) { @@ -70,15 +75,36 @@ int code_convert(const char *from_charset, const char *to_charset, const char *i return 0; #endif #if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) - iconv_t cd; - const char *temp = inbuf; - const char **pin = &temp; - char **pout = &outbuf; memset(outbuf,0,outlen); - cd = iconv_open(to_charset,from_charset); - if(cd==0) return -1; - if(-1==iconv(cd, (char **)(pin),&inlen,pout,&outlen)) return -1; - iconv_close(cd); + JNIEnv* env = cocos2d::JniHelper::getEnv(); + if (!env) return -1; + + jbyteArray inputBytes = env->NewByteArray(inlen); + env->SetByteArrayRegion(inputBytes, 0, inlen, (const jbyte*)inbuf); + + jstring fromCharset = env->NewStringUTF(from_charset); + jstring toCharset = env->NewStringUTF(to_charset); + + jclass stringClass = env->FindClass("java/lang/String"); + jmethodID ctor = env->GetMethodID(stringClass, "", "([BLjava/lang/String;)V"); + jobject jstr = env->NewObject(stringClass, ctor, inputBytes, fromCharset); + + jmethodID getBytes = env->GetMethodID(stringClass, "getBytes", "(Ljava/lang/String;)[B"); + jbyteArray outputBytes = (jbyteArray)env->CallObjectMethod(jstr, getBytes, toCharset); + + if (outputBytes) { + jsize outputLen = env->GetArrayLength(outputBytes); + if ((size_t)outputLen < outlen) { + env->GetByteArrayRegion(outputBytes, 0, outputLen, (jbyte*)outbuf); + } + env->DeleteLocalRef(outputBytes); + } + + env->DeleteLocalRef(jstr); + env->DeleteLocalRef(toCharset); + env->DeleteLocalRef(fromCharset); + env->DeleteLocalRef(inputBytes); + env->DeleteLocalRef(stringClass); return 0; #endif return 0; @@ -87,9 +113,9 @@ int code_convert(const char *from_charset, const char *to_charset, const char *i namespace utility { /** - * utf8ַ - * @param utf8 utf8ַ - * @return ַ + * 获取utf8字符串长度 + * @param utf8 utf8字符串 + * @return 字符串长度 */ int utf8_len(std::string utf8) { @@ -99,15 +125,15 @@ namespace utility { return 0; unsigned int i; - unsigned long nBytes=0;//UFT81-6ֽڱ,ASCIIһֽ + unsigned long nBytes=0;//UFT8可用1-6个字节编码,ASCII用一个字节 unsigned char chr; - int bAllAscii=1; //ȫASCII, ˵UTF-8 + int bAllAscii=1; //如果全部都是ASCII, 说明不是UTF-8 for(i=0;i=0x80) { @@ -128,7 +154,7 @@ namespace utility nBytes--; } } - else //ֽڷķֽ,ӦΪ 10xxxxxx + else //多字节符的非首字节,应为 10xxxxxx { if( (chr&0xC0) != 0x80 ) { @@ -137,11 +163,11 @@ namespace utility nBytes--; } } - if( nBytes > 0 ) //Υ + if( nBytes > 0 ) //违反规则 { return 0; } - if( bAllAscii ) //ȫASCII, ˵UTF-8 + if( bAllAscii ) //如果全部都是ASCII, 说明不是UTF-8 { return 0; } @@ -184,7 +210,7 @@ namespace utility return strRet; } - /*gbkתΪUTF16*/ + /*gbk转为UTF16*/ std::string a2l(const char *inbuf) { size_t inlen = strlen(inbuf); @@ -197,7 +223,7 @@ namespace utility } - /*utf16תΪUTF8*/ + /*utf16转为UTF8*/ std::string l2u(const char *inbuf) { size_t inlen = ucs2_len((const unsigned short*)&inbuf[0]); @@ -270,7 +296,7 @@ namespace utility pSprFace->setAnchorPoint(Vec2(0, 0)); pSprFace->setFlippedY(true); - // ͷ + // 头像遮罩 auto textureCache = Director::getInstance()->getTextureCache(); auto texMask = textureCache->addImage("Platform/lobby/head_mask.png"); CC_ASSERT(texMask != nullptr); @@ -407,7 +433,7 @@ namespace utility } } - //ǺŴ(:dzƣļС) + //根据宽度截取昵号长度(参数:昵称,字体文件名,字体大小,限定宽度) std::string getShortName(const std::string& strName, const std::string& strFont, float fFontSize, float fOverWidth) { size_t nCount = strName.size(); @@ -435,7 +461,7 @@ namespace utility if (fTotalWidth >= fOverWidth) { - return strName.substr(0, i - (bChinese ? 3 : 1)) + a_u8(""); + return strName.substr(0, i - (bChinese ? 3 : 1)) + a_u8("..."); } } @@ -466,7 +492,7 @@ namespace utility if (nTempNum > nFontNum) { - return strName.substr(0, i - (bChinese ? 3 : 1)) + a_u8(""); + return strName.substr(0, i - (bChinese ? 3 : 1)) + a_u8("..."); } } @@ -486,17 +512,17 @@ namespace utility std::string GetUserLevel(SCORE lGrade) { static std::string Levels[] = { - "ȼ:ȸ", - "ȼ:ȸ", - "ȼ:ȸͷ", - "ȼ:ͭȸ", - "ȼ:ȸ", - "ȼ:ȸ", - "ȼ:ȸ", - "ȼ:ȸ", - "ȼ:ȸ", - "ȼ:ȸʥ", - "ȼ:ȸ" + "等级:雀民", + "等级:雀士", + "等级:雀头", + "等级:铜雀", + "等级:银雀", + "等级:金雀", + "等级:雀侠", + "等级:雀杰", + "等级:雀王", + "等级:雀圣", + "等级:雀神" }; static SCORE lLevels[] = { 200, 500, 1000, 2000, 4000, 6000, 10000, 15000, 20000, 30000 }; @@ -527,4 +553,4 @@ namespace utility return Helps::MD5Encrypt(timeString); } -} \ No newline at end of file +} diff --git a/Classes/Utils/crypt/coAes.cpp b/Classes/Utils/crypt/coAes.cpp index 3d00974a..ecd8237a 100644 --- a/Classes/Utils/crypt/coAes.cpp +++ b/Classes/Utils/crypt/coAes.cpp @@ -1,5 +1,6 @@ #include "aes.h" #include "coAes.h" +#include ////////////////////////////////////////////////////////////////////////// static void aes_encrypt_data( aes_context *ctx, const std::string& ins, std::string& outs) diff --git a/CocosFile/Platform/Platform.udf b/CocosFile/Platform/Platform.udf index e1bee1ce..9d9a489a 100644 --- a/CocosFile/Platform/Platform.udf +++ b/CocosFile/Platform/Platform.udf @@ -32,10 +32,8 @@ - - - + diff --git a/CocosFile/Platform/cocosstudio/Platform/ChatScene.csd b/CocosFile/Platform/cocosstudio/Platform/ChatScene.csd index ceacd58a..be4a2272 100644 --- a/CocosFile/Platform/cocosstudio/Platform/ChatScene.csd +++ b/CocosFile/Platform/cocosstudio/Platform/ChatScene.csd @@ -4,7 +4,7 @@ - + diff --git a/CocosFile/Platform/cocosstudio/Platform/CheckRecordScene.csd b/CocosFile/Platform/cocosstudio/Platform/CheckRecordScene.csd index 1ca6f9fb..0dad802e 100644 --- a/CocosFile/Platform/cocosstudio/Platform/CheckRecordScene.csd +++ b/CocosFile/Platform/cocosstudio/Platform/CheckRecordScene.csd @@ -4,7 +4,7 @@ - + diff --git a/CocosFile/Platform/cocosstudio/Platform/DismissScene.csd b/CocosFile/Platform/cocosstudio/Platform/DismissScene.csd index 456b1be4..cfe4ff25 100644 --- a/CocosFile/Platform/cocosstudio/Platform/DismissScene.csd +++ b/CocosFile/Platform/cocosstudio/Platform/DismissScene.csd @@ -4,7 +4,7 @@ - + diff --git a/CocosFile/Platform/cocosstudio/Platform/DuiHuanScene.csd b/CocosFile/Platform/cocosstudio/Platform/DuiHuanScene.csd index 58c90df2..9f96d72c 100644 --- a/CocosFile/Platform/cocosstudio/Platform/DuiHuanScene.csd +++ b/CocosFile/Platform/cocosstudio/Platform/DuiHuanScene.csd @@ -4,7 +4,7 @@ - + diff --git a/CocosFile/Platform/cocosstudio/Platform/GongHuiScene.csd b/CocosFile/Platform/cocosstudio/Platform/GongHuiScene.csd index 6db8a04a..7df01c8c 100644 --- a/CocosFile/Platform/cocosstudio/Platform/GongHuiScene.csd +++ b/CocosFile/Platform/cocosstudio/Platform/GongHuiScene.csd @@ -4,7 +4,7 @@ - + diff --git a/CocosFile/Platform/cocosstudio/Platform/HelpScene.csd b/CocosFile/Platform/cocosstudio/Platform/HelpScene.csd index fe35076a..8930122b 100644 --- a/CocosFile/Platform/cocosstudio/Platform/HelpScene.csd +++ b/CocosFile/Platform/cocosstudio/Platform/HelpScene.csd @@ -4,7 +4,7 @@ - + diff --git a/CocosFile/Platform/cocosstudio/Platform/IpTipScene.csd b/CocosFile/Platform/cocosstudio/Platform/IpTipScene.csd index fd293c1e..15f254e1 100644 --- a/CocosFile/Platform/cocosstudio/Platform/IpTipScene.csd +++ b/CocosFile/Platform/cocosstudio/Platform/IpTipScene.csd @@ -4,7 +4,7 @@ - + diff --git a/CocosFile/Platform/cocosstudio/Platform/JoinScene.csd b/CocosFile/Platform/cocosstudio/Platform/JoinScene.csd index e526ecc7..dbea336c 100644 --- a/CocosFile/Platform/cocosstudio/Platform/JoinScene.csd +++ b/CocosFile/Platform/cocosstudio/Platform/JoinScene.csd @@ -4,7 +4,7 @@ - + diff --git a/CocosFile/Platform/cocosstudio/Platform/LogonScene.csd b/CocosFile/Platform/cocosstudio/Platform/LogonScene.csd index cfdb8736..8c818279 100644 --- a/CocosFile/Platform/cocosstudio/Platform/LogonScene.csd +++ b/CocosFile/Platform/cocosstudio/Platform/LogonScene.csd @@ -4,7 +4,7 @@ - + diff --git a/CocosFile/Platform/cocosstudio/Platform/NoticeScene.csd b/CocosFile/Platform/cocosstudio/Platform/NoticeScene.csd index 27a0550b..1e5e27b2 100644 --- a/CocosFile/Platform/cocosstudio/Platform/NoticeScene.csd +++ b/CocosFile/Platform/cocosstudio/Platform/NoticeScene.csd @@ -4,7 +4,7 @@ - + diff --git a/CocosFile/Platform/cocosstudio/Platform/PayLogScene.csd b/CocosFile/Platform/cocosstudio/Platform/PayLogScene.csd index 6fc0d9fa..658a3cf7 100644 --- a/CocosFile/Platform/cocosstudio/Platform/PayLogScene.csd +++ b/CocosFile/Platform/cocosstudio/Platform/PayLogScene.csd @@ -4,7 +4,7 @@ - + diff --git a/CocosFile/Platform/cocosstudio/Platform/PayScene.csd b/CocosFile/Platform/cocosstudio/Platform/PayScene.csd index 331cf2fc..397a5670 100644 --- a/CocosFile/Platform/cocosstudio/Platform/PayScene.csd +++ b/CocosFile/Platform/cocosstudio/Platform/PayScene.csd @@ -4,7 +4,7 @@ - + diff --git a/CocosFile/Platform/cocosstudio/Platform/PlayerScene.csd b/CocosFile/Platform/cocosstudio/Platform/PlayerScene.csd index c9d55fd5..0e250b79 100644 --- a/CocosFile/Platform/cocosstudio/Platform/PlayerScene.csd +++ b/CocosFile/Platform/cocosstudio/Platform/PlayerScene.csd @@ -4,7 +4,7 @@ - + diff --git a/CocosFile/Platform/cocosstudio/Platform/PopScene.csd b/CocosFile/Platform/cocosstudio/Platform/PopScene.csd index 95abae58..e30f53ae 100644 --- a/CocosFile/Platform/cocosstudio/Platform/PopScene.csd +++ b/CocosFile/Platform/cocosstudio/Platform/PopScene.csd @@ -4,7 +4,7 @@ - + diff --git a/CocosFile/Platform/cocosstudio/Platform/RecordScene.csd b/CocosFile/Platform/cocosstudio/Platform/RecordScene.csd index 2297ade3..fecd4f2b 100644 --- a/CocosFile/Platform/cocosstudio/Platform/RecordScene.csd +++ b/CocosFile/Platform/cocosstudio/Platform/RecordScene.csd @@ -4,7 +4,7 @@ - + diff --git a/CocosFile/Platform/cocosstudio/Platform/SelectShareScene.csd b/CocosFile/Platform/cocosstudio/Platform/SelectShareScene.csd index 6f872c49..db477213 100644 --- a/CocosFile/Platform/cocosstudio/Platform/SelectShareScene.csd +++ b/CocosFile/Platform/cocosstudio/Platform/SelectShareScene.csd @@ -4,7 +4,7 @@ - + diff --git a/CocosFile/Platform/cocosstudio/Platform/SetScene.csd b/CocosFile/Platform/cocosstudio/Platform/SetScene.csd index ed9560ba..6653afb9 100644 --- a/CocosFile/Platform/cocosstudio/Platform/SetScene.csd +++ b/CocosFile/Platform/cocosstudio/Platform/SetScene.csd @@ -4,7 +4,7 @@ - + diff --git a/CocosFile/Platform/cocosstudio/Platform/ShowScene.csd b/CocosFile/Platform/cocosstudio/Platform/ShowScene.csd index 1bafd370..68ec25bd 100644 --- a/CocosFile/Platform/cocosstudio/Platform/ShowScene.csd +++ b/CocosFile/Platform/cocosstudio/Platform/ShowScene.csd @@ -4,7 +4,7 @@ - + diff --git a/CocosFile/Platform/cocosstudio/Platform/StartGame.csd b/CocosFile/Platform/cocosstudio/Platform/StartGame.csd index 83495181..a44fb84d 100644 --- a/CocosFile/Platform/cocosstudio/Platform/StartGame.csd +++ b/CocosFile/Platform/cocosstudio/Platform/StartGame.csd @@ -4,7 +4,7 @@ - + diff --git a/Servers/ServerParameter.ini b/Servers/ServerParameter.ini index 9b623c24..ab0cc7fc 100644 Binary files a/Servers/ServerParameter.ini and b/Servers/ServerParameter.ini differ diff --git a/Servers/服务器组件/内核引擎/KernelEngine.vcxproj b/Servers/服务器组件/内核引擎/KernelEngine.vcxproj index 89ba5f38..552046ca 100644 --- a/Servers/服务器组件/内核引擎/KernelEngine.vcxproj +++ b/Servers/服务器组件/内核引擎/KernelEngine.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 内核引擎 {F5D6B929-08E3-43DA-9F39-941A859B3FD8} 内核引擎 @@ -29,25 +30,25 @@ DynamicLibrary Dynamic MultiByte - v120 + v143 DynamicLibrary Dynamic Unicode - v120 + v143 DynamicLibrary Dynamic MultiByte - v120 + v143 DynamicLibrary Dynamic MultiByte - v120 + v143 @@ -295,4 +296,6 @@ copy /y ..\..\..\运行\Release\Unicode\$(TargetFileName) ..\..\..\发布组件\ - \ No newline at end of file + + + diff --git a/Servers/服务器组件/协调服务器/Correspond.vcxproj b/Servers/服务器组件/协调服务器/Correspond.vcxproj index 106c18e2..78845589 100644 --- a/Servers/服务器组件/协调服务器/Correspond.vcxproj +++ b/Servers/服务器组件/协调服务器/Correspond.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 协调服务器 {0167D883-34DA-47FC-A903-6BE341FD8DC5} MFCProj @@ -26,25 +27,25 @@ Application - v110 + v143 Dynamic Unicode Application - v120 + v143 Dynamic Unicode Application - v120 + v143 Dynamic MultiByte Application - v120 + v143 Dynamic MultiByte @@ -259,4 +260,6 @@ copy /y ..\..\..\运行\Release\Unicode\$(TargetFileName) ..\..\..\发布组件\ - \ No newline at end of file + + + diff --git a/Servers/服务器组件/服务核心/ServiceCore.vcxproj b/Servers/服务器组件/服务核心/ServiceCore.vcxproj index 694e1d37..ca53ea6a 100644 --- a/Servers/服务器组件/服务核心/ServiceCore.vcxproj +++ b/Servers/服务器组件/服务核心/ServiceCore.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 服务核心 {B1320037-89DD-4F99-A628-69DC200DFA05} MFCDLLProj @@ -26,25 +27,25 @@ DynamicLibrary - v110 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic MultiByte DynamicLibrary - v120 + v143 Dynamic MultiByte @@ -274,4 +275,6 @@ copy /y ..\..\..\运行\Release\Unicode\$(TargetFileName) ..\..\..\发布组件\ - \ No newline at end of file + + + diff --git a/Servers/服务器组件/模块管理/ModuleManager.vcxproj b/Servers/服务器组件/模块管理/ModuleManager.vcxproj index f453e3d0..2027155e 100644 --- a/Servers/服务器组件/模块管理/ModuleManager.vcxproj +++ b/Servers/服务器组件/模块管理/ModuleManager.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 模块管理 {ED28DEC3-BBC7-43FA-998B-11DCFAA69CEF} MFCDLLProj @@ -26,25 +27,25 @@ DynamicLibrary - v110 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic MultiByte DynamicLibrary - v120 + v143 Dynamic MultiByte @@ -276,4 +277,6 @@ copy /y ..\..\..\运行\Release\Unicode\$(TargetFileName) ..\..\..\发布组件\ - \ No newline at end of file + + + diff --git a/Servers/服务器组件/比赛服务/GameMatchServer.vcxproj b/Servers/服务器组件/比赛服务/GameMatchServer.vcxproj index 97603300..bd154714 100644 --- a/Servers/服务器组件/比赛服务/GameMatchServer.vcxproj +++ b/Servers/服务器组件/比赛服务/GameMatchServer.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 比赛服务 {CA071FF5-97BF-42C3-99AF-FE8F8A0F0AF2} MFCDLLProj @@ -26,25 +27,25 @@ DynamicLibrary - v110 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic MultiByte DynamicLibrary - v120 + v143 Dynamic MultiByte @@ -271,4 +272,6 @@ copy /y ..\..\..\运行\Release\Unicode\$(TargetFileName) ..\..\..\发布组件\ - \ No newline at end of file + + + diff --git a/Servers/服务器组件/游戏服务/GameService.vcxproj b/Servers/服务器组件/游戏服务/GameService.vcxproj index 1a115e8d..1a7d2825 100644 --- a/Servers/服务器组件/游戏服务/GameService.vcxproj +++ b/Servers/服务器组件/游戏服务/GameService.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 游戏服务 {07F0CF5A-4D5D-4DBB-A723-4DF612C3AB33} MFCDLLProj @@ -26,25 +27,25 @@ DynamicLibrary - v110 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic MultiByte DynamicLibrary - v120 + v143 Dynamic MultiByte @@ -257,4 +258,6 @@ copy /y ..\..\..\运行\Release\Unicode\$(TargetFileName) ..\..\..\发布组件\ - \ No newline at end of file + + + diff --git a/Servers/服务器组件/游戏服务器/GameServer.vcxproj b/Servers/服务器组件/游戏服务器/GameServer.vcxproj index aa7ac3e3..b0394eaf 100644 --- a/Servers/服务器组件/游戏服务器/GameServer.vcxproj +++ b/Servers/服务器组件/游戏服务器/GameServer.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 游戏服务器 {267C213B-3F02-4627-8734-E361A61C83F9} MFCProj @@ -26,25 +27,25 @@ Application - v110 + v143 Dynamic Unicode Application - v120 + v143 Dynamic Unicode Application - v120 + v143 Dynamic MultiByte Application - v120 + v143 Dynamic MultiByte @@ -300,4 +301,6 @@ copy /y ..\..\..\运行\Release\Unicode\$(TargetFileName) ..\..\..\发布组件\ - \ No newline at end of file + + + diff --git a/Servers/服务器组件/登录服务器/LogonServer.vcxproj b/Servers/服务器组件/登录服务器/LogonServer.vcxproj index 2e0d88db..6e253ac0 100644 --- a/Servers/服务器组件/登录服务器/LogonServer.vcxproj +++ b/Servers/服务器组件/登录服务器/LogonServer.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 登录服务器 {CD826B8C-89BD-44AF-A1DE-0A91494CD763} MFCProj @@ -26,25 +27,25 @@ Application - v110 + v143 Dynamic Unicode Application - v120 + v143 Dynamic Unicode Application - v120 + v143 Dynamic MultiByte Application - v120 + v143 Dynamic MultiByte @@ -262,4 +263,6 @@ copy /y ..\..\..\运行\Release\Unicode\$(TargetFileName) ..\..\..\发布组件\ - \ No newline at end of file + + + diff --git a/Servers/服务器组件/私人场服务/GamePrivateServer.vcxproj b/Servers/服务器组件/私人场服务/GamePrivateServer.vcxproj index be7816dc..507c11d9 100644 --- a/Servers/服务器组件/私人场服务/GamePrivateServer.vcxproj +++ b/Servers/服务器组件/私人场服务/GamePrivateServer.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 私人场服务 {0A9AEFD4-1583-4BE3-89D8-F5286DAD1C91} MFCDLLProj @@ -26,25 +27,25 @@ DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic MultiByte DynamicLibrary - v120 + v143 Dynamic MultiByte @@ -266,4 +267,6 @@ copy /y ..\..\..\运行\Release\Unicode\$(TargetFileName) ..\..\..\发布组件\ - \ No newline at end of file + + + diff --git a/Servers/服务器组件/网站网关服务器/WebServerGate.vcxproj b/Servers/服务器组件/网站网关服务器/WebServerGate.vcxproj index d964fc04..a06db45b 100644 --- a/Servers/服务器组件/网站网关服务器/WebServerGate.vcxproj +++ b/Servers/服务器组件/网站网关服务器/WebServerGate.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 网站网关服务器 {549C4789-BB43-48BD-B470-247375CD3F74} @@ -28,23 +29,23 @@ Application - v120 + v143 Dynamic MultiByte Application - v120 + v143 Dynamic MultiByte - v120 + v143 Dynamic Unicode - v120 + v143 Unicode Dynamic @@ -241,4 +242,6 @@ - \ No newline at end of file + + + diff --git a/Servers/服务器组件/网络服务/ClientSocket.vcxproj b/Servers/服务器组件/网络服务/ClientSocket.vcxproj index b862b1b5..8119f1ff 100644 --- a/Servers/服务器组件/网络服务/ClientSocket.vcxproj +++ b/Servers/服务器组件/网络服务/ClientSocket.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 网络服务 {487AE71A-160E-49E0-A1EF-6D115F6B8A3F} 网络组件 @@ -27,25 +28,25 @@ DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic MultiByte DynamicLibrary - v120 + v143 Dynamic MultiByte @@ -260,4 +261,6 @@ - \ No newline at end of file + + + diff --git a/Servers/游戏组件/万年麻将/游戏服务器/GameServer.vcxproj b/Servers/游戏组件/万年麻将/游戏服务器/GameServer.vcxproj index fbbbb900..a81c40f7 100644 --- a/Servers/游戏组件/万年麻将/游戏服务器/GameServer.vcxproj +++ b/Servers/游戏组件/万年麻将/游戏服务器/GameServer.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -11,6 +11,7 @@ + 10.0 麻将游戏服务器 {CA071FF5-97BF-42C3-99AF-FE8F8A0F0AF2} MFCDLLProj @@ -18,13 +19,13 @@ DynamicLibrary - v120 + v143 Dynamic MultiByte DynamicLibrary - v120 + v143 Dynamic MultiByte @@ -152,4 +153,6 @@ - \ No newline at end of file + + + diff --git a/Servers/游戏组件/上饶打炸/游戏服务器/GameServer.vcxproj b/Servers/游戏组件/上饶打炸/游戏服务器/GameServer.vcxproj index d43ea325..c3c279ab 100644 --- a/Servers/游戏组件/上饶打炸/游戏服务器/GameServer.vcxproj +++ b/Servers/游戏组件/上饶打炸/游戏服务器/GameServer.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 游戏服务器 {CA071FF5-97BF-42C3-99AF-FE8F8A0F0AF2} @@ -30,25 +31,25 @@ DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic MultiByte DynamicLibrary - v120 + v143 Dynamic MultiByte @@ -256,4 +257,6 @@ - \ No newline at end of file + + + diff --git a/Servers/游戏组件/十三水/机器人服务/AndroidService.vcxproj b/Servers/游戏组件/十三水/机器人服务/AndroidService.vcxproj index a89cfdcc..6272619d 100644 --- a/Servers/游戏组件/十三水/机器人服务/AndroidService.vcxproj +++ b/Servers/游戏组件/十三水/机器人服务/AndroidService.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 机器人服务 {487AE71A-160E-49E0-A1EF-6D115F6B8A3F} @@ -30,25 +31,25 @@ DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic MultiByte DynamicLibrary - v120 + v143 Dynamic MultiByte @@ -260,4 +261,6 @@ copy /y ..\..\..\..\运行\Release\Unicode\$(TargetFileName) ..\..\..\发布组 - \ No newline at end of file + + + diff --git a/Servers/游戏组件/十三水/游戏服务器/GameServer.vcxproj b/Servers/游戏组件/十三水/游戏服务器/GameServer.vcxproj index d36f95b6..a7fe1e18 100644 --- a/Servers/游戏组件/十三水/游戏服务器/GameServer.vcxproj +++ b/Servers/游戏组件/十三水/游戏服务器/GameServer.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 十三张服务端 {CA071FF5-97BF-42C3-99AF-FE8F8A0F0AF2} MFCDLLProj @@ -26,25 +27,25 @@ DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic MultiByte DynamicLibrary - v120 + v143 Dynamic MultiByte @@ -265,4 +266,6 @@ - \ No newline at end of file + + + diff --git a/Servers/游戏组件/房卡牛牛/服务器控制/ServerControl.vcxproj b/Servers/游戏组件/房卡牛牛/服务器控制/ServerControl.vcxproj index da1b95e6..87dc72a7 100644 --- a/Servers/游戏组件/房卡牛牛/服务器控制/ServerControl.vcxproj +++ b/Servers/游戏组件/房卡牛牛/服务器控制/ServerControl.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 控制服务器 {E30A6C9B-6B5E-4348-BC0E-67E1A22EEAAF} MFCDLLProj @@ -26,25 +27,25 @@ DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic MultiByte DynamicLibrary - v120 + v143 Dynamic MultiByte @@ -257,4 +258,6 @@ copy /y ..\..\..\..\运行\Release\Unicode\$(TargetFileName) ..\..\..\发布组 - \ No newline at end of file + + + diff --git a/Servers/游戏组件/房卡牛牛/游戏服务器/GameServer.vcxproj b/Servers/游戏组件/房卡牛牛/游戏服务器/GameServer.vcxproj index d60c36b7..ba2126c7 100644 --- a/Servers/游戏组件/房卡牛牛/游戏服务器/GameServer.vcxproj +++ b/Servers/游戏组件/房卡牛牛/游戏服务器/GameServer.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 游戏服务端 {CA071FF5-97BF-42C3-99AF-FE8F8A0F0AF2} MFCDLLProj @@ -26,25 +27,25 @@ DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic MultiByte DynamicLibrary - v120 + v143 Dynamic MultiByte @@ -266,4 +267,6 @@ copy /y ..\..\..\..\运行\Release\Unicode\$(TargetFileName) ..\..\..\发布组 - \ No newline at end of file + + + diff --git a/Servers/游戏组件/斗地主/服务器控制/ServerControl.vcxproj b/Servers/游戏组件/斗地主/服务器控制/ServerControl.vcxproj index 3920ed59..08f43ebf 100644 --- a/Servers/游戏组件/斗地主/服务器控制/ServerControl.vcxproj +++ b/Servers/游戏组件/斗地主/服务器控制/ServerControl.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 控制服务器 {E30A6C9B-6B5E-4348-BC0E-67E1A22EEAAF} MFCDLLProj @@ -26,25 +27,25 @@ DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic MultiByte DynamicLibrary - v120 + v143 Dynamic MultiByte @@ -253,4 +254,6 @@ - \ No newline at end of file + + + diff --git a/Servers/游戏组件/斗地主/服务器组件/GameServer.vcxproj b/Servers/游戏组件/斗地主/服务器组件/GameServer.vcxproj index 50033f2f..31b395ad 100644 --- a/Servers/游戏组件/斗地主/服务器组件/GameServer.vcxproj +++ b/Servers/游戏组件/斗地主/服务器组件/GameServer.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 游戏服务器 {390B89DC-4355-442B-AD09-91F6D9AF32DD} @@ -30,25 +31,25 @@ DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic MultiByte DynamicLibrary - v120 + v143 Dynamic MultiByte @@ -265,4 +266,6 @@ - \ No newline at end of file + + + diff --git a/Servers/游戏组件/斗地主/机器人服务/AndroidService.vcxproj b/Servers/游戏组件/斗地主/机器人服务/AndroidService.vcxproj index 1479630f..8a85cb70 100644 --- a/Servers/游戏组件/斗地主/机器人服务/AndroidService.vcxproj +++ b/Servers/游戏组件/斗地主/机器人服务/AndroidService.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 机器人服务 {487AE71A-160E-49E0-A1EF-6D115F6B8A3F} @@ -30,25 +31,25 @@ DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic MultiByte DynamicLibrary - v120 + v143 Dynamic MultiByte @@ -263,4 +264,6 @@ - \ No newline at end of file + + + diff --git a/Servers/游戏组件/诈金花/服务器控制/ServerControl.vcxproj b/Servers/游戏组件/诈金花/服务器控制/ServerControl.vcxproj index d7542381..cdb3b4b0 100644 --- a/Servers/游戏组件/诈金花/服务器控制/ServerControl.vcxproj +++ b/Servers/游戏组件/诈金花/服务器控制/ServerControl.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 控制服务器 {E30A6C9B-6B5E-4348-BC0E-67E1A22EEAAF} MFCDLLProj @@ -26,25 +27,25 @@ DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic MultiByte DynamicLibrary - v120 + v143 Dynamic MultiByte @@ -254,4 +255,6 @@ copy /y ..\..\..\..\运行\Release\Unicode\$(TargetFileName) ..\..\..\发布组 - \ No newline at end of file + + + diff --git a/Servers/游戏组件/诈金花/游戏服务器/GameServer.vcxproj b/Servers/游戏组件/诈金花/游戏服务器/GameServer.vcxproj index 441e1edb..c8e36b7b 100644 --- a/Servers/游戏组件/诈金花/游戏服务器/GameServer.vcxproj +++ b/Servers/游戏组件/诈金花/游戏服务器/GameServer.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 诈金花服务端 {CA071FF5-97BF-42C3-99AF-FE8F8A0F0AF2} MFCDLLProj @@ -26,25 +27,25 @@ DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic MultiByte DynamicLibrary - v120 + v143 Dynamic MultiByte @@ -265,4 +266,6 @@ copy /y ..\..\..\..\运行\Release\Unicode\$(TargetFileName) ..\..\..\发布组 - \ No newline at end of file + + + diff --git a/Servers/游戏组件/跑的快/服务器控制/ServerControl.vcxproj b/Servers/游戏组件/跑的快/服务器控制/ServerControl.vcxproj index 58fb5c22..4ea97f49 100644 --- a/Servers/游戏组件/跑的快/服务器控制/ServerControl.vcxproj +++ b/Servers/游戏组件/跑的快/服务器控制/ServerControl.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 控制服务器 {E30A6C9B-6B5E-4348-BC0E-67E1A22EEAAF} MFCDLLProj @@ -26,25 +27,25 @@ DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic MultiByte DynamicLibrary - v120 + v143 Dynamic MultiByte @@ -253,4 +254,6 @@ - \ No newline at end of file + + + diff --git a/Servers/游戏组件/跑的快/服务器组件/GameServer.vcxproj b/Servers/游戏组件/跑的快/服务器组件/GameServer.vcxproj index c9df1928..898dcd5d 100644 --- a/Servers/游戏组件/跑的快/服务器组件/GameServer.vcxproj +++ b/Servers/游戏组件/跑的快/服务器组件/GameServer.vcxproj @@ -1,5 +1,5 @@  - + Debug_Unicode @@ -19,6 +19,7 @@ + 10.0 游戏服务器 {390B89DC-4355-442B-AD09-91F6D9AF32DD} @@ -30,25 +31,25 @@ DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic Unicode DynamicLibrary - v120 + v143 Dynamic MultiByte DynamicLibrary - v120 + v143 Dynamic MultiByte @@ -265,4 +266,6 @@ - \ No newline at end of file + + + diff --git a/proj.android/.project b/proj.android/.project index cd504f7c..a9e0a6d8 100644 --- a/proj.android/.project +++ b/proj.android/.project @@ -98,6 +98,11 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.andmore.AndroidNature @@ -106,6 +111,7 @@ org.eclipse.cdt.core.ccnature org.eclipse.cdt.managedbuilder.core.managedBuildNature org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + org.eclipse.buildship.core.gradleprojectnature @@ -124,4 +130,15 @@ PARENT-1-PROJECT_LOC/cocos2d/cocos/platform/android/java/src + + + 1770360450750 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/proj.android/jni/Android.mk b/proj.android/jni/Android.mk index c30f4567..66bac892 100644 --- a/proj.android/jni/Android.mk +++ b/proj.android/jni/Android.mk @@ -10,9 +10,9 @@ include $(PREBUILT_SHARED_LIBRARY) include $(CLEAR_VARS) $(call import-add-path,$(LOCAL_PATH)/../..) -$(call import-add-path,$(LOCAL_PATH)/../../../../cocos2d) -$(call import-add-path,$(LOCAL_PATH)/../../../../cocos2d/external) -$(call import-add-path,$(LOCAL_PATH)/../../../../cocos2d/cocos) +$(call import-add-path,$(LOCAL_PATH)/../../../cocos2d) +$(call import-add-path,$(LOCAL_PATH)/../../../cocos2d/external) +$(call import-add-path,$(LOCAL_PATH)/../../../cocos2d/cocos) LOCAL_MODULE := cocos2dcpp_shared LOCAL_SHARED_LIBRARIES += libYvImSdk diff --git a/proj.android/libs/armeabi/libYvImSdk.so b/proj.android/libs/armeabi/libYvImSdk.so index df3bde97..ab20060e 100644 Binary files a/proj.android/libs/armeabi/libYvImSdk.so and b/proj.android/libs/armeabi/libYvImSdk.so differ diff --git a/proj.android/libs/armeabi/libcocos2dcpp.so b/proj.android/libs/armeabi/libcocos2dcpp.so index c72ccaba..7e47f391 100644 Binary files a/proj.android/libs/armeabi/libcocos2dcpp.so and b/proj.android/libs/armeabi/libcocos2dcpp.so differ diff --git a/proj.android/libs/armeabi/libtencentloc.so b/proj.android/libs/armeabi/libtencentloc.so index beb3d8f4..8d6ae654 100644 Binary files a/proj.android/libs/armeabi/libtencentloc.so and b/proj.android/libs/armeabi/libtencentloc.so differ diff --git a/proj.android/local.properties b/proj.android/local.properties index a334e760..a5b4a81f 100644 --- a/proj.android/local.properties +++ b/proj.android/local.properties @@ -7,4 +7,4 @@ # location of the SDK. This is only used by Ant # For customization when using a Version Control System, please read the # header note. -sdk.dir=G:\\cocos\\Android\\android-sdk +sdk.dir=D:\\Android\\sdk diff --git a/proj.android/project.properties b/proj.android/project.properties index 6ca71d61..458f05b3 100644 --- a/proj.android/project.properties +++ b/proj.android/project.properties @@ -8,7 +8,7 @@ # project structure. # Project target. -target=android-14 +target=android-28 android.library=false -android.library.reference.1=../../../cocos2d/cocos/platform/android/java +android.library.reference.1=../../cocos2d/cocos/platform/android/java diff --git a/proj.win32/GameClient.sln b/proj.win32/GameClient.sln index a9664467..a4b9b65b 100644 --- a/proj.win32/GameClient.sln +++ b/proj.win32/GameClient.sln @@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0.21005.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\..\cocos2d\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\cocos2d\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\..\..\cocos2d\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\..\cocos2d\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\..\cocos2d\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\cocos2d\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbullet", "..\..\..\cocos2d\external\bullet\proj.win32\libbullet.vcxproj", "{012DFF48-A13F-4F52-B07B-F8B9D21CE95B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbullet", "..\..\cocos2d\external\bullet\proj.win32\libbullet.vcxproj", "{012DFF48-A13F-4F52-B07B-F8B9D21CE95B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librecast", "..\..\..\cocos2d\external\recast\proj.win32\librecast.vcxproj", "{41E34993-647E-4282-8384-4AB1AE31A452}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "librecast", "..\..\cocos2d\external\recast\proj.win32\librecast.vcxproj", "{41E34993-647E-4282-8384-4AB1AE31A452}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameClient", "GameClient.vcxproj", "{C4D520E0-1B78-4EFC-A4BA-547F9B1116C2}" EndProject diff --git a/proj.win32/GameClient.v12.suo b/proj.win32/GameClient.v12.suo index 0299f085..1b5308b7 100644 Binary files a/proj.win32/GameClient.v12.suo and b/proj.win32/GameClient.v12.suo differ diff --git a/proj.win32/GameClient.vcxproj b/proj.win32/GameClient.vcxproj index 6a9253f7..8291d521 100644 --- a/proj.win32/GameClient.vcxproj +++ b/proj.win32/GameClient.vcxproj @@ -41,13 +41,13 @@ - - + + - - + + @@ -87,7 +87,7 @@ true - %(AdditionalDependencies);$(_COCOS_LIB_WIN32_BEGIN);$(_COCOS_LIB_WIN32_END);LoginSDK.lib;yvpacket.lib + libcocos2d.lib;%(AdditionalDependencies);$(_COCOS_LIB_WIN32_BEGIN);$(_COCOS_LIB_WIN32_END);LoginSDK.lib;yvpacket.lib $(OutDir)$(ProjectName).exe $(OutDir);%(AdditionalLibraryDirectories);$(_COCOS_LIB_PATH_WIN32_BEGIN);$(_COCOS_LIB_PATH_WIN32_END);..\IM_SDK\win32 true @@ -130,7 +130,7 @@ true - libcurl_imp.lib;websockets.lib;%(AdditionalDependencies);$(_COCOS_LIB_WIN32_BEGIN);$(_COCOS_LIB_WIN32_END) + libcocos2d.lib;libcurl_imp.lib;websockets.lib;%(AdditionalDependencies);$(_COCOS_LIB_WIN32_BEGIN);$(_COCOS_LIB_WIN32_END) $(OutDir)$(ProjectName).exe $(OutDir);%(AdditionalLibraryDirectories);$(_COCOS_LIB_PATH_WIN32_BEGIN);$(_COCOS_LIB_PATH_WIN32_END) true diff --git a/运行/Debug/Ansi/ServerParameter.ini b/运行/Debug/Ansi/ServerParameter.ini index 22e845d3..ab0cc7fc 100644 Binary files a/运行/Debug/Ansi/ServerParameter.ini and b/运行/Debug/Ansi/ServerParameter.ini differ