From bd5250bad6e53291bd520e56942fa141d4a79c2b Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 31 八月 2018 11:59:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Compose/New/ComposeToolsWin.cs | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/System/Compose/New/ComposeToolsWin.cs b/System/Compose/New/ComposeToolsWin.cs
index 2eaf6f7..47c9526 100644
--- a/System/Compose/New/ComposeToolsWin.cs
+++ b/System/Compose/New/ComposeToolsWin.cs
@@ -242,8 +242,7 @@
if (secondTypeDict != null)
{
- if (secondTypeDict.Count >= 1 && curSecondType != 0
- && curThirdType == 0)
+ if (secondTypeDict.Count >= 1 && curSecondType != 0)
{
cellCtrl.JumpIndex(curSecondType - 1);
}
@@ -277,6 +276,7 @@
name.text = compoundModel.secondTypeName;
if (curSecondType == cell.index)
{
+ preSecondType = curSecondType;
arrowIcon.transform.localRotation = Quaternion.Euler(0, 0, -90);
icon.SetSprite("ComposeFirstClassChoosebtn");
secondTypeDict = composeWinModel.GetSecondTypeModel((int)ComposeFuncType.Item, curSecondType);
@@ -326,7 +326,6 @@
{
if (thirdType != 0)
{
-
if (preSecondType == curSecondType)
{
curSecondType = 0;
@@ -369,8 +368,7 @@
private void OnClickThirdType(int thirdType)
{
curThirdType = thirdType;
- CreateCell();
- //RefreshUI(thirdTypelist[0]);
+ cellCtrl.m_Scorller.RefreshActiveCellViews();
}
private void RefreshUI(ItemCompoundConfig compoundModel)
--
Gitblit v1.8.0