| System/Treasure/TreasureAnimation.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Treasure/TreasureData.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Treasure/TreasureLevelUpWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Treasure/TreasureModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Treasure/TreasureUnlockCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Treasure/TreasureUnlockCell.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/Treasure/TreasureAnimation.cs
@@ -278,6 +278,12 @@ var _effect = EffectMgr.Instance.PlayUIEffect(SPIRALSFX, 2700, m_TreasureMeridians[_index].transform.parent, false); _effect.transform.localPosition = _config[_index].position; _duration = _effect.duration; if (_index == _config.stagePointNum - 1 && m_ProgressPosTween.gameObject.activeInHierarchy) { m_ProgressPosTween.Play(true); } while (_timer < _duration) { _timer += Time.deltaTime; @@ -602,7 +608,12 @@ OnAchievementTweenComplete(); } }); m_ProgressPosTween.Play(); Treasure treasure; model.TryGetTreasure(selectTreasureId, out treasure); if (!treasure.IsHighestStage) { m_ProgressPosTween.Play(); } if (OnStepComplete != null) { OnStepComplete(TreasureShowStep.FirstUnLock); @@ -612,7 +623,6 @@ yield return null; } stepComplete = true; Treasure treasure; model.TryGetTreasure(selectTreasureId, out treasure); if (treasure.treasureStages[0].unlockType != TreasureStageUnlock.None) { System/Treasure/TreasureData.cs
@@ -249,9 +249,9 @@ stage = _lv; exp = _exp; hasClickChallenge = _hasClickChallenge; if ((this is HumanTreasure) && IsHighestStage) if ((this is HumanTreasure)) { (this as HumanTreasure).humanState = HumanTreasureState.Potential; (this as HumanTreasure).UpdateTreasureState(); } } @@ -303,7 +303,7 @@ { return m_State; } set private set { m_State = value; ModelCenter.Instance.GetModel<TreasureModel>().HumanTreasureStateChange(base.id); @@ -317,6 +317,28 @@ castSoulRedpoint = _castSoulPoint; } public void UpdateTreasureState() { if (state == TreasureState.Locked) { humanState = HumanTreasureState.Locked; return; } if (state == TreasureState.Collecting) { humanState = HumanTreasureState.Challenge; return; } if (IsHighestStage && FuncOpen.Instance.IsFuncOpen(82)) { humanState = HumanTreasureState.Potential; } else { humanState = HumanTreasureState.CastSoul; } } public Redpoint castSoulRedpoint { get; private set; } }
@@ -43,6 +43,7 @@ [SerializeField] TreasureProperty m_TreasureProperty; [SerializeField] TreasureMeridianBehaviour[] m_TreasureMeridians; [Header("Progress")] [SerializeField] RectTransform m_ContainerPropgress; [SerializeField] Image m_CurrentStageIcon; [SerializeField] Text m_TreasureLevelProgress; [SerializeField] Text m_TreasureStageDesc; @@ -110,7 +111,7 @@ public event Action OnLineStepComplete; public int beforePlayerLv = 0; int beforePlayerLv = 0; #region Built-in protected override void BindController() @@ -397,6 +398,7 @@ else { m_ContainerLevelUp.gameObject.SetActive(true); m_ContainerPropgress.gameObject.SetActive(!m_Treasure.IsHighestStage); m_ContainerPotential.gameObject.SetActive(false); if (model.treasureEntranceShowId == model.selectedTreasure) { @@ -1176,31 +1178,16 @@ m_TreasureStageDesc.text = Language.Get("TreasureLevelUpSkill", _funcCfg.Remark); m_CurrentStageIcon.SetSprite(_funcCfg.Icon); break; //case TreasureStageUnlock.Privilege: // var privilege = m_Treasure.treasureStages[m_Treasure.StageCount - 1]; // var _privilegeCfg = ConfigManager.Instance.GetTemplate<TreasurePrivilegeConfig>(_nextStage.privilege); // if (!FuncOpen.Instance.IsFuncOpen(126)) // { // m_CurrentStageIcon.SetSprite("UnKnowIcon"); // if (!FuncOpen.Instance.IsFuncOpen(126)) // { // var funcConfig = ConfigManager.Instance.GetTemplate<FuncOpenLVConfig>(126); // m_TreasureStageDesc.text = Language.Get("TreasurePrivilegeFuncLimit", funcConfig.LimitLV, funcConfig.Remark); // } // } // else // { // m_CurrentStageIcon.SetSprite(_privilegeCfg.Icon); // if (PlayerDatas.Instance.baseData.LV >= _nextStage.limitLevel) // { // m_TreasureStageDesc.text = _privilegeCfg.Name; // } // else // { // m_TreasureStageDesc.text = Language.Get("TreasurePrivilege_Unlock", _nextStage.limitLevel); // } // } // break; case TreasureStageUnlock.Item: var _itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(_nextStage.item.id); m_CurrentStageIcon.SetSprite(_itemConfig.IconKey); m_TreasureStageDesc.text = Language.Get("TreasureLevelUpItem", _itemConfig.ItemName); break; case TreasureStageUnlock.Treasure: var _treasureConfig = ConfigManager.Instance.GetTemplate<TreasureConfig>(_nextStage.treasure); m_CurrentStageIcon.SetSprite(_treasureConfig.Icon); m_TreasureStageDesc.text = Language.Get("TreasureLevelUpTreasure", _treasureConfig.Name); break; } } else System/Treasure/TreasureModel.cs
@@ -279,7 +279,7 @@ if ((treasure is HumanTreasure)) { var humanTreasure = treasure as HumanTreasure; humanTreasure.humanState = HumanTreasureState.Locked; humanTreasure.UpdateTreasureState(); } } } @@ -513,14 +513,7 @@ if (treasure is HumanTreasure) { var humanTreasure = treasure as HumanTreasure; if (humanTreasure.IsHighestStage && FuncOpen.Instance.IsFuncOpen(82)) { humanTreasure.humanState = HumanTreasureState.Potential; } else { humanTreasure.humanState = HumanTreasureState.CastSoul; } humanTreasure.UpdateTreasureState(); UpdateCastSoulRedpoint(treasure.id); if (GetTreasureUnlockShow(TreasureCategory.Human) == treasure.id) { @@ -588,7 +581,7 @@ treasure.state = TreasureState.Collecting; if ((TreasureCategory)config.Category == TreasureCategory.Human) { (treasure as HumanTreasure).humanState = HumanTreasureState.Challenge; (treasure as HumanTreasure).UpdateTreasureState(); } if ((TreasureCategory)config.Category == TreasureCategory.Demon) { @@ -775,11 +768,7 @@ Treasure treasure; TryGetTreasure(list[i], out treasure); var humanTreasure = treasure as HumanTreasure; if (treasure.state == TreasureState.Collected && treasure.IsHighestStage && humanTreasure.humanState != HumanTreasureState.Potential) { humanTreasure.humanState = HumanTreasureState.Potential; } humanTreasure.UpdateTreasureState(); if (!serverInited || !treasure.IsHighestStage) { continue; @@ -1005,7 +994,7 @@ if (_pretreasure == null || _pretreasure.state == TreasureState.Collected) { treasure.state = TreasureState.Collecting; (treasure as HumanTreasure).humanState = HumanTreasureState.Challenge; (treasure as HumanTreasure).UpdateTreasureState(); collectingHuman = treasure.id; if (serverInited) { System/Treasure/TreasureUnlockCell.cs
New file @@ -0,0 +1,76 @@ using System.Collections; using System.Collections.Generic; using TableConfig; using UnityEngine; using UnityEngine.UI; namespace Snxxz.UI { public class TreasureUnlockCell : CellView { [SerializeField] Image m_Icon; [SerializeField] Text m_Func; [SerializeField] Image m_Cutline; [SerializeField] Button m_Button; TreasureModel model { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } } public void Display(int id, int stage, bool last = false) { m_Cutline.gameObject.SetActive(!last); m_Button.RemoveAllListeners(); Treasure treasure; if (model.TryGetTreasure(id, out treasure)) { var treasureStage = treasure.treasureStages.Find((x) => { return x.stage == stage; }); if (treasureStage != null) { switch (treasureStage.unlockType) { case TreasureStageUnlock.Skill: var skillConfig = ConfigManager.Instance.GetTemplate<SkillConfig>(treasureStage.GetSkill(PlayerDatas.Instance.baseData.Job)); if (skillConfig != null) { m_Icon.SetSprite(skillConfig.IconName); m_Func.text = Language.Get("TreasureUnlockNewSkill"); } break; case TreasureStageUnlock.Func: var funcConfig = ConfigManager.Instance.GetTemplate<FuncOpenLVConfig>(treasureStage.func); if (funcConfig != null) { m_Icon.SetSprite(funcConfig.Icon); m_Func.text = Language.Get("TreasureUnlockNewFunc"); } break; case TreasureStageUnlock.Treasure: var treasureConfig = ConfigManager.Instance.GetTemplate<TreasureConfig>(treasureStage.treasure); if (treasureConfig != null) { m_Icon.SetSprite(treasureConfig.Icon); m_Func.text = Language.Get("TreasureUnlockNewTreasure"); } break; } m_Button.AddListener(() => { if (model.treasureStepUpShow) { return; } model.selectedStage = treasureStage.stage; if (!WindowCenter.Instance.CheckOpen<TreasureStageTipWin>()) { TreasureStageTipWin.SetTargetPosition(m_Button.transform as RectTransform); WindowCenter.Instance.Open<TreasureStageTipWin>(); } }); } } } } }
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: 77f99fdc05a9d774ab1f11302d406df8 timeCreated: 1534492640 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant:
