From b36979b59d5825972f970d09b28e05ac45629132 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 14 八月 2018 14:35:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/BlastFurnace/LingDanTips.cs | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/System/BlastFurnace/LingDanTips.cs b/System/BlastFurnace/LingDanTips.cs
index 77b5205..260444d 100644
--- a/System/BlastFurnace/LingDanTips.cs
+++ b/System/BlastFurnace/LingDanTips.cs
@@ -5,6 +5,7 @@
using System;
using Snxxz.UI;
using System.Collections;
+using System.Linq;
namespace Snxxz.UI
{
@@ -134,7 +135,7 @@
isJumpToId = FurnaceModel.alchemyModellist[i].AlchemyID;
isMakeDan = true;
presentIndex = i;
- _danDrugCtrl.JumpIndex(presentIndex);
+ _danDrugCtrl.JumpIndex(presentIndex - 1);
_danDrugCtrl.m_Scorller.RefreshActiveCellViews();
break;
}
@@ -177,7 +178,7 @@
}
}
}
- _danDrugCtrl.JumpIndex(presentIndex);
+ _danDrugCtrl.JumpIndex(presentIndex - 1);
_danDrugCtrl.m_Scorller.RefreshActiveCellViews();
}
@@ -421,9 +422,9 @@
private void CreateRandomLineCell()
{
if(chooseSpecModel == null)
- previewDanlist = FurnaceModel.GetPreviewMakeDruglist(curAlchemyModel);
+ previewDanlist = FurnaceModel.GetPreviewMakeDruglist(curAlchemyModel).Keys.ToList();
else
- previewDanlist = FurnaceModel.GetPreviewSpecMakeDruglist(chooseSpecModel);
+ previewDanlist = FurnaceModel.GetPreviewSpecMakeDruglist(chooseSpecModel).Keys.ToList();
_randomLineCtrl.Refresh();
if (previewDanlist.Count > 0)
@@ -452,9 +453,20 @@
GameObject randomCell = cell.transform.GetChild(i).gameObject;
ItemCell itemCell = randomCell.transform.Find("ItemCell1").GetComponent<ItemCell>();
GameObject fullImg = randomCell.transform.Find("FullImg").gameObject;
+ UIEffect effect = randomCell.transform.Find("UIEffect").GetComponent<UIEffect>();
if (previewIndex <= previewDanlist.Count - 1)
{
int itemId = previewDanlist[previewIndex];
+ int effectId = FurnaceModel.GetEffectIdByItemId(itemId);
+ if(effectId != 0)
+ {
+ effect.effect = effectId;
+ effect.gameObject.SetActive(true);
+ }
+ else
+ {
+ effect.gameObject.SetActive(false);
+ }
randomCell.SetActive(true);
ItemCellModel cellModel = new ItemCellModel(itemId);
itemCell.Init(cellModel);
--
Gitblit v1.8.0