| Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/GameEngine/Login/Launch.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/BetterItemGet/RealmBetterEquipModel .cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/EquipTrain/EquipTrainModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/RealmBetterEquipBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
@@ -401,6 +401,19 @@ EditorGUILayout.Space(); #endif #if UNITY_STANDALONE GUILayout.BeginHorizontal(); EditorGUILayout.TextField("EXE Output Path", ApkOutputPath); if (GUILayout.Button("Browse", GUILayout.MaxWidth(75f))) { BrowseForApkOutput(); } GUILayout.EndHorizontal(); EditorGUILayout.Space(); #endif GUILayout.BeginHorizontal(); EditorGUILayout.TextField("SDK Project Path", ClientPackage.SDK_PLUGIN_PROJECT); if (GUILayout.Button("Browse", GUILayout.MaxWidth(75f))) Core/GameEngine/Login/Launch.cs
@@ -362,9 +362,6 @@ private void StandaloneCopyAsset() { if (!SDKUtility.builtinAssetCopyFinished) { firstLaunch = true; var targetDirectory = ResourcesPath.Instance.ExternalStorePath; if (!Directory.Exists(targetDirectory)) { @@ -396,6 +393,11 @@ var fromPath = StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, item); var toPath = StringUtility.Contact(targetDirectory, item); if (File.Exists(toPath)) { continue; } var destDirectoryName = Path.GetDirectoryName(toPath); if (!Directory.Exists(destDirectoryName)) { @@ -403,9 +405,6 @@ } File.Copy(fromPath, toPath, true); } LocalSave.SetString("BuiltInAssetCopyCompleted_IOSorStandalone", VersionConfig.Get().version); } } @@ -548,8 +547,10 @@ AndroidCopyAsset(); break; case RuntimePlatform.IPhonePlayer: IOSCopyAsset(); break; case RuntimePlatform.WindowsPlayer: IOSorStandaloneCopyAsset(); StandaloneCopyAsset(); break; } } @@ -568,8 +569,7 @@ AndroidProcessCopyComplete(); break; case RuntimePlatform.IPhonePlayer: case RuntimePlatform.WindowsPlayer: IOSorStandaloneProcessCopyComplete(); IOSProcessCopyComplete(); break; } } @@ -625,7 +625,7 @@ } } private void IOSorStandaloneCopyAsset() private void IOSCopyAsset() { if (VersionUtility.Instance.versionInfo != null && VersionUtility.Instance.versionInfo.downAsset == 1) { @@ -652,6 +652,52 @@ completedCount = 0; totalCount = copyTasks.Count; } if (totalCount > 0) { done = false; progress = 0f; } else { done = true; } break; case InstalledAsset.NullAsset: done = true; break; } } else { done = true; } } private void StandaloneCopyAsset() { if (VersionUtility.Instance.versionInfo != null && VersionUtility.Instance.versionInfo.downAsset == 1) { switch (VersionConfig.Get().assetAccess) { case InstalledAsset.FullAsset: case InstalledAsset.HalfAsset: case InstalledAsset.IngoreDownLoad: copyTasks = new List<FileInfo>(); FileExtersion.GetAllDirectoryFileInfos(ResourcesPath.Instance.StreamingAssetPath, copyTasks); for (var i = copyTasks.Count - 1; i >= 0; i--) { var fileInfo = copyTasks[i]; var destPath = fileInfo.FullName.Replace(ResourcesPath.Instance.StreamingAssetPath, ResourcesPath.Instance.ExternalStorePath); if (File.Exists(destPath)) { copyTasks.RemoveAt(i); } } completedCount = 0; totalCount = copyTasks.Count; if (totalCount > 0) { @@ -724,7 +770,7 @@ { } private void IOSorStandaloneProcessCopyComplete() private void IOSProcessCopyComplete() { LocalSave.SetString("AssetCopyCompleted_IOSorStandalone", VersionConfig.Get().version); } System/BetterItemGet/RealmBetterEquipModel .cs
@@ -168,20 +168,6 @@ return guid; } private void RemoveItemByEquipPlace(int _place) { var place = _place == 10 ? 9 : _place; var keys = new List<string>(betterEquipModels.Keys); for (int i = keys.Count - 1; i >= 0; i--) { var item = betterEquipModels[keys[i]]; if (item != null && item.config.EquipPlace == place) { betterEquipModels.Remove(keys[i]); } } } private void RemoveLowGradeItemByEquipPlace(int _place, int _score) { var place = _place == 10 ? 9 : _place; @@ -196,23 +182,6 @@ } } private bool TryGetEquipByPlace(int _place, out ItemModel _itemModel) { var place = _place == 10 ? 9 : _place; var keys = new List<string>(betterEquipModels.Keys); for (int i = keys.Count - 1; i >= 0; i--) { var item = betterEquipModels[keys[i]]; if (item != null && item.config.EquipPlace == place) { _itemModel = item; return true; } } _itemModel = null; return false; } } } System/EquipTrain/EquipTrainModel.cs
@@ -6,7 +6,7 @@ namespace Snxxz.UI { [XLua.LuaCallCSharp] public class EquipTrainModel : Model, IBeforePlayerDataInitialize public class EquipTrainModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize { public readonly LogicInt selectedLevel = new LogicInt(); public readonly LogicInt selectedPlace = new LogicInt(); @@ -57,6 +57,11 @@ { train.Reset(); } } public void OnAfterPlayerDataInitialize() { redpointDirty = true; } public void ResetOperateParams() @@ -167,8 +172,12 @@ GameNetSystem.Instance.SendInfo(equipWash); }; if (inevitableCount > 0) if (inevitableCount == 0) { processTrain(); return; } var trainLevel = GetTrainLevel(equipPosition); var trainType = GetTrainType(equipPosition.y); var config = EquipWashConfig.Get(trainType, trainLevel); @@ -176,19 +185,26 @@ var inevitableNeed = config != null ? config.mustCosts[inevitableCount - 1] : 0; var inevitableOwn = packModel.GetItemCountByID(PackType.Item, GeneralDefine.equipTrainMustItemId); if (inevitableOwn >= inevitableNeed) { processTrain(); return; } var diamondNeed = (inevitableNeed - inevitableOwn) * GetInevitableMaterialPrice(); var diamondOwn = PlayerDatas.Instance.baseData.diamond; if (diamondNeed > diamondOwn) { WindowCenter.Instance.Open<RechargeTipWin>(); return; } if (diamondNeed > 0) if (DayRemind.Instance.GetDayRemind(DayRemind.EQUIPTRAIN_COSTDIAMOND)) { if (!DayRemind.Instance.GetDayRemind(DayRemind.EQUIPTRAIN_COSTDIAMOND)) { processTrain(); return; } ConfirmCancel.ToggleConfirmCancel(Language.Get("Mail101"), Language.Get("EquipWash103", inevitableNeed - inevitableOwn, diamondNeed), Language.Get("TodayNoNotify"), (bool ok, bool isToggle) => @@ -203,17 +219,6 @@ processTrain(); } }); } else { processTrain(); } } } else { processTrain(); } }
@@ -80,6 +80,7 @@ var itemConfig = ItemConfig.Get(betterModel.itemId); m_EquipName.text = itemConfig.ItemName; m_EquipName.color = UIHelper.GetUIColor(itemConfig.ItemColor, true); m_EquipBehaviour.button.enabled = false; m_EquipBehaviour.Init(betterModel, true); } }
