| Core/GameEngine/Model/Config/GetItemWaysConfig.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/GameEngine/Model/Config/GetItemWaysConfig.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/PreFightMission.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/FlyingShoesTask.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/MainInterfaceWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/PlayerMainDate.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/WingTaskJumpWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/WingTaskJumpWin.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Team/TeamModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/GameEngine/Model/Config/GetItemWaysConfig.cs
@@ -1,14 +1,14 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Wednesday, June 06, 2018 //-------------------------------------------------------- using UnityEngine; using System; namespace TableConfig { //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Monday, August 27, 2018 //-------------------------------------------------------- using UnityEngine; using System; namespace TableConfig { public partial class GetItemWaysConfig : ConfigBase { public int ID { get ; private set ; } @@ -18,13 +18,14 @@ public string SelectActive { get ; private set; } public int OpenpanelId { get ; private set ; } public int FuncOpenId { get ; private set ; } public int ActiveType { get ; private set ; } public override string getKey() { return ID.ToString(); } public override void Parse() { } public override void Parse() { try { ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; @@ -40,17 +41,19 @@ OpenpanelId=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0; FuncOpenId=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0; ActiveType=IsNumeric(rawContents[7]) ? int.Parse(rawContents[7]):0; } catch (Exception ex) { DebugEx.Log(ex); } } } } } } } }
@@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 1a2d1561c3b3d9d40b6ff80cbeb37298 timeCreated: 1528265994 timeCreated: 1535360341 licenseType: Pro MonoImporter: serializedVersion: 2 Fight/PreFightMission.cs
@@ -917,6 +917,8 @@ private IEnumerator LookNpcBorn() { GA_Hero.s_MapSwitching = true; // 摄像机移动至石头人出现区域 CameraController.Instance.SetLookTarget(null); CameraController.Instance.transform.position = PlayerDatas.Instance.hero.Pos; @@ -940,11 +942,13 @@ // 回到玩家身上 CameraController.Instance.SetLookTarget(PlayerDatas.Instance.hero.Root); yield return WaitingForSecondConst.WaitMS500; // 显示任务界面 Transform _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/TaskAndTeamTip/TaskListTip"); _temp.gameObject.SetActive(true); WindowCenter.Instance.Get<MainInterfaceWin>().ForceShowTaskPanel(); yield return WaitingForSecondConst.WaitMS500; // 打开引导界面 NewGuideModel _model2 = ModelCenter.Instance.GetModel<NewGuideModel>(); @@ -1438,7 +1442,7 @@ _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/CopyOfThePanel/HighSettingTip/Container_Treasure"); _temp.gameObject.SetActive(true); _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/InGameDownLoadProgress"); _temp.localScale = Vector3.one;
@@ -121,7 +121,7 @@ taskmodel.GetNowTaskID = Task_ID; if (mainModel.TaskId_Skill1.Contains(Task_ID)) if (mainModel.TaskId_Skill1.Contains(Task_ID))//特殊支线任务解锁被动技能的 { if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv) { @@ -147,6 +147,35 @@ } return; } if (mainModel.WingTask == Task_ID && ((int)taskmodel.GetTaskStatus(Task_ID) == 0 || (int)taskmodel.GetTaskStatus(Task_ID) == -5))//关于特殊翅膀任务 { if (playerPack.GetSinglePackModel(PackType.rptItem) == null) { WindowCenter.Instance.Open<WingTaskJumpWin>(); return; } Dictionary<int, ItemModel> BackpackDic = playerPack.GetSinglePackModel(PackType.rptItem).GetPackModelIndexDict(); if (BackpackDic == null) { WindowCenter.Instance.Open<WingTaskJumpWin>(); return; } else { int job = PlayerDatas.Instance.baseData.Job; foreach (var key in BackpackDic.Keys) { ItemModel ItemM = BackpackDic[key]; if (ItemM.chinItemModel.Type == 111 && ItemM.chinItemModel.ExpireTime == 0 && ItemM.chinItemModel.JobLimit/100 == job) { WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.KnapSackFunc1Type2);//跳到背包 return; } } } WindowCenter.Instance.Open<WingTaskJumpWin>(); return; } switch ((int)taskmodel.GetTaskStatus(Task_ID)) { case -5: System/MainInterfacePanel/MainInterfaceWin.cs
@@ -238,7 +238,7 @@ } protected override void OnAfterOpen() { { bool IsBossBool = PlayerDatas.Instance.hero != null && MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//是否在Boss区域 if (onMainModel.IsDead || (onMainModel.IsBossAreaTask && !IsBossBool)) { @@ -286,7 +286,7 @@ } } else { { var isNeutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID); if (isNeutralMap) @@ -448,7 +448,7 @@ private void OnEnterOrExitArea(MapArea.E_Type _areaType, bool _enter) { // DesignDebug.LogError(_areaType + ".." + _enter); // DesignDebug.LogError(_areaType + ".." + _enter); if (PlayerDatas.Instance.baseData.MapID == 10040 && _areaType != MapArea.E_Type.Boss && _enter) { if (Buffmodel.PkType != onMainModel.AreaState) @@ -653,7 +653,7 @@ if (!recordPositionBool) { if (inDungeon || IsBossBool || isNeutralMap) { { if (IsCopyOfThePanel != null) { IsCopyOfThePanel(false); @@ -664,12 +664,12 @@ } CopyOfThePanel.DOLocalMoveY(CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed); m_ContainerBossList.DOLocalMoveY(CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed); m_BossBriefInfos.Unfold(false); m_BossBriefInfos.Unfold(false); } if (!IsBossBool) { if (Vector3.Distance(CopyOfThePanel.position, CopyOfThePosition1.position) > 2 && !inDungeon) { { if (IsCopyOfThePanel != null) { IsCopyOfThePanel(true); @@ -814,6 +814,17 @@ recordPositionBool = !recordPositionBool; } // 前期战斗用强制设置任务位置逻辑 public void ForceShowTaskPanel() { if (onMainModel.IsBossAreaTask) { onMainModel.IsBossAreaTask = false; } m_TaskAndTeamPanel.localPosition = TaskListTipAnchor1.localPosition; TaskSwithBool = !TaskSwithBool; } void ArticleExperience()//关于经验条 { int NowLv = (int)PlayerDatas.Instance.baseData.LV; System/MainInterfacePanel/PlayerMainDate.cs
@@ -124,6 +124,8 @@ } NetworkState = (int)SDKUtility.Instance.NetworkType; GetPassiveSkillTask(); var WingsTask = Config.Instance.Get<FuncConfigConfig>("WingsTask"); WingTask = int.Parse(WingsTask.Numerical1); } //----------关于某些副本可以进行地图挂机 public List<int> OneKeyList = new List<int>(); @@ -139,7 +141,8 @@ public int UnitPrice = 0; public int ItemNumber = 0; public int TaskLv = 0;//任务等级 //-----关于支线翅膀任务的特殊逻辑 public int WingTask = 0; private void GetPassiveSkillTask()//获取任务数据 { TaskId_Skill.Clear(); System/MainInterfacePanel/WingTaskJumpWin.cs
New file @@ -0,0 +1,60 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Monday, August 27, 2018 //-------------------------------------------------------- using System; using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; //特殊任务的翅膀任务 namespace Snxxz.UI { public class WingTaskJumpWin : Window { [SerializeField] Button m_Button1; [SerializeField] Button m_Button2; #region Built-in protected override void BindController() { } protected override void AddListeners() { m_Button1.AddListener(()=> { Close(); WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StoreFunc2); }); m_Button2.AddListener(()=> { Close(); WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.ComposeFunc1); }); } protected override void OnPreOpen() { } protected override void OnAfterOpen() { } protected override void OnPreClose() { } protected override void OnAfterClose() { } #endregion } }
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: 51593e0325bece7459a27808b61a51a9 timeCreated: 1535359328 licenseType: Free MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: System/Team/TeamModel.cs
@@ -724,11 +724,7 @@ { if (_leaveTeam.PlayerID == PlayerDatas.Instance.baseData.PlayerID) { if (!myTeam.iamCaptainer) { ClearAllApplications(); } ClearAllApplications(); myTeam.ClearMembers(); if (myTeamRefreshEvent != null) {
