Skip to content

B
babycare_xiaoxiao
Commit 74bcd904 authored by 邱旭's avatar 邱旭
Browse files
Options

m

parent 43f2d55c
Hide whitespace changes
Inline Side-by-side
Showing with 2906 additions and 2648 deletions
.idea/workspace.xml
View file @ 74bcd904
...@@ -3,6 +3,21 @@ ...@@ -3,6 +3,21 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment=""> <list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TaoBaoNet.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaoBaoNet.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Tools.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tools.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/LotteryPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/LotteryPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/StartPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/LoadingScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/LotteryScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/LotteryScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -61,7 +76,7 @@ ...@@ -61,7 +76,7 @@
<recent name="$PROJECT_DIR$/lotties" /> <recent name="$PROJECT_DIR$/lotties" />
</key> </key>
</component> </component>
<component name="RunManager" selected="npm.build"> <component name="RunManager" selected="npm.flushRes">
<configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true"> <configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" /> <package-json value="$PROJECT_DIR$/package.json" />
<command value="run" /> <command value="run" />
...@@ -114,11 +129,11 @@ ...@@ -114,11 +129,11 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.build" /> <item itemvalue="npm.build" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.copyJs" /> <item itemvalue="npm.copyJs" />
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.handleLotS" /> <item itemvalue="npm.handleLotS" />
<item itemvalue="npm.dev" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
...@@ -133,6 +148,7 @@ ...@@ -133,6 +148,7 @@
<workItem from="1612576979459" duration="13000" /> <workItem from="1612576979459" duration="13000" />
<workItem from="1612577003915" duration="21094000" /> <workItem from="1612577003915" duration="21094000" />
<workItem from="1612662929222" duration="40609000" /> <workItem from="1612662929222" duration="40609000" />
<workItem from="1613698993022" duration="3958000" />
</task> </task>
<task id="LOCAL-00001" summary="斐乐消消乐"> <task id="LOCAL-00001" summary="斐乐消消乐">
<created>1612581213298</created> <created>1612581213298</created>
......
index.html
View file @ 74bcd904
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
background-color: #fff; background-color: #48bdbf;
/* background: linear-gradient(#93dbb7,#ff0,#b5d89a); */ /* background: linear-gradient(#93dbb7,#ff0,#b5d89a); */
/* background: linear-gradient(#93dbb7,#b5d89a); */ /* background: linear-gradient(#93dbb7,#b5d89a); */
} }
......
output.js
View file @ 74bcd904
This source diff could not be displayed because it is too large. You can view the blob instead.
output.js.map
View file @ 74bcd904
This source diff could not be displayed because it is too large. You can view the blob instead.
resource/res.json
View file @ 74bcd904
{ {
"groups": [ "groups": [
{
"keys": "failedBtn.png,failedTxt.png",
"name": "FailedPanel"
},
{
"keys": "freePowerBg.png,freePowerBtn.png",
"name": "FreePowerPanel"
},
{
"keys": "体力不足.png,体力不足按钮.png",
"name": "NoEnergyPanel"
},
{
"keys": "noPrizeBg.png,知道了.png",
"name": "NoPrizePanel"
},
{
"keys": "noStepCancel.png,noStepOk.png",
"name": "NoStepPanel"
},
{
"keys": "prizePanel.png,prizePanelBtn.png",
"name": "PrizePanel"
},
{
"keys": "ruleBtn.png,活动规则背景.png",
"name": "RulePanel"
},
{
"keys": "startBg.png,startBtn.png,startNum1.png,startNum2.png,startNum3.png,startNum4.png,startNum5.png,startNum6.png,startNum7.png,startNum8.png,startNum9.png,startNum关.png,startNum第.png",
"name": "StartPanel"
},
{
"keys": "star_en.png,sucAgain.png,sucContinueL.png,sucContinueS.png,sucContinueSR.png,sucGet.png,sucGoPrize.png,sucPrizeTip.png,sucPropTip.png,successBgL.png,successBgS.png",
"name": "SuccessPanel"
},
{
"keys": "任务背景.png,去完成.png,去完成灰.png,待领取.png",
"name": "TaskPanel"
},
{
"keys": "useStepCancel.png,useStepOk.png",
"name": "UseStep"
},
{ {
"keys": "0d5e3eff-7726-4e3a-a2d4-409a9e68c2ec.png,16eb7a4a-34a0-45f3-8c02-154b638b1049.png,2c17dca6-ec35-4184-ae72-25813cf8f5dc.png,79040d0c-04ba-4c98-a512-5707d7ed37f5.png,93bcd69f-9897-4b12-8bf0-c0659817ccd2.png,e8c749fe-2a3b-4941-8527-37ba70a66e34.png,fdcf57c3-b91e-44d2-a011-7a0bbf4e5bb4.png", "keys": "0d5e3eff-7726-4e3a-a2d4-409a9e68c2ec.png,16eb7a4a-34a0-45f3-8c02-154b638b1049.png,2c17dca6-ec35-4184-ae72-25813cf8f5dc.png,79040d0c-04ba-4c98-a512-5707d7ed37f5.png,93bcd69f-9897-4b12-8bf0-c0659817ccd2.png,e8c749fe-2a3b-4941-8527-37ba70a66e34.png,fdcf57c3-b91e-44d2-a011-7a0bbf4e5bb4.png",
"name": "bonus_lottie" "name": "bonus_lottie"
}, },
{ {
"keys": "boomBtn.png,comCloseBtn.png,comm_light.png,e305be55-fdfd-453b-9e6d-41edfe68c0f1.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,panelBgS.png,powerIcon.png,powerImg.png,stepBtn.png,target0.png,target1.png,target2.png,target3.png,target4.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,确定.png,继续闯关大.png,继续闯关小.png", "keys": "boomBtn.png,comCloseBtn.png,comm_light.png,e305be55-fdfd-453b-9e6d-41edfe68c0f1.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,panelBgS.png,powerIcon.png,powerImg.png,stepBtn.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,target0.png,target1.png,target2.png,target3.png,target4.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common" "name": "common"
}, },
{
"keys": "failedBtn.png,failedTxt.png",
"name": "FailedPanel"
},
{ {
"keys": "fesEleSmallDis1.png,fesEleSmallDis10.png,fesEleSmallDis2.png,fesEleSmallDis3.png,fesEleSmallDis4.png,fesEleSmallDis5.png,fesEleSmallDis6.png,fesEleSmallDis7.png,fesEleSmallDis8.png,fesEleSmallDis9.png,fesRedBigLight.png,fesRedBombSta1.png,fesRedCap.png,fesRedDown.png,fesRedSmallLight.png,fesRedUp.png,festivalTargetBg.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,xingxingbi.png", "keys": "fesEleSmallDis1.png,fesEleSmallDis10.png,fesEleSmallDis2.png,fesEleSmallDis3.png,fesEleSmallDis4.png,fesEleSmallDis5.png,fesEleSmallDis6.png,fesEleSmallDis7.png,fesEleSmallDis8.png,fesEleSmallDis9.png,fesRedBigLight.png,fesRedBombSta1.png,fesRedCap.png,fesRedDown.png,fesRedSmallLight.png,fesRedUp.png,festivalTargetBg.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,xingxingbi.png",
"name": "festival" "name": "festival"
...@@ -20,10 +60,6 @@ ...@@ -20,10 +60,6 @@
"keys": "dis_ele0_0.png,dis_ele0_1.png,dis_ele0_10.png,dis_ele0_11.png,dis_ele0_12.png,dis_ele0_13.png,dis_ele0_14.png,dis_ele0_2.png,dis_ele0_3.png,dis_ele0_4.png,dis_ele0_5.png,dis_ele0_6.png,dis_ele0_7.png,dis_ele0_8.png,dis_ele0_9.png,dis_ele1_0.png,dis_ele1_1.png,dis_ele1_10.png,dis_ele1_11.png,dis_ele1_12.png,dis_ele1_13.png,dis_ele1_14.png,dis_ele1_2.png,dis_ele1_3.png,dis_ele1_4.png,dis_ele1_5.png,dis_ele1_6.png,dis_ele1_7.png,dis_ele1_8.png,dis_ele1_9.png,dis_ele2_0.png,dis_ele2_1.png,dis_ele2_10.png,dis_ele2_11.png,dis_ele2_12.png,dis_ele2_13.png,dis_ele2_14.png,dis_ele2_2.png,dis_ele2_3.png,dis_ele2_4.png,dis_ele2_5.png,dis_ele2_6.png,dis_ele2_7.png,dis_ele2_8.png,dis_ele2_9.png,dis_ele3_0.png,dis_ele3_1.png,dis_ele3_10.png,dis_ele3_11.png,dis_ele3_12.png,dis_ele3_13.png,dis_ele3_14.png,dis_ele3_2.png,dis_ele3_3.png,dis_ele3_4.png,dis_ele3_5.png,dis_ele3_6.png,dis_ele3_7.png,dis_ele3_8.png,dis_ele3_9.png,dis_ele4_0.png,dis_ele4_1.png,dis_ele4_10.png,dis_ele4_11.png,dis_ele4_12.png,dis_ele4_13.png,dis_ele4_14.png,dis_ele4_2.png,dis_ele4_3.png,dis_ele4_4.png,dis_ele4_5.png,dis_ele4_6.png,dis_ele4_7.png,dis_ele4_8.png,dis_ele4_9.png", "keys": "dis_ele0_0.png,dis_ele0_1.png,dis_ele0_10.png,dis_ele0_11.png,dis_ele0_12.png,dis_ele0_13.png,dis_ele0_14.png,dis_ele0_2.png,dis_ele0_3.png,dis_ele0_4.png,dis_ele0_5.png,dis_ele0_6.png,dis_ele0_7.png,dis_ele0_8.png,dis_ele0_9.png,dis_ele1_0.png,dis_ele1_1.png,dis_ele1_10.png,dis_ele1_11.png,dis_ele1_12.png,dis_ele1_13.png,dis_ele1_14.png,dis_ele1_2.png,dis_ele1_3.png,dis_ele1_4.png,dis_ele1_5.png,dis_ele1_6.png,dis_ele1_7.png,dis_ele1_8.png,dis_ele1_9.png,dis_ele2_0.png,dis_ele2_1.png,dis_ele2_10.png,dis_ele2_11.png,dis_ele2_12.png,dis_ele2_13.png,dis_ele2_14.png,dis_ele2_2.png,dis_ele2_3.png,dis_ele2_4.png,dis_ele2_5.png,dis_ele2_6.png,dis_ele2_7.png,dis_ele2_8.png,dis_ele2_9.png,dis_ele3_0.png,dis_ele3_1.png,dis_ele3_10.png,dis_ele3_11.png,dis_ele3_12.png,dis_ele3_13.png,dis_ele3_14.png,dis_ele3_2.png,dis_ele3_3.png,dis_ele3_4.png,dis_ele3_5.png,dis_ele3_6.png,dis_ele3_7.png,dis_ele3_8.png,dis_ele3_9.png,dis_ele4_0.png,dis_ele4_1.png,dis_ele4_10.png,dis_ele4_11.png,dis_ele4_12.png,dis_ele4_13.png,dis_ele4_14.png,dis_ele4_2.png,dis_ele4_3.png,dis_ele4_4.png,dis_ele4_5.png,dis_ele4_6.png,dis_ele4_7.png,dis_ele4_8.png,dis_ele4_9.png",
"name": "fiveVerHorDis" "name": "fiveVerHorDis"
}, },
{
"keys": "freePowerBg.png,freePowerBtn.png",
"name": "FreePowerPanel"
},
{ {
"keys": "loadingBg.jpg,loadingPro.png", "keys": "loadingBg.jpg,loadingPro.png",
"name": "loadingScene" "name": "loadingScene"
...@@ -40,18 +76,6 @@ ...@@ -40,18 +76,6 @@
"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": "体力不足.png,体力不足按钮.png",
"name": "NoEnergyPanel"
},
{
"keys": "noPrizeBg.png,知道了.png",
"name": "NoPrizePanel"
},
{
"keys": "noStepCancel.png,noStepOk.png",
"name": "NoStepPanel"
},
{ {
"keys": "amazing.png,blueDoorBg.png,brownBallFace.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele0Hor.png,ele1Exp.png,ele1Hor.png,ele2Exp.png,ele2Hor.png,ele3Exp.png,ele3Hor.png,ele4Exp.png,ele4Hor.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,good.png,great.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,perfect.png,playBg.jpg,propCancel.png,propNumBg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum当.png,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png", "keys": "amazing.png,blueDoorBg.png,brownBallFace.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele0Hor.png,ele1Exp.png,ele1Hor.png,ele2Exp.png,ele2Hor.png,ele3Exp.png,ele3Hor.png,ele4Exp.png,ele4Hor.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,good.png,great.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,perfect.png,playBg.jpg,propCancel.png,propNumBg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum当.png,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene" "name": "playScene"
...@@ -67,30 +91,6 @@ ...@@ -67,30 +91,6 @@
{ {
"keys": "chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png", "keys": "chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png",
"name": "playSceneNum" "name": "playSceneNum"
},
{
"keys": "prizePanel.png,prizePanelBtn.png",
"name": "PrizePanel"
},
{
"keys": "ruleBtn.png,活动规则背景.png",
"name": "RulePanel"
},
{
"keys": "startBg.png,startBtn.png,startNum1.png,startNum2.png,startNum3.png,startNum4.png,startNum5.png,startNum6.png,startNum7.png,startNum8.png,startNum9.png,startNum关.png,startNum第.png",
"name": "StartPanel"
},
{
"keys": "star_en.png,sucAgain.png,successBgL.png,successBgS.png,sucContinueL.png,sucContinueS.png,sucContinueSR.png,sucGet.png,sucgoPrize.png,sucPrizeTip.png,sucPropTip.png",
"name": "SuccessPanel"
},
{
"keys": "任务背景.png,去完成.png,去完成灰.png,待领取.png",
"name": "TaskPanel"
},
{
"keys": "useStepCancel.png,useStepOk.png",
"name": "UseStep"
} }
], ],
"path": "./resource/" "path": "./resource/"
......
src/ResJson.ts
View file @ 74bcd904
export const ResJson = { export const ResJson = {
"groups": [ "groups": [
{
"keys": "failedBtn.png,failedTxt.png",
"name": "FailedPanel"
},
{
"keys": "freePowerBg.png,freePowerBtn.png",
"name": "FreePowerPanel"
},
{
"keys": "体力不足.png,体力不足按钮.png",
"name": "NoEnergyPanel"
},
{
"keys": "noPrizeBg.png,知道了.png",
"name": "NoPrizePanel"
},
{
"keys": "noStepCancel.png,noStepOk.png",
"name": "NoStepPanel"
},
{
"keys": "prizePanel.png,prizePanelBtn.png",
"name": "PrizePanel"
},
{
"keys": "ruleBtn.png,活动规则背景.png",
"name": "RulePanel"
},
{
"keys": "startBg.png,startBtn.png,startNum1.png,startNum2.png,startNum3.png,startNum4.png,startNum5.png,startNum6.png,startNum7.png,startNum8.png,startNum9.png,startNum关.png,startNum第.png",
"name": "StartPanel"
},
{
"keys": "star_en.png,sucAgain.png,sucContinueL.png,sucContinueS.png,sucContinueSR.png,sucGet.png,sucGoPrize.png,sucPrizeTip.png,sucPropTip.png,successBgL.png,successBgS.png",
"name": "SuccessPanel"
},
{
"keys": "任务背景.png,去完成.png,去完成灰.png,待领取.png",
"name": "TaskPanel"
},
{
"keys": "useStepCancel.png,useStepOk.png",
"name": "UseStep"
},
{ {
"keys": "0d5e3eff-7726-4e3a-a2d4-409a9e68c2ec.png,16eb7a4a-34a0-45f3-8c02-154b638b1049.png,2c17dca6-ec35-4184-ae72-25813cf8f5dc.png,79040d0c-04ba-4c98-a512-5707d7ed37f5.png,93bcd69f-9897-4b12-8bf0-c0659817ccd2.png,e8c749fe-2a3b-4941-8527-37ba70a66e34.png,fdcf57c3-b91e-44d2-a011-7a0bbf4e5bb4.png", "keys": "0d5e3eff-7726-4e3a-a2d4-409a9e68c2ec.png,16eb7a4a-34a0-45f3-8c02-154b638b1049.png,2c17dca6-ec35-4184-ae72-25813cf8f5dc.png,79040d0c-04ba-4c98-a512-5707d7ed37f5.png,93bcd69f-9897-4b12-8bf0-c0659817ccd2.png,e8c749fe-2a3b-4941-8527-37ba70a66e34.png,fdcf57c3-b91e-44d2-a011-7a0bbf4e5bb4.png",
"name": "bonus_lottie" "name": "bonus_lottie"
}, },
{ {
"keys": "boomBtn.png,comCloseBtn.png,comm_light.png,e305be55-fdfd-453b-9e6d-41edfe68c0f1.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,panelBgS.png,powerIcon.png,powerImg.png,stepBtn.png,target0.png,target1.png,target2.png,target3.png,target4.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,确定.png,继续闯关大.png,继续闯关小.png", "keys": "boomBtn.png,comCloseBtn.png,comm_light.png,e305be55-fdfd-453b-9e6d-41edfe68c0f1.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,panelBgS.png,powerIcon.png,powerImg.png,stepBtn.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,target0.png,target1.png,target2.png,target3.png,target4.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common" "name": "common"
}, },
{
"keys": "failedBtn.png,failedTxt.png",
"name": "FailedPanel"
},
{ {
"keys": "fesEleSmallDis1.png,fesEleSmallDis10.png,fesEleSmallDis2.png,fesEleSmallDis3.png,fesEleSmallDis4.png,fesEleSmallDis5.png,fesEleSmallDis6.png,fesEleSmallDis7.png,fesEleSmallDis8.png,fesEleSmallDis9.png,fesRedBigLight.png,fesRedBombSta1.png,fesRedCap.png,fesRedDown.png,fesRedSmallLight.png,fesRedUp.png,festivalTargetBg.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,xingxingbi.png", "keys": "fesEleSmallDis1.png,fesEleSmallDis10.png,fesEleSmallDis2.png,fesEleSmallDis3.png,fesEleSmallDis4.png,fesEleSmallDis5.png,fesEleSmallDis6.png,fesEleSmallDis7.png,fesEleSmallDis8.png,fesEleSmallDis9.png,fesRedBigLight.png,fesRedBombSta1.png,fesRedCap.png,fesRedDown.png,fesRedSmallLight.png,fesRedUp.png,festivalTargetBg.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,xingxingbi.png",
"name": "festival" "name": "festival"
...@@ -20,10 +60,6 @@ export const ResJson = { ...@@ -20,10 +60,6 @@ export const ResJson = {
"keys": "dis_ele0_0.png,dis_ele0_1.png,dis_ele0_10.png,dis_ele0_11.png,dis_ele0_12.png,dis_ele0_13.png,dis_ele0_14.png,dis_ele0_2.png,dis_ele0_3.png,dis_ele0_4.png,dis_ele0_5.png,dis_ele0_6.png,dis_ele0_7.png,dis_ele0_8.png,dis_ele0_9.png,dis_ele1_0.png,dis_ele1_1.png,dis_ele1_10.png,dis_ele1_11.png,dis_ele1_12.png,dis_ele1_13.png,dis_ele1_14.png,dis_ele1_2.png,dis_ele1_3.png,dis_ele1_4.png,dis_ele1_5.png,dis_ele1_6.png,dis_ele1_7.png,dis_ele1_8.png,dis_ele1_9.png,dis_ele2_0.png,dis_ele2_1.png,dis_ele2_10.png,dis_ele2_11.png,dis_ele2_12.png,dis_ele2_13.png,dis_ele2_14.png,dis_ele2_2.png,dis_ele2_3.png,dis_ele2_4.png,dis_ele2_5.png,dis_ele2_6.png,dis_ele2_7.png,dis_ele2_8.png,dis_ele2_9.png,dis_ele3_0.png,dis_ele3_1.png,dis_ele3_10.png,dis_ele3_11.png,dis_ele3_12.png,dis_ele3_13.png,dis_ele3_14.png,dis_ele3_2.png,dis_ele3_3.png,dis_ele3_4.png,dis_ele3_5.png,dis_ele3_6.png,dis_ele3_7.png,dis_ele3_8.png,dis_ele3_9.png,dis_ele4_0.png,dis_ele4_1.png,dis_ele4_10.png,dis_ele4_11.png,dis_ele4_12.png,dis_ele4_13.png,dis_ele4_14.png,dis_ele4_2.png,dis_ele4_3.png,dis_ele4_4.png,dis_ele4_5.png,dis_ele4_6.png,dis_ele4_7.png,dis_ele4_8.png,dis_ele4_9.png", "keys": "dis_ele0_0.png,dis_ele0_1.png,dis_ele0_10.png,dis_ele0_11.png,dis_ele0_12.png,dis_ele0_13.png,dis_ele0_14.png,dis_ele0_2.png,dis_ele0_3.png,dis_ele0_4.png,dis_ele0_5.png,dis_ele0_6.png,dis_ele0_7.png,dis_ele0_8.png,dis_ele0_9.png,dis_ele1_0.png,dis_ele1_1.png,dis_ele1_10.png,dis_ele1_11.png,dis_ele1_12.png,dis_ele1_13.png,dis_ele1_14.png,dis_ele1_2.png,dis_ele1_3.png,dis_ele1_4.png,dis_ele1_5.png,dis_ele1_6.png,dis_ele1_7.png,dis_ele1_8.png,dis_ele1_9.png,dis_ele2_0.png,dis_ele2_1.png,dis_ele2_10.png,dis_ele2_11.png,dis_ele2_12.png,dis_ele2_13.png,dis_ele2_14.png,dis_ele2_2.png,dis_ele2_3.png,dis_ele2_4.png,dis_ele2_5.png,dis_ele2_6.png,dis_ele2_7.png,dis_ele2_8.png,dis_ele2_9.png,dis_ele3_0.png,dis_ele3_1.png,dis_ele3_10.png,dis_ele3_11.png,dis_ele3_12.png,dis_ele3_13.png,dis_ele3_14.png,dis_ele3_2.png,dis_ele3_3.png,dis_ele3_4.png,dis_ele3_5.png,dis_ele3_6.png,dis_ele3_7.png,dis_ele3_8.png,dis_ele3_9.png,dis_ele4_0.png,dis_ele4_1.png,dis_ele4_10.png,dis_ele4_11.png,dis_ele4_12.png,dis_ele4_13.png,dis_ele4_14.png,dis_ele4_2.png,dis_ele4_3.png,dis_ele4_4.png,dis_ele4_5.png,dis_ele4_6.png,dis_ele4_7.png,dis_ele4_8.png,dis_ele4_9.png",
"name": "fiveVerHorDis" "name": "fiveVerHorDis"
}, },
{
"keys": "freePowerBg.png,freePowerBtn.png",
"name": "FreePowerPanel"
},
{ {
"keys": "loadingBg.jpg,loadingPro.png", "keys": "loadingBg.jpg,loadingPro.png",
"name": "loadingScene" "name": "loadingScene"
...@@ -40,18 +76,6 @@ export const ResJson = { ...@@ -40,18 +76,6 @@ export const ResJson = {
"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": "体力不足.png,体力不足按钮.png",
"name": "NoEnergyPanel"
},
{
"keys": "noPrizeBg.png,知道了.png",
"name": "NoPrizePanel"
},
{
"keys": "noStepCancel.png,noStepOk.png",
"name": "NoStepPanel"
},
{ {
"keys": "amazing.png,blueDoorBg.png,brownBallFace.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele0Hor.png,ele1Exp.png,ele1Hor.png,ele2Exp.png,ele2Hor.png,ele3Exp.png,ele3Hor.png,ele4Exp.png,ele4Hor.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,good.png,great.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,perfect.png,playBg.jpg,propCancel.png,propNumBg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum当.png,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png", "keys": "amazing.png,blueDoorBg.png,brownBallFace.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele0Hor.png,ele1Exp.png,ele1Hor.png,ele2Exp.png,ele2Hor.png,ele3Exp.png,ele3Hor.png,ele4Exp.png,ele4Hor.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,good.png,great.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,perfect.png,playBg.jpg,propCancel.png,propNumBg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum当.png,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene" "name": "playScene"
...@@ -67,30 +91,6 @@ export const ResJson = { ...@@ -67,30 +91,6 @@ export const ResJson = {
{ {
"keys": "chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png", "keys": "chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png",
"name": "playSceneNum" "name": "playSceneNum"
},
{
"keys": "prizePanel.png,prizePanelBtn.png",
"name": "PrizePanel"
},
{
"keys": "ruleBtn.png,活动规则背景.png",
"name": "RulePanel"
},
{
"keys": "startBg.png,startBtn.png,startNum1.png,startNum2.png,startNum3.png,startNum4.png,startNum5.png,startNum6.png,startNum7.png,startNum8.png,startNum9.png,startNum关.png,startNum第.png",
"name": "StartPanel"
},
{
"keys": "star_en.png,sucAgain.png,successBgL.png,successBgS.png,sucContinueL.png,sucContinueS.png,sucContinueSR.png,sucGet.png,sucgoPrize.png,sucPrizeTip.png,sucPropTip.png",
"name": "SuccessPanel"
},
{
"keys": "任务背景.png,去完成.png,去完成灰.png,待领取.png",
"name": "TaskPanel"
},
{
"keys": "useStepCancel.png,useStepOk.png",
"name": "UseStep"
} }
], ],
"path": "./resource/" "path": "./resource/"
......
src/TaoBaoNet.ts
View file @ 74bcd904
...@@ -89,7 +89,7 @@ export enum TbNetName { ...@@ -89,7 +89,7 @@ export enum TbNetName {
* 抽奖 * 抽奖
* activityId * activityId
*/ */
luckyDraw = "babycare.luckyDraw", luckyDraw = "feile.drawTopLevelPrize",
/** /**
* 获取120名通关的人数 * 获取120名通关的人数
*/ */
......
src/Tools.ts
View file @ 74bcd904
...@@ -20,6 +20,7 @@ export class Tools { ...@@ -20,6 +20,7 @@ export class Tools {
} }
public static addSteps = 5; public static addSteps = 5;
public static maxLevel = 99;
/** /**
* 缓存key * 缓存key
...@@ -108,7 +109,9 @@ export class Tools { ...@@ -108,7 +109,9 @@ export class Tools {
} }
public static gameOver(data) { public static gameOver(data) {
if (!data.isVisitSuccess) { // 闯关失败 if (data.level == Tools.maxLevel) { // 99肯定是抽奖机会
showPanel(SuccessNoPrizePanel, data);
} else if (!data.isVisitSuccess) { // 闯关失败
showPanel(FailedPanel, data); showPanel(FailedPanel, data);
} else if (data.prize && data.prize.type != 5) { // 闯关成功，奖励关卡 } else if (data.prize && data.prize.type != 5) { // 闯关成功，奖励关卡
showPanel(SuccessPrizePanel, data); showPanel(SuccessPrizePanel, data);
......
src/panels/LotteryPanel.ts
View file @ 74bcd904
...@@ -2,13 +2,12 @@ import { Scene } from "../../module/views/Scene"; ...@@ -2,13 +2,12 @@ import { Scene } from "../../module/views/Scene";
import { RES } from "../../module/RES"; import { RES } from "../../module/RES";
import { layers } from "../../module/views/layers"; import { layers } from "../../module/views/layers";
import { Tools } from "../Tools"; import { Tools } from "../Tools";
import { showWaiting, wait, hideWaiting, showPanel } from "../../module/ctrls"; import { showWaiting, wait, hideWaiting, showPanel, changeScene } from "../../module/ctrls";
import { sendTbNet, TbNetName } from "../TaoBaoNet"; import { sendTbNet, TbNetName } from "../TaoBaoNet";
import { GTool } from "../../module/tools/GTool"; import { GTool } from "../../module/tools/GTool";
// import { MapScene } from "./map/MapScene"; // import { MapScene } from "./map/MapScene";
import { PrizePanel } from "../panels/PrizePanel";
import { NoPrizePanel } from "../panels/NoPrizePanel";
import { Panel } from "../../module/views/Panel"; import { Panel } from "../../module/views/Panel";
import { MapScene } from "../scene/map/MapScene";
/** /**
* 摇奖机弹框 * 摇奖机弹框
...@@ -47,7 +46,10 @@ export class LotteryPanel extends Panel { ...@@ -47,7 +46,10 @@ export class LotteryPanel extends Panel {
this.thanksBtn.visible = false; this.thanksBtn.visible = false;
//返回按钮，回到地图页 //返回按钮，回到地图页
this.addChild(new FYGE.Sprite(RES.getRes("lotteryReturnBtn.png"))) this.addChild(new FYGE.Sprite(RES.getRes("lotteryReturnBtn.png")))
.addEventListener(FYGE.MouseEvent.CLICK, this.hidePanel, this) .addEventListener(FYGE.MouseEvent.CLICK, () => {
this.hidePanel();
changeScene(MapScene);
}, this)
.position.set(0, 250) .position.set(0, 250)
//刷新奖品列表和摇奖列表 //刷新奖品列表和摇奖列表
this.updatePrizes(); this.updatePrizes();
...@@ -101,39 +103,6 @@ interface PrizeInt { ...@@ -101,39 +103,6 @@ interface PrizeInt {
name: string, name: string,
_id: string _id: string
} }
class PrizeItem extends FYGE.Container implements FYGE.IScrollListItem {
private prizeImage: FYGE.Sprite;
private nameTxt: FYGE.TextField;
constructor() {
super();
this.addChild(new FYGE.Sprite(RES.getRes("prizeItemBg.png")))
this.prizeImage = this.addChild(new FYGE.Sprite());
this.prizeImage.width = this.prizeImage.height = 101;
this.prizeImage.position.set(4, 4);
//考虑需不需要加，如果到时性能不行再去掉
var mask = this.addChild(new FYGE.Shape())
mask.beginFill(0);
mask.drawRoundedRect(4, 4, 101, 101, 10);
mask.endFill();
this.prizeImage.mask = mask
//名字
this.nameTxt = this.addChild(Tools.getText(
"",
19.23,
"#317f7f",
FYGE.TEXT_ALIGN.CENTER,
109,
0, 112
))
}
initData(id: number, data: PrizeInt) {
if (id < 0 || !data) return;
if (data.image) this.prizeImage.texture = FYGE.Texture.from(data.image);
this.nameTxt.text = data.name;
}
id;
data: number;
}
class LotteryItem extends FYGE.Container { class LotteryItem extends FYGE.Container {
private showImage: FYGE.Sprite; private showImage: FYGE.Sprite;
id: string id: string
......
src/panels/StartPanel.ts
View file @ 74bcd904
...@@ -50,7 +50,7 @@ export class StartPanel extends Panel { ...@@ -50,7 +50,7 @@ export class StartPanel extends Panel {
// this.addChild(Tools.getRect(595, 80)).position.set(79, 730); // this.addChild(Tools.getRect(595, 80)).position.set(79, 730);
const tipTxt = level == 99 ? '通过此关即可获得抽取大奖的机会哦' : '通关即可抽取大奖\n分数越高几率越大哦'; const tipTxt = level == Tools.maxLevel ? '通过此关即可获得抽取大奖的机会哦' : '通关即可抽取大奖\n分数越高几率越大哦';
const tip = this.addChild(Tools.getText( /// TODO 道具加步数 const tip = this.addChild(Tools.getText( /// TODO 道具加步数
tipTxt, 26, '#744f1d', tipTxt, 26, '#744f1d',
TEXT_ALIGN.CENTER, 595, 79, 730 TEXT_ALIGN.CENTER, 595, 79, 730
......
src/panels/SuccessNoPrizePanel.ts
View file @ 74bcd904
import { Panel } from "../../module/views/Panel"; import { Panel } from "../../module/views/Panel";
import { Tools } from "../Tools"; import { Tools } from "../Tools";
import { RES } from "../../module/RES"; import { RES } from "../../module/RES";
import { changeScene } from "../../module/ctrls"; import { changeScene, showPanel } from "../../module/ctrls";
import { MapScene } from "../scene/map/MapScene"; import { MapScene } from "../scene/map/MapScene";
import Container = FYGE.Container; import Container = FYGE.Container;
import Sprite = FYGE.Sprite; import Sprite = FYGE.Sprite;
...@@ -42,7 +42,7 @@ export class SuccessNoPrizePanel extends Panel { ...@@ -42,7 +42,7 @@ export class SuccessNoPrizePanel extends Panel {
FYGE.TEXT_ALIGN.CENTER, 750, 0, 713 FYGE.TEXT_ALIGN.CENTER, 750, 0, 713
)); ));
if (level == 99) { // 99关 if (level == Tools.maxLevel) { // 99关
tipLabel.text = '成功通关！\n获得一次抽奖机会！'; tipLabel.text = '成功通关！\n获得一次抽奖机会！';
this.addChild(new Button(RES.getRes("sucGoPrize.png"))) this.addChild(new Button(RES.getRes("sucGoPrize.png")))
.addEventListener(MouseEvent.CLICK, this.goPrize, this) .addEventListener(MouseEvent.CLICK, this.goPrize, this)
...@@ -83,7 +83,8 @@ export class SuccessNoPrizePanel extends Panel { ...@@ -83,7 +83,8 @@ export class SuccessNoPrizePanel extends Panel {
public goPrize() { public goPrize() {
// 去抽奖 // 去抽奖
changeScene(LotteryScene, { level: this.data.level }) showPanel(LotteryScene, {level: this.data.level})
// changeScene(LotteryScene, { level: this.data.level });
super.hidePanel(); super.hidePanel();
} }
...@@ -91,7 +92,7 @@ export class SuccessNoPrizePanel extends Panel { ...@@ -91,7 +92,7 @@ export class SuccessNoPrizePanel extends Panel {
* 继续闯关 * 继续闯关
*/ */
private continue() { private continue() {
if (this.data.level == 120) { if (this.data.level == Tools.maxLevel) {
changeScene(MapScene); changeScene(MapScene);
} else { } else {
changeScene(MapScene, {level: this.data.level + 1}); changeScene(MapScene, {level: this.data.level + 1});
......
src/panels/SuccessPrizePanel.ts
View file @ 74bcd904
...@@ -108,7 +108,7 @@ export class SuccessPrizePanel extends Panel { ...@@ -108,7 +108,7 @@ export class SuccessPrizePanel extends Panel {
* 继续闯关 * 继续闯关
*/ */
private continue() { private continue() {
if (this.data.level == 99) { if (this.data.level == Tools.maxLevel) {
changeScene(MapScene); changeScene(MapScene);
} else { } else {
changeScene(MapScene, { level: this.data.level + 1 }); changeScene(MapScene, { level: this.data.level + 1 });
...@@ -116,13 +116,6 @@ export class SuccessPrizePanel extends Panel { ...@@ -116,13 +116,6 @@ export class SuccessPrizePanel extends Panel {
super.hidePanel(); super.hidePanel();
} }
public goPrize() {
// 去抽奖
changeScene(LotteryScene, { level: this.data.level })
super.hidePanel();
}
/** /**
* 领奖 * 领奖
*/ */
......
src/scene/LoadingScene.ts
View file @ 74bcd904
...@@ -4,8 +4,9 @@ import { ProgressBarS } from "../common/ProgressBarS"; ...@@ -4,8 +4,9 @@ import { ProgressBarS } from "../common/ProgressBarS";
import { RES } from "../../module/RES"; import { RES } from "../../module/RES";
import { sendTbNet, TbNetName } from "../TaoBaoNet"; import { sendTbNet, TbNetName } from "../TaoBaoNet";
import { layers } from "../../module/views/layers"; import { layers } from "../../module/views/layers";
import { changeScene, showToast } from "../../module/ctrls"; import { changeScene, showPanel, showToast } from "../../module/ctrls";
import { MapScene } from "./map/MapScene"; import { LotteryScene } from "./LotteryScene";
import { LotteryPanel } from "../panels/LotteryPanel";
export class LoadingScene extends Scene { export class LoadingScene extends Scene {
get groupNames() { get groupNames() {
...@@ -68,7 +69,8 @@ export class LoadingScene extends Scene { ...@@ -68,7 +69,8 @@ export class LoadingScene extends Scene {
.call(() => { .call(() => {
if (pro >= 1) { if (pro >= 1) {
this.removeEventListener(FYGE.Event.PROGRESS, this.progressEvent, this); this.removeEventListener(FYGE.Event.PROGRESS, this.progressEvent, this);
changeScene(MapScene, {from: "loading"}) // changeScene(MapScene, {from: "loading"})
showPanel(LotteryPanel);
// changeScene(PlayScene, { chapter: 1 }); // changeScene(PlayScene, { chapter: 1 });
// changeScene(LotteryScene,{level:1}); // changeScene(LotteryScene,{level:1});
} }
......
src/scene/LotteryScene.ts
View file @ 74bcd904
...@@ -8,11 +8,12 @@ import { GTool } from "../../module/tools/GTool"; ...@@ -8,11 +8,12 @@ import { GTool } from "../../module/tools/GTool";
import { MapScene } from "./map/MapScene"; import { MapScene } from "./map/MapScene";
import { PrizePanel } from "../panels/PrizePanel"; import { PrizePanel } from "../panels/PrizePanel";
import { NoPrizePanel } from "../panels/NoPrizePanel"; import { NoPrizePanel } from "../panels/NoPrizePanel";
import { Panel } from "../../module/views/Panel";
/** /**
* 摇奖机弹框 * 摇奖机弹框
*/ */
export class LotteryScene extends Scene { export class LotteryScene extends Panel {
get groupNames() { return ["lotteryScene"] } get groupNames() { return ["lotteryScene"] }
lotScroll: LotteryScroll; lotScroll: LotteryScroll;
...@@ -23,46 +24,17 @@ export class LotteryScene extends Scene { ...@@ -23,46 +24,17 @@ export class LotteryScene extends Scene {
//适配 //适配
this.y = -layers.stageOffsetY; this.y = -layers.stageOffsetY;
//背景 //背景
this.addChild(new FYGE.Sprite(RES.getRes("lotteryMachineBg.jpg"))) this.addChild(new FYGE.Sprite(RES.getRes("lotteryMachineBg.png")))
//计算下一关的关数
// let upLevel: number = 120;
// let dLevel: number = 120;
// Tools.baseInfo.prizeLevels.forEach((value, index) => {
// const d: number = value - this.data.level;
// if (this.data.level <= value && d >= 0 && d <= dLevel) {
// upLevel = value;
// dLevel = d + 1;
// }
// });
Tools.gameData.prizeLevels.sort((a, b) => { Tools.gameData.prizeLevels.sort((a, b) => {
return a - b return a - b
}) })
var index = Tools.gameData.prizeLevels.indexOf(this.data.level);
let upLevel = Tools.gameData.prizeLevels[index + 1]
//标题文案
this.addChild(Tools.getText(
this.data.level + "关抽奖奖励",
53.19,
"#ffffff",
FYGE.TEXT_ALIGN.CENTER,
488,
(750 - 488) / 2,
360
)).bold = true;
//下一次抽奖文案
this.addChild(Tools.getText(
upLevel ? "下一奖励关卡：" + upLevel + "关" : "",
32.54,
"#ffffff",
FYGE.TEXT_ALIGN.CENTER,
488,
(750 - 488) / 2,
420
))
//抽奖按钮 //抽奖按钮
this.addChild(new FYGE.Button(RES.getRes("lotteryBtn.png"))) this.addChild(new FYGE.Button(RES.getRes("lotteryBtn.png")))
.addEventListener(FYGE.MouseEvent.CLICK, this.lottery, this) .addEventListener(FYGE.MouseEvent.CLICK, this.lottery, this)
.position.set((750 - RES.getRes("lotteryBtn.png").width) / 2, 797); .position.set(192, 1232);
//返回按钮，回到地图页 //返回按钮，回到地图页
this.addChild(new FYGE.Button(RES.getRes("lotteryReturnBtn.png"))) this.addChild(new FYGE.Button(RES.getRes("lotteryReturnBtn.png")))
.addEventListener(FYGE.MouseEvent.CLICK, () => { changeScene(MapScene) }, this) .addEventListener(FYGE.MouseEvent.CLICK, () => { changeScene(MapScene) }, this)
...@@ -72,21 +44,19 @@ export class LotteryScene extends Scene { ...@@ -72,21 +44,19 @@ export class LotteryScene extends Scene {
} }
async updatePrizes() { async updatePrizes() {
showWaiting(); showWaiting();
const { data: prizeList } = await sendTbNet(TbNetName.getPrizesByLevel, { level: this.data.level }); const { data: prizeList } = await sendTbNet(TbNetName.getPrizesByLevel);
//去掉type为5的谢谢参与 //去掉type为5的谢谢参与
var list = prizeList.slice().filter((e) => { return e.type != 5 }); var list = prizeList.slice().filter((e) => { return e.type != 5 });
//滚动列表
var scroll = this.addChild(new FYGE.ScrollList(PrizeItem, 122, 140, 345, 152, false))
scroll.position.set(195, 1013);
scroll.updateData(list || [])
//摇奖部分 //摇奖部分
var p = [201, 620] var p = [80, 645]
this.lotScroll = this.addChild(new LotteryScroll(list)) this.lotScroll = this.addChild(new LotteryScroll(list))
this.lotScroll.position.set(p[0], p[1]); this.lotScroll.position.set(p[0], p[1]);
} }
lottery() { lottery() {
showWaiting() showWaiting()
sendTbNet(TbNetName.luckyDraw, { level: this.data.level }) sendTbNet(TbNetName.luckyDraw)
.then((res) => { .then((res) => {
hideWaiting(); hideWaiting();
//如果是失败 //如果是失败
...@@ -108,57 +78,25 @@ export class LotteryScene extends Scene { ...@@ -108,57 +78,25 @@ export class LotteryScene extends Scene {
}) })
} }
} }
interface PrizeInt { interface PrizeInt {
image: string, image: string,
name: string, name: string,
_id: string _id: string
} }
class PrizeItem extends FYGE.Container implements FYGE.IScrollListItem {
private prizeImage: FYGE.Sprite;
private nameTxt: FYGE.TextField;
constructor() {
super();
this.addChild(new FYGE.Sprite(RES.getRes("prizeItemBg.png")))
this.prizeImage = this.addChild(new FYGE.Sprite());
this.prizeImage.width = this.prizeImage.height = 101;
this.prizeImage.position.set(4, 4);
//考虑需不需要加，如果到时性能不行再去掉
var mask = this.addChild(new FYGE.Shape())
mask.beginFill(0);
mask.drawRoundedRect(4, 4, 101, 101, 10);
mask.endFill();
this.prizeImage.mask = mask
//名字
this.nameTxt = this.addChild(Tools.getText(
"",
19.23,
"#317f7f",
FYGE.TEXT_ALIGN.CENTER,
109,
0, 112
))
}
initData(id: number, data: PrizeInt) {
if (id < 0 || !data) return;
if (data.image) this.prizeImage.texture = FYGE.Texture.from(data.image);
this.nameTxt.text = data.name;
}
id;
data: number;
}
class LotteryItem extends FYGE.Container { class LotteryItem extends FYGE.Container {
private showImage: FYGE.Sprite; private showImage: FYGE.Sprite;
id: string id: string
constructor(data: PrizeInt) { constructor(data: PrizeInt) {
super(); super();
this.id = data._id; this.id = data._id;
this.addChild(new FYGE.Sprite(RES.getRes("lotteryItemBg.png"))); // this.addChild(new FYGE.Sprite(RES.getRes("lotteryItemBg.png")));
this.showImage = this.addChild(new FYGE.Sprite(FYGE.Texture.from(data.image))); this.showImage = this.addChild(new FYGE.Sprite(FYGE.Texture.from(data.image)));
this.showImage.width = this.showImage.height = 88; this.showImage.width = this.showImage.height = 160;
this.showImage.position.set((103 - 88) / 2, 6); this.showImage.position.set(15, 6);
var mask = this.addChild(new FYGE.Shape()) const mask = this.addChild(new FYGE.Shape());
mask.beginFill(0); mask.beginFill(0);
mask.drawRoundedRect((103 - 88) / 2, 6, 88, 88, 10); mask.drawRoundedRect(15, 6, 160, 160, 10);
mask.endFill(); mask.endFill();
this.showImage.mask = mask this.showImage.mask = mask
} }
...@@ -167,7 +105,7 @@ class LotteryItem extends FYGE.Container { ...@@ -167,7 +105,7 @@ class LotteryItem extends FYGE.Container {
this.id = data._id; this.id = data._id;
} }
} }
const HEIGHT = 123; const HEIGHT = 180;
/** /**
* 滚动条 * 滚动条
* 功能可以滚动到指定的图 * 功能可以滚动到指定的图
...@@ -227,7 +165,7 @@ class LotteryScrollItem extends FYGE.Container { ...@@ -227,7 +165,7 @@ class LotteryScrollItem extends FYGE.Container {
if (c.y > HEIGHT * 1.5) { if (c.y > HEIGHT * 1.5) {
c.y = c.y - this.children.length * HEIGHT c.y = c.y - this.children.length * HEIGHT
} }
}) });
} }
// 0 0- 10 21 1 // 0 0- 10 21 1
...@@ -248,22 +186,22 @@ class LotteryScroll extends FYGE.Container { ...@@ -248,22 +186,22 @@ class LotteryScroll extends FYGE.Container {
constructor(datas: PrizeInt[]) { constructor(datas: PrizeInt[]) {
super(); super();
this.scrollItems = [] this.scrollItems = []
for (var i = 0; i < 3; i++) { for (let i = 0; i < 3; i++) {
var s = this.addChild(new LotteryScrollItem(GTool.disturbArr(datas.slice()))) const s = this.addChild(new LotteryScrollItem(GTool.disturbArr(datas.slice())));
s.position.set(116 * i, 0); s.position.set(205 * i, 80);
this.scrollItems.push(s) this.scrollItems.push(s)
} }
this.ids = []; this.ids = [];
datas.forEach((d) => { this.ids.push(d._id) }); datas.forEach((d) => { this.ids.push(d._id) });
var h = -50 const h = -45;
//遮罩 //遮罩
var mask = this.addChild(new FYGE.Shape()) const mask = this.addChild(new FYGE.Shape());
mask.beginFill(0) mask.beginFill(0)
mask.drawRect(0, h + 3, 350, 195 - 5) mask.drawRect(0, h, 592, 424)
mask.endFill(); mask.endFill();
this.mask = mask; this.mask = mask;
//蒙层 // 蒙层
this.addChild(new FYGE.Sprite(RES.getRes("shadowMask.png"))) this.addChild(new FYGE.Sprite(RES.getRes("shadowMask.png")))
.position.set(0, h) .position.set(0, h)
} }
......
src/scene/map/CheckBtn.ts
View file @ 74bcd904
...@@ -160,7 +160,7 @@ export default class CheckBtn extends Container { ...@@ -160,7 +160,7 @@ export default class CheckBtn extends Container {
// 点击事件 // 点击事件
this.btn.addEventListener(MouseEvent.CLICK, this.clickStart, this); this.btn.addEventListener(MouseEvent.CLICK, this.clickStart, this);
if (data.check == 99) { if (data.check == Tools.maxLevel) {
this.addChild(Tools.getSprite("checkTip99.png", -34, -62)); this.addChild(Tools.getSprite("checkTip99.png", -34, -62));
} }
......
src/scene/map/MapScene.ts
View file @ 74bcd904
...@@ -154,9 +154,9 @@ export class MapScene extends Scene { ...@@ -154,9 +154,9 @@ export class MapScene extends Scene {
} }
public initMap() { public initMap() {
const arr = new Array(99); const arr = new Array(Tools.maxLevel);
for (let i = 0; i < 99; i++) { for (let i = 0; i < Tools.maxLevel; i++) {
arr[i] = { arr[i] = {
check: i + 1 check: i + 1
}; };
...@@ -191,8 +191,8 @@ export class MapScene extends Scene { ...@@ -191,8 +191,8 @@ export class MapScene extends Scene {
private scrollToCheck(checkNum: number, time = 0) { private scrollToCheck(checkNum: number, time = 0) {
if (checkNum < 1) { if (checkNum < 1) {
checkNum = 1; checkNum = 1;
} else if (checkNum > 99) { } else if (checkNum > Tools.maxLevel) {
checkNum = 99; checkNum = Tools.maxLevel;
} }
const check = MapScene.checkArr[checkNum]; const check = MapScene.checkArr[checkNum];
const checkY = check.y + check.parent.y - layers.stageHeight / 2 + 50; const checkY = check.y + check.parent.y - layers.stageHeight / 2 + 50;
......
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