From 0481e4b577d7bd44ed1b8ed1b61d17dbe543e7a2 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 15 三月 2019 12:37:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/EquipGem/EquipStrengthRein.cs | 6 +-
System/Realm/RealmWin.cs | 12 ++++--
System/Activity/ActivityModel.cs | 4 ++
System/Realm/RealmStageBehaviour.cs | 14 +++++++
System/EquipGem/EquipStrengthUpper.cs | 12 +++---
Fight/Actor/State/SMB/Dead_4.cs | 8 ++--
System/EquipGem/EquipStrengthFull.cs | 12 +++---
System/Realm/RealmAnimationBehaviour.cs | 30 ++++++++++----
System/EquipGem/EquipEvolutionWin.cs | 13 +++---
9 files changed, 73 insertions(+), 38 deletions(-)
diff --git a/Fight/Actor/State/SMB/Dead_4.cs b/Fight/Actor/State/SMB/Dead_4.cs
index 27c852a..94a7300 100644
--- a/Fight/Actor/State/SMB/Dead_4.cs
+++ b/Fight/Actor/State/SMB/Dead_4.cs
@@ -167,10 +167,10 @@
owner.needSyncGroundHeight = true;
- //if (owner.ActorType == GameObjType.gotNPC)
- //{
- // GAMgr.Instance.Release(owner);
- //}
+ if (owner is GA_NpcClientFightNorm)
+ {
+ GAMgr.Instance.Release(owner);
+ }
#if UNITY_EDITOR
string _content = string.Format("Dead_4 => {0} 閫�鍑轰簡Dead鐘舵��", owner.ServerInstID);
diff --git a/System/Activity/ActivityModel.cs b/System/Activity/ActivityModel.cs
index 88be1f0..3dfaba9 100644
--- a/System/Activity/ActivityModel.cs
+++ b/System/Activity/ActivityModel.cs
@@ -288,6 +288,10 @@
case DailyQuestType.AllianceBoss1:
case DailyQuestType.AllianceBoss2:
{
+ if (!PlayerDatas.Instance.fairyData.HasFairy)
+ {
+ return true;
+ }
if (allianceBossModel.isActivityOver)
{
return true;
diff --git a/System/EquipGem/EquipEvolutionWin.cs b/System/EquipGem/EquipEvolutionWin.cs
index 32a92a9..37f3d7f 100644
--- a/System/EquipGem/EquipEvolutionWin.cs
+++ b/System/EquipGem/EquipEvolutionWin.cs
@@ -93,13 +93,14 @@
m_ItemCell.Init(cellModel);
if (advancedLv == 0)
{
- m_TextAttributesA.text = "瑁呭寮哄寲绛夌骇鍒拌揪" + evolveNext.NeedPlusLV + "绾�";
- m_TextAttributesB.text = "娑堣��" + evolveNext.CostItemCount + "涓己鍖栨按鏅�";
+
+ m_TextAttributesA.text = Language.Get("ZBQH_05", evolveNext.NeedPlusLV);
+ m_TextAttributesB.text = Language.Get("ZBQH_06", evolveNext.CostItemCount);
}
else
{
- m_TextAttributesA.text = "瑁呭寮哄寲绛夌骇鍒拌揪" + evolve.NeedPlusLV + "绾�";
- m_TextAttributesB.text = "娑堣��" + evolve.CostItemCount + "涓己鍖栨按鏅�";
+ m_TextAttributesA.text = Language.Get("ZBQH_05", evolve.NeedPlusLV);
+ m_TextAttributesB.text = Language.Get("ZBQH_06", evolve.CostItemCount);
}
}
@@ -160,12 +161,12 @@
itemCount = playerPack.GetItemCountByID(PackType.Item, equipPlusEvolve.CostItemID);
if (equipPlusEvolve.NeedPlusLV > equipLv)
{
- DebugEx.LogError("鎵�闇�寮哄寲绛夌骇涓嶈冻");
+ ServerTipDetails.DisplayNormalTip(Language.Get("ZBQH_07"));
return false;
}
if (equipPlusEvolve.CostItemCount > itemCount)
{
- DebugEx.LogError("鎵�闇�鏉愭枡涓嶈冻");
+ ServerTipDetails.DisplayNormalTip(Language.Get("ZBQH_08"));
return false;
}
return true;
diff --git a/System/EquipGem/EquipStrengthFull.cs b/System/EquipGem/EquipStrengthFull.cs
index 636066e..1151460 100644
--- a/System/EquipGem/EquipStrengthFull.cs
+++ b/System/EquipGem/EquipStrengthFull.cs
@@ -92,13 +92,13 @@
ulong needMoney = (ulong)itemPlusConfig.costCount;
string MoneyStr = ItemLogicUtility.Instance.OnChangeCoinsUnit(UIHelper.GetMoneyCnt(3));
string NeedMoneyStr = ItemLogicUtility.Instance.OnChangeCoinsUnit(needMoney);
- if (money >= needMoney)
+ if (money >= needMoney)
{
- strMoneyText = "<color=#fffaf0>" + NeedMoneyStr + "/" + MoneyStr + "</color>";
- }
- else
- {
- strMoneyText = "<color=#ff0000>" + NeedMoneyStr + "/" + MoneyStr + "</color>";
+ strMoneyText = Language.Get("ZBQH_03", NeedMoneyStr, MoneyStr);
+ }
+ else
+ {
+ strMoneyText = Language.Get("ZBQH_04", NeedMoneyStr, MoneyStr);
}
return strMoneyText;
}
diff --git a/System/EquipGem/EquipStrengthRein.cs b/System/EquipGem/EquipStrengthRein.cs
index 132d1e3..2f8ddc0 100644
--- a/System/EquipGem/EquipStrengthRein.cs
+++ b/System/EquipGem/EquipStrengthRein.cs
@@ -117,12 +117,12 @@
string MoneyStr = ItemLogicUtility.Instance.OnChangeCoinsUnit(UIHelper.GetMoneyCnt(3));
string NeedMoneyStr = ItemLogicUtility.Instance.OnChangeCoinsUnit(needMoney);
if (money >= needMoney)
- {
- strMoneyText = "<color=#fffaf0>" + NeedMoneyStr + "/"+ MoneyStr + "</color>";
+ {
+ strMoneyText = Language.Get("ZBQH_03", NeedMoneyStr, MoneyStr);
}
else
{
- strMoneyText = "<color=#ff0000>" + NeedMoneyStr + "/" + MoneyStr + "</color>";
+ strMoneyText = Language.Get("ZBQH_04", NeedMoneyStr, MoneyStr);
}
return strMoneyText;
}
diff --git a/System/EquipGem/EquipStrengthUpper.cs b/System/EquipGem/EquipStrengthUpper.cs
index aeecabb..2df35f2 100644
--- a/System/EquipGem/EquipStrengthUpper.cs
+++ b/System/EquipGem/EquipStrengthUpper.cs
@@ -94,13 +94,13 @@
ulong needMoney = (ulong)itemPlusConfig.costCount;
string MoneyStr = ItemLogicUtility.Instance.OnChangeCoinsUnit(UIHelper.GetMoneyCnt(3));
string NeedMoneyStr = ItemLogicUtility.Instance.OnChangeCoinsUnit(needMoney);
- if (money >= needMoney)
+ if (money >= needMoney)
{
- strMoneyText = "<color=#fffaf0>" + NeedMoneyStr + "/" + MoneyStr + "</color>";
- }
- else
- {
- strMoneyText = "<color=#ff0000>" + NeedMoneyStr + "/" + MoneyStr + "</color>";
+ strMoneyText = Language.Get("ZBQH_03", NeedMoneyStr, MoneyStr);
+ }
+ else
+ {
+ strMoneyText = Language.Get("ZBQH_04", NeedMoneyStr, MoneyStr);
}
return strMoneyText;
}
diff --git a/System/Realm/RealmAnimationBehaviour.cs b/System/Realm/RealmAnimationBehaviour.cs
index 813ff8c..efb3f78 100644
--- a/System/Realm/RealmAnimationBehaviour.cs
+++ b/System/Realm/RealmAnimationBehaviour.cs
@@ -35,6 +35,10 @@
m_RealmStages[i].transform.localPosition = GetPointPosition(i);
m_RealmStages[i].animIndex = i;
}
+ foreach (var effectLine in m_EffectLines)
+ {
+ effectLine.StopImediatly();
+ }
m_ContainerEffectLine.localEulerAngles = Vector3.zero;
DisplayEffectLines();
}
@@ -51,9 +55,9 @@
var level = realms[i] + 1;
if (realmLevel >= level)
{
- // m_EffectLines[i].Play();
- // var animator = m_EffectLines[i].target.GetAnimator();
- // animator.Play("idle", 0);
+ m_EffectLines[i].Play();
+ var animator = m_EffectLines[i].target.GetAnimator();
+ animator.Play("idle", 0, 0);
}
}
}
@@ -88,11 +92,14 @@
{
yield break;
}
- //m_EffectLines[index].Play();
- //var animator = m_EffectLines[index].target.GetAnimator();
- //animator.Play("open", 0, 0);
- //yield return WaitingForSecondConst.WaitMS1500;
- //animator.Play("idle", 0);
+ if (index != -1)
+ {
+ m_EffectLines[index].Play();
+ var animator = m_EffectLines[index].target.GetAnimator();
+ animator.Play("open", 0, 0);
+ yield return WaitingForSecondConst.WaitMS500;
+ animator.Play("idle", 0);
+ }
var realmStage = GetRealmStageBeha(index + 1);
if (realmStage != null)
{
@@ -161,8 +168,9 @@
{
foreach (var realmStage in m_RealmStages)
{
- if (realmStage.animIndex == 0)
+ if (realmStage.animIndex == 0 || realmStage.animIndex == 1)
{
+ realmStage.Dispose();
realmStage.gameObject.SetActive(false);
}
else
@@ -186,6 +194,10 @@
m_ContainerLine.gameObject.SetActive(false);
foreach (var realmStage in m_RealmStages)
{
+ if (realmStage.animIndex == 1)
+ {
+ realmStage.gameObject.SetActive(true);
+ }
realmStage.animIndex = (realmStage.animIndex + 5) % 9;
}
diff --git a/System/Realm/RealmStageBehaviour.cs b/System/Realm/RealmStageBehaviour.cs
index 487bbdc..7f91301 100644
--- a/System/Realm/RealmStageBehaviour.cs
+++ b/System/Realm/RealmStageBehaviour.cs
@@ -69,13 +69,27 @@
if (animator != null)
{
animator.Play(levelUp ? "open" : "idle", 0);
+ if (levelUp)
+ {
+ StartCoroutine(Co_DelayEffect(animator));
+ }
}
+ }
+ }
+
+ IEnumerator Co_DelayEffect(Animator animator)
+ {
+ yield return WaitingForSecondConst.WaitMS300;
+ if (animator != null)
+ {
+ animator.Play("idle", 0, 0);
}
}
public void Dispose()
{
model.selectRealmRefresh -= SelectRealmRefresh;
+ StopAllCoroutines();
}
private void SelectRealmRefresh()
diff --git a/System/Realm/RealmWin.cs b/System/Realm/RealmWin.cs
index 2b53d41..a2516d9 100644
--- a/System/Realm/RealmWin.cs
+++ b/System/Realm/RealmWin.cs
@@ -269,15 +269,19 @@
var currentStage = model.GetRealmStage(cacheRealmLevel);
if (cacheRealmLevel > realmLevel || stage > currentStage + 1)
{
+ model.selectRealm = realmLevel + 1;
DisplayRealmStages();
}
else
{
- List<int> realms = null;
- if (model.TryGetRealmStages(currentStage, out realms))
+ if (cacheRealmLevel < realmLevel)
{
- var index = realms.IndexOf(cacheRealmLevel);
- m_RealmAnimation.DisplayLevelUp(realms.IndexOf(cacheRealmLevel));
+ List<int> realms = null;
+ if (model.TryGetRealmStages(currentStage, out realms))
+ {
+ var index = realms.IndexOf(cacheRealmLevel);
+ m_RealmAnimation.DisplayLevelUp(realms.IndexOf(cacheRealmLevel));
+ }
}
}
cacheRealmLevel = realmLevel;
--
Gitblit v1.8.0