Merge branch 'modifyTestResource' into jsWebviewTest
jianglong0156
|
|
@ -24,7 +24,7 @@
|
||||||
"to": "script"
|
"to": "script"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"from": "../../res",
|
"from": "../../resjs",
|
||||||
"to": "res/"
|
"to": "res/"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
"to": "script"
|
"to": "script"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"from": "../../res",
|
"from": "../../resjs",
|
||||||
"to": "res/"
|
"to": "res/"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
|
||||||
|
|
@ -122,7 +122,7 @@ xcopy "$(ProjectDir)..\..\src" "$(OutDir)\src\" /e /Y
|
||||||
xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(OutDir)\res\" /e /Y
|
xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(OutDir)\res\" /e /Y
|
||||||
copy "$(ProjectDir)..\..\main.js" "$(OutDir)"
|
copy "$(ProjectDir)..\..\main.js" "$(OutDir)"
|
||||||
copy "$(ProjectDir)..\..\project.json" "$(OutDir)"
|
copy "$(ProjectDir)..\..\project.json" "$(OutDir)"
|
||||||
xcopy "$(ProjectDir)..\..\res" "$(OutDir)\res\" /e /Y</Command>
|
xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\res\" /e /Y</Command>
|
||||||
</PreBuildEvent>
|
</PreBuildEvent>
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
<Message>Copy js and resource files.</Message>
|
<Message>Copy js and resource files.</Message>
|
||||||
|
|
@ -184,7 +184,7 @@ xcopy "$(ProjectDir)..\..\src" "$(OutDir)\src\" /e /Y
|
||||||
xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(OutDir)\res\" /e /Y
|
xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(OutDir)\res\" /e /Y
|
||||||
copy "$(ProjectDir)..\..\main.js" "$(OutDir)"
|
copy "$(ProjectDir)..\..\main.js" "$(OutDir)"
|
||||||
copy "$(ProjectDir)..\..\project.json" "$(OutDir)"
|
copy "$(ProjectDir)..\..\project.json" "$(OutDir)"
|
||||||
xcopy "$(ProjectDir)..\..\res" "$(OutDir)\res\" /e /Y</Command>
|
xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\res\" /e /Y</Command>
|
||||||
<Message>Copy js and resource files.</Message>
|
<Message>Copy js and resource files.</Message>
|
||||||
</PreBuildEvent>
|
</PreBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 7.6 KiB |
|
Before Width: | Height: | Size: 6.5 KiB After Width: | Height: | Size: 6.5 KiB |
|
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 7.6 KiB |
|
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 66 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 156 KiB After Width: | Height: | Size: 156 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 8.5 KiB |
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 56 KiB After Width: | Height: | Size: 56 KiB |
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 58 KiB |
|
Before Width: | Height: | Size: 722 B After Width: | Height: | Size: 722 B |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 6.7 KiB |
|
|
@ -4,7 +4,7 @@ var s_resprefix = "";
|
||||||
var ccbjs = "";
|
var ccbjs = "";
|
||||||
if (!cc.sys.isNative)
|
if (!cc.sys.isNative)
|
||||||
{
|
{
|
||||||
ccbjs = "../../js-tests/res/";
|
ccbjs = "../../js-tests/resjs/";
|
||||||
}
|
}
|
||||||
|
|
||||||
var s_pathGrossini = "Images/grossini.png";
|
var s_pathGrossini = "Images/grossini.png";
|
||||||
|
|
|
||||||