Commit 81bc4a39 authored by Tt's avatar Tt
parents e23f17d9 f4a57bb1
...@@ -1571,8 +1571,13 @@ ...@@ -1571,8 +1571,13 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
<<<<<<< HEAD
"width": 1250, "width": 1250,
"height": 120 "height": 120
=======
"width": 1135,
"height": 60
>>>>>>> f4a57bb1edc0e71981d1120bedee80497f755da2
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1637,8 +1642,13 @@ ...@@ -1637,8 +1642,13 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
<<<<<<< HEAD
"width": 1150, "width": 1150,
"height": 126 "height": 126
=======
"width": 1035,
"height": 75.6
>>>>>>> f4a57bb1edc0e71981d1120bedee80497f755da2
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1818,8 +1828,13 @@ ...@@ -1818,8 +1828,13 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "题目:请参照图片移动下方按钮,组成完整的一句话", "_string": "题目:请参照图片移动下方按钮,组成完整的一句话",
"_N$string": "题目:请参照图片移动下方按钮,组成完整的一句话", "_N$string": "题目:请参照图片移动下方按钮,组成完整的一句话",
<<<<<<< HEAD
"_fontSize": 50, "_fontSize": 50,
"_lineHeight": 100, "_lineHeight": 100,
=======
"_fontSize": 45,
"_lineHeight": 60,
>>>>>>> f4a57bb1edc0e71981d1120bedee80497f755da2
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "da919d2c-e1fd-4dfa-889b-82c53f3adb51" "__uuid__": "da919d2c-e1fd-4dfa-889b-82c53f3adb51"
...@@ -1846,8 +1861,13 @@ ...@@ -1846,8 +1861,13 @@
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
<<<<<<< HEAD
"width": 1250, "width": 1250,
"height": 120 "height": 120
=======
"width": 1135,
"height": 60
>>>>>>> f4a57bb1edc0e71981d1120bedee80497f755da2
}, },
"_resize": 1, "_resize": 1,
"_N$layoutType": 1, "_N$layoutType": 1,
......
...@@ -565,7 +565,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -565,7 +565,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.currentDt = data; this.currentDt = data;
this.touchForbid = true; this.touchForbid = true;
this.playLocalAudio("move") this.playLocalAudio("move")
cc.tween(this.gou_node) cc.tween(this.gou_node)
// 移动钩子 // 移动钩子
...@@ -672,6 +672,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -672,6 +672,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
} }
onTouchRecordClose() { onTouchRecordClose() {
this.playBgmP100();
this.layout_record.active = false; this.layout_record.active = false;
this.currentItem && (this.currentItem.active = true) this.currentItem && (this.currentItem.active = true)
} }
...@@ -924,6 +925,8 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -924,6 +925,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
@property(cc.Node) @property(cc.Node)
bgmNode: cc.Node = null; bgmNode: cc.Node = null;
playBgmP10() { playBgmP10() {
let vol = cc.audioEngine.getMusicVolume();
if (vol < 0.7) return;
this.scheduleOnce(() => { this.scheduleOnce(() => {
cc.audioEngine.setMusicVolume(0.8); cc.audioEngine.setMusicVolume(0.8);
this.scheduleOnce(() => { this.scheduleOnce(() => {
...@@ -949,6 +952,8 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -949,6 +952,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
cc.audioEngine.playMusic(this.bgmNode.getComponent(cc.AudioSource).clip, true); cc.audioEngine.playMusic(this.bgmNode.getComponent(cc.AudioSource).clip, true);
} }
playBgmP100() { playBgmP100() {
let vol = cc.audioEngine.getMusicVolume();
if (vol > 0.9) return;
this.scheduleOnce(() => { this.scheduleOnce(() => {
cc.audioEngine.setMusicVolume(0.2); cc.audioEngine.setMusicVolume(0.2);
this.scheduleOnce(() => { this.scheduleOnce(() => {
......
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