Commit bed3e6f0 authored by 邱旭's avatar 邱旭

1

parent 2afccfc2
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
]; ];
// localStorage.clear(); // localStorage.clear();
window['imgver'] = '11112' window['imgver'] = '11112'
window['total_level'] = 18 + 13 * 16; window['total_level'] = 14 + 13 * 17;
window['last_level'] = 225;//必须大于等于total_level window['last_level'] = 225;//必须大于等于total_level
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="MapBottomSkin" width="750" height="1363" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="MapBottomSkin" width="750" height="1363" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image source="map3_jpg" x="0" y="0"/> <e:Image source="map3_jpg" x="0" y="0"/>
<e:Group x="276.88" y="44" id="icon0"> <e:Group x="223.88" y="64" id="icon0">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt0" width="76" x="12" y="18.69" text="60" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt0" width="76" x="10" y="13" text="60" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group id="icon1" x="145.7" y="148.44"> <e:Group id="icon1" x="124.7" y="248.44">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt1" width="76" x="12" y="18.69" text="61" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt1" width="76" x="10" y="13" text="61" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="130" y="288" id="icon2"> <e:Group x="189" y="388" id="icon2">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt2" width="76" x="12" y="18.69" text="62" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt2" width="76" x="8" y="13" text="62" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="206.94" y="403" id="icon3"> <e:Group x="328.94" y="481" id="icon3">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt3" width="76" x="12" y="18.69" text="63" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt3" width="76" x="10" y="13" text="63" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="314" y="479" id="icon4"> <e:Group x="483" y="592" id="icon4">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt4" width="76" x="12" y="18.69" text="64" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt4" width="76" x="10" y="13" text="64" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="471" y="589" id="icon5"> <e:Group x="562" y="746" id="icon5">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt5" width="76" x="12" y="18.69" text="65" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt5" width="76" x="10" y="13" text="65" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="561.01" y="718.69" id="icon6"> <e:Group x="442.01" y="902.69" id="icon6">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt6" width="76" x="12" y="18.69" text="66" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt6" width="76" x="10" y="13" text="66" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="453.01" y="892.69" id="icon7"> <e:Group x="453.01" y="892.69" id="icon7" visible="false">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt7" width="76" x="12" y="18.69" text="67" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt7" width="76" x="10" y="13" text="67" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="309.01" y="1052.69" id="icon8"> <e:Group x="309.01" y="1052.69" id="icon8" visible="false">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt8" width="76" x="12" y="18.69" text="68" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt8" width="76" x="10" y="13" text="68" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="95.01" y="1145.69" id="icon9"> <e:Group x="95.01" y="1145.69" id="icon9" visible="false">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt9" width="76" x="12" y="18.69" text="69" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt9" width="76" x="10" y="13" text="69" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="202.01" y="1255.69" id="icon10"> <e:Group x="202.01" y="1255.69" id="icon10" visible="false">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt10" width="76" x="12" y="18.69" text="70" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt10" width="76" x="10" y="13" text="70" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
</e:Skin> </e:Skin>
\ No newline at end of file
...@@ -3,55 +3,55 @@ ...@@ -3,55 +3,55 @@
<e:Image source="map2_jpg"/> <e:Image source="map2_jpg"/>
<e:Group x="359" y="136.01" id="icon0"> <e:Group x="359" y="136.01" id="icon0">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt0" width="76" x="12" y="18.69" text="1" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt0" width="76" x="10" y="13" text="1" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="235" y="282" id="icon1"> <e:Group x="244" y="251" id="icon1">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt1" width="76" x="12" y="18.69" text="2" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt1" width="76" x="10" y="13" text="2" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="307" y="423" id="icon2"> <e:Group x="218" y="403" id="icon2">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt2" width="76" x="12" y="18.69" text="3" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt2" width="76" x="10" y="12" text="3" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="458" y="523" id="icon3"> <e:Group x="350" y="495" id="icon3">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt3" width="76" x="12" y="18.69" text="4" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt3" width="76" x="10" y="12" text="4" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="573" y="624" id="icon4"> <e:Group x="528" y="547" id="icon4">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt4" width="76" x="12" y="18.69" text="5" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt4" width="76" x="10" y="12" text="5" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="515" y="740" id="icon5"> <e:Group x="609" y="663" id="icon5">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt5" width="76" x="12" y="18.69" text="6" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt5" width="76" x="10" y="12" text="6" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="427" y="832" id="icon6"> <e:Group x="495" y="794" id="icon6">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt6" width="76" x="12" y="18.69" text="7" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt6" width="76" x="10" y="12" text="7" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="287" y="889" id="icon7"> <e:Group x="333" y="885" id="icon7">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt7" width="76" x="12" y="18.69" text="8" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt7" width="76" x="10" y="12" text="8" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="227" y="1035" id="icon8"> <e:Group x="187" y="972" id="icon8">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt8" width="76" x="12" y="18.69" text="9" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt8" width="76" x="10" y="12" text="9" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="319" y="1140" id="icon9"> <e:Group x="290" y="1109" id="icon9">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel id="txt9" width="76" x="12" y="18.69" text="10" font="nums_fnt" textAlign="center"/> <e:BitmapLabel id="txt9" width="76" x="10" y="12" text="10" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="426" y="1249.12" id="icon10"> <e:Group x="408" y="1249.12" id="icon10">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel width="76" x="12" y="18.69" text="11" font="nums_fnt" textAlign="center" id="txt10"/> <e:BitmapLabel width="76" x="10" y="12" text="11" font="nums_fnt" textAlign="center" id="txt10"/>
</e:Group> </e:Group>
<e:Group x="346" y="1379.76" id="icon11"> <e:Group x="348" y="1379.76" id="icon11">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel width="76" x="12" y="18.69" text="12" font="nums_fnt" textAlign="center" id="txt11"/> <e:BitmapLabel width="76" x="10" y="12" text="12" font="nums_fnt" textAlign="center" id="txt11"/>
</e:Group> </e:Group>
<e:Group x="324" y="1527.61" id="icon12"> <e:Group x="324" y="1527.61" id="icon12">
<e:Image source="icon_png" x="-1" y="0"/> <e:Image source="icon_png" x="-1" y="0"/>
<e:BitmapLabel width="76" x="12" y="18.69" text="13" font="nums_fnt" textAlign="center" id="txt12"/> <e:BitmapLabel width="76" x="10" y="13" text="13" font="nums_fnt" textAlign="center" id="txt12"/>
</e:Group> </e:Group>
<e:Image id="animal1" source="狮子_png" x="201.68" y="651.02" anchorOffsetX="0" width="152.81" anchorOffsetY="0" height="132.72" visible="false"/> <e:Image id="animal1" source="狮子_png" x="201.68" y="651.02" anchorOffsetX="0" width="152.81" anchorOffsetY="0" height="132.72" visible="false"/>
<e:Image id="animal2" source="animal1_png" x="232" y="567.5" visible="false"/> <e:Image id="animal2" source="animal1_png" x="232" y="567.5" visible="false"/>
......
...@@ -3,31 +3,31 @@ ...@@ -3,31 +3,31 @@
<e:Image source="map1_jpg" x="0" y="0"/> <e:Image source="map1_jpg" x="0" y="0"/>
<e:Group x="448" y="496.04" id="icon0"> <e:Group x="448" y="496.04" id="icon0">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel width="76" x="12" y="18.69" text="1" font="nums_fnt" textAlign="center"/> <e:BitmapLabel width="76" x="10" y="12" text="1" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group id="icon1" x="490" y="625"> <e:Group id="icon1" x="490" y="625">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel width="76" x="12" y="18.69" text="2" font="nums_fnt" textAlign="center"/> <e:BitmapLabel width="76" x="10" y="12" text="2" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="573.33" y="745.37" id="icon2"> <e:Group x="573.33" y="745.37" id="icon2">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel width="76" x="12" y="18.69" text="3" font="nums_fnt" textAlign="center"/> <e:BitmapLabel width="76" x="10" y="12" text="3" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="442" y="845.5" id="icon3"> <e:Group x="442" y="845.5" id="icon3">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel width="76" x="12" y="18.69" text="4" font="nums_fnt" textAlign="center"/> <e:BitmapLabel width="76" x="10" y="12" text="4" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="238.01" y="939.19" id="icon4"> <e:Group x="238.01" y="939.19" id="icon4">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel width="76" x="12" y="18.69" text="5" font="nums_fnt" textAlign="center"/> <e:BitmapLabel width="76" x="10" y="12" text="5" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="180" y="1092" id="icon5"> <e:Group x="180" y="1092" id="icon5">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel width="76" x="12" y="18.69" text="6" font="nums_fnt" textAlign="center"/> <e:BitmapLabel width="76" x="10" y="12" text="6" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
<e:Group x="382.01" y="1194.69" id="icon6"> <e:Group x="382.01" y="1194.69" id="icon6">
<e:Image source="icon_png" x="0" y="0"/> <e:Image source="icon_png" x="0" y="0"/>
<e:BitmapLabel width="76" x="12" y="18.69" text="7" font="nums_fnt" textAlign="center"/> <e:BitmapLabel width="76" x="10" y="12" text="7" font="nums_fnt" textAlign="center"/>
</e:Group> </e:Group>
</e:Skin> </e:Skin>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="RedBombTipsSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="RedBombTipsSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image id="rulebtn" source="redbagtips活动规则_png" y="814" horizontalCenter="0.5"/> <e:Image id="rulebtn" source="redbagtips活动规则_png" y="814" horizontalCenter="0"/>
<e:Button id="btn" label="" y="692" horizontalCenter="0"> <e:Group id="btn" y="693.31" horizontalCenter="0">
<e:skinName> <e:Image source="redbagtips按钮_png" y="0" x="0"/>
<e:Skin states="up,down,disabled"> <e:Label text="找铃铛" verticalCenter="-10" horizontalCenter="0" size="38" strokeColor="0x0389ff" stroke="2" fontFamily="FZY3JW"/>
<e:Image width="100%" height="100%" source="redbagtips按钮_png" source.down="redbagtips按钮_png" source.disabled="redbagtips按钮_png"/> </e:Group>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
</e:Skin> </e:Skin>
\ No newline at end of file
...@@ -8,12 +8,8 @@ ...@@ -8,12 +8,8 @@
<e:Image id="ele4" source="redbagtips_ele_png" x="134" y="490"/> <e:Image id="ele4" source="redbagtips_ele_png" x="134" y="490"/>
<e:Image id="redbag" source="redbagtips_ele7_png" y="432" x="376" anchorOffsetX="192" anchorOffsetY="108"/> <e:Image id="redbag" source="redbagtips_ele7_png" y="432" x="376" anchorOffsetX="192" anchorOffsetY="108"/>
<e:Image id="rulebtn" source="redbagtips活动规则_png" y="814" horizontalCenter="0.5"/> <e:Image id="rulebtn" source="redbagtips活动规则_png" y="814" horizontalCenter="0.5"/>
<e:Button id="btn" label="" y="692" horizontalCenter="0"> <e:Group id="btn" y="693.31" horizontalCenter="0">
<e:skinName> <e:Image source="redbagtips按钮_png" y="0" x="0"/>
<e:Skin states="up,down,disabled"> <e:Label text="找红包" verticalCenter="-10" horizontalCenter="0" size="38" strokeColor="0x0389FF" stroke="2" fontFamily="FZY3JW"/>
<e:Image width="100%" height="100%" source="redbagtips按钮_png" source.down="redbagtips按钮_png" source.disabled="redbagtips按钮_png"/> </e:Group>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
</e:Skin> </e:Skin>
\ No newline at end of file
...@@ -8,7 +8,7 @@ import MapRpeatPart from "./MapRpeatPart"; ...@@ -8,7 +8,7 @@ import MapRpeatPart from "./MapRpeatPart";
import { getRepeatCount } from "../startScene/StartScene"; import { getRepeatCount } from "../startScene/StartScene";
export default class MapBottomPart extends ComponentBase { export default class MapBottomPart extends ComponentBase {
static LEVEL_NUMS = 11; static LEVEL_NUMS = 7;
getTxt(i): eui.BitmapLabel { return this[`txt${i}`]; } getTxt(i): eui.BitmapLabel { return this[`txt${i}`]; }
start({repeatHeight,topHeight}) { start({repeatHeight,topHeight}) {
super.start(); super.start();
...@@ -25,9 +25,8 @@ export default class MapBottomPart extends ComponentBase { ...@@ -25,9 +25,8 @@ export default class MapBottomPart extends ComponentBase {
this.getIcon(i).addEventListener(egret.TouchEvent.TOUCH_TAP, () => { this.getIcon(i).addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
showToast('敬请期待更多关卡~'); showToast('敬请期待更多关卡~');
}, this); }, this);
} }
const icon = MapScene.iconHash[levelOrder] = this.getIcon(i); const icon = MapScene.iconHash[levelOrder] = this.getIcon(i);
this.removeChild(icon); this.removeChild(icon);
icon.show = ()=>{this.addChild(icon)}; icon.show = ()=>{this.addChild(icon)};
...@@ -35,7 +34,7 @@ export default class MapBottomPart extends ComponentBase { ...@@ -35,7 +34,7 @@ export default class MapBottomPart extends ComponentBase {
icon['nums'] = icon.getChildAt(0); icon['nums'] = icon.getChildAt(0);
icon['bmptxt']=icon.getChildAt(1); icon['bmptxt']=icon.getChildAt(1);
icon['mappart']=this; icon['mappart']=this;
const star = new MapStarComp(); const star = new MapStarComp();
star.loadSkin(); star.start(); star.loadSkin(); star.start();
MapScene.starHash[levelOrder] = star; MapScene.starHash[levelOrder] = star;
......
...@@ -3,6 +3,8 @@ import MapTopPart from "./MapTopPart"; ...@@ -3,6 +3,8 @@ import MapTopPart from "./MapTopPart";
import MapScene from "./MapScene"; import MapScene from "./MapScene";
import MapStarComp from "./MapStarComp"; import MapStarComp from "./MapStarComp";
import { createData } from "../startScene/StartScene"; import { createData } from "../startScene/StartScene";
import setGray from "../setGray";
import { showToast } from "../../libs/new_wx/ctrls/toastCtrl";
export default class MapRpeatPart extends ComponentBase { export default class MapRpeatPart extends ComponentBase {
static LEVEL_NUMS = 13; static LEVEL_NUMS = 13;
...@@ -19,8 +21,16 @@ export default class MapRpeatPart extends ComponentBase { ...@@ -19,8 +21,16 @@ export default class MapRpeatPart extends ComponentBase {
for (let i = 0; i < MapRpeatPart.LEVEL_NUMS; i++) { for (let i = 0; i < MapRpeatPart.LEVEL_NUMS; i++) {
const levelOrder = MapTopPart.LEVEL_NUMS + this._index * MapRpeatPart.LEVEL_NUMS + i + 1; const levelOrder = MapTopPart.LEVEL_NUMS + this._index * MapRpeatPart.LEVEL_NUMS + i + 1;
this.getTxt(i).text = levelOrder + ''; this.getTxt(i).text = levelOrder + '';
/// TODO 如果是在Repeat页的关卡超过了最大关卡,也要加点击toast
if ( levelOrder > window['last_level']) {
setGray(this.getIcon(i));
this.getIcon(i).addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
showToast('敬请期待更多关卡~');
}, this);
}
const icon = MapScene.iconHash[levelOrder] = this.getIcon(i); const icon = MapScene.iconHash[levelOrder] = this.getIcon(i);
this.removeChild(icon); this.removeChild(icon);
icon.show = ()=>{this.addChild(icon)}; icon.show = ()=>{this.addChild(icon)};
......
...@@ -117,6 +117,7 @@ export default class MapScene extends Scene { ...@@ -117,6 +117,7 @@ export default class MapScene extends Scene {
function hbRainBaseInfo() { function hbRainBaseInfo() {
return new Promise((resolve, reject) => NetManager.ins.hbRainBaseInfo(() => resolve())); return new Promise((resolve, reject) => NetManager.ins.hbRainBaseInfo(() => resolve()));
} }
function getTaskInfo() { function getTaskInfo() {
return new Promise((resolve, reject) => NetManager.ins.getTaskInfo(() => resolve())); return new Promise((resolve, reject) => NetManager.ins.getTaskInfo(() => resolve()));
} }
...@@ -204,9 +205,9 @@ export default class MapScene extends Scene { ...@@ -204,9 +205,9 @@ export default class MapScene extends Scene {
// 任务中心可领奖强提示 // 任务中心可领奖强提示
const taskInfoRes = DataManager.ins.getData(NetName.GET_TASKINFO); const taskInfoRes = DataManager.ins.getData(NetName.GET_TASKINFO);
if(taskInfoRes && taskInfoRes.data && taskInfoRes.data.length > 0){ if(taskInfoRes && taskInfoRes.data && taskInfoRes.data.length > 0) {
for(let i = 0; i < taskInfoRes.data.length; i++){ for(let i = 0; i < taskInfoRes.data.length; i++) {
if(taskInfoRes.data[i].count > 0){ if(taskInfoRes.data[i].count > 0) {
panels.push('task'); panels.push('task');
break; break;
} }
...@@ -517,6 +518,9 @@ export default class MapScene extends Scene { ...@@ -517,6 +518,9 @@ export default class MapScene extends Scene {
} }
disableIcon(level) { disableIcon(level) {
if(level >= 200) {
let s = 1
}
this.setGray(level); this.setGray(level);
MapScene.starHash[level].visible = false; MapScene.starHash[level].visible = false;
} }
...@@ -842,6 +846,7 @@ export default class MapScene extends Scene { ...@@ -842,6 +846,7 @@ export default class MapScene extends Scene {
sec: Utils.prefixInteger(sec, 2) sec: Utils.prefixInteger(sec, 2)
} }
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
onTap_friendBtn() { onTap_friendBtn() {
...@@ -858,7 +863,7 @@ export default class MapScene extends Scene { ...@@ -858,7 +863,7 @@ export default class MapScene extends Scene {
}, window['signActivityId']) }, window['signActivityId'])
} }
onTap_goldBtn(){ onTap_goldBtn() {
NetManager.ins.clickLog(getlogItem(67)); NetManager.ins.clickLog(getlogItem(67));
PanelCtrl.instance.show('recharge'); PanelCtrl.instance.show('recharge');
} }
......
...@@ -49,10 +49,10 @@ export default class BombTips2Panel extends Panel { ...@@ -49,10 +49,10 @@ export default class BombTips2Panel extends Panel {
this['btn'].touchEnabled = false; this['btn'].touchEnabled = false;
const dur = 100; const dur = 100;
egret.Tween.get(this.mv).to({alpha: 0}, dur); egret.Tween.get(this.mv).to({alpha: 0}, dur);
egret.Tween.get(this['btn']).to({alpha: 0}, dur);
egret.Tween.get(this['rulebtn']).to({alpha: 0}, dur);
const mask = PanelCtrl.instance._mask; const mask = PanelCtrl.instance._mask;
egret.Tween.get(mask).to({alpha: 0}, dur); egret.Tween.get(mask).to({alpha: 0}, dur);
egret.Tween.get(this['redbag']).to({scaleX: 0.7, scaleY: 0.7}, 100)
.to({scaleX: 1.5, scaleY: 1.5, alpha: 0}, 300);
setTimeout(() => { setTimeout(() => {
const mc = createEffect1MovieClip(); const mc = createEffect1MovieClip();
......
...@@ -139,5 +139,7 @@ export const createData = () => { ...@@ -139,5 +139,7 @@ export const createData = () => {
} }
export const getRepeatCount = ()=>{ export const getRepeatCount = ()=>{
return (window['total_level'] - 18)/13; /// TODO 14 = MapTopPart.LEVEL_NUMS + MapBottomPart.LEVEL_NUMS
/// TODO 13 = MapRpeatPart.LEVEL_NUMS
return (window['total_level'] - 14)/13;
} }
\ No newline at end of file
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