Auto-publish release WXSDK.

This commit is contained in:
nebulaliu 2024-12-18 18:46:35 +08:00
parent 65b7e86611
commit 11a345da4a
110 changed files with 336 additions and 135 deletions

View File

@ -6,13 +6,23 @@ Removed - 删除功能/接口
Fixed - 修复问题
Others - 其他
-->
## 2024-12-18 【重要更新】
### Feature
* 普通: 开放数据域支持screenCanvas
* 普通: 完善screenCanvas.toTempFilePath
* 普通: 低版本WindowInfo适配
* 普通: 调整autoAdaptScreen默认false
* 普通: 首资源包放小游戏分包时总大小调整为30MB
### Fixed
* 重要: 更改WebGLInput.mobileKeyboardSupport默认属性为 false该属性导致Unity2022 以上版本 Touch 会多调用一次 MainLoop产生较大性能损耗。请使用微信键盘API或 WXTouchInputOverride支持文本输入框
## 2024-11-14 【普通更新】
### Feature
* 普通: WXSDK代码简化
* 普通: 增强JsonMapper报错信息
* 普通: 适配插件版本升级到1.2.62
### Fixed
* 普通: WX.Cloud.Init 自定义环境报错
* 普通: WX.Cloud.Init 自定义环境报错
## 2024-10-8 【重要更新】
### Feature

View File

