From 2ba7ca87a5a388ff8a5aa6e710c5ce5a8514a03b Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期一, 15 十月 2018 21:17:26 +0800
Subject: [PATCH] 4179 【前端】魂石配置表增加丹药秘方品阶字段
---
System/Dogz/DogzPackWin.cs | 11 ++++++++++-
UI/Common/SortTable.cs | 16 ++--------------
Core/GameEngine/Model/Config/AttrFruitConfig.cs.meta | 4 ++--
Core/GameEngine/Model/Config/AttrFruitConfig.cs | 27 +++++++++++++++------------
4 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/Core/GameEngine/Model/Config/AttrFruitConfig.cs b/Core/GameEngine/Model/Config/AttrFruitConfig.cs
index 285f147f..def086f 100644
--- a/Core/GameEngine/Model/Config/AttrFruitConfig.cs
+++ b/Core/GameEngine/Model/Config/AttrFruitConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: 绗簩涓栫晫
-// [ Date ]: Wednesday, August 08, 2018
+// [ Date ]: Monday, October 15, 2018
//--------------------------------------------------------
using UnityEngine;
@@ -9,22 +9,23 @@
namespace TableConfig {
- public partial class AttrFruitConfig : ConfigBase {
-
+ public partial class AttrFruitConfig : ConfigBase {
+
public int ID { get ; private set ; }
public int FuncID { get ; private set ; }
public int MaxUseCnt { get ; private set ; }
public int RecycleExp { get ; private set ; }
public int Sort { get ; private set ; }
+ public int RecipeLv { get ; private set ; }
- public override string getKey()
- {
- return ID.ToString();
+ public override string getKey()
+ {
+ return ID.ToString();
}
public override void Parse() {
- try
- {
+ try
+ {
ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
FuncID=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0;
@@ -34,10 +35,12 @@
RecycleExp=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0;
Sort=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0;
- }
- catch (Exception ex)
- {
- DebugEx.Log(ex);
+
+ RecipeLv=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0;
+ }
+ catch (Exception ex)
+ {
+ DebugEx.Log(ex);
}
}
diff --git a/Core/GameEngine/Model/Config/AttrFruitConfig.cs.meta b/Core/GameEngine/Model/Config/AttrFruitConfig.cs.meta
index d6562f2..0295910 100644
--- a/Core/GameEngine/Model/Config/AttrFruitConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/AttrFruitConfig.cs.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 1954bcb26cf3ca94786dfcd7948b49df
-timeCreated: 1533695467
-licenseType: Free
+timeCreated: 1539609256
+licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
diff --git a/System/Dogz/DogzPackWin.cs b/System/Dogz/DogzPackWin.cs
index 5e08485..34f4fc0 100644
--- a/System/Dogz/DogzPackWin.cs
+++ b/System/Dogz/DogzPackWin.cs
@@ -212,8 +212,17 @@
}
}
- private void RefreshDogzSelectEvent(int type)
+ private void RefreshDogzSelectEvent(SortType sortType,int type)
{
+ switch (sortType)
+ {
+ case SortType.EquipQuality:
+ dogzModel.SelectDogzItemQuality = type;
+ break;
+ case SortType.EquipStar:
+ dogzModel.SelectDogzItemStart = type;
+ break;
+ }
m_PackController.m_Scorller.RefreshActiveCellViews();
}
diff --git a/UI/Common/SortTable.cs b/UI/Common/SortTable.cs
index dce259c..9e1d0cb 100644
--- a/UI/Common/SortTable.cs
+++ b/UI/Common/SortTable.cs
@@ -25,10 +25,8 @@
[SerializeField] ScrollerController m_Controller;
[SerializeField] ClickScreenOtherSpace m_ClickOtherSpace;
[SerializeField] Text m_TargetDisplay;
- public event Action<int> onSelectSortEvent;
+ public event Action<SortType, int> onSelectSortEvent;
public event Action onSortCloseEvent;
-
- DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }
private void Awake()
{
m_Controller.OnRefreshCell += OnRefreshCell;
@@ -62,19 +60,9 @@
{
var _index = _cell.index;
var type = m_SortElements[_index].type;
- switch (sortType)
- {
- case SortType.EquipQuality:
- dogzModel.SelectDogzItemQuality = type;
- break;
- case SortType.EquipStar:
- dogzModel.SelectDogzItemStart = type;
- break;
- }
-
if (onSelectSortEvent != null)
{
- onSelectSortEvent(type);
+ onSelectSortEvent(sortType,type);
}
if (onSortCloseEvent != null)
{
--
Gitblit v1.8.0