From 8089f61b173cf879da93835de2b6bca08644a6f8 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 21 八月 2018 17:57:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dogz/DogzActiveWin.cs | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/System/Dogz/DogzActiveWin.cs b/System/Dogz/DogzActiveWin.cs
index 6007c59..262415b 100644
--- a/System/Dogz/DogzActiveWin.cs
+++ b/System/Dogz/DogzActiveWin.cs
@@ -60,7 +60,6 @@
protected override void OnPreOpen()
{
- SelectDecide();
GenerateDogz();
UpdateSelectDogzEvent();
UpdateDogzAssistCnt();
@@ -86,12 +85,6 @@
{
}
#endregion
-
- void SelectDecide()
- {
- var configs = ConfigManager.Instance.GetAllValues<DogzConfig>();
- model.presentSelectDogz = configs[0].ID;
- }
void GenerateDogz()
{
@@ -155,6 +148,7 @@
{
if (dogzId != model.presentSelectDogz) return;
UpdateDogzEquip();
+ UpdateDogzProperty();
}
private void UpdateDogzEquip()
@@ -177,6 +171,11 @@
private void UpdateDogzProperty()
{
var _dogzCfg = ConfigManager.Instance.GetTemplate<DogzConfig>(model.presentSelectDogz);
+ bool isAddAttr = model.GetDogzEquips(model.presentSelectDogz) != null && model.GetDogzEquips(model.presentSelectDogz).Count == 5 ? true : false;
+ if(isAddAttr)
+ {
+ model.GetDogzEquipAddAttr(model.presentSelectDogz);
+ }
for (int i = 0; i < m_PropertyTypes.Count; i++)
{
m_PropertyTypes[i].gameObject.SetActive(i < _dogzCfg.BaseAttrTypes.Length);
@@ -185,8 +184,31 @@
{
var _propertyCfg = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(_dogzCfg.BaseAttrTypes[i]);
m_PropertyTypes[i].text = _propertyCfg.Name;
- m_PropertyValues[i].text = StringUtility.Contact(UIHelper.ReplacePercentage(_dogzCfg.BaseAttrValues[i], _propertyCfg.ISPercentage)
- , _propertyCfg.ISPercentage == 1 ? "%" : string.Empty);
+ int attrValue = _dogzCfg.BaseAttrValues[i];
+
+ if (isAddAttr && model.m_DogzEquipAttrDict[_propertyCfg.ID] > 0)
+ {
+ m_PropertyValues[i].text = StringUtility.Contact(UIHelper.ReplacePercentage(_dogzCfg.BaseAttrValues[i], _propertyCfg.ISPercentage)
+ , _propertyCfg.ISPercentage == 1 ? "%" : string.Empty,"+",UIHelper.ReplacePercentage(model.m_DogzEquipAttrDict[_propertyCfg.ID], _propertyCfg.ISPercentage)
+ , _propertyCfg.ISPercentage == 1 ? "%" : string.Empty);
+ }
+ else
+ {
+ m_PropertyValues[i].text = StringUtility.Contact(UIHelper.ReplacePercentage(_dogzCfg.BaseAttrValues[i], _propertyCfg.ISPercentage)
+ , _propertyCfg.ISPercentage == 1 ? "%" : string.Empty);
+ }
+
+ }
+
+ if(model.TryGetAssistDogzState(model.presentSelectDogz))
+ {
+ m_PropertyTypes[i].material = MaterialUtility.GetUIDefaultGraphicMaterial();
+ m_PropertyValues[i].material = MaterialUtility.GetUIDefaultGraphicMaterial();
+ }
+ else
+ {
+ m_PropertyTypes[i].material = MaterialUtility.GetDefaultSpriteGrayMaterial();
+ m_PropertyValues[i].material = MaterialUtility.GetDefaultSpriteGrayMaterial();
}
}
}
@@ -212,7 +234,7 @@
}
private void TakeOffEquip()
{
- model.SendPutOffEquip(0);
+ model.CheckPutOff(0);
}
private void OpenEquipPack()
{
--
Gitblit v1.8.0