From 4e97e005695289d13a714b33d9d8845b1e91c146 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期四, 24 一月 2019 15:05:36 +0800
Subject: [PATCH] 5996 子 【开发】【1.5.100】诛仙装备开发 / 【前端】【1.5.100】诛仙装备合成
---
System/JadeDynastyKnapSack/JadeDynastyItemBeh.cs | 10 +++++++---
System/WindowJump/WindowJumpMgr.cs | 10 +++++++---
System/KnapSack/BetterItemGetBehaviour.cs | 19 +++++++++++++++++--
System/JadeDynastyTower/JadeDynastyTowerRankBehaviour.cs | 2 +-
4 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/System/JadeDynastyKnapSack/JadeDynastyItemBeh.cs b/System/JadeDynastyKnapSack/JadeDynastyItemBeh.cs
index 4b6b04c..fd1a4bb 100644
--- a/System/JadeDynastyKnapSack/JadeDynastyItemBeh.cs
+++ b/System/JadeDynastyKnapSack/JadeDynastyItemBeh.cs
@@ -25,11 +25,15 @@
if(itemModel != null)
{
- equipLvObj.SetActive(true);
lockBtn.gameObject.SetActive(false);
itemCell.Init(itemModel,true);
- string equipLvSB = Language.Get(StringUtility.Contact("Num_CHS_", itemModel.chinItemModel.LV));
- equipLvText.text = Language.Get("L1091", equipLvSB);
+ if (itemModel.EquipPlace > 0)
+ {
+ equipLvObj.SetActive(true);
+ string equipLvSB = Language.Get(StringUtility.Contact("Num_CHS_", itemModel.chinItemModel.LV));
+ equipLvText.text = Language.Get("L1091", equipLvSB);
+ }
+
itemCell.cellBtn.RemoveAllListeners();
itemCell.cellBtn.AddListener(()=>
{
diff --git a/System/JadeDynastyTower/JadeDynastyTowerRankBehaviour.cs b/System/JadeDynastyTower/JadeDynastyTowerRankBehaviour.cs
index 0d713f2..7bfa36c 100644
--- a/System/JadeDynastyTower/JadeDynastyTowerRankBehaviour.cs
+++ b/System/JadeDynastyTower/JadeDynastyTowerRankBehaviour.cs
@@ -51,7 +51,7 @@
private void ViewRank()
{
- WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.JadeDynastyTowerRank);
+ WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.JadeDynastyTowerRank289);
}
public struct RankInfo
diff --git a/System/KnapSack/BetterItemGetBehaviour.cs b/System/KnapSack/BetterItemGetBehaviour.cs
index 26253f9..f1ef390 100644
--- a/System/KnapSack/BetterItemGetBehaviour.cs
+++ b/System/KnapSack/BetterItemGetBehaviour.cs
@@ -25,6 +25,9 @@
[SerializeField] Text coolTimeText;
[SerializeField] Button m_Puton;
[SerializeField] Button m_BetterEquipDetail;
+ [SerializeField] GameObject equipLvObj;
+ [SerializeField] Text equipLvText;
+
ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }
BetterEquipGetModel model { get { return ModelCenter.Instance.GetModel<BetterEquipGetModel>(); } }
@@ -143,8 +146,9 @@
private void ToOpenJadeDynastyKnapsack(ItemModel betterEquip)
{
- var model = ModelCenter.Instance.GetModel<JadeDynastyEquipModel>();
- model.SetLookItemModel(betterEquip.itemInfo.ItemGUID);
+ var equipModel = ModelCenter.Instance.GetModel<JadeDynastyEquipModel>();
+ equipModel.SetLookItemModel(betterEquip.itemInfo.ItemGUID);
+ model.ReportConfirmBetterEquip(model.currentEquipGuid);
}
private void ShowBetterEquipDetails()
@@ -170,6 +174,17 @@
m_FunctionTitle.text = Language.Get(itemConfig.ItemColor >= 3 ? "GoodEquip_See" : "GoodEquip_FitUp");
m_EquipBehaviour.Init(betterModel, true);
UpdateCoolTime(betterModel.itemInfo.ItemGUID);
+
+ if(betterModel.packType == PackType.rptJadeDynastyItem && betterModel.chinItemModel.EquipPlace > 0)
+ {
+ equipLvObj.SetActive(true);
+ string equipLvSB = Language.Get(StringUtility.Contact("Num_CHS_", betterModel.chinItemModel.LV));
+ equipLvText.text = Language.Get("L1091", equipLvSB);
+ }
+ else
+ {
+ equipLvObj.SetActive(false);
+ }
}
IEnumerator Co_Delay(string _guid)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index cd33759..1d6a793 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -192,6 +192,7 @@
case JumpUIType.EquipCompose268:
case JumpUIType.EquipCompose269:
case JumpUIType.EquipCompose270:
+ case JumpUIType.EquipCompose291:
int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;
if(types.Length > 0)
{
@@ -378,6 +379,7 @@
case JumpUIType.LootPreciousFrameFunc1:
case JumpUIType.DogzDungeon:
case JumpUIType.FairyGrabBoss:
+ case JumpUIType.JadeDynastyBoss290:
SetJumpLogic<LootPreciousFrameWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.LootPreciousFrameSpec:
@@ -706,7 +708,7 @@
case JumpUIType.JadeDynastyTower288:
SetJumpLogic<TowerWin>(_tagWinSearchModel.TABID);
break;
- case JumpUIType.JadeDynastyTowerRank:
+ case JumpUIType.JadeDynastyTowerRank289:
var rankModel = ModelCenter.Instance.GetModel<RankModel>();
rankModel.jumpRankType = int.Parse(_tagWinSearchModel.SelectActive);
SetJumpLogic<RankPanel>(_tagWinSearchModel.TABID);
@@ -1013,6 +1015,7 @@
case JumpUIType.EquipCompose268:
case JumpUIType.EquipCompose269:
case JumpUIType.EquipCompose270:
+ case JumpUIType.EquipCompose291:
int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;
if (types.Length > 0)
{
@@ -1602,8 +1605,9 @@
SevenDaysTour286 = 286, //涓冩棩宸＄ぜ
SevenDaysTour287 = 287, //涓冩棩宸＄ぜ
JadeDynastyTower288 = 288,//璇涗粰濉�
- JadeDynastyTowerRank = 289,//鎺掕姒�-璇涗粰濉�
-
+ JadeDynastyTowerRank289 = 289,//鎺掕姒�-璇涗粰濉�
+ JadeDynastyBoss290 = 290,//璇涗粰Boss
+ EquipCompose291 = 291,//瑁呭鍚堟垚-璇涗粰瑁呭
DhszTs = 1001,//瀹氭捣绁為拡鍔熸硶鎻愬崌鐣岄潰
HyqTs = 1002,//鐨撴湀鏋姛娉曟彁鍗囩晫闈�
GyzTs = 1003,//楝肩墮鍒冨姛娉曟彁鍗囩晫闈�
--
Gitblit v1.8.0