From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
System/Dogz/DogzModel.cs | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/System/Dogz/DogzModel.cs b/System/Dogz/DogzModel.cs
index e105153..e2295d3 100644
--- a/System/Dogz/DogzModel.cs
+++ b/System/Dogz/DogzModel.cs
@@ -20,6 +20,8 @@
public void OnBeforePlayerDataInitialize()
{
+ playerPack.RefreshItemCountAct -= RefreshDogzEquipInfo;
+ FuncOpen.Instance.OnFuncStateChangeEvent -= UpdateDogzState;
curSumAssistNum = DogzAssistDefaultCnt;
addAssistCnt = 0;
SelectDogzItemQuality = 0;
@@ -38,9 +40,9 @@
public void OnPlayerLoginOk()
{
- SetDogzEquipInfo();
- playerPack.RefreshItemCountAct -= RefreshDogzEquipInfo;
+ SetDogzEquipInfo();
playerPack.RefreshItemCountAct += RefreshDogzEquipInfo;
+ FuncOpen.Instance.OnFuncStateChangeEvent += UpdateDogzState;
UpdateDogzAssistRed();
UpdateDogzEquipPlaceRed();
UpdateAssistNumRed();
@@ -302,6 +304,17 @@
SysNotifyMgr.Instance.ShowTip("DogzQualityAsk", GetDogzPartNameByIndex(index), GetItemColorName(color));
return false;
}
+
+
+ private void UpdateDogzState(int funcId)
+ {
+ if (funcId != (int)FuncOpenEnum.Dogz) return;
+
+ UpdateDogzAssistRed();
+ UpdateDogzEquipPlaceRed();
+ UpdateAssistNumRed();
+ }
+
#region 鍗忚
@@ -867,10 +880,13 @@
public void UpdateDogzAssistRed()
{
- foreach(var value in dogzAssistRedDict.Values)
+ if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Dogz)) return;
+
+ foreach (var value in dogzAssistRedDict.Values)
{
value.state = RedPointState.None;
}
+
bool isMaxAssistNum = GetAssistDogzCount() >= curSumAssistNum ? true : false;
int minAlreadyAssistId = 0;
foreach (var dogzId in m_DogzEquipLimit.Keys)
@@ -927,7 +943,9 @@
public void UpdateDogzEquipPlaceRed()
{
- foreach(var value in dogzEquipPlaceRedDict.Values)
+ if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Dogz)) return;
+
+ foreach (var value in dogzEquipPlaceRedDict.Values)
{
foreach(var value2 in value.Values)
{
@@ -935,7 +953,7 @@
}
}
- foreach(var value in dogzAssistRedDict.Values)
+ foreach (var value in dogzAssistRedDict.Values)
{
if(value.state == RedPointState.Simple)
{
@@ -1057,7 +1075,9 @@
public void UpdateAssistNumRed()
{
- if(CheckIsAddAssistNum() && !IsAddMaxAssist())
+ if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Dogz)) return;
+
+ if (CheckIsAddAssistNum() && !IsAddMaxAssist())
{
if(addAssistDogzRedpoint.state == RedPointState.None)
{
--
Gitblit v1.8.0