背景和头像缺失

Classes/Mission/GameMission.cpp

@@ -576,7 +576,6 @@ bool GameMission::OnSocketSubPrivateRoomInfo(void* data, int dataSize)
 	DataStream kDataStream(data, dataSize);
 	CMD_GF_Private_Room_Info kNetInfo;
 	kNetInfo.StreamValue(kDataStream, false);
-
 	if (mIClientKernelSink)
 	{
 		mIClientKernelSink->OnSocketSubPrivateRoomInfo(&kNetInfo);

Classes/Mission/LoginMission.cpp

@@ -17,20 +17,20 @@ LoginMission::LoginMission()
 }
 
 
-// 占쏙옙占시쀼듸옙占쌈울옙
+// 设置回调接口
 void LoginMission::setMissionSink(ILoginMissionSink* pILoginMissionSink)
 {
 	mILoginMissionSink = pILoginMissionSink;
 }
 
-// 占싯뵀듸옙쩍
+// 账号登陆
 void LoginMission::loginAccount(const CMD_GP_LogonAccounts& LoginAccount)
 {
 	memcpy(&mLoginAccount, &LoginAccount, sizeof(mLoginAccount));
 	mMissionType = MISSION_LOGIN_ACCOUNT;
 	start();
 }
-// 占싸와듸옙쩌
+// 游客登录
 void LoginMission::loginVisitor(const CMD_GP_VisitorLogon& VisitorAccount)
 {
 	memcpy(&mVisitorAccount, &VisitorAccount, sizeof(VisitorAccount));
@@ -39,7 +39,7 @@ void LoginMission::loginVisitor(const CMD_GP_VisitorLogon& VisitorAccount)
 	start();
 }
 
-// I D占쏙옙쩍
+// I D登陆
 void LoginMission::loginGameID(const CMD_GP_LogonByUserID& LoginGameID)
 {
 	memcpy(&mLoginGameID, &LoginGameID, sizeof(mLoginGameID));
@@ -60,7 +60,7 @@ void LoginMission::updateOnlineInfo()
 	start();
 }
 
-//占쏙옙占쏙옙占쏙옙占쏙옙
+//更新类型
 bool LoginMission::updateServerInfo(uint16 kind)
 {
 	KIND_ITER it = std::find(mKindList.begin(), mKindList.end(), kind);
@@ -84,38 +84,38 @@ bool LoginMission::updateServerInfo(uint16 kind)
 	return true;
 }
 
-// 占쏙옙쩍
+// 登陆
 bool LoginMission::sendLoginVisitor(const CMD_GP_VisitorLogon& VisitorAccount)
 {
 	CGlobalUserInfo * pGlobalUserInfo=CGlobalUserInfo::GetInstance();
 	tagGlobalUserData * pGlobalUserData=pGlobalUserInfo->GetGlobalUserData();
 	strncpy(pGlobalUserData->szPassword,mVisitorAccount.szPassWord,countarray(pGlobalUserData->szPassword));
 
-	//占쏙옙占쏙옙占쏙옙占쏙옙
+	//发送数据
 	send(MDM_GP_LOGON, SUB_GP_LOGON_VISITOR, (void*)&mVisitorAccount, sizeof(mVisitorAccount));
 	return true;
 }
-//占쏙옙占싶듸옙쩍占쏙옙口
+//发送登陆信息
 bool LoginMission::sendLoginAccount(const CMD_GP_LogonAccounts& LoginAccount)
 {
 	cocos2d::log(("LoginMission::sendLoginAccount\n"));
-	//占쏙옙占쏙옙占쏙옙占쏙옙
+	//保存密码
 	CGlobalUserInfo * pGlobalUserInfo=CGlobalUserInfo::GetInstance();
 	tagGlobalUserData * pGlobalUserData=pGlobalUserInfo->GetGlobalUserData();
 	strncpy(pGlobalUserData->szPassword,LoginAccount.szPassword, countarray(pGlobalUserData->szPassword));
 
-	//占쏙옙占쏙옙占쏙옙占쏙옙
+	//发送数据
 	send(MDM_GP_LOGON, SUB_GP_LOGON_ACCOUNTS, (void*)&LoginAccount, sizeof(LoginAccount));
 	return true;
 }
 
-//占쏙옙占싶듸옙쩍占쏙옙口
+//发送登陆信息
 bool LoginMission::sendLoginGameID(const CMD_GP_LogonByUserID& LoginGameID)
 {
 	return true;
 }
 
