Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New app #1

Open
wants to merge 56 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
3b5e42f
优化洗牌、出牌算法,优化开始指令逻辑
Future-R Aug 29, 2019
88a5409
修复各种BUG
Future-R Sep 10, 2019
ddc011d
排序指令
Future-R Sep 10, 2019
ec4a1d0
调整了一些比较底层的东西
Future-R Sep 13, 2019
cb24d74
这个怎么提交不了?
Future-R Sep 13, 2019
a993342
加了避免解释的新特性
Future-R Sep 13, 2019
545f56d
为啥你老提交不了
Future-R Sep 13, 2019
827a574
修复计算BUG
Future-R Sep 13, 2019
45781e8
修复如果指令在群聊无法发送的BUG
Future-R Sep 14, 2019
500c94c
增加屏蔽回显的特性;
Future-R Sep 21, 2019
53f4a7e
变量指令现在可以获取到角色属性;
Future-R Sep 21, 2019
4d801ba
每次都卡你?
Future-R Sep 21, 2019
ad15981
修改查看机制
Future-R Sep 21, 2019
6e21f59
修复计算BUG
Future-R Sep 13, 2019
60cb6e4
Revert "修复计算BUG"
Future-R Sep 21, 2019
848b6dc
Revert "修改查看机制"
Future-R Sep 21, 2019
462b20d
修改查看机制
Future-R Sep 21, 2019
1c21a46
原来是酷Q的feature,不是我的BUG。换了个思路解决了
Future-R Sep 21, 2019
424faec
又是你?
Future-R Sep 21, 2019
7f98cac
暂时先推个测试版
Future-R Sep 21, 2019
dda3047
消息处理完毕后截断消息;
Future-R Sep 21, 2019
fc491cb
日志补丁
Future-R Sep 21, 2019
79a4965
修复复合指令中持续屏蔽的逻辑BUG
Future-R Sep 21, 2019
280c452
临时版本1.1.3
Future-R Oct 13, 2019
4886f35
这个为啥总是传不上去???
Future-R Oct 13, 2019
b6d7b7a
临时push
Future-R Oct 23, 2019
571c940
push
Future-R Oct 23, 2019
ba87367
push
Future-R Oct 23, 2019
ecf87c7
push
Future-R Oct 23, 2019
5906fe1
push
Future-R Oct 23, 2019
e1a25d2
1.2.0先行正式版
Future-R Nov 2, 2019
389a8fa
1.2.0帮助文档
Future-R Nov 2, 2019
914bcb3
没有更新
Future-R Feb 2, 2020
784dcb5
基本完成了实体和组件的结构、实体组件的增删查改、基本运算功能。
Future-R Feb 5, 2020
d638404
实现了判别式、有限循环、变量解释
Future-R Feb 14, 2020
f25f0e8
字符串处理、动态解释变量
Future-R Feb 15, 2020
7384a0c
更新了好多小功能
Future-R Feb 18, 2020
c439b36
实现了方法、静态集合、模糊匹配
Future-R Feb 21, 2020
d2bfaac
修了一个函数死循环bug
Future-R Feb 24, 2020
cb201c2
V0.1.0:简单的转义、群开关、骰子、人物作成
Future-R Mar 2, 2020
7d099bb
小调整
Future-R Mar 2, 2020
b1c1c4e
实现讨论组接口、URL自动转码、各种优化、开发模式雏形
Future-R Mar 7, 2020
8a8041d
修复计算的括号BUG
Future-R Mar 7, 2020
a45bc19
DND3r全扩法术
Future-R Mar 8, 2020
c84a68c
V0.1最后一个版本
Future-R Mar 9, 2020
1eb3930
更新极大骰池
Future-R Mar 15, 2020
1367147
实现了读写阻塞、实现了数据库查询、新增各种集合方法、优化了RD兼容、设置了http和正则超时(数据库是不是也要设置一下……)
Future-R Mar 26, 2020
4348800
新增批量赋值功能、新增批量替换功能、强化正则功能、优化了部分语句中“我我”的重定向、优化不规范计算符号的兼容、计算结果现在直接打印、取余符…
Future-R Mar 29, 2020
3549816
新增二维数组框架、新增生命游戏、不再依赖本地的反义词典并开放用户编辑、新增逐字方法、修复一个被截断后仍能输出的bug
Future-R Apr 5, 2020
63d3e94
V0.2.0
Future-R Apr 24, 2020
6ed1272
人物卡设置、ra、矩阵基础、emoji转义、开发者模式优化、帮助公屏、修复判别式中使用执行导致语句集丢失BUG、“XX和YY一样”语句现在…
Future-R May 1, 2020
a72d016
0.2.3新增保存读取、分词、逐n字;修复销毁“我”无法正确引用QQ号的bug、修复汉字转阿拉伯数字必定带括号而无法被int.parse的bug
Future-R May 21, 2020
cd1db08
暂存
Future-R Jun 26, 2020
dc34d10
暂存
Future-R Sep 14, 2020
096e2cd
style: 不必要的转类型
Future-R Jun 21, 2021
0076258
restore: 适配Mirai
Future-R Apr 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Native.Csharp/App.config
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.18.3, Culture=neutral, PublicKeyToken=89b483f429c47342" />
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
</configSections>
<entityFramework>
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
Expand All @@ -12,14 +12,12 @@
</parameters>
</defaultConnectionFactory>
<providers>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
<provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"></provider>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
</providers>
</entityFramework>
<system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" />
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
<remove invariant="Oracle.ManagedDataAccess.Client" />
<add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.18.3, Culture=neutral, PublicKeyToken=89b483f429c47342" />
</DbProviderFactories>
Expand Down Expand Up @@ -47,4 +45,7 @@
<connectionStrings>
<add name="MyEntity" connectionString="data source=(LocalDb)\MSSQLLocalDB;initial catalog=Native.Csharp.App.Entity.MyEntity;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
</connectionStrings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>
</configuration>
266 changes: 4 additions & 262 deletions Native.Csharp/App/Core/LibExport.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ private static string AppInfo ()
{
// ���������޸�
//
Common.AppName = "��Q����Ӧ�� for C#";
Common.AppVersion = Version.Parse ("1.0.0");
Common.AppName = "���������μ�";
Common.AppVersion = Version.Parse ("0.1.3");

//
// ��ǰ��Ŀ����: com.lovedream.top
// ��ǰ��Ŀ����: com.frm.top
// Api�汾: 9

return string.Format ("{0},{1}", 9, "com.lovedream.top");
return string.Format ("{0},{1}", 9, "com.frm.top");
}

