Skip to content

X
xiaoxiaole
Commit 7672ae9f authored by wjf's avatar wjf
Browse files
Options

l

parent 7455b756
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 33 deletions
egret/resource/default.res.json
View file @ 7672ae9f
......@@ -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,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,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",
"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,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",
"name": "main2"
},
{
......@@ -3048,6 +3048,56 @@
"url": "assets/hbGame/hbGame_tips.png",
"type": "image",
"name": "hbGame_tips_png"
},
{
"url": "assets/mainScene/curScoreNum9.png",
"type": "image",
"name": "curScoreNum9_png"
},
{
"url": "assets/mainScene/curScoreNum0.png",
"type": "image",
"name": "curScoreNum0_png"
},
{
"url": "assets/mainScene/curScoreNum1.png",
"type": "image",
"name": "curScoreNum1_png"
},
{
"url": "assets/mainScene/curScoreNum2.png",
"type": "image",
"name": "curScoreNum2_png"
},
{
"url": "assets/mainScene/curScoreNum3.png",
"type": "image",
"name": "curScoreNum3_png"
},
{
"url": "assets/mainScene/curScoreNum4.png",
"type": "image",
"name": "curScoreNum4_png"
},
{
"url": "assets/mainScene/curScoreNum5.png",
"type": "image",
"name": "curScoreNum5_png"
},
{
"url": "assets/mainScene/curScoreNum6.png",
"type": "image",
"name": "curScoreNum6_png"
},
{
"url": "assets/mainScene/curScoreNum7.png",
"type": "image",
"name": "curScoreNum7_png"
},
{
"url": "assets/mainScene/curScoreNum8.png",
"type": "image",
"name": "curScoreNum8_png"
}
]
}
\ No newline at end of file
egret/resource/skins/Main2Skin.exml
View file @ 7672ae9f
......@@ -8,18 +8,18 @@
<e:Image x="0" y="47.35" source="progressDown_png"/>
<e:Image id="starProgress" x="73" y="77.85" source="starProgress_png"/>
<e:Image x="162.5" y="74.85" source="yezi1_png"/>
<e:Image x="54" y="28.85" source="stepsBoard_png"/>
<e:Image x="226.5" y="88.85" source="dangqianfenshu_png" visible="false"/>
<e:Image x="0" y="28.85" source="stepsBoard_png"/>
<e:Image x="226.5" y="88.85" source="dangqianfenshu_png"/>
<e:Label id="scoreTxt" touchEnabled="false" size="20" width="194.85" anchorOffsetY="0" height="36" textAlign="left" bold="true" anchorOffsetX="0" verticalAlign="middle" fontFamily="Microsoft YaHei" text="0" y="83.85" x="320.85" textColor="0xffffff" stroke="1"/>
<e:Label touchEnabled="false" size="20" width="101.85" anchorOffsetY="0" height="36" textAlign="left" anchorOffsetX="0" verticalAlign="middle" fontFamily="Microsoft YaHei" text="当前分数：" y="81.85" x="227" bold="true" textColor="0xffffff" stroke="1"/>
<e:Label touchEnabled="false" size="20" width="101.85" anchorOffsetY="0" height="36" textAlign="left" anchorOffsetX="0" verticalAlign="middle" fontFamily="Microsoft YaHei" text="当前分数：" y="63.85" textColor="0x00556A" x="765"/>
<e:Label id="targetScoreTxt" touchEnabled="false" size="26" width="292.85" anchorOffsetY="0" height="36" textAlign="center" anchorOffsetX="0" verticalAlign="middle" fontFamily="Microsoft YaHei" text="目标分数" y="169.85" textColor="0x9d4a06" bold="true" horizontalCenter="0.5"/>
<e:Label touchEnabled="false" size="19" width="115.18" anchorOffsetY="0" height="36" textAlign="center" anchorOffsetX="0" verticalAlign="middle" fontFamily="Microsoft YaHei" text="剩余步数" y="53.48" x="66.35" textColor="0xffffff"/>
<e:Label id="chapterTxt" touchEnabled="false" size="24" width="121.85" anchorOffsetY="0" height="36" textAlign="center" anchorOffsetX="0" verticalAlign="middle" fontFamily="Microsoft YaHei" text="第X关" y="22" textColor="0xffffff" x="316"/>
<e:Button id="hammerBtn" label="" anchorOffsetX="67.5" anchorOffsetY="60" icon="hammerBtn_png" skinName="ui.IconButtonSkin" y="1100" x="375.5"/>
<e:Button id="stepBtn" label="" anchorOffsetX="67.5" anchorOffsetY="60" icon="stepBtn_png" skinName="ui.IconButtonSkin" y="1100" x="568.46"/>
<e:Button id="boomBtn" label="" anchorOffsetX="67" anchorOffsetY="60" icon="boomBtn_png" skinName="ui.IconButtonSkin" y="1100" x="185.58"/>
<e:Group id="settingAll" width="89" height="203" x="641" y="53" anchorOffsetY="0">
<e:Group id="settingGroup" width="72" height="282" x="8" y="29" anchorOffsetX="0" visible="false">
<e:Image x="0" y="0" source="mainSettingBg_png"/>
......
egret/src/mainScene/MainScene.ts
View file @ 7672ae9f
......@@ -46,11 +46,9 @@ import { createData } from '../startScene/StartScene';
import { DataManager } from './../../libs/tw/manager/DataManager';
import { NetManager } from './../../libs/tw/manager/NetManager';
import { readCache, getCacheKey } from '../mapScene/GuideCon';
import { PropGuideInt } from './PropGuide';
import { StepAni } from '../something/anis/StepAni';
import { updateMainTimerAfterGetData } from '../../libs/new_wx/MainBase';
import wait from '../../libs/new_tc/wait';
import { GameGuide } from './GameGuide';
import { AiControl } from '../something/logic/AiControl';
import { JellyDisAni } from '../something/anis/JellyDisAni';
import { EggBrokenAni } from '../something/anis/EggBrokenAni';
......@@ -63,6 +61,7 @@ import { HairballBlackState } from '../something/states/HairballBlackState';
import { HairballGreyDisAni } from '../something/anis/HairballGreyDisAni';
import { HairballBrownState } from '../something/states/HairballBrownState';
import { EleDownAni } from '../something/anis/EleDownAni';
import { GameGuide } from '../something/uis/GameGuide';
const aniClass = {
"BoomAni": BoomAni,
......@@ -305,7 +304,7 @@ export default class MainScene extends Scene {
})
}
}
//初始化界面ui
//初始化界面ui,,道具弄在这里s
initUi() {
//步数
this.stepNumber = new StepNumber();
......
egret/src/mainScene/GameGuide.ts → egret/src/something/uis/GameGuide.ts
View file @ 7672ae9f
import { Lattice } from "../something/class/Lattice";
import { Tool } from "../something/Tool";
import { generateMapBg, drawPoly } from "../something/logic/aaa";
import MainScene from "./MainScene";
import { writeCache, getCacheKey } from "../mapScene/GuideCon";
import { Element } from "../something/class/Element";
import { EffectType } from "../something/enum/EffectType";
import MainScene from "../../mainScene/MainScene";
import { Tool } from "../Tool";
import { getCacheKey, writeCache } from "../../mapScene/GuideCon";
import { generateMapBg, drawPoly } from "../logic/aaa";
/**
* 引导前，initElements需要编排特定元素
......
egret/src/something/uis/GuideMsg.ts
View file @ 7672ae9f
......@@ -4,7 +4,7 @@ import { writeCache, getCacheKey } from "../../mapScene/GuideCon";
const rrr = "//yun.duiba.com.cn/db_games/xxlguide/1/";
/**
* 引导
* 引导 废弃不用
*/
export class GuideMsg extends egret.DisplayObjectContainer {
bg: egret.Bitmap;
......
egret/src/something/uis/GuideMsg1.ts
View file @ 7672ae9f
......@@ -4,7 +4,7 @@ const moiveClip = {};
const resPath = getResPath()
const parser = new window["SVGA"].Parser();
/**
* 引导
* 引导 废弃
*/
export class GuideMsg extends egret.DisplayObjectContainer {
bg: egret.Bitmap;
......
egret/src/something/uis/PropBtnCon.ts 0 → 100644
View file @ 7672ae9f
export class PropBtnCon extends egret.DisplayObjectContainer {
}
\ No newline at end of file
egret/src/mainScene/PropGuide.ts → egret/src/something/uis/PropGuideInt.ts
View file @ 7672ae9f
import MainScene, { baseScore, effectBaseTimes } from "./MainScene";
import PropType from "../PropType";
import { EffectType } from "../something/enum/EffectType";
import { playSound, SoundType } from "../soundCtrl";
import { Tool } from "../something/Tool";
import { RecoverName } from "../something/enum/RecoverName";
import { writeCache, getCacheKey } from "../mapScene/GuideCon";
import { showToast } from "../../libs/new_wx/ctrls/toastCtrl";
import { Element } from "../something/class/Element";
import { StepAni } from "../something/anis/StepAni";
import { StateType } from "../something/enum/StateType";
import MainScene, { baseScore, effectBaseTimes } from "../../mainScene/MainScene";
import PropType from "../../PropType";
import { getCacheKey, writeCache } from "../../mapScene/GuideCon";
import { StepAni } from "../anis/StepAni";
import { Element } from "../class/Element";
import { SoundType, playSound } from "../../soundCtrl";
import { Tool } from "../Tool";
import { RecoverName } from "../enum/RecoverName";
const msgs = {
......@@ -19,7 +17,7 @@ const msgs = {
/**
* 动态道具引导
* 动态道具引导 ui已改，暂时去掉了道具引导，到时需要加回来重新调整位置和动效
*/
export class PropGuideInt extends egret.DisplayObjectContainer {
......
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