Commit a366f424 authored by WUYING\505623963_1041864935's avatar WUYING\505623963_1041864935

Merge branch 'master' of http://vcs.ireadabc.com/template/sn02_playAudio

# Conflicts:
#	assets/sn02_playAudio/dragonBones.meta
parents 7b16c50b 14b0313d
......@@ -1885,8 +1885,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 330,
"height": 390
"width": 305,
"height": 370
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1898,7 +1898,7 @@
"ctor": "Float64Array",
"array": [
64.283,
-67.988,
-60.063,
0,
0,
0,
......
......@@ -107,7 +107,7 @@ export const defaultData = {
"text": "Starter 1",
"desc": "Magic Trip Review",
"questionAudio": "",
"image": "http://staging-teach.cdn.ireadabc.com/2acdedb9d07a738e0655b9a8aafd286a.jpg",
"image": "http://staging-teach.cdn.ireadabc.com/682620e803db6ccc463901133d02e9da.png",
"contentMain": "",
"contentArr": []
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment