Compare commits

..

61 Commits

Author SHA1 Message Date
hevinci
5197d42807 Update CHANGELOG.md 2022-12-04 20:27:27 +08:00
hevinci
7a0f4caa9b Update package.json 2022-12-04 20:27:13 +08:00
hevinci
5bf1d29edc update utility 2022-12-04 20:14:02 +08:00
hevinci
2687466ed4 Update editor file 2022-12-03 23:16:39 +08:00
hevinci
14512d6470 Update samples 2022-12-03 23:16:16 +08:00
hevinci
32268f5a4a Update editor logic
资源收集界面规则选项显示别名
2022-12-03 23:16:04 +08:00
何冠峰
81401ca0b8 Merge pull request #53 from ZensYue/main
[add]Add ShowEditorAlias 添加显示编辑器名字
2022-12-03 20:12:31 +08:00
hevinci
688cc271d5 Update runtime logic
UpdatePackageVersionAsync()方法增加appendTimeTicks参数
2022-12-03 20:03:10 +08:00
hevinci
a290353cfa Update runtime logic
在初始化失败的时候,销毁YooAssets会报异常。
2022-12-03 19:48:17 +08:00
hevinci
6038e7acd6 Update asset system 2022-12-03 19:13:11 +08:00
何冠峰
4abec5a389 Merge pull request #52 from gaozhou/main
为handle 添加 using 支持
2022-12-03 19:00:44 +08:00
hevinci
a2b51a8044 Update samples 2022-12-03 18:49:05 +08:00
hevinci
19cb239746 Update logic code
优化补丁清单格式为二进制。
2022-12-03 18:48:51 +08:00
hevinci
7aab610be5 Add binary buffer class 2022-12-03 18:42:28 +08:00
hevinci
4ec5a126ac Remove BitMask files 2022-12-03 18:07:52 +08:00
zensyue
32643caf51 Merge pull request #1 from ZensYue/dev
Dev
2022-12-02 20:46:13 +08:00
ZensYue
114ebab6ae [bugfix]Convert the show name to the type name 把显示名字转换成类型名字 2022-12-02 20:39:28 +08:00
gaozhou
d1463e1fc6 为handle 添加 using 支持 2022-12-02 14:23:58 +08:00
ZensYue
aa49980231 [add]Add ShowEditorAlias 添加显示编辑器名字 2022-12-02 12:31:15 +08:00
hevinci
2696da092d update samples 2022-11-29 11:07:38 +08:00
hevinci
5415d95f36 Fix #46
修复资源包初始化失败之后,再次初始化提示异常的问题。
2022-11-29 11:06:24 +08:00
hevinci
efa71c8bb7 Update FAQ.md 2022-11-28 22:24:36 +08:00
hevinci
d59df4c561 update document 2022-11-27 15:40:09 +08:00
hevinci
140bcb037f Update CHANGELOG.md 2022-11-26 18:17:22 +08:00
hevinci
2a4384e093 Update package.json 2022-11-26 18:17:20 +08:00
hevinci
5aafed85ed Update CHANGELOG.md 2022-11-26 18:11:34 +08:00
hevinci
6ad4b91c60 Update package.json 2022-11-26 18:11:20 +08:00
hevinci
cd62686316 update editor code
非原生文件收集器自动移除Unity无法识别的文件。
2022-11-26 17:54:42 +08:00
hevinci
dcd606e573 update samples 2022-11-26 17:41:34 +08:00
hevinci
f6f326119c update samples 2022-11-26 17:39:52 +08:00
hevinci
f31e5e0d22 update runtime code 2022-11-26 17:39:35 +08:00
hevinci
abc12d2a1d Update runtime code
增加资源系统销毁方法。
2022-11-26 16:43:05 +08:00
hevinci
b7e2f084b1 Update editor code 2022-11-26 15:31:46 +08:00
hevinci
adf1776b1e Update runtime code
优化调试信息的加载状态显示为文本。
2022-11-26 15:31:35 +08:00
hevinci
fd1edcdedf Fix #45 2022-11-26 15:14:46 +08:00
hevinci
ebc25c401d update sample 2022-11-26 15:09:12 +08:00
hevinci
67574bf759 update samples 2022-11-26 11:29:53 +08:00
hevinci
e94923c3c6 Update AssetSystem 2022-11-26 11:29:39 +08:00
hevinci
5718d57b88 update sample 2022-11-25 21:40:54 +08:00
hevinci
82cff36194 Update samples 2022-11-23 16:46:25 +08:00
hevinci
3e4e2d5eb6 Update space shooter 2022-11-23 12:35:27 +08:00
hevinci
015f09d27b Update runtime code 2022-11-23 12:33:12 +08:00
hevinci
3fedc5b1b3 Update AssetBundleCollector
原生文件打包规则包含文件后缀名
2022-11-21 19:07:34 +08:00
hevinci
4776ab9bd8 Update document 2022-11-21 09:52:18 +08:00
hevinci
3bb01ef9a8 Update CHANGELOG.md 2022-11-19 18:34:43 +08:00
hevinci
0204f5f68f Update package.json 2022-11-19 18:34:39 +08:00
hevinci
217d88beaa Update basic sample 2022-11-19 18:34:31 +08:00
hevinci
77080b3934 Update basic sample 2022-11-19 17:54:41 +08:00
hevinci
83f6dc2f76 Update editor code 2022-11-19 17:54:18 +08:00
hevinci
29b3ca4e69 Update runtime code
重构原生文件加载流程。
2022-11-19 17:54:09 +08:00
hevinci
9394ff49fd Update basic sample 2022-11-18 21:35:42 +08:00
hevinci
49949ecda5 Update runtime code
优化资源包缓存文件清理方式。
2022-11-18 21:33:58 +08:00
hevinci
1dab0f2b19 Update patch system
下载器增加取消方法。
2022-11-18 16:45:56 +08:00
hevinci
1cf03bf049 Update basic sample 2022-11-18 10:21:48 +08:00
何冠峰
c00594738f Update asset system
支持场景文件跨资源包配置。
2022-11-16 16:25:43 +08:00
何冠峰
d5f601b0eb Update runtime code 2022-11-16 14:49:38 +08:00
何冠峰
304bff1f19 Fix #43
修复了打包规则按收集器路径来命名,bundle文件名称显示不正确。
2022-11-16 11:51:01 +08:00
hevinci
ce9e0cd88c Update README.md 2022-11-11 11:02:56 +08:00
hevinci
40903d9ad5 Update runtime code 2022-11-11 11:01:37 +08:00
hevinci
0fc97ad2f1 Update document 2022-11-11 11:01:25 +08:00
hevinci
2bb66ea583 Update README.md 2022-11-11 11:01:11 +08:00
684 changed files with 137639 additions and 16336 deletions

View File

@@ -2,6 +2,91 @@
All notable changes to this package will be documented in this file.
## [1.4.0-preview] - 2022-12-04
### Fixed
- (#46)修复了资源包初始化失败之后,再次初始化发生异常的问题。
- 修复了在初始化失败的之后销毁YooAssets会报异常的问题。
### Changed
- 优化了资源收集界面,可以选择显示中文别名。
- **优化了补丁清单序列化方式,由文本数据修改为二进制数据。**
- 资源操作句柄增加using支持。
## [1.3.7] - 2022-11-26
全新的太空战机Demo !
### Fixed
- (#45)修复了package列表更新触发的异常。
### Added
- 新增了YooAssets.Destroy()资源系统销毁方法。
```C#
/// <summary>
/// 销毁资源系统
/// </summary>
public static void Destroy();
```
### Changed
- 优化了资源收集规则,原生文件打包名称现在已经包含文件后缀名。
- 优化了资源收集规则非原生文件收集器自动移除Unity无法识别的文件。
- 优化了调试信息窗口,列表元素的加载状态显示为文本。
## [1.3.5] - 2022-11-19
### Fixed
- 修复了同步接口加载加密文件失败的问题。
### Added
- 新增了方法AssetsPackage.ClearPackageUnusedCacheFilesAsync()
```c#
/// <summary>
/// 清理本地包裹未使用的缓存文件
/// </summary>
public ClearPackageUnusedCacheFilesOperation ClearPackageUnusedCacheFilesAsync()
```
- 新增了方法AssetsPackage.LoadRawFileAsync()
```c#
/// <summary>
/// 异步加载原生文件
/// </summary>
/// <param name="location">资源的定位地址</param>
public RawFileOperationHandle LoadRawFileAsync(string location)
```
- 新增了方法AssetsPackage.LoadRawFileSync()
```c#
/// <summary>
/// 同步加载原生文件
/// </summary>
/// <param name="location">资源的定位地址</param>
public RawFileOperationHandle LoadRawFileSync(string location)
```
### Changed
- 重命名AssetsPackage.UpdateStaticVersionAsync()为AssetsPackage.UpdatePackageVersionAsync();
- 重命名AssetsPackage.UpdateManifestAsync()为AssetsPackage.UpdatePackageManifestAsync();
### Removed
- 移除了方法YooAssets.ClearUnusedCacheFiles()
- 移除了方法AssetsPackage.GetRawFileAsync()
## [1.3.4] - 2022-11-04
### Fixed

View File

@@ -1,4 +1,5 @@
using UnityEditor;
using UnityEngine;
namespace YooAsset.Editor
{
@@ -9,6 +10,7 @@ namespace YooAsset.Editor
/// </summary>
public static string SimulateBuild(string packageName)
{
Debug.Log($"Begin to create simulate package : {packageName}");
string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultOutputRoot();
BuildParameters buildParameters = new BuildParameters();
buildParameters.OutputRoot = defaultOutputRoot;
@@ -21,7 +23,7 @@ namespace YooAsset.Editor
var buildResult = builder.Run(buildParameters);
if (buildResult.Success)
{
string manifestFileName = YooAssetSettingsData.GetPatchManifestFileName(buildParameters.PackageName, buildParameters.PackageVersion);
string manifestFileName = YooAssetSettingsData.GetPatchManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
string manifestFilePath = $"{buildResult.OutputPackageDirectory}/{manifestFileName}";
return manifestFilePath;
}

View File

@@ -182,13 +182,14 @@ namespace YooAsset.Editor
/// </summary>
internal PatchBundle CreatePatchBundle()
{
string fileHash = PatchInfo.PatchFileHash;
string fileCRC = PatchInfo.PatchFileCRC;
long fileSize = PatchInfo.PatchFileSize;
bool isRawFile = IsRawFile;
byte loadMethod = (byte)LoadMethod;
string[] tags = GetBundleTags();
PatchBundle patchBundle = new PatchBundle(BundleName, fileHash, fileCRC, fileSize, isRawFile, loadMethod, tags);
PatchBundle patchBundle = new PatchBundle();
patchBundle.BundleName = BundleName;
patchBundle.FileHash = PatchInfo.PatchFileHash;
patchBundle.FileCRC = PatchInfo.PatchFileCRC;
patchBundle.FileSize = PatchInfo.PatchFileSize;
patchBundle.IsRawFile = IsRawFile;
patchBundle.LoadMethod = (byte)LoadMethod;
patchBundle.Tags = GetBundleTags();
return patchBundle;
}
}

View File

@@ -45,7 +45,7 @@ namespace YooAsset.Editor
// 拷贝补丁清单文件
{
string fileName = YooAssetSettingsData.GetPatchManifestFileName(buildPackageName, buildPackageVersion);
string fileName = YooAssetSettingsData.GetPatchManifestBinaryFileName(buildPackageName, buildPackageVersion);
string sourcePath = $"{packageOutputDirectory}/{fileName}";
string destPath = $"{streamingAssetsDirectory}/{fileName}";
EditorTools.CopyFile(sourcePath, destPath, true);

View File

@@ -51,18 +51,26 @@ namespace YooAsset.Editor
}
}
// 创建补丁清单文件
// 创建补丁清单文本文
{
string fileName = YooAssetSettingsData.GetPatchManifestJsonFileName(buildParameters.PackageName, buildParameters.PackageVersion);
string filePath = $"{packageOutputDirectory}/{fileName}";
PatchManifest.SerializeToJson(filePath, patchManifest);
BuildRunner.Log($"创建补丁清单文件:{filePath}");
}
// 创建补丁清单二进制文件
string packageHash;
{
string fileName = YooAssetSettingsData.GetPatchManifestFileName(buildParameters.PackageName, buildParameters.PackageVersion);
string fileName = YooAssetSettingsData.GetPatchManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
string filePath = $"{packageOutputDirectory}/{fileName}";
PatchManifest.Serialize(filePath, patchManifest);
PatchManifest.SerializeToBinary(filePath, patchManifest);
packageHash = HashUtility.FileMD5(filePath);
BuildRunner.Log($"创建补丁清单文件:{filePath}");
var patchManifestContext = new PatchManifestContext();
string jsonData = FileUtility.ReadFile(filePath);
patchManifestContext.Manifest = PatchManifest.Deserialize(jsonData);
PatchManifestContext patchManifestContext = new PatchManifestContext();
byte[] bytesData = FileUtility.ReadAllBytes(filePath);
patchManifestContext.Manifest = PatchManifest.DeserializeFromBinary(bytesData);
context.SetContextObject(patchManifestContext);
}

View File

@@ -240,13 +240,15 @@ namespace YooAsset.Editor
return false;
// 忽略Unity无法识别的无效文件
/*
if (type == typeof(UnityEditor.DefaultAsset))
// 注意:只对非原生文件收集器处理
if(PackRuleName != nameof(PackRawFile))
{
UnityEngine.Debug.LogWarning($"Cannot pack default asset : {assetPath}");
return false;
if (type == typeof(UnityEditor.DefaultAsset))
{
UnityEngine.Debug.LogWarning($"Cannot pack default asset : {assetPath}");
return false;
}
}
*/
string fileExtension = System.IO.Path.GetExtension(assetPath);
if (IsIgnoreFile(fileExtension))

View File

@@ -10,13 +10,14 @@ namespace YooAsset.Editor
{
public class AssetBundleCollectorConfig
{
public const string ConfigVersion = "2.1";
public const string ConfigVersion = "2.2";
public const string XmlVersion = "Version";
public const string XmlCommon = "Common";
public const string XmlEnableAddressable = "AutoAddressable";
public const string XmlUniqueBundleName = "UniqueBundleName";
public const string XmlShowPackageView = "ShowPackageView";
public const string XmlShowEditorAlias = "ShowEditorAlias";
public const string XmlPackage = "Package";
public const string XmlPackageName = "PackageName";
@@ -65,6 +66,7 @@ namespace YooAsset.Editor
bool enableAddressable = false;
bool uniqueBundleName = false;
bool showPackageView = false;
bool showEditorAlias = false;
var commonNodeList = root.GetElementsByTagName(XmlCommon);
if (commonNodeList.Count > 0)
{
@@ -75,10 +77,13 @@ namespace YooAsset.Editor
throw new Exception($"Not found attribute {XmlUniqueBundleName} in {XmlCommon}");
if (commonElement.HasAttribute(XmlShowPackageView) == false)
throw new Exception($"Not found attribute {XmlShowPackageView} in {XmlCommon}");
if (commonElement.HasAttribute(XmlShowEditorAlias) == false)
throw new Exception($"Not found attribute {XmlShowEditorAlias} in {XmlCommon}");
enableAddressable = commonElement.GetAttribute(XmlEnableAddressable) == "True" ? true : false;
uniqueBundleName = commonElement.GetAttribute(XmlUniqueBundleName) == "True" ? true : false;
showPackageView = commonElement.GetAttribute(XmlShowPackageView) == "True" ? true : false;
showEditorAlias = commonElement.GetAttribute(XmlShowEditorAlias) == "True" ? true : false;
}
// 读取包裹配置
@@ -153,6 +158,7 @@ namespace YooAsset.Editor
AssetBundleCollectorSettingData.Setting.EnableAddressable = enableAddressable;
AssetBundleCollectorSettingData.Setting.UniqueBundleName = uniqueBundleName;
AssetBundleCollectorSettingData.Setting.ShowPackageView = showPackageView;
AssetBundleCollectorSettingData.Setting.ShowEditorAlias = showEditorAlias;
AssetBundleCollectorSettingData.Setting.Packages.AddRange(packages);
AssetBundleCollectorSettingData.SaveFile();
Debug.Log($"导入配置完毕!");
@@ -183,6 +189,7 @@ namespace YooAsset.Editor
commonElement.SetAttribute(XmlEnableAddressable, AssetBundleCollectorSettingData.Setting.EnableAddressable.ToString());
commonElement.SetAttribute(XmlUniqueBundleName, AssetBundleCollectorSettingData.Setting.UniqueBundleName.ToString());
commonElement.SetAttribute(XmlShowPackageView, AssetBundleCollectorSettingData.Setting.ShowPackageView.ToString());
commonElement.SetAttribute(XmlShowEditorAlias, AssetBundleCollectorSettingData.Setting.ShowEditorAlias.ToString());
root.AppendChild(commonElement);
// 设置Package配置
@@ -296,6 +303,23 @@ namespace YooAsset.Editor
return UpdateXmlConfig(xmlDoc);
}
// 2.1 -> 2.2
if (configVersion == "2.1")
{
// 添加公共元素属性
var commonNodeList = root.GetElementsByTagName(XmlCommon);
if (commonNodeList.Count > 0)
{
XmlElement commonElement = commonNodeList[0] as XmlElement;
if (commonElement.HasAttribute(XmlShowEditorAlias) == false)
commonElement.SetAttribute(XmlShowEditorAlias, "False");
}
// 更新版本
root.SetAttribute(XmlVersion, "2.2");
return UpdateXmlConfig(xmlDoc);
}
return false;
}
}

View File

@@ -23,6 +23,12 @@ namespace YooAsset.Editor
/// </summary>
public bool UniqueBundleName = false;
/// <summary>
/// 是否显示编辑器别名
/// </summary>
public bool ShowEditorAlias = false;
/// <summary>
/// 包裹列表
/// </summary>

View File

@@ -38,92 +38,6 @@ namespace YooAsset.Editor
}
}
public static List<string> GetActiveRuleNames()
{
if (_setting == null)
LoadSettingData();
List<string> names = new List<string>();
foreach (var pair in _cacheActiveRuleTypes)
{
names.Add(pair.Key);
}
return names;
}
public static List<string> GetAddressRuleNames()
{
if (_setting == null)
LoadSettingData();
List<string> names = new List<string>();
foreach (var pair in _cacheAddressRuleTypes)
{
names.Add(pair.Key);
}
return names;
}
public static List<string> GetPackRuleNames()
{
if (_setting == null)
LoadSettingData();
List<string> names = new List<string>();
foreach (var pair in _cachePackRuleTypes)
{
names.Add(pair.Key);
}
return names;
}
public static List<string> GetFilterRuleNames()
{
if (_setting == null)
LoadSettingData();
List<string> names = new List<string>();
foreach (var pair in _cacheFilterRuleTypes)
{
names.Add(pair.Key);
}
return names;
}
public static bool HasActiveRuleName(string ruleName)
{
foreach (var pair in _cacheActiveRuleTypes)
{
if (pair.Key == ruleName)
return true;
}
return false;
}
public static bool HasAddressRuleName(string ruleName)
{
foreach (var pair in _cacheAddressRuleTypes)
{
if (pair.Key == ruleName)
return true;
}
return false;
}
public static bool HasPackRuleName(string ruleName)
{
foreach (var pair in _cachePackRuleTypes)
{
if (pair.Key == ruleName)
return true;
}
return false;
}
public static bool HasFilterRuleName(string ruleName)
{
foreach (var pair in _cacheFilterRuleTypes)
{
if (pair.Key == ruleName)
return true;
}
return false;
}
/// <summary>
/// 加载配置文件
/// </summary>
@@ -146,6 +60,7 @@ namespace YooAsset.Editor
typeof(PackCollector),
typeof(PackGroup),
typeof(PackRawFile),
typeof(PackShaderVariants)
};
var customTypes = EditorTools.GetAssignableTypes(typeof(IPackRule));
@@ -266,7 +181,92 @@ namespace YooAsset.Editor
SaveFile();
}
// 实例类相关
public static List<RuleDisplayName> GetActiveRuleNames()
{
if (_setting == null)
LoadSettingData();
List<RuleDisplayName> names = new List<RuleDisplayName>();
foreach (var pair in _cacheActiveRuleTypes)
{
RuleDisplayName ruleName = new RuleDisplayName();
ruleName.ClassName = pair.Key;
ruleName.DisplayName = GetRuleDisplayName(pair.Key, pair.Value);
names.Add(ruleName);
}
return names;
}
public static List<RuleDisplayName> GetAddressRuleNames()
{
if (_setting == null)
LoadSettingData();
List<RuleDisplayName> names = new List<RuleDisplayName>();
foreach (var pair in _cacheAddressRuleTypes)
{
RuleDisplayName ruleName = new RuleDisplayName();
ruleName.ClassName = pair.Key;
ruleName.DisplayName = GetRuleDisplayName(pair.Key, pair.Value);
names.Add(ruleName);
}
return names;
}
public static List<RuleDisplayName> GetPackRuleNames()
{
if (_setting == null)
LoadSettingData();
List<RuleDisplayName> names = new List<RuleDisplayName>();
foreach (var pair in _cachePackRuleTypes)
{
RuleDisplayName ruleName = new RuleDisplayName();
ruleName.ClassName = pair.Key;
ruleName.DisplayName = GetRuleDisplayName(pair.Key, pair.Value);
names.Add(ruleName);
}
return names;
}
public static List<RuleDisplayName> GetFilterRuleNames()
{
if (_setting == null)
LoadSettingData();
List<RuleDisplayName> names = new List<RuleDisplayName>();
foreach (var pair in _cacheFilterRuleTypes)
{
RuleDisplayName ruleName = new RuleDisplayName();
ruleName.ClassName = pair.Key;
ruleName.DisplayName = GetRuleDisplayName(pair.Key, pair.Value);
names.Add(ruleName);
}
return names;
}
private static string GetRuleDisplayName(string name, Type type)
{
var attribute = EditorAttribute.GetAttribute<DisplayNameAttribute>(type);
if (attribute != null && string.IsNullOrEmpty(attribute.DisplayName) == false)
return attribute.DisplayName;
else
return name;
}
public static bool HasActiveRuleName(string ruleName)
{
return _cacheActiveRuleTypes.Keys.Contains(ruleName);
}
public static bool HasAddressRuleName(string ruleName)
{
return _cacheAddressRuleTypes.Keys.Contains(ruleName);
}
public static bool HasPackRuleName(string ruleName)
{
return _cachePackRuleTypes.Keys.Contains(ruleName);
}
public static bool HasFilterRuleName(string ruleName)
{
return _cacheFilterRuleTypes.Keys.Contains(ruleName);
}
public static IActiveRule GetActiveRuleInstance(string ruleName)
{
if (_cacheActiveRuleInstance.TryGetValue(ruleName, out IActiveRule instance))
@@ -352,6 +352,11 @@ namespace YooAsset.Editor
Setting.UniqueBundleName = uniqueBundleName;
IsDirty = true;
}
public static void ModifyShowEditorAlias(bool showAlias)
{
Setting.ShowEditorAlias = showAlias;
IsDirty = true;
}
// 资源包裹编辑相关
public static AssetBundleCollectorPackage CreatePackage(string packageName)

View File

