Skip to content

Commit 886b107

Browse files
committed
Merge branch 'main' into feat/CloudDemo
2 parents ef4f1f6 + cf66a55 commit 886b107

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+18583
-17094
lines changed

.config/.vitepress/config.mts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ export default defineConfig({
3535
{ text: "简介", link: "/README" },
3636
{ text: "安装与使用", link: "/Design/SDKInstaller" },
3737
{ text: "入门指南", link: "/Design/Guide" },
38+
{ text: "快速开始", link: "/Design/Transform" },
3839
{ text: "优秀案例", link: "/Design/ShowCase" },
3940
{ text: "更新日志", link: "/CHANGELOG.md" },
4041
],
@@ -133,6 +134,7 @@ export default defineConfig({
133134
text: "能力适配",
134135
items: [
135136
{ text: "WX SDK 平台能力适配", link: "/Design/WX_SDK" },
137+
{ text: "音频视频适配", link: "/Design/AudioAndVideo" },
136138
{ text: "屏幕适配", link: "/Design/fixScreen" },
137139
{ text: "输入法适配", link: "/Design/InputAdaptation" },
138140
{ text: "排行榜与微信关系数据", link: "/Design/OpenData" },

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@ SDK安装指引:[微信小游戏Unity、团结引擎转换插件WXSDK](Design/
1111
1. UnityPackage:[下载地址](https://game.weixin.qq.com/cgi-bin/gamewxagwasmsplitwap/getunityplugininfo?download=1)
1212
2. PackageManager(git URL): https://github.com/wechat-miniprogram/minigame-tuanjie-transform-sdk.git
1313

14+
## 2024-8-28 【预发布】
15+
PackageManager(git URL): https://github.com/wechat-miniprogram/minigame-tuanjie-transform-sdk.git#pre-v0.1.19
16+
### Feature
17+
* 普通: UDPSocket.write适配
18+
* 普通: 部分JS API接口更新
19+
* 普通: 云开发/云托管支持
20+
### Fixed
21+
* 普通: 修复.net8 OnApplicationFocus/Pause适配
22+
* 普通: 修复插件自动调节dpr后,获取不到实际dpr
23+
1424
## 2024-8-13 【重要更新】
1525
### Feature
1626
* 普通: 横竖屏切换,PC窗口大小自动适配

Demo/API_V2/Assets/API/APISO.asset

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@ MonoBehaviour:
3737
- {fileID: 11400000, guid: 1aa518b2f8ca04c6e81821bcb9a3cc49, type: 2}
3838
- {fileID: 11400000, guid: 89339dab17a614cbf8abc8469d67cb72, type: 2}
3939
- {fileID: 11400000, guid: 27654a238f98e4f7e8756e4caed418e1, type: 2}
40+
- {fileID: 11400000, guid: ebd496025e81f434bb6b5b487cfbf2ed, type: 2}
Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
using UnityEngine;
2+
using WeChatWASM;
3+
using UnityEngine.UI;
4+
using UnityEngine.EventSystems;
5+
6+
// 添加 InputField 组件的依赖
7+
[RequireComponent(typeof(InputField))]
8+
public class WXInputFieldAdapter : MonoBehaviour, IPointerClickHandler, IPointerExitHandler
9+
{
10+
private InputField _inputField;
11+
private bool _isShowKeyboard = false;
12+
13+
private void Start()
14+
{
15+
_inputField = GetComponent<InputField>();
16+
}
17+
18+
public void OnPointerClick(PointerEventData eventData)
19+
{
20+
Debug.Log("OnPointerClick");
21+
ShowKeyboard();
22+
}
23+
24+
public void OnPointerExit(PointerEventData eventData)
25+
{
26+
Debug.Log("OnPointerExit");
27+
if (!_inputField.isFocused)
28+
{
29+
HideKeyboard();
30+
}
31+
}
32+
33+
private void OnInput(OnKeyboardInputListenerResult v)
34+
{
35+
Debug.Log("onInput");
36+
Debug.Log(v.value);
37+
if (_inputField.isFocused)
38+
{
39+
_inputField.text = v.value;
40+
}
41+
}
42+
43+
private void OnConfirm(OnKeyboardInputListenerResult v)
44+
{
45+
// 输入法confirm回调
46+
Debug.Log("onConfirm");
47+
Debug.Log(v.value);
48+
HideKeyboard();
49+
}
50+
51+
private void OnComplete(OnKeyboardInputListenerResult v)
52+
{
53+
// 输入法complete回调
54+
Debug.Log("OnComplete");
55+
Debug.Log(v.value);
56+
HideKeyboard();
57+
}
58+
59+
private void ShowKeyboard()
60+
{
61+
if (_isShowKeyboard) return;
62+
63+
WX.ShowKeyboard(new ShowKeyboardOption()
64+
{
65+
defaultValue = "xxx",
66+
maxLength = 20,
67+
confirmType = "go"
68+
});
69+
70+
//绑定回调
71+
WX.OnKeyboardConfirm(this.OnConfirm);
72+
WX.OnKeyboardComplete(this.OnComplete);
73+
WX.OnKeyboardInput(this.OnInput);
74+
_isShowKeyboard = true;
75+
}
76+
77+
private void HideKeyboard()
78+
{
79+
if (!_isShowKeyboard) return;
80+
81+
WX.HideKeyboard(new HideKeyboardOption());
82+
//删除掉相关事件监听
83+
WX.OffKeyboardInput(this.OnInput);
84+
WX.OffKeyboardConfirm(this.OnConfirm);
85+
WX.OffKeyboardComplete(this.OnComplete);
86+
_isShowKeyboard = false;
87+
}
88+
}

Demo/API_V2/Assets/API/InputField/WXInputFieldAdapter.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
using System.Globalization;
2+
using UnityEngine;
3+
4+
public class FrameRate : Details
5+
{
6+
private float _lastUpdateShowTime = 0f; // 上一次更新帧率的时间
7+
8+
private readonly float _updateTime = 0.05f; // 更新显示帧率的时间间隔
9+
10+
private int _frames = 0; // 帧数
11+
12+
private float _fps = 0; // 帧率
13+
14+
private void Start()
15+
{
16+
GameManager.Instance.detailsController.BindExtraButtonAction(0, this.SetFPS60);
17+
}
18+
19+
private void Update()
20+
{
21+
_frames++;
22+
if (Time.realtimeSinceStartup - _lastUpdateShowTime >= _updateTime)
23+
{
24+
_fps = _frames / (Time.realtimeSinceStartup - _lastUpdateShowTime);
25+
_frames = 0;
26+
_lastUpdateShowTime = Time.realtimeSinceStartup;
27+
}
28+
29+
GameManager.Instance.detailsController.ChangeResultContent(0, _fps.ToString(CultureInfo.CurrentCulture));
30+
}
31+
32+
protected override void TestAPI(string[] args)
33+
{
34+
SetFPS30();
35+
}
36+
37+
private void SetFPS30()
38+
{
39+
Application.targetFrameRate = 30;
40+
}
41+
42+
private void SetFPS60()
43+
{
44+
Application.targetFrameRate = 60;
45+
}
46+
47+
private void Destroy()
48+
{
49+
SetFPS60();
50+
}
51+
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: fb48e4613a53bb941a20036d7c08fefb, type: 3}
13+
m_Name: FrameRateSO
14+
m_EditorClassIdentifier:
15+
entryScriptTypeName: FrameRate
16+
entryName: "\u5E27\u7387\u8BBE\u7F6E"
17+
entryAPI: Application.targetFrameRate
18+
entryDescription:
19+
optionList: []
20+
initialButtonText: "\u4FEE\u6539\u5E27\u7387\u4E3A30FPS"
21+
extraButtonList:
22+
- buttonText: "\u4FEE\u6539\u5E27\u7387\u4E3A60FPS"
23+
initialResultList:
24+
- isDisableInitially: 0
25+
initialTitleText: "\u5F53\u524D\u5E27\u7387\uFF1A"
26+
initialContentText:

Demo/API_V2/Assets/API/Render/Render/Render.cs

Lines changed: 0 additions & 35 deletions
This file was deleted.

Demo/API_V2/Assets/API/Render/RenderSO.asset

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ MonoBehaviour:
1616
categorySprite: {fileID: 21300000, guid: 9e35ae4b7c6f04df08ba76b6b663edc0, type: 3}
1717
entryList:
1818
- {fileID: 11400000, guid: 3742edf3f50854504ba8632134064e94, type: 2}
19+
- {fileID: 11400000, guid: c185ac653050d49608ea734a26e8dbaa, type: 2}

Demo/API_V2/Assets/API/Render/SetFont.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using UnityEngine;
2+
using WeChatWASM;
3+
4+
public class SetFont : Details
5+
{
6+
protected override void TestAPI(string[] args)
7+
{
8+
LoadFont();
9+
}
10+
11+
private void LoadFont()
12+
{
13+
var font = WX.LoadFont("TencentSans-W7.subset.ttf");
14+
Debug.Log(font);
15+
}
16+
}

Demo/API_V2/Assets/API/Render/SetFont/SetFont.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Demo/API_V2/Assets/API/Render/Render/RenderSO.asset renamed to Demo/API_V2/Assets/API/Render/SetFont/SetFontSO.asset

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@ MonoBehaviour:
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
1212
m_Script: {fileID: 11500000, guid: fb48e4613a53bb941a20036d7c08fefb, type: 3}
13-
m_Name: RenderSO
13+
m_Name: SetFontSO
1414
m_EditorClassIdentifier:
15-
entryScriptTypeName: Render
16-
entryName: "\u6E32\u67D3"
17-
entryAPI: "\u6E32\u67D3\u76F8\u5173api"
15+
entryScriptTypeName: SetFont
16+
entryName: "\u5B57\u4F53"
17+
entryAPI: WX.LoadFont
1818
entryDescription: "\u52A0\u8F7D\u81EA\u5B9A\u4E49\u6587\u5B57\u9700\u8981\u624B\u52A8\u5C06ttf\u5B57\u4F53\u6587\u4EF6\u653E\u5165\u5C0F\u6E38\u620F\u6587\u4EF6\u5939\u4E2D"
1919
optionList: []
20-
initialButtonText: "\u4FEE\u6539\u6E32\u67D3\u5E27\u7387"
21-
extraButtonList:
22-
- buttonText: "\u52A0\u8F7D\u81EA\u5B9A\u4E49\u5B57\u4F53\u6587\u4EF6"
20+
initialButtonText: "\u52A0\u8F7D\u81EA\u5B9A\u4E49\u5B57\u4F53\u6587\u4EF6"
21+
extraButtonList: []
2322
initialResultList: []

Demo/API_V2/Assets/API/Render/SetFont/SetFontSO.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Demo/API_V2/Assets/API/Render/Render/TencentSans-W7.subset.ttf.meta renamed to Demo/API_V2/Assets/API/Render/SetFont/TencentSans-W7.subset.ttf.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

Demo/API_V2/Assets/Fonts/TencentSans-W7.subset.ttf.meta

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)