Skip to content

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

适配暂存

parent de8466aa
Show whitespace changes
Inline Side-by-side
Showing with 222 additions and 159 deletions
egret/resource/skins/Main2Skin.exml
View file @ 01dd4530
......@@ -5,23 +5,15 @@
</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: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="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"/>
......@@ -31,6 +23,24 @@
</e:Group>
<e:Image id="settingBtn" y="1" source="setting_png" horizontalCenter="0"/>
</e:Group>
</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
......@@ -5,6 +5,7 @@
<e:Group id="scrollGroup">
</e:Group>
</e:Scroller>
<e:Group id="adapttop" width="750" height="1206" y="0" horizontalCenter="0" touchEnabled="false" touchThrough="true">
<e:Group id="treasureboxBtn" y="40" x="537" scaleX="1" scaleY="1" anchorOffsetX="0" width="193.33" height="82">
<e:Image source="宝箱bg_png" y="13.33" x="4.18"/>
<e:Group x="80.34" y="23.48" anchorOffsetX="0" width="104">
......@@ -45,7 +46,7 @@
</e:Button>
<e:Label id="countdown" text="00:00:00" verticalAlign="middle" textAlign="center" size="19" fontFamily="FZY4JW" anchorOffsetX="0" width="87" anchorOffsetY="0" height="37" strokeColor="0x4365ac" stroke="2" verticalCenter="0.5" horizontalCenter="-84.25"/>
</e:Group>
<e:Button id="shopBtn" label="" x="613.08" y="174.01" visible="false">
<e:Button id="shopBtn" label="" x="613.08" y="174.01" visible="false" scaleX="1" scaleY="1">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="道具_png" source.down="道具_png" source.disabled="道具_png"/>
......@@ -53,7 +54,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="recordBtn" label="" x="597" y="174.57" locked="true">
<e:Button id="recordBtn" label="" x="597" y="174.57" scaleX="1" scaleY="1">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="recordbtn_png" source.down="recordbtn_png" source.disabled="recordbtn_png"/>
......@@ -61,7 +62,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Group id="friendBtn" x="-0.12" y="22.31" width="171" height="120" locked="true">
<e:Group id="friendBtn" x="-0.12" y="22.31" width="171" height="120" scaleX="1" scaleY="1">
<e:Image source="avatar_png" y="0" horizontalCenter="0"/>
<e:Group x="38.5" y="10">
<e:Image id="avatar" y="-2.87" source="" width="70" height="70" x="11.31" anchorOffsetX="0" anchorOffsetY="0"/>
......@@ -70,8 +71,8 @@
<e:Image source="namebg_png" horizontalCenter="-4" bottom="-4"/>
<e:Label id="nameTxt" text="La121233bel" y="80.06" size="19" horizontalCenter="-3" fontFamily="FZY3JW"/>
</e:Group>
<e:Image id="adBtn" y="478" right="602" width="122" height="122" source=""/>
<e:Button id="taskBtn1" label="" x="572.62" y="248.51" visible="false">
<e:Image id="adBtn" y="478" right="602" width="122" height="122" source="" x="26" scaleX="1" scaleY="1"/>
<e:Button id="taskBtn1" label="" x="572.62" y="248.51" visible="false" scaleX="1" scaleY="1">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="taskicon_png" source.down="taskicon_png" source.disabled="taskicon_png"/>
......@@ -79,7 +80,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Group id="signGroup" x="26.69" y="172.57" locked="true">
<e:Group id="signGroup" x="26.69" y="172.57" scaleX="1" scaleY="1">
<e:Button id="signBtn" label="" y="0" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
......@@ -93,7 +94,7 @@
<e:Image id="sign_s2" source="map明日可领_png" x="1.33" y="0" visible="false"/>
</e:Group>
</e:Group>
<e:Group id="inviteGroup" x="16.69" y="323.76" anchorOffsetX="0" width="132" visible="false">
<e:Group id="inviteGroup" x="16.69" y="323.76" anchorOffsetX="0" width="132" visible="false" scaleX="1" scaleY="1">
<e:Button id="inviteBtn" label="" x="10" y="1.54">
<e:skinName>
<e:Skin states="up,down,disabled">
......@@ -107,7 +108,7 @@
<e:Label id="inviteTips" text="立即到账" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" size="22" fontFamily="FZY4JW" stroke="2" strokeColor="0xc74417" textColor="0xfff1c2"/>
</e:Group>
</e:Group>
<e:Group id="turnTableGroup" x="589.5" y="475" anchorOffsetX="0" width="134">
<e:Group id="turnTableGroup" x="589.5" y="475" anchorOffsetX="0" width="134" scaleX="1" scaleY="1">
<e:Button id="turnTableBtn" label="" y="0" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
......@@ -121,7 +122,7 @@
<e:Label id="turnTableTips" text="立即到" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" size="22" fontFamily="FZY4JW" strokeColor="0xc74417" stroke="2" textColor="0xfff1c2"/>
</e:Group>
</e:Group>
<e:Group id="scratchGroup" y="631" right="25">
<e:Group id="scratchGroup" y="631" right="25" x="588" scaleX="1" scaleY="1">
<e:Button id="scratchBtn" label="" y="0" x="-5.32" locked="true">
<e:skinName>
<e:Skin states="up,down,disabled">
......@@ -135,7 +136,7 @@
<e:Label id="scratchTips" text="立即到" verticalCenter="-0.5" verticalAlign="middle" textAlign="center" size="22" fontFamily="FZY4JW" horizontalCenter="0" strokeColor="0xc74417" stroke="2" textColor="0xfff1c2"/>
</e:Group>
</e:Group>
<e:Group id="taskGroup" y="325" right="30">
<e:Group id="taskGroup" y="325" right="30" x="594" scaleX="1" scaleY="1">
<e:Button id="taskBtn" label="" y="0">
<e:skinName>
<e:Skin states="up,down,disabled">
......@@ -149,7 +150,7 @@
<e:Label id="taskTips" text="有优惠" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" size="22" fontFamily="FZY4JW" strokeColor="0xc74417" stroke="2" textColor="0xfff1c2"/>
</e:Group>
</e:Group>
<e:Group id="activitys" x="13.4" y="620.55" touchEnabled="false">
<e:Group id="activitys" x="13.4" y="620.55" touchEnabled="false" scaleX="1" scaleY="1">
<e:Group id="actIconsGroup" x="-8.88" y="-4">
<e:Image id="actIconsBg2" source="map2+bg_png" x="-27.15" y="0" visible="false"/>
<e:Image id="actIconsBg1" x="-29.27" y="10" source="map2+bg2_png" visible="false"/>
......@@ -170,6 +171,24 @@
<e:Image id="actsShowBtn" source="map2+_png" x="9.29" y="17.45"/>
<e:Image id="actTips" source="maphot_png" x="96.82" y="3.44"/>
</e:Group>
<e:Group id="guide" x="0" y="0" scaleX="1" scaleY="1" visible="false">
<e:Rect width="750" height="1624" x="0" y="0" alpha="0.7"/>
<e:Image id="guideInner" source="map2热门引导_png" x="3.7" y="336.77"/>
</e:Group>
</e:Group>
<e:Group id="settingsx" scaleX="1" scaleY="1" touchEnabled="false" bottom="23" left="30">
<e:Group id="settingGroup" verticalCenter="0" horizontalCenter="0" visible="false">
<e:Image id="settingbg" source="设置bg_png" verticalCenter="0" horizontalCenter="0" scale9Grid="44,0,250,89"/>
......@@ -229,9 +248,6 @@
<e:Image source="common_box_btn_png" y="957.41" x="189" scaleX="1" scaleY="1"/>
</e:Group>
</e:Group>
<e:Group id="guide" visible="false" locked="true">
<e:Rect width="750" height="1624" x="0" y="0" alpha="0.7"/>
<e:Image id="guideInner" source="map2热门引导_png" x="3.7" y="336.77"/>
</e:Group>
<w:Config id="16c89f4ae1a"/>
</e:Skin>
\ No newline at end of file
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