From a974a2621a6dcb90b8fe52b23d075814873c0960 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 23 十月 2018 20:53:49 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
System/Message/RichNormalEvent.cs | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/System/Message/RichNormalEvent.cs b/System/Message/RichNormalEvent.cs
index 1436706..9aff702 100644
--- a/System/Message/RichNormalEvent.cs
+++ b/System/Message/RichNormalEvent.cs
@@ -14,6 +14,7 @@
RichTextMgr.Inst.RegisterEvent(RichTextEventEnum.OPENUI, this);
RichTextMgr.Inst.RegisterEvent(RichTextEventEnum.TIP, this);
RichTextMgr.Inst.RegisterEvent(RichTextEventEnum.GetWay, this);
+ RichTextMgr.Inst.RegisterEvent(RichTextEventEnum.JOINTEAM, this);
}
public override bool Execute(RichTextEventEnum type, RichTextMgr.HrefInfo href)
@@ -30,6 +31,21 @@
}
}
break;
+ case RichTextEventEnum.JOINTEAM:
+ {
+ uint id = 0;
+ if (uint.TryParse(href.mSplits["jointeam"], out id))
+ {
+ var teamModel = ModelCenter.Instance.GetModel<TeamModel>();
+ if (teamModel.myTeam.GetIndexOfMember((int)id) != -1)
+ {
+ SysNotifyMgr.Instance.ShowTip("AlreadyInTeam2");
+ return false;
+ }
+ teamModel.RequestInviteJoinTeam((int)id);
+ }
+ }
+ break;
case RichTextEventEnum.INVITE:
{
uint id = 0;
--
Gitblit v1.8.0