Commit 476d415d authored by wjf's avatar wjf

l

parents e4e8d4f1 c2f609fc
...@@ -18,8 +18,9 @@ export default class PrizePanel extends Panel { ...@@ -18,8 +18,9 @@ export default class PrizePanel extends Panel {
// showCustomLog(lottery); // showCustomLog(lottery);
this._level = parseInt(data.level + ''); this._level = parseInt(data.level + '');
const itemid = DataManager.ins.getData('getPlugOrderStatus').lottery.itemId;
this.data.img = DataManager.ins.getData('getPlugOrderStatus').lottery.imgurl; this.data.img = `http://yun.duiba.com.cn/db_games/0827/${itemid}.png`;
// this.data.img = DataManager.ins.getData('getPlugOrderStatus').lottery.imgurl;
this['shareBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => { this['shareBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
NetManager.ins.clickLog(getlogItem(15)); NetManager.ins.clickLog(getlogItem(15));
......
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["..\\assets\\common\\toast.png","..\\assets\\common\\closeCommonBtn.png","..\\assets\\common\\btn.png","..\\assets\\common\\alertbg.png","..\\assets\\common\\按钮 副本 4.png","..\\assets\\common\\按钮 副本 3.png","..\\assets\\common\\share_btn2.png","..\\assets\\common\\share_btn1.png","..\\assets\\common\\commmon_okbtn1.png","..\\assets\\common\\lightani.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/toast.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/commmon_okbtn1.png","../assets/common/lightani.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"main","version":5,"files":["..\\assets\\mainScene\\yezi1.png","..\\assets\\mainScene\\unlightedStar.png","..\\assets\\mainScene\\targetBoard.png","..\\assets\\mainScene\\stepsBoard.png","..\\assets\\mainScene\\stepNumber9.png","..\\assets\\mainScene\\stepNumber8.png","..\\assets\\mainScene\\stepNumber7.png","..\\assets\\mainScene\\stepNumber6.png","..\\assets\\mainScene\\stepNumber5.png","..\\assets\\mainScene\\stepNumber4.png","..\\assets\\mainScene\\stepNumber3.png","..\\assets\\mainScene\\stepNumber2.png","..\\assets\\mainScene\\stepNumber1.png","..\\assets\\mainScene\\stepNumber0.png","..\\assets\\mainScene\\stepBtn.png","..\\assets\\mainScene\\starProgress.png","..\\assets\\mainScene\\setting.png","..\\assets\\mainScene\\scoreNumber9.png","..\\assets\\mainScene\\scoreNumber8.png","..\\assets\\mainScene\\scoreNumber7.png","..\\assets\\mainScene\\scoreNumber6.png","..\\assets\\mainScene\\scoreNumber5.png","..\\assets\\mainScene\\scoreNumber4.png","..\\assets\\mainScene\\scoreNumber3.png","..\\assets\\mainScene\\scoreNumber2.png","..\\assets\\mainScene\\scoreNumber1.png","..\\assets\\mainScene\\scoreNumber0.png","..\\assets\\mainScene\\rock6.png","..\\assets\\mainScene\\rock5.png","..\\assets\\mainScene\\rock4.png","..\\assets\\mainScene\\rock3.png","..\\assets\\mainScene\\rock2.png","..\\assets\\mainScene\\rock1.png","..\\assets\\mainScene\\rightMark.png","..\\assets\\mainScene\\rightArrow.png","..\\assets\\mainScene\\rectLat.png","..\\assets\\mainScene\\progressDown.png","..\\assets\\mainScene\\playSceneBg.png","..\\assets\\mainScene\\magicLionBg.png","..\\assets\\mainScene\\magicLion.png","..\\assets\\mainScene\\lockUp.png","..\\assets\\mainScene\\lockDown.png","..\\assets\\mainScene\\lineLight.png","..\\assets\\mainScene\\lightedStar.png","..\\assets\\mainScene\\leftArrow.png","..\\assets\\mainScene\\ice6.png","..\\assets\\mainScene\\ice5.png","..\\assets\\mainScene\\ice4.png","..\\assets\\mainScene\\ice3.png","..\\assets\\mainScene\\ice2.png","..\\assets\\mainScene\\ice1.png","..\\assets\\mainScene\\hammerBtn.png","..\\assets\\mainScene\\eleDis9.png","..\\assets\\mainScene\\eleDis8.png","..\\assets\\mainScene\\eleDis7.png","..\\assets\\mainScene\\eleDis6.png","..\\assets\\mainScene\\eleDis5.png","..\\assets\\mainScene\\eleDis4.png","..\\assets\\mainScene\\eleDis3.png","..\\assets\\mainScene\\eleDis2.png","..\\assets\\mainScene\\eleDis12.png","..\\assets\\mainScene\\eleDis11.png","..\\assets\\mainScene\\eleDis10.png","..\\assets\\mainScene\\eleDis1.png","..\\assets\\mainScene\\ele5.png","..\\assets\\mainScene\\ele42.png","..\\assets\\mainScene\\ele41.png","..\\assets\\mainScene\\ele40.png","..\\assets\\mainScene\\ele4.png","..\\assets\\mainScene\\ele32.png","..\\assets\\mainScene\\ele31.png","..\\assets\\mainScene\\ele30.png","..\\assets\\mainScene\\ele3.png","..\\assets\\mainScene\\ele22.png","..\\assets\\mainScene\\ele21.png","..\\assets\\mainScene\\ele20.png","..\\assets\\mainScene\\ele2.png","..\\assets\\mainScene\\ele12.png","..\\assets\\mainScene\\ele11.png","..\\assets\\mainScene\\ele10.png","..\\assets\\mainScene\\ele1.png","..\\assets\\mainScene\\ele02.png","..\\assets\\mainScene\\ele01.png","..\\assets\\mainScene\\ele00.png","..\\assets\\mainScene\\ele0.png","..\\assets\\mainScene\\dangqianfenshu.png","..\\assets\\mainScene\\chooseRect.png","..\\assets\\mainScene\\boomBtn.png","..\\assets\\mainScene\\boom9.png","..\\assets\\mainScene\\boom8.png","..\\assets\\mainScene\\boom7.png","..\\assets\\mainScene\\boom6.png","..\\assets\\mainScene\\boom5.png","..\\assets\\mainScene\\boom4.png","..\\assets\\mainScene\\boom3.png","..\\assets\\mainScene\\boom2.png","..\\assets\\mainScene\\boom18.png","..\\assets\\mainScene\\boom17.png","..\\assets\\mainScene\\boom16.png","..\\assets\\mainScene\\boom15.png","..\\assets\\mainScene\\boom14.png","..\\assets\\mainScene\\boom13.png","..\\assets\\mainScene\\boom12.png","..\\assets\\mainScene\\boom11.png","..\\assets\\mainScene\\boom10.png","..\\assets\\mainScene\\boom1.png","..\\assets\\mainScene\\mainSoundBtnOn.png","..\\assets\\mainScene\\mainSettingBg.png","..\\assets\\mainScene\\mainQuestionBtn.png","..\\assets\\mainScene\\mainMusicBtnOn.png","..\\assets\\mainScene\\mainQuitBtn.png","..\\assets\\mainScene\\mainSoundBtnOff.png","..\\assets\\mainScene\\mainMusicBtnOff.png","..\\assets\\mainScene\\targetNumber9.png","..\\assets\\mainScene\\targetNumber8.png","..\\assets\\mainScene\\targetNumber7.png","..\\assets\\mainScene\\targetNumber6.png","..\\assets\\mainScene\\targetNumber5.png","..\\assets\\mainScene\\targetNumber4.png","..\\assets\\mainScene\\targetNumber3.png","..\\assets\\mainScene\\targetNumber2.png","..\\assets\\mainScene\\targetNumber1.png","..\\assets\\mainScene\\targetNumber0.png","..\\assets\\mainScene\\ele7.png","..\\assets\\mainScene\\ele6.png","..\\assets\\mainScene\\bonusFra9.png","..\\assets\\mainScene\\bonusFra8.png","..\\assets\\mainScene\\bonusFra7.png","..\\assets\\mainScene\\bonusFra6.png","..\\assets\\mainScene\\bonusFra5.png","..\\assets\\mainScene\\bonusFra4.png","..\\assets\\mainScene\\bonusFra3.png","..\\assets\\mainScene\\bonusFra27.png","..\\assets\\mainScene\\bonusFra26.png","..\\assets\\mainScene\\bonusFra25.png","..\\assets\\mainScene\\bonusFra24.png","..\\assets\\mainScene\\bonusFra23.png","..\\assets\\mainScene\\bonusFra22.png","..\\assets\\mainScene\\bonusFra21.png","..\\assets\\mainScene\\bonusFra20.png","..\\assets\\mainScene\\bonusFra2.png","..\\assets\\mainScene\\bonusFra19.png","..\\assets\\mainScene\\bonusFra18.png","..\\assets\\mainScene\\bonusFra17.png","..\\assets\\mainScene\\bonusFra16.png","..\\assets\\mainScene\\bonusFra15.png","..\\assets\\mainScene\\bonusFra14.png","..\\assets\\mainScene\\bonusFra13.png","..\\assets\\mainScene\\bonusFra12.png","..\\assets\\mainScene\\bonusFra11.png","..\\assets\\mainScene\\bonusFra10.png","..\\assets\\mainScene\\bonusFra1.png","..\\assets\\mainScene\\bonusShoot.png","..\\assets\\mainScene\\guideTxt5.png","..\\assets\\mainScene\\guideTxt4.png","..\\assets\\mainScene\\guideTxt3.png","..\\assets\\mainScene\\guideTxt2.png","..\\assets\\mainScene\\guideTxt1.png","..\\assets\\mainScene\\guideKnowBtn.png","..\\assets\\mainScene\\guideBg.png","..\\assets\\mainScene\\propNum9.png","..\\assets\\mainScene\\propNum8.png","..\\assets\\mainScene\\propNum7.png","..\\assets\\mainScene\\propNum6.png","..\\assets\\mainScene\\propNum5.png","..\\assets\\mainScene\\propNum4.png","..\\assets\\mainScene\\propNum3.png","..\\assets\\mainScene\\propNum2.png","..\\assets\\mainScene\\propNum1.png","..\\assets\\mainScene\\propNum0.png","..\\assets\\mainScene\\propNumBg.png","..\\assets\\mainScene\\bonusTime.png","..\\assets\\mainScene\\eleDis19.png","..\\assets\\mainScene\\eleDis18.png","..\\assets\\mainScene\\eleDis17.png","..\\assets\\mainScene\\eleDis16.png","..\\assets\\mainScene\\eleDis15.png","..\\assets\\mainScene\\eleDis14.png","..\\assets\\mainScene\\eleDis13.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"main","version":5,"files":["../assets/mainScene/yezi1.png","../assets/mainScene/unlightedStar.png","../assets/mainScene/targetBoard.png","../assets/mainScene/stepsBoard.png","../assets/mainScene/stepNumber9.png","../assets/mainScene/stepNumber8.png","../assets/mainScene/stepNumber7.png","../assets/mainScene/stepNumber6.png","../assets/mainScene/stepNumber5.png","../assets/mainScene/stepNumber4.png","../assets/mainScene/stepNumber3.png","../assets/mainScene/stepNumber2.png","../assets/mainScene/stepNumber1.png","../assets/mainScene/stepNumber0.png","../assets/mainScene/stepBtn.png","../assets/mainScene/starProgress.png","../assets/mainScene/setting.png","../assets/mainScene/scoreNumber9.png","../assets/mainScene/scoreNumber8.png","../assets/mainScene/scoreNumber7.png","../assets/mainScene/scoreNumber6.png","../assets/mainScene/scoreNumber5.png","../assets/mainScene/scoreNumber4.png","../assets/mainScene/scoreNumber3.png","../assets/mainScene/scoreNumber2.png","../assets/mainScene/scoreNumber1.png","../assets/mainScene/scoreNumber0.png","../assets/mainScene/rock6.png","../assets/mainScene/rock5.png","../assets/mainScene/rock4.png","../assets/mainScene/rock3.png","../assets/mainScene/rock2.png","../assets/mainScene/rock1.png","../assets/mainScene/rightMark.png","../assets/mainScene/rightArrow.png","../assets/mainScene/rectLat.png","../assets/mainScene/progressDown.png","../assets/mainScene/playSceneBg.png","../assets/mainScene/magicLionBg.png","../assets/mainScene/magicLion.png","../assets/mainScene/lockUp.png","../assets/mainScene/lockDown.png","../assets/mainScene/lineLight.png","../assets/mainScene/lightedStar.png","../assets/mainScene/leftArrow.png","../assets/mainScene/ice6.png","../assets/mainScene/ice5.png","../assets/mainScene/ice4.png","../assets/mainScene/ice3.png","../assets/mainScene/ice2.png","../assets/mainScene/ice1.png","../assets/mainScene/hammerBtn.png","../assets/mainScene/eleDis9.png","../assets/mainScene/eleDis8.png","../assets/mainScene/eleDis7.png","../assets/mainScene/eleDis6.png","../assets/mainScene/eleDis5.png","../assets/mainScene/eleDis4.png","../assets/mainScene/eleDis3.png","../assets/mainScene/eleDis2.png","../assets/mainScene/eleDis12.png","../assets/mainScene/eleDis11.png","../assets/mainScene/eleDis10.png","../assets/mainScene/eleDis1.png","../assets/mainScene/ele5.png","../assets/mainScene/ele42.png","../assets/mainScene/ele41.png","../assets/mainScene/ele40.png","../assets/mainScene/ele4.png","../assets/mainScene/ele32.png","../assets/mainScene/ele31.png","../assets/mainScene/ele30.png","../assets/mainScene/ele3.png","../assets/mainScene/ele22.png","../assets/mainScene/ele21.png","../assets/mainScene/ele20.png","../assets/mainScene/ele2.png","../assets/mainScene/ele12.png","../assets/mainScene/ele11.png","../assets/mainScene/ele10.png","../assets/mainScene/ele1.png","../assets/mainScene/ele02.png","../assets/mainScene/ele01.png","../assets/mainScene/ele00.png","../assets/mainScene/ele0.png","../assets/mainScene/dangqianfenshu.png","../assets/mainScene/chooseRect.png","../assets/mainScene/boomBtn.png","../assets/mainScene/boom9.png","../assets/mainScene/boom8.png","../assets/mainScene/boom7.png","../assets/mainScene/boom6.png","../assets/mainScene/boom5.png","../assets/mainScene/boom4.png","../assets/mainScene/boom3.png","../assets/mainScene/boom2.png","../assets/mainScene/boom18.png","../assets/mainScene/boom17.png","../assets/mainScene/boom16.png","../assets/mainScene/boom15.png","../assets/mainScene/boom14.png","../assets/mainScene/boom13.png","../assets/mainScene/boom12.png","../assets/mainScene/boom11.png","../assets/mainScene/boom10.png","../assets/mainScene/boom1.png","../assets/mainScene/mainSoundBtnOn.png","../assets/mainScene/mainSettingBg.png","../assets/mainScene/mainQuestionBtn.png","../assets/mainScene/mainMusicBtnOn.png","../assets/mainScene/mainQuitBtn.png","../assets/mainScene/mainSoundBtnOff.png","../assets/mainScene/mainMusicBtnOff.png","../assets/mainScene/targetNumber9.png","../assets/mainScene/targetNumber8.png","../assets/mainScene/targetNumber7.png","../assets/mainScene/targetNumber6.png","../assets/mainScene/targetNumber5.png","../assets/mainScene/targetNumber4.png","../assets/mainScene/targetNumber3.png","../assets/mainScene/targetNumber2.png","../assets/mainScene/targetNumber1.png","../assets/mainScene/targetNumber0.png","../assets/mainScene/ele7.png","../assets/mainScene/ele6.png","../assets/mainScene/bonusFra9.png","../assets/mainScene/bonusFra8.png","../assets/mainScene/bonusFra7.png","../assets/mainScene/bonusFra6.png","../assets/mainScene/bonusFra5.png","../assets/mainScene/bonusFra4.png","../assets/mainScene/bonusFra3.png","../assets/mainScene/bonusFra27.png","../assets/mainScene/bonusFra26.png","../assets/mainScene/bonusFra25.png","../assets/mainScene/bonusFra24.png","../assets/mainScene/bonusFra23.png","../assets/mainScene/bonusFra22.png","../assets/mainScene/bonusFra21.png","../assets/mainScene/bonusFra20.png","../assets/mainScene/bonusFra2.png","../assets/mainScene/bonusFra19.png","../assets/mainScene/bonusFra18.png","../assets/mainScene/bonusFra17.png","../assets/mainScene/bonusFra16.png","../assets/mainScene/bonusFra15.png","../assets/mainScene/bonusFra14.png","../assets/mainScene/bonusFra13.png","../assets/mainScene/bonusFra12.png","../assets/mainScene/bonusFra11.png","../assets/mainScene/bonusFra10.png","../assets/mainScene/bonusFra1.png","../assets/mainScene/bonusShoot.png","../assets/mainScene/guideTxt5.png","../assets/mainScene/guideTxt4.png","../assets/mainScene/guideTxt3.png","../assets/mainScene/guideTxt2.png","../assets/mainScene/guideTxt1.png","../assets/mainScene/guideKnowBtn.png","../assets/mainScene/guideBg.png","../assets/mainScene/propNum9.png","../assets/mainScene/propNum8.png","../assets/mainScene/propNum7.png","../assets/mainScene/propNum6.png","../assets/mainScene/propNum5.png","../assets/mainScene/propNum4.png","../assets/mainScene/propNum3.png","../assets/mainScene/propNum2.png","../assets/mainScene/propNum1.png","../assets/mainScene/propNum0.png","../assets/mainScene/propNumBg.png","../assets/mainScene/bonusTime.png","../assets/mainScene/eleDis19.png","../assets/mainScene/eleDis18.png","../assets/mainScene/eleDis17.png","../assets/mainScene/eleDis16.png","../assets/mainScene/eleDis15.png","../assets/mainScene/eleDis14.png","../assets/mainScene/eleDis13.png"]}
\ No newline at end of file
...@@ -48,19 +48,40 @@ export default class MapScene extends Scene { ...@@ -48,19 +48,40 @@ export default class MapScene extends Scene {
this.scrollGroup.addChild(data.bottom); this.scrollGroup.addChild(data.bottom);
data.bottom.y = data.top.height + (data.list.length * data.list[0].height); data.bottom.y = data.top.height + (data.list.length * data.list[0].height);
let target;
const homeData = getHomeData();
if(homeData.levels.length == 0) {
target = 1;
}else if(homeData.levels.length ==70) {
target = 70+1;
}else {
target = homeData.levels.length + 1;
}
for (const key in MapScene.iconHash) { for (const key in MapScene.iconHash) {
const levelOrder = parseInt(key);
const element = MapScene.iconHash[key]; const element = MapScene.iconHash[key];
element.addEventListener(egret.TouchEvent.TOUCH_TAP, () => { element.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
const homeData = getHomeData();
const levelOrder = parseInt(key);
if (levelOrder > (homeData.levels.length + 1) && levelOrder > 1) { if (levelOrder > (homeData.levels.length + 1) && levelOrder > 1) {
// showToast('必须通关前面的关卡才能开启本关'); // showToast('必须通关前面的关卡才能开启本关');
} else } else
PanelCtrl.instance.show('StartPanel', key); PanelCtrl.instance.show('StartPanel', key);
NetManager.ins.clickLog(getlogItem(19)) NetManager.ins.clickLog(getlogItem(19))
}, this); }, this);
} }
const targetIcon = MapScene.iconHash[target];
const light = RES.getRes('lightani_png');
const pic = new egret.Bitmap(light);//76 61
// targetIcon.addChild(pic);
targetIcon.addChildAt(pic,0);
pic.anchorOffsetX=76;
pic.anchorOffsetY=61;
pic.x =50-2;
pic.y =37+10;
egret.Tween.get(pic,{loop:true}).to({scaleX:2,scaleY:2,alpha:0},1000).wait(1000);
this['pic'] = pic;
this.updateHomeData(); this.updateHomeData();
this.showLog(); this.showLog();
this.updateBox(); this.updateBox();
...@@ -76,15 +97,19 @@ export default class MapScene extends Scene { ...@@ -76,15 +97,19 @@ export default class MapScene extends Scene {
} }
}, this); }, this);
const homeData = getHomeData();
let lastOrder = homeData.levels.length + 1; let lastOrder = homeData.levels.length + 1;
if (homeData.levels.length >= 70) if (homeData.levels.length >= 70)
lastOrder = 70; lastOrder = 70;
this.scroll.viewport.scrollV = this.getScrollV(lastOrder, this.stage.stageHeight); this.scroll.viewport.scrollV = this.getScrollV(lastOrder, this.stage.stageHeight);
// console.warn(this.getScrollV(lastOrder, this.stage.stageHeight)) // console.warn(this.getScrollV(lastOrder, this.stage.stageHeight))
const light = RES.getRes('lightani_png');
const pic = new egret.Bitmap(light); }
this.addChild(pic);
destroy(){
super.destroy();
if(this['pic'])
egret.Tween.removeTweens(this['pic']);
} }
getScrollV(lastOrder, stageHeight) { getScrollV(lastOrder, stageHeight) {
......
...@@ -11,7 +11,10 @@ export default class BoxPanel extends Panel { ...@@ -11,7 +11,10 @@ export default class BoxPanel extends Panel {
}, this); }, this);
this.showlog(); this.showlog();
this.data.img = DataManager.ins.getData('getPlugOrderStatus').lottery.imgurl; // this.data.img = DataManager.ins.getData('getPlugOrderStatus').lottery.imgurl;
const itemid = DataManager.ins.getData('getPlugOrderStatus').lottery.itemId;
this.data.img = `http://yun.duiba.com.cn/db_games/0827/${itemid}.png`;
} }
showlog() { showlog() {
NetManager.ins.showLog(getlogItem(17)); NetManager.ins.showLog(getlogItem(17));
......
...@@ -87,6 +87,11 @@ ...@@ -87,6 +87,11 @@
"maxScore": 99999, "maxScore": 99999,
"stars": 3 "stars": 3
}, },
{
"levelNum": 18,
"maxScore": 99999,
"stars": 3
},
{ {
"levelNum": 17, "levelNum": 17,
"maxScore": 42420, "maxScore": 42420,
...@@ -109,7 +114,7 @@ ...@@ -109,7 +114,7 @@
], ],
"remainEnargy": 9979, "remainEnargy": 9979,
"askForEnergy": false, "askForEnergy": false,
"canReceiveTreasureBoxNum": 0, "canReceiveTreasureBoxNum": 10,
"nextRangeStarsNum": 150 "nextRangeStarsNum": 150
} }
} }
\ No newline at end of file
{ {
"success": false, "success": true,
"code": "0000000000", "code": "0000000000",
"desc": "OK", "desc": "OK",
"timestamp": 1566558623308, "timestamp": 1566558623308,
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"imgurl": "//yun.duiba.com.cn/developer/img/activityTool/slotMachine/virtual.png", "imgurl": "//yun.duiba.com.cn/developer/img/activityTool/slotMachine/virtual.png",
"isAppHidden": true, "isAppHidden": true,
"isDownloadUrl": true, "isDownloadUrl": true,
"itemId": 49440, "itemId": 59236,
"link": "//activity.m.duibadev.com.cn/activity/takePrizeNew?recordId=30035037&dbnewopen", "link": "//activity.m.duibadev.com.cn/activity/takePrizeNew?recordId=30035037&dbnewopen",
"linkTo": 0, "linkTo": 0,
"title": "宝箱1", "title": "宝箱1",
......
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