-//占쏙옙占쏙옙鬧占쏙옙占쏙옙口
+//发送注册信息
 bool LoginMission::sendRegisterPacket(const CMD_GP_RegisterAccounts& RegisterAccount)
 {
 	cocos2d::log(("LoginMission::sendRegisterPacket\n"));
@@ -124,20 +124,20 @@ bool LoginMission::sendRegisterPacket(const CMD_GP_RegisterAccounts& RegisterAcc
 	tagGlobalUserData * pGlobalUserData=pGlobalUserInfo->GetGlobalUserData();
 	strncpy(pGlobalUserData->szPassword,RegisterAccount.szLogonPass, countarray(pGlobalUserData->szPassword));
 
-	//占쏙옙占쏙옙占쏙옙占쏙옙
+	//发送数据
 	send(MDM_GP_LOGON, SUB_GP_REGISTER_ACCOUNTS, (void*)&RegisterAccount, sizeof(RegisterAccount));
 	return true;
 }
 
 
-// 占쏙옙占쏙옙占쏙옙占쏙옙
+// 更新人数
 bool LoginMission::sendUpdateOnlineInfoPacket()
 {
 	return true;
 
 }
 
-// 占쏙옙占쏙옙占쏙옙占싶뤄옙占쏙옙占싻깍옙
+// 更新类型房间列表
 void LoginMission::sendUpdateServerInfo()
 {
 }
@@ -148,26 +148,26 @@ void LoginMission::onEventTCPSocketLink()
 
 	switch (mMissionType)
 	{
-		// 占쏙옙쩍
+		// 登陆
 	case MISSION_LOGIN_ACCOUNT:
 		sendLoginAccount(mLoginAccount);
 		break;
 	case MISSION_LOGIN_VISITOR:
 		sendLoginVisitor(mVisitorAccount);
 		break;
-		// 占쏙옙쩍
+		// 登陆
 	case MISSION_LOGIN_GAMEID:
 		sendLoginGameID(mLoginGameID);
 		break;
-		// 鬧占쏙옙
+		// 注册
 	case MISSION_REGISTER:
 		sendRegisterPacket(mRegisterAccount);
 		break;
-		// 占쏙옙占쏙옙占쏙옙占쏙옙
+		// 更新人数
 	case MISSION_UPDATE_INFO:
 		sendUpdateOnlineInfoPacket();
 		break;
-		// 占쏙옙占쏙옙占쏙옙占싶뤄옙占쏙옙占싻깍옙
+		// 更新类型房间列表
 	case MISSION_SERVER_INFO:
 		sendUpdateServerInfo();
 		break;
@@ -202,20 +202,20 @@ bool LoginMission::onEventTCPSocketRead(int main, int sub, void* data, int size)
 }
 
 //////////////////////////////////////////////////////////////////////////
-// 占쏙옙쩍占쏙옙口
+// 登陆信息
 bool LoginMission::onSocketMainLogon(int sub, void* data, int size)
 {
 	switch (sub)
 	{
-		//占쏙옙쩌占심뱄옙
+		//登录成功
 	case SUB_GP_LOGON_SUCCESS:		return onSocketSubLogonSuccess(data, size);
-		//占쏙옙쩌呵占쏙옙
+		//登录失败
 	case SUB_GP_LOGON_FAILURE:		return onSocketSubLogonFailure(data, size);
- 		//占쏙옙쩌呵占쏙옙
+ 		//登录失败
  	case SUB_GP_VALIDATE_MBCARD:	return onSocketSubLogonValidateMBCard(data, size);
- 		//占쏙옙占쏙옙占쏙옙刻
+ 		//升级提示
  	case SUB_GP_UPDATE_NOTIFY:		return onSocketSubUpdateNotify(data, size);
- 		//占쏙옙쩌占쏙옙占?
+ 		//登录完成
 	case SUB_GP_LOGON_FINISH:		return onSocketSubLogonFinish(data, size);
 	case SUB_GP_GROWLEVEL_CONFIG:	return true;
 	case SUB_GP_MATCH_SIGNUPINFO:	return onSocketSubMacthSignupInfo(data, size);
@@ -225,14 +225,14 @@ bool LoginMission::onSocketMainLogon(int sub, void* data, int size)
 	return false;
 }
 
-//占쏙옙쩌占심뱄옙
+//登录成功
 bool LoginMission::onSocketSubLogonSuccess(void* data, int size)
 {
 	cocos2d::log(("LoginMission::onSocketSubLogonSuccess\n"));
 
-	//占쏙옙쩍占심뱄옙
+	//登陆成功
 	CMD_GP_LogonSuccess* pData = (CMD_GP_LogonSuccess*)data;
-	//占쏙옙占쏙옙占쏙옙占쏙옙
+	//变量定义
 	CGlobalUserInfo * pGlobalUserInfo=CGlobalUserInfo::GetInstance();
 	tagGlobalUserData * pGlobalUserData=pGlobalUserInfo->GetGlobalUserData();
 
@@ -240,7 +240,7 @@ bool LoginMission::onSocketSubLogonSuccess(void* data, int size)
 	pGlobalUserData->lUserInsure = pData->lUserInsure;
 	pGlobalUserData->lGrade = pData->lGrade;
 
-	//占쏙옙占쏙옙占쏙옙口
+	//保存信息
 	pGlobalUserData->wFaceID = pData->wFaceID;
 	pGlobalUserData->cbGender = pData->cbGender;
 	pGlobalUserData->dwUserID =pData->dwUserID;
@@ -249,13 +249,13 @@ bool LoginMission::onSocketSubLogonSuccess(void* data, int size)
 	pGlobalUserData->dwExperience =pData->dwExperience;
 	pGlobalUserData->cbInsureEnabled = pData->cbInsureEnabled;
 	pGlobalUserData->cbWXShareTimes = pData->cbWXShareTimes;
-	strncpy(pGlobalUserData->szNickName, (char*)pData->szNickName, countarray(pGlobalUserData->szNickName)-1);
+	//strncpy(pGlobalUserData->szNickName, (char*)pData->szNickName, countarray(pGlobalUserData->szNickName)-1);
 	strncpy(pGlobalUserData->szAccounts, ((char*)pData->szAccounts), countarray(pGlobalUserData->szAccounts)-1);
 
-	// 占썽쉽占쏙옙口;
+	// 抽奖信息;
 	pGlobalUserData->isLottery = pData->isLottery;
 
-	//占쏙옙占쏙옙占싹?
+	//金币信息
 	pGlobalUserInfo->upPlayerInfo();
 
 	if (mILoginMissionSink)
@@ -264,36 +264,36 @@ bool LoginMission::onSocketSubLogonSuccess(void* data, int size)
 	return true;
 }
 
-//占쏙옙쩌呵占쏙옙
+//登录失败
 bool LoginMission::onSocketSubLogonFailure(void* data, int size)
 {
 	cocos2d::log(("LoginMission::onSocketSubLogonFailure\n"));
 
 	DBR_GP_LogonError* pNetInfo =(DBR_GP_LogonError*)data;
-	//占쏙옙刻占쏙옙口
+	//显示消息
 	if (mILoginMissionSink)
 		mILoginMissionSink->onGPLoginFailure(pNetInfo->lErrorCode,utility::a_u8(pNetInfo->szErrorDescribe).c_str());
 	return true;
 
 }
 
-//占쏙옙占쏙옙占쏙옙刻
+//升级提示
 bool LoginMission::onSocketSubUpdateNotify(void* data, int size)
 {
 	cocos2d::log(("LoginMission::onSocketSubUpdateNotify\n"));
-	//槻占쏙옙占쏙옙占?
+	//效验参数
 
 	return true;
 }
 
-//占쏙옙쩌呵占쏙옙(占쌤깍옙占쏙옙)
+//登录失败(密保卡)
 bool LoginMission::onSocketSubLogonValidateMBCard(void* data, int size)
 {
 	cocos2d::log(("LoginMission::onSocketSubLogonValidateMBCard\n"));
 	return true;
 }
 
-//占쏙옙쩌占쏙옙占?
+//登录完成
 bool LoginMission::onSocketSubLogonFinish(void* data, int size)
 {
 	cocos2d::log(("LoginMission::onSocketSubLogonFinish\n"));
@@ -311,21 +311,21 @@ bool LoginMission::onSocketSubLogonFinish(void* data, int size)
 }
 bool LoginMission::onSocketSubMacthSignupInfo(void* data, int size)
 {
-	//叫占쏙옙占쏙옙占쏙옙
+	//校验数据
 	if(size%sizeof(uint16)!=0) return false;
 
-	//占쏙옙혤占쏙옙占쏙옙			
+	//提取数据			
 	tagSignupMatchInfo * pSignupMatchInfo = (tagSignupMatchInfo *)data;
 	uint16 wSignupCount = size/sizeof(pSignupMatchInfo);
 
-	//占쏙옙혤占쏙옙占쏙옙
+	//获取对象
 	ASSERT(CServerListData::shared()!=NULL);
 	CServerListData * pServerListData=CServerListData::shared();
 
-	//占쏙옙占쌀뤄옙占쏙옙
+	//查找房间
 	CGameServerItem * pGameServerItem = NULL;
 
-	//占쏙옙占시깍옙占쏙옙
+	//设置报名
 	for(uint16 i=0;i<wSignupCount;i++)
 	{
 		pGameServerItem = pServerListData->SearchGameServer(pSignupMatchInfo[i].wServerID);
@@ -339,7 +339,7 @@ bool LoginMission::onSocketSubMacthSignupInfo(void* data, int size)
 }
 
 //////////////////////////////////////////////////////////////////////////
-// 占싻깍옙占쏙옙口
+// 列表信息
 bool LoginMission::onSocketMainServerList(int sub, void* data, int size)
 {
  	switch (sub)
@@ -357,7 +357,7 @@ bool LoginMission::onSocketMainServerList(int sub, void* data, int size)
 	return false;
 }
 
-//占쏙옙占쏙옙占쏙옙口
+//种类信息
 bool LoginMission::onSocketListType(void* data, int size)
 {
 	cocos2d::log(("LoginMission::onSocketListType\n"));
@@ -365,11 +365,11 @@ bool LoginMission::onSocketListType(void* data, int size)
 	return true;
 }
 
-//占쏙옙占쏙옙占쏙옙口
+//类型信息
 bool LoginMission::onSocketListKind(void* data, int size)
 {
 	cocos2d::log(("LoginMission::onSocketListKind\n"));
-	////占쏙옙占쏙옙占쏙옙占쏙옙
+	////更新数据
 	int itemSize = sizeof(tagGameKind);
 
 	ASSERT(size%itemSize==0);
@@ -386,11 +386,11 @@ bool LoginMission::onSocketListKind(void* data, int size)
 	return true;
 }
 
-// 占쏙옙占쏙옙占싻깍옙
+// 房间列表
 bool LoginMission::onSocketListServer(void* data, int size)
 {
 	cocos2d::log(("LoginMission::onSocketListServer\n"));
-	////占쏙옙占쏙옙占쏙옙占쏙옙
+	////更新数据
 	int itemSize = sizeof(tagGameServer);
 
 	ASSERT(size%itemSize==0);
@@ -406,7 +406,7 @@ bool LoginMission::onSocketListServer(void* data, int size)
 	}
 	return true;
 }
-//占쏙옙占쏙옙占싻깍옙
+//比赛列表
 bool LoginMission::onSocketListMatch(void* data, int size)
 {
 	cocos2d::log(("LoginMission::onSocketListMatch\n"));
@@ -415,15 +415,15 @@ bool LoginMission::onSocketListMatch(void* data, int size)
 	ASSERT(size%itemSize==0);
 	if (size%itemSize!=0) return false;
 
-	//占쏙옙占쏙옙占쏙옙占쏙옙
+	//变量定义
 	uint16 wItemCount=size/sizeof(tagGameMatch);
 	tagGameMatch * pGameMatch=(tagGameMatch *)(data);
 
-	//占쏙옙혤占쏙옙占쏙옙
+	//获取对象
 	CGameServerItem * pGameServerItem=NULL;
 	CServerListData * pServerListData=CServerListData::shared();
 
-	//占쏙옙占쏙옙占쏙옙占쏙옙
+	//更新数据
 	for (uint16 i=0;i<wItemCount;i++)
 	{
 		pGameServerItem = pServerListData->SearchGameServer(pGameMatch->wServerID);
@@ -437,7 +437,7 @@ bool LoginMission::onSocketListMatch(void* data, int size)
 
 }
 
-// 占싻깍옙占쏙옙占?
+// 列表完成
 bool LoginMission::onSocketListFinish(void* data, int size)
 {
 	cocos2d::log(("LoginMission::onSocketListFinish\n"));
@@ -449,7 +449,7 @@ bool LoginMission::onSocketListFinish(void* data, int size)
 	}
 	return true;
 }
-//占싻깍옙占쏙옙占쏙옙
+//列表配置
 bool LoginMission::onSocketListConfig(void* data, int size)
 {
 	cocos2d::log(("LoginMission::onSocketListConfig\n"));
@@ -460,31 +460,31 @@ bool LoginMission::onSocketListConfig(void* data, int size)
 
 
 //////////////////////////////////////////////////////////////////////////
-// 占쏙옙占쌩몌옙占쏙옙
+// 在线更新
 //////////////////////////////////////////////////////////////////////////
-//占쏙옙占쏙옙占쏙옙占쏙옙
+//类型在线
 bool LoginMission::onSocketKindOnline(void* data, int size)
 {
 	cocos2d::log(("LoginMission::onSocketKindOnline\n"));
 
-	//占쏙옙占쏙옙占쏙옙占쏙옙
+	//变量定义
 	
 	return true;
 
 }
 
-//占쏙옙占쏙옙占쏙옙占쏙옙
+//房间在线
 bool LoginMission::onSocketServerOnline(void* data, int size)
 {
 	cocos2d::log(("LoginMission::onSocketServerOnline\n"));
 
-	//占쏙옙占쏙옙占쏙옙占쏙옙
+	//变量定义
 	
 	return true;
 
 }
 
-// 占쏙옙占쌩몌옙占쏙옙占쏙옙占?
+// 在线更新完成
 bool LoginMission::onSocketOnlineFinish(void* data, int size)
 {
 	cocos2d::log(("LoginMission::onSocketOnlineFinish\n"));
@@ -494,7 +494,7 @@ bool LoginMission::onSocketOnlineFinish(void* data, int size)
 
 //////////////////////////////////////////////////////////////////////////
 
-//占쏙옙틉占쏙옙占쏙옙
+//视频配置
 bool LoginMission::onSocketVideoOption(void* data, int size)
 {
 	cocos2d::log(("LoginMission::onSocketVideoOption\n"));

Classes/Mission/MissionWeiXin.cpp

@@ -3,6 +3,7 @@
 #include "MissionWeiXin.h"
 #include "JniFun.h"
 #include "Define.h"
+#include "Utility.h"
 
 USING_NS_CC;
 
@@ -223,7 +224,9 @@ void MissionWeiXin::shareTextWeiXin(std::string kText,int nShareType /*= SHARE_S
 
 void MissionWeiXin::shareUrlWeiXin(std::string kUrl,std::string kTitle,std::string kDesc,int nShareType)
 {
-	JniFun::shareUrlWX(kUrl.c_str(),kTitle.c_str(),kDesc.c_str(),nShareType);
+	std::string utf8Title = utility::a_u8(kTitle);
+	std::string utf8Desc = utility::a_u8(kDesc);
+	JniFun::shareUrlWX(kUrl.c_str(),utf8Title.c_str(),utf8Desc.c_str(),nShareType);
 }
 
 //////////////////////////////// 闲聊分享 //////////////////////////////////////////
@@ -239,5 +242,7 @@ void MissionWeiXin::shareTextXL(std::string kText, int nShareType /*= SHARE_SESS
 
 void MissionWeiXin::shareUrlXL(std::string kUrl, std::string kTitle, std::string kDesc, int nShareType /*= SHARE_SESSION*/)
 {
-	JniFun::shareUrlXL(kUrl.c_str(), kTitle.c_str(), kDesc.c_str(), nShareType);
+	std::string utf8Title = utility::a_u8(kTitle);
+	std::string utf8Desc = utility::a_u8(kDesc);
+	JniFun::shareUrlXL(kUrl.c_str(), utf8Title.c_str(), utf8Desc.c_str(), nShareType);
 }

Classes/Mission/UserInGameServer.cpp

@@ -292,6 +292,7 @@ void UserInGameServer::PerformGetUnionRoomList(CMD_GR_GetUnionRoomInfo* pkSendNe
 void UserInGameServer::CB_GetUnionRoomList(CMD_GR_GetUnionRoomInfo* pkSendNet)
 {
 	CMD_GR_GetUnionRoomInfo kNetInfo;
+	memset(&kNetInfo, 0, sizeof(kNetInfo));
 	kNetInfo.dwUserID = pkSendNet->dwUserID;
 	kNetInfo.dwUnionCode = pkSendNet->dwUnionCode;
 	send(MDM_GP_USER_SERVICE, SUB_GP_GET_UNION_ROOM_LIST, &kNetInfo, sizeof(kNetInfo));