Skip to content

X
xiaoxiaole
Commit 0434fda7 authored by wjf's avatar wjf
Browse files
Options

l

parents 670ab98a 2531d5be
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 146 deletions
egret/.wing/exml.json
View file @ 0434fda7
...@@ -173,5 +173,10 @@ ...@@ -173,5 +173,10 @@
"backgroundType": "user", "backgroundType": "user",
"useBgImage": false, "useBgImage": false,
"useBgColor": true "useBgColor": true
},
"16cd285c715": {
"backgroundType": "user",
"useBgImage": false,
"useBgColor": true
} }
} }
\ No newline at end of file
egret/resource/TextureMerger/blood.tmproject
View file @ 0434fda7
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"blood","version":5,"files":["..\\assets\\blood\\blood体力补济站.png","..\\assets\\blood\\blood按钮.png","..\\assets\\blood\\blood按钮 副本1.png","..\\assets\\blood\\blood按钮 副本.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"blood","version":5,"files":["../assets/blood/blood体力补济站.png","../assets/blood/blood按钮.png","../assets/blood/blood按钮 副本1.png","../assets/blood/blood按钮 副本.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/TextureMerger/box.tmproject
View file @ 0434fda7
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"box","version":5,"files":["..\\assets\\box\\boxbtn.png","..\\assets\\box\\boxbg.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"box","version":5,"files":["../assets/box/boxbtn.png","../assets/box/boxbg.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/TextureMerger/box2.tmproject
View file @ 0434fda7
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"box2","version":5,"files":["..\\assets\\box2\\box2_bg.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"box2","version":5,"files":["../assets/box2/box2_bg.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/TextureMerger/buy1.tmproject
View file @ 0434fda7
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy1","version":5,"files":["..\\assets\\buy1\\购买锤子.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy1","version":5,"files":["../assets/buy1/购买锤子.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/TextureMerger/buy2.tmproject
View file @ 0434fda7
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy2","version":5,"files":["..\\assets\\buy2\\购买炸弹.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy2","version":5,"files":["../assets/buy2/购买炸弹.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/TextureMerger/buy3.tmproject
View file @ 0434fda7
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy3","version":5,"files":["..\\assets\\buy3\\购买步数增加.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy3","version":5,"files":["../assets/buy3/购买步数增加.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/TextureMerger/common.tmproject
View file @ 0434fda7
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["..\\assets\\common\\toast.png","..\\assets\\common\\closeCommonBtn.png","..\\assets\\common\\btn.png","..\\assets\\common\\alertbg.png","..\\assets\\common\\按钮 副本 4.png","..\\assets\\common\\按钮 副本 3.png","..\\assets\\common\\share_btn2.png","..\\assets\\common\\share_btn1.png","..\\assets\\common\\commmon_okbtn1.png","..\\assets\\common\\lightani.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/toast.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/commmon_okbtn1.png","../assets/common/lightani.png"]}
\ No newline at end of file
egret/resource/TextureMerger/fail.tmproject
View file @ 0434fda7
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"fail","version":5,"files":["..\\assets\\faild\\闯关失败.png","..\\assets\\faild\\按钮 副本 9.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"fail","version":5,"files":["../assets/faild/闯关失败.png","../assets/faild/按钮 副本 9.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/TextureMerger/failed.tmproject
View file @ 0434fda7
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"failed","version":5,"files":["..\\assets\\faild\\闯关失败.png","..\\assets\\faild\\按钮 副本 9.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"failed","version":5,"files":["../assets/faild/闯关失败.png","../assets/faild/按钮 副本 9.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/TextureMerger/main.tmproject
View file @ 0434fda7
This diff is collapsed.
egret/resource/TextureMerger/map.tmproject
View file @ 0434fda7
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["..\\assets\\map\\progress2.png","..\\assets\\map\\progress1.png","..\\assets\\map\\icon.png","..\\assets\\map\\animal1.png","..\\assets\\map\\元宝bg.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\\设置bg.png","..\\assets\\map\\设置.png","..\\assets\\map\\关闭 拷贝.png","..\\assets\\map\\道具.png","..\\assets\\map\\宝箱btn.png","..\\assets\\map\\宝箱bg.png","..\\assets\\map\\宝箱.png","..\\assets\\map\\宝箱3.png","..\\assets\\map\\宝箱2.png","..\\assets\\map\\宝箱1.png","..\\assets\\map\\iconbg.png","..\\assets\\map\\光 副本 4.png","..\\assets\\map\\音乐关闭.png","..\\assets\\map\\声音关闭.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/icon.png","../assets/map/animal1.png","../assets/map/元宝bg.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/设置bg.png","../assets/map/设置.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/iconbg.png","../assets/map/光 副本 4.png","../assets/map/音乐关闭.png","../assets/map/声音关闭.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/TextureMerger/noprize.tmproject
View file @ 0434fda7
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"noprize","version":5,"files":["..\\assets\\nprize\\擦肩而过弹窗 .png","..\\assets\\nprize\\得分- 无发券.png","..\\assets\\nprize\\再来一次.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"noprize","version":5,"files":["../assets/nprize/擦肩而过弹窗 .png","../assets/nprize/得分- 无发券.png","../assets/nprize/再来一次.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/TextureMerger/prize.tmproject
View file @ 0434fda7
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prize","version":5,"files":["..\\assets\\prize\\PrizePanelX.png","..\\assets\\prize\\prizePanelUseBtn.png","..\\assets\\prize\\prizePanelbg.png","..\\assets\\prize\\点亮.png","..\\assets\\prize\\点亮 副本 2.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prize","version":5,"files":["../assets/prize/PrizePanelX.png","../assets/prize/prizePanelUseBtn.png","../assets/prize/prizePanelbg.png","../assets/prize/点亮.png","../assets/prize/点亮 副本 2.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/TextureMerger/quit.tmproject
View file @ 0434fda7
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"quit","version":5,"files":["..\\assets\\quit\\quit_bg.png","..\\assets\\quit\\关闭按钮.png","..\\assets\\quit\\按钮 副本 8.png","..\\assets\\quit\\按钮 副本 7.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"quit","version":5,"files":["../assets/quit/quit_bg.png","../assets/quit/关闭按钮.png","../assets/quit/按钮 副本 8.png","../assets/quit/按钮 副本 7.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/TextureMerger/rule.tmproject
View file @ 0434fda7
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"rule","version":5,"files":["..\\assets\\rule\\ruleBg.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"rule","version":5,"files":["../assets/rule/ruleBg.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/TextureMerger/shop.tmproject
View file @ 0434fda7
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"shop","version":5,"files":["..\\assets\\shop\\道具商城.png","..\\assets\\shop\\按钮 副本.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"shop","version":5,"files":["../assets/shop/道具商城.png","../assets/shop/按钮 副本.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/TextureMerger/start.tmproject
View file @ 0434fda7
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"start","version":5,"files":["..\\assets\\startScene\\mask3.png","..\\assets\\startScene\\mask2.png","..\\assets\\startScene\\mask.png","..\\assets\\startScene\\loadingbg.png","..\\assets\\startScene\\头顶树丛.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"start","version":5,"files":["../assets/startScene/mask3.png","../assets/startScene/mask2.png","../assets/startScene/mask.png","../assets/startScene/loadingbg.png","../assets/startScene/头顶树丛.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/TextureMerger/startpanel.tmproject
View file @ 0434fda7
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["..\\assets\\startpanel2\\通关条件.png","..\\assets\\startpanel2\\数量.png","..\\assets\\startpanel2\\数量 副本 3.png","..\\assets\\startpanel2\\按钮.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["../assets/startpanel2/通关条件.png","../assets/startpanel2/数量.png","../assets/startpanel2/数量 副本 3.png","../assets/startpanel2/按钮.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/skins/StartPanelSkin.exml
View file @ 0434fda7
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="StartPanelSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="StartPanelSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16cd285c715"/>
<e:Image source="通关条件_png" y="52" horizontalCenter="0"/> <e:Image source="通关条件_png" y="52" horizontalCenter="0"/>
<e:Label id="levelTxt" text="第一关" y="204" horizontalCenter="0" size="42"/> <e:Label id="levelTxt" text="第一关" y="204" horizontalCenter="0" size="42"/>
<e:Label id="targetTxt" text="在规定的步数内\n消除足够数量目标" y="332" width="444" x="157" textAlign="center" lineSpacing="15" verticalAlign="middle" height="156" anchorOffsetX="0" textColor="0xa32020"/> <e:Label id="targetTxt" text="在规定的步数内\n消除足够数量目标" y="332" width="444" x="157" textAlign="center" lineSpacing="15" verticalAlign="middle" height="156" anchorOffsetX="0" textColor="0xa32020"/>
<e:Button id="startBtn" label="" y="751" horizontalCenter="0"> <e:Button id="startBtn" label="" y="787" horizontalCenter="0">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮_png" source.down="按钮_png" source.disabled="按钮_png"/> <e:Image width="100%" height="100%" source="按钮_png" source.down="按钮_png" source.disabled="按钮_png"/>
...@@ -35,18 +36,9 @@ ...@@ -35,18 +36,9 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Group id="nums2" x="228.03" y="682" width="70" visible="false"> <e:Label id="nums2Txt" text="888" size="26" bold="true" x="189.03" y="728.04" width="52" textAlign="center" textColor="0xc33700" verticalAlign="middle"/>
<e:Image source="数量_png" y="0" horizontalCenter="0"/> <e:Label id="nums1Txt" text="888" size="26" bold="true" x="358.99" y="728.04" width="52" textAlign="center" textColor="0xc33700" verticalAlign="middle"/>
<e:Label id="nums2Txt" text="888" horizontalCenter="0" textColor="0x683619" size="26" verticalCenter="0" bold="true"/> <e:Label id="nums3Txt" text="888" size="26" bold="true" x="518.15" y="728.04" textAlign="center" width="52" textColor="0xc33700" verticalAlign="middle"/>
</e:Group>
<e:Group id="nums1" x="390.99" y="682" width="70" visible="false">
<e:Image source="数量_png" y="0" horizontalCenter="0"/>
<e:Label id="nums1Txt" text="888" horizontalCenter="0" textColor="0x683619" size="26" verticalCenter="0" bold="true"/>
</e:Group>
<e:Group id="nums3" x="552.15" y="682" width="70" visible="false">
<e:Image source="数量_png" y="0" horizontalCenter="0"/>
<e:Label id="nums3Txt" text="888" horizontalCenter="0" textColor="0x683619" size="26" verticalCenter="0" bold="true"/>
</e:Group>
<e:Button id="closeBtn" label="" x="616" y="230"> <e:Button id="closeBtn" label="" x="616" y="230">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
......
egret/src/mapScene/MapScene.ts
View file @ 0434fda7
...@@ -69,18 +69,20 @@ export default class MapScene extends Scene { ...@@ -69,18 +69,20 @@ export default class MapScene extends Scene {
}, this); }, this);
} }
const targetIcon = MapScene.iconHash[target]; if(homeData.levels.length <70) {
const light = RES.getRes('lightani_png'); const targetIcon = MapScene.iconHash[target];
const pic = new egret.Bitmap(light);//76 61 const light = RES.getRes('lightani_png');
// targetIcon.addChild(pic); const pic = new egret.Bitmap(light);//76 61
targetIcon.addChildAt(pic,0); // targetIcon.addChild(pic);
pic.anchorOffsetX=76; targetIcon.addChildAt(pic,0);
pic.anchorOffsetY=61; pic.anchorOffsetX=76;
pic.x =50-2; pic.anchorOffsetY=61;
pic.y =37+10; pic.x =50-2;
pic.y =37+10;
egret.Tween.get(pic,{loop:true}).to({scaleX:2,scaleY:2,alpha:0},1000).wait(1000); egret.Tween.get(pic,{loop:true}).to({scaleX:2,scaleY:2,alpha:0},1000).wait(1000);
this['pic'] = pic; this['pic'] = pic;
}
this.updateHomeData(); this.updateHomeData();
this.showLog(); this.showLog();
...@@ -199,6 +201,16 @@ export default class MapScene extends Scene { ...@@ -199,6 +201,16 @@ export default class MapScene extends Scene {
this.disableIcon(level.levelNum); this.disableIcon(level.levelNum);
} }
} }
if(homeData.levels.length==0) {
const star = MapScene.starHash[1];
star.setStar(0);
this.enableIcon(1);
}else if(homeData.levels.length==70) {
}else {
const star = MapScene.starHash[homeData.levels.length+1];
this.enableIcon(homeData.levels.length+1);
}
} }
protected initEvents() { protected initEvents() {
......
egret/src/panels/StartPanel.ts
View file @ 0434fda7
...@@ -25,9 +25,7 @@ export default class StartPanel extends Panel { ...@@ -25,9 +25,7 @@ export default class StartPanel extends Panel {
//循环15到35 //循环15到35
mapDataIndex = data - 21 mapDataIndex = data - 21
} }
this['buy1btn'].visible = false;
this['nums1'].visible = true;
this['nums1Txt'].text = '7';
const levelType = Chapters[mapDataIndex].passTarget.type; const levelType = Chapters[mapDataIndex].passTarget.type;
if (levelType == PassType.ELEMENT_TARGET) if (levelType == PassType.ELEMENT_TARGET)
this['targetTxt'].text = '在规定步数内\n消除足够数量目标'; this['targetTxt'].text = '在规定步数内\n消除足够数量目标';
...@@ -37,12 +35,6 @@ export default class StartPanel extends Panel { ...@@ -37,12 +35,6 @@ export default class StartPanel extends Panel {
const prop2Nums = getPropNums(PropType.BOOM); const prop2Nums = getPropNums(PropType.BOOM);
const prop1Nums = getPropNums(PropType.HAMMER); const prop1Nums = getPropNums(PropType.HAMMER);
const prop3Nums = getPropNums(PropType.CHANCE_NUM); const prop3Nums = getPropNums(PropType.CHANCE_NUM);
this['buy1btn'].visible = prop1Nums <= 0;
this['nums1'].visible = prop1Nums > 0;
this['buy2btn'].visible = prop2Nums <= 0;
this['nums2'].visible = prop2Nums > 0;
this['buy3btn'].visible = prop3Nums <= 0;
this['nums3'].visible = prop3Nums > 0;
this['nums1Txt'].text = prop1Nums; this['nums1Txt'].text = prop1Nums;
this['nums2Txt'].text = prop2Nums; this['nums2Txt'].text = prop2Nums;
this['nums3Txt'].text = prop3Nums; this['nums3Txt'].text = prop3Nums;
......
mock/happyclear/home.json
View file @ 0434fda7
...@@ -7,114 +7,24 @@ ...@@ -7,114 +7,24 @@
"wealth": 7960, "wealth": 7960,
"totalStars": 145, "totalStars": 145,
"levels": [ "levels": [
{
"levelNum": 1,
"maxScore": 36320,
"stars": 3
},
{
"levelNum": 2,
"maxScore": 18680,
"stars": 3
},
{
"levelNum": 3,
"maxScore": 19530,
"stars": 3
},
{
"levelNum": 4,
"maxScore": 20230,
"stars": 3
},
{
"levelNum": 5,
"maxScore": 10710,
"stars": 3
},
{
"levelNum": 6,
"maxScore": 42580,
"stars": 3
},
{
"levelNum": 7,
"maxScore": 23700,
"stars": 3
},
{
"levelNum": 8,
"maxScore": 99999,
"stars": 3
},
{
"levelNum": 9,
"maxScore": 70330,
"stars": 3
},
{
"levelNum": 10,
"maxScore": 27710,
"stars": 3
},
{
"levelNum": 11,
"maxScore": 19410,
"stars": 3
},
{
"levelNum": 12,
"maxScore": 23650,
"stars": 3
},
{
"levelNum": 13,
"maxScore": 34150,
"stars": 1
},
{
"levelNum": 14,
"maxScore": 37110,
"stars": 1
},
{
"levelNum": 15,
"maxScore": 99999,
"stars": 2
},
{
"levelNum": 16,
"maxScore": 99999,
"stars": 3
},
{
"levelNum": 18,
"maxScore": 99999,
"stars": 3
},
{
"levelNum": 17,
"maxScore": 42420,
"stars": 3
}
], ],
"remainProp": [ "remainProp": [
{ {
"type": 2, "type": 2,
"num": 0 "num": 1
}, },
{ {
"type": 3, "type": 3,
"num": 0 "num": 8
}, },
{ {
"type": 4, "type": 4,
"num": 0 "num": 10
} }
], ],
"remainEnargy": 9979, "remainEnargy": 9979,
"askForEnergy": false, "askForEnergy": false,
"canReceiveTreasureBoxNum": 10, "canReceiveTreasureBoxNum": 0,
"nextRangeStarsNum": 150 "nextRangeStarsNum": 150
} }
} }
\ 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