Skip to content

B
babycare_xiaoxiao
Commit 57ada2df authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

1

parents 8dea5a23 882d9054
Show whitespace changes
Inline Side-by-side
Showing with 489 additions and 8 deletions
resource/TaskPanel/任务背景.png
View replaced file @ 8dea5a23 View file @ 57ada2df
resource/TaskPanel/任务背景.png

184 KB | W: | H:

resource/TaskPanel/任务背景.png

198 KB | W: | H:

resource/TaskPanel/任务背景.png
resource/TaskPanel/任务背景.png
resource/TaskPanel/任务背景.png
resource/TaskPanel/任务背景.png
  • 2-up
  • Swipe
  • Onion skin
resource/res.json
View file @ 57ada2df
...@@ -5,6 +5,13 @@ ...@@ -5,6 +5,13 @@
"name": "BuyPowerPanel" "name": "BuyPowerPanel"
}, },
{ {
<<<<<<< HEAD
=======
"keys": "boomBtn.png,comCloseBtn.png,comm_light.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common"
},
{
>>>>>>> 882d90540f4da80e7c4999e6c1032fe61b3a3a8a
"keys": "积分不足背景.png,赚取积分.png", "keys": "积分不足背景.png,赚取积分.png",
"name": "CreditsOutPanel" "name": "CreditsOutPanel"
}, },
......
src/ResJson.ts
View file @ 57ada2df
...@@ -2,7 +2,371 @@ export const ResJson = { ...@@ -2,7 +2,371 @@ export const ResJson = {
"groups": [ "groups": [
{ {
"keys": "增加体力背景.png,无字按钮底.png", "keys": "增加体力背景.png,无字按钮底.png",
<<<<<<< HEAD
"name": "BuyPowerPanel" "name": "BuyPowerPanel"
=======
"name": "BuyPowerPanel",
"atlas": {
"增加体力背景.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 477,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 477,
"ro": true
},
"无字按钮底.png": {
"x": 2,
"y": 644,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": false
}
}
},
{
"keys": "boomBtn.png,comCloseBtn.png,comm_light.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common",
"atlas": {
"boomBtn.png": {
"x": 108,
"y": 874,
"w": 101,
"h": 109,
"ox": 0,
"oy": 0,
"sw": 101,
"sh": 109,
"ro": false
},
"comCloseBtn.png": {
"x": 347,
"y": 908,
"w": 48,
"h": 48,
"ox": 0,
"oy": 0,
"sw": 48,
"sh": 48,
"ro": false
},
"comm_light.png": {
"x": 464,
"y": 2,
"w": 439,
"h": 439,
"ox": 0,
"oy": 0,
"sw": 439,
"sh": 439,
"ro": false
},
"ele0.png": {
"x": 188,
"y": 762,
"w": 80,
"h": 66,
"ox": 0,
"oy": 13,
"sw": 80,
"sh": 80,
"ro": true
},
"ele1.png": {
"x": 279,
"y": 922,
"w": 66,
"h": 72,
"ox": 7,
"oy": 8,
"sw": 80,
"sh": 80,
"ro": false
},
"ele10.png": {
"x": 256,
"y": 761,
"w": 76,
"h": 74,
"ox": 2,
"oy": 6,
"sw": 80,
"sh": 80,
"ro": true
},
"ele11.png": {
"x": 211,
"y": 844,
"w": 76,
"h": 74,
"ox": 2,
"oy": 6,
"sw": 80,
"sh": 80,
"ro": true
},
"ele12.png": {
"x": 211,
"y": 844,
"w": 76,
"h": 74,
"ox": 2,
"oy": 6,
"sw": 80,
"sh": 80,
"ro": true
},
"ele13.png": {
"x": 287,
"y": 839,
"w": 67,
"h": 67,
"ox": 0,
"oy": 0,
"sw": 67,
"sh": 67,
"ro": false
},
"ele14.png": {
"x": 332,
"y": 754,
"w": 61,
"h": 66,
"ox": 0,
"oy": 0,
"sw": 61,
"sh": 66,
"ro": false
},
"ele2.png": {
"x": 118,
"y": 762,
"w": 80,
"h": 68,
"ox": 0,
"oy": 10,
"sw": 80,
"sh": 80,
"ro": true
},
"ele3.png": {
"x": 280,
"y": 598,
"w": 72,
"h": 70,
"ox": 4,
"oy": 10,
"sw": 80,
"sh": 80,
"ro": true
},
"ele4.png": {
"x": 279,
"y": 678,
"w": 74,
"h": 64,
"ox": 6,
"oy": 14,
"sw": 80,
"sh": 80,
"ro": true
},
"ele5.png": {
"x": 118,
"y": 598,
"w": 80,
"h": 80,
"ox": 0,
"oy": 0,
"sw": 80,
"sh": 80,
"ro": false
},
"ele6.png": {
"x": 211,
"y": 922,
"w": 66,
"h": 72,
"ox": 7,
"oy": 5,
"sw": 80,
"sh": 80,
"ro": false
},
"ele7.png": {
"x": 278,
"y": 528,
"w": 72,
"h": 68,
"ox": 4,
"oy": 6,
"sw": 80,
"sh": 80,
"ro": false
},
"ele8.png": {
"x": 118,
"y": 680,
"w": 78,
"h": 80,
"ox": 1,
"oy": 0,
"sw": 80,
"sh": 80,
"ro": false
},
"ele9.png": {
"x": 200,
"y": 598,
"w": 78,
"h": 78,
"ox": 1,
"oy": 1,
"sw": 80,
"sh": 80,
"ro": false
},
"hammerBtn.png": {
"x": 2,
"y": 874,
"w": 104,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 104,
"sh": 114,
"ro": false
},
"stepBtn.png": {
"x": 905,
"y": 2,
"w": 124,
"h": 117,
"ox": 0,
"oy": 0,
"sw": 124,
"sh": 117,
"ro": true
},
"toastBg.png": {
"x": 2,
"y": 2,
"w": 460,
"h": 130,
"ox": 0,
"oy": 0,
"sw": 460,
"sh": 130,
"ro": false
},
"waitingBg.png": {
"x": 278,
"y": 366,
"w": 160,
"h": 180,
"ox": 0,
"oy": 0,
"sw": 160,
"sh": 180,
"ro": true
},
"waitingRot.png": {
"x": 345,
"y": 672,
"w": 56,
"h": 56,
"ox": 0,
"oy": 0,
"sw": 56,
"sh": 56,
"ro": false
},
"关闭按钮.png": {
"x": 198,
"y": 680,
"w": 79,
"h": 79,
"ox": 0,
"oy": 0,
"sw": 79,
"sh": 79,
"ro": false
},
"再想想.png": {
"x": 2,
"y": 598,
"w": 274,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 274,
"sh": 114,
"ro": true
},
"开始闯关不要能量.png": {
"x": 2,
"y": 250,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": false
},
"开始闯关要能量.png": {
"x": 2,
"y": 134,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": false
},
"确定.png": {
"x": 2,
"y": 482,
"w": 274,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 274,
"sh": 114,
"ro": false
},
"继续闯关大.png": {
"x": 905,
"y": 128,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": true
},
"继续闯关小.png": {
"x": 2,
"y": 366,
"w": 274,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 274,
"sh": 114,
"ro": false
}
}
>>>>>>> 882d90540f4da80e7c4999e6c1032fe61b3a3a8a
}, },
{ {
"keys": "积分不足背景.png,赚取积分.png", "keys": "积分不足背景.png,赚取积分.png",
...@@ -97,8 +461,114 @@ export const ResJson = { ...@@ -97,8 +461,114 @@ export const ResJson = {
"name": "map" "name": "map"
}, },
{ {
<<<<<<< HEAD
"keys": "prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png", "keys": "prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png",
"name": "mapCheckPrizeEffect" "name": "mapCheckPrizeEffect"
=======
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,开奖按钮120.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
"name": "SuccessPanel",
"atlas": {
"star_dis.png": {
"x": 835,
"y": 957,
"w": 150,
"h": 144,
"ox": 0,
"oy": 0,
"sw": 150,
"sh": 144,
"ro": false
},
"star_en.png": {
"x": 835,
"y": 644,
"w": 164,
"h": 157,
"ox": 0,
"oy": 0,
"sw": 164,
"sh": 157,
"ro": false
},
"去抽奖.png": {
"x": 2,
"y": 1402,
"w": 274,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 274,
"sh": 114,
"ro": false
},
"圆角矩形 648.png": {
"x": 2,
"y": 1529,
"w": 502,
"h": 196,
"ox": 0,
"oy": 2,
"sw": 504,
"sh": 200,
"ro": true
},
"开奖按钮120.png": {
"x": 835,
"y": 1103,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": true
},
"道具圆圈.png": {
"x": 835,
"y": 803,
"w": 152,
"h": 152,
"ox": 0,
"oy": 0,
"sw": 152,
"sh": 152,
"ro": false
},
"闯关成功.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 971,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 971,
"ro": true
},
"闯关成功Bg.png": {
"x": 2,
"y": 644,
"w": 640,
"h": 831,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 831,
"ro": true
},
"闯关成功不满星按钮.png": {
"x": 2,
"y": 1286,
"w": 274,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 274,
"sh": 114,
"ro": false
}
}
>>>>>>> 882d90540f4da80e7c4999e6c1032fe61b3a3a8a
}, },
{ {
"keys": "map_crab_0.png,map_crab_1.png,map_crab_10.png,map_crab_11.png,map_crab_12.png,map_crab_13.png,map_crab_14.png,map_crab_15.png,map_crab_16.png,map_crab_17.png,map_crab_18.png,map_crab_19.png,map_crab_2.png,map_crab_20.png,map_crab_21.png,map_crab_22.png,map_crab_23.png,map_crab_24.png,map_crab_25.png,map_crab_26.png,map_crab_27.png,map_crab_28.png,map_crab_29.png,map_crab_3.png,map_crab_30.png,map_crab_4.png,map_crab_5.png,map_crab_6.png,map_crab_7.png,map_crab_8.png,map_crab_9.png", "keys": "map_crab_0.png,map_crab_1.png,map_crab_10.png,map_crab_11.png,map_crab_12.png,map_crab_13.png,map_crab_14.png,map_crab_15.png,map_crab_16.png,map_crab_17.png,map_crab_18.png,map_crab_19.png,map_crab_2.png,map_crab_20.png,map_crab_21.png,map_crab_22.png,map_crab_23.png,map_crab_24.png,map_crab_25.png,map_crab_26.png,map_crab_27.png,map_crab_28.png,map_crab_29.png,map_crab_3.png,map_crab_30.png,map_crab_4.png,map_crab_5.png,map_crab_6.png,map_crab_7.png,map_crab_8.png,map_crab_9.png",
...@@ -121,5 +591,9 @@ export const ResJson = { ...@@ -121,5 +591,9 @@ export const ResJson = {
"name": "starLight" "name": "starLight"
} }
], ],
<<<<<<< HEAD
"path": "./resource/" "path": "./resource/"
=======
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1596423352/resource/"
>>>>>>> 882d90540f4da80e7c4999e6c1032fe61b3a3a8a
} }
\ No newline at end of file
src/scene/PlayScene.ts
View file @ 57ada2df
...@@ -2888,7 +2888,7 @@ export class PlayScene extends Scene { ...@@ -2888,7 +2888,7 @@ export class PlayScene extends Scene {
// } // }
// return currentTarget // return currentTarget
// } // }
let isOn: boolean = true;
class SettingBtn extends FYGE.Container { class SettingBtn extends FYGE.Container {
constructor() { constructor() {
super() super()
...@@ -2898,24 +2898,24 @@ class SettingBtn extends FYGE.Container { ...@@ -2898,24 +2898,24 @@ class SettingBtn extends FYGE.Container {
bg.visible = false; bg.visible = false;
//音乐 //音乐
var musicBtn = this.addChild(new class extends FYGE.Sprite { var musicBtn = this.addChild(new class extends FYGE.Sprite {
private isOn: boolean; // private isOn: boolean;
constructor() { constructor() {
var t = RES.getRes("musicOn.png") var t = RES.getRes("musicOn.png")
super(t) super(t)
this.addEventListener(FYGE.MouseEvent.CLICK, () => { this.addEventListener(FYGE.MouseEvent.CLICK, () => {
this.isOn = !this.isOn; isOn = !isOn;
this.texture = RES.getRes(this.isOn ? "musicOn.png" : "musicOff.png"); this.texture = RES.getRes(isOn ? "musicOn.png" : "musicOff.png");
//播放或暂停音乐接口 //播放或暂停音乐接口
sendTbNet(TbNetName.openMusic, { isOn: this.isOn }) sendTbNet(TbNetName.openMusic, { isOn: isOn })
}, this); }, this);
//默认开启 //默认开启
this.isOn = true; // this.isOn = true;
sendTbNet(TbNetName.openMusic, { isOn: this.isOn }) if (isOn) sendTbNet(TbNetName.openMusic, { isOn: true })
//添加onSHow事件 //添加onSHow事件
GDispatcher.addEventListener(G_EVENT.ON_SHOW, this.onShow, this) GDispatcher.addEventListener(G_EVENT.ON_SHOW, this.onShow, this)
} }
onShow() { onShow() {
if (this.isOn) sendTbNet(TbNetName.openMusic, { isOn: true }) if (isOn) sendTbNet(TbNetName.openMusic, { isOn: true })
} }
destroy() { destroy() {
GDispatcher.removeEventListener(G_EVENT.ON_SHOW, this.onShow, this) GDispatcher.removeEventListener(G_EVENT.ON_SHOW, this.onShow, this)
......
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