From bba7ecd4dc236dc80a5fef67f856ecfdd63a63f5 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 07 五月 2019 17:32:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/BetterItemGet/RealmBetterEquipModel .cs | 31 ------
Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs | 13 ++
Core/GameEngine/Login/Launch.cs | 130 +++++++++++++++++--------
System/EquipTrain/EquipTrainModel.cs | 83 ++++++++-------
System/KnapSack/RealmBetterEquipBehaviour.cs | 1
5 files changed, 146 insertions(+), 112 deletions(-)
diff --git a/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs b/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
index 53db24e..fe35c96 100644
--- a/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
+++ b/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)))
diff --git a/Core/GameEngine/Login/Launch.cs b/Core/GameEngine/Login/Launch.cs
index 0f46759..dc8bf7f 100644
--- a/Core/GameEngine/Login/Launch.cs
+++ b/Core/GameEngine/Login/Launch.cs
@@ -362,50 +362,49 @@
private void StandaloneCopyAsset()
{
- if (!SDKUtility.builtinAssetCopyFinished)
+ var targetDirectory = ResourcesPath.Instance.ExternalStorePath;
+ if (!Directory.Exists(targetDirectory))
{
- firstLaunch = true;
- var targetDirectory = ResourcesPath.Instance.ExternalStorePath;
- if (!Directory.Exists(targetDirectory))
+ Directory.CreateDirectory(targetDirectory);
+ }
+
+ var fileNames = new List<string>();
+ var files = new List<FileInfo>();
+ FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, "builtin"), files);
+ foreach (var file in files)
+ {
+ var name = Path.GetFileName(file.FullName);
+ fileNames.Add(StringUtility.Contact("builtin", Path.DirectorySeparatorChar, name));
+ }
+
+ fileNames.Add("builtin_assetbundle");
+ fileNames.Add("builtin_assetbundle.manifest");
+
+ var configFiles = new List<FileInfo>();
+ FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, "config"), configFiles);
+ foreach (var file in configFiles)
+ {
+ var name = Path.GetFileName(file.FullName);
+ fileNames.Add(StringUtility.Contact("config", Path.DirectorySeparatorChar, name));
+ }
+
+ foreach (var item in fileNames)
+ {
+ var fromPath = StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, item);
+ var toPath = StringUtility.Contact(targetDirectory, item);
+
+ if (File.Exists(toPath))
{
- Directory.CreateDirectory(targetDirectory);
+ continue;
}
- var fileNames = new List<string>();
- var files = new List<FileInfo>();
- FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, "builtin"), files);
- foreach (var file in files)
+ var destDirectoryName = Path.GetDirectoryName(toPath);
+ if (!Directory.Exists(destDirectoryName))
{
- var name = Path.GetFileName(file.FullName);
- fileNames.Add(StringUtility.Contact("builtin", Path.DirectorySeparatorChar, name));
+ Directory.CreateDirectory(destDirectoryName);
}
- fileNames.Add("builtin_assetbundle");
- fileNames.Add("builtin_assetbundle.manifest");
-
- var configFiles = new List<FileInfo>();
- FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, "config"), configFiles);
- foreach (var file in configFiles)
- {
- var name = Path.GetFileName(file.FullName);
- fileNames.Add(StringUtility.Contact("config", Path.DirectorySeparatorChar, name));
- }
-
- foreach (var item in fileNames)
- {
- var fromPath = StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, item);
- var toPath = StringUtility.Contact(targetDirectory, item);
-
- var destDirectoryName = Path.GetDirectoryName(toPath);
- if (!Directory.Exists(destDirectoryName))
- {
- Directory.CreateDirectory(destDirectoryName);
- }
-
- File.Copy(fromPath, toPath, true);
- }
-
- LocalSave.SetString("BuiltInAssetCopyCompleted_IOSorStandalone", VersionConfig.Get().version);
+ File.Copy(fromPath, toPath, true);
}
}
@@ -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);
}
diff --git a/System/BetterItemGet/RealmBetterEquipModel .cs b/System/BetterItemGet/RealmBetterEquipModel .cs
index 1b6e5a0..85bb125 100644
--- a/System/BetterItemGet/RealmBetterEquipModel .cs
+++ b/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;
- }
}
}
diff --git a/System/EquipTrain/EquipTrainModel.cs b/System/EquipTrain/EquipTrainModel.cs
index b8b4d60..8bd0191 100644
--- a/System/EquipTrain/EquipTrainModel.cs
+++ b/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();
@@ -23,7 +23,7 @@
static Dictionary<int, int> trainTypes = new Dictionary<int, int>();
Dictionary<int, EquipTrainSet> equipTrains = new Dictionary<int, EquipTrainSet>();
- Redpoint redpoint = new Redpoint(106,910000);
+ Redpoint redpoint = new Redpoint(106, 910000);
bool redpointDirty = false;
LogicUpdate logicUpdate = new LogicUpdate(1);
@@ -57,6 +57,11 @@
{
train.Reset();
}
+ }
+
+ public void OnAfterPlayerDataInitialize()
+ {
+ redpointDirty = true;
}
public void ResetOperateParams()
@@ -167,53 +172,53 @@
GameNetSystem.Instance.SendInfo(equipWash);
};
- if (inevitableCount > 0)
+ if (inevitableCount == 0)
{
- var trainLevel = GetTrainLevel(equipPosition);
- var trainType = GetTrainType(equipPosition.y);
- var config = EquipWashConfig.Get(trainType, trainLevel);
+ processTrain();
+ return;
+ }
- var inevitableNeed = config != null ? config.mustCosts[inevitableCount - 1] : 0;
- var inevitableOwn = packModel.GetItemCountByID(PackType.Item, GeneralDefine.equipTrainMustItemId);
+ var trainLevel = GetTrainLevel(equipPosition);
+ var trainType = GetTrainType(equipPosition.y);
+ var config = EquipWashConfig.Get(trainType, trainLevel);
- var diamondNeed = (inevitableNeed - inevitableOwn) * GetInevitableMaterialPrice();
- var diamondOwn = PlayerDatas.Instance.baseData.diamond;
+ var inevitableNeed = config != null ? config.mustCosts[inevitableCount - 1] : 0;
+ var inevitableOwn = packModel.GetItemCountByID(PackType.Item, GeneralDefine.equipTrainMustItemId);
- if (diamondNeed > diamondOwn)
+ 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 (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) =>
{
- WindowCenter.Instance.Open<RechargeTipWin>();
- return;
- }
-
- if (diamondNeed > 0)
- {
- if (!DayRemind.Instance.GetDayRemind(DayRemind.EQUIPTRAIN_COSTDIAMOND))
+ if (isToggle)
{
- ConfirmCancel.ToggleConfirmCancel(Language.Get("Mail101"),
- Language.Get("EquipWash103", inevitableNeed - inevitableOwn, diamondNeed),
- Language.Get("TodayNoNotify"), (bool ok, bool isToggle) =>
- {
- if (isToggle)
- {
- DayRemind.Instance.SetDayRemind(DayRemind.EQUIPTRAIN_COSTDIAMOND, true);
- }
-
- if (ok)
- {
- processTrain();
- }
- });
+ DayRemind.Instance.SetDayRemind(DayRemind.EQUIPTRAIN_COSTDIAMOND, true);
}
- else
+
+ if (ok)
{
processTrain();
}
- }
- }
- else
- {
- processTrain();
- }
+ });
}
diff --git a/System/KnapSack/RealmBetterEquipBehaviour.cs b/System/KnapSack/RealmBetterEquipBehaviour.cs
index 5ae4a2b..fc39c3f 100644
--- a/System/KnapSack/RealmBetterEquipBehaviour.cs
+++ b/System/KnapSack/RealmBetterEquipBehaviour.cs
@@ -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);
}
}
--
Gitblit v1.8.0