mirror of
https://github.com/wechat-miniprogram/minigame-tuanjie-transform-sdk.git
synced 2026-04-22 01:35:56 +08:00
Auto-publish.
This commit is contained in:
parent
c0b5a28821
commit
fd3632901d
@ -119,7 +119,7 @@ namespace WeChatWASM
|
||||
absolutePath = Path.GetFullPath(Path.Combine(Application.dataPath, "WebGLTemplates/WXTemplate2022TJ"));
|
||||
|
||||
if (Directory.Exists(absolutePath))
|
||||
PlayerSettings.MiniGame.SetTemplatePath_Internal(playerSettings, $"PATH:{absolutePath}");
|
||||
PlayerSettings.MiniGame.SetTemplatePath_Internal(playerSettings, string.Format("PATH:{0}", absolutePath));
|
||||
|
||||
PlayerSettings.MiniGame.SetThreadsSupport_Internal(playerSettings, false);
|
||||
PlayerSettings.MiniGame.SetCompressionFormat_Internal(playerSettings, MiniGameCompressionFormat.Disabled);
|
||||
|
||||
@ -36,16 +36,16 @@ namespace WeChatWASM
|
||||
var absolutePath = Path.GetFullPath("Packages/com.qq.weixin.minigame/WebGLTemplates/WXTemplate2022TJ");
|
||||
if (!Directory.Exists(absolutePath))
|
||||
{
|
||||
PlayerSettings.WeixinMiniGame.template = $"{templateHeader}WXTemplate2022TJ";
|
||||
PlayerSettings.WeixinMiniGame.template = string.Format("{0}WXTemplate2022TJ", templateHeader);
|
||||
}
|
||||
else
|
||||
{
|
||||
PlayerSettings.WeixinMiniGame.template = $"PATH:{absolutePath}";
|
||||
PlayerSettings.WeixinMiniGame.template = string.Format("PATH:{0}", absolutePath);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
PlayerSettings.WeixinMiniGame.template = $"{templateHeader}WXTemplate2022TJ";
|
||||
PlayerSettings.WeixinMiniGame.template = string.Format("{0}WXTemplate2022TJ", templateHeader);
|
||||
}
|
||||
PlayerSettings.WeixinMiniGame.linkerTarget = WeixinMiniGameLinkerTarget.Wasm;
|
||||
PlayerSettings.WeixinMiniGame.dataCaching = false;
|
||||
@ -55,11 +55,11 @@ namespace WeChatWASM
|
||||
PlayerSettings.runInBackground = false;
|
||||
PlayerSettings.WebGL.compressionFormat = WebGLCompressionFormat.Disabled;
|
||||
#if UNITY_2022_3_OR_NEWER
|
||||
PlayerSettings.WebGL.template = $"{templateHeader}WXTemplate2022";
|
||||
PlayerSettings.WebGL.template = string.Format("{0}WXTemplate2022", templateHeader);
|
||||
#elif UNITY_2020_1_OR_NEWER
|
||||
PlayerSettings.WebGL.template = $"{templateHeader}WXTemplate2020";
|
||||
PlayerSettings.WebGL.template = string.Format("{0}WXTemplate2020", templateHeader);
|
||||
#else
|
||||
PlayerSettings.WebGL.template = $"{templateHeader}WXTemplate";
|
||||
PlayerSettings.WebGL.template = string.Format("{0}WXTemplate", templateHeader);
|
||||
#endif
|
||||
PlayerSettings.WebGL.linkerTarget = WebGLLinkerTarget.Wasm;
|
||||
PlayerSettings.WebGL.dataCaching = false;
|
||||
@ -244,8 +244,8 @@ namespace WeChatWASM
|
||||
}
|
||||
string dataFilePath = GetWebGLDataPath();
|
||||
string wxTextDataDir = WXAssetsTextTools.GetTextMinDataDir();
|
||||
string dataFilePathBackupDir = $"{wxTextDataDir}{WXAssetsTextTools.DS}slim";
|
||||
string dataFilePathBackupPath = $"{dataFilePathBackupDir}{WXAssetsTextTools.DS}backup.txt";
|
||||
string dataFilePathBackupDir = string.Format("{0}{1}slim", wxTextDataDir, WXAssetsTextTools.DS);
|
||||
string dataFilePathBackupPath = string.Format("{0}{1}backup.txt", dataFilePathBackupDir, WXAssetsTextTools.DS);
|
||||
if (!Directory.Exists(dataFilePathBackupDir))
|
||||
{
|
||||
Directory.CreateDirectory(dataFilePathBackupDir);
|
||||
@ -281,7 +281,7 @@ namespace WeChatWASM
|
||||
try
|
||||
{
|
||||
int tagStrIdx = inAllText.IndexOf(inTagStr);
|
||||
if (tagStrIdx == -1) throw new Exception($"Tag string '{inTagStr}' not found.");
|
||||
if (tagStrIdx == -1) throw new Exception(string.Format("Tag string '{0}' not found.", inTagStr));
|
||||
|
||||
int enabledStrIdx = inAllText.IndexOf("enabled: ", tagStrIdx);
|
||||
if (enabledStrIdx == -1) throw new Exception("'enabled: ' string not found after tag.");
|
||||
@ -292,7 +292,7 @@ namespace WeChatWASM
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
UnityEngine.Debug.LogWarning($"Failed to get enabled flag string index: {ex.Message}");
|
||||
UnityEngine.Debug.LogWarning(string.Format("Failed to get enabled flag string index: {0}", ex.Message));
|
||||
return -1; // -1 means failed
|
||||
}
|
||||
}
|
||||
@ -323,7 +323,7 @@ namespace WeChatWASM
|
||||
catch (Exception ex)
|
||||
{
|
||||
// 避免 Error 日志阻塞打包流程
|
||||
UnityEngine.Debug.LogWarning($"Failed to enable plugin asset: {ex.Message}");
|
||||
UnityEngine.Debug.LogWarning(string.Format("Failed to enable plugin asset: {0}", ex.Message));
|
||||
}
|
||||
}
|
||||
|
||||
@ -335,21 +335,21 @@ namespace WeChatWASM
|
||||
{
|
||||
wxPerfPlugins = new string[]
|
||||
{
|
||||
$"Packages{DS}com.qq.weixin.minigame{DS}Runtime{DS}Plugins{DS}WxPerfJsBridge.jslib",
|
||||
$"Packages{DS}com.qq.weixin.minigame{DS}Runtime{DS}Plugins{DS}wx_perf_2022.a",
|
||||
$"Packages{DS}com.qq.weixin.minigame{DS}Runtime{DS}Plugins{DS}wx_perf_2021.a",
|
||||
string.Format("Packages{0}com.qq.weixin.minigame{0}Runtime{0}Plugins{0}WxPerfJsBridge.jslib", DS),
|
||||
string.Format("Packages{0}com.qq.weixin.minigame{0}Runtime{0}Plugins{0}wx_perf_2022.a", DS),
|
||||
string.Format("Packages{0}com.qq.weixin.minigame{0}Runtime{0}Plugins{0}wx_perf_2021.a", DS),
|
||||
};
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
string jsLibRootDir = $"Assets{DS}WX-WASM-SDK-V2{DS}Runtime{DS}Plugins{DS}";
|
||||
string jsLibRootDir = string.Format("Assets{0}WX-WASM-SDK-V2{0}Runtime{0}Plugins{0}", DS);
|
||||
|
||||
// 下方顺序不可变动
|
||||
wxPerfPlugins = new string[]
|
||||
{
|
||||
$"{jsLibRootDir}WxPerfJsBridge.jslib",
|
||||
$"{jsLibRootDir}wx_perf_2022.a",
|
||||
$"{jsLibRootDir}wx_perf_2021.a",
|
||||
string.Format("{0}WxPerfJsBridge.jslib", jsLibRootDir),
|
||||
string.Format("{0}wx_perf_2022.a", jsLibRootDir),
|
||||
string.Format("{0}wx_perf_2021.a", jsLibRootDir),
|
||||
};
|
||||
}
|
||||
|
||||
@ -407,19 +407,19 @@ namespace WeChatWASM
|
||||
{
|
||||
glLibs = new string[]
|
||||
{
|
||||
$"Packages{DS}com.qq.weixin.minigame{DS}Runtime{DS}Plugins{DS}libemscriptenglx.a",
|
||||
$"Packages{DS}com.qq.weixin.minigame{DS}Runtime{DS}Plugins{DS}libemscriptenglx_2021.a",
|
||||
string.Format("Packages{0}com.qq.weixin.minigame{0}Runtime{0}Plugins{0}libemscriptenglx.a", DS),
|
||||
string.Format("Packages{0}com.qq.weixin.minigame{0}Runtime{0}Plugins{0}libemscriptenglx_2021.a", DS),
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
string glLibRootDir = $"Assets{DS}WX-WASM-SDK-V2{DS}Runtime{DS}Plugins{DS}";
|
||||
string glLibRootDir = string.Format("Assets{0}WX-WASM-SDK-V2{0}Runtime{0}Plugins{0}", DS);
|
||||
|
||||
// 下方顺序不要变动
|
||||
glLibs = new string[]
|
||||
{
|
||||
$"{glLibRootDir}libemscriptenglx.a",
|
||||
$"{glLibRootDir}libemscriptenglx_2021.a",
|
||||
string.Format("{0}libemscriptenglx.a", glLibRootDir),
|
||||
string.Format("{0}libemscriptenglx_2021.a", glLibRootDir),
|
||||
};
|
||||
}
|
||||
|
||||
@ -500,17 +500,17 @@ namespace WeChatWASM
|
||||
{
|
||||
glLibs = new string[]
|
||||
{
|
||||
$"Packages{DS}com.qq.weixin.minigame{DS}Editor{DS}BuildProfile{DS}lib{DS}libwx-metal-cpp.bc",
|
||||
$"Packages{DS}com.qq.weixin.minigame{DS}Editor{DS}BuildProfile{DS}lib{DS}mtl_library.jslib",
|
||||
string.Format("Packages{0}com.qq.weixin.minigame{0}Editor{0}BuildProfile{0}lib{0}libwx-metal-cpp.bc", DS),
|
||||
string.Format("Packages{0}com.qq.weixin.minigame{0}Editor{0}BuildProfile{0}lib{0}mtl_library.jslib", DS),
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
string glLibRootDir = $"Assets{DS}WX-WASM-SDK-V2{DS}Editor{DS}BuildProfile{DS}lib{DS}";
|
||||
string glLibRootDir = string.Format("Assets{0}WX-WASM-SDK-V2{0}Editor{0}BuildProfile{0}lib{0}", DS);
|
||||
glLibs = new string[]
|
||||
{
|
||||
$"{glLibRootDir}libwx-metal-cpp.bc",
|
||||
$"{glLibRootDir}mtl_library.jslib",
|
||||
string.Format("{0}libwx-metal-cpp.bc", glLibRootDir),
|
||||
string.Format("{0}mtl_library.jslib", glLibRootDir),
|
||||
};
|
||||
}
|
||||
for (int i = 0; i < glLibs.Length; i++)
|
||||
@ -532,10 +532,10 @@ namespace WeChatWASM
|
||||
string DS = WXAssetsTextTools.DS;
|
||||
if (UnityUtil.GetSDKMode() == UnityUtil.SDKMode.Package)
|
||||
{
|
||||
return $"Packages{DS}com.qq.weixin.minigame{DS}Runtime{DS}Plugins{DS}LuaAdaptor{DS}{filename}";
|
||||
return string.Format("Packages{0}com.qq.weixin.minigame{0}Runtime{0}Plugins{0}LuaAdaptor{0}{1}", DS, filename);
|
||||
}
|
||||
|
||||
return $"Assets{DS}WX-WASM-SDK-V2{DS}Runtime{DS}Plugins{DS}LuaAdaptor{DS}{filename}";
|
||||
return string.Format("Assets{0}WX-WASM-SDK-V2{0}Runtime{0}Plugins{0}LuaAdaptor{0}{1}", DS, filename);
|
||||
}
|
||||
|
||||
private static void MakeLuaImport(Dictionary<string, string> luaPaths)
|
||||
@ -550,7 +550,7 @@ namespace WeChatWASM
|
||||
string includeLuaContent = "//EMSCRIPTEN_ENV_LUA_IMPORT_LOGIC_START";
|
||||
foreach (var luaPath in luaPaths)
|
||||
{
|
||||
includeLuaContent += $"\n#include \"{luaPath.Value.Replace("\\", "\\\\")}\"";
|
||||
includeLuaContent += string.Format("\n#include \"{0}\"", luaPath.Value.Replace("\\", "\\\\"));
|
||||
}
|
||||
includeLuaContent += "\n//EMSCRIPTEN_ENV_LUA_IMPORT_LOGIC_END";
|
||||
|
||||
@ -753,7 +753,7 @@ namespace WeChatWASM
|
||||
Debug.LogError("系统发现自定义构建模板中存在以下文件对应的基础模板已被更新,为确保游戏导出正常工作请自行解决可能存在的冲突:");
|
||||
for (int i = 0; i < res.Length; i++)
|
||||
{
|
||||
Debug.LogError($"自定义模板文件 [{i}]: [ {res[i]} ]");
|
||||
Debug.LogError(string.Format("自定义模板文件 [{0}]: [ {1} ]", i, res[i]));
|
||||
}
|
||||
Debug.LogError("有关上述警告产生原因及处理办法请阅读:https://wechat-miniprogram.github.io/minigame-unity-webgl-transform/Design/BuildTemplate.html#%E6%96%B0%E7%89%88%E6%9C%ACsdk%E5%BC%95%E8%B5%B7%E7%9A%84%E5%86%B2%E7%AA%81%E6%8F%90%E9%86%92");
|
||||
return false;
|
||||
@ -788,7 +788,7 @@ namespace WeChatWASM
|
||||
new Rule()
|
||||
{
|
||||
old = "await *WebAssembly\\.instantiate\\(\\w*,",
|
||||
newStr = $"await WebAssembly.instantiate(Module[\"wasmPath\"],",
|
||||
newStr = string.Format("await WebAssembly.instantiate(Module[\"wasmPath\"],"),
|
||||
},
|
||||
new Rule()
|
||||
{
|
||||
@ -864,7 +864,7 @@ private static void CompressAssemblyBrotli()
|
||||
{
|
||||
var current = i + 1;
|
||||
var total = ReplaceRules.rules.Length;
|
||||
EditorUtility.DisplayProgressBar($"Converting...,{current}/{total}", "Replace holder...", current * 1.0f / total);
|
||||
EditorUtility.DisplayProgressBar(string.Format("Converting...,{0}/{1}", current, total), "Replace holder...", current * 1.0f / total);
|
||||
var rule = ReplaceRules.rules[i];
|
||||
// text = Regex.Replace(text, rule.old, rule.newStr);
|
||||
if (ShowMatchFailedWarning(text, rule.old, "WXReplaceRules") == false)
|
||||
@ -1026,17 +1026,17 @@ private static void CompressAssemblyBrotli()
|
||||
{
|
||||
if (config.ProjectConf.MemorySize >= 1024)
|
||||
{
|
||||
UnityEngine.Debug.LogErrorFormat($"UnityHeap必须小于1024,请查看GIT文档<a href=\"https://github.com/wechat-miniprogram/minigame-unity-webgl-transform/blob/main/Design/OptimizationMemory.md\">优化Unity WebGL的内存</a>");
|
||||
UnityEngine.Debug.LogErrorFormat(string.Format("UnityHeap必须小于1024,请查看GIT文档<a href=\"{0}\">优化Unity WebGL的内存</a>", "https://github.com/wechat-miniprogram/minigame-unity-webgl-transform/blob/main/Design/OptimizationMemory.md"));
|
||||
return -1;
|
||||
}
|
||||
else if (config.ProjectConf.MemorySize >= 500)
|
||||
{
|
||||
UnityEngine.Debug.LogWarningFormat($"UnityHeap大于500M时,32位Android与iOS普通模式较大概率启动失败,中轻度游戏建议小于该值。请查看GIT文档<a href=\"https://github.com/wechat-miniprogram/minigame-unity-webgl-transform/blob/main/Design/OptimizationMemory.md\">优化Unity WebGL的内存</a>");
|
||||
UnityEngine.Debug.LogWarningFormat(string.Format("UnityHeap大于500M时,32位Android与iOS普通模式较大概率启动失败,中轻度游戏建议小于该值。请查看GIT文档<a href=\"{0}\">优化Unity WebGL的内存</a>", "https://github.com/wechat-miniprogram/minigame-unity-webgl-transform/blob/main/Design/OptimizationMemory.md"));
|
||||
}
|
||||
#if PLATFORM_WEIXINMINIGAME
|
||||
PlayerSettings.WeixinMiniGame.emscriptenArgs += $" -s TOTAL_MEMORY={config.ProjectConf.MemorySize}MB";
|
||||
PlayerSettings.WeixinMiniGame.emscriptenArgs += string.Format(" -s TOTAL_MEMORY={0}MB", config.ProjectConf.MemorySize);
|
||||
#else
|
||||
PlayerSettings.WebGL.emscriptenArgs += $" -s TOTAL_MEMORY={config.ProjectConf.MemorySize}MB";
|
||||
PlayerSettings.WebGL.emscriptenArgs += string.Format(" -s TOTAL_MEMORY={0}MB", config.ProjectConf.MemorySize);
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -1235,7 +1235,7 @@ var keys = boot["resources"][key].Keys;
|
||||
return add_lua_newstate_hook_osx(filename);
|
||||
}
|
||||
|
||||
throw new System.NotSupportedException($"add_lua_newstate_hook not supported on: {RuntimeInformation.OSDescription}");
|
||||
throw new System.NotSupportedException(string.Format("add_lua_newstate_hook not supported on: {0}", RuntimeInformation.OSDescription));
|
||||
}
|
||||
|
||||
private static void MaybeInstallLuaNewStateHook()
|
||||
@ -1243,7 +1243,7 @@ var keys = boot["resources"][key].Keys;
|
||||
// 当前版本仅支持 win & mac, 不满足时直接跳过.
|
||||
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && !RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
|
||||
{
|
||||
Debug.LogWarning($"MaybeInstallLuaNewStateHook:: Cannot install lua runtime on {RuntimeInformation.OSDescription}");
|
||||
Debug.LogWarning(string.Format("MaybeInstallLuaNewStateHook:: Cannot install lua runtime on {0}", RuntimeInformation.OSDescription));
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1259,12 +1259,12 @@ var keys = boot["resources"][key].Keys;
|
||||
var ret = add_lua_newstate_hook(codePath);
|
||||
if (ret != 0)
|
||||
{
|
||||
Debug.LogWarning($"cannot add lua new state hook: {ret}");
|
||||
Debug.LogWarning(string.Format("cannot add lua new state hook: {0}", ret));
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.LogError($"cannot add lua new state hook: {e}");
|
||||
Debug.LogError(string.Format("cannot add lua new state hook: {0}", e));
|
||||
}
|
||||
}
|
||||
|
||||
@ -1954,7 +1954,7 @@ var keys = boot["resources"][key].Keys;
|
||||
{
|
||||
if (preloadFile.relativePath == string.Empty)
|
||||
{
|
||||
UnityEngine.Debug.LogError($"并非所有预下载的文件都被找到,剩余:{preloadFile.fileName}");
|
||||
UnityEngine.Debug.LogError(string.Format("并非所有预下载的文件都被找到,剩余:{0}", preloadFile.fileName));
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -2065,7 +2065,7 @@ try
|
||||
selectedIp = "127.0.0.1";
|
||||
}
|
||||
|
||||
sb.Append($"player-connection-ip={selectedIp}");
|
||||
sb.Append(string.Format("player-connection-ip={0}", selectedIp));
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@ -2276,21 +2276,21 @@ try
|
||||
{
|
||||
jsLibs = new string[]
|
||||
{
|
||||
$"Packages{DS}com.qq.weixin.minigame{DS}Runtime{DS}Plugins{DS}SDK-WX-TextureMin-JS-WEBGL1.jslib",
|
||||
$"Packages{DS}com.qq.weixin.minigame{DS}Runtime{DS}Plugins{DS}SDK-WX-TextureMin-JS-WEBGL2.jslib",
|
||||
$"Packages{DS}com.qq.weixin.minigame{DS}Runtime{DS}Plugins{DS}SDK-WX-TextureMin-JS-WEBGL2-Linear.jslib",
|
||||
string.Format("Packages{0}com.qq.weixin.minigame{0}Runtime{0}Plugins{0}SDK-WX-TextureMin-JS-WEBGL1.jslib", DS),
|
||||
string.Format("Packages{0}com.qq.weixin.minigame{0}Runtime{0}Plugins{0}SDK-WX-TextureMin-JS-WEBGL2.jslib", DS),
|
||||
string.Format("Packages{0}com.qq.weixin.minigame{0}Runtime{0}Plugins{0}SDK-WX-TextureMin-JS-WEBGL2-Linear.jslib", DS),
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
string jsLibRootDir = $"Assets{DS}WX-WASM-SDK-V2{DS}Runtime{DS}Plugins{DS}";
|
||||
string jsLibRootDir = string.Format("Assets{0}WX-WASM-SDK-V2{0}Runtime{0}Plugins{0}", DS);
|
||||
|
||||
// 下方顺序不可变动
|
||||
jsLibs = new string[]
|
||||
{
|
||||
$"{jsLibRootDir}SDK-WX-TextureMin-JS-WEBGL1.jslib",
|
||||
$"{jsLibRootDir}SDK-WX-TextureMin-JS-WEBGL2.jslib",
|
||||
$"{jsLibRootDir}SDK-WX-TextureMin-JS-WEBGL2-Linear.jslib",
|
||||
string.Format("{0}SDK-WX-TextureMin-JS-WEBGL1.jslib", jsLibRootDir),
|
||||
string.Format("{0}SDK-WX-TextureMin-JS-WEBGL2.jslib", jsLibRootDir),
|
||||
string.Format("{0}SDK-WX-TextureMin-JS-WEBGL2-Linear.jslib", jsLibRootDir),
|
||||
};
|
||||
}
|
||||
int index = 0;
|
||||
@ -2354,7 +2354,7 @@ try
|
||||
{
|
||||
if (Regex.IsMatch(text, rule) == false)
|
||||
{
|
||||
Debug.Log($"UnMatched {file} rule: {rule}");
|
||||
Debug.Log(string.Format("UnMatched {0} rule: {1}", file, rule));
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
||||
@ -1184,7 +1184,7 @@ namespace WeChatWASM
|
||||
if (shouldAddSymbol)
|
||||
{
|
||||
shouldAddSymbol = false;
|
||||
EditorUtility.DisplayDialog("警告", $"当前Unity版本({Application.unityVersion})不在性能分析工具适配范围内(2021.2-2023.1), 性能分析工具将被禁用。", "确定");
|
||||
EditorUtility.DisplayDialog("警告", string.Format("当前Unity版本({0})不在性能分析工具适配范围内(2021.2-2023.1), 性能分析工具将被禁用。", Application.unityVersion), "确定");
|
||||
config.CompileOptions.enablePerfAnalysis = false;
|
||||
this.setData("enablePerfAnalysis", false);
|
||||
}
|
||||
@ -1194,7 +1194,7 @@ namespace WeChatWASM
|
||||
{
|
||||
if (defineSymbols.IndexOf(MACRO_ENABLE_WX_PERF_FEATURE) == -1)
|
||||
{
|
||||
PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, MACRO_ENABLE_WX_PERF_FEATURE + $";{defineSymbols}");
|
||||
PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, string.Format("{0};{1}", MACRO_ENABLE_WX_PERF_FEATURE, defineSymbols));
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@ -2,7 +2,7 @@ namespace WeChatWASM
|
||||
{
|
||||
public class WXPluginVersion
|
||||
{
|
||||
public static string pluginVersion = "202603060639"; // 这一行不要改他,导出的时候会自动替换
|
||||
public static string pluginVersion = "202603090941"; // 这一行不要改他,导出的时候会自动替换
|
||||
}
|
||||
|
||||
public class WXPluginConf
|
||||
|
||||
Binary file not shown.
@ -291,6 +291,14 @@
|
||||
扫描首资源包中资源内容
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:WeChatWASM.IntPtrExtensions.Add(System.IntPtr,System.Int32)">
|
||||
<summary>
|
||||
模拟IntPtr.Add,适配.NET 3.5
|
||||
</summary>
|
||||
<param name="pointer">基础指针</param>
|
||||
<param name="offset">偏移量(int)</param>
|
||||
<returns>偏移后的指针</returns>
|
||||
</member>
|
||||
<member name="T:WeChatWASM.UnityUtil">
|
||||
工具函数
|
||||
</member>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f847db20faa66610af5948c280c4a736
|
||||
guid: a8b20d0640c024747c9934c2fd339de1
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -8925,6 +8925,14 @@
|
||||
</summary>
|
||||
<returns>微信启动剧情交互句柄</returns>
|
||||
</member>
|
||||
<member name="M:WeChatWASM.IntPtrExtensions.Add(System.IntPtr,System.Int32)">
|
||||
<summary>
|
||||
模拟IntPtr.Add,适配.NET 3.5
|
||||
</summary>
|
||||
<param name="pointer">基础指针</param>
|
||||
<param name="offset">偏移量(int)</param>
|
||||
<returns>偏移后的指针</returns>
|
||||
</member>
|
||||
<member name="M:WeChatWASM.WXTCPSocket.BindWifi(WeChatWASM.TCPSocketBindWifiOption)">
|
||||
<summary>
|
||||
[TCPSocket.bindWifi(Object options)](https://developers.weixin.qq.com/minigame/dev/api/network/tcp/TCPSocket.bindWifi.html)
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 466cc16e475e1dc063887d65171102f7
|
||||
guid: 2b5da1dc3906b9772f098b122350c986
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
Binary file not shown.
@ -8925,6 +8925,14 @@
|
||||
</summary>
|
||||
<returns>微信启动剧情交互句柄</returns>
|
||||
</member>
|
||||
<member name="M:WeChatWASM.IntPtrExtensions.Add(System.IntPtr,System.Int32)">
|
||||
<summary>
|
||||
模拟IntPtr.Add,适配.NET 3.5
|
||||
</summary>
|
||||
<param name="pointer">基础指针</param>
|
||||
<param name="offset">偏移量(int)</param>
|
||||
<returns>偏移后的指针</returns>
|
||||
</member>
|
||||
<member name="M:WeChatWASM.WXTCPSocket.BindWifi(WeChatWASM.TCPSocketBindWifiOption)">
|
||||
<summary>
|
||||
[TCPSocket.bindWifi(Object options)](https://developers.weixin.qq.com/minigame/dev/api/network/tcp/TCPSocket.bindWifi.html)
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bf55242a56dec72e36e68cce3feed2c0
|
||||
guid: 0f0705d5531be7910b7e9a4ec393130b
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -887,31 +887,31 @@ namespace WeChatWASM
|
||||
Font[] fonts = ab.LoadAllAssets<Font>();
|
||||
if (fonts.Length != 0)
|
||||
{
|
||||
WriteLog($"Load font from ab. abBytes:{abBytes.Length}");
|
||||
WriteLog(string.Format("Load font from ab. abBytes:{0}", abBytes.Length));
|
||||
callback.Invoke(fonts[0]);
|
||||
}
|
||||
else
|
||||
{
|
||||
WriteWarn($"LoadAllAssets failed, abBytes:{abBytes.Length}, fonts: {fonts.Length}");
|
||||
WriteWarn(string.Format("LoadAllAssets failed, abBytes:{0}, fonts: {1}", abBytes.Length, fonts.Length));
|
||||
callback.Invoke(null);
|
||||
}
|
||||
ab.Unload(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
WriteWarn($"LoadFromMemory failed, Length: {abBytes.Length}");
|
||||
WriteWarn(string.Format("LoadFromMemory failed, Length: {0}", abBytes.Length));
|
||||
callback.Invoke(null);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
WriteWarn($"GetWXFont Exception, ex:{ex.ToString()}");
|
||||
WriteWarn(string.Format("GetWXFont Exception, ex:{0}", ex.ToString()));
|
||||
callback.Invoke(null);
|
||||
}
|
||||
},
|
||||
fail = (fail) =>
|
||||
{
|
||||
WriteWarn($"GetFontData fail {fail.errMsg}");
|
||||
WriteWarn(string.Format("GetFontData fail {0}", fail.errMsg));
|
||||
callback.Invoke(null);
|
||||
},
|
||||
});
|
||||
|
||||
@ -186,7 +186,7 @@ public class WXProfileStatsScript : MonoBehaviour, WeChatWASM.WXSDKManagerHandle
|
||||
profValue.current = value;
|
||||
profValue.max = value > profValue.max ? value : profValue.max;
|
||||
profValue.min = value < profValue.min ? value : profValue.min;
|
||||
sb.AppendLine($"{key}:[{profValue.current.ToString(format)}, {profValue.min.ToString(format)}, {profValue.max.ToString(format)}]");
|
||||
sb.AppendLine(string.Format("{0}:[{1}, {2}, {3}]", key, profValue.current.ToString(format), profValue.min.ToString(format), profValue.max.ToString(format)));
|
||||
return profValue;
|
||||
}
|
||||
|
||||
@ -195,14 +195,14 @@ public class WXProfileStatsScript : MonoBehaviour, WeChatWASM.WXSDKManagerHandle
|
||||
UpdateFps();
|
||||
const uint toMB = 1024 * 1024;
|
||||
var sb = new StringBuilder(500);
|
||||
sb.AppendLine($"-------------FPS---------------");
|
||||
|
||||
sb.AppendLine(string.Format("-------------FPS---------------"));
|
||||
|
||||
// var key = "targetFrameRate";
|
||||
UpdateValue("TargetFramerate", Application.targetFrameRate, sb);
|
||||
UpdateValue("FPS", fps, sb);
|
||||
UpdateValue("FrameTime(ms)", WeChatWASM.WXSDKManagerHandler.Instance.GetEXFrameTime(), sb, "0.00");
|
||||
|
||||
sb.AppendLine($"-------------Profiler------------");
|
||||
sb.AppendLine(string.Format("-------------Profiler------------"));
|
||||
|
||||
UpdateValue("MonoHeapReserved", Profiler.GetMonoHeapSizeLong() / toMB, sb);
|
||||
UpdateValue("MonoHeapUsed", Profiler.GetMonoUsedSizeLong() / toMB, sb);
|
||||
|
||||
@ -93,7 +93,7 @@ namespace WXSDKPerf
|
||||
#else
|
||||
DateTime timestamp = DateTime.Now;
|
||||
var dateString = timestamp.ToLocalTime().ToString("yyyy-MM-dd_HH-mm-ss", System.Globalization.CultureInfo.InvariantCulture);
|
||||
var snapshotFileName = $"{dateString}.snap";
|
||||
var snapshotFileName = string.Format("{0}.snap", dateString);
|
||||
|
||||
#if UNITY_2018_3_OR_NEWER && !UNITY_2022_2_OR_NEWER
|
||||
UnityEngine.Profiling.Memory.Experimental.MemoryProfiler.TakeSnapshot(Path.Combine(Application.persistentDataPath, snapshotFileName),
|
||||
|
||||
@ -119,13 +119,13 @@ public class WXTouchInputOverride : BaseInput
|
||||
TouchData data = FindTouchData(wxTouch.identifier);
|
||||
if (data == null)
|
||||
{
|
||||
Debug.LogError($"OnWxTouchEnd, error identifier:{wxTouch.identifier}");
|
||||
Debug.LogError(string.Format("OnWxTouchEnd, error identifier:{0}", wxTouch.identifier));
|
||||
return;
|
||||
}
|
||||
|
||||
if (data.touch.phase == TouchPhase.Canceled || data.touch.phase == TouchPhase.Ended)
|
||||
{
|
||||
Debug.LogWarning($"OnWxTouchEnd, error phase:{wxTouch.identifier}, phase:{data.touch.phase}");
|
||||
Debug.LogWarning(string.Format("OnWxTouchEnd, error phase:{0}, phase:{1}", wxTouch.identifier, data.touch.phase));
|
||||
}
|
||||
|
||||
// Debug.Log($"OnWxTouchEnd:{wxTouch.identifier}");
|
||||
@ -193,13 +193,13 @@ public class WXTouchInputOverride : BaseInput
|
||||
TouchData data = FindTouchData(wxTouch.identifier);
|
||||
if (data == null)
|
||||
{
|
||||
Debug.LogError($"OnWxTouchCancel, error identifier:{wxTouch.identifier}");
|
||||
Debug.LogError(string.Format("OnWxTouchCancel, error identifier:{0}", wxTouch.identifier));
|
||||
return;
|
||||
}
|
||||
|
||||
if (data.touch.phase == TouchPhase.Canceled || data.touch.phase == TouchPhase.Ended)
|
||||
{
|
||||
Debug.LogWarning($"OnWxTouchCancel, error phase:{wxTouch.identifier}, phase:{data.touch.phase}");
|
||||
Debug.LogWarning(string.Format("OnWxTouchCancel, error phase:{0}, phase:{1}", wxTouch.identifier, data.touch.phase));
|
||||
}
|
||||
|
||||
// Debug.Log($"OnWxTouchCancel:{wxTouch.identifier}");
|
||||
@ -299,7 +299,7 @@ public class WXTouchInputOverride : BaseInput
|
||||
|
||||
public override Touch GetTouch(int index)
|
||||
{
|
||||
// Debug.LogError($"GetTouch touchCount:{touchCount}, index:{index}, touch:{_touches[index].touch.fingerId}, {_touches[index].touch.phase}");
|
||||
// Debug.LogError(string.Format("GetTouch touchCount:{0}, index:{1}, touch:{2}, {3}", touchCount, index, _touches[index].touch.fingerId, _touches[index].touch.phase));
|
||||
return _touches[index].touch;
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 460b7146891e03cd7dbb166d151096e1
|
||||
guid: c526fb2f6e666da59ddbd8fa7f4ad87c
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1c59264f7bf286edbdbaa2627c7927c2
|
||||
guid: a6a2d25ee6bf3805573ebf247f64235c
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b382bb79de38e210b15880907cc7d41c
|
||||
guid: 5a8b6fbb8e0e9fa3189f69d69d59caf2
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 849e2da7797616bff64c4fe7d232d0cb
|
||||
guid: 501833e5301c6e3c54c17eea667ff373
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b03882de99fc9f2ed6b20299268a28b6
|
||||
guid: d3f85d81155f3647dca2a2e89254e561
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c6089fbb2d77d00eab351326275bf993
|
||||
guid: c0312646cd2aabe4526d1a3472d4ae01
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 18d9bd07f7d060b28db7a7cbbb0416af
|
||||
guid: 40cd5e200c77c9c3badf02ec4f8d747c
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1298a7f506242d7a4967168f70bab80e
|
||||
guid: 7308a109eb7e51f28453a932de413748
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0254d8ada54cb96c6063eba15afc09a7
|
||||
guid: 451f1340ab23a89aaa0e0b52135b6191
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 93785183d6f272e727a673663a5e07e9
|
||||
guid: a1aae47fb1da3db3972735625089918f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 92a2d27f7c61314acf1c6641d86227f5
|
||||
guid: f1aa1801a458453f96d62d9dc5a73198
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5d8f28add3f018284503fea0e5378972
|
||||
guid: 06fb29527ddb6cddf0fa3787095f6412
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 537a71a53508662c39382835698346e6
|
||||
guid: e053328a6be93fc41ca0eb82acb558e2
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 03aacf3fa013739fdedfcf3172992424
|
||||
guid: 78ce2f9390663ca37537b2f8946f601d
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5acf59fa4887afe9e5543f0f7a9ab6f5
|
||||
guid: acd5c33d3af23993381569233b6bdd7f
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1d29ee2561675ff14194b6e7bd46275f
|
||||
guid: e019ef2fb527cabe0c0e26b06b0a5487
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5c75545aa410d7c9eb551b6e8dce37b7
|
||||
guid: 56dfe555e04a64ca2da3a4b1acf97398
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f2f03f48ff6a03f1276ae28a17377414
|
||||
guid: e956132f6ca5e592f9b0fe92fc5b0b27
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: dfe1ab7614760e79245ae02eff739917
|
||||
guid: 2c1ce08d25ed1c856a05c01c3951f2a1
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8e5fc4074aa776448c9e675d711fc04d
|
||||
guid: c60898c831cc1acb3a32cdd1433dd659
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 53d1ab44475823c98fdc7dec83071d40
|
||||
guid: 3a9eef1cfecf0fa1fefd34a7a9ad5755
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7e520a71771d5f4d704322bbf1ec29f5
|
||||
guid: 12f1008385f0733941a5a34ff13185c7
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 646d2bf9d8672a9a218e0a2424510f52
|
||||
guid: 1b3a9b216d91b3e499ffe22d7d6f390b
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1a5ef22d879dc7b36eaaead98378a482
|
||||
guid: 5112ed3c1af6d320e353774c2ce09b6f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 68b32c2c7118568d468a0fce0d97694b
|
||||
guid: b1227aa1dab1def1830cb3fd7bbe3cb3
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5ce10c57e0ae044aeeafb926d6ded27f
|
||||
guid: 7506ea769e5995d80750b89f73e23492
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2d507f80aa1f07e6928878192025aa21
|
||||
guid: 8a1259324e97794fb28e607718a9e0d1
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ee2b75ef9071d848b74d2d966cb81206
|
||||
guid: 5ed8dd13994c498079747b7da267bd31
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4bc3a02780083df409ea2bac3350a837
|
||||
guid: c1997bc73747b3f872c0e39531007aa1
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 61cf5aa7128e5a3c34b2f91ac3ff7032
|
||||
guid: ff97ad282ebbef79a843baaf4f978555
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 32704751c54b549694968042f39948aa
|
||||
guid: 507cc375dee690b091c06068ffc7d27a
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c0185de9f1f461083bfbb4e2c15ea01e
|
||||
guid: 2ff8793d2428a154d5577bdce5cbb5a8
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 79f243891a58a44ba7dc3e770932fca1
|
||||
guid: aebe106509005a099cd28c0ccf9ff2e5
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 515d2b0e000b1bfd7b748177f71fb734
|
||||
guid: c70cc5182b1a9e45660ac7b551b29fd1
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a932c00345fe2c7fc81b4904a4017d39
|
||||
guid: f703746105b55837f621c93eddfe29a5
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b9163b02b4864899a82780c4a9b0e7b0
|
||||
guid: 6cf073162eee943308aa997f40357b8f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c0af6b89c7c00ca99c7cfe7d52e6ce4d
|
||||
guid: 45f682c6c4a4a2b8d74cc5367007e45f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: fdc5bfdcc34ef1b8de6f95bca01bf1b3
|
||||
guid: 6c46ae500d740b041397a147d45e3b43
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a21c1998f69d6ee8f81fb3938a5d8bca
|
||||
guid: 68e9a0e25556f2c2d697b93739bafcf8
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e8e7434519e8ec931591721a6dd69016
|
||||
guid: a5927c7d23dda5befac8fd7c1bd83616
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: fd841a4b61faf05dc6896b591ecd2ba6
|
||||
guid: 6e7648a9c0cf09f432c890e4183c0d70
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b3e88ddd36b37a10c634fcdb051a0569
|
||||
guid: d254994e20a93dbfbd643e6464baeed1
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f384824af82b0633fb3a27e951a8c74f
|
||||
guid: 2a40faa03309ea8c46ab983156fba81d
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ab044f78c2e335802c0f998d62e4c6c7
|
||||
guid: 3af3b35349b79a15d2060daf8f53ab78
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 855be02b877ce8e5850ef2feedbef97e
|
||||
guid: d9e4a67d717b8e9e5b3fce5097116aaa
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 62aaecceca2ed87f82807b24c98f4712
|
||||
guid: 06f2b292e4e198e1535b286790ccc892
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f69fcbb758d3536e2b5fac8650ce40d4
|
||||
guid: adce73509ed8fb98e2fd8cf20cfb640a
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 89a3fb9d015bf0b6b96fb48bca912596
|
||||
guid: 30da7f432e4e896537cc6bd4de7ab520
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 87c5f02823219e89422ea290c57c1266
|
||||
guid: 4c72ae875d0dab7cf0c702f8ef04c891
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: efe8b98cb4473b7f1583a67e64ca8daa
|
||||
guid: 6ef42cda90623f9ee55df6d30148882b
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4efa8ec768fca1d4da5115cf42de9f32
|
||||
guid: c89d8e6ad841065afcda268d1495a407
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e72390571f670aa4bbbec78889e9b058
|
||||
guid: a65105502519753776c3a453b8ac8e75
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2f131f149f19fdc87ab9686a67ffebdc
|
||||
guid: 3156de0c8b288495e7b4efd94c58772a
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a5a9cf6d090d31b4c3eb08e3d6c27a1e
|
||||
guid: 978b75f214febff9b78f2cdff7fb2624
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 63a5e6f252880047434433f8924f3be2
|
||||
guid: d844e3e22cd27b9b91807eb8cf8b7184
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3d4e5d5c773cdd4a57c6abeda3370087
|
||||
guid: ae5a29c71b3fc535a90acd6ddded23c1
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6d4521b0fa0e60e30d0f245701160892
|
||||
guid: 7bf77d5c2b7e62429c778d47344b9120
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3a54bb1cac1ae4507b4201bd105c3432
|
||||
guid: 357e05f7ef2197a5438108f0e4fd9e23
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f49bded02a1f6bd44eae366c2ea78e07
|
||||
guid: 1372529276322a9857b072bf081706b8
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b679c202093bd7de5537085c53e931d6
|
||||
guid: 80618ee03d1d82b52d29d667a7e580b2
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 272489925bfa31b6abf785b2fa61a664
|
||||
guid: 24256e92321dec6e4fb8ef3b65bba87a
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3588bab2efd41339c1db334fdc234e30
|
||||
guid: b58af528322aec9146070331b38f571c
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 57bbfac1f0986bb2d02101c0864ebbd7
|
||||
guid: 7a08cfbf142d2006e9a293364ebc6db3
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 43a0ec4ad864662e148a8c68067d2bdc
|
||||
guid: 9fb3de4ce2ecc80babba9e789f0427fe
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 38dc2df3f06fbe9995c454081d1a70e6
|
||||
guid: cebce4cede4588fea660e3c209f6e583
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b2e11dd00a464b0b6a7b09f8a821087e
|
||||
guid: 15743030538166aebc50b76464ceaee3
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0e5e166e34bc11f84aa4fd8228183950
|
||||
guid: 3c7676c8c3656eb815528bd0c0d34d3e
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ad55718a418cfe3ce9232e32a98ff584
|
||||
guid: 3cea552e9787bffb9939574825f1dd20
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a78984906e58807b5f70411ba85b1264
|
||||
guid: 0a1b7d62d29dfeb31614f39b996716a4
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bd5430d4bc3b3e23a9b3f513797de869
|
||||
guid: bd383153f410a052d6aac4bebc78dbbe
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 12dae9d2b467b3a07b3527ded0335c57
|
||||
guid: 9feecb3fb35cf4425a4fa952e07b4094
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 807eafef432d291f2f6db9fbcacb87ff
|
||||
guid: 33ba1d316a75c27b024ed40799929fb8
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 95d5959159faf26b27c10c7fe5003709
|
||||
guid: bc46a0b3bfc87610650a18f8f94f5648
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8c7c740fdd7f849a1c394b0ea9c35f36
|
||||
guid: 00c3c989a450a43c5b68fca540add4e5
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 45efca3220c9ef23b7b47fb84eae753e
|
||||
guid: edd9a477ebe4489353e74e780f3bd771
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5b7332c2a2678cb2227751961546f08d
|
||||
guid: dabe667c83af4a211ec42ca16ac2710e
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 972f4cb9fa800c2de59ea13b7cb58229
|
||||
guid: 83d6339c28ca3a535c4df303ff498faf
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 071d56a47526f31f7b042ec5edf00c30
|
||||
guid: ba6aeca0a59177d7a6038829d5e93a5d
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 21809ffd118cc6b2cb14a43d35c7da29
|
||||
guid: dc1239636b9ff9acd6a7a453d1e71a1f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1aded7a6162b7de16fec88fa33a5a479
|
||||
guid: 3a3c25a59bf187b1f5f2588b696a1131
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 143916ef811ca25c110bb6ac62f4ea3f
|
||||
guid: 82eedf5b550d1ce2d19d519700f0508f
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user