From 577aa28e09e08d1ee12df16d36643b80c192d7bf Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 05 七月 2019 23:49:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Alchemy/AlchemyUseDrugWin.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/System/Alchemy/AlchemyUseDrugWin.cs b/System/Alchemy/AlchemyUseDrugWin.cs
index f9d5664..c22dac0 100644
--- a/System/Alchemy/AlchemyUseDrugWin.cs
+++ b/System/Alchemy/AlchemyUseDrugWin.cs
@@ -15,13 +15,13 @@
public class AlchemyUseDrugWin : Window
{
[SerializeField] AlchemyType m_AlchemyType;
- [SerializeField] ScrollerController m_Controller;
+ [SerializeField] protected ScrollerController m_Controller;
//[SerializeField] AlchemySortBehaviour m_AlchemyTypeSort;
//[SerializeField] AlchemySortBehaviour m_AlchemyQualitySort;
List<int> displayItems = new List<int>();
- AlchemyModel model { get { return ModelCenter.Instance.GetModel<AlchemyModel>(); } }
+ protected AlchemyModel model { get { return ModelCenter.Instance.GetModel<AlchemyModel>(); } }
PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
#region Built-in
@@ -134,7 +134,7 @@
private void OnRefreshCell(ScrollerDataType type, CellView cell)
{
var useDrugCell = cell as AlchemyUseDrugCell;
- useDrugCell.Display(displayItems[cell.index]);
+ useDrugCell.Display(displayItems[cell.index], cell.index);
}
private void RefreshItemCountEvent(PackType packType, int arg2, int itemId)
--
Gitblit v1.8.0