diff --git a/doc/intro.md b/doc/intro.md index fc5597d73..db1949aad 100644 --- a/doc/intro.md +++ b/doc/intro.md @@ -12,7 +12,7 @@ MiraiCP是一个[Mirai](https://github.com/mamoe/mirai) 的C++语言的社区SDK 实现原理： -用kotlin调用java的jni包，再用jni调用c++编写dll动态链接库，实现使用c++语言编写mirai机器人 +用kotlin调用java的jni包，再用jni调用c++编写dll动态链接库，实现使用c++语言编写mirai机器人(下图已过时，不过大体上是这样的) ![项目流程](https://raw.githubusercontent.com/Nambers/MiraiCP/master/doc/pic/流程.svg?raw=true) @@ -26,7 +26,7 @@ mirai-demo: C++SDK c++版 1. 下载release文件(中包含编译好的.jar)或源代码(需自己编译出.jar) -2. c++sdk(mirai-demo)中`procession.cpp`中编辑你想要的功能 +2. c++sdk(mirai-demo)中`procession.cpp`中编辑代码实现你想要的功能 3. 生成dll动态链接库(用x64,release这个配置) 4. 找到生成的.dll文件(通常叫mirai-demo.dll目前不支持改名,除非你改源代码里的名称生成的自定义.jar插件)和.jar文件(如果是release就在根目录，如果源代码要自己生成) 5. 把.dll文件放到mcl(mirai-console-loader)下的data文件夹下的miraiCP里,然后把.jar文件放到plugin文件夹里,如果data下没有没有要先运行一次mcl然后会报错，退出，复制dll进去再运行 diff --git a/mirai-demo/.vs/mirai-demo/v16/.suo b/mirai-demo/.vs/mirai-demo/v16/.suo index 6b3a43bf5..601a8e488 100644 Binary files a/mirai-demo/.vs/mirai-demo/v16/.suo and b/mirai-demo/.vs/mirai-demo/v16/.suo differ diff --git a/mirai-demo/.vs/mirai-demo/v16/Browse.VC.db.REMOVED.git-id b/mirai-demo/.vs/mirai-demo/v16/Browse.VC.db.REMOVED.git-id index 3846a53cf..450ed226b 100644 --- a/mirai-demo/.vs/mirai-demo/v16/Browse.VC.db.REMOVED.git-id +++ b/mirai-demo/.vs/mirai-demo/v16/Browse.VC.db.REMOVED.git-id @@ -1 +1 @@ -eb4bdcffbb4edf2d9af251b2aecbded57f4d14b1 \ No newline at end of file +606927228cb056176d8a2e1a791251ed63c8c4f7 \ No newline at end of file diff --git a/mirai-demo/.vs/mirai-demo/v16/ipch/c06e1943f8bf3a14.ipch.REMOVED.git-id b/mirai-demo/.vs/mirai-demo/v16/ipch/c06e1943f8bf3a14.ipch.REMOVED.git-id index 5e6f33700..3a6b1d33c 100644 --- a/mirai-demo/.vs/mirai-demo/v16/ipch/c06e1943f8bf3a14.ipch.REMOVED.git-id +++ b/mirai-demo/.vs/mirai-demo/v16/ipch/c06e1943f8bf3a14.ipch.REMOVED.git-id @@ -1 +1 @@ -eee644334b70921027d186bd936589a8ff6239b5 \ No newline at end of file +ee62910962d5c8242b1f44d7cda78d9f66f21010 \ No newline at end of file diff --git a/mirai-demo/ClassDiagram.cd b/mirai-demo/ClassDiagram.cd new file mode 100644 index 000000000..7b894197b --- /dev/null +++ b/mirai-demo/ClassDiagram.cd @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/mirai-demo/Procession.cpp b/mirai-demo/Procession.cpp index 9c3f30070..3c08d9f76 100644 --- a/mirai-demo/Procession.cpp +++ b/mirai-demo/Procession.cpp @@ -1,18 +1,42 @@ #include "pch.h" -class procession: public Procession{ - //Ҫλ -public: - void GroupMessage(Group g, Friend f, string message) { - g.SendMsg(message); - logger.Info(message); - } - void PrivateMessage(Friend f, string message) { - f.SendMsg(message); - } - string GroupInvite(Group g, Friend f) { - return accept; - } - string NewFrinedRequest(Friend f, string message) { - return accept; - } -}; \ No newline at end of file +void EventRegister() { + /* + ע¼-ûԶ + logger - ־ + logger.Info(string)Ϣ־ + logger.Warning(string);漶־ + logger.Error(string)ʹ־ + procession 㲥Դ + procession.registerEvent(lambda) ʼ¼ظ + procession.registerEvent([](GroupMessageEvent param){ \**\});ǼȺϢ + procession.registerEvent([](PrivateMessageEvent param){ \**\});ǼȺϢ + ... + paramlambdaʹparam.xxx + */ + + procession.registerEvent([](GroupMessageEvent param)->void { + //дԼȺϢĴ + logger.Info("hi"); + param.group.SendMsg("hi"); + }); + procession.registerEvent([](PrivateMessageEvent param)->void { + //дԼ˽ϢĴ + logger.Info("hi"); + param.sender.SendMsg("hi"); + }); + procession.registerEvent([](GroupInviteEvent param)->bool{ + //Ⱥ룬trueͬȺ,falseͬ + if (param.sender.id == 11111) { + return true; + } + return true; + }); + procession.registerEvent([](NewFriendRequestEvent param)->bool { + //º + logger.Info("º" + to_string(param.sender.id)); + if (param.message == "hhh") { + return false; + } + return true; + }); +} \ No newline at end of file diff --git a/mirai-demo/mirai-demo.vcxproj b/mirai-demo/mirai-demo.vcxproj index 8c642ff34..7e1794221 100644 --- a/mirai-demo/mirai-demo.vcxproj +++ b/mirai-demo/mirai-demo.vcxproj @@ -190,6 +190,7 @@ + diff --git a/mirai-demo/mirai-demo.vcxproj.filters b/mirai-demo/mirai-demo.vcxproj.filters index b42f212a5..62122c996 100644 --- a/mirai-demo/mirai-demo.vcxproj.filters +++ b/mirai-demo/mirai-demo.vcxproj.filters @@ -44,5 +44,6 @@ + \ No newline at end of file diff --git a/mirai-demo/pch.cpp b/mirai-demo/pch.cpp index 3899fe756..55b8812d0 100644 --- a/mirai-demo/pch.cpp +++ b/mirai-demo/pch.cpp @@ -1,7 +1,6 @@ #include "pch.h" -#include "Procession.cpp" Logger logger = Logger(); -procession p = procession(); +Event procession = Event(); /* *正文开始 */ @@ -12,11 +11,16 @@ procession p = procession(); * 返回值:jstring (用str2jstring把string类型转成jsrting) 发送返回的字符串 */ JNIEXPORT jstring JNICALL Java_org_example_mirai_plugin_CPP_1lib_Verify(JNIEnv* env, jobject job) { + //初始化日志模块 logger.init(env); - p.init(logger); + //初始化监听 + EventRegister(); return tools.str2jstring(env, "2333");//验证机制 } +/* +* 消息解析分流 +*/ JNIEXPORT jstring JNICALL Java_org_example_mirai_plugin_CPP_1lib_Event (JNIEnv* env, jobject job, jstring content) { string Rcontent = tools.jstring2str(env, content); @@ -31,24 +35,28 @@ JNIEXPORT jstring JNICALL Java_org_example_mirai_plugin_CPP_1lib_Event logger.Error("JSON reader error"); } switch (root["type"].asInt()) { - /* - 1- groupmessage - 2- privatemessage - */ case 1: //GroupMessage - p.GroupMessage(Group(env,job, root["groupid"].asLargestInt()), - Friend(env, job, root["senderid"].asLargestInt()), root["message"].asCString()); + procession.broadcast(GroupMessageEvent( + Group(env, job, root["groupid"].asLargestInt()), + Friend(env, job, root["senderid"].asLargestInt()), + root["message"].asCString())); return tools.str2jstring(env, "NULL"); case 2: - p.PrivateMessage(Friend(env, job, root["senderid"].asLargestInt()), root["message"].asCString()); + //私聊消息 + procession.broadcast(PrivateMessageEvent( + Friend(env, job, root["senderid"].asLargestInt()), + root["message"].asCString())); return tools.str2jstring(env, "NULL"); case 3: - return tools.str2jstring(env, p.GroupInvite(Group(env, job, root["groupid"].asLargestInt()), - Friend(env, job, root["invitorid"].asLargestInt())).c_str()); - case 4: return tools.str2jstring(env, - p.NewFriendRequest( - Friend(env, job, root["friendid"].asLargestInt()), root["message"].asCString()).c_str()); + //群聊邀请 + return tools.str2jstring(env, procession.broadcast(GroupInviteEvent( + Group(env, job, root["groupid"].asLargestInt()), + Friend(env, job, root["invitorid"].asLargestInt()))).c_str()); + case 4: + return tools.str2jstring(env, "false"); + //return tools.str2jstring(env,p.NewFriendRequest( + //Friend(env, job, root["friendid"].asLargestInt()), root["message"].asCString()).c_str()); } logger.Error("unknown type"); return tools.str2jstring(env, "ERROR"); diff --git a/mirai-demo/pch.h b/mirai-demo/pch.h index a8bd3bd81..7a006711e 100644 --- a/mirai-demo/pch.h +++ b/mirai-demo/pch.h @@ -3,14 +3,16 @@ */ #ifndef PCH_H #define PCH_H - // 添加要在此处预编译的标头 +#include #include "framework.h" +#include +#include #include -#include #include "org_example_mirai_plugin_CPP_lib.h" -#include -#include "tools.h" #include +#include +#include using namespace std; -#endif //PCH_H +#include "tools.h" +#endif //PCH_H \ No newline at end of file diff --git a/mirai-demo/tools.cpp b/mirai-demo/tools.cpp index ef7f1388e..85db8380e 100644 --- a/mirai-demo/tools.cpp +++ b/mirai-demo/tools.cpp @@ -18,9 +18,9 @@ void Logger::Error(string log) { void Logger::Info(string log) { this->env->CallStaticVoidMethod(this->javaclass, this->sinfo, tools.str2jstring(env, log.c_str())); } -string Friend::GetNick() { +/*string Friend::GetNick() { return tools.jstring2str(this->env, (jstring)this->env->CallStaticObjectMethod(java_first, Send_Msg_id, (jlong)this->id)); -} +}*/ Friend::Friend (JNIEnv* env, jobject job,long id){ this->java_first = env->FindClass("org/example/mirai/plugin/CPP_lib"); this->Send_Msg_id = env->GetStaticMethodID(java_first, "SendPrivateMSG", "(Ljava/lang/String;J)V"); @@ -42,7 +42,7 @@ Group::~Group() { env->DeleteLocalRef(java_first); } - string Tools::jstring2str(JNIEnv* env, jstring jstr) +string Tools::jstring2str(JNIEnv* env, jstring jstr) { char* rtn = NULL; jclass clsstring = env->FindClass("java/lang/String"); @@ -62,8 +62,7 @@ Group::~Group() { free(rtn); return stemp; } - - jstring Tools::str2jstring(JNIEnv* env, const char* pat) +jstring Tools::str2jstring(JNIEnv* env, const char* pat) { //java String strClass jclass strClass = (env)->FindClass("Ljava/lang/String;"); @@ -78,7 +77,7 @@ Group::~Group() { //byteתΪjava String, return (jstring)(env)->NewObject(strClass, ctorID, bytes, encoding); } - string Tools::JLongToString(jlong qqid) { +string Tools::JLongToString(jlong qqid) { auto id = [qqid]() -> string { stringstream stream; stream << qqid; diff --git a/mirai-demo/tools.h b/mirai-demo/tools.h index dbe9693dc..960dcfe02 100644 --- a/mirai-demo/tools.h +++ b/mirai-demo/tools.h @@ -1,7 +1,7 @@ #include "pch.h" -#include -#include -using namespace std; +/* +* ־ +*/ class Logger { private: JNIEnv* env; @@ -16,23 +16,24 @@ class Logger { void Warning(string log); void Error(string log); }; + class Tools { public: - + /* * :jstring2str * :jstringstringת * :env:JNIEnv ,jstr:jstring תı * ֵ:string */ - string jstring2str(JNIEnv* env, jstring jstr); + string jstring2str(JNIEnv* env, jstring jstr); /* * :str2jstring * :stringתjstring * :JNIEnv,const char*(string) * ֵ:jstring */ - jstring str2jstring(JNIEnv* env, const char* pat); + jstring str2jstring(JNIEnv* env, const char* pat); /* * :JLongToString * :jlongתstring @@ -41,26 +42,36 @@ class Tools { */ string JLongToString(jlong qqid); }; + static Tools tools; + +/* +* Ѷ +*/ class Friend { private: jclass java_first; jmethodID Send_Msg_id; - jmethodID Nick_Name_id; + //jmethodID Nick_Name_id; JNIEnv* env; public: long id; Friend(JNIEnv* env, jobject job, long id); + Friend() {}; ~Friend(); - string GetNick(); - string nick; + //string GetNick(); + //string nick; void SendMsg(jstring msg) { this->env->CallStaticVoidMethod(this->java_first, this->Send_Msg_id, msg, (jlong)this->id); } - void SendMsg(string msg) { + void SendMsg(string msg) { this->env->CallStaticVoidMethod(this->java_first, this->Send_Msg_id, tools.str2jstring(this->env, msg.c_str()), (jlong)this->id); } }; + +/* +* qqȺĶ +*/ class Group { private: jclass java_first; @@ -69,7 +80,8 @@ class Group { public: long id; ~Group(); - Group(JNIEnv* env,jobject job,long id); + Group(JNIEnv* env, jobject job, long id); + Group() {}; void SendMsg(jstring msg) { this->env->CallStaticVoidMethod(java_first, Send_Msg_id, msg, (jlong)this->id); } @@ -77,27 +89,129 @@ class Group { SendMsg(tools.str2jstring(this->env, msg.c_str())); } }; -class Procession { - //ΪĿǰܵĽӿ + +class GroupMessageEvent { public: - //־ - Logger logger; - //ʼ־ - void init(Logger logger) { - this->logger = logger; - } - //ֵܵGroupInvite֣Ӧkotlinеaccept() - const string accept = "true"; - //ֵܾ - const string reject = "false"; - //ȺϢ - virtual void GroupMessage(Group, Friend, string) = 0; - //˽Ϣ - virtual void PrivateMessage(Friend, string) = 0; - //Ⱥ - virtual string GroupInvite(Group, Friend) { return "true"; }; - //º - virtual string NewFriendRequest(Friend, string) { return "true"; }; - JNIEnv* env; - jobject job; -}; \ No newline at end of file + //ԴȺ + Group group; + // + Friend sender; + //Ϣ + string message; + GroupMessageEvent(Group g, Friend f, string s) { + this->group = g; + this->sender = f; + this->message = s; + } +}; + +class PrivateMessageEvent { +public: + // + Friend sender; + //Ϣ + string message; + PrivateMessageEvent(Friend f, string s) { + this->sender = f; + this->message = s; + } +}; + +class GroupInviteEvent { +public: + // + Friend sender; + // + Group group; + GroupInviteEvent(Group g, Friend f) { + this->sender = f; + this->group = g; + } +}; + +class NewFriendRequestEvent { +public: + // + Friend sender; + //Ϣ + string message; + NewFriendRequestEvent(Friend f, string s) { + this->sender = f; + this->message = s; + } +}; + +/* +* ¼ +*/ +class Event { +private: + typedef std::function GME; + typedef std::function PME; + typedef std::function GI; + typedef std::function NFRE; + vector GMEa; + vector PMEa; + // ĴΨһ + NFRE NFREf = NFRE(); + GI GIf = GI(); +public: + /* + * 㲥 + */ + + void broadcast(GroupMessageEvent g) { + //Ϊ0δעᣬ + if (GMEa.size() <= 0) { + return; + } + for (int i = 0; i < GMEa.size(); i++) { + this->GMEa[i](g); + } + } + void broadcast(PrivateMessageEvent p) { + //Ϊ0δעᣬ + if (PMEa.size()<= 0) { + return; + } + for (int i = 0; i < PMEa.size(); i++) { + this->PMEa[i](p); + } + } + string broadcast(GroupInviteEvent g) { + if (GIf == NULL) { + //ĬԶܾ + return "false"; + } + return (this->GIf(g) ? "true" : "false"); + } + + string broadcast(NewFriendRequestEvent g) { + if (GIf == NULL) { + //ĬԶܾ + return "false"; + } + return (this->NFREf(g) ? "true" : "false"); + } + + /* + * + */ + + void registerEvent(GME f) { + GMEa.push_back(move(f)); + } + void registerEvent(PME f) { + PMEa.push_back(move(f)); + } + void registerEvent(GI f) { + this->GIf = std::move(f); + } + void registerEvent(NFRE f) { + this->NFREf = std::move(f); + } +}; +void EventRegister(); +extern Event procession; +extern Logger logger; + diff --git a/mirai-demo/x64/Release/Procession.obj b/mirai-demo/x64/Release/Procession.obj index b6dfa1085..ae08630b3 100644 Binary files a/mirai-demo/x64/Release/Procession.obj and b/mirai-demo/x64/Release/Procession.obj differ diff --git a/mirai-demo/x64/Release/dllmain.obj b/mirai-demo/x64/Release/dllmain.obj index 525fd702a..3fc0cd4c9 100644 Binary files a/mirai-demo/x64/Release/dllmain.obj and b/mirai-demo/x64/Release/dllmain.obj differ diff --git a/mirai-demo/x64/Release/jsoncpp.obj.REMOVED.git-id b/mirai-demo/x64/Release/jsoncpp.obj.REMOVED.git-id index 976026d4b..fa0b7b331 100644 --- a/mirai-demo/x64/Release/jsoncpp.obj.REMOVED.git-id +++ b/mirai-demo/x64/Release/jsoncpp.obj.REMOVED.git-id @@ -1 +1 @@ -64736d6571cac348c549b9df77715c2f24522219 \ No newline at end of file +a72fdab2ee0d57ef80cf5653ff19df1bc5e02e90 \ No newline at end of file diff --git a/mirai-demo/x64/Release/mirai-demo.Build.CppClean.log b/mirai-demo/x64/Release/mirai-demo.Build.CppClean.log new file mode 100644 index 000000000..a4cfb7d78 --- /dev/null +++ b/mirai-demo/x64/Release/mirai-demo.Build.CppClean.log @@ -0,0 +1,2 @@ +d:\git\miraicp\mirai-demo\x64\release\vc142.pdb +d:\git\miraicp\mirai-demo\x64\release\mirai-demo.tlog\cl.command.1.tlog diff --git a/mirai-demo/x64/Release/mirai-demo.dll b/mirai-demo/x64/Release/mirai-demo.dll index 50a3d5de8..9ea71bd15 100644 Binary files a/mirai-demo/x64/Release/mirai-demo.dll and b/mirai-demo/x64/Release/mirai-demo.dll differ diff --git a/mirai-demo/x64/Release/mirai-demo.dll.recipe b/mirai-demo/x64/Release/mirai-demo.dll.recipe index 6d6f75fd8..caac2abb1 100644 --- a/mirai-demo/x64/Release/mirai-demo.dll.recipe +++ b/mirai-demo/x64/Release/mirai-demo.dll.recipe @@ -1,7 +1,11 @@  - D:\Git\MiraiCP\mirai-demo\x64\Release\mirai-demo.dll - - - + + + D:\Git\MiraiCP\mirai-demo\x64\Release\mirai-demo.dll + + + + + \ No newline at end of file diff --git a/mirai-demo/x64/Release/mirai-demo.exp b/mirai-demo/x64/Release/mirai-demo.exp index a9a77413a..f40677230 100644 Binary files a/mirai-demo/x64/Release/mirai-demo.exp and b/mirai-demo/x64/Release/mirai-demo.exp differ diff --git a/mirai-demo/x64/Release/mirai-demo.iobj.REMOVED.git-id b/mirai-demo/x64/Release/mirai-demo.iobj.REMOVED.git-id index 6795704a8..dd45c0fcc 100644 --- a/mirai-demo/x64/Release/mirai-demo.iobj.REMOVED.git-id +++ b/mirai-demo/x64/Release/mirai-demo.iobj.REMOVED.git-id @@ -1 +1 @@ -f8e7e7ba11f16dedb83d73a037a3b0344188955d \ No newline at end of file +3b88714deafefa1c30433e733811f27bc400471a \ No newline at end of file diff --git a/mirai-demo/x64/Release/mirai-demo.ipdb.REMOVED.git-id b/mirai-demo/x64/Release/mirai-demo.ipdb.REMOVED.git-id index ca73b1539..df614168e 100644 --- a/mirai-demo/x64/Release/mirai-demo.ipdb.REMOVED.git-id +++ b/mirai-demo/x64/Release/mirai-demo.ipdb.REMOVED.git-id @@ -1 +1 @@ -85f994ea6a54beeea42905a3915b838057070d50 \ No newline at end of file +5337f41f0ea13ad767b3c4a2d0e3d6943b3a2000 \ No newline at end of file diff --git a/mirai-demo/x64/Release/mirai-demo.lib b/mirai-demo/x64/Release/mirai-demo.lib index 0df4486d2..7421e9efb 100644 Binary files a/mirai-demo/x64/Release/mirai-demo.lib and b/mirai-demo/x64/Release/mirai-demo.lib differ diff --git a/mirai-demo/x64/Release/mirai-demo.log b/mirai-demo/x64/Release/mirai-demo.log index fd3f940a7..1fbf104d6 100644 --- a/mirai-demo/x64/Release/mirai-demo.log +++ b/mirai-demo/x64/Release/mirai-demo.log @@ -1,20 +1,19 @@  pch.cpp -D:\Git\MiraiCP\mirai-demo\pch.cpp(40,67): warning C4244: “参数”: 从“Json::Value::LargestInt”转换到“long”，可能丢失数据 -D:\Git\MiraiCP\mirai-demo\pch.cpp(41,59): warning C4244: “参数”: 从“Json::Value::LargestInt”转换到“long”，可能丢失数据 -D:\Git\MiraiCP\mirai-demo\pch.cpp(44,72): warning C4244: “参数”: 从“Json::Value::LargestInt”转换到“long”，可能丢失数据 -D:\Git\MiraiCP\mirai-demo\pch.cpp(47,97): warning C4244: “参数”: 从“Json::Value::LargestInt”转换到“long”，可能丢失数据 -D:\Git\MiraiCP\mirai-demo\pch.cpp(48,60): warning C4244: “参数”: 从“Json::Value::LargestInt”转换到“long”，可能丢失数据 -D:\Git\MiraiCP\mirai-demo\pch.cpp(51,59): warning C4244: “参数”: 从“Json::Value::LargestInt”转换到“long”，可能丢失数据 +D:\Git\MiraiCP\mirai-demo\pch.cpp(41,57): warning C4244: “参数”: 从“Json::Value::LargestInt”转换到“long”，可能丢失数据 +D:\Git\MiraiCP\mirai-demo\pch.cpp(42,59): warning C4244: “参数”: 从“Json::Value::LargestInt”转换到“long”，可能丢失数据 +D:\Git\MiraiCP\mirai-demo\pch.cpp(48,59): warning C4244: “参数”: 从“Json::Value::LargestInt”转换到“long”，可能丢失数据 +D:\Git\MiraiCP\mirai-demo\pch.cpp(54,57): warning C4244: “参数”: 从“Json::Value::LargestInt”转换到“long”，可能丢失数据 +D:\Git\MiraiCP\mirai-demo\pch.cpp(55,60): warning C4244: “参数”: 从“Json::Value::LargestInt”转换到“long”，可能丢失数据 Procession.cpp dllmain.cpp jsoncpp.cpp tools.cpp -D:\Git\MiraiCP\mirai-demo\tools.cpp(73,59): warning C4267: “参数”: 从“size_t”转换到“jsize”，可能丢失数据 -D:\Git\MiraiCP\mirai-demo\tools.cpp(75,69): warning C4267: “参数”: 从“size_t”转换到“jsize”，可能丢失数据 +D:\Git\MiraiCP\mirai-demo\tools.cpp(72,59): warning C4267: “参数”: 从“size_t”转换到“jsize”，可能丢失数据 +D:\Git\MiraiCP\mirai-demo\tools.cpp(74,69): warning C4267: “参数”: 从“size_t”转换到“jsize”，可能丢失数据 正在创建库 D:\Git\MiraiCP\mirai-demo\x64\Release\mirai-demo.lib 和对象 D:\Git\MiraiCP\mirai-demo\x64\Release\mirai-demo.exp 正在生成代码 - 18 of 887 functions ( 2.0%) were compiled, the rest were copied from previous compilation. - 1 functions were new in current compilation - 4 functions had inline decision re-evaluated but remain unchanged + 109 of 1118 functions ( 9.7%) were compiled, the rest were copied from previous compilation. + 60 functions were new in current compilation + 102 functions had inline decision re-evaluated but remain unchanged 已完成代码的生成 mirai-demo.vcxproj -> D:\Git\MiraiCP\mirai-demo\x64\Release\mirai-demo.dll diff --git a/mirai-demo/x64/Release/mirai-demo.pch.REMOVED.git-id b/mirai-demo/x64/Release/mirai-demo.pch.REMOVED.git-id index 59e64887d..853fb7a08 100644 --- a/mirai-demo/x64/Release/mirai-demo.pch.REMOVED.git-id +++ b/mirai-demo/x64/Release/mirai-demo.pch.REMOVED.git-id @@ -1 +1 @@ -1bfd2e5ca15f985ede99def77c54816934b569e5 \ No newline at end of file +a592603c385cc49c82efa5e1a6bc335d1640f666 \ No newline at end of file diff --git a/mirai-demo/x64/Release/mirai-demo.pdb.REMOVED.git-id b/mirai-demo/x64/Release/mirai-demo.pdb.REMOVED.git-id index d07d5205c..d080fd5b7 100644 --- a/mirai-demo/x64/Release/mirai-demo.pdb.REMOVED.git-id +++ b/mirai-demo/x64/Release/mirai-demo.pdb.REMOVED.git-id @@ -1 +1 @@ -3c198612b804e21f1708607a7e6d2148b940e94e \ No newline at end of file +c4227bf4e39feee4ee781179a529c8d7e865d361 \ No newline at end of file diff --git a/mirai-demo/x64/Release/mirai-demo.tlog/CL.read.1.tlog b/mirai-demo/x64/Release/mirai-demo.tlog/CL.read.1.tlog index d2d2f9d59..4eed865a9 100644 Binary files a/mirai-demo/x64/Release/mirai-demo.tlog/CL.read.1.tlog and b/mirai-demo/x64/Release/mirai-demo.tlog/CL.read.1.tlog differ diff --git a/mirai-demo/x64/Release/mirai-demo.tlog/CL.write.1.tlog b/mirai-demo/x64/Release/mirai-demo.tlog/CL.write.1.tlog index dcfa8946e..3e96a49b2 100644 Binary files a/mirai-demo/x64/Release/mirai-demo.tlog/CL.write.1.tlog and b/mirai-demo/x64/Release/mirai-demo.tlog/CL.write.1.tlog differ diff --git a/mirai-demo/x64/Release/mirai-demo.tlog/link.delete.1.tlog b/mirai-demo/x64/Release/mirai-demo.tlog/link.delete.1.tlog deleted file mode 100644 index dd282091d..000000000 Binary files a/mirai-demo/x64/Release/mirai-demo.tlog/link.delete.1.tlog and /dev/null differ diff --git a/mirai-demo/x64/Release/mirai-demo.tlog/link.read.1.tlog b/mirai-demo/x64/Release/mirai-demo.tlog/link.read.1.tlog index d5b15c2ee..473b1434f 100644 Binary files a/mirai-demo/x64/Release/mirai-demo.tlog/link.read.1.tlog and b/mirai-demo/x64/Release/mirai-demo.tlog/link.read.1.tlog differ diff --git a/mirai-demo/x64/Release/mirai-demo.tlog/mirai-demo.lastbuildstate b/mirai-demo/x64/Release/mirai-demo.tlog/mirai-demo.lastbuildstate index e5114fb13..0ace5bb42 100644 --- a/mirai-demo/x64/Release/mirai-demo.tlog/mirai-demo.lastbuildstate +++ b/mirai-demo/x64/Release/mirai-demo.tlog/mirai-demo.lastbuildstate @@ -1,2 +1,2 @@ -PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.27.29110:TargetPlatformVersion=10.0.18362.0: +PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.28.29333:TargetPlatformVersion=10.0.18362.0: Release|x64|D:\Git\MiraiCP\mirai-demo\| diff --git a/mirai-demo/x64/Release/mirai-demo.tlog/mirai-demo.write.1u.tlog b/mirai-demo/x64/Release/mirai-demo.tlog/mirai-demo.write.1u.tlog index 3add65342..e342ee071 100644 Binary files a/mirai-demo/x64/Release/mirai-demo.tlog/mirai-demo.write.1u.tlog and b/mirai-demo/x64/Release/mirai-demo.tlog/mirai-demo.write.1u.tlog differ diff --git a/mirai-demo/x64/Release/pch.obj.REMOVED.git-id b/mirai-demo/x64/Release/pch.obj.REMOVED.git-id index 938e7b2ec..0bb3993cc 100644 --- a/mirai-demo/x64/Release/pch.obj.REMOVED.git-id +++ b/mirai-demo/x64/Release/pch.obj.REMOVED.git-id @@ -1 +1 @@ -d754eb3047d413da9a2ebdebccaf9e83486f9e0b \ No newline at end of file +962ed4e2f7edcb572685e7198111d595dce37e12 \ No newline at end of file diff --git a/mirai-demo/x64/Release/tools.obj b/mirai-demo/x64/Release/tools.obj index 90176bf95..57a1a9f70 100644 Binary files a/mirai-demo/x64/Release/tools.obj and b/mirai-demo/x64/Release/tools.obj differ diff --git a/mirai-demo/x64/Release/vc142.pdb.REMOVED.git-id b/mirai-demo/x64/Release/vc142.pdb.REMOVED.git-id index e37848fe2..7fc1dec5a 100644 --- a/mirai-demo/x64/Release/vc142.pdb.REMOVED.git-id +++ b/mirai-demo/x64/Release/vc142.pdb.REMOVED.git-id @@ -1 +1 @@ -d155844280c9f80b2ef771030be9a2c5d8eb260e \ No newline at end of file +dd265ee16d2cf3068d56eef37c9864470f7b7494 \ No newline at end of file