From c8d37bd5866c8ea4fba04fd2bb97ba260ef16dc2 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 25 十月 2018 16:12:32 +0800
Subject: [PATCH] 4347 【前端】【1.2】仙盟精英可同意玩家进入仙盟，但不可将玩家踢出仙盟
---
System/Tip/PlayerDetailWin.cs | 6 +++++-
Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs | 2 +-
System/FairyAu/FairyRequestWin.cs | 2 +-
System/FairyAu/FairyMemberWin.cs | 4 ++--
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs b/Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs
index 5dc9d85..3e49e72 100644
--- a/Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs
+++ b/Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs
@@ -348,7 +348,7 @@
void UpdateRequestRedpoint()
{
- if (HasFairy && IsCanFunc(LimitFunc.CanKick))
+ if (HasFairy && IsCanFunc(LimitFunc.CanCall))
{
applyRedpoint.state = applyList.Count > 0 ? RedPointState.Simple : RedPointState.None;
}
diff --git a/System/FairyAu/FairyMemberWin.cs b/System/FairyAu/FairyMemberWin.cs
index 8c0f0c2..5720460 100644
--- a/System/FairyAu/FairyMemberWin.cs
+++ b/System/FairyAu/FairyMemberWin.cs
@@ -42,7 +42,7 @@
}
private void OnOpenChangeBtn()
{
- if (!PlayerDatas.Instance.fairyData.IsCanFunc(PlayerFairyData.LimitFunc.CanCall))
+ if (!PlayerDatas.Instance.fairyData.IsCanFunc(PlayerFairyData.LimitFunc.CanNotify))
{
MessageWin.Inst.ShowFixedTip(Language.Get("L1019"));
return;
@@ -52,7 +52,7 @@
private void RefreshChangeTipBtn()
{
- var _changeTip = PlayerDatas.Instance.fairyData.IsCanFunc(PlayerFairyData.LimitFunc.CanCall);
+ var _changeTip = PlayerDatas.Instance.fairyData.IsCanFunc(PlayerFairyData.LimitFunc.CanNotify);
openChangeBtn.gameObject.SetActive(_changeTip);
}
diff --git a/System/FairyAu/FairyRequestWin.cs b/System/FairyAu/FairyRequestWin.cs
index e63b4c9..2b15978 100644
--- a/System/FairyAu/FairyRequestWin.cs
+++ b/System/FairyAu/FairyRequestWin.cs
@@ -61,7 +61,7 @@
private void OnRefreshFairyMine()
{
if (!PlayerDatas.Instance.fairyData.HasFairy
- || !PlayerDatas.Instance.fairyData.IsCanFunc(PlayerFairyData.LimitFunc.CanKick))
+ || !PlayerDatas.Instance.fairyData.IsCanFunc(PlayerFairyData.LimitFunc.CanCall))
{
CloseImmediately();
}
diff --git a/System/Tip/PlayerDetailWin.cs b/System/Tip/PlayerDetailWin.cs
index 6a8630b..96a9213 100644
--- a/System/Tip/PlayerDetailWin.cs
+++ b/System/Tip/PlayerDetailWin.cs
@@ -152,7 +152,7 @@
case PlayerDetails.OpenType.Default:
if (PlayerDatas.Instance.fairyData.HasFairy)
{
- if (PlayerDatas.Instance.fairyData.IsCanFunc(PlayerFairyData.LimitFunc.CanKick) &&
+ if (PlayerDatas.Instance.fairyData.IsCanFunc(PlayerFairyData.LimitFunc.CanCall) &&
PlayerDatas.Instance.fairyData.GetMember(PlayerDetails.PlayerID) == null)
{
funcTypes.Add(PlayerDetails.DetailType.InviteFairy);
@@ -169,6 +169,10 @@
&& _mine.FamilyLV > _fairyMember.FamilyLV)
{
funcTypes.Add(PlayerDetails.DetailType.FairyLv);
+ }
+ if (PlayerDatas.Instance.fairyData.IsCanFunc(PlayerFairyData.LimitFunc.CanKick)
+ && _mine.FamilyLV > _fairyMember.FamilyLV)
+ {
funcTypes.Add(PlayerDetails.DetailType.KickFairy);
}
}
--
Gitblit v1.8.0