@ -885,7 +885,7 @@ namespace WeChatWASM
}
}
/// <summary>
/// 等brotli之后统计下资源包加brotli压缩后代码包是否超过了20M小游戏代码分包总大小限制
/// 等brotli之后统计下资源包加brotli压缩后代码包是否超过了30M小游戏代码分包总大小限制
/// </summary>
private static void convertDataPackage(bool brotliError)
{
@ -956,8 +956,8 @@ namespace WeChatWASM
// 计算首资源包大小
var tempDataInfo = new FileInfo(tempDataPath);
var tempFileSize = tempDataInfo.Length.ToString();
// 胶水层及sdk可能占一定大小粗略按照1M来算则剩余19M
if (brcodeSize + int.Parse(tempFileSize) > (20 - 1) * 1024 * 1024)
// 胶水层及sdk可能占一定大小粗略按照1M来算则剩余29M
if (brcodeSize + int.Parse(tempFileSize) > (30 - 1) * 1024 * 1024)
{
config.ProjectConf.assetLoadType = 0;
Debug.LogError("资源文件过大不适宜用放小游戏包内加载请上传资源文件到CDN");

View File

@ -2,7 +2,7 @@ namespace WeChatWASM
{
public class WXPluginVersion
{
public static string pluginVersion = "202411141147"; // 这一行不要改他,导出的时候会自动替换
public static string pluginVersion = "202412181046"; // 这一行不要改他,导出的时候会自动替换
}
public class WXPluginConf

Binary file not shown.

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d7b9a503098a826e42d62de42937c364
guid: 0d012de81b1c8b841ff88c8db4bde940
DefaultImporter:
externalObjects: {}
userData:

View File

@ -0,0 +1,21 @@
#if UNITY_WEBGL || WEIXINMINIGAME || UNITY_EDITOR
using System;
using UnityEngine;
using WeChatWASM;
internal class DisableKeyboardInput : MonoBehaviour
{
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
private static void OnGameLaunch()
{
#if !UNITY_EDITOR
#if PLATFORM_WEIXINMINIGAME
WeixinMiniGameInput.mobileKeyboardSupport = false;
#elif PLATFORM_WEBGL
WebGLInput.mobileKeyboardSupport = false;
#endif
#endif
}
}
#endif

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0d66dfb2fab87346c760045d60f1bb1f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -232,6 +232,16 @@ mergeInto(LibraryManager.library, {
stringToUTF8(returnStr, buffer, bufferSize);
return buffer;
},
WXOpenDataToTempFilePath: function (conf, s, f, c) {
window.WXWASMSDK.WXOpenDataToTempFilePath(_WXPointer_stringify_adaptor(conf), _WXPointer_stringify_adaptor(s), _WXPointer_stringify_adaptor(f), _WXPointer_stringify_adaptor(c))
},
WXOpenDataToTempFilePathSync: function (conf) {
var returnStr = window.WXWASMSDK.WXOpenDataToTempFilePathSync(_WXPointer_stringify_adaptor(conf));
var bufferSize = lengthBytesUTF8(returnStr || '') + 1;
var buffer = _malloc(bufferSize);
stringToUTF8(returnStr, buffer, bufferSize);
return buffer;
},
WXGetUserDataPath: function () {
var returnStr = window.WXWASMSDK.WXGetUserDataPath();
var bufferSize = lengthBytesUTF8(returnStr || '') + 1;
@ -253,6 +263,9 @@ mergeInto(LibraryManager.library, {
stringToUTF8(returnStr, buffer, bufferSize);
return buffer;
},
WXGetOpenDataContext: function (mode) {
window.WXWASMSDK.WXGetOpenDataContext(_WXPointer_stringify_adaptor(mode));
},
WXDataContextPostMessage: function (msg) {
window.WXWASMSDK.WXDataContextPostMessage(_WXPointer_stringify_adaptor(msg));
},

View File

@ -198,7 +198,7 @@ var WXAssetBundleLibrary = {
}();
WXFS.cache = new WXFileCache(ttl, capacity);
if(!unityNamespace.isAndroid) {
if(unityNamespace.isIOS && unityNamespace.isH5Renderer) {
WXFS.cache.RegularCleaning(1);
}

Binary file not shown.

View File

@ -193,14 +193,31 @@
</member>
<member name="M:WeChatWASM.WXCanvas.ToTempFilePathSync(WeChatWASM.WXToTempFilePathSyncParam)">
<summary>
同步的将当前 Canvas 保存为一个临时文件
同步的将当前 SharedCanvas(开放数据域) 截屏保存为一个临时文件
华为机型分享有已知bug推荐使用异步版本
</summary>
<returns>canvas 生成的临时文件路径 (本地路径)</returns>
</member>
<member name="M:WeChatWASM.WXCanvas.ToTempFilePath(WeChatWASM.WXToTempFilePathParam)">
<summary>
异步的将当前 Canvas 保存为一个临时文件
异步的将当前 SharedCanvas开放数据域 截图保存为一个临时文件
</summary>
</member>
<member name="T:WeChatWASM.WXSharedCanvas">
<summary>
开放数据域的sharedCanvas
</summary>
</member>
<member name="M:WeChatWASM.WXSharedCanvas.ToTempFilePathSync(WeChatWASM.WXToTempFilePathSyncParam)">
<summary>
同步的将当前 SharedCanvas开放数据域 保存为一个临时文件
华为机型分享有已知bug推荐使用异步版本
</summary>
<returns>canvas 生成的临时文件路径 (本地路径)</returns>
</member>
<member name="M:WeChatWASM.WXSharedCanvas.ToTempFilePath(WeChatWASM.WXToTempFilePathParam)">
<summary>
异步的将当前 SharedCanvas开放数据域 保存为一个临时文件
</summary>
</member>
<!-- Badly formed XML comment ignored for member "T:WeChatWASM.WXChat" -->

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 01bdbebd66ee5a739cc6b349dba4cd99
guid: cc381ebb35884590d1fc2486dae2fa3f
DefaultImporter:
externalObjects: {}
userData:

Binary file not shown.

View File

@ -199,14 +199,31 @@
</member>
<member name="M:WeChatWASM.WXCanvas.ToTempFilePathSync(WeChatWASM.WXToTempFilePathSyncParam)">
<summary>
同步的将当前 Canvas 保存为一个临时文件
同步的将当前 SharedCanvas(开放数据域) 截屏保存为一个临时文件
华为机型分享有已知bug推荐使用异步版本
</summary>
<returns>canvas 生成的临时文件路径 (本地路径)</returns>
</member>
<member name="M:WeChatWASM.WXCanvas.ToTempFilePath(WeChatWASM.WXToTempFilePathParam)">
<summary>
异步的将当前 Canvas 保存为一个临时文件
异步的将当前 SharedCanvas开放数据域 截图保存为一个临时文件
</summary>
</member>
<member name="T:WeChatWASM.WXSharedCanvas">
<summary>
开放数据域的sharedCanvas
</summary>
</member>
<member name="M:WeChatWASM.WXSharedCanvas.ToTempFilePathSync(WeChatWASM.WXToTempFilePathSyncParam)">
<summary>
同步的将当前 SharedCanvas开放数据域 保存为一个临时文件
华为机型分享有已知bug推荐使用异步版本
</summary>
<returns>canvas 生成的临时文件路径 (本地路径)</returns>
</member>
<member name="M:WeChatWASM.WXSharedCanvas.ToTempFilePath(WeChatWASM.WXToTempFilePathParam)">
<summary>
异步的将当前 SharedCanvas开放数据域 保存为一个临时文件
</summary>
</member>
<!-- Badly formed XML comment ignored for member "T:WeChatWASM.WXChat" -->

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b62580f0401d094a6394f069fac1303a
guid: 7231fcc0ade5a625d0618f995c24f816
DefaultImporter:
externalObjects: {}
userData:

View File

@ -446,9 +446,9 @@ namespace WeChatWASM
/// 获取开放数据域,关系链相关可以参看 https://developers.weixin.qq.com/minigame/dev/guide/open-ability/open-data.html
/// </summary>
/// <returns>开放数据域对象</returns>
public static WXOpenDataContext GetOpenDataContext()
public static WXOpenDataContext GetOpenDataContext(OpenDataContextOption option = null)
{
return new WXOpenDataContext();
return new WXOpenDataContext(option);
}
/// <summary>

View File

@ -146,7 +146,26 @@ public class WXTouchInputOverride : BaseInput
button.onClick.Invoke();
button.onClick.SetPersistentListenerState(0, UnityEventCallState.Off);
}
}
#if !UNITY_EDITOR
Text text = selectedObject.GetComponent<Text>();
if (text != null)
{
#if PLATFORM_WEIXINMINIGAME
WeixinMiniGameInput.mobileKeyboardSupport = true;
#elif PLATFORM_WEBGL
WebGLInput.mobileKeyboardSupport = true;
#endif
}
else
{
#if PLATFORM_WEIXINMINIGAME
WeixinMiniGameInput.mobileKeyboardSupport = false;
#elif PLATFORM_WEBGL
WebGLInput.mobileKeyboardSupport = false;
#endif
}
#endif
}
}

View File

@ -17,6 +17,7 @@ function compareVersion(v1, v2) {
.map(v => v.padStart(2, '0'))
.join(''));
}
export const isDebug = false;
export const isPc = platform === 'windows' || platform === 'mac';
export const isIOS = platform === 'ios';
export const isAndroid = platform === 'android';
@ -64,6 +65,8 @@ const isMobileBrotliInvalid = isMobile && !compareVersion(SDKVersion, '2.21.1');
const isBrotliInvalid = $COMPRESS_DATA_PACKAGE && (isPcBrotliInvalid || isMobileBrotliInvalid);
// iOS系统版本>=17.5时,小游戏退后台会导致异常
export const isIOS175 = compareVersion(systemVersion, '17.5') || isH5Renderer;
// 是否支持开放数据域渲染模式使用ScreenCanvas模式可以优化ToTempFilePath的使用
export const isSupportSharedCanvasMode = compareVersion(SDKVersion, '3.6.6');
// 是否能以iOS高性能模式运行
// 请勿修改GameGlobal.canUseH5Renderer赋值
GameGlobal.canUseH5Renderer = isH5Renderer && isH5LibVersionValid;

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8a1247b573dd310a1b2a64ba21756bdf
guid: 4a049c97f8ce49760bdaf0e7347599ee
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 79c953592cf5081e24ec64910469c256
guid: 38f6e6c9158ee933ee15063198812ae0
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 99e734d080d959d56ae6a52ab2f90b24
guid: f99dbfbea56287e71a1e6c4685b90fe0
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d07e957b862d3577394bb5f30c841b27
guid: 8358e08c832bd56fb0877b5d47a46890
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3d369640bad5dde9208f01b22ffa181b
guid: 2c66afb145a01df9406c563c4be5c0d7
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3495bc6c3989dcf8e88863081dc22452
guid: 6cf312966822e16c7f243d84dc4f0ad8
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 979f3d4d2e35c62b4b4f519b1e8eadf4
guid: 2631d9448ee0bde954aab98b3c2af15e
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 531ab265ffa88403ffc4ce4ab706bb11
guid: 028d32a6a6c9258a59578b2fe8d012ef
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 323d4d77d13e49d058d4e031060a89dd
guid: 4bf45810415c42a220b096637c7ae88a
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 953a2adfd422461e390eca30fc86730c
guid: 9af16e95a13df18c7db5996b59c5899c
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 731ce494d806fb3223bdd49c00f66608
guid: 84b54158603b91d96c564d60d993531a
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 35bc38a057afeea49631a8531525b9c9
guid: 79a9c132f1e51dc307d0bed93de8d8f6
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 06b0d68ee061f759cf54cc972ebb1a36
guid: 6b652776803b5a931569726cd638faf2
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 2078030a00a1994c7ce98919545d976c
guid: b0dd0b38aa137ee086221cea51f5f9b5
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b3f682ba70ebc841b606df12b001d010
guid: 1d17912d13b11b223eea405057f09abf
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 126c6cabeaac54d0d1ddf8c3c844648c
guid: 948c1620ec7bfa9506b589892c7a9564
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 951b66720a211df06a2c37c7a4e6deb8
guid: 8008b94b08ccf486726513f6cc071212
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 46409f256e5c5a004e7723caa67e205e
guid: 68c04c2df844aeceed169c6ac2bdf31b
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 2749f6c15e441c6a6df17a597a310ded
guid: 3231dfb74c63dacb247220a3c0bc60d8
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 9973d534a5cb9e55f8a51042fb7c3d20
guid: 170b1786b72f1f2414aa64c5a188050f
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 4d58d6cad7803c6af5c1686144f09ac6
guid: 4654292fc2e8dc87aa67e3ef6630e966
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 4161f5d60279a2b7a19482423c66908c
guid: 12a08f8a287e41e211f9792546ad1ffb
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8c8d5f23952a30055cf46cdf40daf274
guid: a1cbb8662646db2059af788b750316d8
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f9eb78ff7a8937ac5dfb48245b04a8ba
guid: 621130f8fca7ed728852362021c17c0a
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6fff18b45179ff821e3781366c16adf4
guid: 9435ec87d202df5d460f485a0cfc8d55
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 131a5002fac1acf6b63596e65a931f2c
guid: 228a6e2603118b2ba2252cb5e4ce0338
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 23ff41e809be2278962c3d135476ee3c
guid: 79ad890a06f80d7cefca81452e8311c7
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 31cc91af1db2b99581a7387b77891439
guid: 6972af0c7964b11593355e3a3ce478a5
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6e9739e1de3ee18c4fb8a1317faaadcd
guid: f1ce4783ddd7bd2cd1ba82ddcd6c9834
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 66c3c6f4958b979c243d5533de996d68
guid: 52d9345bf57b3992be9c1574b2c4bd7b
DefaultImporter:
externalObjects: {}
userData:

View File

@ -173,7 +173,7 @@ bindGloblException();
// eslint-disable-next-line no-multi-assign
GameGlobal.onCrash = GameGlobal.unityNamespace.onCrash = function () {
GameGlobal.manager.showAbort();
const windowInfo = wx.getWindowInfo();
const windowInfo = wx.getWindowInfo ? wx.getWindowInfo() : wx.getSystemInfoSync();
wx.createFeedbackButton({
type: 'text',
text: '提交反馈',

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7f27d833ad935fa805512a84298eaea4
guid: bd13c111c376f8a744f770ededdc51f0
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 766bddd5446563ef8e2c47c71aa40451
guid: 12150e41995796a8cbdcd8a7a1cc3034
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0f6f1ac5d67c594fef68a767dad077e5
guid: c6c0e931fcbde1587c166486e3d5d543
DefaultImporter:
externalObjects: {}
userData:

View File

@ -35,7 +35,7 @@ export default {
return key;
},
WXCreateFixedBottomMiddleBannerAd(adUnitId, adIntervals, height) {
const info = wx.getWindowInfo();
const info = wx.getWindowInfo ? wx.getWindowInfo() : wx.getSystemInfoSync();
const ad = wx.createBannerAd({
adUnitId,
adIntervals,

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b0391791882adfe7474af8871ba1507a
guid: bde9d14caa2f4e4e799db3d489ec3823
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: dd320d849117093592f7fce740ac1bdc
guid: 3675d865b4472fe5c916f96f37bbe854
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ff9fe60d890673322bc7ed54360cbaae
guid: 4acc66ba28382ad1e05343bd343612cb
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 668714634739620987464e00472dd2c4
guid: fbc2bf70f73fb4a9a0689bc25d6b4e05
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: bec2f228c70bb650886701990e963ec6
guid: 10bbac12bc8daaedb127b8be1de4c7f1
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: c75e2388a71a8e562b9a053722e599c2
guid: cc7260bfed47020029e4bedce0eaceed
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7006a91caef44308276e578d482a49d2
guid: 0f17170cc6677a7ed2cae6e96e7b0c45
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0964f41cb20a736fdec3d1b5c5af48fa
guid: a0e3220f7b19c45c8e5970949f3397de
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8c8265f85df2fae934e43fddf225db35
guid: 67540c4a4b661e5ff067fe4f505b45d8
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 543747602ed8b955436592aeff496702
guid: 58c714b802c7f8db65383ddecbe56a54
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 289d11dd2b99cdc444315bb581071a7b
guid: 4d326103f95c0735c9eae2bee4ccb2a4
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ef38590f60857344e9ba9e8972d892a6
guid: cf24251adce7da74cea4a600b76d3739
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,28 +1,6 @@
import response from './response';
import moduleHelper from './module-helper';
import { formatJsonStr } from './utils';
function getDefaultData(canvas, conf) {
const config = formatJsonStr(conf);
if (typeof config.x === 'undefined') {
config.x = 0;
}
if (typeof config.y === 'undefined') {
config.y = 0;
}
if (typeof config.width === 'undefined' || config.width === 0) {
config.width = canvas.width;
}
if (typeof config.height === 'undefined' || config.height === 0) {
config.height = canvas.height;
}
if (typeof config.destWidth === 'undefined' || config.destWidth === 0) {
config.destWidth = canvas.width;
}
if (typeof config.destHeight === 'undefined' || config.destHeight === 0) {
config.destHeight = canvas.height;
}
return config;
}
import { getDefaultData } from './utils';
export default {
WXToTempFilePathSync(conf) {
return canvas.toTempFilePathSync(getDefaultData(canvas, conf));

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8928cde6f8dc7badb406c80e4f974c19
guid: ee82c9b48afc33ca2b49796835889f7b
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ecb588c5857c7e0de9a55e9493f32bfb
guid: 0a681468d92c9b11abfc8986d139c4f0
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 377258b0bae3f0a3dda9bf70b233dcaa
guid: 9c2225e298bb58404ac60821edb1ef12
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f93aa301cb7a969f8386e0292ebd3ccd
guid: 9716036914311528c53ae85c7d4b44ff
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f1af4e76799774c7b92c18a06e929cdd
guid: 604025eeb6b8774e0d48463b35e8cf4d
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 29e769883b5fcc934b821c25a9a22c1c
guid: f458ec2f5ede403a94f779c1c7196a0b
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e5ed04bc49703466b850b706e954f545
guid: 57b93d705208fa0f3687a2f08084ca7f
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 98b1b2b795fa0b5fb7bf6fad2a1ce599
guid: 6ebb6d02efbeaf66fec6db5483ce584c
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 836dee44cd3f3b9cc7cd34f7ffc36c8f
guid: 568384b812fcaaf993843232e87ef772
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d1a41b5f07ff17bdcc4fdd1a4b8315ea
guid: feeba1937664bd4556db41f3a6ff6192
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3b9b7e634c503e8c6b3ce0c396abca9c
guid: dd27cb2f329b26574571e394a0ac5c66
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: eb800297b61247d41bbf60b9902a2fc4
guid: 5ba2015c14cc53b607c69d54de628ecb
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ba00566c1ff471dc82d70c7b74709ac3
guid: eed058e04f2edefa70737ff37031aa12
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 029769ef7bf31119d222436f7c2e9e38
guid: d688d41b570e784c007b6ba9a606f4e2
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7240d703aa50908bac720346b7bcbef9
guid: 90840e4609a6df2daa87eb8d6321d47a
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 36a91578755ee2617a665209d70d9854
guid: dbb4e4453886952af2bdb386459de091
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: be04e6c960eb3e3e73b4768e5d718c6c
guid: 95f898ba659115078e4a708c9a19bc46
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 58ba27f52b783990fde257bc7aed85bf
guid: 86cb45e4700edb5f57e8ae33edfd8b3d
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8f5ddd9f5eea4d4f3db0fa5fc9844d6d
guid: 015ca9a709b5123c277a1d07c3bb1246
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,17 +1,47 @@
import response from './response';
import moduleHelper from './module-helper';
import { getDefaultData } from './utils';
import { isDebug, isSupportSharedCanvasMode } from '../check-version';
let cachedOpenDataContext;
let cachedSharedCanvas;
var SharedCanvasMode;
(function (SharedCanvasMode) {
SharedCanvasMode["ScreenCanvas"] = "screenCanvas";
SharedCanvasMode["OffScreenCanvas"] = "offscreenCanvas";
})(SharedCanvasMode || (SharedCanvasMode = {}));
let sharedCanvasMode;
let timerId;
let textureObject = null;
let textureId;
function getOpenDataContext() {
return cachedOpenDataContext || wx.getOpenDataContext();
function getOpenDataContext(mode) {
if (cachedOpenDataContext) {
return cachedOpenDataContext;
}
if (!isSupportSharedCanvasMode) {
sharedCanvasMode = SharedCanvasMode.OffScreenCanvas;
}
if (!sharedCanvasMode) {
if (typeof mode === 'string' && SharedCanvasMode[mode]) {
sharedCanvasMode = SharedCanvasMode[mode];
}
else {
sharedCanvasMode = SharedCanvasMode.OffScreenCanvas;
}
}
// @ts-ignore
cachedOpenDataContext = wx.getOpenDataContext({
sharedCanvasMode,
});
return cachedOpenDataContext;
}
function getSharedCanvas() {
return cachedSharedCanvas || getOpenDataContext().canvas;
}
let timerId;
let textureObject = null;
let textureId;
function hookUnityRender() {
if (!textureId) {
@ -70,10 +100,22 @@ function stopHookUnityRender() {
textureObject = null;
}
export default {
WXGetOpenDataContext(mode) {
if (isDebug) {
console.warn('WXGetOpenDataContext:', mode);
}
getOpenDataContext(mode);
},
WXDataContextPostMessage(msg) {
if (isDebug) {
console.warn('WXDataContextPostMessage:', msg);
}
getOpenDataContext().postMessage(msg);
},
WXShowOpenData(id, x, y, width, height) {
if (isDebug) {
console.warn('WXShowOpenData:', id, x, y, width, height);
}
if (width <= 0 || height <= 0) {
console.error('[unity-sdk]: WXShowOpenData要求 width 和 height 参数必须大于0');
}
@ -82,6 +124,12 @@ export default {
const sharedCanvas = openDataContext.canvas;
sharedCanvas.width = width;
sharedCanvas.height = height;
if (sharedCanvasMode === SharedCanvasMode.ScreenCanvas && sharedCanvas.style) {
sharedCanvas.style.left = `${x / window.devicePixelRatio}px`;
sharedCanvas.style.top = `${y / window.devicePixelRatio}px`;
sharedCanvas.style.width = `${width / window.devicePixelRatio}px`;
sharedCanvas.style.height = `${height / window.devicePixelRatio}px`;
}
openDataContext.postMessage({
type: 'WXRender',
x,
@ -90,13 +138,60 @@ export default {
height,
devicePixelRatio: window.devicePixelRatio,
});
textureId = id;
startHookUnityRender();
if (sharedCanvasMode === SharedCanvasMode.OffScreenCanvas) {
textureId = id;
startHookUnityRender();
}
},
WXHideOpenData() {
if (isDebug) {
console.warn('WXHideOpenData');
}
getOpenDataContext().postMessage({
type: 'WXDestroy',
});
stopHookUnityRender();
if (sharedCanvasMode === SharedCanvasMode.OffScreenCanvas) {
stopHookUnityRender();
}
else if (sharedCanvasMode === SharedCanvasMode.ScreenCanvas) {
const sharedCanvas = getSharedCanvas();
if (sharedCanvas.style) {
sharedCanvas.style.top = '9999px';
}
}
},
WXOpenDataToTempFilePathSync(conf) {
if (isDebug) {
console.warn('WXOpenDataToTempFilePathSync', conf);
}
const sharedCanvas = getSharedCanvas();
if (!sharedCanvas) {
return 'Please use WX.GetOpenDataContext() first';
}
return sharedCanvas.toTempFilePathSync(getDefaultData(sharedCanvas, conf));
},
WXOpenDataToTempFilePath(conf, s, f, c) {
if (isDebug) {
console.warn('WXOpenDataToTempFilePath', conf);
}
if (conf) {
const sharedCanvas = getSharedCanvas();
if (!sharedCanvas) {
console.error('Please use WX.GetOpenDataContext() first');
return;
}
sharedCanvas.toTempFilePath({
...getDefaultData(sharedCanvas, conf),
...response.handleText(s, f, c),
success: (res) => {
moduleHelper.send('ToTempFilePathCallback', JSON.stringify({
callbackId: s,
errMsg: res.errMsg,
errCode: res.errCode || 0,
tempFilePath: res.tempFilePath,
}));
},
});
}
},
};

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f79052ad77b04b833d44865832471fc4
guid: f956f22d1b65d3f435fa31b30da84038
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3232c9317c5d73372a9524f21f564ba2
guid: 0ac4531849845c2d2ade38f820e4270c
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6d5fa787e34212c77b6ee0cdcea51371
guid: 60fc94dbaee3be0837311613f7f0f8a1
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 439aa898bd68964ace7479e0a4bf5063
guid: 935f00df4ac5c2e27a2cd06dd9b1f9b4
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 12ab4a8611a027144f8414c0681a8358
guid: 75505a784ff14cdc7e9ef5a9a49ed3c9
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: eedcdccb46592975f6cc969ba8c92d59
guid: e0116773fd7638114f9b8b3a7ecd6db0
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 835ddc94e8a02c48fa220413f0d32985
guid: cb0bcde46104234a08defdeb8fc014e6
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ce94b115142efbd114758cff4dddf68d
guid: d358fc48d4057fb98667c935c22d9008
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3ea9157a0cbc01964fa6bc6d0937e56d
guid: 70ac1a40c00fdc65c2d25a7832325396
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 4deb544a60d9f161065ae0706b17cdbf
guid: 8bceec28d39794bec962594ac0ef1573
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 746d0e6a576ecdbf002f3e434aaa5a9c
guid: e07e9e18a43b7ce83fb2afb09aa741fd
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 5a59e2d18e6490f632b7ec0b06bae3a6
guid: f5d18b264ffdf51b80981c32bb1b9519
DefaultImporter:
externalObjects: {}
userData:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 86677fe9d310a342dae4a89ec0dd1a33
guid: 5019dd2d8040b7944bb970d3e0b5334a
DefaultImporter:
externalObjects: {}
userData:

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