背景和头像缺失
This commit is contained in:
@@ -934,6 +934,11 @@ struct CMD_GP_ListConfig
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// Restore default alignment for structs containing std::vector.
|
||||
// CMD_GF_Private_Room_Info uses DataStream field-by-field serialization,
|
||||
// so memory layout does not need to match network byte order.
|
||||
#pragma pack()
|
||||
|
||||
//私人场房间信息
|
||||
struct CMD_GF_Private_Room_Info
|
||||
{
|
||||
@@ -1050,6 +1055,9 @@ struct CMD_GF_Private_Room_Info
|
||||
}
|
||||
};
|
||||
|
||||
// Restore pack(1) for remaining structs
|
||||
#pragma pack(1)
|
||||
|
||||
//游戏记录
|
||||
struct CMD_GP_GetGameTotalRecord
|
||||
{
|
||||
@@ -1289,6 +1297,9 @@ struct tagPrivateRandTotalRecordList
|
||||
}
|
||||
};
|
||||
|
||||
// 以下结构体包含STL容器,需要恢复默认对齐以避免ARM平台SIGBUS错误
|
||||
#pragma pack()
|
||||
|
||||
// 玩家信息;
|
||||
struct tagGameRecordPlayer
|
||||
{
|
||||
@@ -1442,6 +1453,7 @@ struct tagGameRecord
|
||||
};
|
||||
|
||||
//工会列表;
|
||||
#pragma pack(1)
|
||||
struct tagUnionItem
|
||||
{
|
||||
uint32 dwUserID; //会长ID;
|
||||
@@ -1464,7 +1476,7 @@ struct tagUnionItem
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
#pragma pack()
|
||||
struct tagUnionItemList
|
||||
{
|
||||
std::vector<tagUnionItem> kList;
|
||||
@@ -1494,7 +1506,7 @@ struct tagUnionItemList
|
||||
StructVecotrMember(tagUnionItem, kList);
|
||||
}
|
||||
};
|
||||
|
||||
#pragma pack(1)
|
||||
struct tagUnionGameItem
|
||||
{
|
||||
uint32 dwUnionCode; //工会码;
|
||||
@@ -1512,7 +1524,7 @@ struct tagUnionGameItem
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
#pragma pack()
|
||||
struct tagUnionGameList
|
||||
{
|
||||
std::vector<tagUnionGameItem> kList;
|
||||
@@ -1581,6 +1593,7 @@ struct tagUnionAndGameList
|
||||
};
|
||||
|
||||
//房间列表;
|
||||
#pragma pack(1)
|
||||
struct tagRoomItem
|
||||
{
|
||||
uint16 wKindID; //游戏ID;
|
||||
@@ -1608,7 +1621,7 @@ struct tagRoomItem
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
#pragma pack()
|
||||
struct tagRoomItemList
|
||||
{
|
||||
uint8 cbPlayRoomCount;
|
||||
@@ -1646,6 +1659,7 @@ struct tagRoomItemList
|
||||
};
|
||||
|
||||
//自动房间列表;
|
||||
#pragma pack(1)
|
||||
struct tagAutoRoomItem
|
||||
{
|
||||
uint32 dwIndex;
|
||||
@@ -1672,7 +1686,7 @@ struct tagAutoRoomItem
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
#pragma pack()
|
||||
struct tagAutoRoomItemList
|
||||
{
|
||||
std::vector<tagAutoRoomItem> kList;
|
||||
|
||||
@@ -171,13 +171,16 @@ public:
|
||||
|
||||
DataStream& pushValue(long value)
|
||||
{
|
||||
push(value);
|
||||
push((int)value);
|
||||
return *this;
|
||||
}
|
||||
|
||||
DataStream& popValue(long& value)
|
||||
{
|
||||
return pop(value);
|
||||
int kTempValue = 0;
|
||||
pop(kTempValue);
|
||||
value = kTempValue;
|
||||
return *this;
|
||||
}
|
||||
|
||||
DataStream& pushValue(long long value)
|
||||
@@ -207,25 +210,15 @@ public:
|
||||
{
|
||||
return pop(value);
|
||||
}
|
||||
#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
|
||||
DataStream& pushValue(unsigned long value)
|
||||
{
|
||||
push((unsigned int)value);
|
||||
push(value);
|
||||
return *this;
|
||||
}
|
||||
DataStream& popValue(unsigned long& value)
|
||||
{
|
||||
if (size() <= sizeof(unsigned int))
|
||||
{
|
||||
return *this;
|
||||
}
|
||||
|
||||
unsigned int kTempValue = 0;
|
||||
pop(kTempValue);
|
||||
value = kTempValue;
|
||||
return *this;
|
||||
return pop(value);
|
||||
}
|
||||
#endif
|
||||
DataStream& pushValue(unsigned char value)
|
||||
{
|
||||
return push(value);
|
||||
@@ -262,7 +255,7 @@ public:
|
||||
return pop(value);
|
||||
}
|
||||
|
||||
//std::vector´¦Àí
|
||||
//std::vector<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
template<typename C>
|
||||
DataStream& pushValue(const std::vector<C>& data)
|
||||
{
|
||||
@@ -329,7 +322,7 @@ private:
|
||||
{
|
||||
return *this;
|
||||
}
|
||||
memcpy(&data, &operator[](0), sizeof(data));
|
||||
memcpy((void*)&data, (void*)&operator[](0), sizeof(data));
|
||||
erase(begin(), begin()+sizeof(data));
|
||||
return *this;
|
||||
}
|
||||
|
||||
@@ -29,20 +29,34 @@
|
||||
#define VERSION_EFFICACY 0 //效验版本;
|
||||
#define VERSION_FRAME_SDK INTERFACE_VERSION(6,3) //框架版本;
|
||||
|
||||
#if 1
|
||||
|
||||
#define LOGON_SERVER_ADDRESS "121.40.40.53" //登录服务器地址;
|
||||
#define WEB_SERVER_ADDRESS "http://121.40.40.53:9002/" //WEB服务器地址;
|
||||
#define WEB_SERVER_ADDRESS "http://121.40.40.53:9002" //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://121.40.40.53/Lobby/PayToPlayer" //转账给玩家;
|
||||
#define PAY_LOG_HTTP_ADDRESS "http://121.40.40.53/Lobby/GetPayLog" //充值记录;
|
||||
#define GET_NICKNAME_HTTP_ADDRESS "http://121.40.40.53/Lobby/GetPlayerNickName" //获取昵称;
|
||||
#define DUI_HUAN_HTTP_ADDRESS "http://121.40.40.53/duihuan.html" //兑换地址;
|
||||
#define GONG_HUI_HTTP_ADDRESS "http://121.40.40.53/gonghui.html" //公会地址;
|
||||
#define HEAD_HTTP_ADDRESS "http://121.40.40.53/b.php?id=%d" //头像地址;
|
||||
#define PAY_TO_PLAYER_HTTP_ADDRESS "http://121.40.40.53:9002/Lobby/PayToPlayer" //转账给玩家;
|
||||
#define PAY_LOG_HTTP_ADDRESS "http://121.40.40.53:9002/Lobby/GetPayLog" //充值记录;
|
||||
#define GET_NICKNAME_HTTP_ADDRESS "http://121.40.40.53:9002/Lobby/GetPlayerNickName" //获取昵称;
|
||||
#define DUI_HUAN_HTTP_ADDRESS "http://121.40.40.53:9002/duihuan.html" //兑换地址;
|
||||
#define GONG_HUI_HTTP_ADDRESS "http://121.40.40.53:9002/gonghui.html" //公会地址;
|
||||
#define HEAD_HTTP_ADDRESS "http://121.40.40.53/b.php?id=%d" //公会地址;
|
||||
#define SHARE_HTTP_ADDRESS "http://121.40.40.53/qy.html" //分享地址;
|
||||
|
||||
#else
|
||||
|
||||
#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" //分享地址;
|
||||
|
||||
#endif
|
||||
|
||||
#define LOGON_SERVER_PORT 10086 //登录服务器端口;
|
||||
//#define LOGON_SERVER_PORT 10090 //登录服务器端口;
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
#include <assert.h>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include <cstdlib>
|
||||
|
||||
#ifndef ASSERT
|
||||
#define ASSERT(f) assert(f)
|
||||
@@ -73,7 +72,7 @@ typedef int INT;
|
||||
typedef float FLOAT;
|
||||
typedef DWORD COLORREF;
|
||||
|
||||
typedef long LONG;
|
||||
typedef int LONG;
|
||||
|
||||
typedef struct _SYSTEMTIME
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user