From 1ff8b1ecb52c843faee046b7e439dbdc20b96852 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期五, 23 十一月 2018 20:42:50 +0800
Subject: [PATCH] 4714 【1.3】【前端】新的洗练副本-冰晶矿脉（新），原冰晶矿脉副本删除
---
System/Dungeon/DungeonSweepResultWin.cs | 19 +++++++++++++++++--
System/Dungeon/IceCrystalVeinWin.cs | 5 +++--
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/System/Dungeon/DungeonSweepResultWin.cs b/System/Dungeon/DungeonSweepResultWin.cs
index f5a7ecf..7c0f160 100644
--- a/System/Dungeon/DungeonSweepResultWin.cs
+++ b/System/Dungeon/DungeonSweepResultWin.cs
@@ -29,7 +29,7 @@
[SerializeField] UIEffect m_SweepResultEffect;
[SerializeField] Button m_Again;
[SerializeField] Button m_Close;
-
+ [SerializeField] Text m_BtnText;
DungeonModel model { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }
GetItemPathModel getItemPath { get { return ModelCenter.Instance.GetModel<GetItemPathModel>(); } }
@@ -50,6 +50,14 @@
{
DisplayResult();
model.getDungeonResultEvent += DisplayResult;
+ if (model.currentDungeon.mapId == 31140)
+ {
+ m_BtnText.text = Language.Get("RuneTowerSweepText12");
+ }
+ else
+ {
+ m_BtnText.text = Language.Get("MoppingUpEnd_Btn_Continue");
+ }
}
protected override void OnAfterOpen()
@@ -151,7 +159,14 @@
var error = 0;
if (TestSweep(out error))
{
- model.RequestSweep(model.currentDungeon);
+ if (model.currentDungeon.mapId == 31140)//鍐版櫠鐭胯剦涓嶅厑璁稿啀娆℃壂鑽�
+ {
+ CloseClick();
+ }
+ else
+ {
+ model.RequestSweep(model.currentDungeon);
+ }
}
else
{
diff --git a/System/Dungeon/IceCrystalVeinWin.cs b/System/Dungeon/IceCrystalVeinWin.cs
index 0d9b744..990381a 100644
--- a/System/Dungeon/IceCrystalVeinWin.cs
+++ b/System/Dungeon/IceCrystalVeinWin.cs
@@ -110,6 +110,7 @@
if (fbId == 31140)
{
StarAll = iceCrystalVeinModel.GetAllStar();
+ SetGridBotton();
m_ScrollerController.m_Scorller.RefreshActiveCellViews();//鍒锋柊鍙
}
}
@@ -309,7 +310,7 @@
m_Collar.SetActive(true);
}
}
- ItemCellModel cellModel = new ItemCellModel(IceLode.ItemID, true, (ulong)1);
+ ItemCellModel cellModel = new ItemCellModel(IceLode.ItemID, true, (ulong)IceLode.ItemCount, IceLode.IsBind);
_ItemCell.Init(cellModel);
int type = i;
_ItemCell.cellBtn.SetListener(() =>
@@ -319,7 +320,7 @@
iceCrystalVeinModel.SendGetAward(IceLode.Index);
return;
}
- ItemAttrData attrData = new ItemAttrData(IceLode.ItemID, false, (ulong)1);
+ ItemAttrData attrData = new ItemAttrData(IceLode.ItemID, false, (ulong)IceLode.ItemCount,-1, IceLode.IsBind);
itemTipsModel.SetItemTipsModel(attrData);
return;
});
--
Gitblit v1.8.0