Skip to content

Commit 2f5f1d4

Browse files
author
v_shanxia
committed
fix:合并主分支更改
1 parent f0b0dc7 commit 2f5f1d4

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

Demo/API_V2/Assets/API/Base/LifeCycle/LifeCycleSO.asset

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ MonoBehaviour:
1313
m_Name: LifeCycleSO
1414
m_EditorClassIdentifier:
1515
entryName: "\u751F\u547D\u5468\u671F"
16+
entryOrder: 2
17+
entryScriptTypeName: LifeCycle
1618
entryAPI: 'OnHide | OnShow
1719
1820
OffHide | OffShow'
@@ -27,4 +29,3 @@ MonoBehaviour:
2729
- isDisableInitially: 0
2830
initialTitleText:
2931
initialContentText:
30-
entryOrder: 2

Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: fb48e4613a53bb941a20036d7c08fefb, type: 3}
12+
m_Script: {fileID: 11500000, guid: 57c8415214254e23a63d9bfb8c6bbf62, type: 3}
1313
m_Name: InnerAudioSO
1414
m_EditorClassIdentifier:
15+
entryName: "\u97F3\u9891"
16+
entryOrder: 0
1517
entryScriptTypeName: InnerAudio
16-
entryName: "\u97F3\u9891\u793A\u4F8B"
17-
entryAPI:
18+
entryAPI: WX.CreateInnerAudioContext
1819
entryDescription:
1920
optionList: []
20-
initialButtonText: "\u64AD\u653E\u97F3\u9891"
21+
initialButtonText: "\u64AD\u653E"
2122
extraButtonList:
2223
- buttonText: "\u6682\u505C"
2324
- buttonText: "\u505C\u6B62"
2425
- buttonText: "\u8DF3\u8F6C"
2526
initialResultList: []
26-
entryOrder: 0

Demo/API_V2/Assets/API/Media/InnerAudio/InnerAudioSO.asset.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.

Demo/API_V2/Assets/API/Media/MediaSO.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ MonoBehaviour:
1717
categorySprite: {fileID: 21300000, guid: 10009e080ceca4d88b96fcdff0749dfc, type: 3}
1818
entryList:
1919
- {fileID: 11400000, guid: 1d998af43281d4eee9e1effc8f83bddd, type: 2}
20-
- {fileID: 11400000, guid: fc3a7d7719412264b914d0ae6e094405, type: 2}
20+
- {fileID: 11400000, guid: 0a7c9b9ec3936214887602ce8fa8ab53, type: 2}
2121
- {fileID: 11400000, guid: 1055cfc5cdda7407298fa2ff9997d0c6, type: 2}
2222
- {fileID: 11400000, guid: 480646e3cd4d6a948a7538d483c1b043, type: 2}
2323
- {fileID: 11400000, guid: ad04526c3748b4e2b8498f998dfea973, type: 2}

0 commit comments

Comments
 (0)