/// <summary>
Expand Down Expand Up @@ -152,85 +152,6 @@ private static void ResolveAppbackcall ()
ReceiveDiscussMessage_3 = Common.UnityContainer.Resolve<IReceiveDiscussMessage> ("��������Ϣ����").ReceiveDiscussMessage;
}

/*
* Id: 4
* Name: Ⱥ�ļ��ϴ��¼�����
*/
if (Common.UnityContainer.IsRegistered<IReceiveGroupFileUpload> ("Ⱥ�ļ��ϴ��¼�����") == true)
{
ReceiveFileUploadMessage_4 = Common.UnityContainer.Resolve<IReceiveGroupFileUpload> ("Ⱥ�ļ��ϴ��¼�����").ReceiveGroupFileUpload;
}

/*
* Id: 5
* Name: Ⱥ�����䶯�¼�����
*/
if (Common.UnityContainer.IsRegistered<IReceiveGroupManageIncrease> ("Ⱥ�����䶯�¼�����") == true)
{
ReceiveManageIncrease_5 = Common.UnityContainer.Resolve<IReceiveGroupManageIncrease> ("Ⱥ�����䶯�¼�����").ReceiveGroupManageIncrease;
}
if (Common.UnityContainer.IsRegistered<IReceiveGroupManageDecrease> ("Ⱥ�����䶯�¼�����") == true)
{
ReceiveManageDecrease_5 = Common.UnityContainer.Resolve<IReceiveGroupManageDecrease> ("Ⱥ�����䶯�¼�����").ReceiveGroupManageDecrease;
}

