Skip to content

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

斐乐消消乐

parent 67269ba2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 618 additions and 11217 deletions
.idea/codeStyles/codeStyleConfig.xml deleted 100644 → 0
View file @ 67269ba2
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
</state>
</component>
\ No newline at end of file
.idea/inspectionProfiles/Project_Default.xml
View file @ a84c624d
<component name="InspectionProjectProfileManager"> <component name="InspectionProjectProfileManager">
<profile version="1.0"> <profile version="1.0">
<option name="myName" value="Project Default" /> <option name="myName" value="Project Default" />
<inspection_tool class="TsLint" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="HtmlRequiredAltAttribute" enabled="false" level="WARNING" enabled_by_default="false" />
</profile> </profile>
</component> </component>
\ No newline at end of file
.idea/misc.xml deleted 100644 → 0
View file @ 67269ba2
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
</project>
\ No newline at end of file
.idea/modules.xml
View file @ a84c624d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<project version="4"> <project version="4">
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/.idea/babycare_xiaoxiao.iml" filepath="$PROJECT_DIR$/.idea/babycare_xiaoxiao.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/斐乐消消乐.iml" filepath="$PROJECT_DIR$/.idea/斐乐消消乐.iml" />
</modules> </modules>
</component> </component>
</project> </project>
\ No newline at end of file
.idea/workspace.xml
View file @ a84c624d
This diff is collapsed.
.idea/babycare_xiaoxiao.iml → .idea/斐乐消消乐.iml
View file @ a84c624d
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<module type="WEB_MODULE" version="4"> <module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager"> <component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/temp" /> <excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/tmp" /> <excludeFolder url="file://$MODULE_DIR$/tmp" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
......
lotties/aa.json deleted 100644 → 0
View file @ 67269ba2
This diff is collapsed.
lotties/bb.json deleted 100644 → 0
View file @ 67269ba2
This diff is collapsed.
lotties/bonusTime.json 0 → 100644
View file @ a84c624d
This diff is collapsed.
lotties/checkTip.json 0 → 100644
View file @ a84c624d
This diff is collapsed.
package.json
View file @ a84c624d
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
"scripts": { "scripts": {
"psd": "node scripts/psdH.js && node scripts/flushRes", "psd": "node scripts/psdH.js && node scripts/flushRes",
"createModule": "node scripts/createModule", "createModule": "node scripts/createModule",
"handleLotS": "node scripts/handleLotS",
"flushRes": "node scripts/flushRes", "flushRes": "node scripts/flushRes",
"handleRes": "node scripts/delRel && node scripts/copyRes && node scripts/createTm && node scripts/textureMerge && node scripts/delTm && node scripts/imageMin", "handleRes": "node scripts/delRel && node scripts/copyRes && node scripts/createTm && node scripts/textureMerge && node scripts/delTm && node scripts/imageMin",
"upload": "node scripts/upload", "upload": "node scripts/upload",
......
resource/playScene/gameGuideBoard.png
View replaced file @ 67269ba2 View file @ a84c624d
resource/playScene/gameGuideBoard.png

47.3 KB | W: | H:

resource/playScene/gameGuideBoard.png

216 KB | W: | H:

resource/playScene/gameGuideBoard.png
resource/playScene/gameGuideBoard.png
resource/playScene/gameGuideBoard.png
resource/playScene/gameGuideBoard.png
  • 2-up
  • Swipe
  • Onion skin
resource/res.json
View file @ a84c624d
...@@ -72,6 +72,10 @@ ...@@ -72,6 +72,10 @@
"keys": "amazing.png,great.png,img_0.png,img_1.png,img_10.png,img_11.png,img_12.png,img_13.png,img_14.png,img_15.png,img_16.png,img_17.png,img_18.png,img_19.png,img_2.png,img_3.png,img_4.png,img_5.png,img_6.png,img_7.png,img_8.png,img_9.png,wonderful.png", "keys": "amazing.png,great.png,img_0.png,img_1.png,img_10.png,img_11.png,img_12.png,img_13.png,img_14.png,img_15.png,img_16.png,img_17.png,img_18.png,img_19.png,img_2.png,img_3.png,img_4.png,img_5.png,img_6.png,img_7.png,img_8.png,img_9.png,wonderful.png",
"name": "bonusTime" "name": "bonusTime"
}, },
{
"keys": "0250abc4-fabc-4bf3-970a-46ceeb12d416.png,03756d82-4e5c-4bdc-8247-7f704ed92ba7.png,0b1a21c5-2e2f-43bc-81f7-ee1c4474d07f.png,0f025d15-5a0b-4e5d-81e9-4a822c469467.png,445121aa-3bae-4b89-a8e9-fd41e2779276.png,54e427a5-b930-4506-a07d-8f1d7eb83ff5.png,560f6473-1e86-433f-a2fb-8e6d0c06d32f.png,8d000f4d-318a-47a1-9fa4-53c7b203a8fd.png,9ed4a149-8df3-45d4-b531-63b82833255a.png,b0c2b486-8dab-4c34-bec4-02e4b4ef835b.png,cd544214-fe15-402a-99a0-a57072952722.png",
"name": "bonus_lottie"
},
{ {
"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,powerImg.png,stepBtn.png,target0.png,target1.png,target2.png,target3.png,target4.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,powerImg.png,stepBtn.png,target0.png,target1.png,target2.png,target3.png,target4.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common" "name": "common"
...@@ -101,7 +105,7 @@ ...@@ -101,7 +105,7 @@
"name": "mapCheckPrizeEffect" "name": "mapCheckPrizeEffect"
}, },
{ {
"keys": "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,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.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,playBg.jpg,propNumBg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum当.png,settingBg.png,settingBtn.png,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png", "keys": "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,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.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,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,settingBg.png,settingBtn.png,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene" "name": "playScene"
}, },
{ {
...@@ -115,6 +119,10 @@ ...@@ -115,6 +119,10 @@
{ {
"keys": "star_light_0.png,star_light_1.png,star_light_10.png,star_light_11.png,star_light_12.png,star_light_13.png,star_light_14.png,star_light_15.png,star_light_2.png,star_light_3.png,star_light_4.png,star_light_5.png,star_light_6.png,star_light_7.png,star_light_8.png,star_light_9.png", "keys": "star_light_0.png,star_light_1.png,star_light_10.png,star_light_11.png,star_light_12.png,star_light_13.png,star_light_14.png,star_light_15.png,star_light_2.png,star_light_3.png,star_light_4.png,star_light_5.png,star_light_6.png,star_light_7.png,star_light_8.png,star_light_9.png",
"name": "starLight" "name": "starLight"
},
{
"keys": "e305be55-fdfd-453b-9e6d-41edfe68c0f1.png",
"name": "关卡提示"
} }
], ],
"path": "./resource/" "path": "./resource/"
......
scripts/handleLot.js
View file @ a84c624d
...@@ -4,7 +4,7 @@ var iconv = require('iconv-lite'); ...@@ -4,7 +4,7 @@ var iconv = require('iconv-lite');
//暂时用作测试用 //暂时用作测试用
return return
var data = iconv.decode(fs.readFileSync("./lotties/bb.json"), "utf-8");//GBK var data = iconv.decode(fs.readFileSync("./lotties/checkTip.json"), "utf-8");//GBK
//反序列化 //反序列化
data = JSON.parse(data); data = JSON.parse(data);
......
scripts/handleLotS.js
View file @ a84c624d
...@@ -3,7 +3,7 @@ var iconv = require('iconv-lite'); ...@@ -3,7 +3,7 @@ var iconv = require('iconv-lite');
var path = require('path'); var path = require('path');
//用于处理带base64图片的lottie文件，取出图片，同名lottie文件夹，写入代码"./src/lotties/"中; //用于处理带base64图片的lottie文件，取出图片，同名lottie文件夹，写入代码"./src/lotties/"中;
var pathName = "./lottiesT" var pathName = "./lotties"
//读文件夹 //读文件夹
var files = fs.readdirSync(pathName); var files = fs.readdirSync(pathName);
//对每个json文件作处理 //对每个json文件作处理
...@@ -30,7 +30,7 @@ files.forEach(function (lottiesFileName) { ...@@ -30,7 +30,7 @@ files.forEach(function (lottiesFileName) {
//存图片 //存图片
var base64 = e.p.replace(/^data:image\/\w+;base64,/, "");//去掉图片base64码前面部分data:image/png;base64 var base64 = e.p.replace(/^data:image\/\w+;base64,/, "");//去掉图片base64码前面部分data:image/png;base64
var dataBuffer = new Buffer(base64, 'base64'); //把base64码转成buffer对象， var dataBuffer = new Buffer(base64, 'base64'); //把base64码转成buffer对象，
fs.writeFile(imgOutPath + "/" + uuid + ".png", dataBuffer); fs.writeFile(imgOutPath + "/" + uuid + ".png", dataBuffer, ()=>0);
//修改用到id的所有refId //修改用到id的所有refId
data.layers.forEach((l) => { l.refId === id && (l.refId = uuid) }) data.layers.forEach((l) => { l.refId === id && (l.refId = uuid) })
}) })
......
src/ResJson.ts
View file @ a84c624d
...@@ -72,6 +72,10 @@ export const ResJson = { ...@@ -72,6 +72,10 @@ export const ResJson = {
"keys": "amazing.png,great.png,img_0.png,img_1.png,img_10.png,img_11.png,img_12.png,img_13.png,img_14.png,img_15.png,img_16.png,img_17.png,img_18.png,img_19.png,img_2.png,img_3.png,img_4.png,img_5.png,img_6.png,img_7.png,img_8.png,img_9.png,wonderful.png", "keys": "amazing.png,great.png,img_0.png,img_1.png,img_10.png,img_11.png,img_12.png,img_13.png,img_14.png,img_15.png,img_16.png,img_17.png,img_18.png,img_19.png,img_2.png,img_3.png,img_4.png,img_5.png,img_6.png,img_7.png,img_8.png,img_9.png,wonderful.png",
"name": "bonusTime" "name": "bonusTime"
}, },
{
"keys": "0250abc4-fabc-4bf3-970a-46ceeb12d416.png,03756d82-4e5c-4bdc-8247-7f704ed92ba7.png,0b1a21c5-2e2f-43bc-81f7-ee1c4474d07f.png,0f025d15-5a0b-4e5d-81e9-4a822c469467.png,445121aa-3bae-4b89-a8e9-fd41e2779276.png,54e427a5-b930-4506-a07d-8f1d7eb83ff5.png,560f6473-1e86-433f-a2fb-8e6d0c06d32f.png,8d000f4d-318a-47a1-9fa4-53c7b203a8fd.png,9ed4a149-8df3-45d4-b531-63b82833255a.png,b0c2b486-8dab-4c34-bec4-02e4b4ef835b.png,cd544214-fe15-402a-99a0-a57072952722.png",
"name": "bonus_lottie"
},
{ {
"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,powerImg.png,stepBtn.png,target0.png,target1.png,target2.png,target3.png,target4.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,powerImg.png,stepBtn.png,target0.png,target1.png,target2.png,target3.png,target4.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common" "name": "common"
...@@ -101,7 +105,7 @@ export const ResJson = { ...@@ -101,7 +105,7 @@ export const ResJson = {
"name": "mapCheckPrizeEffect" "name": "mapCheckPrizeEffect"
}, },
{ {
"keys": "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,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.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,playBg.jpg,propNumBg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum当.png,settingBg.png,settingBtn.png,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png", "keys": "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,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.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,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,settingBg.png,settingBtn.png,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene" "name": "playScene"
}, },
{ {
...@@ -115,6 +119,10 @@ export const ResJson = { ...@@ -115,6 +119,10 @@ export const ResJson = {
{ {
"keys": "star_light_0.png,star_light_1.png,star_light_10.png,star_light_11.png,star_light_12.png,star_light_13.png,star_light_14.png,star_light_15.png,star_light_2.png,star_light_3.png,star_light_4.png,star_light_5.png,star_light_6.png,star_light_7.png,star_light_8.png,star_light_9.png", "keys": "star_light_0.png,star_light_1.png,star_light_10.png,star_light_11.png,star_light_12.png,star_light_13.png,star_light_14.png,star_light_15.png,star_light_2.png,star_light_3.png,star_light_4.png,star_light_5.png,star_light_6.png,star_light_7.png,star_light_8.png,star_light_9.png",
"name": "starLight" "name": "starLight"
},
{
"keys": "e305be55-fdfd-453b-9e6d-41edfe68c0f1.png",
"name": "关卡提示"
} }
], ],
"path": "./resource/" "path": "./resource/"
......
src/lotties/bonus_lottie.ts
View file @ a84c624d
This diff is collapsed.
src/lotties/关卡提示.ts 0 → 100644
View file @ a84c624d
export const 关卡提示 = {
"v": "5.6.10",
"fr": 24,
"ip": 0,
"op": 26,
"w": 308,
"h": 226,
"nm": "关卡提示",
"layers": [
{
"ind": 1,
"ty": 2,
"nm": "关卡提示.png",
"refId": "e305be55-fdfd-453b-9e6d-41edfe68c0f1",
"ks": {
"o": {
"a": 1,
"k": [
{
"t": 16,
"s": [
70
]
},
{
"t": 25,
"s": [
0
]
}
]
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
154,
114,
0
]
},
"a": {
"a": 0,
"k": [
82.5,
54,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 10,
"s": [
100,
100,
100
]
},
{
"t": 25,
"s": [
140,
140,
100
]
}
]
}
},
"ip": 10,
"op": 1210
},
{
"ind": 2,
"ty": 2,
"nm": "关卡提示.png",
"refId": "e305be55-fdfd-453b-9e6d-41edfe68c0f1",
"ks": {
"o": {
"a": 1,
"k": [
{
"t": 6,
"s": [
70
]
},
{
"t": 15,
"s": [
0
]
}
]
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
154,
114,
0
]
},
"a": {
"a": 0,
"k": [
82.5,
54,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 0,
"s": [
100,
100,
100
]
},
{
"t": 15,
"s": [
140,
140,
100
]
}
]
}
},
"ip": 0,
"op": 1200
}
],
"markers": []
}
\ No newline at end of file
src/scene/LoadingScene.ts
View file @ a84c624d
...@@ -94,7 +94,7 @@ export class LoadingScene extends Scene { ...@@ -94,7 +94,7 @@ export class LoadingScene extends Scene {
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"})
changeScene(PlayScene, {chapter: 1}); changeScene(PlayScene, {chapter: 0});
// changeScene(LotteryScene,{level:1}); // changeScene(LotteryScene,{level:1});
} }
}) })
......
src/scene/PlayScene.ts
View file @ a84c624d
...@@ -24,7 +24,6 @@ import { MagicRotateData } from '../something/interface/MagicRotateData'; ...@@ -24,7 +24,6 @@ import { MagicRotateData } from '../something/interface/MagicRotateData';
import { drawBg, drawShape, generateMapBg } from '../something/logic/aaa'; import { drawBg, drawShape, generateMapBg } from '../something/logic/aaa';
import { Pool } from '../something/Pool'; import { Pool } from '../something/Pool';
import { Tool } from '../something/Tool'; import { Tool } from '../something/Tool';
import { BonusTime } from '../something/uis/BonusTime';
import { ElementTargets } from '../something/uis/ElementTargets'; import { ElementTargets } from '../something/uis/ElementTargets';
import { PropGuide } from '../something/uis/PropGuide'; import { PropGuide } from '../something/uis/PropGuide';
import { ScoreProgress } from '../something/uis/ScoreProgress'; import { ScoreProgress } from '../something/uis/ScoreProgress';
...@@ -52,9 +51,8 @@ import { GTool } from '../../module/tools/GTool'; ...@@ -52,9 +51,8 @@ import { GTool } from '../../module/tools/GTool';
import { Tools } from '../Tools'; import { Tools } from '../Tools';
import { PropType } from '../something/enum/PropType'; import { PropType } from '../something/enum/PropType';
import { RES } from '../../module/RES'; import { RES } from '../../module/RES';
import { showToast, showWaiting, showPanel, hideWaiting, wait, changeScene } from '../../module/ctrls'; import { changeScene, hideWaiting, showPanel, showToast, showWaiting, wait } from '../../module/ctrls';
import { layers } from '../../module/views/layers'; import { layers } from '../../module/views/layers';
import { ToolsOutPanel } from '../panels/ToolsOutPanel';
import { Lottie } from '../Lottie'; import { Lottie } from '../Lottie';
import { GameToast } from '../something/uis/GameToast'; import { GameToast } from '../something/uis/GameToast';
...@@ -121,7 +119,7 @@ const festivalIndex: number = 40 ...@@ -121,7 +119,7 @@ const festivalIndex: number = 40
export class PlayScene extends Scene { export class PlayScene extends Scene {
get groupNames() { get groupNames() {
return ["playScene", "fiveVerHorDis", "playSceneEffect", "playSceneNum"] return ["playScene", "fiveVerHorDis", "playSceneEffect", "playSceneNum", "bonus_lottie"]
} }
//关卡数据 //关卡数据
...@@ -276,8 +274,8 @@ export class PlayScene extends Scene { ...@@ -276,8 +274,8 @@ export class PlayScene extends Scene {
start(data: { chapter: number }) { start(data: { chapter: number }) {
super.start(); super.start();
// data = { chapter: 1 } // data = { chapter: 1 }
//第几关 //第几关 TODO 这里改了 (data && data.chapter) ? data.chapter : 1;
this.chapter = (data && data.chapter) ? data.chapter : 1; this.chapter = (data && data.chapter != null && data.chapter != undefined) ? data.chapter : 1;
// this.chapter = 6; // this.chapter = 6;
//关卡数据 //关卡数据
this.chapterData = getChapterData(this.chapter); this.chapterData = getChapterData(this.chapter);
...@@ -350,7 +348,6 @@ export class PlayScene extends Scene { ...@@ -350,7 +348,6 @@ export class PlayScene extends Scene {
*/ */
async initSvgas() { async initSvgas() {
//这里加载资源吧 //这里加载资源吧
await RES.loadGroup("bonusTime")
var bonusTime = new Lottie(bonus_lottie) var bonusTime = new Lottie(bonus_lottie)
bonusTime.position.set( bonusTime.position.set(
(750 - bonusTime.videoWidth) / 2, (750 - bonusTime.videoWidth) / 2,
...@@ -870,34 +867,16 @@ export class PlayScene extends Scene { ...@@ -870,34 +867,16 @@ export class PlayScene extends Scene {
b.y = bp[1]; b.y = bp[1];
} }
// onTap_settingBtn() {
// this.settingGroup.visible = !this.settingGroup.visible;
// }
// onTap_musicBtn() {
// // toggleBg();
// toggleGameBg();
// if (getBgOn()) {
// this.musicBtn.source = "mainMusicBtnOn.png"
// } else {
// this.musicBtn.source = "mainMusicBtnOff.png"
// }
// }
onTap_boomBtn() { onTap_boomBtn() {
this.propBtnCon.boomCount ? this.propBtnCon.boomCount ? this.useProp(PropType.BOOMS) : showToast("道具不足");
this.useProp(PropType.BOOMS) :
showPanel(ToolsOutPanel, { type: PropType.BOOMS, showSucPanel: true });//注意弹框逻辑，购买完后要调用updateScene
} }
onTap_hammerBtn() { onTap_hammerBtn() {
this.propBtnCon.hammerCount ? this.propBtnCon.hammerCount ? this.useProp(PropType.HAMMERS) : showToast("道具不足");
this.useProp(PropType.HAMMERS) :
showPanel(ToolsOutPanel, { type: PropType.HAMMERS, showSucPanel: true });//注意弹框逻辑，购买完后要调用updateScene
} }
onTap_stepBtn() { onTap_stepBtn() {
this.propBtnCon.stepCount ? this.propBtnCon.stepCount ? this.useProp(PropType.STEPS) : showToast("道具不足");
this.useProp(PropType.STEPS) :
showPanel(ToolsOutPanel, { type: PropType.STEPS, showSucPanel: true });//注意弹框逻辑，购买完后要调用updateScene
} }
//使用道具逻辑 //使用道具逻辑
......
src/something/chapters/Chapter1.ts
View file @ a84c624d
...@@ -6,8 +6,63 @@ import { ElementType } from "../enum/ElementType"; ...@@ -6,8 +6,63 @@ import { ElementType } from "../enum/ElementType";
* 1到20关数据 * 1到20关数据
*/ */
export const Chapters1: ChapterData[] = [ export const Chapters1: ChapterData[] = [
//第0关为空吧, //第0关测试,
null, {
baseElementTypes: [0, 1, 2, 3],
bubbleProbability: 0,
stepCount: 25,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.CHICKEN,
count: 1,
},
],
},
starScores: [1000, 5000, 10000],
map: {
lattices: [
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 1, 0, 0, 0, 1, 0, 0,
0, 1, 1, 1, 0, 1, 1, 1, 0,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
0, 1, 1, 1, 1, 1, 1, 1, 0,
0, 0, 1, 1, 1, 1, 1, 0, 0,
0, 0, 0, 1, 1, 1, 0, 0, 0,
0, 0, 0, 0, 1, 0, 0, 0, 0,
],
generateLats: [
{ index: 11, type: [0], cus: [] },
{ index: 15, type: [0], cus: [] },
],
// connectedLats: [[0, 18], [1, 19], [2, 20]],
elements: [
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 1, 0, 0, 0, 1, 0, 0,
0, 1, 1, 1, 0, 1, 1, 1, 0,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
0, 1, 1, 1, 1, 1, 1, 1, 0,
0, 0, 1, 1, 1, 1, 1, 0, 0,
0, 0, 0, 1, 1, 1, 0, 0, 0,
0, 0, 0, 0, 1, 0, 0, 0, 0,
],
baseElements: [
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 20, 0, 0, 0, 20, 0, 0,
0, 20, 10, 20, 0, 20, 10, 20, 0,
20, 10, 20, 10, 20, 10, 20, 10, 20,
20, 10, 20, 20, 10, 20, 20, 10, 20,
0, 20, 10, 20, 10, 20, 10, 20, 0,
0, 0, 20, 10, 20, 10, 20, 0, 0,
0, 0, 0, 20, 10, 20, 0, 0, 0,
0, 0, 0, 0, 20, 0, 0, 0, 0,
],
// recycles: [70, 71, 72, 73]
},
},
//1引导基本消除 //1引导基本消除
{ {
baseElementTypes: [0, 1, 2, 3], baseElementTypes: [0, 1, 2, 3],
...@@ -625,7 +680,7 @@ export const Chapters1: ChapterData[] = [ ...@@ -625,7 +680,7 @@ export const Chapters1: ChapterData[] = [
connectedLats: [[3, 21], [4, 22], [5, 23], [6, 24], [7, 25]] connectedLats: [[3, 21], [4, 22], [5, 23], [6, 24], [7, 25]]
}, },
}, },
//11 //11
{ {
baseElementTypes: [0, 1, 2, 3, 4], baseElementTypes: [0, 1, 2, 3, 4],
bubbleProbability: 0, bubbleProbability: 0,
...@@ -1245,4 +1300,4 @@ export const Chapters1: ChapterData[] = [ ...@@ -1245,4 +1300,4 @@ export const Chapters1: ChapterData[] = [
recycles: [72, 73, 74, 77, 75, 76, 78] recycles: [72, 73, 74, 77, 75, 76, 78]
}, },
}, },
] ]
\ No newline at end of file
src/something/uis/FirstPropGift.ts
View file @ a84c624d
...@@ -15,11 +15,11 @@ export class FirstPropGift extends FYGE.Container { ...@@ -15,11 +15,11 @@ export class FirstPropGift extends FYGE.Container {
//信息板 //信息板
var msgBoard = this.addChild(new MsgBoard()); var msgBoard = this.addChild(new MsgBoard());
msgBoard.position.set((750 - 604) / 2, 800); msgBoard.position.set((750 - 604) / 2, 800);
msgBoard.msg = "首次进入游戏，送你三个道具，让你通关无阻力！"; // msgBoard.msg = "首次进入游戏，送你三个道具，让你通关无阻力！";
//三个道具 //三个道具
["stepBtn", "boomBtn", "hammerBtn"].forEach((e, i) => { ["stepBtn", "boomBtn", "hammerBtn"].forEach((e, i) => {
this.addChild(FYGE.Sprite.fromFrame(e + ".png")) this.addChild(FYGE.Sprite.fromFrame(e + ".png"))
.position.set(100 + i * 230, 500) .position.set(100 + i * 230, 500)
}) })
} }
} }
\ No newline at end of file
src/something/uis/PropGuide.ts
View file @ a84c624d
...@@ -3,6 +3,8 @@ import { Tool } from "../Tool"; ...@@ -3,6 +3,8 @@ import { Tool } from "../Tool";
import { RES } from "../../../module/RES"; import { RES } from "../../../module/RES";
import { PropType } from "../enum/PropType"; import { PropType } from "../enum/PropType";
import { stepPosition } from "../anis/BonusShootAni"; import { stepPosition } from "../anis/BonusShootAni";
import Sprite = FYGE.Sprite;
import calculateSpriteMatrix = FYGE.calculateSpriteMatrix;
/** /**
* 道具使用引导，初始化一次，然后用init初始化 * 道具使用引导，初始化一次，然后用init初始化
...@@ -37,12 +39,14 @@ export class PropGuide extends FYGE.Container { ...@@ -37,12 +39,14 @@ export class PropGuide extends FYGE.Container {
text.text = "为本次增加额外5次步数"; text.text = "为本次增加额外5次步数";
text.fillColor = "#ffffff"; text.fillColor = "#ffffff";
text.size = 20; text.size = 20;
text.x = (750 - 500) / 2; text.y = offsetY - 120;
text.y = offsetY - 30;
text.textAlign = FYGE.TEXT_ALIGN.CENTER; text.textAlign = FYGE.TEXT_ALIGN.CENTER;
text.textWidth = 500; text.textWidth = 750;
this.addChild(text); this.addChild(text);
this.msgTxt = text; this.msgTxt = text;
const cancel = this.addChild(new Sprite(RES.getRes("propCancel.png")));
cancel.position.set(290, offsetY - 70);
} }
init(prop: PropType) { init(prop: PropType) {
if (prop == PropType.BOOMS) { if (prop == PropType.BOOMS) {
...@@ -58,7 +62,7 @@ export class PropGuide extends FYGE.Container { ...@@ -58,7 +62,7 @@ export class PropGuide extends FYGE.Container {
this.hammerBtn.visible = true; this.hammerBtn.visible = true;
this.stepBtn.visible = false; this.stepBtn.visible = false;
this.setRect(); this.setRect();
this.msgTxt.text = "选择任意一个元素即可消除"; this.msgTxt.text = "选择任意一个元素，直接消除掉它";
// this.msgTxt.x = (750-500)/2; // this.msgTxt.x = (750-500)/2;
} }
else { else {
...@@ -78,6 +82,9 @@ export class PropGuide extends FYGE.Container { ...@@ -78,6 +82,9 @@ export class PropGuide extends FYGE.Container {
this.msgTxt.text = "点击上方步数，可为闯关时增加额外5次步数"; this.msgTxt.text = "点击上方步数，可为闯关时增加额外5次步数";
// this.msgTxt.x = 320; // this.msgTxt.x = 320;
} }
this.msgTxt.fillColor = "#f4f4df";
this.msgTxt.size = 33;
} }
setRect() { setRect() {
......
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