| Fight/Stage/StageLoad.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/HazyRegion/HazyRegionIncidentBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/HazyRegion/HazyRegionIncidentPanel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/HazyRegion/HazyRegionModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/HazyRegion/HazyRegionWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/FlyingShoesTask.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/TaskFeedbackModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Utility/RuntimeLogUtility.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Fight/Stage/StageLoad.cs
@@ -124,6 +124,7 @@ if (needLoadResource) { tasks.Enqueue(new StageLoadProcessor.LoadNewSceneTask(command)); isLoadingScene = true; } if (!command.isClientLoadMap) @@ -152,7 +153,6 @@ WindowCenter.Instance.Close<MainInterfaceWin>(); loadStartTime = Time.time; isLoading = true; isLoadingScene = true; } public void ReportComplete(int mapId, int lineId, bool record) System/HazyRegion/HazyRegionIncidentBehaviour.cs
@@ -139,14 +139,14 @@ void DisplayBase() { var config = HazyRegionConfig.Get(incidentId); //m_DepletionPoint.gameObject.SetActive(!model.InFakeHazyRegion); m_DepletionPoint.gameObject.SetActive(false); m_DepletionPoint.text = Language.Get("HazyRegionPoint", config.point); m_IncidentTitle.text = config.name; m_Icon.SetSprite(config.PortraitID); m_Icon.SetNativeSize(); m_Icon.material = m_SmoothMask.imageMaterials[0]; m_ContainerCrossServer.gameObject.SetActive(!model.InFakeHazyRegion && config.crossServer == 1); m_ContainerMustSign.gameObject.SetActive(incidentType == HazyRegionIncidentType.Precious); m_ContainerMustSign.gameObject.SetActive(false); } void DisplayItems() System/HazyRegion/HazyRegionIncidentPanel.cs
@@ -31,7 +31,7 @@ private void Awake() { m_Back.AddListener(OnBack); //m_Back.AddListener(OnBack); m_Goto.AddListener(Goto); } @@ -45,6 +45,8 @@ requestCount = 0; model.incidentDirty = false; SendRequestPlayerCount(); m_ContainerPoint.gameObject.SetActive(false); DailyQuestActionTimer.Instance.RefreshDailyQuestState -= RefreshDailyQuestState; DailyQuestActionTimer.Instance.RefreshDailyQuestState += RefreshDailyQuestState; @@ -111,7 +113,7 @@ void DisplayBackButton() { m_Back.gameObject.SetActive(!model.InFakeHazyRegion); m_Back.gameObject.SetActive(false); } int Compare(int lhs, int rhs) System/HazyRegion/HazyRegionModel.cs
@@ -257,11 +257,11 @@ switch (incident.state) { case IncidentState.UnStart: if (point < config.point) { error = 3; return false; } //if (point < config.point) //{ // error = 3; // return false; //} break; case IncidentState.Complete: error = 4; System/HazyRegion/HazyRegionWin.cs
@@ -79,7 +79,7 @@ protected override void OnAfterOpen() { if (model.InFakeHazyRegion && stage == HazyRegionStage.Playing) if (stage == HazyRegionStage.Playing) { StartCoroutine(Co_VerifyCompleteAllIncidents()); } @@ -188,7 +188,6 @@ yield return WaitingForSecondConst.WaitMS500; var allComplete = true; bool existAnySatisfyGoto = false; var incidents = model.GetAllIncidents(); if (incidents != null) { @@ -201,26 +200,6 @@ { allComplete = false; } if (incident.state == HazyRegionModel.IncidentState.Processing) { existAnySatisfyGoto = true; } else if (incident.state == HazyRegionModel.IncidentState.UnStart) { var error = 0; if (model.TryGotoIncident(id, false, out error)) { existAnySatisfyGoto = true; } } } } if (!allComplete) { if (!existAnySatisfyGoto && model.point == 0) { allComplete = true; } } } System/MainInterfacePanel/FlyingShoesTask.cs
@@ -345,20 +345,19 @@ m_parent.GetChild(i).GetComponent<FlyingShoesTask>().ImgSelected.SetActive(true); } } m_DeliveryButton.gameObject.SetActive(true); m_DeliveryButton.gameObject.SetActive(false); if (!taskmodel.allMissionDict.ContainsKey(TaskID)) { return; } if ((int)taskmodel.GetTaskStatus(TaskID) > 0) var satisfyFly = true; if (!FuncOpen.Instance.IsFuncOpen(176) || taskmodel.GetTaskStatus(TaskID) > 0) { m_DeliveryButton.gameObject.SetActive(false); IsKaJiBool = true; } else { IsKaJiBool = false; satisfyFly = false; } if (taskmodel.allMissionDict[TaskID].MissionState == 2) @@ -403,14 +402,13 @@ return; } bool isOPenTransferButton = HrefAnalysis.Inst.ContainsKey(taskinfo.show_writing, "flynpc"); if (isOPenTransferButton && !IsKaJiBool) if (satisfyFly && !isOPenTransferButton) { m_DeliveryButton.gameObject.SetActive(true); satisfyFly = false; } else { m_DeliveryButton.gameObject.SetActive(false); } m_DeliveryButton.gameObject.SetActive(satisfyFly); m_ContentText.raycastTarget = false; if (taskmodel._DicTaskInformation.ContainsKey(TaskID)) { System/MainInterfacePanel/TaskFeedbackModel.cs
@@ -152,18 +152,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 { @@ -187,18 +176,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 { @@ -231,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 { @@ -254,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>(); @@ -267,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>(); @@ -302,6 +261,23 @@ } } 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); } } } public void ExecuteGuide(int id) { if (id == 0) Utility/RuntimeLogUtility.cs
@@ -206,11 +206,16 @@ { // ClientSceneManager.Instance.TriggerTest(_triggerID); // GA_NpcFunc.SetNpcFuncVisible(10104003, true); Vector3 ppp; if (ClientSceneManager.Instance.AAA(PlayerDatas.Instance.hero.Pos, new Vector3(6, 0, 39.5f), out ppp)) { Debug.Log("最终....PPP: " + ppp); } // Vector3 ppp; // if (ClientSceneManager.Instance.AAA(PlayerDatas.Instance.hero.Pos, new Vector3(6, 0, 39.5f), out ppp)) // { // Debug.Log("最终....PPP: " + ppp); // } // for (int i = 0; i < 10; ++i) // { // ClientDropItemUtility.Instance.DropInShortTime(PlayerDatas.Instance.hero.Pos, 10427); // } PlayerDatas.Instance.hero.Play(GAStaticDefine.State_IdleHash); } EditorGUILayout.EndHorizontal(); @@ -254,8 +259,10 @@ if (GUILayout.Button("创建PVP敌方")) { var _npc = GAMgr.Instance.ReqClntFightNpc<GA_NpcClientFightBoss>(10103001, E_ActorGroup.Enemy); var _npc = GAMgr.Instance.ReqClntFightNpc<GA_NpcClientFightBoss>(20000, E_ActorGroup.Enemy); _npc.BornPos = _npc.Pos = PlayerDatas.Instance.hero.Pos; PersonalEnemy.Bind(_npc); // BossShowModel.Instance.Start(PlayerDatas.Instance.baseData.MapID, 10103001); // ClientDropItemUtility.Instance.Drop(PlayerDatas.Instance.hero.Pos, // new int[] { 5006, 5301, 5410, 5505, 10543, 1043050,