暂存修改 尝试添加热重载插件

This commit is contained in:
2024-09-23 22:56:51 +08:00
parent 5b79a2d4bb
commit 8f824e0671
373 changed files with 3835 additions and 5709 deletions

View File

@ -15,6 +15,7 @@ using Object = UnityEngine.Object;
using UnityEditor;
#endif
/// <summary>
/// Author: Blastom
/// 通用工具类型代码
@ -37,7 +38,7 @@ public static class CommonUtility
private const float _jumpAnimTime = 1f;
private static float _lastGetUnityTime;
private static int _lastGetTime;
private static int _lastGetTime;
/// <summary>
/// 数组Find方法
@ -104,7 +105,7 @@ public static class CommonUtility
public static void ToCopyClip(string text)
{
var textEditor = new TextEditor {text = text};
var textEditor = new TextEditor { text = text };
textEditor.SelectAll();
textEditor.Copy();
}
@ -171,10 +172,10 @@ public static class CommonUtility
public static void TrimCloneInName(this GameObject gameObject)
{
const string clone = "(Clone)";
var name = gameObject.name;
var name = gameObject.name;
if (name.EndsWith(clone))
{
name = name.Remove(name.Length - clone.Length);
name = name.Remove(name.Length - clone.Length);
gameObject.name = name;
}
}
@ -224,11 +225,11 @@ public static class CommonUtility
/// </summary>
public static void CopyTo(this RectTransform source, RectTransform target)
{
target.pivot = source.pivot;
target.anchorMin = source.anchorMin;
target.anchorMax = source.anchorMax;
target.pivot = source.pivot;
target.anchorMin = source.anchorMin;
target.anchorMax = source.anchorMax;
target.anchoredPosition = source.anchoredPosition;
target.sizeDelta = source.sizeDelta;
target.sizeDelta = source.sizeDelta;
target.SetParent(source.parent, false);
}
@ -279,8 +280,8 @@ public static class CommonUtility
result.AddKey(keyFrame);
}
result.preWrapMode = (WrapMode) keyFrameList[0].PreWrapMode;
result.postWrapMode = (WrapMode) keyFrameList[0].PostWrapMode;
result.preWrapMode = (WrapMode)keyFrameList[0].PreWrapMode;
result.postWrapMode = (WrapMode)keyFrameList[0].PostWrapMode;
}
}
#if UNITY_EDITOR
@ -295,7 +296,7 @@ public static class CommonUtility
/// </summary>
public static float LoopFloat(float source, float minValue, float maxValue)
{
var cycle = maxValue - minValue;
var cycle = maxValue - minValue;
var multiplier = Mathf.Floor((source - minValue) / cycle);
return source - multiplier * cycle;
}
@ -345,7 +346,7 @@ public static class CommonUtility
var target = source as TTarget;
if (target == null)
LogModule.ErrorLog(string.Format("无法将组件{0}转换为{1}, 所在路径{2}", source.GetType(), typeof(TTarget),
source.transform.GetHierarchyName()));
source.transform.GetHierarchyName()));
return target;
}
@ -399,8 +400,8 @@ public static class CommonUtility
/// </summary>
public static Tab_Impact GetMoveSkillImpact(this Tab_SkillEx skillEx)
{
Tab_Impact result = null;
var impactCount = skillEx.getImpactIdCount();
Tab_Impact result = null;
var impactCount = skillEx.getImpactIdCount();
for (var i = 0; i < impactCount; i++)
{
var impactId = skillEx.GetImpactIdbyIndex(i);
@ -432,7 +433,8 @@ public static class CommonUtility
//}
//return hasNext;
return skillEx.NextStageSkillId >= 0 && GameManager.gameManager.PlayerDataPool.GetOwnSkillInfo(skillEx.NextStageSkillId) != null;
return skillEx.NextStageSkillId >= 0 &&
GameManager.gameManager.PlayerDataPool.GetOwnSkillInfo(skillEx.NextStageSkillId) != null;
}
/// <summary>
@ -440,8 +442,8 @@ public static class CommonUtility
/// </summary>
public static Tab_SkillTargetSelector GetSkillSelector(this Tab_SkillEx skillEx)
{
Tab_SkillTargetSelector result = null;
var selectorId = skillEx.GetSelectorIdbyIndex(0);
Tab_SkillTargetSelector result = null;
var selectorId = skillEx.GetSelectorIdbyIndex(0);
if (selectorId > -1)
result = TryGetTable(selectorId, a => TableManager.GetSkillTargetSelectorByID(a));
return result;
@ -494,7 +496,7 @@ public static class CommonUtility
/// </summary>
public static string GetCurrentTimeString(bool showInterval = true)
{
var time = GetCurrentTimeInMilliseconds();
var time = GetCurrentTimeInMilliseconds();
var result = time.ToString();
if (showInterval)
result = string.Format("({0} - {1})", result, time - _lastGetTime);
@ -516,12 +518,12 @@ public static class CommonUtility
/// </summary>
private static int GetCurrentTimeInMilliseconds()
{
return (int) (DateTime.Now - DateTime.Today).TotalMilliseconds;
return (int)(DateTime.Now - DateTime.Today).TotalMilliseconds;
}
public static Vector3 ParseVector3(string source)
{
var result = Vector3.zero;
var result = Vector3.zero;
var segments = source.Split(';');
result.x = float.Parse(segments[0]);
result.y = float.Parse(segments[1]);
@ -597,7 +599,7 @@ public static class CommonUtility
public static int FubenAutoType()
{
var fubenId = GlobeVar.INVALID_ID;
var cache = GameManager.gameManager.PlayerDataPool.EnterSceneCache;
var cache = GameManager.gameManager.PlayerDataPool.EnterSceneCache;
if (cache != null)
fubenId = cache.EnterCopySceneID;
if (fubenId <= GlobeVar.INVALID_ID)
@ -618,8 +620,8 @@ public static class CommonUtility
public static bool IsCopyScene(this Tab_SceneClass sceneClassData)
{
return sceneClassData.SceneID != (int) GameDefine_Globe.SCENE_DEFINE.SCENE_GUILD &&
sceneClassData.Type == (int) GameDefine_Globe.SCENE_TYPE.SCENETYPE_COPYSCENE;
return sceneClassData.SceneID != (int)GameDefine_Globe.SCENE_DEFINE.SCENE_GUILD &&
sceneClassData.Type == (int)GameDefine_Globe.SCENE_TYPE.SCENETYPE_COPYSCENE;
}
public static Tab_Jump GetFinialJumpData(this Tab_Jump jumpData)
@ -681,15 +683,15 @@ public static class CommonUtility
public static Tab_SkillEx GetSkillMaxLevelByBaseId(int baseId)
{
Tab_SkillEx result = null;
var maxLevel = int.MinValue;
var skillExDict = TableManager.GetSkillEx();
Tab_SkillEx result = null;
var maxLevel = int.MinValue;
var skillExDict = TableManager.GetSkillEx();
foreach (var value in skillExDict.Values)
{
var skillEx = value;
if (skillEx.BaseId == baseId && skillEx.Level > maxLevel)
{
result = skillEx;
result = skillEx;
maxLevel = skillEx.Level;
}
}
@ -700,7 +702,7 @@ public static class CommonUtility
// 注C#不支持对泛型限制为枚举
public static T GetMaxEnum<T>() where T : struct, IComparable
{
var values = (T[]) Enum.GetValues(typeof(T));
var values = (T[])Enum.GetValues(typeof(T));
return GetMaxValue(values);
}
@ -735,7 +737,7 @@ public static class CommonUtility
break;
}
startPos = corners[i];
startPos = corners[i];
distance -= length;
}
@ -762,7 +764,7 @@ public static class CommonUtility
/// </summary>
public static float GetTotalDistance(this NavMeshPath path)
{
var length = 0f;
var length = 0f;
var corners = path.corners;
if (corners.Length > 1)
for (var i = 1; i < corners.Length; i++)
@ -799,7 +801,7 @@ public static class CommonUtility
if (mode == ListGetMode.create && result == null)
{
result = new TV {id = id};
result = new TV { id = id };
list.Add(result);
}
@ -863,6 +865,12 @@ public static class CommonUtility
}
#endif
var bundleName = LoadAssetBundle.FixBundleName(LoadAssetBundle.BUNDLE_PATH_GAMERES);
if (AssetManager.instance == null)
{
throw new Exception("AssetManager.instance is null");
}
return AssetManager.instance.LoadAssetSync<T>(bundleName, name);
}
@ -890,8 +898,8 @@ public static class CommonUtility
// LoadAssetBundle.Instance.LoadGameObject(bundleName, assetName, callBack, null, archive);
// }
public static void LoadAssetInstance(string bundleName, string assetName,
LoadBundleAssetCallback<GameObject> callBack, bool archive)
public static void LoadAssetInstance(string bundleName, string assetName,
LoadBundleAssetCallback<GameObject> callBack, bool archive)
{
#if UNITY_EDITOR
if (AssetUpdateManager.useResources)
@ -922,7 +930,7 @@ public class MyTuple<T1, T2>
public MyTuple(T1 first, T2 second)
{
this.first = first;
this.first = first;
this.second = second;
}
}

View File

@ -69,7 +69,7 @@ public class AdvanceCanadvanceCtr
private bool CheckFuncOpen(int id)
{
var table = TableManager.GetFunctionOpenByID(id);
Tab_FunctionOpen table = TableManager.GetFunctionOpenByID(id);
if (table != null)
{
//return table.OpenServerDay <= GlobalData.OpenServerDays && table.OpenVipLv <= GameManager.gameManager.PlayerDataPool.VipCost

View File

@ -25,6 +25,7 @@ public class LoginUILogic : MonoBehaviour
LoginData.Init();
// GuiTextDebug.debug("LoginUILogic awake");
AssetUpdateDownloaderTick.CreateInstance();
print("Init AssetUpdateDownloaderTick");
if (!LoadAssetBundle.Instance)
LoadAssetBundle.CreateInstance();
if (!FirstSceneBg.instance)
@ -35,13 +36,14 @@ public class LoginUILogic : MonoBehaviour
public void Start()
{
Debug.Log("初始化 游戏");
EventDispatcher.Instance.Add(EventId.SdkPhpLogin, OnPhpLoginComplete);
// 在开始执行画质Init防止多余的Shader变体被加载
QualityDetector.InitQuality();
QualitySettings.shadowCascades = 2;
QualitySettings.shadowDistance = 32f;
QualitySettings.shadowCascades = 2;
QualitySettings.shadowDistance = 32f;
QualitySettings.shadowResolution = ShadowResolution.High;
QualitySettings.shadowmaskMode = ShadowmaskMode.Shadowmask;
QualitySettings.shadowmaskMode = ShadowmaskMode.Shadowmask;
QualitySettings.shadowProjection = ShadowProjection.CloseFit;
if (FirstSceneBg.instance)
{
@ -49,7 +51,7 @@ public class LoginUILogic : MonoBehaviour
FirstSceneBg.instance.ShowGameVersion();
}
LoginData.onSdkEvent += OnSdkCallBack;
LoginData.onSdkEvent += OnSdkCallBack;
LoginData.onServerList += OnServerList;
if (_firstLaunch || AssetUpdateManager.useResources)
StartLoadResource();
@ -67,7 +69,7 @@ public class LoginUILogic : MonoBehaviour
_instance = null;
if (!SdkControl.appQuit)
{
LoginData.onSdkEvent -= OnSdkCallBack;
LoginData.onSdkEvent -= OnSdkCallBack;
LoginData.onServerList -= OnServerList;
EventDispatcher.Instance.Remove(EventId.SdkPhpLogin, OnPhpLoginComplete);
}
@ -86,7 +88,7 @@ public class LoginUILogic : MonoBehaviour
AssetUpdateManager.OpenApkUri(jsonAssetInfo.apkUri);
else if (jsonAssetInfo.assetVersion != AssetUpdateManager.assetVersion)
LiteConfirmWin.Open("游戏资源更新", "游戏资源需要更新!\n请重新启动游戏开始更新",
new LiteConfirmButtonData("确定", OnRestartConfirm));
new LiteConfirmButtonData("确定", OnRestartConfirm));
else
StartLoadResource();
}
@ -95,11 +97,12 @@ public class LoginUILogic : MonoBehaviour
{
StartCoroutine(CheckVersionAction());
}
private static void OnRestartConfirm()
{
SdkControl.instance.CloseGame();
}
public static LoginUILogic Instance()
{
return _instance;
@ -119,9 +122,9 @@ public class LoginUILogic : MonoBehaviour
else
{
var segments = data.args.Split(',');
var message = segments.Length > 1 ? segments[1] : "登录失败";
var message = segments.Length > 1 ? segments[1] : "登录失败";
MessageBoxLogic.OpenOKBox("登录失败", message,
() => SdkControl.instance.LoginSdk(false));
() => SdkControl.instance.LoginSdk(false));
}
}
break;
@ -156,14 +159,14 @@ public class LoginUILogic : MonoBehaviour
TryToInitGame();
else
MessageBoxLogic.OpenOKBox(error, error,
() => SdkControl.instance.GetServerList());
() => SdkControl.instance.GetServerList());
}
private void InitUI()
{
GameManager.gameManager.SoundManager.PlaySceneMusic();
LoadAssetBundle.Instance.LoadUI(UIInfo.UiRoot.path, UIInfo.UiRoot.name,
OnUiRootLoaded, new Hashtable());
OnUiRootLoaded, new Hashtable());
}
private void OnUiRootLoaded(string path, GameObject prefab, Hashtable hash)
@ -258,7 +261,7 @@ public class LoginUILogic : MonoBehaviour
public static void RequestRandomName(int maleOrFemale)
{
var packet = (CG_REQ_RANDOMNAME) PacketDistributed.CreatePacket(MessageID.PACKET_CG_REQ_RANDOMNAME);
var packet = (CG_REQ_RANDOMNAME)PacketDistributed.CreatePacket(MessageID.PACKET_CG_REQ_RANDOMNAME);
packet.SetSex(maleOrFemale);
packet.SendPacket();
}
@ -282,7 +285,7 @@ public class LoginUILogic : MonoBehaviour
Complete
}
private LoadStage _LoadStage = LoadStage.None;
private LoadStage _LoadStage = LoadStage.None;
private SceneHandle _loadSceneHandle;
private void TryToInitGame()

