Skip to content

X
xiaoxiaole
Commit 01dd4530 authored by zjz1994's avatar zjz1994
Browse files
Options

适配暂存

parent de8466aa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 222 additions and 159 deletions
egret/resource/skins/Main2Skin.exml
View file @ 01dd4530
......@@ -5,32 +5,42 @@
</w:Declarations>
<e:Image x="0" y="0" source="playSceneBg_jpg"/>
<e:Image source="lef_png" y="-2" x="0"/>
<e:Image y="199.5" source="targetBoard_png" x="174"/>
<e:Image y="-47.5" source="progressDown_png" horizontalCenter="0"/>
<e:Image id="starProgress" x="138" y="159.35" source="starProgress_png"/>
<e:Group id="chaptergro" width="750" height="200"/>
<e:Image x="69" y="-64.5" source="stepsBoard_png"/>
<e:Image x="171.5" y="166.35" source="dangqianfenshu_png"/>
<e:Group id="adapttop" width="750" height="1624" horizontalCenter="0" y="0" touchEnabled="false" touchThrough="true">
<e:Image y="199.5" source="targetBoard_png" x="174" scaleX="1" scaleY="1"/>
<e:Image y="-47.5" source="progressDown_png" horizontalCenter="0" x="11" scaleX="1" scaleY="1"/>
<e:Image id="starProgress" x="138" y="159.35" source="starProgress_png" scaleX="1" scaleY="1"/>
<e:Group id="chaptergro" width="750" height="200" x="0" y="0" scaleX="1" scaleY="1"/>
<e:Image x="69" y="-64.5" source="stepsBoard_png" scaleX="1" scaleY="1"/>
<e:Image x="171.5" y="166.35" source="dangqianfenshu_png" scaleX="1" scaleY="1"/>
<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="234.85" textColor="0x9d4a06" bold="true" horizontalCenter="0.5" x="229" scaleX="1" scaleY="1"/>
<e:Group id="settingAll" width="89" height="203" x="641" y="5.5" anchorOffsetY="0" scaleX="1" scaleY="1">
<e:Group id="settingGroup" width="72" height="282" x="8" y="29" anchorOffsetX="0" visible="false">
<e:Image y="-13.03" source="mainSettingBg_png" horizontalCenter="0"/>
<e:Image id="questionBtn" y="53" source="mainQuestionBtn_png" horizontalCenter="1"/>
<e:Image id="soundBtn" y="105" source="mainSoundBtnOn_png" horizontalCenter="1"/>
<e:Image id="musicBtn" y="155" source="mainMusicBtnOn_png" horizontalCenter="1"/>
<e:Image id="quitBtn" y="205.99" source="mainQuitBtn_png" horizontalCenter="1"/>
</e:Group>
<e:Image id="settingBtn" y="1" source="setting_png" horizontalCenter="0"/>
</e:Group>
</e:Group>
<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="234.85" textColor="0x9d4a06" bold="true" horizontalCenter="0.5"/>
<e:Group id="settingAll" width="89" height="203" x="641" y="5.5" anchorOffsetY="0">
<e:Group id="settingGroup" width="72" height="282" x="8" y="29" anchorOffsetX="0" visible="false">
<e:Image y="-13.03" source="mainSettingBg_png" horizontalCenter="0"/>
<e:Image id="questionBtn" y="53" source="mainQuestionBtn_png" horizontalCenter="1"/>
<e:Image id="soundBtn" y="105" source="mainSoundBtnOn_png" horizontalCenter="1"/>
<e:Image id="musicBtn" y="155" source="mainMusicBtnOn_png" horizontalCenter="1"/>
<e:Image id="quitBtn" y="205.99" source="mainQuitBtn_png" horizontalCenter="1"/>
</e:Group>
<e:Image id="settingBtn" y="1" source="setting_png" horizontalCenter="0"/>
</e:Group>
<e:Group id="redrainbg" width="750" height="1624" visible="false">
<e:Image source="redrainbg_jpg"/>
<e:Label id="tips" text="正在加载中，请稍后" y="826.33" textColor="0x244B00" horizontalCenter="0" size="24" visible="false"/>
......
egret/resource/skins/MapSkin.exml
View file @ 01dd4530
This diff is collapsed.
egret/src/mainScene/MainScene.ts
View file @ 01dd4530
......@@ -412,13 +412,44 @@ export default class MainScene extends Scene {
}>
}> = [];
islongScreen:boolean = false;
constructor(){
super();
window['gm'] = this.gm;
//选择框 无需加入场景
var textureChoosed: egret.Texture = RES.getRes("chooseRect_png")
this.choosed = new eui.Image(textureChoosed);
this.choosed.x = -textureChoosed.textureWidth / 2;
this.choosed.y = -textureChoosed.textureHeight / 2;
//bonusTime引导，备用的，无需加入场景
this.bonusTime = new BonusTime();
this.bonusTime.x = 375;
this.bonusTime.y = 600;
this.once(egret.Event.ADDED_TO_STAGE,this.initMainScene,this);
}
initMainScene(){
var stagew = this.stage.stageWidth;
var stageh = this.stage.stageHeight;
var whl = stagew/stageh;
if(whl>0.5){
this.islongScreen = false;
}else{
this.islongScreen = true;
}
if(this.islongScreen){
this['adapttop'].y = 40;
}else{
this['adapttop'].y = 0;
}
//基础ui
//目标
this.targetContainer = new egret.DisplayObjectContainer;
this.addChild(this.targetContainer);
this['adapttop'].addChild(this.targetContainer);
//第几关
this.chapterTxt = new ChapterNum();
this.chapterTxt.num = '0' // >> 0;
......@@ -429,12 +460,12 @@ export default class MainScene extends Scene {
this.stepNumber = new StepNumber();
this.stepNumber.x = 175;
this.stepNumber.y = 83.5;
this.addChild(this.stepNumber);
this['adapttop'].addChild(this.stepNumber);
//当前分数
this.curScoreNum = new CurScoreNum();
this.curScoreNum.x = 284;
this.curScoreNum.y = 170;
this.addChild(this.curScoreNum);
this['adapttop'].addChild(this.curScoreNum);
//初始换道具容器
this.propBtnCon = new PropBtnCon();
......@@ -461,20 +492,9 @@ export default class MainScene extends Scene {
this.festivalContainer = new egret.DisplayObjectContainer();
this.addChildAt(this.festivalContainer,1);
//选择框 无需加入场景
var textureChoosed: egret.Texture = RES.getRes("chooseRect_png")
this.choosed = new eui.Image(textureChoosed);
this.choosed.x = -textureChoosed.textureWidth / 2;
this.choosed.y = -textureChoosed.textureHeight / 2;
//道具使用时蒙层 无需加入场景，带入propBtnCo的位置数据
this.propGuide = new PropGuide(this.propBtnCon.y);
this.propGuide.touchEnabled = true;
//bonusTime引导，备用的，无需加入场景
this.bonusTime = new BonusTime();
this.bonusTime.x = 375;
this.bonusTime.y = 600;
}
resetMainScene(){
......@@ -1888,7 +1908,7 @@ export default class MainScene extends Scene {
}
//添加引导蒙层
this.guideContainer.addChild(this.propGuide);
this.propGuide.init(prop);
this.propGuide.init(prop,this['adapttop'].y);
//如果是炸弹或者锤子
if(prop == PropType.BOOM || prop == PropType.HAMMER) {
//去掉元素容器的侦听
......
egret/src/mapScene/MapScene.ts
View file @ 01dd4530
......@@ -133,6 +133,23 @@ export default class MapScene extends Scene {
}
}
initMapScene(){
var stagew = this.stage.stageWidth;
var stageh = this.stage.stageHeight;
var whl = stagew/stageh;
if(whl>0.5){
this.islongScreen = false;
}else{
this.islongScreen = true;
}
console.log("手机长短屏幕适配",whl,this.islongScreen);
if(this.islongScreen){
this['adapttop'].y = 40;
this['settingsx'].bottom = 50;
}else{
this['adapttop'].y = 0;
this['settingsx'].bottom = 25;
}
// console.log('initMapScene--------------');
// 添加Icon
this.addIcon();
......@@ -324,7 +341,7 @@ export default class MapScene extends Scene {
}, 20 * 1000);
loadFireworks();
}
islongScreen:boolean = false;
constructor(data?){
super();
this._data = data;
......
egret/src/something/uis/PropGuide.ts
View file @ 01dd4530
......@@ -50,7 +50,7 @@ export class PropGuide extends egret.DisplayObjectContainer {
this.stepBtn.y = offsetY - 55;
this.msgTxt.y = offsetY - 80;
}
init(prop: PropType) {
init(prop: PropType,adapttopy:number) {
if (prop == PropType.BOOM) {
this.boomBtn.visible = true;
this.hammerBtn.visible = false;
......@@ -78,7 +78,7 @@ export class PropGuide extends egret.DisplayObjectContainer {
this.bg.graphics.lineTo(750, 1624);
this.bg.graphics.lineTo(0, 1624);
this.bg.graphics.lineTo(0, 0);
this.bg.graphics.drawArc(178, 85, 80, 0, Math.PI * 2, true)
this.bg.graphics.drawArc(178, 85+adapttopy, 80, 0, Math.PI * 2, true)
this.bg.graphics.endFill();
this.msgTxt.text = "点击左上方步数，可为闯关时增加额外5次步数";
// this.msgTxt.x = 320;
......
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