| Fight/Actor/State/SMB/Dead_4.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Activity/ActivityModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/EquipGem/EquipEvolutionWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/EquipGem/EquipStrengthFull.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/EquipGem/EquipStrengthRein.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/EquipGem/EquipStrengthUpper.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Realm/RealmAnimationBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Realm/RealmStageBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Realm/RealmWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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); 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; 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; 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; } 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; } 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; } 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; } 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() 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;