View File

@ -23,13 +23,13 @@ public class LoadAssetBundle : MonoBehaviour
public const string atlasPathConvertTable = "AtlasPathConvert";
public const string BUNDLE_MAIN_BASE_UI = "MainBase";
public const string BUNDLE_PATH_MODEL = "model/";
public const string BUNDLE_PATH_PET = "model/";
public const string BUNDLE_PATH_EFFECT = "effect/";
public const string BUNDLE_PATH_UI = "ui/";
public const string BUNDLE_PATH_SOUND = "sounds/";
public const string BUNDLE_PATH_SPRITE = "ui/sprite/commonitem";
public const string BUNDLE_PATH_Other = "other/";
public const string BUNDLE_PATH_MODEL = "model/";
public const string BUNDLE_PATH_PET = "model/";
public const string BUNDLE_PATH_EFFECT = "effect/";
public const string BUNDLE_PATH_UI = "ui/";
public const string BUNDLE_PATH_SOUND = "sounds/";
public const string BUNDLE_PATH_SPRITE = "ui/sprite/commonitem";
public const string BUNDLE_PATH_Other = "other/";
public const string bundleFileExtension = AssetConst.bundleVariant;
public const string BUNDLE_PATH_GAMERES = "gameres";
@ -44,11 +44,11 @@ public class LoadAssetBundle : MonoBehaviour
public const string uiSpriteBundleHeader = "ui/sprite/";
private readonly LoadAssetRequestList<GameObject> _gameObjectList = new LoadAssetRequestList<GameObject>();
private readonly LoadAssetRequestList<Object> _assetList = new LoadAssetRequestList<Object>();
private readonly LoadAssetRequestList<AudioClip> _audioList = new LoadAssetRequestList<AudioClip>();
private readonly LoadAssetRequestList<TextAsset> _textAssetList = new LoadAssetRequestList<TextAsset>();
private readonly LoadAssetRequestList<Object> _assetList = new LoadAssetRequestList<Object>();
private readonly LoadAssetRequestList<AudioClip> _audioList = new LoadAssetRequestList<AudioClip>();
private readonly LoadAssetRequestList<TextAsset> _textAssetList = new LoadAssetRequestList<TextAsset>();
private readonly LoadSpriteRequestList _spriteList = new LoadSpriteRequestList();
private readonly LoadSpriteRequestList _spriteList = new LoadSpriteRequestList();
private readonly LoadRawImageRequestList _rawImageList = new LoadRawImageRequestList();
public AssetPathHub pathHub { get; private set; }
@ -75,20 +75,22 @@ public class LoadAssetBundle : MonoBehaviour
}
var dependencyPath =
AssetConst.persistentDataPath.Open(AssetUtils.GetTextMd5(AssetConst.versionFile) + AssetConst.bundleVariant);
AssetConst.persistentDataPath.Open(AssetUtils.GetTextMd5(AssetConst.versionFile) +
AssetConst.bundleVariant);
AssetDependencyInfo dependencyInfo = null;
if (!File.Exists(dependencyPath))
{
Debug.LogError(
"Cannot find dependency file. You should start the game from AssetUpdate instead of Login!");
"Cannot find dependency file. You should start the game from AssetUpdate instead of Login!");
}
else
dependencyInfo = AssetDependencyInfo.Create(dependencyPath);
Debug.Log("LoaderAssetsBundle");
if (dependencyInfo == null)
{
Debug.LogError("Unable to load dependency file! This is not recoverable!");
LiteConfirmWin.Open("资源错误", "无法加载资源依赖!\n需要重启游戏修复",
new LiteConfirmButtonData("确定", () => SdkControl.instance.CloseGame()));
new LiteConfirmButtonData("确定", () => SdkControl.instance.CloseGame()));
}
else
{
@ -103,7 +105,7 @@ public class LoadAssetBundle : MonoBehaviour
// 后台下载限制到最大一个;主动加载限制到最大三个;
downloadHub.Init(pathHub, new List<AsyncLoadRule>
{
new AsyncLoadRule(0, 1),
new AsyncLoadRule(0, 1),
new AsyncLoadRule(int.MaxValue, 3)
});
downloadHub.onComplete += pathHub.DownloadComplete;
@ -116,6 +118,7 @@ public class LoadAssetBundle : MonoBehaviour
assetManager.Init(bundleManager);
}
}
DontDestroyOnLoad(gameObject);
}
@ -124,7 +127,7 @@ public class LoadAssetBundle : MonoBehaviour
if (!AssetUpdateManager.useResources)
AssetManager.instance.bundleManager.downloadHub.StartBackGroundDownload();
}
public static void CreateInstance()
{
var loadObject = new GameObject("LoadAssetBundle");
@ -144,20 +147,20 @@ public class LoadAssetBundle : MonoBehaviour
private bool IsBundleAndAssetValid(string bundleName, string assetName)
{
return !string.IsNullOrEmpty(bundleName) &&
!string.IsNullOrEmpty(assetName) &&
!bundleName.Equals("-1") &&
!string.IsNullOrEmpty(assetName) &&
!bundleName.Equals("-1") &&
!assetName.Equals("-1");
}
private void LoadAssetFromList<T>(string bundleName, string assetName, LoadBundleAssetCallback<T> callback,
Hashtable hashtable, LoadAssetRequestList<T> list, bool archive) where T : Object
private void LoadAssetFromList<T>(string bundleName, string assetName, LoadBundleAssetCallback<T> callback,
Hashtable hashtable, LoadAssetRequestList<T> list, bool archive) where T : Object
{
// 已知问题,即使已经加载的资源,仍然会产生一次列表推入和回调监听,造成少量性能浪费
// 暂时不修改这个结构,保持当前强健的逻辑流程
list.AddCallback(bundleName, assetName, callback, hashtable);
LoadAssetInternal<T>(bundleName, assetName);
}
private void RemoveAllCallback(string bundleName, string assetName)
{
_gameObjectList.RemoveAllCallback(bundleName, assetName);
@ -168,19 +171,19 @@ public class LoadAssetBundle : MonoBehaviour
_rawImageList.RemoveAllCallback(bundleName, assetName);
}
public void LoadGameObject(string bundleName, string assetName, LoadBundleAssetCallback<GameObject> callback,
Hashtable hashParam, bool archive = false)
public void LoadGameObject(string bundleName, string assetName, LoadBundleAssetCallback<GameObject> callback,
Hashtable hashParam, bool archive = false)
{
if (IsBundleAndAssetValid(bundleName, assetName))
{
bundleName += assetName;
bundleName = FixBundleName(bundleName);
bundleName = FixBundleName(bundleName);
LoadAssetFromList(bundleName, assetName, callback, hashParam, _gameObjectList, archive);
}
}
public void LoadAsset(string bundleName, string assetName, LoadBundleAssetCallback<Object> callback,
Hashtable hashParam, bool archive = false)
public void LoadAsset(string bundleName, string assetName, LoadBundleAssetCallback<Object> callback,
Hashtable hashParam, bool archive = false)
{
if (IsBundleAndAssetValid(bundleName, assetName))
{
@ -225,8 +228,8 @@ public class LoadAssetBundle : MonoBehaviour
}
}
public void LoadUI(string bundleName, string assetName, LoadBundleAssetCallback<GameObject> callback,
Hashtable hashParam, bool archive = true)
public void LoadUI(string bundleName, string assetName, LoadBundleAssetCallback<GameObject> callback,
Hashtable hashParam, bool archive = true)
{
if (IsBundleAndAssetValid(bundleName, assetName))
{
@ -235,8 +238,8 @@ public class LoadAssetBundle : MonoBehaviour
}
}
public void LoadSoundAsync(string bundlePath, string assetName, LoadBundleAssetCallback<AudioClip> callback,
Hashtable hashParam)
public void LoadSoundAsync(string bundlePath, string assetName, LoadBundleAssetCallback<AudioClip> callback,
Hashtable hashParam)
{
if (!string.IsNullOrEmpty(assetName))
if (IsBundleAndAssetValid(bundlePath, assetName))
@ -254,7 +257,7 @@ public class LoadAssetBundle : MonoBehaviour
if (image.texture == null)
{
image.enabled = false;
valid = true;
valid = true;
}
else
{
@ -278,13 +281,14 @@ public class LoadAssetBundle : MonoBehaviour
if (image.sprite == null)
{
image.enabled = false;
valid = true;
valid = true;
}
else
{
valid = !image.sprite.name.Equals(assetName);
}
}
if (valid && IsBundleAndAssetValid(BUNDLE_PATH_SPRITE, assetName))
{
// 试图校正精灵包名
@ -306,7 +310,7 @@ public class LoadAssetBundle : MonoBehaviour
#endif
AssetManager.instance.LoadAsset<T>(bundleName, assetName, this, OnAssetLoadedFinish);
}
private void OnAssetLoadedFinish<T>(string bundleName, string assetName, T asset) where T : Object
{
_gameObjectList.FinishAsset(bundleName, assetName, asset);
@ -316,14 +320,14 @@ public class LoadAssetBundle : MonoBehaviour
_spriteList.FinishAsset(bundleName, assetName, asset);
_rawImageList.FinishAsset(bundleName, assetName, asset);
}
#if UNITY_EDITOR
[Serializable]
public class EditorBundleList
{
private readonly Dictionary<string, string> _assetDataList = new Dictionary<string, string>();
public EditorBundleList(IEnumerable<string> assets)
{
foreach (var asset in assets)
@ -343,27 +347,27 @@ public class LoadAssetBundle : MonoBehaviour
private class EditorResourceAsync
{
public readonly string bundleName;
public readonly string assetName;
public readonly string bundleName;
public readonly string assetName;
public readonly AsyncOperation operation;
public EditorResourceAsync(string bundleName, string assetName, AsyncOperation operation)
{
this.bundleName = bundleName;
this.assetName = assetName;
this.operation = operation;
this.assetName = assetName;
this.operation = operation;
}
}
public const string assetPathHeader = "Assets/Project3D/Resources";
public const string uiSpriteAssetPath = "Assets/Project3D/Sprites";
public const string bundleToAssetPath = "Assets/Editor/Config/BundleToAsset" + AssetConst.bytesExtension;
private Dictionary<string, string> _uiCommonPathDict;
private Dictionary<string, EditorBundleList> _resourcesDict;
private Dictionary<string, string> _uiCommonPathDict;
private Dictionary<string, EditorBundleList> _resourcesDict;
private const int _maxAsyncCount = 1;
private readonly List<EditorResourceAsync> _asyncList = new List<EditorResourceAsync>();
private readonly Queue<MyTuple<string, string>> _pendingList = new Queue<MyTuple<string, string>>();
private const int _maxAsyncCount = 1;
private readonly List<EditorResourceAsync> _asyncList = new List<EditorResourceAsync>();
private readonly Queue<MyTuple<string, string>> _pendingList = new Queue<MyTuple<string, string>>();
private void OnResourcesLoad(AsyncOperation operation)
{
@ -379,6 +383,7 @@ public class LoadAssetBundle : MonoBehaviour
OnAssetLoadedFinish(async.bundleName, async.assetName, resourceRequest.asset);
}
}
while (_asyncList.Count < _maxAsyncCount && _pendingList.Count > 0)
{
var task = _pendingList.Dequeue();
@ -398,6 +403,7 @@ public class LoadAssetBundle : MonoBehaviour
using (var fs = File.OpenRead(dataPath))
_resourcesDict = bitFormatter.Deserialize(fs) as Dictionary<string, EditorBundleList>;
}
if (_resourcesDict == null)
_resourcesDict = new Dictionary<string, EditorBundleList>();
}
@ -405,19 +411,20 @@ public class LoadAssetBundle : MonoBehaviour
EditorBundleList list;
if (!_resourcesDict.TryGetValue(bundleName, out list))
{
var assets = AssetDatabase.GetAssetPathsFromAssetBundle(bundleName + AssetConst.bundleVariant).
Where(a => a.StartsWith(assetPathHeader)).
Select(a => a.RemoveExtension().Substring(assetPathHeader.Length + 1)).ToArray();
var assets = AssetDatabase.GetAssetPathsFromAssetBundle(bundleName + AssetConst.bundleVariant)
.Where(a => a.StartsWith(assetPathHeader))
.Select(a => a.RemoveExtension().Substring(assetPathHeader.Length + 1)).ToArray();
if (assets.Length > 0)
{
list = new EditorBundleList(assets);
list = new EditorBundleList(assets);
_resourcesDict[bundleName] = list;
var bitFormatter = new BinaryFormatter();
var dataPath = Application.dataPath.MoveUp().Open(bundleToAssetPath);
var dataPath = Application.dataPath.MoveUp().Open(bundleToAssetPath);
using (var fs = File.OpenWrite(dataPath))
bitFormatter.Serialize(fs, _resourcesDict);
}
}
var path = list != null
? list.GetAssetPath(assetName.ToLower())
: string.Empty;
@ -434,7 +441,7 @@ public class LoadAssetBundle : MonoBehaviour
request.completed += OnResourcesLoad;
}
}
private void LoadForSimulateMode(string bundleName, string assetName, Type assetType)
{
Object asset = null;
@ -484,7 +491,7 @@ public class LoadAssetBundle : MonoBehaviour
#region load init
public static LoadAssetBundle Instance { get; private set; }
// public void UnloadBundle(string bundleName)
// {
// Debug.Log("Unload Bundle: " + bundleName);
@ -512,7 +519,7 @@ public class LoadAssetBundle : MonoBehaviour
// }
return bundleName.RemoveExtension().ToLower();
}
// /// <summary>
// /// 加载一个AssetBundle如果Bundle已经加载就返回true
// /// </summary>
@ -521,7 +528,7 @@ public class LoadAssetBundle : MonoBehaviour
// bundleName = FixBundleName(bundleName);
// AssetManager.instance.Preload(bundleName, this, OnAssetBundleLoaded);
// }
#endregion
#region
@ -530,6 +537,7 @@ public class LoadAssetBundle : MonoBehaviour
/// 预加载场景电影Bundle
/// </summary>
private readonly List<int> _movieId = new List<int>();
private string _preloadScene;
private static string GetMovieName(int movieId)
@ -544,6 +552,7 @@ public class LoadAssetBundle : MonoBehaviour
movieName = movieData.GetResPathbyIndex(profession);
}
}
return movieName;
}
@ -553,7 +562,7 @@ public class LoadAssetBundle : MonoBehaviour
if (!string.IsNullOrEmpty(movieName))
Instance.LoadGameObject(BUNDLE_PATH_MODEL, movieName, null, null);
}
private void RemoveMoviePreload(int movieId)
{
var movieName = GetMovieName(movieId);
@ -564,7 +573,7 @@ public class LoadAssetBundle : MonoBehaviour
Instance.UnloadAsset(bundleName, movieName);
}
}
public void StartPreloadScene(string sceneName, int movieId)
{
#if UNITY_EDITOR
@ -580,6 +589,7 @@ public class LoadAssetBundle : MonoBehaviour
CleanPreloadScene();
_preloadScene = sceneName;
}
if (!_movieId.Contains(movieId))
AddMoviePreload(movieId);
}
@ -591,9 +601,11 @@ public class LoadAssetBundle : MonoBehaviour
RemoveMoviePreload(id);
_movieId.Clear();
}
#endregion
#region loadScene
/// <summary>
/// 是否允许加载场景
/// </summary>
@ -602,7 +614,7 @@ public class LoadAssetBundle : MonoBehaviour
{
return !AssetManager.instance.IsLoadingScene();
}
public static string GetSceneBundleName(string sceneName)
{
var bundleName = "scene/" + sceneName;
@ -615,7 +627,7 @@ public class LoadAssetBundle : MonoBehaviour
if (!AssetUpdateManager.useResources)
AssetManager.instance.UnloadAllScene();
}
/// <summary>
/// 加载主要场景 - 主要场景加载时,会卸载之前的主要场景
/// </summary>
@ -624,21 +636,23 @@ public class LoadAssetBundle : MonoBehaviour
bool load;
if (AssetUpdateManager.useResources)
{
load = true;
load = true;
loadHandle = null;
SceneManager.LoadScene(assetName);
}
else
{
var bundleName = GetSceneBundleName(assetName);
var current = AssetManager.instance.GetCurrentSceneHandle();
var current = AssetManager.instance.GetCurrentSceneHandle();
load = current == null || current.sceneName == assetName;
if (!load)
load = AllowLoadScene();
loadHandle = load ? AssetManager.instance.LoadScene(bundleName, assetName, mode, allowReload: true) : null;
}
return load;
}
#endregion
#region loadGameRes
@ -647,7 +661,7 @@ public class LoadAssetBundle : MonoBehaviour
{
get { return FixBundleName(BUNDLE_PATH_GAMERES); }
}
#endregion
#region LoadTable
@ -660,8 +674,8 @@ public class LoadAssetBundle : MonoBehaviour
}
#if UNITY_EDITOR
public const string tablePath = "Assets/Project3D/BundleData/Tables3D/";
private Dictionary<string, string> _luaFiles;
public const string tablePath = "Assets/Project3D/BundleData/Tables3D/";
private Dictionary<string, string> _luaFiles;
#endif
private TextAsset LoadTextAsset(string bundleName, string assetName)
{
@ -676,10 +690,11 @@ public class LoadAssetBundle : MonoBehaviour
_luaFiles = new Dictionary<string, string>();
var luaPath = "Assets".Open("Project").Open("Script").Open("LuaScripts") + '/';
var scripts = AssetDatabase.GetAllAssetPaths().Where(a => a.StartsWith(luaPath))
.Where(a => AssetConst.textExtension.Equals(Path.GetExtension(a)));
.Where(a => AssetConst.textExtension.Equals(Path.GetExtension(a)));
foreach (var script in scripts)
_luaFiles.Add(Path.GetFileNameWithoutExtension(script).ToLower(), script);
}
string path;
if (_luaFiles.TryGetValue(assetName.ToLower(), out path))
result = AssetDatabase.LoadAssetAtPath<TextAsset>(path);
@ -693,15 +708,21 @@ public class LoadAssetBundle : MonoBehaviour
}
else
Debug.LogError(string.Format("Unable to load TextAsset {1} from bundle {0}!", bundleName, assetName));
return result;
}
#endif
if (AssetManager.instance == null)
{
throw new Exception("AssetManager is not initialized!");
}
result = AssetManager.instance.LoadAssetSync<TextAsset>(bundleName, assetName);
return result;
}
#endregion
#region LoadScript
// 注之前逻辑是和LoadTable在一起但是没有监听过这个AssetBundle是否加载结束的
@ -714,11 +735,11 @@ public class LoadAssetBundle : MonoBehaviour
}
#endregion
#region Atlas Path Convert
private Dictionary<string, string> _pathConvertDict;
private void CreateAtlasConvert()
{
_pathConvertDict = new Dictionary<string, string>();
@ -743,12 +764,13 @@ public class LoadAssetBundle : MonoBehaviour
else
{
LogModule.ErrorLog(string.Format(
"Try to load asset {0} from {1}, while Asset Load Manager hasn't init path conversion yet!",
assetName, bundleName));
"Try to load asset {0} from {1}, while Asset Load Manager hasn't init path conversion yet!",
assetName, bundleName));
}
return bundleName;
}
#endregion
}
@ -768,7 +790,7 @@ public abstract class LoadAssetRequestBase
protected LoadAssetRequestBase(string bundleName, string assetName)
{
this.bundleName = bundleName;
this.assetName = assetName;
this.assetName = assetName;
}
}
@ -865,7 +887,7 @@ public class LoadSpriteRequest : LoadAssetRequestBase
for (var i = 0; i < callBackList.Count; i++)
if (callBackList[i].first)
{
callBackList[i].first.sprite = sprite;
callBackList[i].first.sprite = sprite;
callBackList[i].first.enabled = true;
if (callBackList[i].second != null)
callBackList[i].second.Invoke(true, callBackList[i].first.gameObject);
@ -926,7 +948,7 @@ public class LoadRawImageRequestList
public void AddCallback(string bundleName, string assetName, RawImage rawImage)
{
var index = _callbackList.GetIndexFromList(bundleName, assetName);
var index = _callbackList.GetIndexFromList(bundleName, assetName);
LoadRawImageRequest request;
if (index < 0)
{
@ -970,7 +992,7 @@ public class LoadRawImageRequestList
item.FinishAsset(asset);
}
}
public void Clear()
{
_callbackList.Clear();
@ -984,7 +1006,7 @@ public class LoadSpriteRequestList
public void AddCallback(string bundleName, string assetName, Image image, LoadSpritesCallback callback)
{
bundleName = LoadAssetBundle.FixBundleName(bundleName);
var index = _callbackList.GetIndexFromList(bundleName, assetName);
var index = _callbackList.GetIndexFromList(bundleName, assetName);
LoadSpriteRequest request;
if (index < 0)
{
@ -1041,10 +1063,10 @@ public class LoadAssetRequestList<T> where T : Object
{
private readonly List<LoadAssetRequest<T>> _callbackList = new List<LoadAssetRequest<T>>();
public void AddCallback(string bundleName, string assetName, LoadBundleAssetCallback<T> callback,
Hashtable hashTable)
public void AddCallback(string bundleName, string assetName, LoadBundleAssetCallback<T> callback,
Hashtable hashTable)
{
var index = _callbackList.GetIndexFromList(bundleName, assetName);
var index = _callbackList.GetIndexFromList(bundleName, assetName);
LoadAssetRequest<T> request;
if (index < 0)
{
@ -1101,7 +1123,7 @@ public class LoadAssetRequestList<T> where T : Object
public class LoadWholeBundleRequest
{
public readonly List<LoadAssetBundleFinish> callbackList = new List<LoadAssetBundleFinish>();
public readonly string name;
public readonly string name;
public LoadWholeBundleRequest(string bundleName)
{

View File

@ -1,9 +1,3 @@
fileFormatVersion: 2
guid: 70ebc6bf11d76d04eab1bff9676c59ef
folderAsset: yes
timeCreated: 1476345254
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
guid: 6dfe2d6cb3b14f3f870254c8e4916047
timeCreated: 1727003772

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 80d2598c92f6c4d46aabaa9aa10bac3a
timeCreated: 1476345263
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 173ca90eb2a4bba449eb1448ae0c9c8f
timeCreated: 1521524570
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: c04107c6c78b1ec4993a95c35761c67b
timeCreated: 1522325569
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 2352f2e4736780f49ae15e7397e18ead
timeCreated: 1547000917
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 31223f4d1d7776445974c530c4c6a35c
timeCreated: 1493091315
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 3c6d937c43f63e640a702ee26a88af7e
timeCreated: 1493091315
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 0c88cf650adcaa54d86d63c84739ccec
timeCreated: 1493364949
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: f68e7ecb6bf00c241b8b5f8b00fbdb00
timeCreated: 1514190636
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: e49776499fcd82947878c2e476b66ee2
timeCreated: 1500039797
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 7789da33796d8714697c673923c0f111
timeCreated: 1553741048
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: fcb5f32c6907f6c4db6417b17dedd874
timeCreated: 1491877150
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 8ce948983b828444f877f4e88743f6b9
timeCreated: 1513392676
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 305c15ea154d62d41842fd9a9f7d734b
timeCreated: 1513407216
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 873820a3b936f204cbdedd7561802829
timeCreated: 1513392676
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 149e4e9d242df764189eb47a7588ea71
timeCreated: 1513392676
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 04fedd4237a011e4089c9d3f824359ff
timeCreated: 1513407216
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: b7ab72cdf2843864b95e8472c41fc74c
timeCreated: 1476345264
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: ea1e33958f4815b41a4cc825aaf10522
timeCreated: 1476345264
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: e1631d7d60b364141b8e9c470ee5595b
timeCreated: 1502088770
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: a255dd7ceacccb049863702a244d174a
timeCreated: 1476345264
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: e811a926209da664ba5709512e1f8d09
timeCreated: 1494917946
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 5274da07b86a09c4182ff5248c0cb10c
timeCreated: 1476345263
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 520584fa8d479a9458ee89f7439c4ef8
timeCreated: 1516780957
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: f867af3b7ffeba94f927649fe8cbece0
timeCreated: 1516780958
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 06f1fe307202b6a48b26af9e6ba7013a
timeCreated: 1516780957
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: e018bed9506d1d04cbb5052c8cb921ff
timeCreated: 1533714582
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: fe9110aadc7679b44a4550aa655c3dd5
timeCreated: 1550742165
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 51cb47db1932a944fb4fadebf30b56c6
timeCreated: 1550742119
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 5b1d60a8ca4831747aa2e5fe86afb3de
timeCreated: 1524647531
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 9032ab87129a95c4fb6e101c12fe3585
timeCreated: 1492153598
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 10818f6de149755488ffa2ba17a77ff3
timeCreated: 1515759760
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: c69ed3deef600cb4ebbc67e6f27c4cef
timeCreated: 1476345264
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: d0ee7ebd19d01164cbc620ccccade2b1
timeCreated: 1476345264
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 3dfdb003c1d126a40875e771291069d3
timeCreated: 1551169517
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: bb8f257ee2f9ef44f8439881d4763fe5
timeCreated: 1476345264
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 6a6f6a8252637c248a36837c7fbdc1a2
timeCreated: 1476345263
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: bbfe176fa4ea47048b8c8195b751623d
timeCreated: 1543319727
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 3c829287336d620428c3623591cd04dd
timeCreated: 1543456801
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: bbd846a821778be429cef70295e3cb0c
timeCreated: 1535703638
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: c86d9458c4371cf458cbcfb90a420893
timeCreated: 1572595281
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: f9e1b995b35c4314193e7432043c0749
timeCreated: 1571302434
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 799a99a269182f44eb6bd55d631f8f1b
timeCreated: 1571107571
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 9f717660b0267ad4d9fa8c14b8f34b1d
timeCreated: 1571107571
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 0823139a98f3017468b491c39910ea23
timeCreated: 1571107571
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 48456fb1a7e702840a7a265730c2dc26
timeCreated: 1571193094
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: b94df52fafe06a540a8d06d6f1439396
timeCreated: 1571823737
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 41e253f541548e14aa083ac10952ac64
timeCreated: 1571811117
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: fa41a5d0d3f2a58498fc9fd379665964
timeCreated: 1520243637
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 236d4063e1d176e4889bc5a0d41cb966
timeCreated: 1520243637
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 09dae66a5988f1f4197bc9fd7fff1fe2
timeCreated: 1520929518
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 3f17fb25566ee9b4b99d2171201ddff8
timeCreated: 1557199904
licenseType: Free
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 111d06c6a6347eb4486e0401d7a45b5c
timeCreated: 1557199904
licenseType: Free
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: edf091e9f62f8104fb91e27acb764445
timeCreated: 1476345264
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 858404f9f3cb83e4c9ce091e3a01cf5a
timeCreated: 1567424838
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 0317fcc8d4c8c5448979f3e5d56f42ee
timeCreated: 1513306127
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: ae2faf7c9954d9b418373e1c55a8f0ed
timeCreated: 1486456865
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 8bc987ca93b400a45a57899b617ea63b
timeCreated: 1538012612
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 4f0923a2d34cd6a408aed061168cb941
timeCreated: 1531452990
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: dffe0436a3fffd84688d449c3e8da11c
timeCreated: 1476345264
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: b9ba80813b282d14f96dbaf2cc5a9914
timeCreated: 1551185531
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: ad92e413d26b07d429c1407fa6507176
timeCreated: 1489043234
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 99f41f918374c4a4f90443941658278f
timeCreated: 1476345263
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: d3ff9b61c79d85e4798ecab232678a0f
timeCreated: 1532503679
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: e40fbaaf12035f242939d258c9677646
timeCreated: 1514963393
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 950d0a594575f21428ef59a8b80a26a2
timeCreated: 1508749260
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 40a508b216ccae241a1dd984b215c4c8
timeCreated: 1542683140
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 0ff8710148b1b55448d71e780e451efb
timeCreated: 1542683140
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 17072a8965be95e469c50dc9f3e78baf
timeCreated: 1545805606
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 15cb7e1725fcd0a4fbcfc309e0c4fb07
timeCreated: 1545805606
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: f0c2b4429cd33044c8d5cbe080dd9bc4
timeCreated: 1545805606
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 362821acdacef5344aa8b057873dfd36
timeCreated: 1506517340
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: bd8ab037db611e84db8e93e0ba38e08d
timeCreated: 1550631807
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 682b6cad3e9d6174394adbb8710f2faa
timeCreated: 1550826461
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: aeca00ed6b8481a4eb8e8568f1f64807
timeCreated: 1476345264
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 79eee5b47c82dfc438da5fe82b931976
timeCreated: 1491624001
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: f5d6d85e4a24c2b43836473c1afdf065
timeCreated: 1491624001
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 1a3f182ecb15b134b9df45bfbdf81612
timeCreated: 1476345262
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: f6abd013bc40d6e4380465a73405462b
timeCreated: 1559551869
licenseType: Free
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 08ac963d2f40d3e428b5f7bb8e4ceb2e
timeCreated: 1489717185
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 1658ae265d6b5ca409222ae99db48f3c
timeCreated: 1476345262
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: d4139542ec49e3249824505bd879357f
timeCreated: 1476345264
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 11bfbfb910ac2394482c0b9a7be7ded8
timeCreated: 1487554745
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 0441d777f86099c4181635c8ffce47de
timeCreated: 1487643233
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 0f6f1e5a7256723498d22306707402ed
timeCreated: 1487667184
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: d8b30ee6d681b434e8c507b279226ed2
timeCreated: 1487658162
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: db8105989ffdc214eac068d487388dc4
timeCreated: 1487554745
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 2a2324f8f4b24414ba78a9626bf2fdda
timeCreated: 1489998031
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: 84d10c37dc9bfbd41abd16175515468d
timeCreated: 1555405874
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 4e71eade639ccf54ba1a897b26c721e6
timeCreated: 1487320395
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 42f10e148e6f7154e98fa9b8dd6fe5f2
timeCreated: 1487320395
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 3f2683cc95a565648a86427e441f6a93
timeCreated: 1487320395
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 9a1431c874c603440b9e4846f50d3f37
timeCreated: 1487320395
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: e03d37bc241547d448c297ae92de1ec2
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
guid: c1bc13d5864040e4cb77c83f2f36a2cd
timeCreated: 1542287089
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: fe2705cb055097245b94dbe2283bea31
timeCreated: 1490601249
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

Some files were not shown because too many files have changed in this diff Show More