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 System/AssetVersion/AssetVersion.cs
@@ -93,36 +93,46 @@ } } public bool CheckLocalFileValid() public bool CheckLocalFileValid(bool _completeFile) { if (extersion == ".manifest" || extersion == ".bytes" || extersion == ".txt" || extersion == ".dll") if (_completeFile) { var path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, m_RelativePath); var fileInfo = new FileInfo(path); if (!fileInfo.Exists || fileInfo.Length != size || md5 != FileExtersion.GetMD5HashFromFile(path)) { return false; } } else if (string.IsNullOrEmpty(extersion) || extersion.Length == 0) { var path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, m_RelativePath); var fileInfo = new FileInfo(path); var manifestAssetVersion = AssetVersionUtility.GetAssetVersion(StringUtility.Contact(m_RelativePath, ".manifest")); if (!fileInfo.Exists || fileInfo.Length != size || manifestAssetVersion == null || !manifestAssetVersion.CheckLocalFileValid()) { return false; } return fileInfo.Exists && fileInfo.Length == size && md5 == FileExtersion.GetMD5HashFromFile(path); } else { var path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, m_RelativePath); var fileInfo = new FileInfo(path); if (!fileInfo.Exists || fileInfo.Length != size) if (extersion == ".manifest" || extersion == ".bytes" || extersion == ".txt" || extersion == ".dll") { return false; var path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, m_RelativePath); var fileInfo = new FileInfo(path); if (!fileInfo.Exists || fileInfo.Length != size || md5 != FileExtersion.GetMD5HashFromFile(path)) { return false; } } else if (string.IsNullOrEmpty(extersion) || extersion.Length == 0) { var path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, m_RelativePath); var fileInfo = new FileInfo(path); var manifestAssetVersion = AssetVersionUtility.GetAssetVersion(StringUtility.Contact(m_RelativePath, ".manifest")); if (!fileInfo.Exists || fileInfo.Length != size || manifestAssetVersion == null || !manifestAssetVersion.CheckLocalFileValid(false)) { return false; } } else { var path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, m_RelativePath); var fileInfo = new FileInfo(path); if (!fileInfo.Exists || fileInfo.Length != size) { return false; } } }
@@ -91,7 +91,7 @@ { foreach (var assetVersion in assetVersions.Values) { if (!assetVersion.CheckLocalFileValid()) if (!assetVersion.CheckLocalFileValid(false)) { if (assetVersion.IsPriorAsset()) { System/AssetVersion/DownLoadAndDiscompressTask.cs
@@ -3,6 +3,7 @@ using UnityEngine; using System; using Snxxz.UI; using System.Threading; public class DownLoadAndDiscompressTask : Singleton<DownLoadAndDiscompressTask> { @@ -124,8 +125,14 @@ private void OnFileDownLoadCompleted(bool _ok, AssetVersion _assetVersion) { var correctFile = false; if (_ok) { correctFile = _assetVersion.CheckLocalFileValid(true); } if (_ok && correctFile) { okCount++; _assetVersion.localValid = true; } System/MainInterfacePanel/FlyingShoesTask.cs
@@ -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/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/TipPanel.cs
@@ -89,13 +89,27 @@ { if (InGameDownLoad.Instance.CheckDominantDownLoad()) { if (Application.internetReachability == NetworkReachability.ReachableViaLocalAreaNetwork) if (InGameDownTestUtility.enable) { InGameDownLoad.Instance.TryDownLoad(InGameDownLoad.Dominant.Half); if (InGameDownTestUtility.isWifi) { InGameDownLoad.Instance.TryDownLoad(InGameDownLoad.Dominant.Half); } else { InGameDownLoad.Instance.TryDownLoad(InGameDownLoad.Dominant.Whole); } } else { InGameDownLoad.Instance.TryDownLoad(InGameDownLoad.Dominant.Whole); if (Application.internetReachability == NetworkReachability.ReachableViaLocalAreaNetwork) { InGameDownLoad.Instance.TryDownLoad(InGameDownLoad.Dominant.Half); } else { InGameDownLoad.Instance.TryDownLoad(InGameDownLoad.Dominant.Whole); } } } } 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/Realm/ActivateShow.cs
@@ -182,6 +182,7 @@ { activateType = ActivateFunc.TreasureSoul; treasureSoulId = id; titleIconKey = "XT_FBZH_11"; propertyCompares.Clear(); propertyUpDict.Clear(); var model = ModelCenter.Instance.GetModel<TreasureSoulModel>(); System/Realm/RealmPropertyUpWin.cs
@@ -276,6 +276,7 @@ { m_ContainerTreasureSoul.gameObject.SetActive(true); m_TreasureSoulIcon.SetSprite(config.Icon); m_TreasureSoulIcon.SetNativeSize(); m_TreasureSoulName.text = config.Name; } } 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) { System/Treasure/TreasureSoulWin.cs
@@ -248,6 +248,7 @@ m_SelectSoulImg.SetSprite(config.Icon); m_SelectSoulImg.material = special.active ? MaterialUtility.GetUIDefaultGraphicMaterial() : MaterialUtility.GetDefaultSpriteGrayMaterial(); m_SelectSoulImg.SetNativeSize(); if (special.active) {
