From 21d0cf440869adcb8e8b66b0574d2bfb31c9b833 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 04 九月 2018 16:54:42 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Compose/New/ComposeToolsWin.cs | 63 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/System/Compose/New/ComposeToolsWin.cs b/System/Compose/New/ComposeToolsWin.cs
index 2941d37..5464226 100644
--- a/System/Compose/New/ComposeToolsWin.cs
+++ b/System/Compose/New/ComposeToolsWin.cs
@@ -80,7 +80,7 @@
}
AchievementGuideEffect guidEffect = null;
-
+ bool isJumpTo;
protected override void BindController()
{
cellCtrl.OnRefreshCell += RefreshCell;
@@ -98,7 +98,7 @@
{
DTCA814_tagMCMakeItemAnswer.MakeItemAnswerEvent += OnComposeAnswer;
firstTypeDict = composeWinModel.GetFirstTypeModel((int)ComposeFuncType.Item);
- bool isJumpTo = false;
+ isJumpTo = false;
if (AchievementGoto.guideAchievementId != 0)
{
SuccessConfig successConfig = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);
@@ -154,33 +154,7 @@
if (curSecondType == 0)
{
RefreshUI(null);
- }
-
- if (compoundModel != null)
- {
- RefreshUI(compoundModel);
- if (isJumpTo)
- {
- isJumpTo = false;
- bool isCanCompose = true;
- if (!composeWinModel.IsEnoughFixedMat(compoundModel) || !composeWinModel.IsEnoughUnfixedMat(compoundModel))
- {
- MessageWin.Inst.ShowFixedTip(Language.Get("Compose101"));
- isCanCompose = false;
- }
- else if (!composeWinModel.IsEnoughMoney(compoundModel))
- {
- MessageWin.Inst.ShowFixedTip(Language.Get("L1006"));
- isCanCompose = false;
- }
-
- if (isCanCompose)
- {
- guidEffect = AchievementGuideEffectPool.Require(1);
- guidEffect.transform.SetParentEx(composeBtn.transform, Vector3.zero, Quaternion.identity, Vector3.one);
- }
- }
- }
+ }
}
protected override void OnAfterOpen()
@@ -258,7 +232,38 @@
{
cellCtrl.JumpIndex(curThirdType*50, 0, EnhancedUI.EnhancedScroller.EnhancedScroller.TweenType.immediate);
}
+ CheckJumpModel();
}
+
+ private void CheckJumpModel()
+ {
+ if (compoundModel != null)
+ {
+ RefreshUI(compoundModel);
+ if (isJumpTo)
+ {
+ isJumpTo = false;
+ bool isCanCompose = true;
+ if (!composeWinModel.IsEnoughFixedMat(compoundModel) || !composeWinModel.IsEnoughUnfixedMat(compoundModel))
+ {
+ MessageWin.Inst.ShowFixedTip(Language.Get("Compose101"));
+ isCanCompose = false;
+ }
+ else if (!composeWinModel.IsEnoughMoney(compoundModel))
+ {
+ MessageWin.Inst.ShowFixedTip(Language.Get("L1006"));
+ isCanCompose = false;
+ }
+
+ if (isCanCompose)
+ {
+ guidEffect = AchievementGuideEffectPool.Require(1);
+ guidEffect.transform.SetParentEx(composeBtn.transform, Vector3.zero, Quaternion.identity, Vector3.one);
+ }
+ }
+ }
+ }
+
private void RefreshCell(ScrollerDataType type, CellView cell)
{
Image icon = cell.transform.Find("BtnIcon").GetComponent<Image>();
--
Gitblit v1.8.0