From d5cfc06a1ad77780805b27c48f92ee66912c4f13 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 17 八月 2018 16:25:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dogz/DogzActiveWin.cs | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/System/Dogz/DogzActiveWin.cs b/System/Dogz/DogzActiveWin.cs
index 1fda45a..5cad5d8 100644
--- a/System/Dogz/DogzActiveWin.cs
+++ b/System/Dogz/DogzActiveWin.cs
@@ -81,7 +81,7 @@
void SelectDecide()
{
var configs = ConfigManager.Instance.GetAllValues<DogzConfig>();
- model.presentSelectDogz = configs[0].id;
+ model.presentSelectDogz = configs[0].ID;
}
void GenerateDogz()
@@ -92,7 +92,7 @@
m_Controller.Refresh();
for (int i = 0; i < _dogzCfgs.Count; i++)
{
- m_Controller.AddCell(ScrollerDataType.Header, _dogzCfgs[i].id);
+ m_Controller.AddCell(ScrollerDataType.Header, _dogzCfgs[i].ID);
}
m_Controller.Restart();
}
@@ -115,15 +115,15 @@
{
for (int i = 0; i < m_DogzSkills.Count; i++)
{
- if (_dogzCfg.skills == null || _dogzCfg.skills.Length == 0
- || i >= _dogzCfg.skills.Length)
+ if (_dogzCfg.HelpBattleSkills == null || _dogzCfg.HelpBattleSkills.Length == 0
+ || i >= _dogzCfg.HelpBattleSkills.Length)
{
m_DogzSkills[i].SetEnable(false);
}
else
{
m_DogzSkills[i].SetEnable(true);
- var _skillCfg = ConfigManager.Instance.GetTemplate<SkillConfig>(_dogzCfg.skills[i]);
+ var _skillCfg = ConfigManager.Instance.GetTemplate<SkillConfig>(_dogzCfg.HelpBattleSkills[i]);
m_DogzSkills[i].Icon.SetSprite(_skillCfg.IconName);
m_DogzSkills[i].Lv.text = Language.Get("Z1024", _skillCfg.SkillLV);
}
@@ -143,7 +143,7 @@
m_DogzEquips[i].gameObject.SetActive(_equiped);
if (_equiped)
{
- //m_DogzEquips[i].Refresh(_data);
+ m_DogzEquips[i].Display(_data.ItemId);
}
}
}
@@ -152,13 +152,13 @@
var _dogzCfg = ConfigManager.Instance.GetTemplate<DogzConfig>(model.presentSelectDogz);
for (int i = 0; i < m_PropertyTypes.Count; i++)
{
- m_PropertyTypes[i].gameObject.SetActive(i < _dogzCfg.propertyTypes.Length);
- m_PropertyValues[i].gameObject.SetActive(i < _dogzCfg.propertyTypes.Length);
- if (i < _dogzCfg.propertyTypes.Length)
+ m_PropertyTypes[i].gameObject.SetActive(i < _dogzCfg.BaseAttrTypes.Length);
+ m_PropertyValues[i].gameObject.SetActive(i < _dogzCfg.BaseAttrTypes.Length);
+ if (i < _dogzCfg.BaseAttrTypes.Length)
{
- var _propertyCfg = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(_dogzCfg.propertyTypes[i]);
+ var _propertyCfg = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(_dogzCfg.BaseAttrTypes[i]);
m_PropertyTypes[i].text = _propertyCfg.Name;
- m_PropertyValues[i].text = StringUtility.Contact(UIHelper.ReplacePercentage(_dogzCfg.propertyValues[i], _propertyCfg.ISPercentage)
+ m_PropertyValues[i].text = StringUtility.Contact(UIHelper.ReplacePercentage(_dogzCfg.BaseAttrValues[i], _propertyCfg.ISPercentage)
, _propertyCfg.ISPercentage == 1 ? "%" : string.Empty);
}
}
@@ -171,17 +171,17 @@
}
private void UpdateDogzBtn()
{
- //m_CallBackBtnTxt.text = model.dogzAssists.Contains(model.presentSelectDogz) ? "鍙洖" : "鍔╂垬";
+ m_CallBackBtnTxt.text = model.dogzAssists.Contains(model.presentSelectDogz) ? "鍙洖" : "鍔╂垬";
}
private void AddAssist()
{
- //var _itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(model.AddAssistItem);
- //ConfirmCancel.ShowItemConfirm(string.Format("娑堣�梴0}X{1}姘镐箙澧炲姞1涓姪鎴樼鍏�", _itemConfig.ItemName, model.AddAssistItemCnt),
- // model.AddAssistItem, model.AddAssistItemCnt, () =>
- //{
- //
- //});
+ var _itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(model.AddAssistItem);
+ ConfirmCancel.ShowItemConfirm(string.Format("娑堣�梴0}X{1}姘镐箙澧炲姞1涓姪鎴樼鍏�", _itemConfig.ItemName, model.GetAssistItemCnt()),
+ model.AddAssistItem, model.GetAssistItemCnt(), () =>
+ {
+
+ });
}
private void TakeOffEquip()
{
--
Gitblit v1.8.0