From 07c19f0e64cf166f0124499b86cc0f0a4a0b7747 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 25 一月 2019 13:56:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs | 2 +
System/KnapSack/Logic/PackSendQuestMgr.cs | 8 ++--
System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs | 35 ++++++++++++-----
System/JadeDynastyKnapSack/JadeDynastyDecomposeWin.cs | 5 ++
System/JadeDynastyKnapSack/JadeDynastySuitAttrBeh.cs | 17 ++++----
Fight/GameActor/GA_Hero.cs | 18 +++++++++
System/KnapSack/Logic/EquipTip.cs | 4 +-
7 files changed, 64 insertions(+), 25 deletions(-)
diff --git a/Fight/GameActor/GA_Hero.cs b/Fight/GameActor/GA_Hero.cs
index e90c2d8..4d2226d 100644
--- a/Fight/GameActor/GA_Hero.cs
+++ b/Fight/GameActor/GA_Hero.cs
@@ -378,6 +378,24 @@
}
HandleBossAttack();
+
+ if (CrossServerUtility.IsCrossServerOneVsOne())
+ {
+ if (SelectTarget is GActorNpcFight)
+ {
+ GAMgr.Instance.Release(SelectTarget);
+ SelectTarget = null;
+ }
+
+ if (LockTarget is GActorNpcFight)
+ {
+ var _list = GAMgr.Instance.GetTypeList(E_ActorClassType.Player);
+ if (_list != null && _list.Count > 0)
+ {
+ LockTarget = _list[0];
+ }
+ }
+ }
}
private void HandleBossAttack()
diff --git a/System/JadeDynastyKnapSack/JadeDynastyDecomposeWin.cs b/System/JadeDynastyKnapSack/JadeDynastyDecomposeWin.cs
index 520bf59..6913513 100644
--- a/System/JadeDynastyKnapSack/JadeDynastyDecomposeWin.cs
+++ b/System/JadeDynastyKnapSack/JadeDynastyDecomposeWin.cs
@@ -117,6 +117,11 @@
private void ClickDecompose()
{
+ if(decomposeModel.selectGuids.Count < 1)
+ {
+ SysNotifyMgr.Instance.ShowTip("JadeDynastyDecompose");
+ return;
+ }
decomposeModel.SendJadeDynastyDecompose(0);
}
diff --git a/System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs b/System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs
index eb7be8e..eebc651 100644
--- a/System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs
+++ b/System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs
@@ -313,14 +313,24 @@
return false;
}
- public bool TryGetMaxSuitLV(int equipPlace,out int maxSuitLv)
+ public bool TryGetMaxSuitLV(int itemId,int equipPlace,out int maxSuitLv)
{
maxSuitLv = 0;
+ var config = Config.Instance.Get<ItemConfig>(itemId);
+ if (config == null) return false;
+
var suitLvs = GetSuitLvList(equipPlace);
if(suitLvs != null && suitLvs.Count > 0)
{
- maxSuitLv = suitLvs[suitLvs.Count - 1];
- return true;
+ for(int i = suitLvs.Count - 1; i > -1; i--)
+ {
+ var suitLv = suitLvs[i];
+ if(suitLv <= config.LV)
+ {
+ maxSuitLv = suitLv;
+ return true;
+ }
+ }
}
return false;
}
@@ -373,19 +383,22 @@
return isActive;
}
- public bool TryGetSuitLV(int equipPlace,PackType type,out int curSuitLv,out int nextSuitLV)
+ public bool TryGetSuitLV(int equipPlace,PackType type,out int curSuitLv,out int nextSuitLV,int itemId = 0)
{
curSuitLv = 0;
nextSuitLV = 0;
- int maxSuitLv = 0;
- bool isMax = TryGetMaxSuitLV(equipPlace,out maxSuitLv);
switch(type)
{
case PackType.rptJadeDynastyItem:
- if(isMax)
+ if(itemId != 0)
{
- nextSuitLV = maxSuitLv;
- return true;
+ int maxSuitLv = 0;
+ bool isMax = TryGetMaxSuitLV(itemId,equipPlace, out maxSuitLv);
+ if(isMax)
+ {
+ nextSuitLV = maxSuitLv;
+ return true;
+ }
}
break;
case PackType.rptJadeDynastyEquip:
@@ -448,7 +461,7 @@
}
- public bool TryGetSumSuitAttr(int suitType,PackType type,out JadeDynastySuitAttrData activeSuit,out JadeDynastySuitAttrData nextSuit)
+ public bool TryGetSumSuitAttr(int suitType,PackType type,out JadeDynastySuitAttrData activeSuit,out JadeDynastySuitAttrData nextSuit,int itemId = 0)
{
activeSuit = null;
nextSuit = null;
@@ -457,7 +470,7 @@
int equipPlace = suitTypeDict[suitType][0];
int curSuitLv = 0;
int nextSuitLv = 0;
- bool isSuitLv = TryGetSuitLV(equipPlace,type,out curSuitLv,out nextSuitLv);
+ bool isSuitLv = TryGetSuitLV(equipPlace,type,out curSuitLv,out nextSuitLv,itemId);
TryGetSuitAttrData(equipPlace,curSuitLv,out activeSuit);
TryGetSuitAttrData(equipPlace,nextSuitLv,out nextSuit);
diff --git a/System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs b/System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs
index 6ff06e9..47a4aca 100644
--- a/System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs
+++ b/System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs
@@ -137,6 +137,8 @@
equipModel.ClearLookItemModel();
break;
case PackType.rptJadeDynastyEquip:
+ UpdateItemLine();
+ equipModel.ClearLookItemModel();
UpdatePlayerUI3DModel();
UpdateFightPower();
break;
diff --git a/System/JadeDynastyKnapSack/JadeDynastySuitAttrBeh.cs b/System/JadeDynastyKnapSack/JadeDynastySuitAttrBeh.cs
index 912f7a1..d2f9f4f 100644
--- a/System/JadeDynastyKnapSack/JadeDynastySuitAttrBeh.cs
+++ b/System/JadeDynastyKnapSack/JadeDynastySuitAttrBeh.cs
@@ -14,9 +14,10 @@
[SerializeField] GameObject noneActive;
JadeDynastyEquipModel equipModel { get { return ModelCenter.Instance.GetModel<JadeDynastyEquipModel>(); } }
-
- public void SetDisplay(PackType type,bool isNext = false,int equipPlace = 0)
+ int itemId = 0;
+ public void SetDisplay(PackType type,bool isNext = false,int equipPlace = 0,int _itemId = 0)
{
+ this.itemId = _itemId;
if(equipPlace == 0)
{
UpdateSumSuitAttr(type, isNext);
@@ -45,7 +46,7 @@
suitAttr.attrTypeObj.SetActive(true);
JadeDynastyEquipModel.JadeDynastySuitAttrData curAttrData = null;
JadeDynastyEquipModel.JadeDynastySuitAttrData nextAttrData = null;
- equipModel.TryGetSumSuitAttr(suitType, type, out curAttrData, out nextAttrData);
+ equipModel.TryGetSumSuitAttr(suitType, type, out curAttrData, out nextAttrData,itemId);
if (isNext)
{
if (nextAttrData != null)
@@ -60,7 +61,7 @@
isNoneActive = false;
}
}
- suitAttr.SetDisplay(suitType, type, isNext);
+ suitAttr.SetDisplay(suitType, type, isNext,itemId);
}
}
@@ -104,7 +105,7 @@
int suitType = suitTypes[i];
JadeDynastyEquipModel.JadeDynastySuitAttrData curAttrData = null;
JadeDynastyEquipModel.JadeDynastySuitAttrData nextAttrData = null;
- equipModel.TryGetSumSuitAttr(suitType, type, out curAttrData, out nextAttrData);
+ equipModel.TryGetSumSuitAttr(suitType, type, out curAttrData, out nextAttrData,this.itemId);
if (isNext)
{
if (nextAttrData != null)
@@ -119,7 +120,7 @@
isNoneActive = false;
}
}
- suitAttr.SetDisplay(suitType, type, isNext);
+ suitAttr.SetDisplay(suitType, type, isNext,itemId);
}
else
{
@@ -157,12 +158,12 @@
ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
JadeDynastyEquipModel equipModel { get { return ModelCenter.Instance.GetModel<JadeDynastyEquipModel>(); } }
- public void SetDisplay(int suitType,PackType type,bool isNext)
+ public void SetDisplay(int suitType,PackType type,bool isNext,int itemId)
{
JadeDynastyEquipModel.JadeDynastySuitAttrData curAttrData = null;
JadeDynastyEquipModel.JadeDynastySuitAttrData nextAttrData = null;
JadeDynastyEquipModel.JadeDynastySuitAttrData suitAttrData = null;
- equipModel.TryGetSumSuitAttr(suitType,type,out curAttrData,out nextAttrData);
+ equipModel.TryGetSumSuitAttr(suitType,type,out curAttrData,out nextAttrData,itemId);
suitAttrData = isNext ? nextAttrData : curAttrData;
if(suitAttrData == null)
{
diff --git a/System/KnapSack/Logic/EquipTip.cs b/System/KnapSack/Logic/EquipTip.cs
index 47a02a3..ffae278 100644
--- a/System/KnapSack/Logic/EquipTip.cs
+++ b/System/KnapSack/Logic/EquipTip.cs
@@ -878,8 +878,8 @@
PackType packType = itemAttrData.packType == PackType.rptDeleted ? PackType.rptJadeDynastyItem : itemAttrData.packType;
- curJadeDynastySuitAttr.SetDisplay(packType,false,itemAttrData.itemConfig.EquipPlace);
- nextJadeDynastySuitAttr.SetDisplay(packType, true, itemAttrData.itemConfig.EquipPlace);
+ curJadeDynastySuitAttr.SetDisplay(packType,false,itemAttrData.itemConfig.EquipPlace,itemAttrData.itemId);
+ nextJadeDynastySuitAttr.SetDisplay(packType, true, itemAttrData.itemConfig.EquipPlace,itemAttrData.itemId);
}
private void SetMidUIHeight(float midHeight)
diff --git a/System/KnapSack/Logic/PackSendQuestMgr.cs b/System/KnapSack/Logic/PackSendQuestMgr.cs
index 57c72c8..e7974c3 100644
--- a/System/KnapSack/Logic/PackSendQuestMgr.cs
+++ b/System/KnapSack/Logic/PackSendQuestMgr.cs
@@ -558,15 +558,15 @@
if(sendItemModel.packType == PackType.rptJadeDynastyItem)
{
- if (sendItemModel.chinItemModel.EquipPlace >= (int)RoleEquipType.JadeDynasty_Cloak
- && sendItemModel.chinItemModel.EquipPlace <= (int)RoleEquipType.JadeDynasty_Sword4)
+ if (equipPlace >= (int)RoleEquipType.JadeDynasty_Cloak
+ && equipPlace <= (int)RoleEquipType.JadeDynasty_Sword4)
{
var jadeDynastyModel = ModelCenter.Instance.GetModel<JadeDynastyEquipModel>();
- bool islock = jadeDynastyModel.IsLockEquipPlace(sendItemModel.chinItemModel.EquipPlace);
+ bool islock = jadeDynastyModel.IsLockEquipPlace(equipPlace);
if (islock)
{
int towerlayer = 0;
- jadeDynastyModel.TryGetLockTowerLayer(sendItemModel.chinItemModel.EquipPlace, out towerlayer);
+ jadeDynastyModel.TryGetLockTowerLayer(equipPlace, out towerlayer);
SysNotifyMgr.Instance.ShowTip("JadeDynastyEquip", towerlayer);
return;
}
--
Gitblit v1.8.0