Skip to content

Commit 2d7041a

Browse files
committed
up
1 parent 2ee751e commit 2d7041a

File tree

4 files changed

+11
-35
lines changed

4 files changed

+11
-35
lines changed

Source/kbengine_ue4_demo/kbe_scripts/Account.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,19 @@ void Account::onDestroy()
6262

6363
void Account::reqCreateAvatar(uint8 roleType, const FString& name)
6464
{
65-
DEBUG_MSG("roleType=%d", roleType);
65+
DEBUG_MSG("Account::reqCreateAvatar(): roleType=%d", roleType);
6666
baseCall("reqCreateAvatar", roleType, name);
6767
}
6868

6969
void Account::reqRemoveAvatar(uint64 dbid)
7070
{
71-
DEBUG_MSG("dbid=%lld", dbid);
71+
DEBUG_MSG("Account::reqRemoveAvatar(): dbid=%lld", dbid);
7272
baseCall("reqRemoveAvatarDBID", dbid);
7373
}
7474

7575
void Account::selectAvatarGame(uint64 dbid)
7676
{
77-
DEBUG_MSG("name=%lld", dbid);
77+
DEBUG_MSG("Account::selectAvatarGame(): name=%lld", dbid);
7878
baseCall("selectAvatarGame", dbid);
7979
}
8080

@@ -150,7 +150,7 @@ void Account::onCreateAvatarResult(uint8 retcode, const KB_FIXED_DICT& info)
150150

151151
void Account::onRemoveAvatar(uint64 dbid)
152152
{
153-
DEBUG_MSG("dbid=%lld", dbid);
153+
DEBUG_MSG("Account::onRemoveAvatar(): dbid=%lld", dbid);
154154

155155
AVATAR_INFOS* infosFind = characters.Find(dbid);
156156

Source/kbengine_ue4_demo/kbe_scripts/Avatar.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void Avatar::__init__()
4949

5050
void Avatar::reqRelive(uint8 reliveType)
5151
{
52-
DEBUG_MSG("reqRelive");
52+
DEBUG_MSG("Avatar::reqRelive(): reqRelive");
5353
cellCall("relive", reliveType);
5454
}
5555

Source/kbengine_ue4_demo/kbengine_ue4_demo.h

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,27 @@
77

88
DECLARE_LOG_CATEGORY_EXTERN(KBEScriptLog, Log, All);
99

10-
#define NETMODE_WORLD TEXT("")
11-
12-
#if PLATFORM_WINDOWS
13-
#define FUNC_NAME TEXT(__FUNCTION__)
14-
#else
15-
#define FUNC_NAME __func__
16-
#endif
17-
1810
#define INFO_MSG(Format, ...) \
1911
{ \
2012
SET_WARN_COLOR(COLOR_CYAN); \
2113
const FString Msg = FString::Printf(TEXT(Format), ##__VA_ARGS__); \
22-
if (Msg == "") \
23-
{ \
24-
UE_LOG(KBEScriptLog, Log, TEXT("%s%s()"), NETMODE_WORLD, FUNC_NAME); \
25-
} \
26-
else \
27-
{ \
28-
UE_LOG(KBEScriptLog, Log, TEXT("%s%s() : %s"), NETMODE_WORLD, FUNC_NAME, *Msg); \
29-
} \
14+
UE_LOG(KBEScriptLog, Log, TEXT("%s"), *Msg); \
3015
CLEAR_WARN_COLOR(); \
3116
}
3217

3318
#define DEBUG_MSG(Format, ...) \
3419
{ \
3520
SET_WARN_COLOR(COLOR_CYAN); \
3621
const FString Msg = FString::Printf(TEXT(Format), ##__VA_ARGS__); \
37-
UE_LOG(KBEScriptLog, Log, TEXT("**DEBUG** %s() : %s"), FUNC_NAME, *Msg); \
22+
UE_LOG(KBEScriptLog, Log, TEXT("**DEBUG** %s"), *Msg); \
3823
CLEAR_WARN_COLOR(); \
3924
}
4025

4126
#define WARNING_MSG(Format, ...) \
4227
{ \
4328
SET_WARN_COLOR(COLOR_YELLOW); \
4429
const FString Msg = FString::Printf(TEXT(Format), ##__VA_ARGS__); \
45-
UE_LOG(KBEScriptLog, Log, TEXT("**WARNING** %s%s() : %s"), NETMODE_WORLD, FUNC_NAME, *Msg); \
30+
UE_LOG(KBEScriptLog, Log, TEXT("**WARNING** %s"), *Msg); \
4631
CLEAR_WARN_COLOR(); \
4732
GEngine->AddOnScreenDebugMessage(-1, 3.f, FColor::Yellow, Msg); \
4833
}
@@ -51,24 +36,15 @@ DECLARE_LOG_CATEGORY_EXTERN(KBEScriptLog, Log, All);
5136
{ \
5237
SET_WARN_COLOR(COLOR_RED); \
5338
const FString Msg = FString::Printf(TEXT(Format), ##__VA_ARGS__); \
54-
UE_LOG(KBEScriptLog, Log, TEXT("**ERROR** %s%s() : %s"), NETMODE_WORLD, FUNC_NAME, *Msg); \
39+
UE_LOG(KBEScriptLog, Log, TEXT("**ERROR** %s"), *Msg); \
5540
CLEAR_WARN_COLOR(); \
5641
GEngine->AddOnScreenDebugMessage(-1, 60.f, FColor::Red, Msg); \
5742
}
5843

5944
#define SCREENDEBUG(Format, ...) \
6045
{ \
6146
const FString Msg = FString::Printf(TEXT(Format), ##__VA_ARGS__); \
62-
if (Msg == "") \
63-
{ \
64-
TCHAR StdMsg[MAX_SPRINTF] = TEXT(""); \
65-
FCString::Sprintf(StdMsg, TEXT("%s%s()"), NETMODE_WORLD, FUNC_NAME); \
66-
GEngine->AddOnScreenDebugMessage(-1, 10000.f, FColor::White, StdMsg); \
67-
} \
68-
else \
69-
{ \
70-
GEngine->AddOnScreenDebugMessage(-1, 10000.f, FColor::White, Msg); \
71-
} \
47+
GEngine->AddOnScreenDebugMessage(-1, 10000.f, FColor::White, Msg); \
7248
}
7349

7450
#endif

0 commit comments

Comments
 (0)