/*
* Id: 6
* Name: Ⱥ��Ա�����¼�����
*/
if (Common.UnityContainer.IsRegistered<IReceiveGroupMemberLeave> ("Ⱥ��Ա�����¼�����") == true)
{
ReceiveMemberLeave_6 = Common.UnityContainer.Resolve<IReceiveGroupMemberLeave> ("Ⱥ��Ա�����¼�����").ReceiveGroupMemberLeave;
}
if (Common.UnityContainer.IsRegistered<IReceiveGroupMemberRemove> ("Ⱥ��Ա�����¼�����") == true)
{
ReceiveMemberRemove_6 = Common.UnityContainer.Resolve<IReceiveGroupMemberRemove> ("Ⱥ��Ա�����¼�����").ReceiveGroupMemberRemove;
}

/*
* Id: 7
* Name: Ⱥ��Ա�����¼�����
*/
if (Common.UnityContainer.IsRegistered<IReceiveGroupMemberPass> ("Ⱥ��Ա�����¼�����") == true)
{
ReceiveMemberPass_7 = Common.UnityContainer.Resolve<IReceiveGroupMemberPass> ("Ⱥ��Ա�����¼�����").ReceiveGroupMemberPass;
}
if (Common.UnityContainer.IsRegistered<IReceiveGroupMemberBeInvitee> ("Ⱥ��Ա�����¼�����") == true)
{
ReceiveMemberBeInvitee_7 = Common.UnityContainer.Resolve<IReceiveGroupMemberBeInvitee> ("Ⱥ��Ա�����¼�����").ReceiveGroupMemberBeInvitee;
}

/*
* Id: 10
* Name: �����������¼�����
*/
if (Common.UnityContainer.IsRegistered<IReceiveFriendIncrease> ("�����������¼�����") == true)
{
ReceiveFriendIncrease_10 = Common.UnityContainer.Resolve<IReceiveFriendIncrease> ("�����������¼�����").ReceiveFriendIncrease;
}

/*
* Id: 8
* Name: ��������������
*/
if (Common.UnityContainer.IsRegistered<IReceiveFriendAddRequest> ("��������������") == true)
{
ReceiveFriendAdd_8 = Common.UnityContainer.Resolve<IReceiveFriendAddRequest> ("��������������").ReceiveFriendAddRequest;
}

/*
* Id: 9
* Name: Ⱥ����������
*/
if (Common.UnityContainer.IsRegistered<IReceiveAddGroupRequest> ("Ⱥ����������") == true)
{
ReceiveAddGroupRequest_9 = Common.UnityContainer.Resolve<IReceiveAddGroupRequest> ("Ⱥ����������").ReceiveAddGroupRequest;
}
if (Common.UnityContainer.IsRegistered<IReceiveAddGroupBeInvitee> ("Ⱥ����������") == true)
{
ReceiveAddGroupBeInvitee_9 = Common.UnityContainer.Resolve<IReceiveAddGroupBeInvitee> ("Ⱥ����������").ReceiveAddGroupBeInvitee;
}

/*
* Id: 1001
* Name: ��Q�����¼�
Expand Down Expand Up @@ -368,185 +289,6 @@ private static int Evnet__eventDiscussMsg (int subType, int msgId, long fromDisc
return Convert.ToInt32 (args.Handler);
}

/*
* Id: 4
* Type: 11
* Name: Ⱥ�ļ��ϴ��¼�����
* Function: _eventGroupUpload
*/
public static event EventHandler<CqGroupFileUploadEventArgs> ReceiveFileUploadMessage_4;
[DllExport (ExportName = "_eventGroupUpload", CallingConvention = CallingConvention.StdCall)]
private static int Evnet__eventGroupUpload (int subType, int sendTime, long fromGroup, long fromQQ, string file)
{
CqGroupFileUploadEventArgs args = new CqGroupFileUploadEventArgs (4, sendTime.ToDateTime (), fromGroup, fromQQ, Common.CqApi.GetFile (file));
if (subType == 1)
{
if (ReceiveFileUploadMessage_4 != null)
{
ReceiveFileUploadMessage_4 (null, args);
}
}
return Convert.ToInt32 (args.Handler);
}

