Skip to content

Commit 8b2d200

Browse files
committed
up
1 parent 670cf20 commit 8b2d200

File tree

3 files changed

+47
-8
lines changed

3 files changed

+47
-8
lines changed

Plugins/kbengine_ue4_plugins/Source/KBEnginePlugins/Engine/KBETypes.h

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ typedef uint8 ENTITY_SUBSTATE;
102102

103103
typedef int32 ENTITY_FORBIDS;
104104

105-
class KBENGINEPLUGINS_API ENTITY_FORBID_COUNTER : public TArray<int8>
105+
class ENTITY_FORBID_COUNTER : public TArray<int8>
106106
{
107107
public:
108108

@@ -112,7 +112,12 @@ class KBENGINEPLUGINS_API ENTITY_FORBID_COUNTER : public TArray<int8>
112112

113113
};
114114

115-
class KBENGINEPLUGINS_API ENTITYID_LIST : public TArray<int32>
115+
inline bool operator ==(const ENTITY_FORBID_COUNTER& a, const ENTITY_FORBID_COUNTER& b)
116+
{
117+
return a == b;
118+
};
119+
120+
class ENTITYID_LIST : public TArray<int32>
116121
{
117122
public:
118123

@@ -122,7 +127,12 @@ class KBENGINEPLUGINS_API ENTITYID_LIST : public TArray<int32>
122127

123128
};
124129

125-
class KBENGINEPLUGINS_API AVATAR_DATA
130+
inline bool operator ==(const ENTITYID_LIST& a, const ENTITYID_LIST& b)
131+
{
132+
return a == b;
133+
};
134+
135+
class AVATAR_DATA
126136
{
127137
public:
128138
int8 param1;
@@ -136,7 +146,12 @@ class KBENGINEPLUGINS_API AVATAR_DATA
136146

137147
};
138148

139-
class KBENGINEPLUGINS_API AVATAR_INFOS
149+
inline bool operator ==(const AVATAR_DATA& a, const AVATAR_DATA& b)
150+
{
151+
return a.param1 == b.param1 && a.param2 == b.param2;
152+
};
153+
154+
class AVATAR_INFOS
140155
{
141156
public:
142157
uint64 dbid;
@@ -156,7 +171,12 @@ class KBENGINEPLUGINS_API AVATAR_INFOS
156171

157172
};
158173

159-
class KBENGINEPLUGINS_API AVATAR_INFOS_LIST
174+
inline bool operator ==(const AVATAR_INFOS& a, const AVATAR_INFOS& b)
175+
{
176+
return a.dbid == b.dbid && a.name == b.name && a.roleType == b.roleType && a.level == b.level && a.data == b.data;
177+
};
178+
179+
class AVATAR_INFOS_LIST
160180
{
161181
public:
162182
TArray<AVATAR_INFOS> values;
@@ -168,7 +188,12 @@ class KBENGINEPLUGINS_API AVATAR_INFOS_LIST
168188

169189
};
170190

171-
class KBENGINEPLUGINS_API BAG
191+
inline bool operator ==(const AVATAR_INFOS_LIST& a, const AVATAR_INFOS_LIST& b)
192+
{
193+
return a.values == b.values;
194+
};
195+
196+
class BAG
172197
{
173198
public:
174199
TArray<TArray<int64>> values22;
@@ -180,7 +205,12 @@ class KBENGINEPLUGINS_API BAG
180205

181206
};
182207

183-
class KBENGINEPLUGINS_API EXAMPLES
208+
inline bool operator ==(const BAG& a, const BAG& b)
209+
{
210+
return a.values22 == b.values22;
211+
};
212+
213+
class EXAMPLES
184214
{
185215
public:
186216
int64 k1;
@@ -194,5 +224,10 @@ class KBENGINEPLUGINS_API EXAMPLES
194224

195225
};
196226

227+
inline bool operator ==(const EXAMPLES& a, const EXAMPLES& b)
228+
{
229+
return a.k1 == b.k1 && a.k2 == b.k2;
230+
};
231+
197232

198233
}

Plugins/kbengine_ue4_plugins/Source/KBEnginePlugins/Engine/KBEngine.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ void KBEngineApp::reset()
235235
serverdatas_.Empty();
236236

237237
serverVersion_ = TEXT("");
238-
clientVersion_ = TEXT("2.5.4");
238+
clientVersion_ = TEXT("2.5.8");
239239
serverScriptVersion_ = TEXT("");
240240
clientScriptVersion_ = TEXT("0.1.0");
241241

Plugins/kbengine_ue4_plugins/Source/KBEnginePlugins/Engine/Messages.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,6 +1400,10 @@ class KBENGINEPLUGINS_API Messages
14001400
loginappMessages.Empty();
14011401
baseappMessages.Empty();
14021402
clientMessages.Empty();
1403+
1404+
for (auto item : messages)
1405+
delete item.Value;
1406+
14031407
messages.Empty();
14041408

14051409
initialize();

0 commit comments

Comments
 (0)