Skip to content

Commit 24ec438

Browse files
committed
Merge branch 'v3.2-release' into v3.3-release
# Conflicts: # en/animation/use-animation-curve.md # en/audio-system/audiosource.md # en/concepts/scene/light/shadow.md # en/editor/publish/build-guide.md # en/editor/publish/build-options.md # en/editor/publish/build-panel.md # en/editor/publish/build-panel/builder-log.jpg # en/editor/publish/native-options.md # en/editor/publish/publish-web.md # en/editor/publish/setup-native-development.md # en/release-notes/upgrade-guide-v3.0.md # en/scripting/setup.md # zh/animation/use-animation-curve.md # zh/asset/model/glTF.md # zh/audio-system/audiosource.md # zh/editor/publish/build-guide.md # zh/release-notes/upgrade-guide-v3.0.md # zh/scripting/external-scripts.md # zh/scripting/setup.md
2 parents 7e6e466 + 7828c68 commit 24ec438

File tree

290 files changed

+2787
-1886
lines changed

Some content is hidden

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

290 files changed

+2787
-1886
lines changed

.github/workflows/mirror_gitee.yml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: 'GitHub Actions Mirror'
2+
3+
on: [create, push, delete]
4+
5+
jobs:
6+
mirror_to_gitee:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: 'Checkout'
10+
uses: actions/checkout@v1
11+
- name: 'Mirror to gitee'
12+
uses: pixta-dev/repository-mirroring-action@v1
13+
with:
14+
target_repo_url:
15+
[email protected]:creator-cocos/creator-docs.git
16+
ssh_private_key:
17+
${{ secrets.GITEE_KEY }}

en/2d-object/2d-render/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Components that have rendering capabilities in their own right are called 2D ren
2222
- [UIStaticBatch Component Reference](../../ui-system/components/editor/ui-static.md)
2323
- [TiledMap Component Reference](../../editor/components/tiledmap.md)
2424
- [TiledTile Component Reference](../../editor/components/tiledtile.md)
25-
- [Spine (Skeletal Animation) Skeleton Component Reference](../../editor/components/spine.md)
25+
- [Spine Skeletal Component Reference](../../editor/components/spine.md)
2626
- [DragonBones ArmatureDisplay Component Reference](../../editor/components/dragonbones.md)
2727
- [MotionStreak Component Reference](../../editor/components/motion-streak.md)
2828

en/CONTRIBUTING.md

+14-2
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,6 @@ Note that the property name in the editor should be written in the format displa
110110
Correct usage:
111111

112112
> Set the scale of the node through `this.node.scale`.
113-
>
114-
> `this.getComponent(cc.Sprite).spriteFrame` can dynamically change the image rendered by the node.
115113
116114
**File name and file path**, use backtick to indicate.
117115

@@ -295,3 +293,17 @@ Appropriate spaces can be reserved before and after for easy editing.
295293
- json -> JSON
296294
- js or JS -> JavaScript
297295
- ts or TS -> TypeScript
296+
297+
## Footnote
298+
299+
Example:
300+
301+
Text prior to footnote reference.\[^1]
302+
303+
\[^1]: Comment to include in footnote.
304+
305+
The effect is as follows:
306+
307+
Text prior to footnote reference.[^1]
308+
309+
[^1]: Comment to include in footnote.

en/SUMMARY.md

+13-9
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
- [Programming Language Support](scripting/language-support.md)
6464
- [Scripting Basics](scripting/script-basics.md)
6565
- [Script Creation](scripting/setup.md)
66+
- [Coding Environment Setup](scripting/coding-setup.md)
6667
- [Operating Environment](scripting/basic.md)
6768
- [Decorator](scripting/decorator.md)
6869
- [Property Attributes](scripting/reference/attributes.md)
@@ -99,17 +100,17 @@
99100
- [Debugging JavaScript on Native Platforms](editor/publish/debug-jsb.md)
100101
- [Publish to Mini Game Platforms](editor/publish/publish-mini-game.md)
101102
- [Publish to HUAWEI AppGallery Connect](editor/publish/publish-huawei-agc.md)
102-
- [Publish to Alipay Mini Games](editor/publish/publish-alipay-mini-game.md)
103-
- [Publish to ByteDance Mini Games](editor/publish/publish-bytedance-mini-game.md)
103+
- [Publish to Alipay Mini Game](editor/publish/publish-alipay-mini-game.md)
104+
- [Publish to ByteDance Mini Game](editor/publish/publish-bytedance-mini-game.md)
104105
- [Publish to Cocos Play](editor/publish/publish-cocos-play.md)
105-
- [Publish to Huawei Quick Games](editor/publish/publish-huawei-quick-game.md)
106-
- [Publish to OPPO Mini Games](editor/publish/publish-oppo-mini-game.md)
107-
- [Publish to vivo Mini Games](editor/publish/publish-vivo-mini-game.md)
108-
- [Publish to Xiaomi Quick Games](editor/publish/publish-xiaomi-quick-game.md)
109-
- [Publish to Baidu Mini Games](editor/publish/publish-baidu-mini-game.md)
110-
- [Publish to WeChat Mini Games](editor/publish/publish-wechatgame.md)
106+
- [Publish to Huawei Quick Game](editor/publish/publish-huawei-quick-game.md)
107+
- [Publish to OPPO Mini Game](editor/publish/publish-oppo-mini-game.md)
108+
- [Publish to vivo Mini Game](editor/publish/publish-vivo-mini-game.md)
109+
- [Publish to Xiaomi Quick Game](editor/publish/publish-xiaomi-quick-game.md)
110+
- [Publish to Baidu Mini Game](editor/publish/publish-baidu-mini-game.md)
111+
- [Publish to WeChat Mini Game](editor/publish/publish-wechatgame.md)
111112
- [WeChat Engine Plugin](editor/publish/wechatgame-plugin.md)
112-
- [Access to the WeChat PC Mini Games](editor/publish/publish-pc-wechatgame.md)
113+
- [Access to the WeChat PC Mini Game](editor/publish/publish-pc-wechatgame.md)
113114
- [Access to Open Data Context](editor/publish/build-open-data-context.md)
114115
- [Mini Game Subpackage](editor/publish/subpackage.md)
115116
- [Publish from the Command Line](editor/publish/publish-in-command-line.md)
@@ -177,6 +178,7 @@
177178
- [ScrollBar Component Reference](ui-system/components/editor/scrollbar.md)
178179
- [ProgressBar Component Reference](ui-system/components/editor/progress.md)
179180
- [LabelOutline Component Reference](ui-system/components/editor/label-outline.md)
181+
- [LabelShadow Component Reference](ui-system/components/editor/label-shadow.md)
180182
- [Toggle Component Reference](ui-system/components/editor/toggle.md)
181183
- [ToggleContainer Component Reference](ui-system/components/editor/toggleContainer.md)
182184
- [Slider Component Reference](ui-system/components/editor/slider.md)
@@ -214,6 +216,8 @@
214216

215217
- [Audio System](audio-system/overview.md)
216218
- [AudioSource Component Reference](audio-system/audiosource.md)
219+
- [AudioSource Playback Example](audio-system/audioExample.md)
220+
- [Compatibility Notes](audio-system/audioLimit.md)
217221

218222
- [Physics System](physics/index.md)
219223
- [Physics 2D](physics-2d/physics-2d.md)

0 commit comments

Comments
 (0)