/*
* Id: 5
* Type: 101
* Name: Ⱥ�����䶯�¼�����
* Function: _eventSystem_GroupAdmin
*/
public static event EventHandler<CqGroupManageChangeEventArgs> ReceiveManageIncrease_5;
public static event EventHandler<CqGroupManageChangeEventArgs> ReceiveManageDecrease_5;
[DllExport (ExportName = "_eventSystem_GroupAdmin", CallingConvention = CallingConvention.StdCall)]
private static int Evnet__eventSystem_GroupAdmin (int subType, int sendTime, long fromGroup, long beingOperateQQ)
{
CqGroupManageChangeEventArgs args = new CqGroupManageChangeEventArgs (5, sendTime.ToDateTime (), fromGroup, beingOperateQQ);
if (subType == 1)
{
if (ReceiveManageDecrease_5 != null)
{
ReceiveManageDecrease_5 (null, args);
}
}
else if (subType == 2)
{
if (ReceiveManageIncrease_5 != null)
{
ReceiveManageIncrease_5 (null, args);
}
}
return Convert.ToInt32 (args.Handler);
}

/*
* Id: 6
* Type: 102
* Name: Ⱥ��Ա�����¼�����
* Function: _eventSystem_GroupMemberDecrease
*/
public static event EventHandler<CqGroupMemberDecreaseEventArgs> ReceiveMemberLeave_6;
public static event EventHandler<CqGroupMemberDecreaseEventArgs> ReceiveMemberRemove_6;
[DllExport (ExportName = "_eventSystem_GroupMemberDecrease", CallingConvention = CallingConvention.StdCall)]
private static int Evnet__eventSystem_GroupMemberDecrease (int subType, int sendTime, long fromGroup, long fromQQ, long beingOperateQQ)
{
CqGroupMemberDecreaseEventArgs args = new CqGroupMemberDecreaseEventArgs (6, sendTime.ToDateTime (), fromGroup, fromQQ, beingOperateQQ);
if (subType == 1)
{
if (ReceiveMemberLeave_6 != null)
{
ReceiveMemberLeave_6 (null, args);
}
}
else if (subType == 2)
{
if (ReceiveMemberRemove_6 != null)
{
ReceiveMemberRemove_6 (null, args);
}
}
return Convert.ToInt32 (args.Handler);
}

/*
* Id: 7
* Type: 103
* Name: Ⱥ��Ա�����¼�����
* Function: _eventSystem_GroupMemberIncrease
*/
public static event EventHandler<CqGroupMemberIncreaseEventArgs> ReceiveMemberPass_7;
public static event EventHandler<CqGroupMemberIncreaseEventArgs> ReceiveMemberBeInvitee_7;
[DllExport (ExportName = "_eventSystem_GroupMemberIncrease", CallingConvention = CallingConvention.StdCall)]
private static int Evnet__eventSystem_GroupMemberIncrease (int subType, int sendTime, long fromGroup, long fromQQ, long beingOperateQQ)
{
CqGroupMemberIncreaseEventArgs args = new CqGroupMemberIncreaseEventArgs (7, sendTime.ToDateTime (), fromGroup, fromQQ, beingOperateQQ);
if (subType == 1)
{
if (ReceiveMemberPass_7 != null)
{
ReceiveMemberPass_7 (null, args);
}
}
else if (subType == 2)
{
if (ReceiveMemberBeInvitee_7 != null)
{
ReceiveMemberBeInvitee_7 (null, args);
}
}
return Convert.ToInt32 (args.Handler);
}

/*
* Id: 10
* Type: 201
* Name: �����������¼�����
* Function: _eventFriend_Add
*/
public static event EventHandler<CqFriendIncreaseEventArgs> ReceiveFriendIncrease_10;
[DllExport (ExportName = "_eventFriend_Add", CallingConvention = CallingConvention.StdCall)]
private static int Evnet__eventFriend_Add (int subType, int sendTime, long fromQQ)
{
CqFriendIncreaseEventArgs args = new CqFriendIncreaseEventArgs (10, sendTime.ToDateTime (), fromQQ);
if (subType == 1)
{
if (ReceiveFriendIncrease_10 != null)
{
ReceiveFriendIncrease_10 (null, args);
}
}
return Convert.ToInt32 (args.Handler);
}