@@ -20,14 +20,15 @@ namespace YooAsset.Editor
private Button _saveButton;
private List<string> _collectorTypeList;
private List<string> _activeRuleList;
private List<string> _addressRuleList;
private List<string> _packRuleList;
private List<string> _filterRuleList;
private List<RuleDisplayName> _activeRuleList;
private List<RuleDisplayName> _addressRuleList;
private List<RuleDisplayName> _packRuleList;
private List<RuleDisplayName> _filterRuleList;
private Toggle _showPackageToogle;
private Toggle _enableAddressableToogle;
private Toggle _uniqueBundleNameToogle;
private Toggle _showEditorAliasToggle;
private VisualElement _packageContainer;
private ListView _packageListView;
@@ -42,7 +43,7 @@ namespace YooAsset.Editor
private VisualElement _collectorContainer;
private ScrollView _collectorScrollView;
private PopupField<string> _activeRulePopupField;
private PopupField<RuleDisplayName> _activeRulePopupField;
private int _lastModifyPackageIndex = 0;
private int _lastModifyGroupIndex = 0;
@@ -95,6 +96,13 @@ namespace YooAsset.Editor
RefreshWindow();
});
_showEditorAliasToggle = root.Q<Toggle>("ShowEditorAlias");
_showEditorAliasToggle.RegisterValueChangedCallback(evt =>
{
AssetBundleCollectorSettingData.ModifyShowEditorAlias(evt.newValue);
RefreshWindow();
});
// 配置修复按钮
var fixBtn = root.Q<Button>("FixButton");
fixBtn.clicked += FixBtn_clicked;
@@ -236,21 +244,23 @@ namespace YooAsset.Editor
// 分组激活规则
var activeRuleContainer = root.Q("ActiveRuleContainer");
{
_activeRulePopupField = new PopupField<string>("Active Rule", _activeRuleList, 0);
_activeRulePopupField = new PopupField<RuleDisplayName>("Active Rule", _activeRuleList, 0);
_activeRulePopupField.name = "ActiveRuleMaskField";
_activeRulePopupField.style.unityTextAlign = TextAnchor.MiddleLeft;
activeRuleContainer.Add(_activeRulePopupField);
_activeRulePopupField.formatListItemCallback = FormatListItemCallback;
_activeRulePopupField.formatSelectedValueCallback = FormatSelectedValueCallback;
_activeRulePopupField.RegisterValueChangedCallback(evt =>
{
var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
if (selectPackage != null && selectGroup != null)
{
selectGroup.ActiveRuleName = evt.newValue;
selectGroup.ActiveRuleName = evt.newValue.ClassName;
AssetBundleCollectorSettingData.ModifyGroup(selectPackage, selectGroup);
FillGroupViewData();
}
});
activeRuleContainer.Add(_activeRulePopupField);
}
// 刷新窗体
@@ -290,6 +300,9 @@ namespace YooAsset.Editor
{
_showPackageToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShowPackageView);
_enableAddressableToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.EnableAddressable);
_uniqueBundleNameToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.UniqueBundleName);
_showEditorAliasToggle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShowEditorAlias);
_groupContainer.visible = false;
_collectorContainer.visible = false;
@@ -321,6 +334,20 @@ namespace YooAsset.Editor
{
AssetBundleCollectorSettingData.SaveFile();
}
private string FormatListItemCallback(RuleDisplayName ruleDisplayName)
{
if (_showEditorAliasToggle.value)
return ruleDisplayName.DisplayName;
else
return ruleDisplayName.ClassName;
}
private string FormatSelectedValueCallback(RuleDisplayName ruleDisplayName)
{
if (_showEditorAliasToggle.value)
return ruleDisplayName.DisplayName;
else
return ruleDisplayName.ClassName;
}
// 包裹列表相关
private void FillPackageViewData()
@@ -334,7 +361,7 @@ namespace YooAsset.Editor
{
_packageListView.selectedIndex = _lastModifyPackageIndex;
}
if (_showPackageToogle.value)
_packageContainer.style.display = DisplayStyle.Flex;
else
@@ -410,7 +437,7 @@ namespace YooAsset.Editor
_groupListView.itemsSource = selectPackage.Groups;
_groupListView.Rebuild();
if(_lastModifyGroupIndex >=0 && _lastModifyGroupIndex < _groupListView.itemsSource.Count)
if (_lastModifyGroupIndex >= 0 && _lastModifyGroupIndex < _groupListView.itemsSource.Count)
{
_groupListView.selectedIndex = _lastModifyGroupIndex;
}
@@ -460,7 +487,7 @@ namespace YooAsset.Editor
_collectorContainer.visible = true;
_lastModifyGroupIndex = _groupListView.selectedIndex;
_activeRulePopupField.SetValueWithoutNotify(selectGroup.ActiveRuleName);
_activeRulePopupField.SetValueWithoutNotify(GetActiveRuleIndex(selectGroup.ActiveRuleName));
_groupNameTxt.SetValueWithoutNotify(selectGroup.GroupName);
_groupDescTxt.SetValueWithoutNotify(selectGroup.GroupDesc);
_groupAssetTagsTxt.SetValueWithoutNotify(selectGroup.AssetTags);
@@ -564,21 +591,21 @@ namespace YooAsset.Editor
}
if (_enableAddressableToogle.value)
{
var popupField = new PopupField<string>(_addressRuleList, 0);
var popupField = new PopupField<RuleDisplayName>(_addressRuleList, 0);
popupField.name = "PopupField1";
popupField.style.unityTextAlign = TextAnchor.MiddleLeft;
popupField.style.width = 200;
elementBottom.Add(popupField);
}
{
var popupField = new PopupField<string>(_packRuleList, 0);
var popupField = new PopupField<RuleDisplayName>(_packRuleList, 0);
popupField.name = "PopupField2";
popupField.style.unityTextAlign = TextAnchor.MiddleLeft;
popupField.style.width = 150;
popupField.style.width = 230;
elementBottom.Add(popupField);
}
{
var popupField = new PopupField<string>(_filterRuleList, 0);
var popupField = new PopupField<RuleDisplayName>(_filterRuleList, 0);
popupField.name = "PopupField3";
popupField.style.unityTextAlign = TextAnchor.MiddleLeft;
popupField.style.width = 150;
@@ -676,13 +703,15 @@ namespace YooAsset.Editor
});
// Address Rule
var popupField1 = element.Q<PopupField<string>>("PopupField1");
var popupField1 = element.Q<PopupField<RuleDisplayName>>("PopupField1");
if (popupField1 != null)
{
popupField1.index = GetAddressRuleIndex(collector.AddressRuleName);
popupField1.formatListItemCallback = FormatListItemCallback;
popupField1.formatSelectedValueCallback = FormatSelectedValueCallback;
popupField1.RegisterValueChangedCallback(evt =>
{
collector.AddressRuleName = evt.newValue;
collector.AddressRuleName = evt.newValue.ClassName;
AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
if (foldout.value)
{
@@ -692,11 +721,13 @@ namespace YooAsset.Editor
}
// Pack Rule
var popupField2 = element.Q<PopupField<string>>("PopupField2");
var popupField2 = element.Q<PopupField<RuleDisplayName>>("PopupField2");
popupField2.index = GetPackRuleIndex(collector.PackRuleName);
popupField2.formatListItemCallback = FormatListItemCallback;
popupField2.formatSelectedValueCallback = FormatSelectedValueCallback;
popupField2.RegisterValueChangedCallback(evt =>
{
collector.PackRuleName = evt.newValue;
collector.PackRuleName = evt.newValue.ClassName;
AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
if (foldout.value)
{
@@ -705,11 +736,13 @@ namespace YooAsset.Editor
});
// Filter Rule
var popupField3 = element.Q<PopupField<string>>("PopupField3");
var popupField3 = element.Q<PopupField<RuleDisplayName>>("PopupField3");
popupField3.index = GetFilterRuleIndex(collector.FilterRuleName);
popupField3.formatListItemCallback = FormatListItemCallback;
popupField3.formatSelectedValueCallback = FormatSelectedValueCallback;
popupField3.RegisterValueChangedCallback(evt =>
{
collector.FilterRuleName = evt.newValue;
collector.FilterRuleName = evt.newValue.ClassName;
AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
if (foldout.value)
{
@@ -815,7 +848,7 @@ namespace YooAsset.Editor
{
for (int i = 0; i < _addressRuleList.Count; i++)
{
if (_addressRuleList[i] == ruleName)
if (_addressRuleList[i].ClassName == ruleName)
return i;
}
return 0;
@@ -824,7 +857,7 @@ namespace YooAsset.Editor
{
for (int i = 0; i < _packRuleList.Count; i++)
{
if (_packRuleList[i] == ruleName)
if (_packRuleList[i].ClassName == ruleName)
return i;
}
return 0;
@@ -833,11 +866,20 @@ namespace YooAsset.Editor
{
for (int i = 0; i < _filterRuleList.Count; i++)
{
if (_filterRuleList[i] == ruleName)
if (_filterRuleList[i].ClassName == ruleName)
return i;
}
return 0;
}
private RuleDisplayName GetActiveRuleIndex(string ruleName)
{
for (int i = 0; i < _activeRuleList.Count; i++)
{
if (_activeRuleList[i].ClassName == ruleName)
return _activeRuleList[i];
}
return _activeRuleList[0];
}
}
}
#endif

View File

@@ -1,4 +1,4 @@
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements">
<uie:Toolbar name="Toolbar" style="display: flex; flex-direction: row-reverse;">
<ui:Button text="Save" display-tooltip-when-elided="true" name="SaveButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
<ui:Button text="导出" display-tooltip-when-elided="true" name="ExportButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
@@ -7,6 +7,7 @@
</uie:Toolbar>
<ui:VisualElement name="PublicContainer" style="height: 30px; background-color: rgb(67, 67, 67); flex-direction: row; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
<ui:Toggle label="Show Packages" name="ShowPackages" style="width: 196px; -unity-text-align: middle-left;" />
<ui:Toggle label="Show Editor Alias" name="ShowEditorAlias" style="width: 196px; -unity-text-align: middle-left;" />
<ui:Toggle label="Enable Addressable" name="EnableAddressable" style="width: 196px; -unity-text-align: middle-left;" />
<ui:Toggle label="Unique Bundle Name" name="UniqueBundleName" style="width: 196px; -unity-text-align: middle-left;" />
</ui:VisualElement>

View File

@@ -1,9 +1,7 @@

namespace YooAsset.Editor
{
/// <summary>
/// 启用分组
/// </summary>
[DisplayName("启用分组")]
public class EnableGroup : IActiveRule
{
public bool IsActiveGroup()
@@ -12,9 +10,7 @@ namespace YooAsset.Editor
}
}
/// <summary>
/// 禁用分组
/// </summary>
[DisplayName("禁用分组")]
public class DisableGroup : IActiveRule
{
public bool IsActiveGroup()

View File

@@ -2,9 +2,7 @@
namespace YooAsset.Editor
{
/// <summary>
/// 以文件名为定位地址
/// </summary>
[DisplayName("以文件名称为定位地址")]
public class AddressByFileName : IAddressRule
{
string IAddressRule.GetAssetAddress(AddressRuleData data)
@@ -13,9 +11,7 @@ namespace YooAsset.Editor
}
}
/// <summary>
/// 以组名+文件名为定位地址
/// </summary>
[DisplayName("以分组名称+文件名称为定位地址")]
public class AddressByGroupAndFileName : IAddressRule
{
string IAddressRule.GetAssetAddress(AddressRuleData data)
@@ -25,9 +21,7 @@ namespace YooAsset.Editor
}
}
/// <summary>
/// 以收集器名+文件名为定位地址
/// </summary>
[DisplayName("以收集器名称+文件名称为定位地址")]
public class AddressByCollectorAndFileName : IAddressRule
{
string IAddressRule.GetAssetAddress(AddressRuleData data)

View File

@@ -4,9 +4,7 @@ using System.IO;
namespace YooAsset.Editor
{
/// <summary>
/// 收集所有资源
/// </summary>
[DisplayName("收集所有资源")]
public class CollectAll : IFilterRule
{
public bool IsCollectAsset(FilterRuleData data)
@@ -15,9 +13,7 @@ namespace YooAsset.Editor
}
}
/// <summary>
/// 只收集场景
/// </summary>
[DisplayName("收集场景")]
public class CollectScene : IFilterRule
{
public bool IsCollectAsset(FilterRuleData data)
@@ -25,10 +21,8 @@ namespace YooAsset.Editor
return Path.GetExtension(data.AssetPath) == ".unity";
}
}
/// <summary>
/// 只收集预制体
/// </summary>
[DisplayName("收集预制体")]
public class CollectPrefab : IFilterRule
{
public bool IsCollectAsset(FilterRuleData data)
@@ -37,15 +31,13 @@ namespace YooAsset.Editor
}
}
/// <summary>
/// 只收集精灵类型的资源
/// </summary>
[DisplayName("收集精灵类型的纹理")]
public class CollectSprite : IFilterRule
{
public bool IsCollectAsset(FilterRuleData data)
{
var mainAssetType = AssetDatabase.GetMainAssetTypeAtPath(data.AssetPath);
if(mainAssetType == typeof(Texture2D))
if (mainAssetType == typeof(Texture2D))
{
var texImporter = AssetImporter.GetAtPath(data.AssetPath) as TextureImporter;
if (texImporter != null && texImporter.textureType == TextureImporterType.Sprite)
@@ -60,9 +52,7 @@ namespace YooAsset.Editor
}
}
/// <summary>
/// 只收集着色器变种收集文件
/// </summary>
[DisplayName("收集着色器变种集合")]
public class CollectShaderVariants : IFilterRule
{
public bool IsCollectAsset(FilterRuleData data)

View File

@@ -7,10 +7,10 @@ namespace YooAsset.Editor
/// <summary>
/// 以文件路径作为资源包名
/// 注意:每个文件独自打资源包
/// 例如:收集器路径为 "Assets/UIPanel"
/// 例如:"Assets/UIPanel/Shop/Image/backgroud.png" --> "assets/uipanel/shop/image/backgroud.bundle"
/// 例如:"Assets/UIPanel/Shop/View/main.prefab" --> "assets/uipanel/shop/view/main.bundle"
/// 例如:"Assets/UIPanel/Shop/Image/backgroud.png" --> "assets_uipanel_shop_image_backgroud.bundle"
/// 例如:"Assets/UIPanel/Shop/View/main.prefab" --> "assets_uipanel_shop_view_main.bundle"
/// </summary>
[DisplayName("以文件路径作为资源包名")]
public class PackSeparately : IPackRule
{
string IPackRule.GetBundleName(PackRuleData data)
@@ -23,10 +23,10 @@ namespace YooAsset.Editor
/// <summary>
/// 以父类文件夹路径作为资源包名
/// 注意:文件夹下所有文件打进一个资源包
/// 例如:收集器路径为 "Assets/UIPanel"
/// 例如:"Assets/UIPanel/Shop/Image/backgroud.png" --> "assets/uipanel/shop/image.bundle"
/// 例如:"Assets/UIPanel/Shop/View/main.prefab" --> "assets/uipanel/shop/view.bundle"
/// 例如:"Assets/UIPanel/Shop/Image/backgroud.png" --> "assets_uipanel_shop_image.bundle"
/// 例如:"Assets/UIPanel/Shop/View/main.prefab" --> "assets_uipanel_shop_view.bundle"
/// </summary>
[DisplayName("以父类文件夹路径作为资源包名")]
public class PackDirectory : IPackRule
{
public static PackDirectory StaticPackRule = new PackDirectory();
@@ -42,9 +42,10 @@ namespace YooAsset.Editor
/// 以收集器路径下顶级文件夹为资源包名
/// 注意:文件夹下所有文件打进一个资源包
/// 例如:收集器路径为 "Assets/UIPanel"
/// 例如:"Assets/UIPanel/Shop/Image/backgroud.png" --> "assets/uipanel/shop.bundle"
/// 例如:"Assets/UIPanel/Shop/View/main.prefab" --> "assets/uipanel/shop.bundle"
/// 例如:"Assets/UIPanel/Shop/Image/backgroud.png" --> "assets_uipanel_shop.bundle"
/// 例如:"Assets/UIPanel/Shop/View/main.prefab" --> "assets_uipanel_shop.bundle"
/// </summary>
[DisplayName("以收集器路径下顶级文件夹为资源包名")]
public class PackTopDirectory : IPackRule
{
string IPackRule.GetBundleName(PackRuleData data)
@@ -70,12 +71,22 @@ namespace YooAsset.Editor
/// 以收集器路径作为资源包名
/// 注意:收集的所有文件打进一个资源包
/// </summary>
[DisplayName("以收集器路径作为资源包名")]
public class PackCollector : IPackRule
{
string IPackRule.GetBundleName(PackRuleData data)
{
string bundleName = StringUtility.RemoveExtension(data.CollectPath);
return EditorTools.GetRegularPath(bundleName).Replace('/', '_');
string collectPath = data.CollectPath;
if (AssetDatabase.IsValidFolder(collectPath))
{
string bundleName = collectPath;
return EditorTools.GetRegularPath(bundleName).Replace('/', '_');
}
else
{
string bundleName = StringUtility.RemoveExtension(collectPath);
return EditorTools.GetRegularPath(bundleName).Replace('/', '_');
}
}
}
@@ -83,6 +94,7 @@ namespace YooAsset.Editor
/// 以分组名称作为资源包名
/// 注意:收集的所有文件打进一个资源包
/// </summary>
[DisplayName("以分组名称作为资源包名")]
public class PackGroup : IPackRule
{
string IPackRule.GetBundleName(PackRuleData data)
@@ -92,9 +104,10 @@ namespace YooAsset.Editor
}
/// <summary>
/// 原生文件打包模式
/// 打包原生文件
/// 注意:原生文件打包支持:图片,音频,视频,文本
/// </summary>
[DisplayName("打包原生文件")]
public class PackRawFile : IPackRule
{
string IPackRule.GetBundleName(PackRuleData data)
@@ -113,14 +126,15 @@ namespace YooAsset.Editor
if (depends.Length != 1)
throw new Exception($"{nameof(PackRawFile)} is not support estension : {extension}");
string bundleName = StringUtility.RemoveExtension(data.AssetPath);
return EditorTools.GetRegularPath(bundleName).Replace('/', '_');
string bundleName = data.AssetPath;
return EditorTools.GetRegularPath(bundleName).Replace('/', '_').Replace('.', '_');
}
}
/// <summary>
/// 着色器变种收集文件
/// 打包着色器变种集合
/// </summary>
[DisplayName("打包着色器变种集合")]
public class PackShaderVariants : IPackRule
{
public string GetBundleName(PackRuleData data)

View File

@@ -0,0 +1,9 @@

namespace YooAsset.Editor
{
public class RuleDisplayName
{
public string ClassName;
public string DisplayName;
}
}

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 60c7594328ef976408edadfdf2b9aa3d
guid: df712711c3830af419b7ada8fee53dda
MonoImporter:
externalObjects: {}
serializedVersion: 2

View File

@@ -220,7 +220,7 @@ namespace YooAsset.Editor
// Status
StyleColor textColor;
if (providerInfo.Status == (int)ProviderBase.EStatus.Fail)
if (providerInfo.Status == ProviderBase.EStatus.Failed.ToString())
textColor = new StyleColor(Color.yellow);
else
textColor = label1.style.color;

View File

@@ -185,7 +185,7 @@ namespace YooAsset.Editor
// Status
StyleColor textColor;
if (bundleInfo.Status == (int)AssetBundleLoaderBase.EStatus.Failed)
if (bundleInfo.Status == BundleLoaderBase.EStatus.Failed.ToString())
textColor = new StyleColor(Color.yellow);
else
textColor = label1.style.color;

View File

@@ -109,7 +109,7 @@ namespace YooAsset.Editor
return;
_reportFilePath = selectFilePath;
string jsonData = FileUtility.ReadFile(_reportFilePath);
string jsonData = FileUtility.ReadAllText(_reportFilePath);
_buildReport = BuildReport.Deserialize(jsonData);
_assetListViewer.FillViewData(_buildReport, _searchKeyWord);
_bundleListViewer.FillViewData(_buildReport, _reportFilePath, _searchKeyWord);

View File

@@ -0,0 +1,36 @@
using System;
using System.Reflection;
namespace YooAsset.Editor
{
/// <summary>
/// 编辑器显示名字
/// </summary>
public class DisplayNameAttribute : Attribute
{
public string DisplayName;
public DisplayNameAttribute(string name)
{
this.DisplayName = name;
}
}
public static class EditorAttribute
{
internal static T GetAttribute<T>(Type type) where T : Attribute
{
return (T)type.GetCustomAttribute(typeof(T), false);
}
internal static T GetAttribute<T>(MethodInfo methodInfo) where T : Attribute
{
return (T)methodInfo.GetCustomAttribute(typeof(T), false);
}
internal static T GetAttribute<T>(FieldInfo field) where T : Attribute
{
return (T)field.GetCustomAttribute(typeof(T), false);
}
}
}

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6b03684bc5163694ab3983243512b4cc
guid: 92d5f73b21059af43b7f56165b7acd63
MonoImporter:
externalObjects: {}
serializedVersion: 2

View File

@@ -8,13 +8,11 @@ namespace YooAsset
{
internal class AssetSystemImpl
{
private static string SceneRunningPackage = string.Empty;
private readonly List<AssetBundleLoaderBase> _loaders = new List<AssetBundleLoaderBase>(1000);
private readonly List<BundleLoaderBase> _loaders = new List<BundleLoaderBase>(1000);
private readonly List<ProviderBase> _providers = new List<ProviderBase>(1000);
private readonly Dictionary<string, SceneOperationHandle> _sceneHandles = new Dictionary<string, SceneOperationHandle>(100);
private readonly static Dictionary<string, SceneOperationHandle> _sceneHandles = new Dictionary<string, SceneOperationHandle>(100);
private static long _sceneCreateCount = 0;
private long _sceneCreateCount = 0;
private bool _simulationOnEditor;
private int _loadingMaxNumber;
public IDecryptionServices DecryptionServices { private set; get; }
@@ -71,10 +69,19 @@ namespace YooAsset
/// </summary>
public void DestroyAll()
{
_loaders.Clear();
foreach (var provider in _providers)
{
provider.Destroy();
}
_providers.Clear();
_sceneHandles.Clear();
foreach (var loader in _loaders)
{
loader.Destroy(true);
}
_loaders.Clear();
ClearSceneHandle();
DecryptionServices = null;
BundleServices = null;
}
@@ -83,6 +90,15 @@ namespace YooAsset
/// 资源回收(卸载引用计数为零的资源)
/// </summary>
public void UnloadUnusedAssets()
{
// 注意:资源包之间可能存在多层深层嵌套,需要多次循环释放。
int loopCount = 10;
for (int i = 0; i < loopCount; i++)
{
UnloadUnusedAssetsInternal();
}
}
private void UnloadUnusedAssetsInternal()
{
if (_simulationOnEditor)
{
@@ -99,12 +115,12 @@ namespace YooAsset
{
for (int i = _loaders.Count - 1; i >= 0; i--)
{
AssetBundleLoaderBase loader = _loaders[i];
BundleLoaderBase loader = _loaders[i];
loader.TryDestroyAllProviders();
}
for (int i = _loaders.Count - 1; i >= 0; i--)
{
AssetBundleLoaderBase loader = _loaders[i];
BundleLoaderBase loader = _loaders[i];
if (loader.CanDestroy())
{
loader.Destroy(false);
@@ -123,15 +139,14 @@ namespace YooAsset
{
provider.Destroy();
}
_providers.Clear();
foreach (var loader in _loaders)
{
loader.Destroy(true);
}
_loaders.Clear();
_sceneHandles.Clear();
_providers.Clear();
_loaders.Clear();
ClearSceneHandle();
// 注意:调用底层接口释放所有资源
Resources.UnloadUnusedAssets();
@@ -144,25 +159,12 @@ namespace YooAsset
{
if (assetInfo.IsInvalid)
{
YooLogger.Error($"Failed to load scene. {assetInfo.Error}");
YooLogger.Error($"Failed to load scene ! {assetInfo.Error}");
CompletedProvider completedProvider = new CompletedProvider(assetInfo);
completedProvider.SetCompleted(assetInfo.Error);
return completedProvider.CreateHandle<SceneOperationHandle>();
}
// 注意:场景只允许运行在一个资源包内
if (string.IsNullOrEmpty(SceneRunningPackage))
{
SceneRunningPackage = BundleServices.GetPackageName();
}
if (BundleServices.GetPackageName() != SceneRunningPackage)
{
CompletedProvider completedProvider = new CompletedProvider(assetInfo);
string error = $"Scene are allowed to running within only {SceneRunningPackage}";
completedProvider.SetCompleted(error);
return completedProvider.CreateHandle<SceneOperationHandle>();
}
// 如果加载的是主场景,则卸载所有缓存的场景
if (sceneMode == LoadSceneMode.Single)
{
@@ -182,6 +184,7 @@ namespace YooAsset
}
var handle = provider.CreateHandle<SceneOperationHandle>();
handle.PackageName = BundleServices.GetPackageName();
_sceneHandles.Add(providerGUID, handle);
return handle;
}
@@ -193,7 +196,7 @@ namespace YooAsset
{
if (assetInfo.IsInvalid)
{
YooLogger.Error($"Failed to load asset. {assetInfo.Error}");
YooLogger.Error($"Failed to load asset ! {assetInfo.Error}");
CompletedProvider completedProvider = new CompletedProvider(assetInfo);
completedProvider.SetCompleted(assetInfo.Error);
return completedProvider.CreateHandle<AssetOperationHandle>();
@@ -220,7 +223,7 @@ namespace YooAsset
{
if (assetInfo.IsInvalid)
{
YooLogger.Error($"Failed to load sub assets. {assetInfo.Error}");
YooLogger.Error($"Failed to load sub assets ! {assetInfo.Error}");
CompletedProvider completedProvider = new CompletedProvider(assetInfo);
completedProvider.SetCompleted(assetInfo.Error);
return completedProvider.CreateHandle<SubAssetsOperationHandle>();
@@ -240,6 +243,33 @@ namespace YooAsset
return provider.CreateHandle<SubAssetsOperationHandle>();
}
/// <summary>
/// 加载原生文件
/// </summary>
public RawFileOperationHandle LoadRawFileAsync(AssetInfo assetInfo)
{
if (assetInfo.IsInvalid)
{
YooLogger.Error($"Failed to load raw file ! {assetInfo.Error}");
CompletedProvider completedProvider = new CompletedProvider(assetInfo);
completedProvider.SetCompleted(assetInfo.Error);
return completedProvider.CreateHandle<RawFileOperationHandle>();
}
string providerGUID = assetInfo.GUID;
ProviderBase provider = TryGetProvider(providerGUID);
if (provider == null)
{
if (_simulationOnEditor)
provider = new DatabaseRawFileProvider(this, providerGUID, assetInfo);
else
provider = new BundledRawFileProvider(this, providerGUID, assetInfo);
provider.InitSpawnDebugInfo();
_providers.Add(provider);
}
return provider.CreateHandle<RawFileOperationHandle>();
}
internal void UnloadSubScene(ProviderBase provider)
{
string providerGUID = provider.ProviderGUID;
@@ -265,19 +295,39 @@ namespace YooAsset
// 卸载未被使用的资源(包括场景)
UnloadUnusedAssets();
}
internal void ClearSceneHandle()
{
// 释放资源包下的所有场景
if (BundleServices.IsServicesValid())
{
string packageName = BundleServices.GetPackageName();
List<string> removeList = new List<string>();
foreach (var valuePair in _sceneHandles)
{
if (valuePair.Value.PackageName == packageName)
{
removeList.Add(valuePair.Key);
}
}
foreach (var key in removeList)
{
_sceneHandles.Remove(key);
}
}
}
internal AssetBundleLoaderBase CreateOwnerAssetBundleLoader(AssetInfo assetInfo)
internal BundleLoaderBase CreateOwnerAssetBundleLoader(AssetInfo assetInfo)
{
BundleInfo bundleInfo = BundleServices.GetBundleInfo(assetInfo);
return CreateAssetBundleLoaderInternal(bundleInfo);
}
internal List<AssetBundleLoaderBase> CreateDependAssetBundleLoaders(AssetInfo assetInfo)
internal List<BundleLoaderBase> CreateDependAssetBundleLoaders(AssetInfo assetInfo)
{
BundleInfo[] depends = BundleServices.GetAllDependBundleInfos(assetInfo);
List<AssetBundleLoaderBase> result = new List<AssetBundleLoaderBase>(depends.Length);
List<BundleLoaderBase> result = new List<BundleLoaderBase>(depends.Length);
foreach (var bundleInfo in depends)
{
AssetBundleLoaderBase dependLoader = CreateAssetBundleLoaderInternal(bundleInfo);
BundleLoaderBase dependLoader = CreateAssetBundleLoaderInternal(bundleInfo);
result.Add(dependLoader);
}
return result;
@@ -290,10 +340,10 @@ namespace YooAsset
}
}
private AssetBundleLoaderBase CreateAssetBundleLoaderInternal(BundleInfo bundleInfo)
private BundleLoaderBase CreateAssetBundleLoaderInternal(BundleInfo bundleInfo)
{
// 如果加载器已经存在
AssetBundleLoaderBase loader = TryGetAssetBundleLoader(bundleInfo.Bundle.BundleName);
BundleLoaderBase loader = TryGetAssetBundleLoader(bundleInfo.Bundle.BundleName);
if (loader != null)
return loader;
@@ -301,18 +351,21 @@ namespace YooAsset
#if UNITY_WEBGL
loader = new AssetBundleWebLoader(this, bundleInfo);
#else
loader = new AssetBundleFileLoader(this, bundleInfo);
if (bundleInfo.Bundle.IsRawFile)
loader = new RawBundleFileLoader(this, bundleInfo);
else
loader = new AssetBundleFileLoader(this, bundleInfo);
#endif
_loaders.Add(loader);
return loader;
}
private AssetBundleLoaderBase TryGetAssetBundleLoader(string bundleName)
private BundleLoaderBase TryGetAssetBundleLoader(string bundleName)
{
AssetBundleLoaderBase loader = null;
BundleLoaderBase loader = null;
for (int i = 0; i < _loaders.Count; i++)
{
AssetBundleLoaderBase temp = _loaders[i];
BundleLoaderBase temp = _loaders[i];
if (temp.MainBundleInfo.Bundle.BundleName.Equals(bundleName))
{
loader = temp;
@@ -348,7 +401,7 @@ namespace YooAsset
providerInfo.SpawnTime = provider.SpawnTime;
providerInfo.LoadingTime = provider.LoadingTime;
providerInfo.RefCount = provider.RefCount;
providerInfo.Status = (int)provider.Status;
providerInfo.Status = provider.Status.ToString();
providerInfo.DependBundleInfos = new List<DebugBundleInfo>();
result.Add(providerInfo);

View File

@@ -1,9 +1,10 @@
using UnityEngine;
using System;
using System.Collections.Generic;
using UnityEngine;
namespace YooAsset
{
public sealed class AssetOperationHandle : OperationHandleBase
public sealed class AssetOperationHandle : OperationHandleBase, IDisposable
{
private System.Action<AssetOperationHandle> _callback;
@@ -22,7 +23,7 @@ namespace YooAsset
{
add
{
if (IsValid == false)
if (IsValidWithWarning == false)
throw new System.Exception($"{nameof(AssetOperationHandle)} is invalid");
if (Provider.IsDone)
value.Invoke(this);
@@ -31,42 +32,18 @@ namespace YooAsset
}
remove
{
if (IsValid == false)
if (IsValidWithWarning == false)
throw new System.Exception($"{nameof(AssetOperationHandle)} is invalid");
_callback -= value;
}
}
/// <summary>
/// 资源对象
/// </summary>
public UnityEngine.Object AssetObject
{
get
{
if (IsValid == false)
return null;
return Provider.AssetObject;
}
}
/// <summary>
/// 获取资源对象
/// </summary>
/// <typeparam name="TAsset">资源类型</typeparam>
public TAsset GetAssetObject<TAsset>() where TAsset : UnityEngine.Object
{
if (IsValid == false)
return null;
return Provider.AssetObject as TAsset;
}
/// <summary>
/// 等待异步执行完毕
/// </summary>
public void WaitForAsyncComplete()
{
if (IsValid == false)
if (IsValidWithWarning == false)
return;
Provider.WaitForAsyncComplete();
}
@@ -79,6 +56,38 @@ namespace YooAsset
this.ReleaseInternal();
}
/// <summary>
/// 释放资源句柄
/// </summary>
public void Dispose()
{
this.ReleaseInternal();
}
/// <summary>
/// 资源对象
/// </summary>
public UnityEngine.Object AssetObject
{
get
{
if (IsValidWithWarning == false)
return null;
return Provider.AssetObject;
}
}
/// <summary>
/// 获取资源对象
/// </summary>
/// <typeparam name="TAsset">资源类型</typeparam>
public TAsset GetAssetObject<TAsset>() where TAsset : UnityEngine.Object
{
if (IsValidWithWarning == false)
return null;
return Provider.AssetObject as TAsset;
}
/// <summary>
/// 同步初始化游戏对象
@@ -124,7 +133,7 @@ namespace YooAsset
private GameObject InstantiateSyncInternal(Vector3 position, Quaternion rotation, Transform parent)
{
if (IsValid == false)
if (IsValidWithWarning == false)
return null;
if (Provider.AssetObject == null)
return null;

View File

@@ -1,4 +1,5 @@
using System.Collections;
using System;
using System.Collections;
namespace YooAsset
{
@@ -14,7 +15,6 @@ namespace YooAsset
}
internal abstract void InvokeCallback();
/// <summary>
/// 获取资源信息
/// </summary>
@@ -30,11 +30,11 @@ namespace YooAsset
{
get
{
if (IsValid == false)
if (IsValidWithWarning == false)
return EOperationStatus.None;
if (Provider.Status == ProviderBase.EStatus.Fail)
if (Provider.Status == ProviderBase.EStatus.Failed)
return EOperationStatus.Failed;
else if (Provider.Status == ProviderBase.EStatus.Success)
else if (Provider.Status == ProviderBase.EStatus.Succeed)
return EOperationStatus.Succeed;
else
return EOperationStatus.None;
@@ -48,7 +48,7 @@ namespace YooAsset
{
get
{
if (IsValid == false)
if (IsValidWithWarning == false)
return string.Empty;
return Provider.LastError;
}
@@ -61,7 +61,7 @@ namespace YooAsset
{
get
{
if (IsValid == false)
if (IsValidWithWarning == false)
return 0;
return Provider.Progress;
}
@@ -74,7 +74,7 @@ namespace YooAsset
{
get
{
if (IsValid == false)
if (IsValidWithWarning == false)
return false;
return Provider.IsDone;
}
@@ -84,6 +84,20 @@ namespace YooAsset
/// 句柄是否有效
/// </summary>
public bool IsValid
{
get
{
if (Provider != null && Provider.IsDestroyed == false)
return true;
else
return false;
}
}
/// <summary>
/// 句柄是否有效
/// </summary>
internal bool IsValidWithWarning
{
get
{
@@ -102,26 +116,12 @@ namespace YooAsset
}
}
/// <summary>
/// 句柄是否有效
/// </summary>
public bool IsValidNoWarning
{
get
{
if (Provider != null && Provider.IsDestroyed == false)
return true;
else
return false;
}
}
/// <summary>
/// 释放句柄
/// </summary>
internal void ReleaseInternal()
{
if (IsValid == false)
if (IsValidWithWarning == false)
return;
Provider.ReleaseHandle(this);
Provider = null;

View File

@@ -0,0 +1,104 @@
using System;
using System.IO;
using System.Text;
namespace YooAsset
{
public class RawFileOperationHandle : OperationHandleBase, IDisposable
{
private System.Action<RawFileOperationHandle> _callback;
internal RawFileOperationHandle(ProviderBase provider) : base(provider)
{
}
internal override void InvokeCallback()
{
_callback?.Invoke(this);
}
/// <summary>
/// 完成委托
/// </summary>
public event System.Action<RawFileOperationHandle> Completed
{
add
{
if (IsValidWithWarning == false)
throw new System.Exception($"{nameof(RawFileOperationHandle)} is invalid");
if (Provider.IsDone)
value.Invoke(this);
else
_callback += value;
}
remove
{
if (IsValidWithWarning == false)
throw new System.Exception($"{nameof(RawFileOperationHandle)} is invalid");
_callback -= value;
}
}
/// <summary>
/// 等待异步执行完毕
/// </summary>
public void WaitForAsyncComplete()
{
if (IsValidWithWarning == false)
return;
Provider.WaitForAsyncComplete();
}
/// <summary>
/// 释放资源句柄
/// </summary>
public void Release()
{
this.ReleaseInternal();
}
/// <summary>
/// 释放资源句柄
/// </summary>
public void Dispose()
{
this.ReleaseInternal();
}
/// <summary>
/// 获取原生文件的二进制数据
/// </summary>
public byte[] GetRawFileData()
{
if (IsValidWithWarning == false)
return null;
string filePath = Provider.RawFilePath;
if (File.Exists(filePath) == false)
return null;
return File.ReadAllBytes(filePath);
}
/// <summary>
/// 获取原生文件的文本数据
/// </summary>
public string GetRawFileText()
{
if (IsValidWithWarning == false)
return null;
string filePath = Provider.RawFilePath;
if (File.Exists(filePath) == false)
return null;
return File.ReadAllText(filePath, Encoding.UTF8);
}
/// <summary>
/// 获取原生文件的路径
/// </summary>
public string GetRawFilePath()
{
if (IsValidWithWarning == false)
return string.Empty;
return Provider.RawFilePath;
}
}
}

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e26f14db9addb4c49b4f0f520bf75d9d
guid: e8420ba734d425a4ba9f19173d74503c
MonoImporter:
externalObjects: {}
serializedVersion: 2

View File

@@ -3,8 +3,9 @@
namespace YooAsset
{
public class SceneOperationHandle : OperationHandleBase
{
{
private System.Action<SceneOperationHandle> _callback;
internal string PackageName { set; get; }
internal SceneOperationHandle(ProviderBase provider) : base(provider)
{
@@ -21,7 +22,7 @@ namespace YooAsset
{
add
{
if (IsValid == false)
if (IsValidWithWarning == false)
throw new System.Exception($"{nameof(SceneOperationHandle)} is invalid");
if (Provider.IsDone)
value.Invoke(this);
@@ -30,7 +31,7 @@ namespace YooAsset
}
remove
{
if (IsValid == false)
if (IsValidWithWarning == false)
throw new System.Exception($"{nameof(SceneOperationHandle)} is invalid");
_callback -= value;
}
@@ -43,7 +44,7 @@ namespace YooAsset
{
get
{
if (IsValid == false)
if (IsValidWithWarning == false)
return new Scene();
return Provider.SceneObject;
}
@@ -54,7 +55,7 @@ namespace YooAsset
/// </summary>
public bool ActivateScene()
{
if (IsValid == false)
if (IsValidWithWarning == false)
return false;
if (SceneObject.IsValid() && SceneObject.isLoaded)
@@ -73,7 +74,7 @@ namespace YooAsset
/// </summary>
public bool IsMainScene()
{
if (IsValid == false)
if (IsValidWithWarning == false)
return false;
if (Provider is DatabaseSceneProvider)
@@ -98,7 +99,7 @@ namespace YooAsset
public UnloadSceneOperation UnloadAsync()
{
// 如果句柄无效
if (IsValid == false)
if (IsValidWithWarning == false)
{
string error = $"{nameof(SceneOperationHandle)} is invalid.";
var operation = new UnloadSceneOperation(error);

View File

@@ -1,8 +1,9 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
namespace YooAsset
{
public sealed class SubAssetsOperationHandle : OperationHandleBase
public sealed class SubAssetsOperationHandle : OperationHandleBase, IDisposable
{
private System.Action<SubAssetsOperationHandle> _callback;
@@ -21,7 +22,7 @@ namespace YooAsset
{
add
{
if (IsValid == false)
if (IsValidWithWarning == false)
throw new System.Exception($"{nameof(SubAssetsOperationHandle)} is invalid");
if (Provider.IsDone)
value.Invoke(this);
@@ -30,31 +31,18 @@ namespace YooAsset
}
remove
{
if (IsValid == false)
if (IsValidWithWarning == false)
throw new System.Exception($"{nameof(SubAssetsOperationHandle)} is invalid");
_callback -= value;
}
}
/// <summary>
/// 子资源对象集合
/// </summary>
public UnityEngine.Object[] AllAssetObjects
{
get
{
if (IsValid == false)
return null;
return Provider.AllAssetObjects;
}
}
/// <summary>
/// 等待异步执行完毕
/// </summary>
public void WaitForAsyncComplete()
{
if (IsValid == false)
if (IsValidWithWarning == false)
return;
Provider.WaitForAsyncComplete();
}
@@ -67,6 +55,27 @@ namespace YooAsset
this.ReleaseInternal();
}
/// <summary>
/// 释放资源句柄
/// </summary>
public void Dispose()
{
this.ReleaseInternal();
}
/// <summary>
/// 子资源对象集合
/// </summary>
public UnityEngine.Object[] AllAssetObjects
{
get
{
if (IsValidWithWarning == false)
return null;
return Provider.AllAssetObjects;
}
}
/// <summary>
/// 获取子资源对象
@@ -75,7 +84,7 @@ namespace YooAsset
/// <param name="assetName">子资源对象名称</param>
public TObject GetSubAssetObject<TObject>(string assetName) where TObject : UnityEngine.Object
{
if (IsValid == false)
if (IsValidWithWarning == false)
return null;
foreach (var assetObject in Provider.AllAssetObjects)
@@ -94,7 +103,7 @@ namespace YooAsset
/// <typeparam name="TObject">子资源对象类型</typeparam>
public TObject[] GetSubAssetObjects<TObject>() where TObject : UnityEngine.Object
{
if (IsValid == false)
if (IsValidWithWarning == false)
return null;
List<TObject> ret = new List<TObject>(Provider.AllAssetObjects.Length);

View File

@@ -6,7 +6,7 @@ using UnityEngine;
namespace YooAsset
{
internal sealed class AssetBundleFileLoader : AssetBundleLoaderBase
internal sealed class AssetBundleFileLoader : BundleLoaderBase
{
private enum ESteps
{
@@ -21,7 +21,6 @@ namespace YooAsset
}
private ESteps _steps = ESteps.None;
private string _fileLoadPath;
private bool _isWaitForAsyncComplete = false;
private bool _isShowWaitForAsyncError = false;
private DownloaderBase _unpacker;
@@ -47,7 +46,7 @@ namespace YooAsset
if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
{
_steps = ESteps.Download;
_fileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
FileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
}
else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
{
@@ -56,22 +55,22 @@ namespace YooAsset
if (loadMethod == EBundleLoadMethod.LoadFromMemory || loadMethod == EBundleLoadMethod.LoadFromStream)
{
_steps = ESteps.Unpack;
_fileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
FileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
}
else
{
_steps = ESteps.LoadFile;
_fileLoadPath = MainBundleInfo.Bundle.StreamingFilePath;
FileLoadPath = MainBundleInfo.Bundle.StreamingFilePath;
}
#else
_steps = ESteps.LoadFile;
_fileLoadPath = MainBundleInfo.Bundle.StreamingFilePath;
FileLoadPath = MainBundleInfo.Bundle.StreamingFilePath;
#endif
}
else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
{
_steps = ESteps.LoadFile;
_fileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
FileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
}
else
{
@@ -137,11 +136,11 @@ namespace YooAsset
{
#if UNITY_EDITOR
// 注意Unity2017.4编辑器模式下如果AssetBundle文件不存在会导致编辑器崩溃这里做了预判。
if (System.IO.File.Exists(_fileLoadPath) == false)
if (System.IO.File.Exists(FileLoadPath) == false)
{
_steps = ESteps.Done;
Status = EStatus.Failed;
LastError = $"Not found assetBundle file : {_fileLoadPath}";
LastError = $"Not found assetBundle file : {FileLoadPath}";
YooLogger.Error(LastError);
return;
}
@@ -152,9 +151,9 @@ namespace YooAsset
if (loadMethod == EBundleLoadMethod.Normal)
{
if (_isWaitForAsyncComplete)
CacheBundle = AssetBundle.LoadFromFile(_fileLoadPath);
CacheBundle = AssetBundle.LoadFromFile(FileLoadPath);
else
_createRequest = AssetBundle.LoadFromFileAsync(_fileLoadPath);
_createRequest = AssetBundle.LoadFromFileAsync(FileLoadPath);
}
else
{
@@ -169,15 +168,15 @@ namespace YooAsset
DecryptFileInfo fileInfo = new DecryptFileInfo();
fileInfo.BundleName = MainBundleInfo.Bundle.BundleName;
fileInfo.FilePath = _fileLoadPath;
fileInfo.FilePath = FileLoadPath;
if (loadMethod == EBundleLoadMethod.LoadFromFileOffset)
{
ulong offset = Impl.DecryptionServices.LoadFromFileOffset(fileInfo);
if (_isWaitForAsyncComplete)
CacheBundle = AssetBundle.LoadFromFile(_fileLoadPath, 0, offset);
CacheBundle = AssetBundle.LoadFromFile(FileLoadPath, 0, offset);
else
_createRequest = AssetBundle.LoadFromFileAsync(_fileLoadPath, 0, offset);
_createRequest = AssetBundle.LoadFromFileAsync(FileLoadPath, 0, offset);
}
else if (loadMethod == EBundleLoadMethod.LoadFromMemory)
{
@@ -279,6 +278,14 @@ namespace YooAsset
int frame = 1000;
while (true)
{
// 文件解压
if (_unpacker != null)
{
_unpacker.Update();
if (_unpacker.IsDone() == false)
continue;
}
// 保险机制
// 注意如果需要从WEB端下载资源可能会触发保险机制
frame--;

View File

@@ -7,7 +7,7 @@ using UnityEngine.Networking;
namespace YooAsset
{
internal sealed class AssetBundleWebLoader : AssetBundleLoaderBase
internal sealed class AssetBundleWebLoader : BundleLoaderBase
{
private enum ESteps
{
@@ -24,7 +24,6 @@ namespace YooAsset
private ESteps _steps = ESteps.None;
private float _tryTimer = 0;
private string _fileLoadPath;
private bool _isShowWaitForAsyncError = false;
private DownloaderBase _downloader;
private UnityWebRequest _webRequest;
@@ -48,17 +47,17 @@ namespace YooAsset
if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
{
_steps = ESteps.Download;
_fileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
FileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
}
else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
{
_steps = ESteps.LoadWebFile;
_fileLoadPath = MainBundleInfo.Bundle.StreamingFilePath;
FileLoadPath = MainBundleInfo.Bundle.StreamingFilePath;
}
else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
{
_steps = ESteps.LoadCacheFile;
_fileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
FileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
}
else
{
@@ -97,11 +96,11 @@ namespace YooAsset
{
#if UNITY_EDITOR
// 注意Unity2017.4编辑器模式下如果AssetBundle文件不存在会导致编辑器崩溃这里做了预判。
if (System.IO.File.Exists(_fileLoadPath) == false)
if (System.IO.File.Exists(FileLoadPath) == false)
{
_steps = ESteps.Done;
Status = EStatus.Failed;
LastError = $"Not found assetBundle file : {_fileLoadPath}";
LastError = $"Not found assetBundle file : {FileLoadPath}";
YooLogger.Error(LastError);
return;
}
@@ -111,7 +110,7 @@ namespace YooAsset
var loadMethod = (EBundleLoadMethod)MainBundleInfo.Bundle.LoadMethod;
if (loadMethod == EBundleLoadMethod.Normal)
{
_createRequest = AssetBundle.LoadFromFileAsync(_fileLoadPath);
_createRequest = AssetBundle.LoadFromFileAsync(FileLoadPath);
}
else
{
@@ -163,7 +162,8 @@ namespace YooAsset
// 5. 从WEB网站获取AssetBundle文件
if (_steps == ESteps.LoadWebFile)
{
_webRequest = UnityWebRequestAssetBundle.GetAssetBundle(_fileLoadPath, Hash128.Parse(MainBundleInfo.Bundle.FileHash));
var hash = Hash128.Parse(MainBundleInfo.Bundle.FileHash);
_webRequest = UnityWebRequestAssetBundle.GetAssetBundle(FileLoadPath, hash);
_webRequest.SendWebRequest();
_steps = ESteps.CheckLoadWebFile;
}
@@ -180,7 +180,7 @@ namespace YooAsset
if (_webRequest.isNetworkError || _webRequest.isHttpError)
#endif
{
YooLogger.Warning($"Failed to get asset bundle from web : {_fileLoadPath} Error : {_webRequest.error}");
YooLogger.Warning($"Failed to get asset bundle from web : {FileLoadPath} Error : {_webRequest.error}");
_steps = ESteps.TryLoadWebFile;
_tryTimer = 0;
}

View File

@@ -5,7 +5,7 @@ using UnityEngine;
namespace YooAsset
{
internal abstract class AssetBundleLoaderBase
internal abstract class BundleLoaderBase
{
public enum EStatus
{
@@ -46,9 +46,10 @@ namespace YooAsset
private readonly List<ProviderBase> _providers = new List<ProviderBase>(100);
internal AssetBundle CacheBundle { set; get; }
internal string FileLoadPath { set; get; }
public AssetBundleLoaderBase(AssetSystemImpl impl, BundleInfo bundleInfo)
public BundleLoaderBase(AssetSystemImpl impl, BundleInfo bundleInfo)
{
Impl = impl;
MainBundleInfo = bundleInfo;

View File

@@ -9,10 +9,10 @@ namespace YooAsset
/// <summary>
/// 依赖的资源包加载器列表
/// </summary>
private readonly List<AssetBundleLoaderBase> _dependBundles;
private readonly List<BundleLoaderBase> _dependBundles;
public DependAssetBundleGroup(List<AssetBundleLoaderBase> dpendBundles)
public DependAssetBundleGroup(List<BundleLoaderBase> dpendBundles)
{
_dependBundles = dpendBundles;
}
@@ -37,7 +37,7 @@ namespace YooAsset
{
foreach (var loader in _dependBundles)
{
if (loader.Status != AssetBundleLoaderBase.EStatus.Succeed)
if (loader.Status != BundleLoaderBase.EStatus.Succeed)
{
return false;
}
@@ -52,7 +52,7 @@ namespace YooAsset
{
foreach (var loader in _dependBundles)
{
if (loader.Status != AssetBundleLoaderBase.EStatus.Succeed)
if (loader.Status != BundleLoaderBase.EStatus.Succeed)
{
return loader.LastError;
}
@@ -104,7 +104,7 @@ namespace YooAsset
var bundleInfo = new DebugBundleInfo();
bundleInfo.BundleName = loader.MainBundleInfo.Bundle.BundleName;
bundleInfo.RefCount = loader.RefCount;
bundleInfo.Status = (int)loader.Status;
bundleInfo.Status = loader.Status.ToString();
output.Add(bundleInfo);
}
}

View File

@@ -0,0 +1,171 @@
using System.IO;
namespace YooAsset
{
internal class RawBundleFileLoader : BundleLoaderBase
{
private enum ESteps
{
None,
Download,
CheckDownload,
Unpack,
CheckUnpack,
CheckFile,
Done,
}
private ESteps _steps = ESteps.None;
private bool _isShowWaitForAsyncError = false;
private DownloaderBase _unpacker;
private DownloaderBase _downloader;
public RawBundleFileLoader(AssetSystemImpl impl, BundleInfo bundleInfo) : base(impl, bundleInfo)
{
}
/// <summary>
/// 轮询更新
/// </summary>
public override void Update()
{
if (_steps == ESteps.Done)
return;
if (_steps == ESteps.None)
{
if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
{
_steps = ESteps.Download;
FileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
}
else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
{
#if UNITY_ANDROID || UNITY_WEBGL
_steps = ESteps.Unpack;
FileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
#else
_steps = ESteps.CheckFile;
FileLoadPath = MainBundleInfo.Bundle.StreamingFilePath;
#endif
}
else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
{
_steps = ESteps.CheckFile;
FileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
}
else
{
throw new System.NotImplementedException(MainBundleInfo.LoadMode.ToString());
}
}
// 1. 下载远端文件
if (_steps == ESteps.Download)
{
int failedTryAgain = int.MaxValue;
_downloader = DownloadSystem.BeginDownload(MainBundleInfo, failedTryAgain);
_steps = ESteps.CheckDownload;
}
// 2. 检测下载结果
if (_steps == ESteps.CheckDownload)
{
if (_downloader.IsDone() == false)
return;
if (_downloader.HasError())
{
_steps = ESteps.Done;
Status = EStatus.Failed;
LastError = _downloader.GetLastError();
}
else
{
_steps = ESteps.CheckFile;
}
}
// 3. 解压内置文件
if (_steps == ESteps.Unpack)
{
int failedTryAgain = 1;
var bundleInfo = HostPlayModeImpl.ConvertToUnpackInfo(MainBundleInfo.Bundle);
_unpacker = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
_steps = ESteps.CheckUnpack;
}
// 4. 检测解压结果
if (_steps == ESteps.CheckUnpack)
{
if (_unpacker.IsDone() == false)
return;
if (_unpacker.HasError())
{
_steps = ESteps.Done;
Status = EStatus.Failed;
LastError = _unpacker.GetLastError();
}
else
{
_steps = ESteps.CheckFile;
}
}
// 5. 检测结果
if (_steps == ESteps.CheckFile)
{
_steps = ESteps.Done;
if (File.Exists(FileLoadPath))
{
Status = EStatus.Succeed;
}
else
{
Status = EStatus.Failed;
LastError = $"Raw file not found : {FileLoadPath}";
}
}
}
/// <summary>
/// 主线程等待异步操作完毕
/// </summary>
public override void WaitForAsyncComplete()
{
int frame = 1000;
while (true)
{
// 文件解压
if (_unpacker != null)
{
_unpacker.Update();
if (_unpacker.IsDone() == false)
continue;
}
// 保险机制
// 注意如果需要从WEB端下载资源可能会触发保险机制
frame--;
if (frame == 0)
{
if (_isShowWaitForAsyncError == false)
{
_isShowWaitForAsyncError = true;
YooLogger.Error($"WaitForAsyncComplete failed ! Try load bundle : {MainBundleInfo.Bundle.BundleName} from remote with sync load method !");
}
break;
}
// 驱动流程
Update();
// 完成后退出
if (IsDone())
break;
}
}
}
}

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7382b7d45cb2b73469e37c334a1599d9
guid: fa39f24727abe514093f18787c0c7e27
MonoImporter:
externalObjects: {}
serializedVersion: 2

View File

@@ -41,7 +41,7 @@ namespace YooAsset
if (_steps == ESteps.Clone)
{
if (_handle.IsValid == false)
if (_handle.IsValidWithWarning == false)
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;

View File

@@ -1,468 +0,0 @@
using System.IO;
namespace YooAsset
{
/// <summary>
/// 原生文件操作
/// </summary>
public abstract class RawFileOperation : AsyncOperationBase
{
internal readonly BundleInfo _bundleInfo;
/// <summary>
/// 原生文件的拷贝路径
/// </summary>
public string CopyPath { private set; get; }
internal RawFileOperation(BundleInfo bundleInfo, string copyPath)
{
_bundleInfo = bundleInfo;
CopyPath = copyPath;
}
/// <summary>
/// 原生文件的缓存路径
/// </summary>
public abstract string GetCachePath();
/// <summary>
/// 获取原生文件的二进制数据
/// </summary>
public byte[] LoadFileData()
{
string filePath = GetCachePath();
if (File.Exists(filePath) == false)
return null;
return File.ReadAllBytes(filePath);
}
/// <summary>
/// 获取原生文件的文本数据
/// </summary>
public string LoadFileText()
{
string filePath = GetCachePath();
if (File.Exists(filePath) == false)
return string.Empty;
return File.ReadAllText(filePath, System.Text.Encoding.UTF8);
}
}
/// <summary>
/// 发生错误的原生文件操作
/// </summary>
internal sealed class CompletedRawFileOperation : RawFileOperation
{
private readonly string _error;
internal CompletedRawFileOperation(string error, string copyPath) : base(null, copyPath)
{
_error = error;
}
internal override void Start()
{
Status = EOperationStatus.Failed;
Error = _error;
}
internal override void Update()
{
}
/// <summary>
/// 原生文件的缓存路径
/// </summary>
public override string GetCachePath()
{
return string.Empty;
}
}
/// <summary>
/// 编辑器下模拟运行的原生文件操作
/// </summary>
internal sealed class EditorPlayModeRawFileOperation : RawFileOperation
{
private enum ESteps
{
None,
Prepare,
CheckAndCopyFile,
Done,
}
private ESteps _steps = ESteps.None;
internal EditorPlayModeRawFileOperation(BundleInfo bundleInfo, string copyPath) : base(bundleInfo, copyPath)
{
}
internal override void Start()
{
_steps = ESteps.Prepare;
}
internal override void Update()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
// 1. 准备工作
if (_steps == ESteps.Prepare)
{
if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromEditor)
{
_steps = ESteps.CheckAndCopyFile;
return; // 模拟实现异步操作
}
else
{
throw new System.NotImplementedException(_bundleInfo.LoadMode.ToString());
}
}
// 2. 检测并拷贝原生文件
if (_steps == ESteps.CheckAndCopyFile)
{
// 如果不需要保存文件
if (string.IsNullOrEmpty(CopyPath))
{
_steps = ESteps.Done;
Status = EOperationStatus.Succeed;
return;
}
// 如果原生文件已经存在,则将其删除
if (File.Exists(CopyPath))
{
File.Delete(CopyPath);
}
try
{
FileUtility.CreateFileDirectory(CopyPath);
File.Copy(GetCachePath(), CopyPath, true);
_steps = ESteps.Done;
Status = EOperationStatus.Succeed;
}
catch (System.Exception e)
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = e.Message;
}
}
}
/// <summary>
/// 原生文件的缓存路径
/// </summary>
public override string GetCachePath()
{
if (_bundleInfo == null)
return string.Empty;
return _bundleInfo.EditorAssetPath;
}
}
/// <summary>
/// 离线模式的原生文件操作
/// </summary>
internal sealed class OfflinePlayModeRawFileOperation : RawFileOperation
{
private enum ESteps
{
None,
Prepare,
Unpack,
CheckUnpack,
CheckAndCopyFile,
Done,
}
private ESteps _steps = ESteps.None;
private DownloaderBase _unpacker;
public OfflinePlayModeRawFileOperation(BundleInfo bundleInfo, string copyPath) : base(bundleInfo, copyPath)
{
}
internal override void Start()
{
_steps = ESteps.Prepare;
}
internal override void Update()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
// 1. 准备工作
if (_steps == ESteps.Prepare)
{
if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.None)
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"Bundle info is invalid : {_bundleInfo.Bundle.BundleName}";
}
else if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
{
_steps = ESteps.Unpack;
}
else if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
{
_steps = ESteps.CheckAndCopyFile;
}
else
{
throw new System.NotImplementedException(_bundleInfo.LoadMode.ToString());
}
}
// 2. 内置文件解压
if (_steps == ESteps.Unpack)
{
int failedTryAgain = 1;
var bundleInfo = HostPlayModeImpl.ConvertToUnpackInfo(_bundleInfo.Bundle);
_unpacker = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
_steps = ESteps.CheckUnpack;
}
// 3. 检测内置文件解压结果
if (_steps == ESteps.CheckUnpack)
{
Progress = _unpacker.DownloadProgress;
if (_unpacker.IsDone() == false)
return;
if (_unpacker.HasError())
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = _unpacker.GetLastError();
}
else
{
_steps = ESteps.CheckAndCopyFile;
}
}
// 4. 检测并拷贝原生文件
if (_steps == ESteps.CheckAndCopyFile)
{
// 如果不需要保存文件
if (string.IsNullOrEmpty(CopyPath))
{
_steps = ESteps.Done;
Status = EOperationStatus.Succeed;
return;
}
// 如果原生文件已经存在,则验证其完整性
if (File.Exists(CopyPath))
{
var verifyResult = CacheSystem.VerifyContentInternal(CopyPath, _bundleInfo.Bundle.FileSize, _bundleInfo.Bundle.FileCRC, EVerifyLevel.High);
if (verifyResult == EVerifyResult.Succeed)
{
_steps = ESteps.Done;
Status = EOperationStatus.Succeed;
return;
}
else
{
File.Delete(CopyPath);
}
}
try
{
FileUtility.CreateFileDirectory(CopyPath);
File.Copy(GetCachePath(), CopyPath, true);
_steps = ESteps.Done;
Status = EOperationStatus.Succeed;
}
catch (System.Exception e)
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = e.Message;
}
}
}
/// <summary>
/// 原生文件的缓存路径
/// </summary>
public override string GetCachePath()
{
if (_bundleInfo == null)
return string.Empty;
return _bundleInfo.Bundle.CachedFilePath;
}
}
/// <summary>
/// 联机模式的原生文件操作
/// </summary>
internal sealed class HostPlayModeRawFileOperation : RawFileOperation
{
private enum ESteps
{
None,
Prepare,
Download,
CheckDownload,
Unpack,
CheckUnpack,
CheckAndCopyFile,
Done,
}
private ESteps _steps = ESteps.None;
private DownloaderBase _unpacker;
private DownloaderBase _downloader;
internal HostPlayModeRawFileOperation(BundleInfo bundleInfo, string copyPath) : base(bundleInfo, copyPath)
{
}
internal override void Start()
{
_steps = ESteps.Prepare;
}
internal override void Update()
{
if (_steps == ESteps.None || _steps == ESteps.Done)
return;
// 1. 准备工作
if (_steps == ESteps.Prepare)
{
if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.None)
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = $"Bundle info is invalid : {_bundleInfo.Bundle.BundleName}";
}
else if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
{
_steps = ESteps.Download;
}
else if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
{
_steps = ESteps.Unpack;
}
else if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
{
_steps = ESteps.CheckAndCopyFile;
}
else
{
throw new System.NotImplementedException(_bundleInfo.LoadMode.ToString());
}
}
// 2. 下载远端文件
if (_steps == ESteps.Download)
{
int failedTryAgain = int.MaxValue;
_downloader = DownloadSystem.BeginDownload(_bundleInfo, failedTryAgain);
_steps = ESteps.CheckDownload;
}
// 3. 检测下载结果
if (_steps == ESteps.CheckDownload)
{
Progress = _downloader.DownloadProgress;
if (_downloader.IsDone() == false)
return;
if (_downloader.HasError())
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = _downloader.GetLastError();
}
else
{
_steps = ESteps.CheckAndCopyFile;
}
}
// 3. 解压内置文件
if (_steps == ESteps.Unpack)
{
int failedTryAgain = 1;
var bundleInfo = HostPlayModeImpl.ConvertToUnpackInfo(_bundleInfo.Bundle);
_unpacker = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
_steps = ESteps.CheckUnpack;
}
// 4. 检测解压结果
if (_steps == ESteps.CheckUnpack)
{
Progress = _unpacker.DownloadProgress;
if (_unpacker.IsDone() == false)
return;
if (_unpacker.HasError())
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = _unpacker.GetLastError();
}
else
{
_steps = ESteps.CheckAndCopyFile;
}
}
// 5. 检测并拷贝原生文件
if (_steps == ESteps.CheckAndCopyFile)
{
// 如果不需要保存文件
if (string.IsNullOrEmpty(CopyPath))
{
_steps = ESteps.Done;
Status = EOperationStatus.Succeed;
return;
}
// 如果原生文件已经存在,则验证其完整性
if (File.Exists(CopyPath))
{
var verifyResult = CacheSystem.VerifyContentInternal(CopyPath, _bundleInfo.Bundle.FileSize, _bundleInfo.Bundle.FileCRC, EVerifyLevel.High);
if (verifyResult == EVerifyResult.Succeed)
{
_steps = ESteps.Done;
Status = EOperationStatus.Succeed;
return;
}
else
{
File.Delete(CopyPath);
}
}
try
{
FileUtility.CreateFileDirectory(CopyPath);
File.Copy(GetCachePath(), CopyPath, true);
_steps = ESteps.Done;
Status = EOperationStatus.Succeed;
}
catch (System.Exception e)
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = e.Message;
}
}
}
/// <summary>
/// 原生文件的缓存路径
/// </summary>
public override string GetCachePath()
{
if (_bundleInfo == null)
return string.Empty;
return _bundleInfo.Bundle.CachedFilePath;
}
}
}

View File

@@ -48,15 +48,15 @@ namespace YooAsset
if (DependBundleGroup.IsSucceed() == false)
{
Status = EStatus.Fail;
Status = EStatus.Failed;
LastError = DependBundleGroup.GetLastError();
InvokeCompletion();
return;
}
if (OwnerBundle.Status != AssetBundleLoaderBase.EStatus.Succeed)
if (OwnerBundle.Status != BundleLoaderBase.EStatus.Succeed)
{
Status = EStatus.Fail;
Status = EStatus.Failed;
LastError = OwnerBundle.LastError;
InvokeCompletion();
return;
@@ -66,7 +66,7 @@ namespace YooAsset
{
if (OwnerBundle.IsDestroyed)
throw new System.Exception("Should never get here !");
Status = EStatus.Fail;
Status = EStatus.Failed;
LastError = $"The bundle {OwnerBundle.MainBundleInfo.Bundle.BundleName} has been destroyed by unity bugs !";
YooLogger.Error(LastError);
InvokeCompletion();
@@ -115,8 +115,8 @@ namespace YooAsset
}
}
Status = AssetObject == null ? EStatus.Fail : EStatus.Success;
if (Status == EStatus.Fail)
Status = AssetObject == null ? EStatus.Failed : EStatus.Succeed;
if (Status == EStatus.Failed)
{
if (MainAssetInfo.AssetType == null)
LastError = $"Failed to load asset : {MainAssetInfo.AssetPath} AssetType : null AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";

View File

@@ -5,7 +5,7 @@ namespace YooAsset
{
internal abstract class BundledProvider : ProviderBase
{
protected AssetBundleLoaderBase OwnerBundle { private set; get; }
protected BundleLoaderBase OwnerBundle { private set; get; }
protected DependAssetBundleGroup DependBundleGroup { private set; get; }
public BundledProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
@@ -43,7 +43,7 @@ namespace YooAsset
var bundleInfo = new DebugBundleInfo();
bundleInfo.BundleName = OwnerBundle.MainBundleInfo.Bundle.BundleName;
bundleInfo.RefCount = OwnerBundle.RefCount;
bundleInfo.Status = (int)OwnerBundle.Status;
bundleInfo.Status = OwnerBundle.Status.ToString();
output.Add(bundleInfo);
DependBundleGroup.GetBundleDebugInfos(output);

View File

@@ -0,0 +1,61 @@

namespace YooAsset
{
internal class BundledRawFileProvider : BundledProvider
{
public override float Progress
{
get
{
if (IsDone)
return 1f;
else
return 0;
}
}
public BundledRawFileProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
{
}
public override void Update()
{
DebugRecording();
if (IsDone)
return;
if (Status == EStatus.None)
{
Status = EStatus.CheckBundle;
}
if (Status == EStatus.CheckBundle)
{
if (IsWaitForAsyncComplete)
{
OwnerBundle.WaitForAsyncComplete();
}
if (OwnerBundle.IsDone() == false)
return;
if (OwnerBundle.Status != BundleLoaderBase.EStatus.Succeed)
{
Status = EStatus.Failed;
LastError = OwnerBundle.LastError;
InvokeCompletion();
return;
}
Status = EStatus.Checking;
}
if (Status == EStatus.Checking)
{
RawFilePath = OwnerBundle.FileLoadPath;
Status = EStatus.Succeed;
InvokeCompletion();
}
}
}
}

View File

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

View File

@@ -52,15 +52,15 @@ namespace YooAsset
if (DependBundleGroup.IsSucceed() == false)
{
Status = EStatus.Fail;
Status = EStatus.Failed;
LastError = DependBundleGroup.GetLastError();
InvokeCompletion();
return;
}
if (OwnerBundle.Status != AssetBundleLoaderBase.EStatus.Succeed)
if (OwnerBundle.Status != BundleLoaderBase.EStatus.Succeed)
{
Status = EStatus.Fail;
Status = EStatus.Failed;
LastError = OwnerBundle.LastError;
InvokeCompletion();
return;
@@ -83,7 +83,7 @@ namespace YooAsset
}
else
{
Status = EStatus.Fail;
Status = EStatus.Failed;
LastError = $"Failed to load scene : {_sceneName}";
YooLogger.Error(LastError);
InvokeCompletion();
@@ -98,8 +98,8 @@ namespace YooAsset
if (SceneObject.IsValid() && _activateOnLoad)
SceneManager.SetActiveScene(SceneObject);
Status = SceneObject.IsValid() ? EStatus.Success : EStatus.Fail;
if (Status == EStatus.Fail)
Status = SceneObject.IsValid() ? EStatus.Succeed : EStatus.Failed;
if (Status == EStatus.Failed)
{
LastError = $"The load scene is invalid : {MainAssetInfo.AssetPath}";
YooLogger.Error(LastError);

View File

@@ -48,15 +48,15 @@ namespace YooAsset
if (DependBundleGroup.IsSucceed() == false)
{
Status = EStatus.Fail;
Status = EStatus.Failed;
LastError = DependBundleGroup.GetLastError();
InvokeCompletion();
return;
}
if (OwnerBundle.Status != AssetBundleLoaderBase.EStatus.Succeed)
if (OwnerBundle.Status != BundleLoaderBase.EStatus.Succeed)
{
Status = EStatus.Fail;
Status = EStatus.Failed;
LastError = OwnerBundle.LastError;
InvokeCompletion();
return;
@@ -104,8 +104,8 @@ namespace YooAsset
}
}
Status = AllAssetObjects == null ? EStatus.Fail : EStatus.Success;
if (Status == EStatus.Fail)
Status = AllAssetObjects == null ? EStatus.Failed : EStatus.Succeed;
if (Status == EStatus.Failed)
{
if (MainAssetInfo.AssetType == null)
LastError = $"Failed to load sub assets : {MainAssetInfo.AssetPath} AssetType : null AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";

View File

@@ -24,7 +24,7 @@ namespace YooAsset
{
if (Status == EStatus.None)
{
Status = EStatus.Fail;
Status = EStatus.Failed;
LastError = error;
InvokeCompletion();
}

View File

@@ -32,7 +32,7 @@ namespace YooAsset
string guid = UnityEditor.AssetDatabase.AssetPathToGUID(MainAssetInfo.AssetPath);
if (string.IsNullOrEmpty(guid))
{
Status = EStatus.Fail;
Status = EStatus.Failed;
LastError = $"Not found asset : {MainAssetInfo.AssetPath}";
YooLogger.Error(LastError);
InvokeCompletion();
@@ -59,8 +59,8 @@ namespace YooAsset
// 2. 检测加载结果
if (Status == EStatus.Checking)
{
Status = AssetObject == null ? EStatus.Fail : EStatus.Success;
if (Status == EStatus.Fail)
Status = AssetObject == null ? EStatus.Failed : EStatus.Succeed;
if (Status == EStatus.Failed)
{
if (MainAssetInfo.AssetType == null)
LastError = $"Failed to load asset object : {MainAssetInfo.AssetPath} AssetType : null";

View File

@@ -0,0 +1,55 @@

namespace YooAsset
{
internal class DatabaseRawFileProvider : ProviderBase
{
public override float Progress
{
get
{
if (IsDone)
return 1f;
else
return 0;
}
}
public DatabaseRawFileProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
{
}
public override void Update()
{
#if UNITY_EDITOR
if (IsDone)
return;
if (Status == EStatus.None)
{
// 检测资源文件是否存在
string guid = UnityEditor.AssetDatabase.AssetPathToGUID(MainAssetInfo.AssetPath);
if (string.IsNullOrEmpty(guid))
{
Status = EStatus.Failed;
LastError = $"Not found asset : {MainAssetInfo.AssetPath}";
YooLogger.Error(LastError);
InvokeCompletion();
return;
}
Status = EStatus.Checking;
// 注意:模拟异步加载效果提前返回
if (IsWaitForAsyncComplete == false)
return;
}
if(Status == EStatus.Checking)
{
RawFilePath = MainAssetInfo.AssetPath;
Status = EStatus.Succeed;
InvokeCompletion();
}
#endif
}
}
}

View File

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

View File

@@ -51,7 +51,7 @@ namespace YooAsset
}
else
{
Status = EStatus.Fail;
Status = EStatus.Failed;
LastError = $"Failed to load scene : {MainAssetInfo.AssetPath}";
YooLogger.Error(LastError);
InvokeCompletion();
@@ -66,8 +66,8 @@ namespace YooAsset
if (SceneObject.IsValid() && _activateOnLoad)
SceneManager.SetActiveScene(SceneObject);
Status = SceneObject.IsValid() ? EStatus.Success : EStatus.Fail;
if (Status == EStatus.Fail)
Status = SceneObject.IsValid() ? EStatus.Succeed : EStatus.Failed;
if (Status == EStatus.Failed)
{
LastError = $"The loaded scene is invalid : {MainAssetInfo.AssetPath}";
YooLogger.Error(LastError);

View File

@@ -32,7 +32,7 @@ namespace YooAsset
string guid = UnityEditor.AssetDatabase.AssetPathToGUID(MainAssetInfo.AssetPath);
if (string.IsNullOrEmpty(guid))
{
Status = EStatus.Fail;
Status = EStatus.Failed;
LastError = $"Not found asset : {MainAssetInfo.AssetPath}";
YooLogger.Error(LastError);
InvokeCompletion();
@@ -70,8 +70,8 @@ namespace YooAsset
// 2. 检测加载结果
if (Status == EStatus.Checking)
{
Status = AllAssetObjects == null ? EStatus.Fail : EStatus.Success;
if (Status == EStatus.Fail)
Status = AllAssetObjects == null ? EStatus.Failed : EStatus.Succeed;
if (Status == EStatus.Failed)
{
if (MainAssetInfo.AssetType == null)
LastError = $"Failed to load sub assets : {MainAssetInfo.AssetPath} AssetType : null";

View File

@@ -13,8 +13,8 @@ namespace YooAsset
CheckBundle,
Loading,
Checking,
Success,
Fail,
Succeed,
Failed,
}
/// <summary>
@@ -47,6 +47,11 @@ namespace YooAsset
/// </summary>
public UnityEngine.SceneManagement.Scene SceneObject { protected set; get; }
/// <summary>
/// 原生文件路径
/// </summary>
public string RawFilePath { protected set; get; }
/// <summary>
/// 当前的加载状态
@@ -75,7 +80,7 @@ namespace YooAsset
{
get
{
return Status == EStatus.Success || Status == EStatus.Fail;
return Status == EStatus.Succeed || Status == EStatus.Failed;
}
}
@@ -152,6 +157,8 @@ namespace YooAsset
handle = new SceneOperationHandle(this);
else if (typeof(T) == typeof(SubAssetsOperationHandle))
handle = new SubAssetsOperationHandle(this);
else if (typeof(T) == typeof(RawFileOperationHandle))
handle = new RawFileOperationHandle(this);
else
throw new System.NotImplementedException();
@@ -216,7 +223,7 @@ namespace YooAsset
List<OperationHandleBase> tempers = new List<OperationHandleBase>(_handles);
foreach (var hande in tempers)
{
if (hande.IsValid)
if (hande.IsValidWithWarning)
{
hande.InvokeCallback();
}

View File

@@ -78,6 +78,9 @@ namespace YooAsset
/// </summary>
public InitializationOperation InitializeAsync(InitializeParameters parameters)
{
// 注意WebGL平台因为网络原因可能会初始化失败
ResetInitializeAfterFailed();
// 检测初始化参数合法性
CheckInitializeParameters(parameters);
@@ -127,6 +130,20 @@ namespace YooAsset
initializeOperation.Completed += InitializeOperation_Completed;
return initializeOperation;
}
private void ResetInitializeAfterFailed()
{
if (_isInitialize && _initializeStatus == EOperationStatus.Failed)
{
_isInitialize = false;
_initializeStatus = EOperationStatus.None;
_initializeError = string.Empty;
_bundleServices = null;
_assetSystemImpl = null;
_editorSimulateModeImpl = null;
_offlinePlayModeImpl = null;
_hostPlayModeImpl = null;
}
}
private void CheckInitializeParameters(InitializeParameters parameters)
{
if (_isInitialize)
@@ -185,24 +202,25 @@ namespace YooAsset
/// 向网络端请求最新的资源版本
/// </summary>
/// <param name="timeout">超时时间默认值60秒</param>
public UpdateStaticVersionOperation UpdateStaticVersionAsync(int timeout = 60)
/// <param name="appendTimeTicks">在URL末尾添加时间戳</param>
public UpdatePackageVersionOperation UpdatePackageVersionAsync(int timeout = 60, bool appendTimeTicks = true)
{
DebugCheckInitialize();
if (_playMode == EPlayMode.EditorSimulateMode)
{
var operation = new EditorPlayModeUpdateStaticVersionOperation();
var operation = new EditorPlayModeUpdatePackageVersionOperation();
OperationSystem.StartOperation(operation);
return operation;
}
else if (_playMode == EPlayMode.OfflinePlayMode)
{
var operation = new OfflinePlayModeUpdateStaticVersionOperation();
var operation = new OfflinePlayModeUpdatePackageVersionOperation();
OperationSystem.StartOperation(operation);
return operation;
}
else if (_playMode == EPlayMode.HostPlayMode)
{
return _hostPlayModeImpl.UpdateStaticVersionAsync(PackageName, timeout);
return _hostPlayModeImpl.UpdatePackageVersionAsync(PackageName, timeout, appendTimeTicks);
}
else
{
@@ -215,25 +233,25 @@ namespace YooAsset
/// </summary>
/// <param name="packageVersion">更新的包裹版本</param>
/// <param name="timeout">超时时间默认值60秒</param>
public UpdateManifestOperation UpdateManifestAsync(string packageVersion, int timeout = 60)
public UpdatePackageManifestOperation UpdatePackageManifestAsync(string packageVersion, int timeout = 60)
{
DebugCheckInitialize();
DebugCheckUpdateManifest();
if (_playMode == EPlayMode.EditorSimulateMode)
{
var operation = new EditorPlayModeUpdateManifestOperation();
var operation = new EditorPlayModeUpdatePackageManifestOperation();
OperationSystem.StartOperation(operation);
return operation;
}
else if (_playMode == EPlayMode.OfflinePlayMode)
{
var operation = new OfflinePlayModeUpdateManifestOperation();
var operation = new OfflinePlayModeUpdatePackageManifestOperation();
OperationSystem.StartOperation(operation);
return operation;
}
else if (_playMode == EPlayMode.HostPlayMode)
{
return _hostPlayModeImpl.UpdatePatchManifestAsync(PackageName, packageVersion, timeout);
return _hostPlayModeImpl.UpdatePackageManifestAsync(PackageName, packageVersion, timeout);
}
else
{
@@ -270,7 +288,18 @@ namespace YooAsset
}
/// <summary>
/// 获取包裹的版本信息
/// 清理本地包裹未使用的缓存文件
/// </summary>
public ClearPackageUnusedCacheFilesOperation ClearPackageUnusedCacheFilesAsync()
{
DebugCheckInitialize();
var operation = new ClearPackageUnusedCacheFilesOperation(this);
OperationSystem.StartOperation(operation);
return operation;
}
/// <summary>
/// 获取本地包裹的版本信息
/// </summary>
public string GetPackageVersion()
{
@@ -401,74 +430,63 @@ namespace YooAsset
#region
/// <summary>
/// 异步获取原生文件
/// 同步加载原生文件
/// </summary>
/// <param name="location">资源的定位地址</param>
/// <param name="copyPath">拷贝路径</param>
public RawFileOperation GetRawFileAsync(string location, string copyPath = null)
/// <param name="assetInfo">资源信息</param>
public RawFileOperationHandle LoadRawFileSync(AssetInfo assetInfo)
{
DebugCheckInitialize();
AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null);
return GetRawFileInternal(assetInfo, copyPath);
return LoadRawFileInternal(assetInfo, true);
}
/// <summary>
/// 异步获取原生文件
/// 同步加载原生文件
/// </summary>
/// <param name="assetInfo">资源信息</param>
/// <param name="copyPath">拷贝路径</param>
public RawFileOperation GetRawFileAsync(AssetInfo assetInfo, string copyPath = null)
/// <param name="location">资源的定位地址</param>
public RawFileOperationHandle LoadRawFileSync(string location)
{
DebugCheckInitialize();
return GetRawFileInternal(assetInfo, copyPath);
AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null);
return LoadRawFileInternal(assetInfo, true);
}
/// <summary>
/// 异步加载原生文件
/// </summary>
/// <param name="assetInfo">资源信息</param>
public RawFileOperationHandle LoadRawFileAsync(AssetInfo assetInfo)
{
DebugCheckInitialize();
return LoadRawFileInternal(assetInfo, false);
}
/// <summary>
/// 异步加载原生文件
/// </summary>
/// <param name="location">资源的定位地址</param>
public RawFileOperationHandle LoadRawFileAsync(string location)
{
DebugCheckInitialize();
AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null);
return LoadRawFileInternal(assetInfo, false);
}
private RawFileOperation GetRawFileInternal(AssetInfo assetInfo, string copyPath)
private RawFileOperationHandle LoadRawFileInternal(AssetInfo assetInfo, bool waitForAsyncComplete)
{
if (assetInfo.IsInvalid)
{
YooLogger.Error($"Failed to get raw file. {assetInfo.Error}");
RawFileOperation operation = new CompletedRawFileOperation(assetInfo.Error, copyPath);
OperationSystem.StartOperation(operation);
return operation;
}
BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
#if UNITY_EDITOR
if (bundleInfo.Bundle.IsRawFile == false)
if (assetInfo.IsInvalid == false)
{
string error = $"Cannot load asset bundle file using {nameof(GetRawFileAsync)} method !";
YooLogger.Error(error);
RawFileOperation operation = new CompletedRawFileOperation(error, copyPath);
OperationSystem.StartOperation(operation);
return operation;
BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
if (bundleInfo.Bundle.IsRawFile == false)
throw new Exception($"Cannot load asset bundle file using {nameof(LoadRawFileAsync)} method !");
}
#endif
if (_playMode == EPlayMode.EditorSimulateMode)
{
RawFileOperation operation = new EditorPlayModeRawFileOperation(bundleInfo, copyPath);
OperationSystem.StartOperation(operation);
return operation;
}
else if (_playMode == EPlayMode.OfflinePlayMode)
{
RawFileOperation operation = new OfflinePlayModeRawFileOperation(bundleInfo, copyPath);
OperationSystem.StartOperation(operation);
return operation;
}
else if (_playMode == EPlayMode.HostPlayMode)
{
RawFileOperation operation = new HostPlayModeRawFileOperation(bundleInfo, copyPath);
OperationSystem.StartOperation(operation);
return operation;
}
else
{
throw new NotImplementedException();
}
var handle = _assetSystemImpl.LoadRawFileAsync(assetInfo);
if (waitForAsyncComplete)
handle.WaitForAsyncComplete();
return handle;
}
#endregion
@@ -581,13 +599,7 @@ namespace YooAsset
{
BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
if (bundleInfo.Bundle.IsRawFile)
{
string error = $"Cannot load raw file using LoadAsset method !";
YooLogger.Error(error);
CompletedProvider completedProvider = new CompletedProvider(assetInfo);
completedProvider.SetCompleted(error);
return completedProvider.CreateHandle<AssetOperationHandle>();
}
throw new Exception($"Cannot load raw file using {nameof(LoadAssetAsync)} method !");
}
#endif
@@ -676,13 +688,7 @@ namespace YooAsset
{
BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
if (bundleInfo.Bundle.IsRawFile)
{
string error = $"Cannot load raw file using LoadSubAssets method !";
YooLogger.Error(error);
CompletedProvider completedProvider = new CompletedProvider(assetInfo);
completedProvider.SetCompleted(error);
return completedProvider.CreateHandle<SubAssetsOperationHandle>();
}
throw new Exception($"Cannot load raw file using {nameof(LoadSubAssetsAsync)} method !");
}
#endif
@@ -899,24 +905,24 @@ namespace YooAsset
/// </summary>
/// <param name="packageVersion">指定更新的包裹版本</param>
/// <param name="timeout">超时时间</param>
public UpdatePackageOperation UpdatePackageAsync(string packageVersion, int timeout = 60)
public DownloadPackageOperation DownloadPackageAsync(string packageVersion, int timeout = 60)
{
DebugCheckInitialize();
if (_playMode == EPlayMode.EditorSimulateMode)
{
var operation = new EditorPlayModeUpdatePackageOperation();
var operation = new EditorPlayModeDownloadPackageOperation();
OperationSystem.StartOperation(operation);
return operation;
}
else if (_playMode == EPlayMode.OfflinePlayMode)
{
var operation = new OfflinePlayModeUpdatePackageOperation();
var operation = new OfflinePlayModeDownloadPackageOperation();
OperationSystem.StartOperation(operation);
return operation;
}
else if (_playMode == EPlayMode.HostPlayMode)
{
return _hostPlayModeImpl.UpdatePackageAsync(PackageName, packageVersion, timeout);
return _hostPlayModeImpl.DownloadPackageAsync(PackageName, packageVersion, timeout);
}
else
{
@@ -972,7 +978,7 @@ namespace YooAsset
var loadedBundleInfos = _assetSystemImpl.GetLoadedBundleInfos();
if (loadedBundleInfos.Count > 0)
{
YooLogger.Warning($"Found loaded bundle before update manifest ! Recommended to call the {nameof(ForceUnloadAllAssets)} method to release loaded bundle !");
YooLogger.Error($"Found loaded bundle before update manifest ! Recommended to call the {nameof(ForceUnloadAllAssets)} method to release loaded bundle !");
}
}
#endregion

View File

@@ -2,7 +2,6 @@
using System.IO;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace YooAsset
{
@@ -30,8 +29,8 @@ namespace YooAsset
/// </summary>
public static bool IsCached(PatchBundle patchBundle)
{
string fileHash = patchBundle.FileHash;
if (_cachedDic.ContainsKey(fileHash))
string cacheKey = patchBundle.CacheKey;
if (_cachedDic.ContainsKey(cacheKey))
{
string filePath = patchBundle.CachedFilePath;
if (File.Exists(filePath))
@@ -40,7 +39,7 @@ namespace YooAsset
}
else
{
_cachedDic.Remove(fileHash);
_cachedDic.Remove(cacheKey);
YooLogger.Error($"Cache file is missing : {filePath}");
return false;
}
@@ -56,12 +55,12 @@ namespace YooAsset
/// </summary>
public static void CacheBundle(PatchBundle patchBundle)
{
string fileHash = patchBundle.FileHash;
if (_cachedDic.ContainsKey(fileHash) == false)
string cacheKey = patchBundle.CacheKey;
if (_cachedDic.ContainsKey(cacheKey) == false)
{
string filePath = patchBundle.CachedFilePath;
YooLogger.Log($"Cache verify file : {filePath}");
_cachedDic.Add(fileHash, patchBundle);
_cachedDic.Add(cacheKey, patchBundle);
}
}

View File

@@ -25,7 +25,7 @@ namespace YooAsset
/// <summary>
/// 加载状态
/// </summary>
public int Status;
public string Status;
public int CompareTo(DebugBundleInfo other)
{

View File

@@ -40,7 +40,7 @@ namespace YooAsset
/// <summary>
/// 加载状态
/// </summary>
public int Status;
public string Status;
/// <summary>
/// 依赖的资源包列表

View File

@@ -5,9 +5,9 @@ using System.IO;
namespace YooAsset
{
/// <summary>
/// 清理未使用的缓存资源操作类
/// 清理本地包裹未使用的缓存文件
/// </summary>
public sealed class ClearUnusedCacheFilesOperation : AsyncOperationBase
public sealed class ClearPackageUnusedCacheFilesOperation : AsyncOperationBase
{
private enum ESteps
{
@@ -17,14 +17,14 @@ namespace YooAsset
Done,
}
private readonly List<AssetsPackage> _packages;
private readonly AssetsPackage _package;
private ESteps _steps = ESteps.None;
private List<string> _unusedCacheFilePaths;
private int _unusedFileTotalCount = 0;
internal ClearUnusedCacheFilesOperation(List<AssetsPackage> packages)
internal ClearPackageUnusedCacheFilesOperation(AssetsPackage package)
{
_packages = packages;
_package = package;
}
internal override void Start()
{
@@ -84,27 +84,19 @@ namespace YooAsset
/// </summary>
private List<string> GetUnusedCacheFilePaths()
{
string cacheFolderPath = PersistentHelper.GetCacheFolderPath();
string cacheFolderPath = PersistentHelper.GetCacheFolderPath(_package.PackageName);
if (Directory.Exists(cacheFolderPath) == false)
return new List<string>();
// 获取所有缓存文件
DirectoryInfo directoryInfo = new DirectoryInfo(cacheFolderPath);
FileInfo[] fileInfos = directoryInfo.GetFiles();
List<string> result = new List<string>(fileInfos.Length);
foreach (FileInfo fileInfo in fileInfos)
{
bool used = false;
foreach (var package in _packages)
if (_package.IsIncludeBundleFile(fileInfo.Name) == false)
{
if (package.IsIncludeBundleFile(fileInfo.Name))
{
used = true;
break;
}
}
if (used == false)
result.Add(fileInfo.FullName);
}
}
return result;
}

View File

@@ -5,7 +5,7 @@ using System.IO;
namespace YooAsset
{
public abstract class UpdatePackageOperation : AsyncOperationBase
public abstract class DownloadPackageOperation : AsyncOperationBase
{
/// <summary>
/// 创建包裹下载器
@@ -19,7 +19,7 @@ namespace YooAsset
/// <summary>
/// 编辑器下模拟运行的更新资源包裹操作
/// </summary>
internal sealed class EditorPlayModeUpdatePackageOperation : UpdatePackageOperation
internal sealed class EditorPlayModeDownloadPackageOperation : DownloadPackageOperation
{
internal override void Start()
{
@@ -43,7 +43,7 @@ namespace YooAsset
/// <summary>
/// 离线模式的更新资源包裹操作
/// </summary>
internal sealed class OfflinePlayModeUpdatePackageOperation : UpdatePackageOperation
internal sealed class OfflinePlayModeDownloadPackageOperation : DownloadPackageOperation
{
internal override void Start()
{
@@ -67,7 +67,7 @@ namespace YooAsset
/// <summary>
/// 联机模式的更新资源包裹操作
/// </summary>
internal sealed class HostPlayModeUpdatePackageOperation : UpdatePackageOperation
internal sealed class HostPlayModeDownloadPackageOperation : DownloadPackageOperation
{
private enum ESteps
{
@@ -86,7 +86,7 @@ namespace YooAsset
private UnityWebDataRequester _downloader;
private PatchManifest _remotePatchManifest;
internal HostPlayModeUpdatePackageOperation(HostPlayModeImpl impl, string packageName, string packageVersion, int timeout)
internal HostPlayModeDownloadPackageOperation(HostPlayModeImpl impl, string packageName, string packageVersion, int timeout)
{
_impl = impl;
_packageName = packageName;
@@ -105,7 +105,7 @@ namespace YooAsset
if (_steps == ESteps.LoadWebManifest)
{
string fileName = YooAssetSettingsData.GetPatchManifestFileName(_packageName, _packageVersion);
string fileName = YooAssetSettingsData.GetPatchManifestBinaryFileName(_packageName, _packageVersion);
string webURL = GetPatchManifestRequestURL(fileName);
YooLogger.Log($"Beginning to request patch manifest : {webURL}");
_downloader = new UnityWebDataRequester();
@@ -131,7 +131,8 @@ namespace YooAsset
// 解析补丁清单
try
{
_remotePatchManifest = PatchManifest.Deserialize(_downloader.GetText());
byte[] bytesData = _downloader.GetData();
_remotePatchManifest = PatchManifest.DeserializeFromBinary(bytesData);
_steps = ESteps.Done;
Status = EOperationStatus.Succeed;
}
@@ -153,13 +154,14 @@ namespace YooAsset
{
if (Status == EOperationStatus.Succeed)
{
YooLogger.Log($"Create package downloader : {_remotePatchManifest.PackageName} {_remotePatchManifest.PackageVersion}");
List<BundleInfo> downloadList = GetDownloadList();
var operation = new PackageDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
return operation;
}
else
{
YooLogger.Error($"{nameof(UpdatePackageOperation)} status is failed !");
YooLogger.Error($"{nameof(DownloadPackageOperation)} status is failed !");
var operation = new PackageDownloaderOperation(null, downloadingMaxNumber, failedTryAgain, timeout);
return operation;
}

View File

@@ -226,6 +226,19 @@ namespace YooAsset
{
_isPause = false;
}
/// <summary>
/// 取消下载
/// </summary>
public void CancelDownload()
{
if (_steps != ESteps.Done)
{
_steps = ESteps.Done;
Status = EOperationStatus.Failed;
Error = "User cancel.";
}
}
}
public sealed class PackageDownloaderOperation : DownloaderOperation

View File

@@ -56,8 +56,8 @@ namespace YooAsset
try
{
YooLogger.Log($"Load simulation manifest file : {_simulatePatchManifestPath}");
string jsonContent = FileUtility.ReadFile(_simulatePatchManifestPath);
var manifest = PatchManifest.Deserialize(jsonContent);
byte[] bytesData = FileUtility.ReadAllBytes(_simulatePatchManifestPath);
var manifest = PatchManifest.DeserializeFromBinary(bytesData);
InitializedPackageVersion = manifest.PackageVersion;
_impl.SetSimulatePatchManifest(manifest);
_steps = ESteps.Done;
@@ -491,7 +491,7 @@ namespace YooAsset
if (_steps == ESteps.LoadAppManifest)
{
string fileName = YooAssetSettingsData.GetPatchManifestFileName(_buildinPackageName, _buildinPackageVersion);
string fileName = YooAssetSettingsData.GetPatchManifestBinaryFileName(_buildinPackageName, _buildinPackageVersion);
string filePath = PathHelper.MakeStreamingLoadPath(fileName);
string url = PathHelper.ConvertToWWWPath(filePath);
_downloader = new UnityWebDataRequester();
@@ -513,7 +513,8 @@ namespace YooAsset
// 解析APP里的补丁清单
try
{
Manifest = PatchManifest.Deserialize(_downloader.GetText());
byte[] bytesData = _downloader.GetData();
Manifest = PatchManifest.DeserializeFromBinary(bytesData);
}
catch (System.Exception e)
{
@@ -590,7 +591,7 @@ namespace YooAsset
if (_steps == ESteps.CopyAppManifest)
{
string savePath = PersistentHelper.GetCacheManifestFilePath(_buildinPackageName);
string fileName = YooAssetSettingsData.GetPatchManifestFileName(_buildinPackageName, _buildinPackageVersion);
string fileName = YooAssetSettingsData.GetPatchManifestBinaryFileName(_buildinPackageName, _buildinPackageVersion);
string filePath = PathHelper.MakeStreamingLoadPath(fileName);
string url = PathHelper.ConvertToWWWPath(filePath);
_downloader = new UnityWebFileRequester();

View File

@@ -6,9 +6,9 @@ using System.IO;
namespace YooAsset
{
/// <summary>
/// 更新清单操作
/// 向远端请求并更新补丁清单
/// </summary>
public abstract class UpdateManifestOperation : AsyncOperationBase
public abstract class UpdatePackageManifestOperation : AsyncOperationBase
{
/// <summary>
/// 是否发现了新的补丁清单
@@ -19,7 +19,7 @@ namespace YooAsset
/// <summary>
/// 编辑器下模拟运行的更新清单操作
/// </summary>
internal sealed class EditorPlayModeUpdateManifestOperation : UpdateManifestOperation
internal sealed class EditorPlayModeUpdatePackageManifestOperation : UpdatePackageManifestOperation
{
internal override void Start()
{
@@ -33,7 +33,7 @@ namespace YooAsset
/// <summary>
/// 离线模式的更新清单操作
/// </summary>
internal sealed class OfflinePlayModeUpdateManifestOperation : UpdateManifestOperation
internal sealed class OfflinePlayModeUpdatePackageManifestOperation : UpdatePackageManifestOperation
{
internal override void Start()
{
@@ -48,7 +48,7 @@ namespace YooAsset
/// 联机模式的更新清单操作
/// 注意:优先比对沙盒清单哈希值,如果有变化就更新远端清单文件,并保存到本地。
/// </summary>
internal sealed class HostPlayModeUpdateManifestOperation : UpdateManifestOperation
internal sealed class HostPlayModeUpdatePackageManifestOperation : UpdatePackageManifestOperation
{
private enum ESteps
{
@@ -77,7 +77,7 @@ namespace YooAsset
private ESteps _steps = ESteps.None;
private float _verifyTime;
internal HostPlayModeUpdateManifestOperation(HostPlayModeImpl impl, string packageName, string packageVersion, int timeout)
internal HostPlayModeUpdatePackageManifestOperation(HostPlayModeImpl impl, string packageName, string packageVersion, int timeout)
{
_impl = impl;
_packageName = packageName;
@@ -171,7 +171,7 @@ namespace YooAsset
if (_steps == ESteps.LoadWebManifest)
{
string fileName = YooAssetSettingsData.GetPatchManifestFileName(_packageName, _packageVersion);
string fileName = YooAssetSettingsData.GetPatchManifestBinaryFileName(_packageName, _packageVersion);
string webURL = GetPatchManifestRequestURL(fileName);
YooLogger.Log($"Beginning to request patch manifest : {webURL}");
_downloader2 = new UnityWebDataRequester();
@@ -194,8 +194,8 @@ namespace YooAsset
{
try
{
string content = _downloader2.GetText();
var manifest = PersistentHelper.SaveCacheManifestFile(_packageName, content);
byte[] bytesData = _downloader2.GetData();
var manifest = PersistentHelper.SaveCacheManifestFile(_packageName, bytesData);
_impl.SetLocalPatchManifest(manifest);
FoundNewManifest = true;
_steps = ESteps.InitVerifyingCache;

View File

@@ -5,9 +5,9 @@ using UnityEngine;
namespace YooAsset
{
/// <summary>
/// 获取包裹的最新版本
/// 请求远端包裹的最新版本
/// </summary>
public abstract class UpdateStaticVersionOperation : AsyncOperationBase
public abstract class UpdatePackageVersionOperation : AsyncOperationBase
{
/// <summary>
/// 当前最新的包裹版本
@@ -16,9 +16,9 @@ namespace YooAsset
}
/// <summary>
/// 编辑器下模拟运行的获取包裹的最新版本操作
/// 编辑器下模拟模式的请求远端包裹的最新版本
/// </summary>
internal sealed class EditorPlayModeUpdateStaticVersionOperation : UpdateStaticVersionOperation
internal sealed class EditorPlayModeUpdatePackageVersionOperation : UpdatePackageVersionOperation
{
internal override void Start()
{
@@ -30,9 +30,9 @@ namespace YooAsset
}
/// <summary>
/// 离线模式的获取包裹的最新版本操作
/// 离线模式的请求远端包裹的最新版本
/// </summary>
internal sealed class OfflinePlayModeUpdateStaticVersionOperation : UpdateStaticVersionOperation
internal sealed class OfflinePlayModeUpdatePackageVersionOperation : UpdatePackageVersionOperation
{
internal override void Start()
{
@@ -44,9 +44,9 @@ namespace YooAsset
}
/// <summary>
/// 联机模式的获取包裹的最新版本操作
/// 联机模式的请求远端包裹的最新版本
/// </summary>
internal sealed class HostPlayModeUpdateStaticVersionOperation : UpdateStaticVersionOperation
internal sealed class HostPlayModeUpdatePackageVersionOperation : UpdatePackageVersionOperation
{
private enum ESteps
{
@@ -60,14 +60,16 @@ namespace YooAsset
private readonly HostPlayModeImpl _impl;
private readonly string _packageName;
private readonly int _timeout;
private readonly bool _appendTimeTicks;
private ESteps _steps = ESteps.None;
private UnityWebDataRequester _downloader;
internal HostPlayModeUpdateStaticVersionOperation(HostPlayModeImpl impl, string packageName, int timeout)
internal HostPlayModeUpdatePackageVersionOperation(HostPlayModeImpl impl, string packageName, int timeout, bool appendTimeTicks)
{
_impl = impl;
_packageName = packageName;
_timeout = timeout;
_appendTimeTicks = appendTimeTicks;
}
internal override void Start()
{
@@ -130,8 +132,11 @@ namespace YooAsset
else
url = _impl.GetPatchDownloadMainURL(fileName);
// 注意:在URL末尾添加时间戳
return $"{url}?{System.DateTime.UtcNow.Ticks}";
// 在URL末尾添加时间戳
if (_appendTimeTicks)
return $"{url}?{System.DateTime.UtcNow.Ticks}";
else
return url;
}
}
}

View File

@@ -41,10 +41,11 @@ namespace YooAsset
/// </summary>
public string[] Tags;
/// <summary>
/// 文件名称
/// </summary>
public string FileName { private set; get; }
/// 所属的包裹名称
/// </summary>
private string _packageName;
/// <summary>
/// 缓存文件路径
@@ -57,7 +58,7 @@ namespace YooAsset
if (string.IsNullOrEmpty(_cachedFilePath) == false)
return _cachedFilePath;
string cacheRoot = PersistentHelper.GetCacheFolderPath();
string cacheRoot = PersistentHelper.GetCacheFolderPath(_packageName);
_cachedFilePath = $"{cacheRoot}/{FileName}";
return _cachedFilePath;
}
@@ -79,24 +80,47 @@ namespace YooAsset
}
}
public PatchBundle(string bundleName, string fileHash, string fileCRC, long fileSize, bool isRawFile, byte loadMethod, string[] tags)
/// <summary>
/// 文件名称
/// </summary>
private string _fileName;
public string FileName
{
BundleName = bundleName;
FileHash = fileHash;
FileCRC = fileCRC;
FileSize = fileSize;
IsRawFile = isRawFile;
LoadMethod = loadMethod;
Tags = tags;
get
{
if (string.IsNullOrEmpty(_fileName))
throw new Exception("Should never get here !");
return _fileName;
}
}
/// <summary>
/// 解析文件名称
/// 缓存查询Key
/// </summary>
public void ParseFileName(int nameStype)
private string _cacheKey;
public string CacheKey
{
FileName = PatchManifest.CreateBundleFileName(nameStype, BundleName, FileHash);
get
{
if (string.IsNullOrEmpty(_cacheKey))
throw new Exception("Should never get here !");
return _cacheKey;
}
}
public PatchBundle()
{
}
/// <summary>
/// 解析资源包
/// </summary>
public void ParseBundle(string packageName, int nameStype)
{
_packageName = packageName;
_cacheKey = $"{packageName}-{FileHash}";
_fileName = PatchManifest.CreateBundleFileName(nameStype, BundleName, FileHash);
}
/// <summary>

View File

@@ -266,48 +266,147 @@ namespace YooAsset
/// <summary>
/// 序列化
/// 序列化JSON文件
/// </summary>
public static void Serialize(string savePath, PatchManifest patchManifest)
public static void SerializeToJson(string savePath, PatchManifest manifest)
{
string json = JsonUtility.ToJson(patchManifest);
string json = JsonUtility.ToJson(manifest, true);
FileUtility.CreateFile(savePath, json);
}
/// <summary>
/// 序列化
/// 序列化(二进制文件)
/// </summary>
public static PatchManifest Deserialize(string jsonData)
public static void SerializeToBinary(string savePath, PatchManifest patchManifest)
{
PatchManifest patchManifest = JsonUtility.FromJson<PatchManifest>(jsonData);
if (patchManifest == null)
throw new System.Exception($"{nameof(PatchManifest)} deserialize object is null !");
using (FileStream fs = new FileStream(savePath, FileMode.Create))
{
// 创建缓存器
BufferWriter buffer = new BufferWriter(YooAssetSettings.PatchManifestFileMaxSize);
// 检测文件版本
if (patchManifest.FileVersion != YooAssetSettings.PatchManifestFileVersion)
throw new Exception($"The manifest file version are not compatible : {patchManifest.FileVersion} != {YooAssetSettings.PatchManifestFileVersion}");
// 写入文件标记
buffer.WriteUInt32(YooAssetSettings.PatchManifestFileSign);
// 写入文件版本
buffer.WriteUTF8(patchManifest.FileVersion);
// 写入文件头信息
buffer.WriteBool(patchManifest.EnableAddressable);
buffer.WriteInt32(patchManifest.OutputNameStyle);
buffer.WriteUTF8(patchManifest.PackageName);
buffer.WriteUTF8(patchManifest.PackageVersion);
// 写入资源列表
buffer.WriteInt32(patchManifest.AssetList.Count);
for (int i = 0; i < patchManifest.AssetList.Count; i++)
{
var patchAsset = patchManifest.AssetList[i];
buffer.WriteUTF8(patchAsset.Address);
buffer.WriteUTF8(patchAsset.AssetPath);
buffer.WriteUTF8Array(patchAsset.AssetTags);
buffer.WriteInt32(patchAsset.BundleID);
buffer.WriteInt32Array(patchAsset.DependIDs);
}
// 写入资源包列表
buffer.WriteInt32(patchManifest.BundleList.Count);
for (int i = 0; i < patchManifest.BundleList.Count; i++)
{
var patchBundle = patchManifest.BundleList[i];
buffer.WriteUTF8(patchBundle.BundleName);
buffer.WriteUTF8(patchBundle.FileHash);
buffer.WriteUTF8(patchBundle.FileCRC);
buffer.WriteInt64(patchBundle.FileSize);
buffer.WriteBool(patchBundle.IsRawFile);
buffer.WriteByte(patchBundle.LoadMethod);
buffer.WriteUTF8Array(patchBundle.Tags);
}
// 写入文件流
buffer.WriteToStream(fs);
fs.Flush();
}
}
/// <summary>
/// 反序列化(二进制文件)
/// </summary>
public static PatchManifest DeserializeFromBinary(byte[] binaryData)
{
// 创建缓存器
BufferReader buffer = new BufferReader(binaryData);
// 读取文件标记
uint fileSign = buffer.ReadUInt32();
if (fileSign != YooAssetSettings.PatchManifestFileSign)
throw new Exception("Invalid manifest file !");
PatchManifest manifest = new PatchManifest();
{
// 读取文件版本
manifest.FileVersion = buffer.ReadUTF8();
if (manifest.FileVersion != YooAssetSettings.PatchManifestFileVersion)
throw new Exception($"The manifest file version are not compatible : {manifest.FileVersion} != {YooAssetSettings.PatchManifestFileVersion}");
// 读取文件头信息
manifest.EnableAddressable = buffer.ReadBool();
manifest.OutputNameStyle = buffer.ReadInt32();
manifest.PackageName = buffer.ReadUTF8();
manifest.PackageVersion = buffer.ReadUTF8();
// 读取资源列表
int patchAssetCount = buffer.ReadInt32();
manifest.AssetList = new List<PatchAsset>(patchAssetCount);
for (int i = 0; i < patchAssetCount; i++)
{
var patchAsset = new PatchAsset();
patchAsset.Address = buffer.ReadUTF8();
patchAsset.AssetPath = buffer.ReadUTF8();
patchAsset.AssetTags = buffer.ReadUTF8Array();
patchAsset.BundleID = buffer.ReadInt32();
patchAsset.DependIDs = buffer.ReadInt32Array();
manifest.AssetList.Add(patchAsset);
}
// 读取资源包列表
int patchBundleCount = buffer.ReadInt32();
manifest.BundleList = new List<PatchBundle>(patchBundleCount);
for (int i = 0; i < patchBundleCount; i++)
{
var patchBundle = new PatchBundle();
patchBundle.BundleName = buffer.ReadUTF8();
patchBundle.FileHash = buffer.ReadUTF8();
patchBundle.FileCRC = buffer.ReadUTF8();
patchBundle.FileSize = buffer.ReadInt64();
patchBundle.IsRawFile = buffer.ReadBool();
patchBundle.LoadMethod = buffer.ReadByte();
patchBundle.Tags = buffer.ReadUTF8Array();
manifest.BundleList.Add(patchBundle);
}
}
// BundleList
foreach (var patchBundle in patchManifest.BundleList)
foreach (var patchBundle in manifest.BundleList)
{
patchBundle.ParseFileName(patchManifest.OutputNameStyle);
patchManifest.BundleDic.Add(patchBundle.BundleName, patchBundle);
patchBundle.ParseBundle(manifest.PackageName, manifest.OutputNameStyle);
manifest.BundleDic.Add(patchBundle.BundleName, patchBundle);
}
// AssetList
foreach (var patchAsset in patchManifest.AssetList)
foreach (var patchAsset in manifest.AssetList)
{
// 注意:我们不允许原始路径存在重名
string assetPath = patchAsset.AssetPath;
if (patchManifest.AssetDic.ContainsKey(assetPath))
if (manifest.AssetDic.ContainsKey(assetPath))
throw new Exception($"AssetPath have existed : {assetPath}");
else
patchManifest.AssetDic.Add(assetPath, patchAsset);
manifest.AssetDic.Add(assetPath, patchAsset);
}
return patchManifest;
return manifest;
}
/// <summary>
/// 生成Bundle文件的正式名称
/// </summary>

View File

@@ -78,6 +78,10 @@ namespace YooAsset
{
return _simulatePatchManifest.IsIncludeBundleFile(fileName);
}
bool IBundleServices.IsServicesValid()
{
return _simulatePatchManifest != null;
}
#endregion
}
}

View File

@@ -44,9 +44,9 @@ namespace YooAsset
/// <summary>
/// 异步更新资源版本号
/// </summary>
public UpdateStaticVersionOperation UpdateStaticVersionAsync(string packageName, int timeout)
public UpdatePackageVersionOperation UpdatePackageVersionAsync(string packageName, int timeout, bool appendTimeTicks)
{
var operation = new HostPlayModeUpdateStaticVersionOperation(this, packageName, timeout);
var operation = new HostPlayModeUpdatePackageVersionOperation(this, packageName, timeout, appendTimeTicks);
OperationSystem.StartOperation(operation);
return operation;
}
@@ -54,9 +54,9 @@ namespace YooAsset
/// <summary>
/// 异步更新补丁清单
/// </summary>
public UpdateManifestOperation UpdatePatchManifestAsync(string packageName, string packageVersion, int timeout)
public UpdatePackageManifestOperation UpdatePackageManifestAsync(string packageName, string packageVersion, int timeout)
{
var operation = new HostPlayModeUpdateManifestOperation(this, packageName, packageVersion, timeout);
var operation = new HostPlayModeUpdatePackageManifestOperation(this, packageName, packageVersion, timeout);
OperationSystem.StartOperation(operation);
return operation;
}
@@ -74,9 +74,9 @@ namespace YooAsset
/// <summary>
/// 异步更新资源包裹
/// </summary>
public UpdatePackageOperation UpdatePackageAsync(string packageName, string packageVersion, int timeout)
public DownloadPackageOperation DownloadPackageAsync(string packageName, string packageVersion, int timeout)
{
var operation = new HostPlayModeUpdatePackageOperation(this, packageName, packageVersion, timeout);
var operation = new HostPlayModeDownloadPackageOperation(this, packageName, packageVersion, timeout);
OperationSystem.StartOperation(operation);
return operation;
}
@@ -86,6 +86,7 @@ namespace YooAsset
/// </summary>
public PatchDownloaderOperation CreatePatchDownloaderByAll(int fileLoadingMaxNumber, int failedTryAgain, int timeout)
{
YooLogger.Log($"Create patch downloader : {LocalPatchManifest.PackageName} {LocalPatchManifest.PackageVersion}");
List<BundleInfo> downloadList = GetDownloadListByAll();
var operation = new PatchDownloaderOperation(downloadList, fileLoadingMaxNumber, failedTryAgain, timeout);
return operation;
@@ -114,6 +115,7 @@ namespace YooAsset
/// </summary>
public PatchDownloaderOperation CreatePatchDownloaderByTags(string[] tags, int fileLoadingMaxNumber, int failedTryAgain, int timeout)
{
YooLogger.Log($"Create patch downloader : {LocalPatchManifest.PackageName} {LocalPatchManifest.PackageVersion}");
List<BundleInfo> downloadList = GetDownloadListByTags(tags);
var operation = new PatchDownloaderOperation(downloadList, fileLoadingMaxNumber, failedTryAgain, timeout);
return operation;
@@ -154,6 +156,7 @@ namespace YooAsset
/// </summary>
public PatchDownloaderOperation CreatePatchDownloaderByPaths(AssetInfo[] assetInfos, int fileLoadingMaxNumber, int failedTryAgain, int timeout)
{
YooLogger.Log($"Create patch downloader : {LocalPatchManifest.PackageName} {LocalPatchManifest.PackageVersion}");
List<BundleInfo> downloadList = GetDownloadListByPaths(assetInfos);
var operation = new PatchDownloaderOperation(downloadList, fileLoadingMaxNumber, failedTryAgain, timeout);
return operation;
@@ -206,6 +209,7 @@ namespace YooAsset
/// </summary>
public PatchUnpackerOperation CreatePatchUnpackerByTags(string[] tags, int fileUpackingMaxNumber, int failedTryAgain, int timeout)
{
YooLogger.Log($"Create patch unpacker : {LocalPatchManifest.PackageName} {LocalPatchManifest.PackageVersion}");
List<BundleInfo> unpcakList = GetUnpackListByTags(tags);
var operation = new PatchUnpackerOperation(unpcakList, fileUpackingMaxNumber, failedTryAgain, timeout);
return operation;
@@ -237,6 +241,7 @@ namespace YooAsset
/// </summary>
public PatchUnpackerOperation CreatePatchUnpackerByAll(int fileUpackingMaxNumber, int failedTryAgain, int timeout)
{
YooLogger.Log($"Create patch unpacker : {LocalPatchManifest.PackageName} {LocalPatchManifest.PackageVersion}");
List<BundleInfo> unpcakList = GetUnpackListByAll();
var operation = new PatchUnpackerOperation(unpcakList, fileUpackingMaxNumber, failedTryAgain, timeout);
return operation;
@@ -423,6 +428,10 @@ namespace YooAsset
{
return LocalPatchManifest.IsIncludeBundleFile(fileName);
}
bool IBundleServices.IsServicesValid()
{
return LocalPatchManifest != null;
}
#endregion
}
}

View File

@@ -129,6 +129,10 @@ namespace YooAsset
{
return _appPatchManifest.IsIncludeBundleFile(fileName);
}
bool IBundleServices.IsServicesValid()
{
return _appPatchManifest != null;
}
#endregion
}
}

View File

@@ -2,7 +2,7 @@
namespace YooAsset
{
internal interface IBundleServices
{
{
/// <summary>
/// 获取资源包信息
/// </summary>
@@ -42,5 +42,10 @@ namespace YooAsset
/// 是否包含资源文件
/// </summary>
bool IsIncludeBundleFile(string fileName);
/// <summary>
/// 服务接口是否有效
/// </summary>
bool IsServicesValid();
}
}

View File

@@ -16,13 +16,23 @@ namespace YooAsset
public string RawFileVariant = "rawfile";
/// <summary>
/// 补丁清单文件名称
/// 清单文件名称
/// </summary>
public string PatchManifestFileName = "PatchManifest";
/// <summary>
/// 补丁清单文件格式版本
/// 清单文件头标记
/// </summary>
public const uint PatchManifestFileSign = 0x594F4F;
/// <summary>
/// 清单文件极限大小100MB
/// </summary>
public const int PatchManifestFileMaxSize = 104857600;
/// <summary>
/// 清单文件格式版本
/// </summary>
public const string PatchManifestFileVersion = "1.3.4";

View File

@@ -51,11 +51,19 @@ namespace YooAsset
/// <summary>
/// 获取补丁清单文件完整名称
/// </summary>
public static string GetPatchManifestFileName(string packageName, string packageVersion)
public static string GetPatchManifestBinaryFileName(string packageName, string packageVersion)
{
return $"{Setting.PatchManifestFileName}_{packageName}_{packageVersion}.bytes";
}
/// <summary>
/// 获取补丁清单文件完整名称
/// </summary>
public static string GetPatchManifestJsonFileName(string packageName, string packageVersion)
{
return $"{Setting.PatchManifestFileName}_{packageName}_{packageVersion}.json";
}
/// <summary>
/// 获取补丁清单哈希文件完整名称
/// </summary>

View File

@@ -1,69 +0,0 @@
using System;
namespace YooAsset
{
internal struct BitMask32
{
private int _mask;
public static implicit operator int(BitMask32 mask) { return mask._mask; }
public static implicit operator BitMask32(int mask) { return new BitMask32(mask); }
public BitMask32(int mask)
{
_mask = mask;
}
/// <summary>
/// 打开位
/// </summary>
public void Open(int bit)
{
if (bit < 0 || bit > 31)
throw new ArgumentOutOfRangeException();
else
_mask |= 1 << bit;
}
/// <summary>
/// 关闭位
/// </summary>
public void Close(int bit)
{
if (bit < 0 || bit > 31)
throw new ArgumentOutOfRangeException();
else
_mask &= ~(1 << bit);
}
/// <summary>
/// 位取反
/// </summary>
public void Reverse(int bit)
{
if (bit < 0 || bit > 31)
throw new ArgumentOutOfRangeException();
else
_mask ^= 1 << bit;
}
/// <summary>
/// 所有位取反
/// </summary>
public void Inverse()
{
_mask = ~_mask;
}
/// <summary>
/// 比对位值
/// </summary>
public bool Test(int bit)
{
if (bit < 0 || bit > 31)
throw new ArgumentOutOfRangeException();
else
return (_mask & (1 << bit)) != 0;
}
}
}

View File

@@ -1,69 +0,0 @@
using System;
namespace YooAsset
{
internal struct BitMask64
{
private long _mask;
public static implicit operator long(BitMask64 mask) { return mask._mask; }
public static implicit operator BitMask64(long mask) { return new BitMask64(mask); }
public BitMask64(long mask)
{
_mask = mask;
}
/// <summary>
/// 打开位
/// </summary>
public void Open(int bit)
{
if (bit < 0 || bit > 63)
throw new ArgumentOutOfRangeException();
else
_mask |= 1L << bit;
}
/// <summary>
/// 关闭位
/// </summary>
public void Close(int bit)
{
if (bit < 0 || bit > 63)
throw new ArgumentOutOfRangeException();
else
_mask &= ~(1L << bit);
}
/// <summary>
/// 位取反
/// </summary>
public void Reverse(int bit)
{
if (bit < 0 || bit > 63)
throw new ArgumentOutOfRangeException();
else
_mask ^= 1L << bit;
}
/// <summary>
/// 所有位取反
/// </summary>
public void Inverse()
{
_mask = ~_mask;
}
/// <summary>
/// 比对位值
/// </summary>
public bool Test(int bit)
{
if (bit < 0 || bit > 63)
throw new ArgumentOutOfRangeException();
else
return (_mask & (1L << bit)) != 0;
}
}
}

View File

@@ -0,0 +1,160 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Text;
using System.Diagnostics;
namespace YooAsset
{
internal class BufferReader
{
private readonly byte[] _buffer;
private int _index = 0;
public BufferReader(byte[] data)
{
_buffer = data;
}
/// <summary>
/// 缓冲区容量
/// </summary>
public int Capacity
{
get { return _buffer.Length; }
}
public byte[] ReadBytes(int count)
{
CheckReaderIndex(count);
var data = new byte[count];
Buffer.BlockCopy(_buffer, _index, data, 0, count);
_index += count;
return data;
}
public byte ReadByte()
{
CheckReaderIndex(1);
return _buffer[_index++];
}
public bool ReadBool()
{
CheckReaderIndex(1);
return _buffer[_index++] == 1;
}
public short ReadInt16()
{
CheckReaderIndex(2);
if (BitConverter.IsLittleEndian)
{
short value = (short)((_buffer[_index]) | (_buffer[_index + 1] << 8));
_index += 2;
return value;
}
else
{
short value = (short)((_buffer[_index] << 8) | (_buffer[_index + 1]));
_index += 2;
return value;
}
}
public ushort ReadUInt16()
{
return (ushort)ReadInt16();
}
public int ReadInt32()
{
CheckReaderIndex(4);
if (BitConverter.IsLittleEndian)
{
int value = (_buffer[_index]) | (_buffer[_index + 1] << 8) | (_buffer[_index + 2] << 16) | (_buffer[_index + 3] << 24);
_index += 4;
return value;
}
else
{
int value = (_buffer[_index] << 24) | (_buffer[_index + 1] << 16) | (_buffer[_index + 2] << 8) | (_buffer[_index + 3]);
_index += 4;
return value;
}
}
public uint ReadUInt32()
{
return (uint)ReadInt32();
}
public long ReadInt64()
{
CheckReaderIndex(8);
if (BitConverter.IsLittleEndian)
{
int i1 = (_buffer[_index]) | (_buffer[_index + 1] << 8) | (_buffer[_index + 2] << 16) | (_buffer[_index + 3] << 24);
int i2 = (_buffer[_index + 4]) | (_buffer[_index + 5] << 8) | (_buffer[_index + 6] << 16) | (_buffer[_index + 7] << 24);
_index += 8;
return (uint)i1 | ((long)i2 << 32);
}
else
{
int i1 = (_buffer[_index] << 24) | (_buffer[_index + 1] << 16) | (_buffer[_index + 2] << 8) | (_buffer[_index + 3]);
int i2 = (_buffer[_index + 4] << 24) | (_buffer[_index + 5] << 16) | (_buffer[_index + 6] << 8) | (_buffer[_index + 7]);
_index += 8;
return (uint)i2 | ((long)i1 << 32);
}
}
public ulong ReadUInt64()
{
return (ulong)ReadInt64();
}
public string ReadUTF8()
{
ushort count = ReadUInt16();
if (count == 0)
return string.Empty;
CheckReaderIndex(count);
string value = Encoding.UTF8.GetString(_buffer, _index, count);
_index += count;
return value;
}
public int[] ReadInt32Array()
{
ushort count = ReadUInt16();
int[] values = new int[count];
for (int i = 0; i < count; i++)
{
values[i] = ReadInt32();
}
return values;
}
public long[] ReadInt64Array()
{
ushort count = ReadUInt16();
long[] values = new long[count];
for (int i = 0; i < count; i++)
{
values[i] = ReadInt64();
}
return values;
}
public string[] ReadUTF8Array()
{
ushort count = ReadUInt16();
string[] values = new string[count];
for (int i = 0; i < count; i++)
{
values[i] = ReadUTF8();
}
return values;
}
[Conditional("DEBUG")]
private void CheckReaderIndex(int length)
{
if (_index + length > Capacity)
{
throw new IndexOutOfRangeException();
}
}
}
}

View File

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

View File

@@ -0,0 +1,179 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Text;
using System.Diagnostics;
using System.IO;
namespace YooAsset
{
/// <summary>
/// 数据存储以小端字节序为标准
/// </summary>
internal class BufferWriter
{
private readonly byte[] _buffer;
private int _index = 0;
public BufferWriter(int capacity)
{
_buffer = new byte[capacity];
}
/// <summary>
/// 缓冲区容量
/// </summary>
public int Capacity
{
get { return _buffer.Length; }
}
/// <summary>
/// 将有效数据写入文件流
/// </summary>
public void WriteToStream(FileStream fileStream)
{
fileStream.Write(_buffer, 0, _index);
}
public void WriteBytes(byte[] data)
{
int count = data.Length;
CheckWriterIndex(count);
Buffer.BlockCopy(data, 0, _buffer, _index, count);
_index += count;
}
public void WriteByte(byte value)
{
CheckWriterIndex(1);
_buffer[_index++] = value;
}
public void WriteBool(bool value)
{
WriteByte((byte)(value ? 1 : 0));
}
public void WriteInt16(short value)
{
WriteUInt16((ushort)value);
}
public void WriteUInt16(ushort value)
{
CheckWriterIndex(2);
_buffer[_index++] = (byte)value;
_buffer[_index++] = (byte)(value >> 8);
}
public void WriteInt32(int value)
{
WriteUInt32((uint)value);
}
public void WriteUInt32(uint value)
{
CheckWriterIndex(4);
_buffer[_index++] = (byte)value;
_buffer[_index++] = (byte)(value >> 8);
_buffer[_index++] = (byte)(value >> 16);
_buffer[_index++] = (byte)(value >> 24);
}
public void WriteInt64(long value)
{
WriteUInt64((ulong)value);
}
public void WriteUInt64(ulong value)
{
CheckWriterIndex(8);
_buffer[_index++] = (byte)value;
_buffer[_index++] = (byte)(value >> 8);
_buffer[_index++] = (byte)(value >> 16);
_buffer[_index++] = (byte)(value >> 24);
_buffer[_index++] = (byte)(value >> 32);
_buffer[_index++] = (byte)(value >> 40);
_buffer[_index++] = (byte)(value >> 48);
_buffer[_index++] = (byte)(value >> 56);
}
public void WriteUTF8(string value)
{
if (string.IsNullOrEmpty(value))
{
WriteUInt16(0);
}
else
{
byte[] bytes = Encoding.UTF8.GetBytes(value);
int count = bytes.Length;
if (count > ushort.MaxValue)
throw new FormatException($"Write string length cannot be greater than {ushort.MaxValue} !");
WriteUInt16(Convert.ToUInt16(count));
WriteBytes(bytes);
}
}
public void WriteInt32Array(int[] values)
{
if (values == null)
{
WriteUInt16(0);
}
else
{
int count = values.Length;
if (count > ushort.MaxValue)
throw new FormatException($"Write array length cannot be greater than {ushort.MaxValue} !");
WriteUInt16(Convert.ToUInt16(count));
for (int i = 0; i < count; i++)
{
WriteInt32(values[i]);
}
}
}
public void WriteInt64Array(long[] values)
{
if (values == null)
{
WriteUInt16(0);
}
else
{
int count = values.Length;
if (count > ushort.MaxValue)
throw new FormatException($"Write array length cannot be greater than {ushort.MaxValue} !");
WriteUInt16(Convert.ToUInt16(count));
for (int i = 0; i < count; i++)
{
WriteInt64(values[i]);
}
}
}
public void WriteUTF8Array(string[] values)
{
if (values == null)
{
WriteUInt16(0);
}
else
{
int count = values.Length;
if (count > ushort.MaxValue)
throw new FormatException($"Write array length cannot be greater than {ushort.MaxValue} !");
WriteUInt16(Convert.ToUInt16(count));
for (int i = 0; i < count; i++)
{
WriteUTF8(values[i]);
}
}
}
[Conditional("DEBUG")]
private void CheckWriterIndex(int length)
{
if (_index + length > Capacity)
{
throw new IndexOutOfRangeException();
}
}
}
}

View File

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

View File

@@ -97,17 +97,18 @@ namespace YooAsset
/// </summary>
public static void DeleteCacheFolder()
{
string directoryPath = GetCacheFolderPath();
if (Directory.Exists(directoryPath))
Directory.Delete(directoryPath, true);
string root = PathHelper.MakePersistentLoadPath(CacheFolderName);
if (Directory.Exists(root))
Directory.Delete(root, true);
}
/// <summary>
/// 获取缓存文件夹路径
/// </summary>
public static string GetCacheFolderPath()
public static string GetCacheFolderPath(string packageName)
{
return PathHelper.MakePersistentLoadPath(CacheFolderName);
string root = PathHelper.MakePersistentLoadPath(CacheFolderName);
return $"{root}/{packageName}";
}
#region
@@ -127,19 +128,19 @@ namespace YooAsset
{
YooLogger.Log($"Load sandbox patch manifest file : {packageName}");
string filePath = GetCacheManifestFilePath(packageName);
string jsonData = File.ReadAllText(filePath);
return PatchManifest.Deserialize(jsonData);
byte[] bytesData = File.ReadAllBytes(filePath);
return PatchManifest.DeserializeFromBinary(bytesData);
}
/// <summary>
/// 存储沙盒内清单文件
/// </summary>
public static PatchManifest SaveCacheManifestFile(string packageName, string fileContent)
public static PatchManifest SaveCacheManifestFile(string packageName, byte[] fileBytesData)
{
YooLogger.Log($"Save sandbox patch manifest file : {packageName}");
var manifest = PatchManifest.Deserialize(fileContent);
var manifest = PatchManifest.DeserializeFromBinary(fileBytesData);
string savePath = GetCacheManifestFilePath(packageName);
FileUtility.CreateFile(savePath, fileContent);
FileUtility.CreateFile(savePath, fileBytesData);
return manifest;
}

View File

@@ -117,15 +117,25 @@ namespace YooAsset
internal static class FileUtility
{
/// <summary>
/// 读取文件
/// 读取文件的文本数据
/// </summary>
public static string ReadFile(string filePath)
public static string ReadAllText(string filePath)
{
if (File.Exists(filePath) == false)
return string.Empty;
return File.ReadAllText(filePath, Encoding.UTF8);
}
/// <summary>
/// 读取文件的字节数据
/// </summary>
public static byte[] ReadAllBytes(string filePath)
{
if (File.Exists(filePath) == false)
return null;
return File.ReadAllBytes(filePath);
}
/// <summary>
/// 创建文件(如果已经存在则删除旧文件)
/// </summary>

View File

@@ -9,6 +9,7 @@ namespace YooAsset
public static partial class YooAssets
{
private static bool _isInitialize = false;
private static GameObject _driver = null;
private static readonly List<AssetsPackage> _packages = new List<AssetsPackage>();
/// <summary>
@@ -23,13 +24,14 @@ namespace YooAsset
{
// 创建驱动器
_isInitialize = true;
UnityEngine.GameObject driverGo = new UnityEngine.GameObject($"[{nameof(YooAssets)}]");
driverGo.AddComponent<YooAssetsDriver>();
UnityEngine.Object.DontDestroyOnLoad(driverGo);
_driver = new UnityEngine.GameObject($"[{nameof(YooAssets)}]");
_driver.AddComponent<YooAssetsDriver>();
UnityEngine.Object.DontDestroyOnLoad(_driver);
YooLogger.Log($"{nameof(YooAssets)} initialize !");
#if DEBUG
// 添加远程调试脚本
driverGo.AddComponent<RemoteDebuggerInRuntime>();
_driver.AddComponent<RemoteDebuggerInRuntime>();
#endif
// 初始化异步系统
@@ -37,27 +39,10 @@ namespace YooAsset
}
}
/// <summary>
/// 更新资源系统
/// </summary>
internal static void Update()
{
if (_isInitialize)
{
OperationSystem.Update();
DownloadSystem.Update();
foreach (var package in _packages)
{
package.UpdatePackage();
}
}
}
/// <summary>
/// 销毁资源系统
/// </summary>
internal static void Destroy()
public static void Destroy()
{
if (_isInitialize)
{
@@ -72,7 +57,26 @@ namespace YooAsset
_packages.Clear();
_isInitialize = false;
YooLogger.Log("YooAssets destroy all !");
if (_driver != null)
GameObject.Destroy(_driver);
YooLogger.Log($"{nameof(YooAssets)} destroy all !");
}
}
/// <summary>
/// 更新资源系统
/// </summary>
internal static void Update()
{
if (_isInitialize)
{
OperationSystem.Update();
DownloadSystem.Update();
for (int i = 0; i < _packages.Count; i++)
{
_packages[i].UpdatePackage();
}
}
}
@@ -102,6 +106,18 @@ namespace YooAsset
/// </summary>
/// <param name="packageName">资源包名称</param>
public static AssetsPackage GetAssetsPackage(string packageName)
{
var package = TryGetAssetsPackage(packageName);
if (package == null)
YooLogger.Warning($"Not found assets package : {packageName}");
return package;
}
/// <summary>
/// 尝试获取资源包
/// </summary>
/// <param name="packageName">资源包名称</param>
public static AssetsPackage TryGetAssetsPackage(string packageName)
{
if (_isInitialize == false)
throw new Exception($"{nameof(YooAssets)} not initialize !");
@@ -114,8 +130,6 @@ namespace YooAsset
if (package.PackageName == packageName)
return package;
}
YooLogger.Warning($"Not found assets package : {packageName}");
return null;
}
@@ -193,16 +207,6 @@ namespace YooAsset
#endregion
#region
/// <summary>
/// 清理未使用的缓存文件
/// </summary>
public static ClearUnusedCacheFilesOperation ClearUnusedCacheFiles()
{
ClearUnusedCacheFilesOperation operation = new ClearUnusedCacheFilesOperation(_packages);
OperationSystem.StartOperation(operation);
return operation;
}
/// <summary>
/// 获取内置文件夹名称
/// </summary>

View File

@@ -12,14 +12,6 @@ namespace YooAsset
DebugCheckDuplicateDriver();
YooAssets.Update();
}
void OnDestroy()
{
YooAssets.Destroy();
}
void OnApplicationQuit()
{
YooAssets.Destroy();
}
[Conditional("DEBUG")]
private void DebugCheckDuplicateDriver()

View File

@@ -82,25 +82,43 @@ namespace YooAsset
#region
/// <summary>
/// 异步获取原生文件
/// 同步加载原生文件
/// </summary>
/// <param name="location">资源的定位地址</param>
/// <param name="copyPath">拷贝路径</param>
public static RawFileOperation GetRawFileAsync(string location, string copyPath = null)
/// <param name="assetInfo">资源信息</param>
public static RawFileOperationHandle LoadRawFileSync(AssetInfo assetInfo)
{
DebugCheckDefaultPackageValid();
return _defaultPackage.GetRawFileAsync(location, copyPath);
return _defaultPackage.LoadRawFileSync(assetInfo);
}
/// <summary>
/// 异步获取原生文件
/// 同步加载原生文件
/// </summary>
/// <param name="assetInfo">资源信息</param>
/// <param name="copyPath">拷贝路径</param>
public static RawFileOperation GetRawFileAsync(AssetInfo assetInfo, string copyPath = null)
/// <param name="location">资源的定位地址</param>
public static RawFileOperationHandle LoadRawFileSync(string location)
{
DebugCheckDefaultPackageValid();
return _defaultPackage.GetRawFileAsync(assetInfo, copyPath);
return _defaultPackage.LoadRawFileSync(location);
}
/// <summary>
/// 异步加载原生文件
/// </summary>
/// <param name="assetInfo">资源信息</param>
public static RawFileOperationHandle LoadRawFileAsync(AssetInfo assetInfo)
{
DebugCheckDefaultPackageValid();
return _defaultPackage.LoadRawFileAsync(assetInfo);
}
/// <summary>
/// 异步加载原生文件
/// </summary>
/// <param name="location">资源的定位地址</param>
public static RawFileOperationHandle LoadRawFileAsync(string location)
{
DebugCheckDefaultPackageValid();
return _defaultPackage.LoadRawFileAsync(location);
}
#endregion
@@ -367,14 +385,14 @@ namespace YooAsset
#region
/// <summary>
/// 创建资源包裹下载器,用于下载更新指定资源版本所有的资源包文件
/// 资源包裹更新,用于下载更新指定资源版本所有的资源包文件
/// </summary>
/// <param name="packageVersion">指定更新的包裹版本</param>
/// <param name="timeout">超时时间</param>
public static UpdatePackageOperation UpdatePackageAsync(string packageVersion, int timeout = 60)
public static DownloadPackageOperation DownloadPackageAsync(string packageVersion, int timeout = 60)
{
DebugCheckDefaultPackageValid();
return _defaultPackage.UpdatePackageAsync(packageVersion, timeout);
return _defaultPackage.DownloadPackageAsync(packageVersion, timeout);
}
#endregion

View File

@@ -1,692 +0,0 @@
fileFormatVersion: 2
guid: 67fa0069e75d5734fbeb60b68392703b
ModelImporter:
serializedVersion: 20200
internalIDToNameTable:
- first:
1: 100000
second: Chest
- first:
1: 100002
second: COB_CTRL
- first:
1: 100004
second: Foot_Left
- first:
1: 100006
second: Foot_Right
- first:
1: 100008
second: //RootNode
- first:
1: 100010
second: Footman_Mesh
- first:
1: 100012
second: Hand_Left
- first:
1: 100014
second: Hand_Right
- first:
1: 100016
second: Head
- first:
1: 100018
second: Hips
- first:
1: 100020
second: Index_Intermediate_Left
- first:
1: 100022
second: Index_Intermediate_Right
- first:
1: 100024
second: Index_Proximal_Left
- first:
1: 100026
second: Index_Proximal_Right
- first:
1: 100028
second: J_Tip
- first:
1: 100030
second: Jaw
- first:
1: 100032
second: LowerArm_Left
- first:
1: 100034
second: LowerArm_Right
- first:
1: 100036
second: LowerLeg_Left
- first:
1: 100038
second: LowerLeg_Right
- first:
1: 100040
second: Neck
- first:
1: 100042
second: RestOfFingers_Intermediate_Left
- first:
1: 100044
second: RestOfFingers_Intermediate_Right
- first:
1: 100046
second: RestOfFingers_Proximal_Left
- first:
1: 100048
second: RestOfFingers_Proximal_Right
- first:
1: 100050
second: Shield
- first:
1: 100052
second: Shoulder_Left
- first:
1: 100054
second: Shoulder_Right
- first:
1: 100056
second: Spine
- first:
1: 100058
second: Sword
- first:
1: 100060
second: Thumb_Intermediate_Left
- first:
1: 100062
second: Thumb_Intermediate_Right
- first:
1: 100064
second: Thumb_Proximal_Left
- first:
1: 100066
second: Thumb_Proximal_Right
- first:
1: 100068
second: Toe_Left
- first:
1: 100070
second: Toe_Right
- first:
1: 100072
second: Toetip_Left
- first:
1: 100074
second: Toetip_Right
- first:
1: 100076
second: UpperArm_Left
- first:
1: 100078
second: UpperArm_Right
- first:
1: 100080
second: UpperLeg_Left
- first:
1: 100082
second: UpperLeg_Right
- first:
4: 400000
second: Chest
- first:
4: 400002
second: COB_CTRL
- first:
4: 400004
second: Foot_Left
- first:
4: 400006
second: Foot_Right
- first:
4: 400008
second: //RootNode
- first:
4: 400010
second: Footman_Mesh
- first:
4: 400012
second: Hand_Left
- first:
4: 400014
second: Hand_Right
- first:
4: 400016
second: Head
- first:
4: 400018
second: Hips
- first:
4: 400020
second: Index_Intermediate_Left
- first:
4: 400022
second: Index_Intermediate_Right
- first:
4: 400024
second: Index_Proximal_Left
- first:
4: 400026
second: Index_Proximal_Right
- first:
4: 400028
second: J_Tip
- first:
4: 400030
second: Jaw
- first:
4: 400032
second: LowerArm_Left
- first:
4: 400034
second: LowerArm_Right
- first:
4: 400036
second: LowerLeg_Left
- first:
4: 400038
second: LowerLeg_Right
- first:
4: 400040
second: Neck
- first:
4: 400042
second: RestOfFingers_Intermediate_Left
- first:
4: 400044
second: RestOfFingers_Intermediate_Right
- first:
4: 400046
second: RestOfFingers_Proximal_Left
- first:
4: 400048
second: RestOfFingers_Proximal_Right
- first:
4: 400050
second: Shield
- first:
4: 400052
second: Shoulder_Left
- first:
4: 400054
second: Shoulder_Right
- first:
4: 400056
second: Spine
- first:
4: 400058
second: Sword
- first:
4: 400060
second: Thumb_Intermediate_Left
- first:
4: 400062
second: Thumb_Intermediate_Right
- first:
4: 400064
second: Thumb_Proximal_Left
- first:
4: 400066
second: Thumb_Proximal_Right
- first:
4: 400068
second: Toe_Left
- first:
4: 400070
second: Toe_Right
- first:
4: 400072
second: Toetip_Left
- first:
4: 400074
second: Toetip_Right
- first:
4: 400076
second: UpperArm_Left
- first:
4: 400078
second: UpperArm_Right
- first:
4: 400080
second: UpperLeg_Left
- first:
4: 400082
second: UpperLeg_Right
- first:
43: 4300000
second: Footman_Mesh
- first:
74: 7400000
second: attack
- first:
95: 9500000
second: //RootNode
- first:
111: 11100000
second: //RootNode
- first:
137: 13700000
second: Footman_Mesh
externalObjects: {}
materials:
materialImportMode: 1
materialName: 0
materialSearch: 1
materialLocation: 0
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 3
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations:
- serializedVersion: 16
name: attack
takeName: Take 001
internalID: 0
firstFrame: 1
lastFrame: 28
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 1
loopBlendPositionY: 1
loopBlendPositionXZ: 1
keepOriginalOrientation: 1
keepOriginalPositionY: 1
keepOriginalPositionXZ: 1
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: COB_CTRL
weight: 0
- path: Footman_Mesh
weight: 0
- path: Hips
weight: 1
- path: Hips/Shield
weight: 1
- path: Hips/Spine
weight: 1
- path: Hips/Spine/Chest
weight: 1
- path: Hips/Spine/Chest/Neck
weight: 1
- path: Hips/Spine/Chest/Neck/Head
weight: 1
- path: Hips/Spine/Chest/Neck/Head/Jaw
weight: 1
- path: Hips/Spine/Chest/Neck/Head/Jaw/J_Tip
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/Index_Proximal_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/Index_Proximal_Left/Index_Intermediate_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/RestOfFingers_Proximal_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/RestOfFingers_Proximal_Left/RestOfFingers_Intermediate_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/Thumb_Proximal_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/Thumb_Proximal_Left/Thumb_Intermediate_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/Index_Proximal_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/Index_Proximal_Right/Index_Intermediate_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/RestOfFingers_Proximal_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/RestOfFingers_Proximal_Right/RestOfFingers_Intermediate_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/Thumb_Proximal_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/Thumb_Proximal_Right/Thumb_Intermediate_Right
weight: 1
- path: Hips/Sword
weight: 1
- path: Hips/UpperLeg_Left
weight: 1
- path: Hips/UpperLeg_Left/LowerLeg_Left
weight: 1
- path: Hips/UpperLeg_Left/LowerLeg_Left/Foot_Left
weight: 1
- path: Hips/UpperLeg_Left/LowerLeg_Left/Foot_Left/Toe_Left
weight: 1
- path: Hips/UpperLeg_Left/LowerLeg_Left/Foot_Left/Toe_Left/Toetip_Left
weight: 1
- path: Hips/UpperLeg_Right
weight: 1
- path: Hips/UpperLeg_Right/LowerLeg_Right
weight: 1
- path: Hips/UpperLeg_Right/LowerLeg_Right/Foot_Right
weight: 1
- path: Hips/UpperLeg_Right/LowerLeg_Right/Foot_Right/Toe_Right
weight: 1
- path: Hips/UpperLeg_Right/LowerLeg_Right/Foot_Right/Toe_Right/Toetip_Right
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 0
importBlendShapes: 1
importCameras: 0
importLights: 0
fileIdsGeneration: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 4
normalCalculationMode: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton:
- name: footman@attack01(Clone)
parentName:
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: Footman_Mesh
parentName: footman@attack01(Clone)
position: {x: -0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: -0, w: 1}
scale: {x: 0.01, y: 0.01, z: 0.01}
- name: COB_CTRL
parentName: footman@attack01(Clone)
position: {x: 0.0042852233, y: 0.6601113, z: -0.1711083}
rotation: {x: 0.10958317, y: -0.19028346, z: -0.021378642, w: 0.9753598}
scale: {x: 0.01, y: 0.01, z: 0.01}
- name: Hips
parentName: footman@attack01(Clone)
position: {x: 0.0042852233, y: 0.7778554, z: 0.024665922}
rotation: {x: 0.119579025, y: 0.11957903, z: -0.69692236, w: 0.6969225}
scale: {x: 0.010000001, y: 0.009999999, z: 0.010000001}
- name: Spine
parentName: Hips
position: {x: -22.08183, y: 2.7610132e-30, z: 2.789185e-15}
rotation: {x: 0.000000007450581, y: -0.070730194, z: -0.000000078231096, w: 0.99749553}
scale: {x: 1.0000006, y: 1.0000004, z: 0.99999994}
- name: Chest
parentName: Spine
position: {x: -24.493395, y: 4.37078e-15, z: -6.5791713e-15}
rotation: {x: 0.000000019903341, y: -0.1926707, z: -0.00000003972174, w: 0.98126346}
scale: {x: 1.0000001, y: 1.0000002, z: 0.99999994}
- name: Neck
parentName: Chest
position: {x: -31.697706, y: 4.2682918e-15, z: 1.5827795e-14}
rotation: {x: -0.000000014372164, y: 0.14626887, z: -0.000000017028755, w: 0.9892449}
scale: {x: 1.0000008, y: 1.0000006, z: 1.0000001}
- name: Head
parentName: Neck
position: {x: -20.858675, y: 1.02066555e-14, z: 1.3950282e-15}
rotation: {x: -0.38232452, y: -0.000000014134563, z: 0.92402816, w: -0.00000005207485}
scale: {x: 1.0000002, y: 1, z: 0.99999976}
- name: Jaw
parentName: Head
position: {x: -19.492151, y: -4.0412776e-15, z: -4.4981513}
rotation: {x: -0.000000005806956, y: 0.0971892, z: 0.000000040794845, w: 0.99526596}
scale: {x: 1.000001, y: 1.0000006, z: 1.0000001}
- name: J_Tip
parentName: Jaw
position: {x: -9.274182, y: -1.2503675e-14, z: 8.099877}
rotation: {x: 0.29965067, y: -0.2996506, z: -0.64047605, w: 0.640476}
scale: {x: 0.99999994, y: 0.9999995, z: 1.0000008}
- name: Shoulder_Left
parentName: Chest
position: {x: -18.98868, y: -31.335035, z: -12.155753}
rotation: {x: -0.005294424, y: 0.090987876, z: 0.79941905, w: 0.59382015}
scale: {x: 1, y: 1.0000002, z: 0.99999994}
- name: UpperArm_Left
parentName: Shoulder_Left
position: {x: -14.901689, y: 2.842171e-14, z: 8.881784e-16}
rotation: {x: 0.026086485, y: -0.107761614, z: -0.1623719, w: 0.9804807}
scale: {x: 0.99999994, y: 0.99999964, z: 1.0000005}
- name: LowerArm_Left
parentName: UpperArm_Left
position: {x: -32.191196, y: 4.842915e-15, z: -2.9871985e-15}
rotation: {x: 0.00035523064, y: 0.064626634, z: 0.0047827335, w: 0.99789804}
scale: {x: 0.9999998, y: 0.99999976, z: 0.9999998}
- name: Hand_Left
parentName: LowerArm_Left
position: {x: -29.678864, y: -2.7758043e-29, z: 4.869975e-15}
rotation: {x: -0.0033530025, y: -0.08887861, z: -0.072212294, w: 0.9934157}
scale: {x: 1.0000004, y: 0.9999993, z: 0.9999999}
- name: RestOfFingers_Proximal_Left
parentName: Hand_Left
position: {x: -18.280243, y: -1.6586086e-14, z: -2.029683e-15}
rotation: {x: 0.0070363455, y: 0.038031247, z: 0.0719468, w: 0.9966583}
scale: {x: 0.99999964, y: 1.0000008, z: 1.0000001}
- name: RestOfFingers_Intermediate_Left
parentName: RestOfFingers_Proximal_Left
position: {x: -8.780147, y: 7.67957e-15, z: 3.7027159e-16}
rotation: {x: 0.000000007916243, y: 0.02967007, z: 0.00000003856258, w: 0.99955976}
scale: {x: 0.9999997, y: 1.0000001, z: 0.9999998}
- name: Index_Proximal_Left
parentName: Hand_Left
position: {x: -16.901342, y: 1.1929646e-13, z: 10.104264}
rotation: {x: 0.0067923637, y: 0.041410152, z: 0.07197031, w: 0.9965237}
scale: {x: 0.9999993, y: 1.0000011, z: 1.0000001}
- name: Index_Intermediate_Left
parentName: Index_Proximal_Left
position: {x: -9.911482, y: 1.4998595e-14, z: 3.154118e-15}
rotation: {x: 0.00000002142042, y: 0.026280932, z: -0.000000027008355, w: 0.9996546}
scale: {x: 1, y: 1.0000001, z: 1.0000001}
- name: Thumb_Proximal_Left
parentName: Hand_Left
position: {x: -7.0572023, y: -4.708794, z: 9.280683}
rotation: {x: -0.06620509, y: 0.3625553, z: 0.15769373, w: 0.91613495}
scale: {x: 0.99999994, y: 1.0000007, z: 0.9999999}
- name: Thumb_Intermediate_Left
parentName: Thumb_Proximal_Left
position: {x: -10.653726, y: 3.648137e-16, z: 8.5441255e-15}
rotation: {x: 0.030814871, y: -0.21547182, z: -0.13817634, w: 0.9661934}
scale: {x: 0.99999976, y: 1.0000004, z: 1.0000002}
- name: Shoulder_Right
parentName: Chest
position: {x: -18.98899, y: 31.335, z: -12.155691}
rotation: {x: 0.7994109, y: 0.59383136, z: 0.0052921963, w: -0.09098734}
scale: {x: 1.0000002, y: 0.9999999, z: 1.0000001}
- name: UpperArm_Right
parentName: Shoulder_Right
position: {x: 14.901961, y: 0.00046619424, z: 0.000079565914}
rotation: {x: 0.107756816, y: 0.026086226, z: -0.9804833, w: -0.16235957}
scale: {x: 1.0000002, y: 1, z: 1.0000007}
- name: LowerArm_Right
parentName: UpperArm_Right
position: {x: -32.191166, y: 4.4336893e-14, z: 3.536796e-15}
rotation: {x: -0.00035532357, y: -0.06462459, z: 0.0047840555, w: 0.99789816}
scale: {x: 1.0000012, y: 1, z: 1.000001}
- name: Hand_Right
parentName: LowerArm_Right
position: {x: -29.678719, y: 4.5461288e-14, z: -2.7325554e-15}
rotation: {x: 0.0033532493, y: 0.08887915, z: -0.07221696, w: 0.99341536}
scale: {x: 0.99999917, y: 1.0000001, z: 0.9999989}
- name: RestOfFingers_Proximal_Right
parentName: Hand_Right
position: {x: -18.280209, y: -3.645552e-14, z: 1.8098782e-15}
rotation: {x: -0.0070367483, y: -0.038032934, z: 0.07195137, w: 0.99665797}
scale: {x: 0.99999994, y: 1.0000011, z: 1.000001}
- name: RestOfFingers_Intermediate_Right
parentName: RestOfFingers_Proximal_Right
position: {x: -8.7804575, y: 1.3120176e-14, z: -2.045785e-15}
rotation: {x: -0.0000000018626449, y: -0.029668696, z: 0.000000023981553, w: 0.9995598}
scale: {x: 0.99999976, y: 1.0000007, z: 1.0000006}
- name: Index_Proximal_Right
parentName: Hand_Right
position: {x: -16.9013, y: -5.4614235e-14, z: -10.104266}
rotation: {x: -0.0067928056, y: -0.041411325, z: 0.07197488, w: 0.99652326}
scale: {x: 1.0000004, y: 1.0000013, z: 1.0000011}
- name: Index_Intermediate_Right
parentName: Index_Proximal_Right
position: {x: -9.911691, y: 2.0547315e-15, z: -2.2696136e-15}
rotation: {x: 0.0000000018626449, y: -0.026280075, z: -0.000000059051665, w: 0.9996546}
scale: {x: 0.9999998, y: 1.0000005, z: 1.0000007}
- name: Thumb_Proximal_Right
parentName: Hand_Right
position: {x: -7.0571103, y: -4.7085547, z: -9.280674}
rotation: {x: 0.06620055, y: -0.3625544, z: 0.15768987, w: 0.9161364}
scale: {x: 1.0000002, y: 1.0000013, z: 1.0000013}
- name: Thumb_Intermediate_Right
parentName: Thumb_Proximal_Right
position: {x: -10.653982, y: 2.4461068e-14, z: 1.7784693e-15}
rotation: {x: -0.03195776, y: 0.20743087, z: -0.1379023, w: 0.9679536}
scale: {x: 1.0000002, y: 1.0000001, z: 1.0000006}
- name: UpperLeg_Left
parentName: Hips
position: {x: 3.5068195, y: -19.94618, z: -1.3763187}
rotation: {x: -0.24868296, y: -0.015556604, z: 0.96813136, w: 0.025227567}
scale: {x: 1.0000002, y: 1.0000005, z: 1}
- name: LowerLeg_Left
parentName: UpperLeg_Left
position: {x: -32.81932, y: 2.1316282e-14, z: -8.881784e-15}
rotation: {x: -0.000059749553, y: -0.15989013, z: 0.025032664, w: 0.9868174}
scale: {x: 1.0000006, y: 1.0000004, z: 1.0000006}
- name: Foot_Left
parentName: LowerLeg_Left
position: {x: -37.066936, y: -1.4210855e-14, z: -4.440892e-15}
rotation: {x: 0.13149364, y: 0.6137423, z: -0.22415835, w: 0.74550855}
scale: {x: 1.0000005, y: 1, z: 1.0000004}
- name: Toe_Left
parentName: Foot_Left
position: {x: -12.738982, y: -0.5618247, z: 0.30802163}
rotation: {x: 0.44987908, y: 0.11339949, z: -0.10218815, w: 0.8799471}
scale: {x: 0.9999996, y: 0.9999996, z: 1.0000001}
- name: Toetip_Left
parentName: Toe_Left
position: {x: -17.954567, y: -0.038039967, z: 0.4538383}
rotation: {x: 0.04162463, y: 0.030676108, z: -0.003480352, w: 0.9986563}
scale: {x: 1.0000002, y: 1.0000002, z: 1.0000006}
- name: Shield
parentName: Hips
position: {x: -36.892387, y: -62.87267, z: 21.847818}
rotation: {x: 0.0000000074505797, y: -0.16911028, z: -0.00000008940696, w: 0.98559713}
scale: {x: 1.0000004, y: 1.0000006, z: 1}
- name: Sword
parentName: Hips
position: {x: -37.368732, y: 86.23419, z: 18.132149}
rotation: {x: 0.0000000074505797, y: -0.16911028, z: -0.00000008940696, w: 0.98559713}
scale: {x: 1.0000005, y: 1.0000005, z: 1.0000004}
- name: UpperLeg_Right
parentName: Hips
position: {x: 3.5067785, y: 19.9462, z: -1.3763317}
rotation: {x: -0.025228024, y: 0.9681315, z: -0.015552506, w: 0.24868283}
scale: {x: 1.0000004, y: 1.0000007, z: 1.0000004}
- name: LowerLeg_Right
parentName: UpperLeg_Right
position: {x: -32.819374, y: -1.0658141e-14, z: -3.5527137e-15}
rotation: {x: 0.000059747137, y: 0.15988994, z: 0.025033906, w: 0.9868174}
scale: {x: 1.0000005, y: 1.0000004, z: 1.0000013}
- name: Foot_Right
parentName: LowerLeg_Right
position: {x: -37.066925, y: -3.5527137e-15, z: 2.7533531e-14}
rotation: {x: -0.09970065, y: -0.6316042, z: -0.16588187, w: 0.75074565}
scale: {x: 1.0000006, y: 1.0000006, z: 1.0000011}
- name: Toe_Right
parentName: Foot_Right
position: {x: -12.755086, y: -7.1054274e-15, z: -1.2434498e-14}
rotation: {x: -0.4975446, y: -0.111791134, z: -0.10089414, w: 0.85426724}
scale: {x: 1.0000005, y: 0.99999994, z: 1.0000006}
- name: Toetip_Right
parentName: Toe_Right
position: {x: -17.96039, y: 0, z: 3.5527137e-15}
rotation: {x: -0.05678159, y: -0.018067792, z: -0.0037392974, w: 0.99821615}
scale: {x: 1.0000002, y: 0.99999994, z: 1.0000005}
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 1
skeletonHasParents: 0
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,692 +0,0 @@
fileFormatVersion: 2
guid: 215f12aa4e7512d4f97cbf44db79ac76
ModelImporter:
serializedVersion: 20200
internalIDToNameTable:
- first:
1: 100000
second: Chest
- first:
1: 100002
second: COB_CTRL
- first:
1: 100004
second: Foot_Left
- first:
1: 100006
second: Foot_Right
- first:
1: 100008
second: //RootNode
- first:
1: 100010
second: Footman_Mesh
- first:
1: 100012
second: Hand_Left
- first:
1: 100014
second: Hand_Right
- first:
1: 100016
second: Head
- first:
1: 100018
second: Hips
- first:
1: 100020
second: Index_Intermediate_Left
- first:
1: 100022
second: Index_Intermediate_Right
- first:
1: 100024
second: Index_Proximal_Left
- first:
1: 100026
second: Index_Proximal_Right
- first:
1: 100028
second: J_Tip
- first:
1: 100030
second: Jaw
- first:
1: 100032
second: LowerArm_Left
- first:
1: 100034
second: LowerArm_Right
- first:
1: 100036
second: LowerLeg_Left
- first:
1: 100038
second: LowerLeg_Right
- first:
1: 100040
second: Neck
- first:
1: 100042
second: RestOfFingers_Intermediate_Left
- first:
1: 100044
second: RestOfFingers_Intermediate_Right
- first:
1: 100046
second: RestOfFingers_Proximal_Left
- first:
1: 100048
second: RestOfFingers_Proximal_Right
- first:
1: 100050
second: Shield
- first:
1: 100052
second: Shoulder_Left
- first:
1: 100054
second: Shoulder_Right
- first:
1: 100056
second: Spine
- first:
1: 100058
second: Sword
- first:
1: 100060
second: Thumb_Intermediate_Left
- first:
1: 100062
second: Thumb_Intermediate_Right
- first:
1: 100064
second: Thumb_Proximal_Left
- first:
1: 100066
second: Thumb_Proximal_Right
- first:
1: 100068
second: Toe_Left
- first:
1: 100070
second: Toe_Right
- first:
1: 100072
second: Toetip_Left
- first:
1: 100074
second: Toetip_Right
- first:
1: 100076
second: UpperArm_Left
- first:
1: 100078
second: UpperArm_Right
- first:
1: 100080
second: UpperLeg_Left
- first:
1: 100082
second: UpperLeg_Right
- first:
4: 400000
second: Chest
- first:
4: 400002
second: COB_CTRL
- first:
4: 400004
second: Foot_Left
- first:
4: 400006
second: Foot_Right
- first:
4: 400008
second: //RootNode
- first:
4: 400010
second: Footman_Mesh
- first:
4: 400012
second: Hand_Left
- first:
4: 400014
second: Hand_Right
- first:
4: 400016
second: Head
- first:
4: 400018
second: Hips
- first:
4: 400020
second: Index_Intermediate_Left
- first:
4: 400022
second: Index_Intermediate_Right
- first:
4: 400024
second: Index_Proximal_Left
- first:
4: 400026
second: Index_Proximal_Right
- first:
4: 400028
second: J_Tip
- first:
4: 400030
second: Jaw
- first:
4: 400032
second: LowerArm_Left
- first:
4: 400034
second: LowerArm_Right
- first:
4: 400036
second: LowerLeg_Left
- first:
4: 400038
second: LowerLeg_Right
- first:
4: 400040
second: Neck
- first:
4: 400042
second: RestOfFingers_Intermediate_Left
- first:
4: 400044
second: RestOfFingers_Intermediate_Right
- first:
4: 400046
second: RestOfFingers_Proximal_Left
- first:
4: 400048
second: RestOfFingers_Proximal_Right
- first:
4: 400050
second: Shield
- first:
4: 400052
second: Shoulder_Left
- first:
4: 400054
second: Shoulder_Right
- first:
4: 400056
second: Spine
- first:
4: 400058
second: Sword
- first:
4: 400060
second: Thumb_Intermediate_Left
- first:
4: 400062
second: Thumb_Intermediate_Right
- first:
4: 400064
second: Thumb_Proximal_Left
- first:
4: 400066
second: Thumb_Proximal_Right
- first:
4: 400068
second: Toe_Left
- first:
4: 400070
second: Toe_Right
- first:
4: 400072
second: Toetip_Left
- first:
4: 400074
second: Toetip_Right
- first:
4: 400076
second: UpperArm_Left
- first:
4: 400078
second: UpperArm_Right
- first:
4: 400080
second: UpperLeg_Left
- first:
4: 400082
second: UpperLeg_Right
- first:
43: 4300000
second: Footman_Mesh
- first:
74: 7400000
second: defend
- first:
95: 9500000
second: //RootNode
- first:
111: 11100000
second: //RootNode
- first:
137: 13700000
second: Footman_Mesh
externalObjects: {}
materials:
materialImportMode: 1
materialName: 0
materialSearch: 1
materialLocation: 0
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 3
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations:
- serializedVersion: 16
name: defend
takeName: Take 001
internalID: 0
firstFrame: 1
lastFrame: 30
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 1
loopBlendPositionY: 1
loopBlendPositionXZ: 1
keepOriginalOrientation: 1
keepOriginalPositionY: 1
keepOriginalPositionXZ: 1
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: COB_CTRL
weight: 0
- path: Footman_Mesh
weight: 0
- path: Hips
weight: 1
- path: Hips/Shield
weight: 1
- path: Hips/Spine
weight: 1
- path: Hips/Spine/Chest
weight: 1
- path: Hips/Spine/Chest/Neck
weight: 1
- path: Hips/Spine/Chest/Neck/Head
weight: 1
- path: Hips/Spine/Chest/Neck/Head/Jaw
weight: 1
- path: Hips/Spine/Chest/Neck/Head/Jaw/J_Tip
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/Index_Proximal_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/Index_Proximal_Left/Index_Intermediate_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/RestOfFingers_Proximal_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/RestOfFingers_Proximal_Left/RestOfFingers_Intermediate_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/Thumb_Proximal_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/Thumb_Proximal_Left/Thumb_Intermediate_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/Index_Proximal_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/Index_Proximal_Right/Index_Intermediate_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/RestOfFingers_Proximal_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/RestOfFingers_Proximal_Right/RestOfFingers_Intermediate_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/Thumb_Proximal_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/Thumb_Proximal_Right/Thumb_Intermediate_Right
weight: 1
- path: Hips/Sword
weight: 1
- path: Hips/UpperLeg_Left
weight: 1
- path: Hips/UpperLeg_Left/LowerLeg_Left
weight: 1
- path: Hips/UpperLeg_Left/LowerLeg_Left/Foot_Left
weight: 1
- path: Hips/UpperLeg_Left/LowerLeg_Left/Foot_Left/Toe_Left
weight: 1
- path: Hips/UpperLeg_Left/LowerLeg_Left/Foot_Left/Toe_Left/Toetip_Left
weight: 1
- path: Hips/UpperLeg_Right
weight: 1
- path: Hips/UpperLeg_Right/LowerLeg_Right
weight: 1
- path: Hips/UpperLeg_Right/LowerLeg_Right/Foot_Right
weight: 1
- path: Hips/UpperLeg_Right/LowerLeg_Right/Foot_Right/Toe_Right
weight: 1
- path: Hips/UpperLeg_Right/LowerLeg_Right/Foot_Right/Toe_Right/Toetip_Right
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 0
importBlendShapes: 1
importCameras: 0
importLights: 0
fileIdsGeneration: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 4
normalCalculationMode: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton:
- name: footman_defend_01(Clone)
parentName:
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: COB_CTRL
parentName:
position: {x: 0.004, y: 0.65978205, z: -0.17136107}
rotation: {x: 0.109584615, y: -0.19028173, z: -0.021376925, w: 0.97536}
scale: {x: 0.01, y: 0.01, z: 0.010000001}
- name: Footman_Mesh
parentName:
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: 0, w: 1}
scale: {x: 0.01, y: 0.01, z: 0.01}
- name: Hips
parentName:
position: {x: 0.004, y: 0.7778548, z: 0.024665937}
rotation: {x: 0.11957903, y: 0.11957903, z: -0.6969224, w: 0.6969225}
scale: {x: 0.009999998, y: 0.01, z: 0.01}
- name: Spine
parentName:
position: {x: -22.08183, y: 2.7610132e-30, z: 2.789185e-15}
rotation: {x: 0.0000000041714956, y: -0.07073019, z: -0.000000041939902, w: 0.9974955}
scale: {x: 1, y: 1, z: 0.99999994}
- name: Chest
parentName:
position: {x: -24.493395, y: 4.37078e-15, z: -6.5791713e-15}
rotation: {x: 0.000000004171496, y: -0.19267076, z: -0.000000041939906, w: 0.9812635}
scale: {x: 0.9999996, y: 0.9999997, z: 1}
- name: Neck
parentName:
position: {x: -31.697706, y: 4.2682918e-15, z: 1.5827795e-14}
rotation: {x: -0.0000000021927513, y: 0.1462689, z: 0.000000042089766, w: 0.9892449}
scale: {x: 1, y: 1.0000001, z: 1}
- name: Head
parentName:
position: {x: -20.858675, y: 1.02066555e-14, z: 1.3950282e-15}
rotation: {x: -0.3823245, y: 0.0000000021927513, z: 0.92402816, w: -0.00000004208977}
scale: {x: 0.99999994, y: 0.99999994, z: 1}
- name: Jaw
parentName:
position: {x: -19.492151, y: -4.0412776e-15, z: -4.4981513}
rotation: {x: 0.000000017860568, y: 0.09718921, z: -0.00000003817534, w: 0.9952659}
scale: {x: 0.99999994, y: 1, z: 0.9999999}
- name: J_Tip
parentName:
position: {x: -9.274182, y: -1.2503675e-14, z: 8.099877}
rotation: {x: 0.29965067, y: -0.29965067, z: -0.640476, w: 0.640476}
scale: {x: 1.0000001, y: 1.0000002, z: 0.99999994}
- name: Shoulder_Left
parentName:
position: {x: -18.98868, y: -31.335035, z: -12.155753}
rotation: {x: -0.005294385, y: 0.09098777, z: 0.79941916, w: 0.59382004}
scale: {x: 1, y: 1.0000001, z: 1}
- name: UpperArm_Left
parentName:
position: {x: -14.901689, y: 2.842171e-14, z: 8.881784e-16}
rotation: {x: 0.026086552, y: -0.1077615, z: -0.16237192, w: 0.9804807}
scale: {x: 1.0000002, y: 1.0000001, z: 1.0000001}
- name: LowerArm_Left
parentName:
position: {x: -32.191196, y: 4.842915e-15, z: -2.9871985e-15}
rotation: {x: 0.00035524575, y: 0.064626455, z: 0.0047827368, w: 0.99789804}
scale: {x: 0.99999976, y: 0.99999994, z: 0.9999999}
- name: Hand_Left
parentName:
position: {x: -29.678864, y: -2.7758043e-29, z: 4.869975e-15}
rotation: {x: -0.0033529997, y: -0.08887863, z: -0.07221233, w: 0.9934158}
scale: {x: 0.99999976, y: 1.0000002, z: 0.9999999}
- name: RestOfFingers_Proximal_Left
parentName:
position: {x: -18.280243, y: -1.6586086e-14, z: -2.029683e-15}
rotation: {x: 0.007036325, y: 0.038031258, z: 0.07194682, w: 0.9966583}
scale: {x: 1.0000004, y: 0.9999998, z: 1.0000001}
- name: RestOfFingers_Intermediate_Left
parentName:
position: {x: -8.780147, y: 7.67957e-15, z: 3.7027159e-16}
rotation: {x: 0.00000001610115, y: 0.029670052, z: 0.0000000140879415, w: 0.99955976}
scale: {x: 0.9999999, y: 0.9999999, z: 0.9999999}
- name: Index_Proximal_Left
parentName:
position: {x: -16.901342, y: 1.1929646e-13, z: 10.104264}
rotation: {x: 0.0067923516, y: 0.04141017, z: 0.07197026, w: 0.9965236}
scale: {x: 1.0000002, y: 0.99999976, z: 0.9999999}
- name: Index_Intermediate_Left
parentName:
position: {x: -9.911482, y: 1.4998595e-14, z: 3.154118e-15}
rotation: {x: 0.00000001861509, y: 0.026280912, z: -0.000000012133206, w: 0.9996546}
scale: {x: 1, y: 0.9999999, z: 1}
- name: Thumb_Proximal_Left
parentName:
position: {x: -7.0572023, y: -4.708794, z: 9.280683}
rotation: {x: -0.06620511, y: 0.36255562, z: 0.15769365, w: 0.9161349}
scale: {x: 1.0000004, y: 0.9999999, z: 1.0000002}
- name: Thumb_Intermediate_Left
parentName:
position: {x: -10.653726, y: 3.648137e-16, z: 8.5441255e-15}
rotation: {x: 0.030814841, y: -0.21547185, z: -0.13817626, w: 0.9661934}
scale: {x: 1, y: 1, z: 0.9999999}
- name: Shoulder_Right
parentName:
position: {x: -18.98899, y: 31.335, z: -12.155691}
rotation: {x: 0.7994112, y: 0.5938308, z: 0.0052922214, w: -0.090987384}
scale: {x: 1.0000002, y: 1.0000005, z: 1.0000006}
- name: UpperArm_Right
parentName:
position: {x: 14.901961, y: 0.00046619424, z: 0.000079565914}
rotation: {x: 0.10775685, y: 0.026086215, z: -0.98048323, w: -0.16235992}
scale: {x: 1, y: 1, z: 0.9999997}
- name: LowerArm_Right
parentName:
position: {x: -32.191166, y: 4.4336893e-14, z: 3.536796e-15}
rotation: {x: -0.00035539793, y: -0.06462459, z: 0.0047837608, w: 0.99789816}
scale: {x: 1.0000004, y: 1, z: 1.0000002}
- name: Hand_Right
parentName:
position: {x: -29.678719, y: 4.5461288e-14, z: -2.7325554e-15}
rotation: {x: 0.0033532225, y: 0.08887915, z: -0.072216906, w: 0.99341536}
scale: {x: 0.9999994, y: 0.99999994, z: 0.9999992}
- name: RestOfFingers_Proximal_Right
parentName:
position: {x: -18.280209, y: -3.645552e-14, z: 1.8098782e-15}
rotation: {x: -0.0070367004, y: -0.03803295, z: 0.07195142, w: 0.9966579}
scale: {x: 1.0000002, y: 1.0000004, z: 1.0000005}
- name: RestOfFingers_Intermediate_Right
parentName:
position: {x: -8.7804575, y: 1.3120176e-14, z: -2.045785e-15}
rotation: {x: -0.0000000025775735, y: -0.0296687, z: 0.00000004162707, w: 0.9995598}
scale: {x: 0.9999997, y: 0.99999994, z: 0.99999976}
- name: Index_Proximal_Right
parentName:
position: {x: -16.9013, y: -5.4614235e-14, z: -10.104266}
rotation: {x: -0.0067927497, y: -0.041411348, z: 0.071974866, w: 0.9965233}
scale: {x: 1.0000004, y: 0.9999998, z: 1.0000002}
- name: Index_Intermediate_Right
parentName:
position: {x: -9.911691, y: 2.0547315e-15, z: -2.2696136e-15}
rotation: {x: -0.000000015177632, y: -0.026280066, z: 0.0000001054477, w: 0.99965465}
scale: {x: 0.9999999, y: 1.0000001, z: 0.9999999}
- name: Thumb_Proximal_Right
parentName:
position: {x: -7.0571103, y: -4.7085547, z: -9.280674}
rotation: {x: 0.06620065, y: -0.36255434, z: 0.15768968, w: 0.9161363}
scale: {x: 1.0000002, y: 1.0000004, z: 1.0000004}
- name: Thumb_Intermediate_Right
parentName:
position: {x: -10.653982, y: 2.4461068e-14, z: 1.7784693e-15}
rotation: {x: -0.031957757, y: 0.20743091, z: -0.13790222, w: 0.96795356}
scale: {x: 0.99999994, y: 1, z: 0.99999994}
- name: UpperLeg_Left
parentName:
position: {x: 3.5068195, y: -19.94618, z: -1.3763187}
rotation: {x: -0.2414414, y: -0.2406476, z: 0.9400832, w: 0.006198165}
scale: {x: 0.9999999, y: 0.9999998, z: 1}
- name: LowerLeg_Left
parentName:
position: {x: -32.81932, y: 2.1316282e-14, z: -8.881784e-15}
rotation: {x: -0.000059741335, y: -0.15989012, z: 0.025032552, w: 0.98681736}
scale: {x: 1, y: 0.9999998, z: 1}
- name: Foot_Left
parentName:
position: {x: -37.066936, y: -1.4210855e-14, z: -4.440892e-15}
rotation: {x: 0.31684917, y: 0.6395231, z: -0.10572263, w: 0.6924158}
scale: {x: 1.0000002, y: 0.99999976, z: 1.0000002}
- name: Toe_Left
parentName:
position: {x: -12.738982, y: -0.5618247, z: 0.30802163}
rotation: {x: 0.4498791, y: 0.11339964, z: -0.102188155, w: 0.8799472}
scale: {x: 0.99999994, y: 0.9999998, z: 1}
- name: Toetip_Left
parentName:
position: {x: -17.954567, y: -0.038039967, z: 0.4538383}
rotation: {x: 0.041624583, y: 0.03067606, z: -0.0034803154, w: 0.9986562}
scale: {x: 1.0000001, y: 0.99999994, z: 1.0000001}
- name: Shield
parentName:
position: {x: -36.94719, y: -62.859154, z: 21.787066}
rotation: {x: -2.1986723e-18, y: -0.16911028, z: -0.000000042146848, w: 0.98559713}
scale: {x: 1.0000001, y: 1, z: 0.9999999}
- name: Sword
parentName:
position: {x: -37.385925, y: 86.25157, z: 18.17991}
rotation: {x: -2.1986723e-18, y: -0.16911028, z: -0.000000042146848, w: 0.98559713}
scale: {x: 1.0000001, y: 1, z: 1.0000001}
- name: UpperLeg_Right
parentName:
position: {x: 3.5067785, y: 19.9462, z: -1.3763317}
rotation: {x: -0.008172598, y: 0.9452265, z: -0.21804802, w: 0.24276586}
scale: {x: 0.9999998, y: 1, z: 0.9999999}
- name: LowerLeg_Right
parentName:
position: {x: -32.819374, y: -1.0658141e-14, z: -3.5527137e-15}
rotation: {x: 0.00005974702, y: 0.1598899, z: 0.025033766, w: 0.98681736}
scale: {x: 0.99999994, y: 1, z: 0.99999976}
- name: Foot_Right
parentName:
position: {x: -37.066925, y: -3.5527137e-15, z: 2.7533531e-14}
rotation: {x: -0.2687201, y: -0.6451154, z: -0.057831235, w: 0.7129315}
scale: {x: 1.0000001, y: 0.9999999, z: 1.0000002}
- name: Toe_Right
parentName:
position: {x: -12.755086, y: -7.1054274e-15, z: -1.2434498e-14}
rotation: {x: -0.49754456, y: -0.111790985, z: -0.10089422, w: 0.8542673}
scale: {x: 0.9999998, y: 1, z: 0.99999964}
- name: Toetip_Right
parentName:
position: {x: -17.96039, y: 0, z: 3.5527137e-15}
rotation: {x: -0.056781646, y: -0.018067999, z: -0.0037392883, w: 0.9982161}
scale: {x: 0.99999994, y: 1.0000001, z: 1.0000001}
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 1
skeletonHasParents: 0
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,692 +0,0 @@
fileFormatVersion: 2
guid: 2e48304a01f069445a83cd957ef136cb
ModelImporter:
serializedVersion: 20200
internalIDToNameTable:
- first:
1: 100000
second: Chest
- first:
1: 100002
second: COB_CTRL
- first:
1: 100004
second: Foot_Left
- first:
1: 100006
second: Foot_Right
- first:
1: 100008
second: //RootNode
- first:
1: 100010
second: Footman_Mesh
- first:
1: 100012
second: Hand_Left
- first:
1: 100014
second: Hand_Right
- first:
1: 100016
second: Head
- first:
1: 100018
second: Hips
- first:
1: 100020
second: Index_Intermediate_Left
- first:
1: 100022
second: Index_Intermediate_Right
- first:
1: 100024
second: Index_Proximal_Left
- first:
1: 100026
second: Index_Proximal_Right
- first:
1: 100028
second: J_Tip
- first:
1: 100030
second: Jaw
- first:
1: 100032
second: LowerArm_Left
- first:
1: 100034
second: LowerArm_Right
- first:
1: 100036
second: LowerLeg_Left
- first:
1: 100038
second: LowerLeg_Right
- first:
1: 100040
second: Neck
- first:
1: 100042
second: RestOfFingers_Intermediate_Left
- first:
1: 100044
second: RestOfFingers_Intermediate_Right
- first:
1: 100046
second: RestOfFingers_Proximal_Left
- first:
1: 100048
second: RestOfFingers_Proximal_Right
- first:
1: 100050
second: Shield
- first:
1: 100052
second: Shoulder_Left
- first:
1: 100054
second: Shoulder_Right
- first:
1: 100056
second: Spine
- first:
1: 100058
second: Sword
- first:
1: 100060
second: Thumb_Intermediate_Left
- first:
1: 100062
second: Thumb_Intermediate_Right
- first:
1: 100064
second: Thumb_Proximal_Left
- first:
1: 100066
second: Thumb_Proximal_Right
- first:
1: 100068
second: Toe_Left
- first:
1: 100070
second: Toe_Right
- first:
1: 100072
second: Toetip_Left
- first:
1: 100074
second: Toetip_Right
- first:
1: 100076
second: UpperArm_Left
- first:
1: 100078
second: UpperArm_Right
- first:
1: 100080
second: UpperLeg_Left
- first:
1: 100082
second: UpperLeg_Right
- first:
4: 400000
second: Chest
- first:
4: 400002
second: COB_CTRL
- first:
4: 400004
second: Foot_Left
- first:
4: 400006
second: Foot_Right
- first:
4: 400008
second: //RootNode
- first:
4: 400010
second: Footman_Mesh
- first:
4: 400012
second: Hand_Left
- first:
4: 400014
second: Hand_Right
- first:
4: 400016
second: Head
- first:
4: 400018
second: Hips
- first:
4: 400020
second: Index_Intermediate_Left
- first:
4: 400022
second: Index_Intermediate_Right
- first:
4: 400024
second: Index_Proximal_Left
- first:
4: 400026
second: Index_Proximal_Right
- first:
4: 400028
second: J_Tip
- first:
4: 400030
second: Jaw
- first:
4: 400032
second: LowerArm_Left
- first:
4: 400034
second: LowerArm_Right
- first:
4: 400036
second: LowerLeg_Left
- first:
4: 400038
second: LowerLeg_Right
- first:
4: 400040
second: Neck
- first:
4: 400042
second: RestOfFingers_Intermediate_Left
- first:
4: 400044
second: RestOfFingers_Intermediate_Right
- first:
4: 400046
second: RestOfFingers_Proximal_Left
- first:
4: 400048
second: RestOfFingers_Proximal_Right
- first:
4: 400050
second: Shield
- first:
4: 400052
second: Shoulder_Left
- first:
4: 400054
second: Shoulder_Right
- first:
4: 400056
second: Spine
- first:
4: 400058
second: Sword
- first:
4: 400060
second: Thumb_Intermediate_Left
- first:
4: 400062
second: Thumb_Intermediate_Right
- first:
4: 400064
second: Thumb_Proximal_Left
- first:
4: 400066
second: Thumb_Proximal_Right
- first:
4: 400068
second: Toe_Left
- first:
4: 400070
second: Toe_Right
- first:
4: 400072
second: Toetip_Left
- first:
4: 400074
second: Toetip_Right
- first:
4: 400076
second: UpperArm_Left
- first:
4: 400078
second: UpperArm_Right
- first:
4: 400080
second: UpperLeg_Left
- first:
4: 400082
second: UpperLeg_Right
- first:
43: 4300000
second: Footman_Mesh
- first:
74: 7400000
second: die
- first:
95: 9500000
second: //RootNode
- first:
111: 11100000
second: //RootNode
- first:
137: 13700000
second: Footman_Mesh
externalObjects: {}
materials:
materialImportMode: 1
materialName: 0
materialSearch: 1
materialLocation: 0
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 3
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations:
- serializedVersion: 16
name: die
takeName: Take 001
internalID: 0
firstFrame: 1
lastFrame: 23
wrapMode: 8
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 1
loopBlendPositionY: 1
loopBlendPositionXZ: 1
keepOriginalOrientation: 1
keepOriginalPositionY: 1
keepOriginalPositionXZ: 1
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: COB_CTRL
weight: 0
- path: Footman_Mesh
weight: 0
- path: Hips
weight: 1
- path: Hips/Shield
weight: 1
- path: Hips/Spine
weight: 1
- path: Hips/Spine/Chest
weight: 1
- path: Hips/Spine/Chest/Neck
weight: 1
- path: Hips/Spine/Chest/Neck/Head
weight: 1
- path: Hips/Spine/Chest/Neck/Head/Jaw
weight: 1
- path: Hips/Spine/Chest/Neck/Head/Jaw/J_Tip
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/Index_Proximal_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/Index_Proximal_Left/Index_Intermediate_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/RestOfFingers_Proximal_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/RestOfFingers_Proximal_Left/RestOfFingers_Intermediate_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/Thumb_Proximal_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/Thumb_Proximal_Left/Thumb_Intermediate_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/Index_Proximal_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/Index_Proximal_Right/Index_Intermediate_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/RestOfFingers_Proximal_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/RestOfFingers_Proximal_Right/RestOfFingers_Intermediate_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/Thumb_Proximal_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/Thumb_Proximal_Right/Thumb_Intermediate_Right
weight: 1
- path: Hips/Sword
weight: 1
- path: Hips/UpperLeg_Left
weight: 1
- path: Hips/UpperLeg_Left/LowerLeg_Left
weight: 1
- path: Hips/UpperLeg_Left/LowerLeg_Left/Foot_Left
weight: 1
- path: Hips/UpperLeg_Left/LowerLeg_Left/Foot_Left/Toe_Left
weight: 1
- path: Hips/UpperLeg_Left/LowerLeg_Left/Foot_Left/Toe_Left/Toetip_Left
weight: 1
- path: Hips/UpperLeg_Right
weight: 1
- path: Hips/UpperLeg_Right/LowerLeg_Right
weight: 1
- path: Hips/UpperLeg_Right/LowerLeg_Right/Foot_Right
weight: 1
- path: Hips/UpperLeg_Right/LowerLeg_Right/Foot_Right/Toe_Right
weight: 1
- path: Hips/UpperLeg_Right/LowerLeg_Right/Foot_Right/Toe_Right/Toetip_Right
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 0
importBlendShapes: 1
importCameras: 0
importLights: 0
fileIdsGeneration: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 4
normalCalculationMode: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton:
- name: footman_die(Clone)
parentName:
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: COB_CTRL
parentName:
position: {x: 0.004, y: 0.65978205, z: -0.17136107}
rotation: {x: 0.109584615, y: -0.19028173, z: -0.021376925, w: 0.97536}
scale: {x: 0.01, y: 0.01, z: 0.010000001}
- name: Footman_Mesh
parentName:
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: 0, w: 1}
scale: {x: 0.01, y: 0.01, z: 0.01}
- name: Hips
parentName:
position: {x: 0.004, y: 0.7778548, z: 0.024665937}
rotation: {x: 0.11957903, y: 0.11957903, z: -0.6969224, w: 0.6969225}
scale: {x: 0.009999998, y: 0.01, z: 0.01}
- name: Spine
parentName:
position: {x: -22.08183, y: 2.7610132e-30, z: 2.789185e-15}
rotation: {x: 0.0000000041714956, y: -0.07073019, z: -0.000000041939902, w: 0.9974955}
scale: {x: 1, y: 1, z: 0.99999994}
- name: Chest
parentName:
position: {x: -24.493395, y: 4.37078e-15, z: -6.5791713e-15}
rotation: {x: 0.000000004171496, y: -0.19267076, z: -0.000000041939906, w: 0.9812635}
scale: {x: 0.9999996, y: 0.9999997, z: 1}
- name: Neck
parentName:
position: {x: -31.697706, y: 4.2682918e-15, z: 1.5827795e-14}
rotation: {x: -0.0000000021927513, y: 0.1462689, z: 0.000000042089766, w: 0.9892449}
scale: {x: 1, y: 1.0000001, z: 1}
- name: Head
parentName:
position: {x: -20.858675, y: 1.02066555e-14, z: 1.3950282e-15}
rotation: {x: -0.3823245, y: 0.0000000021927513, z: 0.92402816, w: -0.00000004208977}
scale: {x: 0.99999994, y: 0.99999994, z: 1}
- name: Jaw
parentName:
position: {x: -19.492151, y: -4.0412776e-15, z: -4.4981513}
rotation: {x: 0.000000017860568, y: 0.09718921, z: -0.00000003817534, w: 0.9952659}
scale: {x: 0.99999994, y: 1, z: 0.9999999}
- name: J_Tip
parentName:
position: {x: -9.274182, y: -1.2503675e-14, z: 8.099877}
rotation: {x: 0.29965067, y: -0.29965067, z: -0.640476, w: 0.640476}
scale: {x: 1.0000001, y: 1.0000002, z: 0.99999994}
- name: Shoulder_Left
parentName:
position: {x: -18.98868, y: -31.335035, z: -12.155753}
rotation: {x: -0.005294385, y: 0.09098777, z: 0.79941916, w: 0.59382004}
scale: {x: 1, y: 1.0000001, z: 1}
- name: UpperArm_Left
parentName:
position: {x: -14.901689, y: 2.842171e-14, z: 8.881784e-16}
rotation: {x: 0.026086552, y: -0.1077615, z: -0.16237192, w: 0.9804807}
scale: {x: 1.0000002, y: 1.0000001, z: 1.0000001}
- name: LowerArm_Left
parentName:
position: {x: -32.191196, y: 4.842915e-15, z: -2.9871985e-15}
rotation: {x: 0.00035524575, y: 0.064626455, z: 0.0047827368, w: 0.99789804}
scale: {x: 0.99999976, y: 0.99999994, z: 0.9999999}
- name: Hand_Left
parentName:
position: {x: -29.678864, y: -2.7758043e-29, z: 4.869975e-15}
rotation: {x: -0.0033529997, y: -0.08887863, z: -0.07221233, w: 0.9934158}
scale: {x: 0.99999976, y: 1.0000002, z: 0.9999999}
- name: RestOfFingers_Proximal_Left
parentName:
position: {x: -18.280243, y: -1.6586086e-14, z: -2.029683e-15}
rotation: {x: 0.007036325, y: 0.038031258, z: 0.07194682, w: 0.9966583}
scale: {x: 1.0000004, y: 0.9999998, z: 1.0000001}
- name: RestOfFingers_Intermediate_Left
parentName:
position: {x: -8.780147, y: 7.67957e-15, z: 3.7027159e-16}
rotation: {x: 0.00000001610115, y: 0.029670052, z: 0.0000000140879415, w: 0.99955976}
scale: {x: 0.9999999, y: 0.9999999, z: 0.9999999}
- name: Index_Proximal_Left
parentName:
position: {x: -16.901342, y: 1.1929646e-13, z: 10.104264}
rotation: {x: 0.0067923516, y: 0.04141017, z: 0.07197026, w: 0.9965236}
scale: {x: 1.0000002, y: 0.99999976, z: 0.9999999}
- name: Index_Intermediate_Left
parentName:
position: {x: -9.911482, y: 1.4998595e-14, z: 3.154118e-15}
rotation: {x: 0.00000001861509, y: 0.026280912, z: -0.000000012133206, w: 0.9996546}
scale: {x: 1, y: 0.9999999, z: 1}
- name: Thumb_Proximal_Left
parentName:
position: {x: -7.0572023, y: -4.708794, z: 9.280683}
rotation: {x: -0.06620511, y: 0.36255562, z: 0.15769365, w: 0.9161349}
scale: {x: 1.0000004, y: 0.9999999, z: 1.0000002}
- name: Thumb_Intermediate_Left
parentName:
position: {x: -10.653726, y: 3.648137e-16, z: 8.5441255e-15}
rotation: {x: 0.030814841, y: -0.21547185, z: -0.13817626, w: 0.9661934}
scale: {x: 1, y: 1, z: 0.9999999}
- name: Shoulder_Right
parentName:
position: {x: -18.98899, y: 31.335, z: -12.155691}
rotation: {x: 0.7994112, y: 0.5938308, z: 0.0052922214, w: -0.090987384}
scale: {x: 1.0000002, y: 1.0000005, z: 1.0000006}
- name: UpperArm_Right
parentName:
position: {x: 14.901961, y: 0.00046619424, z: 0.000079565914}
rotation: {x: 0.10775685, y: 0.026086215, z: -0.98048323, w: -0.16235992}
scale: {x: 1, y: 1, z: 0.99999964}
- name: LowerArm_Right
parentName:
position: {x: -32.191166, y: 4.4336893e-14, z: 3.536796e-15}
rotation: {x: -0.00035539793, y: -0.06462459, z: 0.0047837608, w: 0.99789816}
scale: {x: 1.0000004, y: 0.99999994, z: 1.0000004}
- name: Hand_Right
parentName:
position: {x: -29.678719, y: 4.5461288e-14, z: -2.7325554e-15}
rotation: {x: 0.0033532225, y: 0.08887915, z: -0.072216906, w: 0.99341536}
scale: {x: 0.9999996, y: 1, z: 0.99999934}
- name: RestOfFingers_Proximal_Right
parentName:
position: {x: -18.280209, y: -3.645552e-14, z: 1.8098782e-15}
rotation: {x: -0.0070367004, y: -0.03803295, z: 0.07195142, w: 0.9966579}
scale: {x: 1.0000001, y: 1.0000002, z: 1.0000002}
- name: RestOfFingers_Intermediate_Right
parentName:
position: {x: -8.7804575, y: 1.3120176e-14, z: -2.045785e-15}
rotation: {x: -0.0000000025775735, y: -0.0296687, z: 0.00000004162707, w: 0.9995598}
scale: {x: 0.9999998, y: 1, z: 0.9999999}
- name: Index_Proximal_Right
parentName:
position: {x: -16.9013, y: -5.4614235e-14, z: -10.104266}
rotation: {x: -0.0067927497, y: -0.041411348, z: 0.071974866, w: 0.9965233}
scale: {x: 1.0000002, y: 1.0000001, z: 1.0000004}
- name: Index_Intermediate_Right
parentName:
position: {x: -9.911691, y: 2.0547315e-15, z: -2.2696136e-15}
rotation: {x: -0.000000015177632, y: -0.026280066, z: 0.0000001054477, w: 0.99965465}
scale: {x: 0.9999998, y: 1.0000001, z: 0.99999994}
- name: Thumb_Proximal_Right
parentName:
position: {x: -7.0571103, y: -4.7085547, z: -9.280674}
rotation: {x: 0.066200666, y: -0.36255416, z: 0.15768969, w: 0.9161365}
scale: {x: 1.0000004, y: 1.0000005, z: 1.0000001}
- name: Thumb_Intermediate_Right
parentName:
position: {x: -10.653982, y: 2.4461068e-14, z: 1.7784693e-15}
rotation: {x: -0.031957757, y: 0.20743091, z: -0.13790222, w: 0.96795356}
scale: {x: 0.99999976, y: 0.99999994, z: 0.99999994}
- name: UpperLeg_Left
parentName:
position: {x: 3.5068195, y: -19.94618, z: -1.3763187}
rotation: {x: -0.2414414, y: -0.2406476, z: 0.9400832, w: 0.006198165}
scale: {x: 0.9999999, y: 0.9999998, z: 1}
- name: LowerLeg_Left
parentName:
position: {x: -32.81932, y: 2.1316282e-14, z: -8.881784e-15}
rotation: {x: -0.000059741335, y: -0.15989012, z: 0.025032552, w: 0.98681736}
scale: {x: 1, y: 0.9999998, z: 1}
- name: Foot_Left
parentName:
position: {x: -37.066936, y: -1.4210855e-14, z: -4.440892e-15}
rotation: {x: 0.31684917, y: 0.6395231, z: -0.10572263, w: 0.6924158}
scale: {x: 1.0000002, y: 0.99999976, z: 1.0000002}
- name: Toe_Left
parentName:
position: {x: -12.738982, y: -0.5618247, z: 0.30802163}
rotation: {x: 0.4498791, y: 0.11339964, z: -0.102188155, w: 0.8799472}
scale: {x: 0.99999994, y: 0.9999998, z: 1}
- name: Toetip_Left
parentName:
position: {x: -17.954567, y: -0.038039967, z: 0.4538383}
rotation: {x: 0.041624583, y: 0.03067606, z: -0.0034803154, w: 0.9986562}
scale: {x: 1.0000001, y: 0.99999994, z: 1.0000001}
- name: Shield
parentName:
position: {x: -36.94719, y: -62.859154, z: 21.787066}
rotation: {x: -2.1986723e-18, y: -0.16911028, z: -0.000000042146848, w: 0.98559713}
scale: {x: 1.0000001, y: 1, z: 0.9999999}
- name: Sword
parentName:
position: {x: -37.385925, y: 86.25157, z: 18.17991}
rotation: {x: -2.1986723e-18, y: -0.16911028, z: -0.000000042146848, w: 0.98559713}
scale: {x: 1.0000001, y: 1, z: 1}
- name: UpperLeg_Right
parentName:
position: {x: 3.5067785, y: 19.9462, z: -1.3763317}
rotation: {x: -0.008172598, y: 0.9452265, z: -0.21804802, w: 0.24276586}
scale: {x: 0.9999998, y: 1, z: 0.9999999}
- name: LowerLeg_Right
parentName:
position: {x: -32.819374, y: -1.0658141e-14, z: -3.5527137e-15}
rotation: {x: 0.00005974702, y: 0.1598899, z: 0.025033766, w: 0.98681736}
scale: {x: 0.99999994, y: 1, z: 0.99999976}
- name: Foot_Right
parentName:
position: {x: -37.066925, y: -3.5527137e-15, z: 2.7533531e-14}
rotation: {x: -0.2687201, y: -0.6451154, z: -0.057831235, w: 0.7129315}
scale: {x: 1.0000001, y: 0.9999999, z: 1.0000002}
- name: Toe_Right
parentName:
position: {x: -12.755086, y: -7.1054274e-15, z: -1.2434498e-14}
rotation: {x: -0.49754456, y: -0.111790985, z: -0.10089422, w: 0.8542673}
scale: {x: 0.9999998, y: 1, z: 0.99999964}
- name: Toetip_Right
parentName:
position: {x: -17.96039, y: 0, z: 3.5527137e-15}
rotation: {x: -0.056781646, y: -0.018067999, z: -0.0037392883, w: 0.9982161}
scale: {x: 0.99999994, y: 1.0000001, z: 1.0000001}
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 1
skeletonHasParents: 0
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,692 +0,0 @@
fileFormatVersion: 2
guid: 22de3beb5b2b58745b1f2da501839c7c
ModelImporter:
serializedVersion: 20200
internalIDToNameTable:
- first:
1: 100000
second: Chest
- first:
1: 100002
second: COB_CTRL
- first:
1: 100004
second: Foot_Left
- first:
1: 100006
second: Foot_Right
- first:
1: 100008
second: //RootNode
- first:
1: 100010
second: Footman_Mesh
- first:
1: 100012
second: Hand_Left
- first:
1: 100014
second: Hand_Right
- first:
1: 100016
second: Head
- first:
1: 100018
second: Hips
- first:
1: 100020
second: Index_Intermediate_Left
- first:
1: 100022
second: Index_Intermediate_Right
- first:
1: 100024
second: Index_Proximal_Left
- first:
1: 100026
second: Index_Proximal_Right
- first:
1: 100028
second: J_Tip
- first:
1: 100030
second: Jaw
- first:
1: 100032
second: LowerArm_Left
- first:
1: 100034
second: LowerArm_Right
- first:
1: 100036
second: LowerLeg_Left
- first:
1: 100038
second: LowerLeg_Right
- first:
1: 100040
second: Neck
- first:
1: 100042
second: RestOfFingers_Intermediate_Left
- first:
1: 100044
second: RestOfFingers_Intermediate_Right
- first:
1: 100046
second: RestOfFingers_Proximal_Left
- first:
1: 100048
second: RestOfFingers_Proximal_Right
- first:
1: 100050
second: Shield
- first:
1: 100052
second: Shoulder_Left
- first:
1: 100054
second: Shoulder_Right
- first:
1: 100056
second: Spine
- first:
1: 100058
second: Sword
- first:
1: 100060
second: Thumb_Intermediate_Left
- first:
1: 100062
second: Thumb_Intermediate_Right
- first:
1: 100064
second: Thumb_Proximal_Left
- first:
1: 100066
second: Thumb_Proximal_Right
- first:
1: 100068
second: Toe_Left
- first:
1: 100070
second: Toe_Right
- first:
1: 100072
second: Toetip_Left
- first:
1: 100074
second: Toetip_Right
- first:
1: 100076
second: UpperArm_Left
- first:
1: 100078
second: UpperArm_Right
- first:
1: 100080
second: UpperLeg_Left
- first:
1: 100082
second: UpperLeg_Right
- first:
4: 400000
second: Chest
- first:
4: 400002
second: COB_CTRL
- first:
4: 400004
second: Foot_Left
- first:
4: 400006
second: Foot_Right
- first:
4: 400008
second: //RootNode
- first:
4: 400010
second: Footman_Mesh
- first:
4: 400012
second: Hand_Left
- first:
4: 400014
second: Hand_Right
- first:
4: 400016
second: Head
- first:
4: 400018
second: Hips
- first:
4: 400020
second: Index_Intermediate_Left
- first:
4: 400022
second: Index_Intermediate_Right
- first:
4: 400024
second: Index_Proximal_Left
- first:
4: 400026
second: Index_Proximal_Right
- first:
4: 400028
second: J_Tip
- first:
4: 400030
second: Jaw
- first:
4: 400032
second: LowerArm_Left
- first:
4: 400034
second: LowerArm_Right
- first:
4: 400036
second: LowerLeg_Left
- first:
4: 400038
second: LowerLeg_Right
- first:
4: 400040
second: Neck
- first:
4: 400042
second: RestOfFingers_Intermediate_Left
- first:
4: 400044
second: RestOfFingers_Intermediate_Right
- first:
4: 400046
second: RestOfFingers_Proximal_Left
- first:
4: 400048
second: RestOfFingers_Proximal_Right
- first:
4: 400050
second: Shield
- first:
4: 400052
second: Shoulder_Left
- first:
4: 400054
second: Shoulder_Right
- first:
4: 400056
second: Spine
- first:
4: 400058
second: Sword
- first:
4: 400060
second: Thumb_Intermediate_Left
- first:
4: 400062
second: Thumb_Intermediate_Right
- first:
4: 400064
second: Thumb_Proximal_Left
- first:
4: 400066
second: Thumb_Proximal_Right
- first:
4: 400068
second: Toe_Left
- first:
4: 400070
second: Toe_Right
- first:
4: 400072
second: Toetip_Left
- first:
4: 400074
second: Toetip_Right
- first:
4: 400076
second: UpperArm_Left
- first:
4: 400078
second: UpperArm_Right
- first:
4: 400080
second: UpperLeg_Left
- first:
4: 400082
second: UpperLeg_Right
- first:
43: 4300000
second: Footman_Mesh
- first:
74: 7400000
second: idle
- first:
95: 9500000
second: //RootNode
- first:
111: 11100000
second: //RootNode
- first:
137: 13700000
second: Footman_Mesh
externalObjects: {}
materials:
materialImportMode: 1
materialName: 0
materialSearch: 1
materialLocation: 0
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 3
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations:
- serializedVersion: 16
name: idle
takeName: Take 001
internalID: 0
firstFrame: 1
lastFrame: 35
wrapMode: 2
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 1
loopBlendPositionY: 1
loopBlendPositionXZ: 1
keepOriginalOrientation: 1
keepOriginalPositionY: 1
keepOriginalPositionXZ: 1
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: COB_CTRL
weight: 0
- path: Footman_Mesh
weight: 0
- path: Hips
weight: 1
- path: Hips/Shield
weight: 1
- path: Hips/Spine
weight: 1
- path: Hips/Spine/Chest
weight: 1
- path: Hips/Spine/Chest/Neck
weight: 1
- path: Hips/Spine/Chest/Neck/Head
weight: 1
- path: Hips/Spine/Chest/Neck/Head/Jaw
weight: 1
- path: Hips/Spine/Chest/Neck/Head/Jaw/J_Tip
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/Index_Proximal_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/Index_Proximal_Left/Index_Intermediate_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/RestOfFingers_Proximal_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/RestOfFingers_Proximal_Left/RestOfFingers_Intermediate_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/Thumb_Proximal_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Left/UpperArm_Left/LowerArm_Left/Hand_Left/Thumb_Proximal_Left/Thumb_Intermediate_Left
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/Index_Proximal_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/Index_Proximal_Right/Index_Intermediate_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/RestOfFingers_Proximal_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/RestOfFingers_Proximal_Right/RestOfFingers_Intermediate_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/Thumb_Proximal_Right
weight: 1
- path: Hips/Spine/Chest/Shoulder_Right/UpperArm_Right/LowerArm_Right/Hand_Right/Thumb_Proximal_Right/Thumb_Intermediate_Right
weight: 1
- path: Hips/Sword
weight: 1
- path: Hips/UpperLeg_Left
weight: 1
- path: Hips/UpperLeg_Left/LowerLeg_Left
weight: 1
- path: Hips/UpperLeg_Left/LowerLeg_Left/Foot_Left
weight: 1
- path: Hips/UpperLeg_Left/LowerLeg_Left/Foot_Left/Toe_Left
weight: 1
- path: Hips/UpperLeg_Left/LowerLeg_Left/Foot_Left/Toe_Left/Toetip_Left
weight: 1
- path: Hips/UpperLeg_Right
weight: 1
- path: Hips/UpperLeg_Right/LowerLeg_Right
weight: 1
- path: Hips/UpperLeg_Right/LowerLeg_Right/Foot_Right
weight: 1
- path: Hips/UpperLeg_Right/LowerLeg_Right/Foot_Right/Toe_Right
weight: 1
- path: Hips/UpperLeg_Right/LowerLeg_Right/Foot_Right/Toe_Right/Toetip_Right
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 0
importBlendShapes: 1
importCameras: 0
importLights: 0
fileIdsGeneration: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 4
normalCalculationMode: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton:
- name: footman_idle(Clone)
parentName:
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: COB_CTRL
parentName:
position: {x: 0.0042852233, y: 0.6601113, z: -0.1711083}
rotation: {x: 0.10958317, y: -0.19028348, z: -0.021378642, w: 0.9753598}
scale: {x: 0.01, y: 0.01, z: 0.01}
- name: Footman_Mesh
parentName:
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: -0, z: 0, w: 1}
scale: {x: 0.01, y: 0.01, z: 0.01}
- name: Hips
parentName:
position: {x: 0.0042852233, y: 0.7778548, z: 0.024665922}
rotation: {x: 0.11957903, y: 0.11957903, z: -0.6969224, w: 0.6969225}
scale: {x: 0.009999998, y: 0.009999999, z: 0.009999998}
- name: Spine
parentName:
position: {x: -22.08183, y: 2.7610132e-30, z: 2.789185e-15}
rotation: {x: 0.0000000041714956, y: -0.07073019, z: -0.000000041939902, w: 0.9974955}
scale: {x: 1.0000001, y: 1, z: 0.99999994}
- name: Chest
parentName:
position: {x: -24.493395, y: 4.37078e-15, z: -6.5791713e-15}
rotation: {x: 0.000000004171496, y: -0.19267076, z: -0.000000041939906, w: 0.9812635}
scale: {x: 0.9999999, y: 0.9999998, z: 1}
- name: Neck
parentName:
position: {x: -31.697706, y: 4.2682918e-15, z: 1.5827795e-14}
rotation: {x: -0.0000000021927513, y: 0.1462689, z: 0.000000042089766, w: 0.9892449}
scale: {x: 0.9999998, y: 1, z: 0.99999994}
- name: Head
parentName:
position: {x: -20.858675, y: 1.02066555e-14, z: 1.3950282e-15}
rotation: {x: -0.3823245, y: 0.0000000021927513, z: 0.92402816, w: -0.00000004208977}
scale: {x: 1, y: 0.99999994, z: 1}
- name: Jaw
parentName:
position: {x: -19.492151, y: -4.0412776e-15, z: -4.4981513}
rotation: {x: 0.000000017860568, y: 0.09718921, z: -0.00000003817534, w: 0.9952659}
scale: {x: 1.0000001, y: 1, z: 1.0000001}
- name: J_Tip
parentName:
position: {x: -9.274182, y: -1.2503675e-14, z: 8.099877}
rotation: {x: 0.29965067, y: -0.29965067, z: -0.640476, w: 0.640476}
scale: {x: 1, y: 1, z: 0.99999994}
- name: Shoulder_Left
parentName:
position: {x: -18.98868, y: -31.335035, z: -12.155753}
rotation: {x: -0.005294429, y: 0.09098784, z: 0.7994192, w: 0.59382}
scale: {x: 1, y: 1, z: 0.9999999}
- name: UpperArm_Left
parentName:
position: {x: -14.901689, y: 2.842171e-14, z: 8.881784e-16}
rotation: {x: 0.026086558, y: -0.10776169, z: -0.16237192, w: 0.9804807}
scale: {x: 0.99999994, y: 0.9999998, z: 1}
- name: LowerArm_Left
parentName:
position: {x: -32.191196, y: 4.842915e-15, z: -2.9871985e-15}
rotation: {x: 0.00035525253, y: 0.06462668, z: 0.0047825873, w: 0.99789804}
scale: {x: 1, y: 1, z: 1.0000001}
- name: Hand_Left
parentName:
position: {x: -29.678864, y: -2.7758043e-29, z: 4.869975e-15}
rotation: {x: -0.0033529997, y: -0.08887863, z: -0.07221233, w: 0.9934158}
scale: {x: 1.0000001, y: 1.0000001, z: 0.9999998}
- name: RestOfFingers_Proximal_Left
parentName:
position: {x: -18.280243, y: -1.6586086e-14, z: -2.029683e-15}
rotation: {x: 0.007036325, y: 0.038031258, z: 0.07194682, w: 0.9966583}
scale: {x: 1, y: 1, z: 1.0000001}
- name: RestOfFingers_Intermediate_Left
parentName:
position: {x: -8.780147, y: 7.67957e-15, z: 3.7027159e-16}
rotation: {x: 0.00000001610115, y: 0.029670052, z: 0.0000000140879415, w: 0.99955976}
scale: {x: 1, y: 0.9999999, z: 0.99999994}
- name: Index_Proximal_Left
parentName:
position: {x: -16.901342, y: 1.1929646e-13, z: 10.104264}
rotation: {x: 0.0067923516, y: 0.04141017, z: 0.07197026, w: 0.9965236}
scale: {x: 0.9999999, y: 1, z: 1.0000001}
- name: Index_Intermediate_Left
parentName:
position: {x: -9.911482, y: 1.4998595e-14, z: 3.154118e-15}
rotation: {x: 0.00000001861509, y: 0.026280912, z: -0.000000012133206, w: 0.9996546}
scale: {x: 1.0000001, y: 1.0000001, z: 1}
- name: Thumb_Proximal_Left
parentName:
position: {x: -7.0572023, y: -4.708794, z: 9.280683}
rotation: {x: -0.06620513, y: 0.36255512, z: 0.15769364, w: 0.916135}
scale: {x: 1.0000002, y: 1.0000001, z: 1.0000002}
- name: Thumb_Intermediate_Left
parentName:
position: {x: -10.653726, y: 3.648137e-16, z: 8.5441255e-15}
rotation: {x: 0.030814841, y: -0.21547185, z: -0.13817626, w: 0.9661934}
scale: {x: 0.9999999, y: 0.99999994, z: 1.0000001}
- name: Shoulder_Right
parentName:
position: {x: -18.98899, y: 31.335, z: -12.155691}
rotation: {x: 0.79941076, y: 0.5938314, z: 0.005292095, w: -0.09098735}
scale: {x: 1.0000001, y: 1.0000004, z: 1.0000002}
- name: UpperArm_Right
parentName:
position: {x: 14.901961, y: 0.00046619424, z: 0.000079565914}
rotation: {x: 0.10775659, y: 0.02608616, z: -0.9804833, w: -0.16235952}
scale: {x: 1, y: 1, z: 0.9999997}
- name: LowerArm_Right
parentName:
position: {x: -32.191166, y: 4.4336893e-14, z: 3.536796e-15}
rotation: {x: -0.00035538155, y: -0.06462456, z: 0.0047837985, w: 0.99789816}
scale: {x: 1.0000006, y: 1.0000001, z: 1.0000008}
- name: Hand_Right
parentName:
position: {x: -29.678719, y: 4.5461288e-14, z: -2.7325554e-15}
rotation: {x: 0.0033532225, y: 0.08887915, z: -0.072216906, w: 0.99341536}
scale: {x: 0.99999946, y: 0.99999994, z: 0.99999964}
- name: RestOfFingers_Proximal_Right
parentName:
position: {x: -18.280209, y: -3.645552e-14, z: 1.8098782e-15}
rotation: {x: -0.0070367004, y: -0.03803295, z: 0.07195142, w: 0.9966579}
scale: {x: 1.0000006, y: 0.9999997, z: 1}
- name: RestOfFingers_Intermediate_Right
parentName:
position: {x: -8.7804575, y: 1.3120176e-14, z: -2.045785e-15}
rotation: {x: -0.0000000025775735, y: -0.0296687, z: 0.00000004162707, w: 0.9995598}
scale: {x: 0.99999976, y: 1.0000002, z: 1}
- name: Index_Proximal_Right
parentName:
position: {x: -16.9013, y: -5.4614235e-14, z: -10.104266}
rotation: {x: -0.0067927497, y: -0.041411348, z: 0.071974866, w: 0.9965233}
scale: {x: 1.0000004, y: 0.99999964, z: 1.0000001}
- name: Index_Intermediate_Right
parentName:
position: {x: -9.911691, y: 2.0547315e-15, z: -2.2696136e-15}
rotation: {x: -0.000000015177632, y: -0.026280066, z: 0.0000001054477, w: 0.99965465}
scale: {x: 1, y: 1.0000002, z: 1.0000002}
- name: Thumb_Proximal_Right
parentName:
position: {x: -7.0571103, y: -4.7085547, z: -9.280674}
rotation: {x: 0.066200264, y: -0.36255375, z: 0.15769042, w: 0.9161365}
scale: {x: 1.0000004, y: 1, z: 1.0000004}
- name: Thumb_Intermediate_Right
parentName:
position: {x: -10.653982, y: 2.4461068e-14, z: 1.7784693e-15}
rotation: {x: -0.031957757, y: 0.20743091, z: -0.13790222, w: 0.96795356}
scale: {x: 1.0000002, y: 1, z: 0.99999976}
- name: UpperLeg_Left
parentName:
position: {x: 3.5068195, y: -19.94618, z: -1.3763187}
rotation: {x: -0.24868298, y: -0.0155566, z: 0.9681314, w: 0.025227528}
scale: {x: 0.9999998, y: 0.9999998, z: 0.99999994}
- name: LowerLeg_Left
parentName:
position: {x: -32.81932, y: 2.1316282e-14, z: -8.881784e-15}
rotation: {x: -0.000059746817, y: -0.15989009, z: 0.025032653, w: 0.98681736}
scale: {x: 1.0000001, y: 0.99999994, z: 1.0000001}
- name: Foot_Left
parentName:
position: {x: -37.066936, y: -1.4210855e-14, z: -4.440892e-15}
rotation: {x: 0.13149361, y: 0.6137422, z: -0.22415833, w: 0.7455086}
scale: {x: 0.99999994, y: 1.0000001, z: 0.9999998}
- name: Toe_Left
parentName:
position: {x: -12.738982, y: -0.5618247, z: 0.30802163}
rotation: {x: 0.44987908, y: 0.11339966, z: -0.102188185, w: 0.8799471}
scale: {x: 1.0000001, y: 0.99999994, z: 1}
- name: Toetip_Left
parentName:
position: {x: -17.954567, y: -0.038039967, z: 0.4538383}
rotation: {x: 0.041624524, y: 0.03067606, z: -0.0034802542, w: 0.9986562}
scale: {x: 1.0000001, y: 1, z: 1}
- name: Shield
parentName:
position: {x: -36.892387, y: -62.87267, z: 21.847818}
rotation: {x: -2.1986723e-18, y: -0.16911028, z: -0.000000042146848, w: 0.98559713}
scale: {x: 1, y: 0.9999999, z: 0.99999994}
- name: Sword
parentName:
position: {x: -37.368732, y: 86.23419, z: 18.132149}
rotation: {x: -2.1986723e-18, y: -0.16911028, z: -0.000000042146848, w: 0.98559713}
scale: {x: 1, y: 0.9999999, z: 1.0000001}
- name: UpperLeg_Right
parentName:
position: {x: 3.5067785, y: 19.9462, z: -1.3763317}
rotation: {x: -0.025228102, y: 0.96813154, z: -0.015552519, w: 0.24868284}
scale: {x: 0.9999997, y: 0.9999999, z: 0.9999998}
- name: LowerLeg_Right
parentName:
position: {x: -32.819374, y: -1.0658141e-14, z: -3.5527137e-15}
rotation: {x: 0.000059737282, y: 0.15988994, z: 0.025033912, w: 0.9868174}
scale: {x: 0.99999976, y: 0.9999997, z: 0.99999976}
- name: Foot_Right
parentName:
position: {x: -37.066925, y: -3.5527137e-15, z: 2.7533531e-14}
rotation: {x: -0.099700645, y: -0.6316042, z: -0.16588186, w: 0.75074565}
scale: {x: 1.0000004, y: 1, z: 1.0000001}
- name: Toe_Right
parentName:
position: {x: -12.755086, y: -7.1054274e-15, z: -1.2434498e-14}
rotation: {x: -0.4975446, y: -0.11179101, z: -0.1008942, w: 0.8542673}
scale: {x: 0.99999994, y: 1.0000002, z: 0.9999998}
- name: Toetip_Right
parentName:
position: {x: -17.96039, y: 0, z: 3.5527137e-15}
rotation: {x: -0.056781564, y: -0.018067915, z: -0.0037393095, w: 0.9982161}
scale: {x: 1.0000002, y: 1, z: 1.0000004}
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 1
skeletonHasParents: 0
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,845 +0,0 @@
fileFormatVersion: 2
guid: 46783dc54d7600447880ab6f35037fb4
ModelImporter:
serializedVersion: 19301
internalIDToNameTable:
- first:
1: 100000
second: Chest
- first:
1: 100002
second: COB_CTRL
- first:
1: 100004
second: Foot_Left
- first:
1: 100006
second: Foot_Right
- first:
1: 100008
second: //RootNode
- first:
1: 100010
second: Footman_Mesh
- first:
1: 100012
second: Hand_Left
- first:
1: 100014
second: Hand_Right
- first:
1: 100016
second: Head
- first:
1: 100018
second: Hips
- first:
1: 100020
second: Index_Intermediate_Left
- first:
1: 100022
second: Index_Intermediate_Right
- first:
1: 100024
second: Index_Proximal_Left
- first:
1: 100026
second: Index_Proximal_Right
- first:
1: 100028
second: J_Tip
- first:
1: 100030
second: Jaw
- first:
1: 100032
second: LowerArm_Left
- first:
1: 100034
second: LowerArm_Right
- first:
1: 100036
second: LowerLeg_Left
- first:
1: 100038
second: LowerLeg_Right
- first:
1: 100040
second: Neck
- first:
1: 100042
second: RestOfFingers_Intermediate_Left
- first:
1: 100044
second: RestOfFingers_Intermediate_Right
- first:
1: 100046
second: RestOfFingers_Proximal_Left
- first:
1: 100048
second: RestOfFingers_Proximal_Right
- first:
1: 100050
second: Shield
- first:
1: 100052
second: Shoulder_Left
- first:
1: 100054
second: Shoulder_Right
- first:
1: 100056
second: Spine
- first:
1: 100058
second: Sword
- first:
1: 100060
second: Thumb_Intermediate_Left
- first:
1: 100062
second: Thumb_Intermediate_Right
- first:
1: 100064
second: Thumb_Proximal_Left
- first:
1: 100066
second: Thumb_Proximal_Right
- first:
1: 100068
second: Toe_Left
- first:
1: 100070
second: Toe_Right
- first:
1: 100072
second: Toetip_Left
- first:
1: 100074
second: Toetip_Right
- first:
1: 100076
second: UpperArm_Left
- first:
1: 100078
second: UpperArm_Right
- first:
1: 100080
second: UpperLeg_Left
- first:
1: 100082
second: UpperLeg_Right
- first:
4: 400000
second: Chest
- first:
4: 400002
second: COB_CTRL
- first:
4: 400004
second: Foot_Left
- first:
4: 400006
second: Foot_Right
- first:
4: 400008
second: //RootNode
- first:
4: 400010
second: Footman_Mesh
- first:
4: 400012
second: Hand_Left
- first:
4: 400014
second: Hand_Right
- first:
4: 400016
second: Head
- first:
4: 400018
second: Hips
- first:
4: 400020
second: Index_Intermediate_Left
- first:
4: 400022
second: Index_Intermediate_Right
- first:
4: 400024
second: Index_Proximal_Left
- first:
4: 400026
second: Index_Proximal_Right
- first:
4: 400028
second: J_Tip
- first:
4: 400030
second: Jaw
- first:
4: 400032
second: LowerArm_Left
- first:
4: 400034
second: LowerArm_Right
- first:
4: 400036
second: LowerLeg_Left
- first:
4: 400038
second: LowerLeg_Right
- first:
4: 400040
second: Neck
- first:
4: 400042
second: RestOfFingers_Intermediate_Left
- first:
4: 400044
second: RestOfFingers_Intermediate_Right
- first:
4: 400046
second: RestOfFingers_Proximal_Left
- first:
4: 400048
second: RestOfFingers_Proximal_Right
- first:
4: 400050
second: Shield
- first:
4: 400052
second: Shoulder_Left
- first:
4: 400054
second: Shoulder_Right
- first:
4: 400056
second: Spine
- first:
4: 400058
second: Sword
- first:
4: 400060
second: Thumb_Intermediate_Left
- first:
4: 400062
second: Thumb_Intermediate_Right
- first:
4: 400064
second: Thumb_Proximal_Left
- first:
4: 400066
second: Thumb_Proximal_Right
- first:
4: 400068
second: Toe_Left
- first:
4: 400070
second: Toe_Right
- first:
4: 400072
second: Toetip_Left
- first:
4: 400074
second: Toetip_Right
- first:
4: 400076
second: UpperArm_Left
- first:
4: 400078
second: UpperArm_Right
- first:
4: 400080
second: UpperLeg_Left
- first:
4: 400082
second: UpperLeg_Right
- first:
43: 4300000
second: Footman_Mesh
- first:
95: 9500000
second: //RootNode
- first:
137: 13700000
second: Footman_Mesh
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Footman1
second: {fileID: 2100000, guid: 08e31e73bd7577d48b36535ac3828d5d, type: 2}
materials:
materialImportMode: 0
materialName: 0
materialSearch: 1
materialLocation: 0
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 3
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 0
importBlendShapes: 1
importCameras: 0
importLights: 0
fileIdsGeneration: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 0
humanDescription:
serializedVersion: 3
human:
- boneName: Hips
humanName: Hips
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: UpperLeg_Left
humanName: LeftUpperLeg
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: UpperLeg_Right
humanName: RightUpperLeg
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: LowerLeg_Left
humanName: LeftLowerLeg
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: LowerLeg_Right
humanName: RightLowerLeg
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Foot_Left
humanName: LeftFoot
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Foot_Right
humanName: RightFoot
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Spine
humanName: Spine
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Chest
humanName: Chest
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Neck
humanName: Neck
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Head
humanName: Head
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Shoulder_Left
humanName: LeftShoulder
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Shoulder_Right
humanName: RightShoulder
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: UpperArm_Left
humanName: LeftUpperArm
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: UpperArm_Right
humanName: RightUpperArm
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: LowerArm_Left
humanName: LeftLowerArm
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: LowerArm_Right
humanName: RightLowerArm
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Hand_Left
humanName: LeftHand
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Hand_Right
humanName: RightHand
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Toe_Left
humanName: LeftToes
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Toe_Right
humanName: RightToes
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Jaw
humanName: Jaw
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Thumb_Proximal_Left
humanName: Left Thumb Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Thumb_Intermediate_Left
humanName: Left Thumb Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Index_Proximal_Left
humanName: Left Index Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Index_Intermediate_Left
humanName: Left Index Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: RestOfFingers_Proximal_Left
humanName: Left Little Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: RestOfFingers_Intermediate_Left
humanName: Left Little Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Thumb_Proximal_Right
humanName: Right Thumb Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Thumb_Intermediate_Right
humanName: Right Thumb Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Index_Proximal_Right
humanName: Right Index Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: Index_Intermediate_Right
humanName: Right Index Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: RestOfFingers_Proximal_Right
humanName: Right Little Proximal
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
- boneName: RestOfFingers_Intermediate_Right
humanName: Right Little Intermediate
limit:
min: {x: 0, y: 0, z: 0}
max: {x: 0, y: 0, z: 0}
value: {x: 0, y: 0, z: 0}
length: 0
modified: 0
skeleton:
- name: footman(Clone)
parentName:
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0, w: 1}
scale: {x: 1, y: 1, z: 1}
- name: COB_CTRL
parentName:
position: {x: 0.004, y: 0.65978205, z: -0.17136107}
rotation: {x: 0.109584615, y: -0.19028173, z: -0.021376925, w: 0.97536}
scale: {x: 0.01, y: 0.01, z: 0.01}
- name: Footman_Mesh
parentName:
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0, w: 1}
scale: {x: 0.01, y: 0.01, z: 0.01}
- name: Hips
parentName:
position: {x: 0.004, y: 0.7778548, z: 0.024665922}
rotation: {x: 0.119579025, y: 0.119579025, z: -0.69692236, w: 0.6969224}
scale: {x: 0.009999997, y: 0.01, z: 0.01}
- name: Spine
parentName:
position: {x: -22.08183, y: 2.7610132e-30, z: 2.789185e-15}
rotation: {x: 0.0000000037252903, y: -0.070730194, z: -0.000000059604645, w: 0.99749553}
scale: {x: 1.0000004, y: 1.0000002, z: 1}
- name: Chest
parentName:
position: {x: -24.493395, y: 4.37078e-15, z: -6.5791713e-15}
rotation: {x: 0.000000026077032, y: -0.19267073, z: -9.313226e-10, w: 0.9812635}
scale: {x: 0.9999999, y: 0.99999994, z: 0.99999994}
- name: Neck
parentName:
position: {x: -31.697706, y: 4.2682918e-15, z: 1.5827795e-14}
rotation: {x: -0.000000029802322, y: 0.14626889, z: -0.0000000011641532, w: 0.98924494}
scale: {x: 1, y: 1.0000002, z: 0.99999994}
- name: Head
parentName:
position: {x: -20.858675, y: 1.02066555e-14, z: 1.3950282e-15}
rotation: {x: -0.38232452, y: -0.000000014901159, z: 0.92402816, w: -0.000000029802319}
scale: {x: 0.9999999, y: 0.9999999, z: 1}
- name: Jaw
parentName:
position: {x: -19.492151, y: -4.0412776e-15, z: -4.4981513}
rotation: {x: 0, y: 0.09718922, z: 0.000000029802319, w: 0.99526596}
scale: {x: 1, y: 0.99999994, z: 0.9999999}
- name: J_Tip
parentName:
position: {x: -9.274182, y: -1.2503675e-14, z: 8.099877}
rotation: {x: 0.29965064, y: -0.29965067, z: -0.640476, w: 0.6404759}
scale: {x: 1.0000005, y: 1.0000001, z: 1.0000002}
- name: Shoulder_Left
parentName:
position: {x: -18.98868, y: -31.335035, z: -12.155753}
rotation: {x: -0.005294334, y: 0.09098781, z: 0.79941905, w: 0.5938203}
scale: {x: 1, y: 0.9999998, z: 1}
- name: UpperArm_Left
parentName:
position: {x: -14.901689, y: 2.842171e-14, z: 8.881784e-16}
rotation: {x: 0.02608649, y: -0.107761435, z: -0.16237162, w: 0.9804808}
scale: {x: 1.0000001, y: 1.0000001, z: 1}
- name: LowerArm_Left
parentName:
position: {x: -32.191196, y: 4.842915e-15, z: -2.9871985e-15}
rotation: {x: 0.00035528588, y: 0.064626664, z: 0.004782589, w: 0.99789804}
scale: {x: 0.9999998, y: 1.0000001, z: 1}
- name: Hand_Left
parentName:
position: {x: -29.678864, y: -2.7758043e-29, z: 4.869975e-15}
rotation: {x: -0.0033529915, y: -0.08887862, z: -0.07221227, w: 0.9934157}
scale: {x: 1.0000001, y: 0.99999994, z: 0.99999976}
- name: RestOfFingers_Proximal_Left
parentName:
position: {x: -18.280243, y: -1.6586086e-14, z: -2.029683e-15}
rotation: {x: 0.007036331, y: 0.038031265, z: 0.07194678, w: 0.9966584}
scale: {x: 1.0000001, y: 1.0000002, z: 1.0000002}
- name: RestOfFingers_Intermediate_Left
parentName:
position: {x: -8.780147, y: 7.67957e-15, z: 3.7027159e-16}
rotation: {x: -0.0000000074505815, y: 0.029670015, z: 0.00000008381901, w: 0.99955976}
scale: {x: 0.9999999, y: 0.9999998, z: 0.99999976}
- name: Index_Proximal_Left
parentName:
position: {x: -16.901342, y: 1.1929646e-13, z: 10.104264}
rotation: {x: 0.0067923577, y: 0.041410178, z: 0.07197022, w: 0.9965237}
scale: {x: 0.99999976, y: 1.0000002, z: 1.0000001}
- name: Index_Intermediate_Left
parentName:
position: {x: -9.911482, y: 1.4998595e-14, z: 3.154118e-15}
rotation: {x: -0.0000000074505797, y: 0.026280899, z: 0.000000013969837, w: 0.99965465}
scale: {x: 1.0000001, y: 0.9999999, z: 1.0000001}
- name: Thumb_Proximal_Left
parentName:
position: {x: -7.0572023, y: -4.708794, z: 9.280683}
rotation: {x: -0.06620525, y: 0.36255533, z: 0.15769345, w: 0.916135}
scale: {x: 1.0000002, y: 0.99999994, z: 1}
- name: Thumb_Intermediate_Left
parentName:
position: {x: -10.653726, y: 3.648137e-16, z: 8.5441255e-15}
rotation: {x: 0.030814871, y: -0.21547191, z: -0.13817623, w: 0.9661934}
scale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
- name: Shoulder_Right
parentName:
position: {x: -18.98899, y: 31.335, z: -12.155691}
rotation: {x: 0.799411, y: 0.5938312, z: 0.0052921325, w: -0.090987325}
scale: {x: 1, y: 1, z: 1}
- name: UpperArm_Right
parentName:
position: {x: 14.901961, y: 0.00046619424, z: 0.000079565914}
rotation: {x: 0.10775672, y: 0.026086168, z: -0.98048323, w: -0.16235963}
scale: {x: 0.99999934, y: 0.99999994, z: 0.99999964}
- name: LowerArm_Right
parentName:
position: {x: -32.191166, y: 4.4336893e-14, z: 3.536796e-15}
rotation: {x: -0.0003553833, y: -0.064624555, z: 0.0047839778, w: 0.9978981}
scale: {x: 1.0000002, y: 1, z: 1.0000006}
- name: Hand_Right
parentName:
position: {x: -29.678719, y: 4.5461288e-14, z: -2.7325554e-15}
rotation: {x: 0.0033531855, y: 0.0888791, z: -0.072216876, w: 0.99341536}
scale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
- name: RestOfFingers_Proximal_Right
parentName:
position: {x: -18.280209, y: -3.645552e-14, z: 1.8098782e-15}
rotation: {x: -0.0070367246, y: -0.038032945, z: 0.071951374, w: 0.99665797}
scale: {x: 1.0000002, y: 0.99999976, z: 1.0000001}
- name: RestOfFingers_Intermediate_Right
parentName:
position: {x: -8.7804575, y: 1.3120176e-14, z: -2.045785e-15}
rotation: {x: 0.000000031364543, y: -0.029668666, z: 0.00000009314987, w: 0.9995598}
scale: {x: 0.9999999, y: 0.9999998, z: 0.99999994}
- name: Index_Proximal_Right
parentName:
position: {x: -16.9013, y: -5.4614235e-14, z: -10.104266}
rotation: {x: -0.006792773, y: -0.04141134, z: 0.07197482, w: 0.9965233}
scale: {x: 1.0000001, y: 0.9999995, z: 0.99999994}
- name: Index_Intermediate_Right
parentName:
position: {x: -9.911691, y: 2.0547315e-15, z: -2.2696136e-15}
rotation: {x: 0.00000006863483, y: -0.026280055, z: 0.000000066069994, w: 0.9996546}
scale: {x: 0.9999999, y: 1.0000005, z: 1.0000002}
- name: Thumb_Proximal_Right
parentName:
position: {x: -7.0571103, y: -4.7085547, z: -9.280674}
rotation: {x: 0.06620009, y: -0.36255378, z: 0.15769039, w: 0.9161365}
scale: {x: 1.0000002, y: 0.99999976, z: 0.9999999}
- name: Thumb_Intermediate_Right
parentName:
position: {x: -10.653982, y: 2.4461068e-14, z: 1.7784693e-15}
rotation: {x: -0.03195776, y: 0.20743091, z: -0.13790223, w: 0.9679536}
scale: {x: 0.99999994, y: 0.9999999, z: 0.9999998}
- name: UpperLeg_Left
parentName:
position: {x: 3.5068195, y: -19.94618, z: -1.3763187}
rotation: {x: -0.24144138, y: -0.24064758, z: 0.94008315, w: 0.006198168}
scale: {x: 1.0000002, y: 1.0000004, z: 1}
- name: LowerLeg_Left
parentName:
position: {x: -32.81932, y: 2.1316282e-14, z: -8.881784e-15}
rotation: {x: -0.000059694055, y: -0.15989012, z: 0.025032662, w: 0.98681736}
scale: {x: 0.99999994, y: 0.99999976, z: 0.99999976}
- name: Foot_Left
parentName:
position: {x: -37.066936, y: -1.4210855e-14, z: -4.440892e-15}
rotation: {x: 0.31684923, y: 0.63952297, z: -0.10572273, w: 0.6924158}
scale: {x: 1.0000001, y: 0.99999994, z: 1.0000001}
- name: Toe_Left
parentName:
position: {x: -12.738982, y: -0.5618247, z: 0.30802163}
rotation: {x: 0.44987902, y: 0.113399684, z: -0.10218826, w: 0.8799471}
scale: {x: 1.0000001, y: 0.99999976, z: 1.0000001}
- name: Toetip_Left
parentName:
position: {x: -17.954567, y: -0.038039967, z: 0.4538383}
rotation: {x: 0.041624516, y: 0.030675909, z: -0.0034803369, w: 0.9986563}
scale: {x: 0.9999999, y: 1.0000002, z: 1}
- name: Shield
parentName:
position: {x: -36.94719, y: -62.859154, z: 21.787066}
rotation: {x: 1.5045698e-16, y: -0.16911028, z: -0.000000029802322, w: 0.98559713}
scale: {x: 1.0000002, y: 1.0000001, z: 0.9999999}
- name: Sword
parentName:
position: {x: -37.385925, y: 86.25157, z: 18.17991}
rotation: {x: 1.5045698e-16, y: -0.16911028, z: -0.000000029802322, w: 0.98559713}
scale: {x: 1.0000001, y: 1.0000002, z: 0.9999997}
- name: UpperLeg_Right
parentName:
position: {x: 3.5067785, y: 19.9462, z: -1.3763317}
rotation: {x: -0.008172602, y: 0.94522643, z: -0.21804802, w: 0.24276586}
scale: {x: 1.0000002, y: 1, z: 0.99999994}
- name: LowerLeg_Right
parentName:
position: {x: -32.819374, y: -1.0658141e-14, z: -3.5527137e-15}
rotation: {x: 0.000059738748, y: 0.15988989, z: 0.025033798, w: 0.98681736}
scale: {x: 1, y: 1.0000002, z: 1.0000004}
- name: Foot_Right
parentName:
position: {x: -37.066925, y: -3.5527137e-15, z: 2.7533531e-14}
rotation: {x: -0.26872012, y: -0.6451153, z: -0.057831265, w: 0.71293145}
scale: {x: 0.9999998, y: 0.99999994, z: 1.0000002}
- name: Toe_Right
parentName:
position: {x: -12.755086, y: -7.1054274e-15, z: -1.2434498e-14}
rotation: {x: -0.49754456, y: -0.11179102, z: -0.100894146, w: 0.8542673}
scale: {x: 0.99999994, y: 1, z: 0.9999999}
- name: Toetip_Right
parentName:
position: {x: -17.96039, y: 0, z: 3.5527137e-15}
rotation: {x: -0.056781534, y: -0.018067764, z: -0.0037393547, w: 0.99821615}
scale: {x: 1.0000001, y: 1, z: 1.0000002}
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 0
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 3
humanoidOversampling: 1
avatarSetup: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 0f170503a39165f4faa3891b144780c8
folderAsset: yes
timeCreated: 1472891111
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,121 +0,0 @@
fileFormatVersion: 2
guid: 2007d7e43ac865b46a49d307a65e7420
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: 12
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: 47
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

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