Skip to content

Commit 144b627

Browse files
committed
Merge pull request cocos2d#1562 from ShengxiangChen/issue2261_LoaderBug
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into ...
2 parents 4297e23 + f71a9d8 commit 144b627

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

HelloHTML5World/src/resource.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ var s_CloseSelected = "res/CloseSelected.png";
44

55
var g_resources = [
66
//image
7-
{src:s_HelloWorld},
8-
{src:s_CloseNormal},
9-
{src:s_CloseSelected}
7+
s_HelloWorld,
8+
s_CloseNormal,
9+
s_CloseSelected
1010

1111
//plist
1212

template/src/resource.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ var s_CloseSelected = "CloseSelected.png";
44

55
var g_resources = [
66
//image
7-
{src:s_HelloWorld},
8-
{src:s_CloseNormal},
9-
{src:s_CloseSelected}
7+
s_HelloWorld,
8+
s_CloseNormal,
9+
s_CloseSelected
1010

1111
//plist
1212

0 commit comments

Comments
 (0)