From 54abafbbdbce42b199eb83fa2d9cd9fe515334ef Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 28 三月 2019 11:08:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/FairyAu/FairyApplyWin.cs | 2 +-
System/FairyAu/FairyModel.cs | 14 +++++++++++---
System/Auction/AuctionInquiryModel.cs | 9 ++++++---
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/System/Auction/AuctionInquiryModel.cs b/System/Auction/AuctionInquiryModel.cs
index 122cc8a..e714206 100644
--- a/System/Auction/AuctionInquiryModel.cs
+++ b/System/Auction/AuctionInquiryModel.cs
@@ -531,13 +531,16 @@
}
}
- public bool IsFamilyQuit()//鍙惁閫�鍑轰粰鐩�
+ public bool IsFamilyQuit(int playerID = 0)//鍙惁閫�鍑轰粰鐩�
{
bool isbool = true;
- int playerId = (int)PlayerDatas.Instance.baseData.PlayerID;
+ if (playerID == 0)
+ {
+ playerID = (int)PlayerDatas.Instance.baseData.PlayerID;
+ }
foreach (var key in FamilyAuctionItemDic.Keys)//鍒ゆ柇鐜╁鏄惁鏈夊湪绔炰环浠欑洘鎷嶅搧(涓旀槸鏈�楂樹环)
{
- if (BiddingItemInfoDic.ContainsKey(key) && BiddingItemInfoDic[key].BidderID== playerId)
+ if (BiddingItemInfoDic.ContainsKey(key) && BiddingItemInfoDic[key].BidderID == playerID)
{
isbool = false;
}
diff --git a/System/FairyAu/FairyApplyWin.cs b/System/FairyAu/FairyApplyWin.cs
index 653eabc..3aaf697 100644
--- a/System/FairyAu/FairyApplyWin.cs
+++ b/System/FairyAu/FairyApplyWin.cs
@@ -222,7 +222,7 @@
var auctionModel = ModelCenter.Instance.GetModel<AuctionInquiryModel>();
if (!auctionModel.IsFamilyQuit())
{
- SysNotifyMgr.Instance.ShowTip("ExitFairyError_Auction");
+ SysNotifyMgr.Instance.ShowTip("Paimai8");
return;
}
diff --git a/System/FairyAu/FairyModel.cs b/System/FairyAu/FairyModel.cs
index b61c976..bb44a5e 100644
--- a/System/FairyAu/FairyModel.cs
+++ b/System/FairyAu/FairyModel.cs
@@ -113,10 +113,18 @@
#region 鍙戝寘
public void SendKickFairy(uint playerID)
{
- C0F09_tagCDeleteFamilyMember kickPack = new C0F09_tagCDeleteFamilyMember();
- kickPack.MemberID = playerID;
- GameNetSystem.Instance.SendInfo(kickPack);
+ var auctionModel = ModelCenter.Instance.GetModel<AuctionInquiryModel>();
+ if (!auctionModel.IsFamilyQuit((int)playerID))
+ {
+ SysNotifyMgr.Instance.ShowTip("Paimai7");
+ return;
+ }
+
+ var pak = new C0F09_tagCDeleteFamilyMember();
+ pak.MemberID = playerID;
+ GameNetSystem.Instance.SendInfo(pak);
}
+
public void SendApplyFairy(uint id)
{
int limit = FuncOpenLVConfig.Get((int)FuncOpenEnum.Fairy).LimitLV;
--
Gitblit v1.8.0