/*
* Id: 8
* Type: 301
* Name: ��������������
* Function: _eventRequest_AddFriend
*/
public static event EventHandler<CqAddFriendRequestEventArgs> ReceiveFriendAdd_8;
[DllExport (ExportName = "_eventRequest_AddFriend", CallingConvention = CallingConvention.StdCall)]
private static int Evnet__eventRequest_AddFriend (int subType, int sendTime, long fromQQ, IntPtr msg, string responseFlag)
{
CqAddFriendRequestEventArgs args = new CqAddFriendRequestEventArgs (8, sendTime.ToDateTime (), fromQQ, msg.ToString (_defaultEncoding), responseFlag);
if (subType == 1)
{
if (ReceiveFriendAdd_8 != null)
{
ReceiveFriendAdd_8 (null, args);
}
}
return Convert.ToInt32 (args.Handler);
}

/*
* Id: 9
* Type: 302
* Name: Ⱥ����������
* Function: _eventRequest_AddGroup
*/
public static event EventHandler<CqAddGroupRequestEventArgs> ReceiveAddGroupRequest_9;
public static event EventHandler<CqAddGroupRequestEventArgs> ReceiveAddGroupBeInvitee_9;
[DllExport (ExportName = "_eventRequest_AddGroup", CallingConvention = CallingConvention.StdCall)]
private static int Evnet__eventRequest_AddGroup (int subType, int sendTime, long fromGroup, long fromQQ, IntPtr msg, string responseFlag)
{
CqAddGroupRequestEventArgs args = new CqAddGroupRequestEventArgs (9, sendTime.ToDateTime (), fromGroup, fromQQ, msg.ToString (_defaultEncoding), responseFlag);
if (subType == 1)
{
if (ReceiveAddGroupRequest_9 != null)
{
ReceiveAddGroupRequest_9 (null, args);
}
}
else if (subType == 2)
{
if (ReceiveAddGroupBeInvitee_9 != null)
{
ReceiveAddGroupBeInvitee_9 (null, args);
}
}
return Convert.ToInt32 (args.Handler);
}

/*
* Id: 1001
* Type: 1001
Expand Down
26 changes: 0 additions & 26 deletions Native.Csharp/App/Core/MenuExport.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,36 +31,10 @@ static MenuExport ()
/// </summary>
private static void ResolveAppbackcall ()
{
/*
* Name: �򿪿���̨
* Function: _eventOpenConsole
*/
if (Common.UnityContainer.IsRegistered<ICallMenu> ("�򿪿���̨") == true)
{
Menu__eventOpenConsole = Common.UnityContainer.Resolve<ICallMenu> ("�򿪿���̨").CallMenu;
}


}
#endregion

#region --��������--
/*
* Name: �򿪿���̨
* Function: _eventOpenConsole
*/
public static event EventHandler<CqCallMenuEventArgs> Menu__eventOpenConsole;
[DllExport (ExportName = "_eventOpenConsole", CallingConvention = CallingConvention.StdCall)]
private static int Evnet__eventOpenConsole ()
{
if (Menu__eventOpenConsole != null)
{
Menu__eventOpenConsole (null, new CqCallMenuEventArgs ("�򿪿���̨"));
}
return 0;
}


#endregion
}
}
Expand Down
18 changes: 7 additions & 11 deletions Native.Csharp/App/Event/Event_AppMain.cs
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.ExceptionServices;
using System.Text;
using Unity;
using Native.Csharp.App.Event.Event_Me;
using Native.Csharp.App.Interface;
using Native.Csharp.App.EventArgs;
using Native.Csharp.Sdk.Cqp;
using Native.Csharp.App.Event.Event_Me;
using Unity;

namespace Native.Csharp.App.Event
{
public static class Event_AppMain
public static class Event_AppMain
{
/// <summary>
/// 回调注册
Expand Down Expand Up @@ -45,7 +38,10 @@ public static void Registbackcall (IUnityContainer container)
container.RegisterType<IReceiveGroupMessage, Event_ReceiveGroupMessage>("群消息处理");

//注册【群私聊回复】
container.RegisterType<IReceiveGroupPrivateMessage, Event_ReceiveGroupPrivateMessage>("私聊消息处理");
container.RegisterType<IReceiveGroupPrivateMessage, Event_ReceiveFriendMessage>("私聊消息处理");

//注册【讨论组回复】
container.RegisterType<IReceiveDiscussMessage, Event_ReceiveFriendMessage>("讨论组消息处理");

////注册【数据库仓储】
//container.RegisterInstance<IRepository>(new SqlRepository(Config.Config.SQLConnectStr));
Expand Down
Loading