Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4.4.0 electronplusrn #3739

Merged
merged 5 commits into from
Aug 15, 2024
Merged

4.4.0 electronplusrn #3739

merged 5 commits into from
Aug 15, 2024

Conversation

Cilla-luodan
Copy link
Collaborator

No description provided.

<codeblock props="unity cs" outputclass="language-csharp">public virtual void OnExtensionEventWithContext(ExtensionContext context, string key, string value){ }</codeblock>
<codeblock props="rn" outputclass="language-typescript"> onExtensionStarted?(provider: string, extension: string): void;</codeblock>
<codeblock props="electron" outputclass="language-typescript">onExtensionStartedWithContext?(context: ExtensionContext): void;</codeblock>
<codeblock props="unity cs" outputclass="language-csharp">public virtual void OnExtensionEventWithContext(ExtensionContext context, string key, string value){ }</codeblock>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里多加了一个 unity 的原型

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

不该在分支间横跳,然后引入冲突解决的时候引入了冗余的 😭

@@ -717,7 +717,7 @@ class VideoFrame {
<pt>textureId</pt>
<pd>该参数仅适用于 Texture 格式的视频数据。Texture ID。</pd>
</plentry>
<plentry props="cpp" id="d3d">
<plentry props="cpp">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里的 props 应该也要加上 unreal bp unity electron flutter

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

electron 和 flutter没有这个成员,我把 unreal bp 加上先

@Cilla-luodan Cilla-luodan merged commit 105c1b2 into 4.4.0-framework Aug 15, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants