Skip to content

Commit 2ebcb03

Browse files
kisence-miankisence-mian
committed
更新
1 parent bedd0ed commit 2ebcb03

Some content is hidden

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

68 files changed

+924
-97
lines changed

‎Assets/Resources/ResourcesManifest.txt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,16 @@ langdata_chinesesimplified data/language/langdata_chinesesimplified
1616
guidedata data/guidedata
1717
item data/item
1818
testdata data/testdata
19+
gameobject 1 prefab/gameobject 1
20+
gameobject 2 prefab/gameobject 2
1921
gameobject prefab/gameobject
2022
gogo prefab/gogo
23+
uitest 1 prefab/uitest 1
24+
uitest 2 prefab/uitest 2
25+
uitest 3 prefab/uitest 3
26+
uitest 4 prefab/uitest 4
27+
uitest 5 prefab/uitest 5
28+
uitest 6 prefab/uitest 6
2129
uitest prefab/uitest
2230
dl_01 sprite/dl_01
2331
dl_01.png sprite/dl_01.png
@@ -49,5 +57,11 @@ image_item ui/testwindow/image_item
4957
testwindow ui/testwindow/testwindow
5058
uimanager ui/uimanager
5159
gameobject_adasd gameobject_adasd
60+
new material 2 new material 2
61+
new material 3 new material 3
62+
new material 4 new material 4
63+
new material 5 new material 5
64+
new material 6 new material 6
65+
new material new material
5266
resourcesmanifest resourcesmanifest
5367
version version

‎Assets/Resources/UI/TestWindowWindow.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.

‎Assets/Resources/UI/TestWindowWindow/TestWindowWindow.prefab‎

7.92 KB
Binary file not shown.

‎Assets/Resources/UI/TestWindowWindow/TestWindowWindow.prefab.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.

‎Assets/Script/Core/Lua/LuaManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ static void Update()
120120

121121
public static void DoLuaFile(string fileName)
122122
{
123-
string content = ResourceManager.ReadTextFile(fileName);
123+
string content = ResourceManager.LoadText(fileName);
124124
s_state.DoString(content, fileName);
125125
}
126126
#endif

‎Assets/Script/Core/Lua/ToLua/Plugins.meta‎

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

‎Assets/Script/Core/Lua/ToLua/Plugins/Android.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.

‎Assets/Script/Core/Lua/ToLua/Plugins/Android/libs.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.

‎Assets/Script/Core/Lua/ToLua/Plugins/Android/libs/armeabi-v7a.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.

‎Assets/Script/Core/Lua/ToLua/Plugins/Android/libs/x86.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.

0 commit comments

Comments
 (0)