Skip to content

X
xiaoxiaole
Commit b1675f08 authored by wildfirecode's avatar wildfirecode
Browse files
Options

1

parent cebf7107
Show whitespace changes
Inline Side-by-side
Showing with 113 additions and 73 deletions
egret/resource/default.res.json
View file @ b1675f08
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
"name": "common" "name": "common"
}, },
{ {
"keys": "startpanel通关条件_png,startpanel数量_png,startpanel数量 副本 3_png,startpanel目标33_png,startpanel目标3_png,startpanel按钮_png,startpanel_icon3_png,startpanel_icon2_png,startpanel_icon1_png,startpanel_icon_png,startpanel_ice1_png,startpanel_ele6_png,startpanel_block2_png,startpanel_bg2_png,startpanel_avatar_png", "keys": "startpanel通关条件_png,startpanel数量_png,startpanel数量 副本 3_png,startpanel目标33_png,startpanel目标3_png,startpanel按钮_png,startpanel_icon3_png,startpanel_icon2_png,startpanel_icon1_png,startpanel_icon_png,startpanel_ice1_png,startpanel_ele6_png,startpanel_block2_png,startpanel_bg2_png,startpanel_avatar_png,startpanel_xxxx_png",
"name": "startpanel" "name": "startpanel"
}, },
{ {
...@@ -92,13 +92,13 @@ ...@@ -92,13 +92,13 @@
"keys": "invite_invite_png,invite_help_png,invite_btn_png,invite_bg_png,invitePrize_btn_png,invitePrize_bg_png,invitePrize_game_btn_png,invateCut_bg_png,invateCut_btn_png,invite_wx_tip_png", "keys": "invite_invite_png,invite_help_png,invite_btn_png,invite_bg_png,invitePrize_btn_png,invitePrize_bg_png,invitePrize_game_btn_png,invateCut_bg_png,invateCut_btn_png,invite_wx_tip_png",
"name": "invite" "name": "invite"
}, },
{
"keys": "bonusFra1_png,bonusFra10_png,bonusFra11_png,bonusFra12_png,bonusFra13_png,bonusFra14_png,bonusFra15_png,bonusFra16_png,bonusFra17_png,bonusFra18_png,bonusFra19_png,bonusFra2_png,bonusFra20_png,bonusFra21_png,bonusFra22_png,bonusFra23_png,bonusFra24_png,bonusFra25_png,bonusFra26_png,bonusFra27_png,bonusFra3_png,bonusFra4_png,bonusFra5_png,bonusFra6_png,bonusFra7_png,bonusFra8_png,bonusFra9_png,bonusShoot_png,bonusTime_png,boom1_png,boom10_png,boom11_png,boom12_png,boom13_png,boom14_png,boom15_png,boom16_png,boom17_png,boom18_png,boom2_png,boom3_png,boom4_png,boom5_png,boom6_png,boom7_png,boom8_png,boom9_png,boomBtn_png,chooseRect_png,dangqianfenshu_png,ele0_png,ele0Exp_png,ele0Line_png,ele1_png,ele1Exp_png,ele1Line_png,ele2_png,ele2Exp_png,ele2Line_png,ele3_png,ele3Exp_png,ele3Line_png,ele4_png,ele4Exp_png,ele4Line_png,ele5_png,ele6_png,ele7_png,ele8_png,eleDis1_png,eleDis10_png,eleDis11_png,eleDis12_png,eleDis13_png,eleDis14_png,eleDis15_png,eleDis16_png,eleDis17_png,eleDis18_png,eleDis19_png,eleDis2_png,eleDis3_png,eleDis4_png,eleDis5_png,eleDis6_png,eleDis7_png,eleDis8_png,eleDis9_png,exLighting1_png,exLighting11_png,exLighting14_png,exLighting16_png,exLighting18_png,exLighting19_png,exLighting21_png,exLighting23_png,exLighting25_png,exLighting27_png,exLighting29_png,exLighting3_png,exLighting32_png,exLighting34_png,exLighting5_png,exLighting7_png,exLighting9_png,guideBg_png,guideKnowBtn_png,guidePropBoom_png,guidePropCow_png,guidePropHammer_png,guidePropHand_png,guidePropMsgPanel_png,guidePropShoe_png,guideTxt1_png,guideTxt2_png,guideTxt3_png,guideTxt4_png,guideTxt5_png,hammerBtn_png,ice2_png,ice3_png,ice4_png,ice5_png,ice6_png,leftArrow_png,lightedStar_png,lineLight_png,lockDown_png,lockUp_png,lockVine_png,magicLion_png,magicLionBg_png,mainMusicBtnOff_png,mainMusicBtnOn_png,mainQuestionBtn_png,mainQuitBtn_png,mainSettingBg_png,mainSoundBtnOff_png,mainSoundBtnOn_png,main_mapbottom_png,playSceneBg_jpg,progressDown_png,propNum0_png,propNum1_png,propNum2_png,propNum3_png,propNum4_png,propNum5_png,propNum6_png,propNum7_png,propNum8_png,propNum9_png,propNumBg_png,rectLat_png,rightArrow_png,rightMark_png,rock2_png,rock3_png,rock4_png,rock5_png,rock6_png,scoreNumber0_png,scoreNumber1_png,scoreNumber2_png,scoreNumber3_png,scoreNumber4_png,scoreNumber5_png,scoreNumber6_png,scoreNumber7_png,scoreNumber8_png,scoreNumber9_png,setting_png,starProgress_png,stepAni1_png,stepAni10_png,stepAni11_png,stepAni2_png,stepAni3_png,stepAni4_png,stepAni5_png,stepAni6_png,stepAni7_png,stepAni8_png,stepAni9_png,stepBtn_png,stepNumber0_png,stepNumber1_png,stepNumber2_png,stepNumber3_png,stepNumber4_png,stepNumber5_png,stepNumber6_png,stepNumber7_png,stepNumber8_png,stepNumber9_png,stepsBoard_png,targetBoard_png,targetNumber0_png,targetNumber1_png,targetNumber2_png,targetNumber3_png,targetNumber4_png,targetNumber5_png,targetNumber6_png,targetNumber7_png,targetNumber8_png,targetNumber9_png,unlightedStar_png,yezi1_png",
"name": "main2"
},
{ {
"keys": "按钮 副本_png", "keys": "按钮 副本_png",
"name": "h5" "name": "h5"
},
{
"keys": "bonusFra1_png,bonusFra10_png,bonusFra11_png,bonusFra12_png,bonusFra13_png,bonusFra14_png,bonusFra15_png,bonusFra16_png,bonusFra17_png,bonusFra18_png,bonusFra19_png,bonusFra2_png,bonusFra20_png,bonusFra21_png,bonusFra22_png,bonusFra23_png,bonusFra24_png,bonusFra25_png,bonusFra26_png,bonusFra27_png,bonusFra3_png,bonusFra4_png,bonusFra5_png,bonusFra6_png,bonusFra7_png,bonusFra8_png,bonusFra9_png,bonusShoot_png,bonusTime_png,boom1_png,boom10_png,boom11_png,boom12_png,boom13_png,boom14_png,boom15_png,boom16_png,boom17_png,boom18_png,boom2_png,boom3_png,boom4_png,boom5_png,boom6_png,boom7_png,boom8_png,boom9_png,boomBtn_png,chooseRect_png,dangqianfenshu_png,eggPiece1_png,eggPiece2_png,eggPiece3_png,eggPiece4_png,eggPiece5_png,eggStatus0_png,eggStatus1_png,eggStatus2_png,ele0_png,ele0Exp_png,ele0Line_png,ele1_png,ele1Exp_png,ele1Line_png,ele2_png,ele2Exp_png,ele2Line_png,ele3_png,ele3Exp_png,ele3Line_png,ele4_png,ele4Exp_png,ele4Line_png,ele5_png,ele6_png,ele7_png,ele8_png,ele9_png,eleDis1_png,eleDis10_png,eleDis11_png,eleDis12_png,eleDis13_png,eleDis14_png,eleDis15_png,eleDis16_png,eleDis17_png,eleDis18_png,eleDis19_png,eleDis2_png,eleDis3_png,eleDis4_png,eleDis5_png,eleDis6_png,eleDis7_png,eleDis8_png,eleDis9_png,exLighting1_png,exLighting11_png,exLighting14_png,exLighting16_png,exLighting18_png,exLighting19_png,exLighting21_png,exLighting23_png,exLighting25_png,exLighting27_png,exLighting29_png,exLighting3_png,exLighting32_png,exLighting34_png,exLighting5_png,exLighting7_png,exLighting9_png,greenCircleDown_png,greenCircleUp_png,guidePropBoom_png,guidePropCow_png,guidePropHammer_png,guidePropHand_png,guidePropMsgPanel_png,guidePropShoe_png,hammerBtn_png,ice2_png,ice3_png,ice4_png,ice5_png,ice6_png,jellyArrow_png,leftArrow_png,lightedStar_png,lineLight_png,lockDown_png,lockUp_png,lockVine_png,magicLion_png,magicLionBg_png,mainMusicBtnOff_png,mainMusicBtnOn_png,mainQuestionBtn_png,mainQuitBtn_png,mainSettingBg_png,mainSoundBtnOff_png,mainSoundBtnOn_png,main_mapbottom_png,playSceneBg_jpg,progressDown_png,propNum0_png,propNum1_png,propNum2_png,propNum3_png,propNum4_png,propNum5_png,propNum6_png,propNum7_png,propNum8_png,propNum9_png,propNumBg_png,rectLat_png,rightArrow_png,rightMark_png,rock2_png,rock3_png,rock4_png,rock5_png,rock6_png,scoreNumber0_png,scoreNumber1_png,scoreNumber2_png,scoreNumber3_png,scoreNumber4_png,scoreNumber5_png,scoreNumber6_png,scoreNumber7_png,scoreNumber8_png,scoreNumber9_png,setting_png,starProgress_png,stepAni1_png,stepAni10_png,stepAni11_png,stepAni2_png,stepAni3_png,stepAni4_png,stepAni5_png,stepAni6_png,stepAni7_png,stepAni8_png,stepAni9_png,stepBtn_png,stepNumber0_png,stepNumber1_png,stepNumber2_png,stepNumber3_png,stepNumber4_png,stepNumber5_png,stepNumber6_png,stepNumber7_png,stepNumber8_png,stepNumber9_png,stepsBoard_png,targetBoard_png,targetNumber0_png,targetNumber1_png,targetNumber2_png,targetNumber3_png,targetNumber4_png,targetNumber5_png,targetNumber6_png,targetNumber7_png,targetNumber8_png,targetNumber9_png,unlightedStar_png,yellowCircleDown_png,yellowCircleUp_png,yezi1_png",
"name": "main2"
} }
], ],
"resources": [ "resources": [
...@@ -1027,6 +1027,51 @@ ...@@ -1027,6 +1027,51 @@
"type": "image", "type": "image",
"name": "startpanel通关条件_png" "name": "startpanel通关条件_png"
}, },
{
"url": "assets/invite/rule/invite_rule_bg.png",
"type": "image",
"name": "invite_rule_bg_png"
},
{
"url": "assets/invite/prize/invitePrize_btn.png",
"type": "image",
"name": "invitePrize_btn_png"
},
{
"url": "assets/invite/prize/invitePrize_bg.png",
"type": "image",
"name": "invitePrize_bg_png"
},
{
"url": "assets/invite/prize/invitePrize_game_btn.png",
"type": "image",
"name": "invitePrize_game_btn_png"
},
{
"url": "assets/invite/cutTime/invateCut_bg.png",
"type": "image",
"name": "invateCut_bg_png"
},
{
"url": "assets/invite/cutTime/invateCut_btn.png",
"type": "image",
"name": "invateCut_btn_png"
},
{
"url": "assets/invite/invite_wx_tip.png",
"type": "image",
"name": "invite_wx_tip_png"
},
{
"url": "assets/common/cutTimeFont.fnt",
"type": "font",
"name": "cutTimeFont_fnt"
},
{
"url": "assets/common/cutTimeFont.png",
"type": "image",
"name": "cutTimeFont_png"
},
{ {
"url": "assets/mainScene/bonusFra1.png", "url": "assets/mainScene/bonusFra1.png",
"type": "image", "type": "image",
...@@ -1277,6 +1322,46 @@ ...@@ -1277,6 +1322,46 @@
"type": "image", "type": "image",
"name": "dangqianfenshu_png" "name": "dangqianfenshu_png"
}, },
{
"url": "assets/mainScene/eggPiece1.png",
"type": "image",
"name": "eggPiece1_png"
},
{
"url": "assets/mainScene/eggPiece2.png",
"type": "image",
"name": "eggPiece2_png"
},
{
"url": "assets/mainScene/eggPiece3.png",
"type": "image",
"name": "eggPiece3_png"
},
{
"url": "assets/mainScene/eggPiece4.png",
"type": "image",
"name": "eggPiece4_png"
},
{
"url": "assets/mainScene/eggPiece5.png",
"type": "image",
"name": "eggPiece5_png"
},
{
"url": "assets/mainScene/eggStatus0.png",
"type": "image",
"name": "eggStatus0_png"
},
{
"url": "assets/mainScene/eggStatus1.png",
"type": "image",
"name": "eggStatus1_png"
},
{
"url": "assets/mainScene/eggStatus2.png",
"type": "image",
"name": "eggStatus2_png"
},
{ {
"url": "assets/mainScene/ele0.png", "url": "assets/mainScene/ele0.png",
"type": "image", "type": "image",
...@@ -1372,6 +1457,11 @@ ...@@ -1372,6 +1457,11 @@
"type": "image", "type": "image",
"name": "ele8_png" "name": "ele8_png"
}, },
{
"url": "assets/mainScene/ele9.png",
"type": "image",
"name": "ele9_png"
},
{ {
"url": "assets/mainScene/eleDis1.png", "url": "assets/mainScene/eleDis1.png",
"type": "image", "type": "image",
...@@ -1553,14 +1643,14 @@ ...@@ -1553,14 +1643,14 @@
"name": "exLighting9_png" "name": "exLighting9_png"
}, },
{ {
"url": "assets/mainScene/guideBg.png", "url": "assets/mainScene/greenCircleDown.png",
"type": "image", "type": "image",
"name": "guideBg_png" "name": "greenCircleDown_png"
}, },
{ {
"url": "assets/mainScene/guideKnowBtn.png", "url": "assets/mainScene/greenCircleUp.png",
"type": "image", "type": "image",
"name": "guideKnowBtn_png" "name": "greenCircleUp_png"
}, },
{ {
"url": "assets/mainScene/guidePropBoom.png", "url": "assets/mainScene/guidePropBoom.png",
...@@ -1592,31 +1682,6 @@ ...@@ -1592,31 +1682,6 @@
"type": "image", "type": "image",
"name": "guidePropShoe_png" "name": "guidePropShoe_png"
}, },
{
"url": "assets/mainScene/guideTxt1.png",
"type": "image",
"name": "guideTxt1_png"
},
{
"url": "assets/mainScene/guideTxt2.png",
"type": "image",
"name": "guideTxt2_png"
},
{
"url": "assets/mainScene/guideTxt3.png",
"type": "image",
"name": "guideTxt3_png"
},
{
"url": "assets/mainScene/guideTxt4.png",
"type": "image",
"name": "guideTxt4_png"
},
{
"url": "assets/mainScene/guideTxt5.png",
"type": "image",
"name": "guideTxt5_png"
},
{ {
"url": "assets/mainScene/hammerBtn.png", "url": "assets/mainScene/hammerBtn.png",
"type": "image", "type": "image",
...@@ -1647,6 +1712,11 @@ ...@@ -1647,6 +1712,11 @@
"type": "image", "type": "image",
"name": "ice6_png" "name": "ice6_png"
}, },
{
"url": "assets/mainScene/jellyArrow.png",
"type": "image",
"name": "jellyArrow_png"
},
{ {
"url": "assets/mainScene/leftArrow.png", "url": "assets/mainScene/leftArrow.png",
"type": "image", "type": "image",
...@@ -2068,54 +2138,24 @@ ...@@ -2068,54 +2138,24 @@
"name": "unlightedStar_png" "name": "unlightedStar_png"
}, },
{ {
"url": "assets/mainScene/yezi1.png", "url": "assets/mainScene/yellowCircleDown.png",
"type": "image",
"name": "yezi1_png"
},
{
"url": "assets/invite/rule/invite_rule_bg.png",
"type": "image",
"name": "invite_rule_bg_png"
},
{
"url": "assets/invite/prize/invitePrize_btn.png",
"type": "image",
"name": "invitePrize_btn_png"
},
{
"url": "assets/invite/prize/invitePrize_bg.png",
"type": "image",
"name": "invitePrize_bg_png"
},
{
"url": "assets/invite/prize/invitePrize_game_btn.png",
"type": "image",
"name": "invitePrize_game_btn_png"
},
{
"url": "assets/invite/cutTime/invateCut_bg.png",
"type": "image", "type": "image",
"name": "invateCut_bg_png" "name": "yellowCircleDown_png"
}, },
{ {
"url": "assets/invite/cutTime/invateCut_btn.png", "url": "assets/mainScene/yellowCircleUp.png",
"type": "image", "type": "image",
"name": "invateCut_btn_png" "name": "yellowCircleUp_png"
}, },
{ {
"url": "assets/invite/invite_wx_tip.png", "url": "assets/mainScene/yezi1.png",
"type": "image", "type": "image",
"name": "invite_wx_tip_png" "name": "yezi1_png"
},
{
"url": "assets/common/cutTimeFont.fnt",
"type": "font",
"name": "cutTimeFont_fnt"
}, },
{ {
"url": "assets/common/cutTimeFont.png", "url": "assets/startpanel2/startpanel_xxxx.png",
"type": "image", "type": "image",
"name": "cutTimeFont_png" "name": "startpanel_xxxx_png"
} }
] ]
} }
\ No newline at end of file
egret/src/panels/TargetItemRenderer.ts
View file @ b1675f08
...@@ -9,7 +9,7 @@ export default class TargetItemRenderer extends eui.ItemRenderer { ...@@ -9,7 +9,7 @@ export default class TargetItemRenderer extends eui.ItemRenderer {
dataChanged(){ dataChanged(){
this['icon_LOLLIPOP'].visible=this.data.type == ElementType.LOLLIPOP; this['icon_LOLLIPOP'].visible=this.data.type == ElementType.LOLLIPOP;
this['icon_ICE'].visible=this.data.type == ElementType.ICE; this['icon_ICE'].visible=this.data.type == ElementType.ICE;
this['icon_xxx'].visible=this.data.type == ElementType.xxx; // this['icon_xxx'].visible=this.data.type == ElementType.xxx;
this['txt'].text = `X${this.data.count }`; this['txt'].text = `X${this.data.count }`;
} }
} }
\ No newline at end of file
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