Skip to content

X
xiaoxiaole
Commit 2e5c2c2c authored by wildfirecode's avatar wildfirecode
Browse files
Options

1

parent 74bc8fae
Show whitespace changes
Inline Side-by-side
Showing with 143 additions and 8 deletions
egret/libs/new_wx/MainBase.ts
View file @ 2e5c2c2c
...@@ -294,7 +294,8 @@ export default class MainBase extends eui.UILayer { ...@@ -294,7 +294,8 @@ export default class MainBase extends eui.UILayer {
RES.getResAsync(`ele${i}_2_png`); RES.getResAsync(`ele${i}_2_png`);
RES.getResAsync(`ele${i}_3_png`); RES.getResAsync(`ele${i}_3_png`);
} }
RES.getResAsync("ele34_png") RES.getResAsync("ele34_png");
RES.getResAsync("ele36_png");
for (var i = 1; i <= 27; i++) { for (var i = 1; i <= 27; i++) {
RES.getResAsync("bonusFra" + i + "_png") RES.getResAsync("bonusFra" + i + "_png")
} }
...@@ -534,7 +535,7 @@ export default class MainBase extends eui.UILayer { ...@@ -534,7 +535,7 @@ export default class MainBase extends eui.UILayer {
this.hcRedBoobBaseInfo(), this.hcRedBoobBaseInfo(),
]); ]);
//获取分享加体力的shareCode，不影响初始化场景，不进await //获取分享加体力的shareCode，不影响初始化场景，不进await
NetManager.ins.getUserShareCode(()=>{}) NetManager.ins.getUserShareCode(() => { })
MapScene.adData = DataManager.ins.getData('hc_advert'); MapScene.adData = DataManager.ins.getData('hc_advert');
......
egret/resource/default.res.json
View file @ 2e5c2c2c
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
}, },
{ {
"name": "preload", "name": "preload",
"keys": "honeymc_json,ele36_png" "keys": "honeymc_json,ele36_png,startpanel_ele36_png"
} }
], ],
"resources": [ "resources": [
...@@ -4557,6 +4557,11 @@ ...@@ -4557,6 +4557,11 @@
"name": "ele36_png", "name": "ele36_png",
"type": "image", "type": "image",
"url": "assets/mainScene/ele36.png" "url": "assets/mainScene/ele36.png"
},
{
"name": "startpanel_ele36_png",
"type": "image",
"url": "assets/startpanel2/startpanel_ele36.png"
} }
] ]
} }
\ No newline at end of file
egret/resource/skins/TargetItemSkin.exml
View file @ 2e5c2c2c
...@@ -19,5 +19,6 @@ ...@@ -19,5 +19,6 @@
<e:Image id="icon25" width="60" height="60" x="0" y="2" source="startpanel_ele25_png"/> <e:Image id="icon25" width="60" height="60" x="0" y="2" source="startpanel_ele25_png"/>
<e:Image id="icon26" width="60" height="60" x="0" y="2" source="startpanel_ele26_png"/> <e:Image id="icon26" width="60" height="60" x="0" y="2" source="startpanel_ele26_png"/>
<e:Image id="icon34" width="60" height="60" x="0" y="2" source="startpanel_ele34_png"/> <e:Image id="icon34" width="60" height="60" x="0" y="2" source="startpanel_ele34_png"/>
<e:Image id="icon36" width="60" height="60" x="0" y="2" source="startpanel_ele36_png"/>
<e:BitmapLabel id="txt" text="X0" font="nums2_fnt" scaleX="0.4" scaleY="0.4" y="46" horizontalCenter="0"/> <e:BitmapLabel id="txt" text="X0" font="nums2_fnt" scaleX="0.4" scaleY="0.4" y="46" horizontalCenter="0"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/src/mainScene/MainScene.ts
View file @ 2e5c2c2c
...@@ -620,16 +620,19 @@ export default class MainScene extends Scene { ...@@ -620,16 +620,19 @@ export default class MainScene extends Scene {
latticeDisplay = ice; latticeDisplay = ice;
this.lattices[i].ice = ice; this.lattices[i].ice = ice;
} else if (isSand(latticesD[i])) { } else if (isSand(latticesD[i])) {
latticeDisplay = genBlockDisplay(latticesD[i]); // latticeDisplay = genBlockDisplay(latticesD[i]);
this.lattices[i].block = latticeDisplay as BaseBlock; // this.lattices[i].block = latticeDisplay as BaseBlock;
} else if(isBlock(latticesD[i])) { } else if(isBlock(latticesD[i])) {
latticeDisplay = genBlockDisplay(latticesD[i]); latticeDisplay = genBlockDisplay(latticesD[i]);
this.lattices[i].block = latticeDisplay as BaseBlock; this.lattices[i].block = latticeDisplay as BaseBlock;
} }
if(latticeDisplay) {
this.map.addChild(latticeDisplay); this.map.addChild(latticeDisplay);
latticeDisplay.x = p[0]; latticeDisplay.x = p[0];
latticeDisplay.y = p[1]; latticeDisplay.y = p[1];
} }
}
} }
//生成口数据 //生成口数据
var genLatDatas = this.chapterData.map.generateLats || []; var genLatDatas = this.chapterData.map.generateLats || [];
......
mock/happyclear/home.json
View file @ 2e5c2c2c
...@@ -2262,6 +2262,131 @@ ...@@ -2262,6 +2262,131 @@
"levelNum": 450, "levelNum": 450,
"maxScore": 47440, "maxScore": 47440,
"stars": 1 "stars": 1
},
{
"levelNum": 451,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 452,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 453,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 454,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 455,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 456,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 457,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 458,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 459,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 460,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 461,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 462,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 463,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 464,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 465,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 466,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 467,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 468,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 469,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 470,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 471,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 472,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 473,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 474,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 475,
"maxScore": 47440,
"stars": 1
} }
], ],
......
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