Commit a1ce5794 authored by Tt's avatar Tt

修改了bug

parent 2919e0fd
...@@ -75,8 +75,9 @@ export default class LayerRecord extends cc.Component { ...@@ -75,8 +75,9 @@ export default class LayerRecord extends cc.Component {
percent = Math.max(percent, 0) percent = Math.max(percent, 0)
let record_time = pg.view.find(this.layout_record, 'record_time'); let record_time = pg.view.find(this.layout_record, 'record_time');
record_time.getComponent(cc.Sprite).fillRange = percent; record_time.getComponent(cc.Sprite).fillRange = percent;
if (percent == 0) { if (percent <= 0) {
this.showTimeEnd(); this.showTimeEnd();
this.onTouchRecordEnd();
} }
} }
showTimeEnd() { showTimeEnd() {
......
...@@ -3812,7 +3812,7 @@ ...@@ -3812,7 +3812,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 150.74, "width": 152.6,
"height": 63 "height": 63
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -3898,7 +3898,7 @@ ...@@ -3898,7 +3898,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
208.95399999999995, 210.81399999999996,
0, 0,
0, 0,
0, 0,
...@@ -6204,8 +6204,8 @@ ...@@ -6204,8 +6204,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 518.8058428187197,
"height": 0 "height": 235.71230824585237
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -6256,11 +6256,11 @@ ...@@ -6256,11 +6256,11 @@
], ],
"_armatureName": "Armature", "_armatureName": "Armature",
"_animationName": "two", "_animationName": "two",
"_preCacheMode": -1, "_preCacheMode": 0,
"_cacheMode": 0, "_cacheMode": 0,
"playTimes": -1, "playTimes": -1,
"premultipliedAlpha": false, "premultipliedAlpha": false,
"_armatureKey": "", "_armatureKey": "f011f737-1f65-490f-b1ca-1a960c98d8f9#bcb9481d-5c54-4e50-85ad-777961ce63b2",
"_accTime": 0, "_accTime": 0,
"_playCount": 0, "_playCount": 0,
"_frameCache": null, "_frameCache": null,
...@@ -6270,7 +6270,9 @@ ...@@ -6270,7 +6270,9 @@
"_N$dragonAsset": { "_N$dragonAsset": {
"__uuid__": "f011f737-1f65-490f-b1ca-1a960c98d8f9" "__uuid__": "f011f737-1f65-490f-b1ca-1a960c98d8f9"
}, },
"_N$dragonAtlasAsset": null, "_N$dragonAtlasAsset": {
"__uuid__": "bcb9481d-5c54-4e50-85ad-777961ce63b2"
},
"_N$_defaultArmatureIndex": 0, "_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1, "_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0, "_N$_defaultCacheMode": 0,
......
...@@ -7,14 +7,14 @@ export const defaultData = ...@@ -7,14 +7,14 @@ export const defaultData =
"questions": [ "questions": [
{ {
"questionAudio": "", "questionAudio": "",
"duration": 120, "duration": 5,
"options": [ "options": [
{ {
"type": "img_txt_audio", "type": "img_txt_audio",
"image": "http://staging-teach.cdn.ireadabc.com/e921b21c9ac22a623497b79cf849a421.png", "image": "http://staging-teach.cdn.ireadabc.com/e921b21c9ac22a623497b79cf849a421.png",
"audio": "http://staging-teach.cdn.ireadabc.com/172fad3743476ac9c668eb8a82d5eca1_l.mp3", "audio": "http://staging-teach.cdn.ireadabc.com/172fad3743476ac9c668eb8a82d5eca1_l.mp3",
"text": "bad", "text": "bad",
"duration": "", "duration": "5",
"content": "", "content": "",
"right": false, "right": false,
"audioName": "bad.mp3" "audioName": "bad.mp3"
...@@ -24,7 +24,7 @@ export const defaultData = ...@@ -24,7 +24,7 @@ export const defaultData =
"image": "http://staging-teach.cdn.ireadabc.com/a56eecb3dd57ef0aca8c52c721717ed5.png", "image": "http://staging-teach.cdn.ireadabc.com/a56eecb3dd57ef0aca8c52c721717ed5.png",
"audio": "http://staging-teach.cdn.ireadabc.com/81c8ea51c42136db0fd61e78c38de7c9_l.mp3", "audio": "http://staging-teach.cdn.ireadabc.com/81c8ea51c42136db0fd61e78c38de7c9_l.mp3",
"text": "Beijing Opera", "text": "Beijing Opera",
"duration": "", "duration": "5",
"content": "", "content": "",
"right": false, "right": false,
"audioName": "Beijing Opera.mp3" "audioName": "Beijing Opera.mp3"
......
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