From 8ec139a41a68bc0aebd3c2de4912276d3db3bd8e Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 21 九月 2018 15:39:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Strengthening/GodBeastAttributes.cs | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/System/Strengthening/GodBeastAttributes.cs b/System/Strengthening/GodBeastAttributes.cs
index 846ccac..fb9f986 100644
--- a/System/Strengthening/GodBeastAttributes.cs
+++ b/System/Strengthening/GodBeastAttributes.cs
@@ -39,9 +39,9 @@
[SerializeField] GameObject m_Text_two;//涓嬬骇灞炴��
[SerializeField] Button m_StrengthenDoubleBtn;//鍙屽�嶅己鍖栨寜閽�
[SerializeField] Text m_NeedFairy;//鎵�闇�鐨勪粰鐜�
+ [SerializeField] GameObject m_BottomBox;
DogzModel Dogz_model;
- DogzModel dogz_model { get { return Dogz_model ?? (Dogz_model = ModelCenter.Instance.GetModel<DogzModel>()); } }
- private Dictionary<int, int> QualityLimit = new Dictionary<int, int>();
+ DogzModel dogz_model { get { return Dogz_model ?? (Dogz_model = ModelCenter.Instance.GetModel<DogzModel>()); } }
PlayerPackModel _playerPack;
PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } }
ItemTipsModel _itemTipsModel;
@@ -74,17 +74,14 @@
}
private void OnDisable()
{
+ GodBeast_Number = 0;
+ GodBeast_Part = 0;
GodBeastReinforcementWin.ChooseToModify -= ChooseToModify;
godBeastModel.AbsorbEvent -= AbsorbEvent;
}
public void Init()
{
- if (QualityLimit.Count <= 0)
- {
- string DogzAssist = Config.Instance.Get<FuncConfigConfig>("DogzAssist").Numerical4;//鑾峰彇涓嶅悓鍝佽川鐨勭鍏藉己鍖栦笂闄�
- QualityLimit = ConfigParse.GetDic<int, int>(DogzAssist);
- }
}
public void Unit()
@@ -160,8 +157,7 @@
}
m_UIAlphaTween.gameObject.SetActive(true);
m_FrameNull.SetActive(true);
- m_FullLevel.SetActive(false);
- m_StrengthenBtn.interactable = true;
+ m_FullLevel.SetActive(false);
GetDogZLevelAndExp();
AttributeAssignment();
}
@@ -182,7 +178,7 @@
m_FrameNull.SetActive(false);
m_FullLevel.SetActive(false);
m_UIAlphaTween.gameObject.SetActive(false);
- m_StrengthenBtn.interactable = false;
+ m_BottomBox.SetActive(false);
}
}
@@ -193,13 +189,15 @@
return;
}
GainProficiency();//鑾峰彇鐔熺粌搴�
+ m_BottomBox.SetActive(true);
var IudetDogzEquipPlus = m_DogZItemModel.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus);
if (IudetDogzEquipPlus != null)
{
- int lv = QualityLimit[m_DogZItemModel.chinItemModel.ItemColor];
+ int lv = godBeastModel.QualityLimit[m_DogZItemModel.chinItemModel.ItemColor];
var DogzEquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(GodBeastPart, lv);
if (DogZLv >= lv)
{
+ m_BottomBox.SetActive(false);
m_Text_two.SetActive(false);
m_FrameNull.SetActive(false);
m_TextAttributes1.gameObject.SetActive(false);
@@ -220,10 +218,13 @@
var Dogz_EquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(GodBeastPart, DogZLv - 1);
NeedExp -= Dogz_EquipConfig.upExpTotal;
}
- m_ExpNum.text = DogZExp + "/" + NeedExp;
+ m_ExpNum.text = NeedExp + "/" + NeedExp;
}
else
{
+
+ m_StrengthenDoubleBtn.interactable = true;
+ m_StrengthenBtn.interactable = true;
m_Text_two.SetActive(true);
if (m_DoubleToggle.isOn)
{
@@ -373,7 +374,7 @@
{
return DogzLv;
}
- int lv = QualityLimit[m_DogZItemModel.chinItemModel.ItemColor];
+ int lv = godBeastModel.QualityLimit[m_DogZItemModel.chinItemModel.ItemColor];
var IudetDogzEquipPlus = m_DogZItemModel.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus);
if (IudetDogzEquipPlus != null)
{
--
Gitblit v1.8.0