| Core/GameEngine/Login/Launch.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Alchemy/AlchemyUseDrugWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/BossShow/ShowActor.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Dungeon/TrialDungeonEntranceWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/FairyAu/FairyAuTaskWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/HazyRegion/HazyRegionCyclicScroll.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/HazyRegion/HazyRegionIncidentPanel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/TaskFeedbackModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Skill/ExpertSkillSelectWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/GameEngine/Login/Launch.cs
@@ -53,6 +53,7 @@ tasks.Enqueue(getVersionInfoTask); break; case RuntimePlatform.Android: tasks.Enqueue(getVersionInfoTask); tasks.Enqueue(assetCopyTask); tasks.Enqueue(assetDecompressTask); break; System/Alchemy/AlchemyUseDrugWin.cs
@@ -124,7 +124,7 @@ private void AlchemyDrugUseRefresh() { DisplayDrugs(); m_Controller.m_Scorller.RefreshActiveCellViews(); } private void OnRefreshCell(ScrollerDataType type, CellView cell) @@ -137,7 +137,7 @@ { if (packType == PackType.Item && displayItems.Contains(itemId)) { DisplayDrugs(); m_Controller.m_Scorller.RefreshActiveCellViews(); } } System/BossShow/ShowActor.cs
@@ -17,6 +17,7 @@ private Animator m_Animator; private RuntimeAnimatorController m_CacheAnimator; private int m_CacheLayer; private int m_CacheEffectLayer; private Vector3 m_CacheScale; SFXController sfxController; @@ -153,6 +154,7 @@ sfxController = SFXPlayUtility.Instance.Play(actorShowModel.effect[m_Index], m_Model.transform); if (sfxController != null) { m_CacheEffectLayer = sfxController.gameObject.layer; sfxController.duration = 0; var _animNodde = sfxController.GetComponent<Animator>("Animation"); if (_animNodde) @@ -217,6 +219,7 @@ if (sfxController != null) { sfxController.gameObject.SetLayer(m_CacheEffectLayer, true); SFXPlayUtility.Instance.Release(sfxController); sfxController = null; } System/Dungeon/TrialDungeonEntranceWin.cs
@@ -64,7 +64,7 @@ { var frame = this.GetComponentInChildren<SecondFrameLoader>(); frame.Create(); m_Title = frame.GetComponent<Text>(); m_Title = frame.GetComponentInChildren<Text>(); close = frame.GetComponentInChildren<Button>(); } } System/FairyAu/FairyAuTaskWin.cs
@@ -15,7 +15,7 @@ namespace Snxxz.UI { public class FairyAuTaskWin : Window public class FairyAuTaskWin : Window, SecondWindowInterface { [SerializeField] ImageEx m_ReceiveImage;//奖励按钮 [SerializeField] Button Btn_Receive;//奖励领取 @@ -41,7 +41,7 @@ private ImpactRankModel.RankAwardItem RankAwardItem = new ImpactRankModel.RankAwardItem();//新增奖励物品 TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } PlayerMainDate m_MainModel; PlayerMainDate mainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } } PlayerDeadModel _deadModel; @@ -194,7 +194,7 @@ private void AccomplishTask() { if ((int)UIHelper.GetMoneyCnt(1) >= _requireNumber ) if ((int)UIHelper.GetMoneyCnt(1) >= _requireNumber) { taskmodel.CompletionOfTask(TaskID); taskmodel.FairyAuBool = true; @@ -220,7 +220,7 @@ WindowCenter.Instance.Close<FairyAuTaskWin>(); WindowCenter.Instance.Open<MainInterfaceWin>(); ObjectiveText.ExcuteHref(); TaskAllocation.Instance.TaskTime =TimeUtility.ServerNow; TaskAllocation.Instance.TaskTime = TimeUtility.ServerNow; } void CloseButton()//关闭按钮 @@ -352,7 +352,7 @@ Btn_Leave.gameObject.SetActive(false); RoundText_L.text = Language.Get("FairyAuTaskWin_Text3", SetNumberOfRounds(2)); RoundText_R.text = Language.Get("FairyAuTaskWin_Text4", taskmodel.FairyAuTaskCount_Round); Text_FinishRound.text = string.Format("{0}/{0}",taskmodel.FairyAuTaskCount_Day); Text_FinishRound.text = string.Format("{0}/{0}", taskmodel.FairyAuTaskCount_Day); m_Slider.value = 1f; ObjectiveText.text = Language.Get("CompleteTheXianmengMission_Z"); ObjectiveText.color = UIHelper.GetUIColor(TextColType.NavyBrown); @@ -421,14 +421,14 @@ Equation.Instance.Clear(); int playerlv = PlayerDatas.Instance.baseData.LV; var config = PlayerLVConfig.Get(playerlv); Equation.Instance.AddKeyValue("reExp", (ulong)config.ReExp*5625); Equation.Instance.AddKeyValue("reExp", (ulong)config.ReExp * 5625); Number = Equation.Instance.Eval<ulong>("reExp"); } ItemCellModel cellModel = new ItemCellModel(AwardItemList[i].id, true, Number); itemCell.Init(cellModel); int tab = i; itemCell.button.SetListener(()=> itemCell.button.SetListener(() => { ItemTipUtility.Show(AwardItemList[tab].id); }); @@ -455,12 +455,12 @@ _award.Add(_job, new Item(_itemArray[j][0], _itemArray[j][1])); } } RankAwardItem = _award; } } private string SetNumberOfRounds(int num) private string SetNumberOfRounds(int num) { string Str = string.Empty; switch (num) System/HazyRegion/HazyRegionCyclicScroll.cs
@@ -1,4 +1,5 @@ using System.Collections; using System; using System.Collections; using System.Collections.Generic; using UnityEngine; namespace Snxxz.UI @@ -19,6 +20,8 @@ } Coroutine m_Coroutine = null; public event Action animationComplete; public override void Init<T>(List<T> _datas, bool _stepByStep = false) { @@ -70,6 +73,11 @@ yield return WaitingForSecondConst.GetWaitForSeconds(time); if (animationComplete != null) { animationComplete(); } IsPlaying = false; } } System/HazyRegion/HazyRegionIncidentPanel.cs
@@ -48,6 +48,9 @@ DailyQuestActionTimer.Instance.RefreshDailyQuestState -= RefreshDailyQuestState; DailyQuestActionTimer.Instance.RefreshDailyQuestState += RefreshDailyQuestState; m_CyclicScroll.animationComplete -= AnimationComplete; m_CyclicScroll.animationComplete += AnimationComplete; } void DisplayIncidents() @@ -320,10 +323,19 @@ DisplayGotoState(); } private void AnimationComplete() { if (!NewBieCenter.Instance.IsGuideCompleted(58)) { NewBieCenter.Instance.StartNewBieGuide(58); } } public void Dispose() { m_CyclicScroll.Dispose(); DailyQuestActionTimer.Instance.RefreshDailyQuestState -= RefreshDailyQuestState; m_CyclicScroll.animationComplete -= AnimationComplete; } #if UNITY_EDITOR System/MainInterfacePanel/TaskFeedbackModel.cs
@@ -13,6 +13,7 @@ PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } } TaskModel taskModel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } } AlchemyModel alchemyModel { get { return ModelCenter.Instance.GetModel<AlchemyModel>(); } } public override void Init() { @@ -63,6 +64,7 @@ } break; case TaskFeedbackType.ItemCount: case TaskFeedbackType.AlchemyItem: { var array = LitJson.JsonMapper.ToObject<int[][]>(config.items); if (array != null) @@ -150,21 +152,43 @@ int condition = 0; if (IsSatisfyCondition(feedback, out condition)) { var guide = config.succGuide; if (guide != 0 && !NewBieCenter.Instance.IsGuideCompleted(guide)) ExecuteSuccFeedback(taskId); } else { if (config.remind != null && config.remind.Length > 0) { ExecuteGuide(guide); var index = Mathf.Min(condition, config.remind.Length - 1); SysNotifyMgr.Instance.ShowTip(config.remind[index]); } else if (feedback.failFuns != null) { var index = Mathf.Min(condition, feedback.failFuns.Count - 1); taskFeedbackFuncs.Clear(); taskFeedbackFuncs.AddRange(feedback.failFuns[index]); WindowCenter.Instance.Open<TaskFeedbackFuncWin>(); } } } break; case TaskFeedbackType.AlchemyItem: { int condition = 0; if (IsSatisfyCondition(feedback, out condition)) { ExecuteSuccFeedback(taskId); } else { Int2 position; if (alchemyModel.IsStoveAlcheming((AlchemyType)config.condition, out position)) { if (config.jump != 0) { WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump); return; } } } else { if (config.remind != null && config.remind.Length > 0) { var index = Mathf.Min(condition, config.remind.Length - 1); @@ -185,18 +209,7 @@ int condition = 0; if (IsSatisfyCondition(feedback, out condition)) { var guide = config.succGuide; if (guide != 0 && !NewBieCenter.Instance.IsGuideCompleted(guide)) { ExecuteGuide(guide); } else { if (config.jump != 0) { WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump); } } ExecuteSuccFeedback(taskId); } else { @@ -208,7 +221,8 @@ } if (feedback.failFuns != null) { var index = Mathf.Min(condition, feedback.failFuns.Count - 1); var taskIndex = feedback.IndexOfSideTasks(condition); var index = Mathf.Min(taskIndex, feedback.failFuns.Count - 1); taskFeedbackFuncs.Clear(); taskFeedbackFuncs.AddRange(feedback.failFuns[index]); WindowCenter.Instance.Open<TaskFeedbackFuncWin>(); @@ -221,30 +235,21 @@ int condition = 0; if (IsSatisfyCondition(feedback, out condition)) { var guide = config.succGuide; if (guide != 0 && !NewBieCenter.Instance.IsGuideCompleted(guide)) { ExecuteGuide(guide); } else { if (config.jump != 0) { WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump); } } ExecuteSuccFeedback(taskId); } else { if (config.remind != null && config.remind.Length > 0) { var taskIndex = feedback.IndexOfSideTasks(condition); var index = Mathf.Min(taskIndex, config.remind.Length - 1); var index = Mathf.Min(condition, config.remind.Length - 1); SysNotifyMgr.Instance.ShowTip(config.remind[index]); } if (feedback.failFuns != null) { var index = Mathf.Min(condition, feedback.failFuns.Count - 1); var sideTaskId = 0; IsSatisfySideTask(feedback.sideTasks, out sideTaskId); var taskIndex = feedback.IndexOfSideTasks(sideTaskId); var index = Mathf.Min(taskIndex, feedback.failFuns.Count - 1); taskFeedbackFuncs.Clear(); taskFeedbackFuncs.AddRange(feedback.failFuns[index]); WindowCenter.Instance.Open<TaskFeedbackFuncWin>(); @@ -252,6 +257,23 @@ } } break; } } } public void ExecuteSuccFeedback(int id) { var config = TaskFeedbackConfig.Get(id); var guide = config.succGuide; if (guide != 0 && !NewBieCenter.Instance.IsGuideCompleted(guide)) { ExecuteGuide(guide); } else { if (config.jump != 0) { WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump); } } } @@ -327,6 +349,7 @@ return true; case TaskFeedbackType.FightPowerSideTask: return PlayerDatas.Instance.baseData.FightPoint >= config.condition; case TaskFeedbackType.AlchemyItem: case TaskFeedbackType.ItemCount: { if (feedback.items != null) @@ -426,6 +449,7 @@ ItemCount = 8, SkyTowerFightPoint = 9, DemonTreasure = 10, AlchemyItem = 11, } } System/Skill/ExpertSkillSelectWin.cs
@@ -27,6 +27,7 @@ [SerializeField] Text m_ActiveLabel; [SerializeField] UIEffect m_ActiveEffect; [SerializeField] Button m_Select; [SerializeField] UIEffect m_SelectEffect; [SerializeField] Button m_Close1; [SerializeField] Button m_Close2; @@ -228,6 +229,8 @@ var used = selectExpertSkill == selectExpert; m_SelectEffect.StopImediatly(); TreasurePotential expert; if (model.TryGetPotential(selectExpert, out expert)) { @@ -238,6 +241,14 @@ m_Select.gameObject.SetActive(activeLevel > 0 && !satisfyActive && !used); m_Active.gameObject.SetActive(satisfyActive || error == 3); if (m_Select.gameObject.activeSelf) { if (selectExpertSkill == 0) { m_SelectEffect.Play(); } } //m_Active.SetColorful(m_ActiveLabel, satisfyActive); if (satisfyActive || error == 3)