Skip to content

X
xiaoxiaole
Commit 9d84a4bd authored by 邱旭's avatar 邱旭
Browse files
Options

1

parent 0b0d19d1
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 32 deletions
egret/libs/new_wx/MainBase.ts
View file @ 9d84a4bd
......@@ -331,8 +331,13 @@ export default class MainBase extends eui.UILayer {
for (var i = 0; i <= 9; i++) {
RES.getResAsync("propNum" + i + "_png")
}
RES.getResAsync("propNum" + "第" + "_png");
RES.getResAsync("propNum" + "关" + "_png");
for (var i = 0; i <= 9; i++) {
RES.getResAsync("check" + i + "_png")
}
RES.getResAsync("check" + "第" + "_png");
RES.getResAsync("check" + "关" + "_png");
RES.getResAsync("propBg_png"); // 道具栏背景
// for (var i = 1; i <= 5; i++) {
// RES.getResAsync("guideTxt" + i + "_png")
......
egret/resource/assets/mainScene/propNum1.png
View replaced file @ 0b0d19d1 View file @ 9d84a4bd
egret/resource/assets/mainScene/propNum1.png

779 Bytes | W: | H:

egret/resource/assets/mainScene/propNum1.png

540 Bytes | W: | H:

egret/resource/assets/mainScene/propNum1.png
egret/resource/assets/mainScene/propNum1.png
egret/resource/assets/mainScene/propNum1.png
egret/resource/assets/mainScene/propNum1.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/default.res.json
View file @ 9d84a4bd
......@@ -97,7 +97,7 @@
"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,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,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,bubbleStar19_png,bubleEle0_png,bubleEle1_png,bubleEle2_png,bubleEle3_png,bubleEle4_png,bubbleStar1_png,bubbleStar2_png,bubbleStar3_png,bubbleStar4_png,bubbleStar5_png,bubbleStar6_png,bubbleStar7_png,bubbleStar8_png,bubbleStar9_png,bubbleStar10_png,bubbleStar11_png,bubbleStar12_png,bubbleStar13_png,bubbleStar14_png,bubbleStar15_png,bubbleStar16_png,bubbleStar17_png,bubbleStar18_png,ele11_png,ele10_png,brownBallFace_png,eyeDownLeft_png,eyeSingle_png,greyBallFace_png,eyeDownRight_png,hairballPiece9_png,hairballPiece8_png,hairballPiece7_png,hairballPiece6_png,hairballPiece5_png,hairballPiece4_png,hairballPiece3_png,hairballPiece2_png,hairballPiece11_png,hairballPiece10_png,hairballPiece1_png,hairballDisBg_png,curScoreNum9_png,curScoreNum8_png,curScoreNum7_png,curScoreNum6_png,curScoreNum5_png,curScoreNum4_png,curScoreNum3_png,curScoreNum2_png,curScoreNum1_png,curScoreNum0_png,festivalTargetBg_png,lineLight9_png,lineLight8_png,lineLight7_png,lineLight6_png,lineLight5_png,lineLight4_png,lineLight3_png,lineLight2_png,lineLight13_png,lineLight12_png,lineLight11_png,lineLight10_png,lineLight1_png,fesRedUp_png,fesRedSmallLight_png,fesRedDown_png,fesRedCap_png,fesRedBombSta1_png,fesRedBigLight_png,fesEleSmallDis9_png,fesEleSmallDis8_png,fesEleSmallDis7_png,fesEleSmallDis6_png,fesEleSmallDis5_png,fesEleSmallDis4_png,fesEleSmallDis3_png,fesEleSmallDis2_png,fesEleSmallDis10_png,fesEleSmallDis1_png,ele12_png,ele13_png,xingxingbi_png,tinyRedMid_png,tinyRedLeft_png,tinyRedRight_png,rectLatWhite_png,fesRedBombSta2_png,ele14_png,redBombYStar_png,redBombBStar_png,redBombBSnow_png,线条尾部炸开_00000_png,线条尾部炸开_00001_png,线条尾部炸开_00002_png,线条尾部炸开_00003_png,线条尾部炸开_00004_png,线条尾部炸开_00005_png,线条尾部炸开_00006_png,线条尾部炸开_00007_png,线条尾部炸开_00008_png,ele15_png,ele16_png,ele17_png,ele18_png,ele19_png,ele20_png,empty_png,ele23_png,ele25_png,ele27_png,ele26_png,ele24_png,ele22_png,chocolateMark3_png,chocolateMark1_png,chocolateFour_png,chocolateMark0_png,chocolateMark2_png,redbombParticle_png,monster_shoot_png,ele33_1_png,ele33_0_png,ele34_png,honey_png,ele36_png,lef_png,propNum第_png,propNum关_png",
"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,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,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,bubbleStar19_png,bubleEle0_png,bubleEle1_png,bubleEle2_png,bubleEle3_png,bubleEle4_png,bubbleStar1_png,bubbleStar2_png,bubbleStar3_png,bubbleStar4_png,bubbleStar5_png,bubbleStar6_png,bubbleStar7_png,bubbleStar8_png,bubbleStar9_png,bubbleStar10_png,bubbleStar11_png,bubbleStar12_png,bubbleStar13_png,bubbleStar14_png,bubbleStar15_png,bubbleStar16_png,bubbleStar17_png,bubbleStar18_png,ele11_png,ele10_png,brownBallFace_png,eyeDownLeft_png,eyeSingle_png,greyBallFace_png,eyeDownRight_png,hairballPiece9_png,hairballPiece8_png,hairballPiece7_png,hairballPiece6_png,hairballPiece5_png,hairballPiece4_png,hairballPiece3_png,hairballPiece2_png,hairballPiece11_png,hairballPiece10_png,hairballPiece1_png,hairballDisBg_png,curScoreNum9_png,curScoreNum8_png,curScoreNum7_png,curScoreNum6_png,curScoreNum5_png,curScoreNum4_png,curScoreNum3_png,curScoreNum2_png,curScoreNum1_png,curScoreNum0_png,festivalTargetBg_png,lineLight9_png,lineLight8_png,lineLight7_png,lineLight6_png,lineLight5_png,lineLight4_png,lineLight3_png,lineLight2_png,lineLight13_png,lineLight12_png,lineLight11_png,lineLight10_png,lineLight1_png,fesRedUp_png,fesRedSmallLight_png,fesRedDown_png,fesRedCap_png,fesRedBombSta1_png,fesRedBigLight_png,fesEleSmallDis9_png,fesEleSmallDis8_png,fesEleSmallDis7_png,fesEleSmallDis6_png,fesEleSmallDis5_png,fesEleSmallDis4_png,fesEleSmallDis3_png,fesEleSmallDis2_png,fesEleSmallDis10_png,fesEleSmallDis1_png,ele12_png,ele13_png,xingxingbi_png,tinyRedMid_png,tinyRedLeft_png,tinyRedRight_png,rectLatWhite_png,fesRedBombSta2_png,ele14_png,redBombYStar_png,redBombBStar_png,redBombBSnow_png,线条尾部炸开_00000_png,线条尾部炸开_00001_png,线条尾部炸开_00002_png,线条尾部炸开_00003_png,线条尾部炸开_00004_png,线条尾部炸开_00005_png,线条尾部炸开_00006_png,线条尾部炸开_00007_png,线条尾部炸开_00008_png,ele15_png,ele16_png,ele17_png,ele18_png,ele19_png,ele20_png,empty_png,ele23_png,ele25_png,ele27_png,ele26_png,ele24_png,ele22_png,chocolateMark3_png,chocolateMark1_png,chocolateFour_png,chocolateMark0_png,chocolateMark2_png,redbombParticle_png,monster_shoot_png,ele33_1_png,ele33_0_png,ele34_png,honey_png,ele36_png,lef_png,propBg_png,check0_png,check1_png,check2_png,check3_png,check4_png,check7_png,check8_png,check9_png,check关_png,check第_png,check6_png,check5_png",
"name": "main2"
},
{
......@@ -5229,19 +5229,74 @@
"name": "lef_png"
},
{
"url": "assets/mainScene/propNum第.png",
"url": "assets/common/common_closebtn2.png",
"type": "image",
"name": "propNum第_png"
"name": "common_closebtn2_png"
},
{
"url": "assets/mainScene/propNum关.png",
"url": "assets/mainScene/propBg.png",
"type": "image",
"name": "propNum关_png"
"name": "propBg_png"
},
{
"url": "assets/common/common_closebtn2.png",
"url": "assets/mainScene/check0.png",
"type": "image",
"name": "common_closebtn2_png"
"name": "check0_png"
},
{
"url": "assets/mainScene/check1.png",
"type": "image",
"name": "check1_png"
},
{
"url": "assets/mainScene/check2.png",
"type": "image",
"name": "check2_png"
},
{
"url": "assets/mainScene/check3.png",
"type": "image",
"name": "check3_png"
},
{
"url": "assets/mainScene/check4.png",
"type": "image",
"name": "check4_png"
},
{
"url": "assets/mainScene/check7.png",
"type": "image",
"name": "check7_png"
},
{
"url": "assets/mainScene/check8.png",
"type": "image",
"name": "check8_png"
},
{
"url": "assets/mainScene/check9.png",
"type": "image",
"name": "check9_png"
},
{
"url": "assets/mainScene/check关.png",
"type": "image",
"name": "check关_png"
},
{
"url": "assets/mainScene/check第.png",
"type": "image",
"name": "check第_png"
},
{
"url": "assets/mainScene/check6.png",
"type": "image",
"name": "check6_png"
},
{
"url": "assets/mainScene/check5.png",
"type": "image",
"name": "check5_png"
}
]
}
\ No newline at end of file
egret/src/something/uis/ChapterNum.ts
View file @ 9d84a4bd
......@@ -44,9 +44,9 @@ export class ChapterNum extends egret.DisplayObjectContainer {
//如果没有就
let o: BitmapNumber = Pool.takeOut(RecoverName.BITMAP_NUMBER);
if(!o) {
o = new BitmapNumber("propNum");
o = new BitmapNumber("check");
} else {
o.reset("propNum")
o.reset("check")
}
o.num = arr[i];
this.addChild(o)
......
egret/src/something/uis/PropBtnCon.ts
View file @ 9d84a4bd
......@@ -5,27 +5,36 @@ export class PropBtnCon extends eui.Component {
boomBtn: CusButton;
hammerBtn: CusButton;
stepBtn: CusButton;
bg: eui.Image;
constructor() {
super();
var textureBg = RES.getRes("propBg_png");
this.bg = new eui.Image(textureBg);
this.bg.y = -137;
this.addChild(this.bg);
this.boomBtn = new CusButton("boomBtn_png");
this.boomBtn.x = 375 - 110 - 50 //110图片宽度，50按钮间隔
this.addChild(this.boomBtn)
this.boomBtn.x = 375 - 110 - 50; //110图片宽度，50按钮间隔
this.addChild(this.boomBtn);
this.hammerBtn = new CusButton("hammerBtn_png");
this.hammerBtn.x = 375;
this.addChild(this.hammerBtn)
this.addChild(this.hammerBtn);
this.stepBtn = new CusButton("stepBtn_png");
this.stepBtn.x = 375 + 110 + 50
this.addChild(this.stepBtn)
this.stepBtn.x = 375 + 110 + 50;
this.addChild(this.stepBtn);
}
}
/**
* 自定义按钮
*/
class CusButton extends eui.Component {
propNumShow: PropNumShow
propNumShow: PropNumShow;
constructor(source: string) {
super();
this.touchChildren = false;
......@@ -34,18 +43,18 @@ class CusButton extends eui.Component {
image.y = -55;
this.addChild(image);
this.propNumShow = new PropNumShow();
this.propNumShow.x = 15;
this.propNumShow.y = 15;
this.propNumShow.x = 30;
this.propNumShow.y = 30;
this.addChild(this.propNumShow);
this.addEventListener(egret.TouchEvent.TOUCH_BEGIN, () => {
this.scaleX = this.scaleY = 0.9;
}, this)
}, this);
this.addEventListener(egret.TouchEvent.TOUCH_END, () => {
this.scaleX = this.scaleY = 1;
}, this)
}, this);
this.addEventListener(egret.TouchEvent.TOUCH_RELEASE_OUTSIDE, () => {
this.scaleX = this.scaleY = 1;
}, this)
}, this);
}
}
\ No newline at end of file
egret/src/something/uis/PropNumShow.ts
View file @ 9d84a4bd
......@@ -19,8 +19,9 @@ export class PropNumShow extends egret.DisplayObjectContainer {
get count(): number {
return this._count;
}
set count(value: number) {
if (value <= 0) {
if(value <= 0) {
value = 0;
//变灰
this.filters = [this.colorFlilter];
......@@ -30,6 +31,7 @@ export class PropNumShow extends egret.DisplayObjectContainer {
this._count = value;
this.countNum.num = value;
}
constructor() {
super();
//滤镜
......@@ -41,12 +43,12 @@ export class PropNumShow extends egret.DisplayObjectContainer {
];
this.colorFlilter = new egret.ColorMatrixFilter(colorMatrix);
//背景
var bg = new egret.Bitmap(RES.getRes("propNumBg_png"))
this.addChild(bg)
var bg = new egret.Bitmap(RES.getRes("propNumBg_png"));
this.addChild(bg);
//数字
this.countNum = new PropNumber();
this.countNum.x = 22.5;
this.countNum.y = 7;
this.countNum.x = 23;
this.countNum.y = 7.5;
this.addChild(this.countNum);
}
}
\ No newline at end of file
egret/src/something/uis/ScoreProgress.ts
View file @ 9d84a4bd
......@@ -51,7 +51,7 @@ export class ScoreProgress {
//是否超过2星
else if(value >= this.starScores[1]) {
scale = (value - this.starScores[1]) / (this.starScores[2] - this.starScores[1]);
w = (536 - 476) * scale + 476 - 138;
w = (563 - 476) * scale + 476 - 138;
if(this.star2.source != "lightedStar_png") {
this.star2.source = "lightedStar_png";
this.star1.source = "lightedStar_png";
......@@ -110,15 +110,15 @@ export class ScoreProgress {
//星星1 lightedStar_png
var textureStar = RES.getRes("unlightedStar_png");
this.star1 = new eui.Image(textureStar); // width (27 * 2)
this.star1.x = 363;
this.star1.x = 363; // 390
this.star1.y = 201;
p.addChild(this.star1);
this.star2 = new eui.Image(textureStar);
this.star2.x = 449;
this.star2.x = 449; // 476
this.star2.y = 201;
p.addChild(this.star2);
this.star3 = new eui.Image(textureStar);
this.star3.x = 536;
this.star3.x = 536; // 563
this.star3.y = 201;
p.addChild(this.star3);
}
......
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