Skip to content

X
xiaoxiaole
Commit 46bcdad9 authored by 邱旭's avatar 邱旭
Browse files
Options

Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev

parents 18a84269 9ed3d7f3
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 22 deletions
egret/index.html
View file @ 46bcdad9
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<body> <body>
<div style="margin: auto;width: 100%;height: 100%;" class="egret-player" data-entry-class="Main" <div style="margin: auto;width: 100%;height: 100%;" class="egret-player" data-entry-class="Main"
data-orientation="auto" data-scale-mode="showAll" data-frame-rate="60" data-content-width="750" data-orientation="auto" data-scale-mode="showAll" data-frame-rate="60" data-content-width="750"
data-content-height="1624" data-multi-fingered="2" data-show-fps="false" data-show-log="true" data-content-height="1624" data-multi-fingered="2" data-show-fps="true" data-show-log="true"
data-show-fps-style="x:0,y:0,size:12,textColor:0xffffff,bgAlpha:0.9"> data-show-fps-style="x:0,y:0,size:12,textColor:0xffffff,bgAlpha:0.9">
</div> </div>
......
egret/resource/TextureMerger/map.tmproject
View file @ 46bcdad9
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/taskicon.png","../assets/map/recordbtn.png","../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/namebg.png","../assets/map/msgTri.png","../assets/map/map_signicon.png","../assets/map/lionMsgBg.png","../assets/map/invite_txtbg.png","../assets/map/invite_icon.png","../assets/map/iconbg.png","../assets/map/icon.png","../assets/map/guideOver.png","../assets/map/guideMoney.png","../assets/map/guideLove.png","../assets/map/guideLevel.png","../assets/map/guideBox.png","../assets/map/friend_avatar.png","../assets/map/avatar.png","../assets/map/animal1.png","../assets/map/ad_icon.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐关闭.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音关闭.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/光 副本 4.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/宝箱.png","../assets/map/map明日可领.png","../assets/map/map今日可领.png","../assets/map/map刮现金红包.png","../assets/map/map大转盘.png","../assets/map/有星星2.png","../assets/map/有星星3.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/taskicon.png","../assets/map/recordbtn.png","../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/namebg.png","../assets/map/msgTri.png","../assets/map/map_signicon.png","../assets/map/lionMsgBg.png","../assets/map/invite_txtbg.png","../assets/map/invite_icon.png","../assets/map/iconbg.png","../assets/map/icon.png","../assets/map/guideOver.png","../assets/map/guideMoney.png","../assets/map/guideLove.png","../assets/map/guideLevel.png","../assets/map/guideBox.png","../assets/map/friend_avatar.png","../assets/map/avatar.png","../assets/map/animal1.png","../assets/map/ad_icon.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐关闭.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音关闭.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/光 副本 4.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/宝箱.png","../assets/map/map明日可领.png","../assets/map/map今日可领.png","../assets/map/map刮现金红包.png","../assets/map/map大转盘.png","../assets/map/有星星2.png","../assets/map/有星星3.png","../assets/map/icongray.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/TextureMerger/preload.tmproject 0 → 100644
View file @ 46bcdad9
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["../assets/map/icongray.png"]}
\ No newline at end of file
egret/resource/skins/Main2Skin.exml
View file @ 46bcdad9
...@@ -11,12 +11,12 @@ ...@@ -11,12 +11,12 @@
<e:Image x="0" y="28.85" source="stepsBoard_png"/> <e:Image x="0" y="28.85" source="stepsBoard_png"/>
<e:Image x="226.5" y="88.85" source="dangqianfenshu_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 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 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 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"/>
......
egret/scripts/MyExmlPlugin.ts
View file @ 46bcdad9
...@@ -11,6 +11,7 @@ export class MyExmlPlugin extends ExmlPlugin2 implements plugins.Command { ...@@ -11,6 +11,7 @@ export class MyExmlPlugin extends ExmlPlugin2 implements plugins.Command {
'cutTimeFont.png', 'cutTimeFont.png',
'sharenums.png', 'sharenums.png',
'nums.png', 'nums.png',
'nums3.png',
'nums2.png' 'nums2.png'
]; ];
if (excludes.indexOf(file.basename) != -1) { if (excludes.indexOf(file.basename) != -1) {
......
egret/src/mainScene/MainScene.ts
View file @ 46bcdad9
...@@ -175,9 +175,6 @@ export default class MainScene extends Scene { ...@@ -175,9 +175,6 @@ export default class MainScene extends Scene {
connectState: number = 2; connectState: number = 2;
//皮肤上的 //皮肤上的
public starProgress: eui.Image; public starProgress: eui.Image;
public scoreTxt: eui.Label;
public chapterTxt: eui.Label;
public settingGroup: eui.Group; public settingGroup: eui.Group;
public settingbg: eui.Image; public settingbg: eui.Image;
public soundBtn: eui.Image; public soundBtn: eui.Image;
...@@ -230,9 +227,6 @@ export default class MainScene extends Scene { ...@@ -230,9 +227,6 @@ export default class MainScene extends Scene {
//第几关 //第几关
this.chapter = (data && data.chapter) ? data.chapter : 1; this.chapter = (data && data.chapter) ? data.chapter : 1;
// this.chapter = 24; // this.chapter = 24;
this.chapterTxt.text = "第" + this.chapter + "关";
this.removeChild(this.chapterTxt);
this.removeChild(this.scoreTxt);
//关卡数据 //关卡数据
this.chapterData = getChapterData(this.chapter); this.chapterData = getChapterData(this.chapter);
//初始化目标信息 //初始化目标信息
......
egret/src/mapScene/MapRpeatPart.ts
View file @ 46bcdad9
...@@ -34,6 +34,7 @@ export default class MapRpeatPart extends ComponentBase { ...@@ -34,6 +34,7 @@ export default class MapRpeatPart extends ComponentBase {
MapScene.starHash[levelOrder] = star; MapScene.starHash[levelOrder] = star;
icon.addChild(star); icon.addChild(star);
icon['visibleY'] = this._topHeight + this.height * this._index + icon.y; icon['visibleY'] = this._topHeight + this.height * this._index + icon.y;
// console.log(icon['visibleY'] );
} }
this['animal1'].visible = this._index % 2; this['animal1'].visible = this._index % 2;
......
egret/src/mapScene/MapScene.ts
View file @ 46bcdad9
...@@ -194,17 +194,19 @@ export default class MapScene extends Scene { ...@@ -194,17 +194,19 @@ export default class MapScene extends Scene {
for (const key in MapScene.iconHash) { for (const key in MapScene.iconHash) {
const levelOrder = parseInt(key); const levelOrder = parseInt(key);
const element = MapScene.iconHash[key]; const element = MapScene.iconHash[key];
element.addEventListener(egret.TouchEvent.TOUCH_TAP, () => { if(!element.hasEventListener(egret.TouchEvent.TOUCH_TAP)){
if ( element.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
(levelOrder > (homeData.levels.length + 1) && levelOrder > 1) if (
|| (levelOrder > window['last_level']) (levelOrder > (homeData.levels.length + 1) && levelOrder > 1)
) { || (levelOrder > window['last_level'])
// showToast('必须通关前面的关卡才能开启本关'); ) {
console.log('必须通关前面的关卡才能开启本关'); // showToast('必须通关前面的关卡才能开启本关');
} else console.log('必须通关前面的关卡才能开启本关');
PanelCtrl.instance.show('StartPanel', key); } else
NetManager.ins.clickLog(getlogItem(19)) PanelCtrl.instance.show('StartPanel', key);
}, this); NetManager.ins.clickLog(getlogItem(19))
}, this);
}
} }
if (homeData.levels.length < window['total_level']) { if (homeData.levels.length < window['total_level']) {
......
egret/src/mapScene/MapTopPart.ts
View file @ 46bcdad9
...@@ -23,6 +23,7 @@ export default class MapTopPart extends ComponentBase { ...@@ -23,6 +23,7 @@ export default class MapTopPart extends ComponentBase {
icon['mappart']=this; icon['mappart']=this;
icon.show = ()=>{this.addChild(icon)}; icon.show = ()=>{this.addChild(icon)};
icon['visibleY'] = icon.y; icon['visibleY'] = icon.y;
// console.log(icon['visibleY']);
} }
} }
......
egret/src/panels/StartPanel.ts
View file @ 46bcdad9
...@@ -120,6 +120,7 @@ showlog(){ ...@@ -120,6 +120,7 @@ showlog(){
}); });
if (success) { if (success) {
// Loading.instace.show(); // Loading.instace.show();
this.hidePanel();
try { try {
const key = 'main2'; const key = 'main2';
await Promise.all([ await Promise.all([
...@@ -130,7 +131,6 @@ showlog(){ ...@@ -130,7 +131,6 @@ showlog(){
} }
// Loading.instace.hide(); // Loading.instace.hide();
this.hidePanel();
SceneCtrl.instance.change(ModuleTypes.MAIN_SCENE, { chapter: this._level }); SceneCtrl.instance.change(ModuleTypes.MAIN_SCENE, { chapter: this._level });
StartPanel.currlevel=this._level StartPanel.currlevel=this._level
} }
......
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