Commit 882d9054 authored by wjf's avatar wjf

l

parent e94f4a88
...@@ -2108,12 +2108,12 @@ exports.ResJson = { ...@@ -2108,12 +2108,12 @@ exports.ResJson = {
} }
}, },
{ {
"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,star.png,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png", "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", "name": "common",
"atlas": { "atlas": {
"boomBtn.png": { "boomBtn.png": {
"x": 920, "x": 108,
"y": 2, "y": 874,
"w": 101, "w": 101,
"h": 109, "h": 109,
"ox": 0, "ox": 0,
...@@ -2123,8 +2123,8 @@ exports.ResJson = { ...@@ -2123,8 +2123,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"comCloseBtn.png": { "comCloseBtn.png": {
"x": 762, "x": 347,
"y": 351, "y": 908,
"w": 48, "w": 48,
"h": 48, "h": 48,
"ox": 0, "ox": 0,
...@@ -2134,8 +2134,8 @@ exports.ResJson = { ...@@ -2134,8 +2134,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"comm_light.png": { "comm_light.png": {
"x": 2, "x": 464,
"y": 134, "y": 2,
"w": 439, "w": 439,
"h": 439, "h": 439,
"ox": 0, "ox": 0,
...@@ -2145,63 +2145,63 @@ exports.ResJson = { ...@@ -2145,63 +2145,63 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"ele0.png": { "ele0.png": {
"x": 599, "x": 188,
"y": 199, "y": 762,
"w": 80, "w": 80,
"h": 66, "h": 66,
"ox": 0, "ox": 0,
"oy": 13, "oy": 13,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"ele1.png": { "ele1.png": {
"x": 688, "x": 279,
"y": 305, "y": 922,
"w": 66, "w": 66,
"h": 72, "h": 72,
"ox": 7, "ox": 7,
"oy": 8, "oy": 8,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": true "ro": false
}, },
"ele10.png": { "ele10.png": {
"x": 521, "x": 256,
"y": 199, "y": 761,
"w": 76, "w": 76,
"h": 74, "h": 74,
"ox": 2, "ox": 2,
"oy": 6, "oy": 6,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"ele11.png": { "ele11.png": {
"x": 443, "x": 211,
"y": 199, "y": 844,
"w": 76, "w": 76,
"h": 74, "h": 74,
"ox": 2, "ox": 2,
"oy": 6, "oy": 6,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"ele12.png": { "ele12.png": {
"x": 443, "x": 211,
"y": 199, "y": 844,
"w": 76, "w": 76,
"h": 74, "h": 74,
"ox": 2, "ox": 2,
"oy": 6, "oy": 6,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"ele13.png": { "ele13.png": {
"x": 952, "x": 287,
"y": 343, "y": 839,
"w": 67, "w": 67,
"h": 67, "h": 67,
"ox": 0, "ox": 0,
...@@ -2211,8 +2211,8 @@ exports.ResJson = { ...@@ -2211,8 +2211,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"ele14.png": { "ele14.png": {
"x": 960, "x": 332,
"y": 275, "y": 754,
"w": 61, "w": 61,
"h": 66, "h": 66,
"ox": 0, "ox": 0,
...@@ -2222,41 +2222,41 @@ exports.ResJson = { ...@@ -2222,41 +2222,41 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"ele2.png": { "ele2.png": {
"x": 532, "x": 118,
"y": 953, "y": 762,
"w": 80, "w": 80,
"h": 68, "h": 68,
"ox": 0, "ox": 0,
"oy": 10, "oy": 10,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"ele3.png": { "ele3.png": {
"x": 804, "x": 280,
"y": 279, "y": 598,
"w": 72, "w": 72,
"h": 70, "h": 70,
"ox": 4, "ox": 4,
"oy": 10, "oy": 10,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"ele4.png": { "ele4.png": {
"x": 884, "x": 279,
"y": 275, "y": 678,
"w": 74, "w": 74,
"h": 64, "h": 64,
"ox": 6, "ox": 6,
"oy": 14, "oy": 14,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"ele5.png": { "ele5.png": {
"x": 920, "x": 118,
"y": 113, "y": 598,
"w": 80, "w": 80,
"h": 80, "h": 80,
"ox": 0, "ox": 0,
...@@ -2266,19 +2266,19 @@ exports.ResJson = { ...@@ -2266,19 +2266,19 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"ele6.png": { "ele6.png": {
"x": 878, "x": 211,
"y": 341, "y": 922,
"w": 66, "w": 66,
"h": 72, "h": 72,
"ox": 7, "ox": 7,
"oy": 5, "oy": 5,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": true "ro": false
}, },
"ele7.png": { "ele7.png": {
"x": 614, "x": 278,
"y": 953, "y": 528,
"w": 72, "w": 72,
"h": 68, "h": 68,
"ox": 4, "ox": 4,
...@@ -2288,19 +2288,19 @@ exports.ResJson = { ...@@ -2288,19 +2288,19 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"ele8.png": { "ele8.png": {
"x": 920, "x": 118,
"y": 195, "y": 680,
"w": 78, "w": 78,
"h": 80, "h": 80,
"ox": 1, "ox": 1,
"oy": 0, "oy": 0,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": true "ro": false
}, },
"ele9.png": { "ele9.png": {
"x": 804, "x": 200,
"y": 199, "y": 598,
"w": 78, "w": 78,
"h": 78, "h": 78,
"ox": 1, "ox": 1,
...@@ -2310,30 +2310,19 @@ exports.ResJson = { ...@@ -2310,30 +2310,19 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"hammerBtn.png": { "hammerBtn.png": {
"x": 688, "x": 2,
"y": 199, "y": 874,
"w": 104, "w": 104,
"h": 114, "h": 114,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 104, "sw": 104,
"sh": 114, "sh": 114,
"ro": true
},
"star.png": {
"x": 464,
"y": 2,
"w": 454,
"h": 195,
"ox": 0,
"oy": 0,
"sw": 454,
"sh": 195,
"ro": false "ro": false
}, },
"stepBtn.png": { "stepBtn.png": {
"x": 532, "x": 905,
"y": 827, "y": 2,
"w": 124, "w": 124,
"h": 117, "h": 117,
"ox": 0, "ox": 0,
...@@ -2354,8 +2343,8 @@ exports.ResJson = { ...@@ -2354,8 +2343,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"waitingBg.png": { "waitingBg.png": {
"x": 350, "x": 278,
"y": 851, "y": 366,
"w": 160, "w": 160,
"h": 180, "h": 180,
"ox": 0, "ox": 0,
...@@ -2365,8 +2354,8 @@ exports.ResJson = { ...@@ -2365,8 +2354,8 @@ exports.ResJson = {
"ro": true "ro": true
}, },
"waitingRot.png": { "waitingRot.png": {
"x": 582, "x": 345,
"y": 348, "y": 672,
"w": 56, "w": 56,
"h": 56, "h": 56,
"ox": 0, "ox": 0,
...@@ -2376,8 +2365,8 @@ exports.ResJson = { ...@@ -2376,8 +2365,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"关闭按钮.png": { "关闭按钮.png": {
"x": 599, "x": 198,
"y": 267, "y": 680,
"w": 79, "w": 79,
"h": 79, "h": 79,
"ox": 0, "ox": 0,
...@@ -2387,8 +2376,8 @@ exports.ResJson = { ...@@ -2387,8 +2376,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"再想想.png": { "再想想.png": {
"x": 466, "x": 2,
"y": 551, "y": 598,
"w": 274, "w": 274,
"h": 114, "h": 114,
"ox": 0, "ox": 0,
...@@ -2398,41 +2387,41 @@ exports.ResJson = { ...@@ -2398,41 +2387,41 @@ exports.ResJson = {
"ro": true "ro": true
}, },
"开始闯关不要能量.png": { "开始闯关不要能量.png": {
"x": 234, "x": 2,
"y": 575, "y": 250,
"w": 424, "w": 424,
"h": 114, "h": 114,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 424, "sw": 424,
"sh": 114, "sh": 114,
"ro": true "ro": false
}, },
"开始闯关要能量.png": { "开始闯关要能量.png": {
"x": 118, "x": 2,
"y": 575, "y": 134,
"w": 424, "w": 424,
"h": 114, "h": 114,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 424, "sw": 424,
"sh": 114, "sh": 114,
"ro": true "ro": false
}, },
"确定.png": { "确定.png": {
"x": 443, "x": 2,
"y": 275, "y": 482,
"w": 274, "w": 274,
"h": 114, "h": 114,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 274, "sw": 274,
"sh": 114, "sh": 114,
"ro": true "ro": false
}, },
"继续闯关大.png": { "继续闯关大.png": {
"x": 2, "x": 905,
"y": 575, "y": 128,
"w": 424, "w": 424,
"h": 114, "h": 114,
"ox": 0, "ox": 0,
...@@ -2442,15 +2431,15 @@ exports.ResJson = { ...@@ -2442,15 +2431,15 @@ exports.ResJson = {
"ro": true "ro": true
}, },
"继续闯关小.png": { "继续闯关小.png": {
"x": 350, "x": 2,
"y": 575, "y": 366,
"w": 274, "w": 274,
"h": 114, "h": 114,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 274, "sw": 274,
"sh": 114, "sh": 114,
"ro": true "ro": false
} }
} }
}, },
...@@ -10040,7 +10029,7 @@ exports.ResJson = { ...@@ -10040,7 +10029,7 @@ exports.ResJson = {
} }
}, },
{ {
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png", "keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,开奖按钮120.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
"name": "SuccessPanel", "name": "SuccessPanel",
"atlas": { "atlas": {
"star_dis.png": { "star_dis.png": {
...@@ -10067,7 +10056,7 @@ exports.ResJson = { ...@@ -10067,7 +10056,7 @@ exports.ResJson = {
}, },
"去抽奖.png": { "去抽奖.png": {
"x": 2, "x": 2,
"y": 1883, "y": 1402,
"w": 274, "w": 274,
"h": 114, "h": 114,
"ox": 0, "ox": 0,
...@@ -10078,7 +10067,7 @@ exports.ResJson = { ...@@ -10078,7 +10067,7 @@ exports.ResJson = {
}, },
"圆角矩形 648.png": { "圆角矩形 648.png": {
"x": 2, "x": 2,
"y": 1379, "y": 1529,
"w": 502, "w": 502,
"h": 196, "h": 196,
"ox": 0, "ox": 0,
...@@ -10087,6 +10076,17 @@ exports.ResJson = { ...@@ -10087,6 +10076,17 @@ exports.ResJson = {
"sh": 200, "sh": 200,
"ro": true "ro": true
}, },
"开奖按钮120.png": {
"x": 835,
"y": 1103,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": true
},
"道具圆圈.png": { "道具圆圈.png": {
"x": 835, "x": 835,
"y": 803, "y": 803,
...@@ -10121,15 +10121,15 @@ exports.ResJson = { ...@@ -10121,15 +10121,15 @@ exports.ResJson = {
"ro": true "ro": true
}, },
"闯关成功不满星按钮.png": { "闯关成功不满星按钮.png": {
"x": 835, "x": 2,
"y": 1103, "y": 1286,
"w": 274, "w": 274,
"h": 114, "h": 114,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 274, "sw": 274,
"sh": 114, "sh": 114,
"ro": true "ro": false
} }
} }
}, },
...@@ -10218,7 +10218,7 @@ exports.ResJson = { ...@@ -10218,7 +10218,7 @@ exports.ResJson = {
} }
} }
], ],
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1596188364/resource/" "path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1596423352/resource/"
}; };
...@@ -11623,7 +11623,11 @@ var Tools = (function () { ...@@ -11623,7 +11623,11 @@ var Tools = (function () {
if (!data.isVisitSuccess) { if (!data.isVisitSuccess) {
ctrls_2.showPanel(FailedPanel_1.FailedPanel, data); ctrls_2.showPanel(FailedPanel_1.FailedPanel, data);
} }
else if ((data.prize && data.prize.image) || (data.tool && data.tool.type)) { else if ((data.prize && data.prize.image) || (data.tool && data.tool.type) || data.level == 120) {
if (data.level == 120 && (!data.prize || !data.prize.image)) {
data.prize = data.prize || {};
data.prize.image = Tools.baseInfo.levelPrize['level_120'];
}
ctrls_2.showPanel(SuccessPrizePanel_1.SuccessPrizePanel, data); ctrls_2.showPanel(SuccessPrizePanel_1.SuccessPrizePanel, data);
} }
else { else {
This source diff could not be displayed because it is too large. You can view the blob instead.
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
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"name": "BuyPowerPanel" "name": "BuyPowerPanel"
}, },
{ {
"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,star.png,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png", "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" "name": "common"
}, },
{ {
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
"name": "StartPanelPrize" "name": "StartPanelPrize"
}, },
{ {
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png", "keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,开奖按钮120.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
"name": "SuccessPanel" "name": "SuccessPanel"
}, },
{ {
......
...@@ -288,12 +288,12 @@ export const ResJson = { ...@@ -288,12 +288,12 @@ export const ResJson = {
} }
}, },
{ {
"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,star.png,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png", "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", "name": "common",
"atlas": { "atlas": {
"boomBtn.png": { "boomBtn.png": {
"x": 920, "x": 108,
"y": 2, "y": 874,
"w": 101, "w": 101,
"h": 109, "h": 109,
"ox": 0, "ox": 0,
...@@ -303,8 +303,8 @@ export const ResJson = { ...@@ -303,8 +303,8 @@ export const ResJson = {
"ro": false "ro": false
}, },
"comCloseBtn.png": { "comCloseBtn.png": {
"x": 762, "x": 347,
"y": 351, "y": 908,
"w": 48, "w": 48,
"h": 48, "h": 48,
"ox": 0, "ox": 0,
...@@ -314,8 +314,8 @@ export const ResJson = { ...@@ -314,8 +314,8 @@ export const ResJson = {
"ro": false "ro": false
}, },
"comm_light.png": { "comm_light.png": {
"x": 2, "x": 464,
"y": 134, "y": 2,
"w": 439, "w": 439,
"h": 439, "h": 439,
"ox": 0, "ox": 0,
...@@ -325,63 +325,63 @@ export const ResJson = { ...@@ -325,63 +325,63 @@ export const ResJson = {
"ro": false "ro": false
}, },
"ele0.png": { "ele0.png": {
"x": 599, "x": 188,
"y": 199, "y": 762,
"w": 80, "w": 80,
"h": 66, "h": 66,
"ox": 0, "ox": 0,
"oy": 13, "oy": 13,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"ele1.png": { "ele1.png": {
"x": 688, "x": 279,
"y": 305, "y": 922,
"w": 66, "w": 66,
"h": 72, "h": 72,
"ox": 7, "ox": 7,
"oy": 8, "oy": 8,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": true "ro": false
}, },
"ele10.png": { "ele10.png": {
"x": 521, "x": 256,
"y": 199, "y": 761,
"w": 76, "w": 76,
"h": 74, "h": 74,
"ox": 2, "ox": 2,
"oy": 6, "oy": 6,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"ele11.png": { "ele11.png": {
"x": 443, "x": 211,
"y": 199, "y": 844,
"w": 76, "w": 76,
"h": 74, "h": 74,
"ox": 2, "ox": 2,
"oy": 6, "oy": 6,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"ele12.png": { "ele12.png": {
"x": 443, "x": 211,
"y": 199, "y": 844,
"w": 76, "w": 76,
"h": 74, "h": 74,
"ox": 2, "ox": 2,
"oy": 6, "oy": 6,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"ele13.png": { "ele13.png": {
"x": 952, "x": 287,
"y": 343, "y": 839,
"w": 67, "w": 67,
"h": 67, "h": 67,
"ox": 0, "ox": 0,
...@@ -391,8 +391,8 @@ export const ResJson = { ...@@ -391,8 +391,8 @@ export const ResJson = {
"ro": false "ro": false
}, },
"ele14.png": { "ele14.png": {
"x": 960, "x": 332,
"y": 275, "y": 754,
"w": 61, "w": 61,
"h": 66, "h": 66,
"ox": 0, "ox": 0,
...@@ -402,41 +402,41 @@ export const ResJson = { ...@@ -402,41 +402,41 @@ export const ResJson = {
"ro": false "ro": false
}, },
"ele2.png": { "ele2.png": {
"x": 532, "x": 118,
"y": 953, "y": 762,
"w": 80, "w": 80,
"h": 68, "h": 68,
"ox": 0, "ox": 0,
"oy": 10, "oy": 10,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"ele3.png": { "ele3.png": {
"x": 804, "x": 280,
"y": 279, "y": 598,
"w": 72, "w": 72,
"h": 70, "h": 70,
"ox": 4, "ox": 4,
"oy": 10, "oy": 10,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"ele4.png": { "ele4.png": {
"x": 884, "x": 279,
"y": 275, "y": 678,
"w": 74, "w": 74,
"h": 64, "h": 64,
"ox": 6, "ox": 6,
"oy": 14, "oy": 14,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"ele5.png": { "ele5.png": {
"x": 920, "x": 118,
"y": 113, "y": 598,
"w": 80, "w": 80,
"h": 80, "h": 80,
"ox": 0, "ox": 0,
...@@ -446,19 +446,19 @@ export const ResJson = { ...@@ -446,19 +446,19 @@ export const ResJson = {
"ro": false "ro": false
}, },
"ele6.png": { "ele6.png": {
"x": 878, "x": 211,
"y": 341, "y": 922,
"w": 66, "w": 66,
"h": 72, "h": 72,
"ox": 7, "ox": 7,
"oy": 5, "oy": 5,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": true "ro": false
}, },
"ele7.png": { "ele7.png": {
"x": 614, "x": 278,
"y": 953, "y": 528,
"w": 72, "w": 72,
"h": 68, "h": 68,
"ox": 4, "ox": 4,
...@@ -468,19 +468,19 @@ export const ResJson = { ...@@ -468,19 +468,19 @@ export const ResJson = {
"ro": false "ro": false
}, },
"ele8.png": { "ele8.png": {
"x": 920, "x": 118,
"y": 195, "y": 680,
"w": 78, "w": 78,
"h": 80, "h": 80,
"ox": 1, "ox": 1,
"oy": 0, "oy": 0,
"sw": 80, "sw": 80,
"sh": 80, "sh": 80,
"ro": true "ro": false
}, },
"ele9.png": { "ele9.png": {
"x": 804, "x": 200,
"y": 199, "y": 598,
"w": 78, "w": 78,
"h": 78, "h": 78,
"ox": 1, "ox": 1,
...@@ -490,30 +490,19 @@ export const ResJson = { ...@@ -490,30 +490,19 @@ export const ResJson = {
"ro": false "ro": false
}, },
"hammerBtn.png": { "hammerBtn.png": {
"x": 688, "x": 2,
"y": 199, "y": 874,
"w": 104, "w": 104,
"h": 114, "h": 114,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 104, "sw": 104,
"sh": 114, "sh": 114,
"ro": true
},
"star.png": {
"x": 464,
"y": 2,
"w": 454,
"h": 195,
"ox": 0,
"oy": 0,
"sw": 454,
"sh": 195,
"ro": false "ro": false
}, },
"stepBtn.png": { "stepBtn.png": {
"x": 532, "x": 905,
"y": 827, "y": 2,
"w": 124, "w": 124,
"h": 117, "h": 117,
"ox": 0, "ox": 0,
...@@ -534,8 +523,8 @@ export const ResJson = { ...@@ -534,8 +523,8 @@ export const ResJson = {
"ro": false "ro": false
}, },
"waitingBg.png": { "waitingBg.png": {
"x": 350, "x": 278,
"y": 851, "y": 366,
"w": 160, "w": 160,
"h": 180, "h": 180,
"ox": 0, "ox": 0,
...@@ -545,8 +534,8 @@ export const ResJson = { ...@@ -545,8 +534,8 @@ export const ResJson = {
"ro": true "ro": true
}, },
"waitingRot.png": { "waitingRot.png": {
"x": 582, "x": 345,
"y": 348, "y": 672,
"w": 56, "w": 56,
"h": 56, "h": 56,
"ox": 0, "ox": 0,
...@@ -556,8 +545,8 @@ export const ResJson = { ...@@ -556,8 +545,8 @@ export const ResJson = {
"ro": false "ro": false
}, },
"关闭按钮.png": { "关闭按钮.png": {
"x": 599, "x": 198,
"y": 267, "y": 680,
"w": 79, "w": 79,
"h": 79, "h": 79,
"ox": 0, "ox": 0,
...@@ -567,8 +556,8 @@ export const ResJson = { ...@@ -567,8 +556,8 @@ export const ResJson = {
"ro": false "ro": false
}, },
"再想想.png": { "再想想.png": {
"x": 466, "x": 2,
"y": 551, "y": 598,
"w": 274, "w": 274,
"h": 114, "h": 114,
"ox": 0, "ox": 0,
...@@ -578,41 +567,41 @@ export const ResJson = { ...@@ -578,41 +567,41 @@ export const ResJson = {
"ro": true "ro": true
}, },
"开始闯关不要能量.png": { "开始闯关不要能量.png": {
"x": 234, "x": 2,
"y": 575, "y": 250,
"w": 424, "w": 424,
"h": 114, "h": 114,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 424, "sw": 424,
"sh": 114, "sh": 114,
"ro": true "ro": false
}, },
"开始闯关要能量.png": { "开始闯关要能量.png": {
"x": 118, "x": 2,
"y": 575, "y": 134,
"w": 424, "w": 424,
"h": 114, "h": 114,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 424, "sw": 424,
"sh": 114, "sh": 114,
"ro": true "ro": false
}, },
"确定.png": { "确定.png": {
"x": 443, "x": 2,
"y": 275, "y": 482,
"w": 274, "w": 274,
"h": 114, "h": 114,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 274, "sw": 274,
"sh": 114, "sh": 114,
"ro": true "ro": false
}, },
"继续闯关大.png": { "继续闯关大.png": {
"x": 2, "x": 905,
"y": 575, "y": 128,
"w": 424, "w": 424,
"h": 114, "h": 114,
"ox": 0, "ox": 0,
...@@ -622,15 +611,15 @@ export const ResJson = { ...@@ -622,15 +611,15 @@ export const ResJson = {
"ro": true "ro": true
}, },
"继续闯关小.png": { "继续闯关小.png": {
"x": 350, "x": 2,
"y": 575, "y": 366,
"w": 274, "w": 274,
"h": 114, "h": 114,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 274, "sw": 274,
"sh": 114, "sh": 114,
"ro": true "ro": false
} }
} }
}, },
...@@ -8220,7 +8209,7 @@ export const ResJson = { ...@@ -8220,7 +8209,7 @@ export const ResJson = {
} }
}, },
{ {
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png", "keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,开奖按钮120.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
"name": "SuccessPanel", "name": "SuccessPanel",
"atlas": { "atlas": {
"star_dis.png": { "star_dis.png": {
...@@ -8247,7 +8236,7 @@ export const ResJson = { ...@@ -8247,7 +8236,7 @@ export const ResJson = {
}, },
"去抽奖.png": { "去抽奖.png": {
"x": 2, "x": 2,
"y": 1883, "y": 1402,
"w": 274, "w": 274,
"h": 114, "h": 114,
"ox": 0, "ox": 0,
...@@ -8258,7 +8247,7 @@ export const ResJson = { ...@@ -8258,7 +8247,7 @@ export const ResJson = {
}, },
"圆角矩形 648.png": { "圆角矩形 648.png": {
"x": 2, "x": 2,
"y": 1379, "y": 1529,
"w": 502, "w": 502,
"h": 196, "h": 196,
"ox": 0, "ox": 0,
...@@ -8267,6 +8256,17 @@ export const ResJson = { ...@@ -8267,6 +8256,17 @@ export const ResJson = {
"sh": 200, "sh": 200,
"ro": true "ro": true
}, },
"开奖按钮120.png": {
"x": 835,
"y": 1103,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": true
},
"道具圆圈.png": { "道具圆圈.png": {
"x": 835, "x": 835,
"y": 803, "y": 803,
...@@ -8301,15 +8301,15 @@ export const ResJson = { ...@@ -8301,15 +8301,15 @@ export const ResJson = {
"ro": true "ro": true
}, },
"闯关成功不满星按钮.png": { "闯关成功不满星按钮.png": {
"x": 835, "x": 2,
"y": 1103, "y": 1286,
"w": 274, "w": 274,
"h": 114, "h": 114,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 274, "sw": 274,
"sh": 114, "sh": 114,
"ro": true "ro": false
} }
} }
}, },
...@@ -8398,5 +8398,5 @@ export const ResJson = { ...@@ -8398,5 +8398,5 @@ export const ResJson = {
} }
} }
], ],
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1596188364/resource/" "path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1596423352/resource/"
} }
\ No newline at end of file
...@@ -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