Commit 54697ff1 authored by wildfirecode's avatar wildfirecode

1

parent 589cda09
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
}, },
{ {
"name": "preload", "name": "preload",
"keys": "namebg_png,avatar_png,invite_txtbg_png,invite_icon_png,taskicon_png,friend_avatar_png,ad_icon_png" "keys": "namebg_png,avatar_png,invite_txtbg_png,invite_icon_png,taskicon_png,friend_avatar_png,ad_icon_png,testavatar_png"
} }
], ],
"resources": [ "resources": [
...@@ -2008,6 +2008,11 @@ ...@@ -2008,6 +2008,11 @@
"name": "ad_icon_png", "name": "ad_icon_png",
"type": "image", "type": "image",
"url": "assets/map/ad_icon.png" "url": "assets/map/ad_icon.png"
},
{
"name": "testavatar_png",
"type": "image",
"url": "assets/testavatar.png"
} }
] ]
} }
\ No newline at end of file
...@@ -148,9 +148,14 @@ ...@@ -148,9 +148,14 @@
</e:Group> </e:Group>
<e:Label text="点击开宝箱" y="791" size="37" horizontalCenter="0" bold="true"/> <e:Label text="点击开宝箱" y="791" size="37" horizontalCenter="0" bold="true"/>
</e:Group> </e:Group>
<e:Group id="friendBtn" x="13.56" y="126.88" width="171"> <e:Group id="friendBtn" x="13.56" y="126.88" width="171" height="120">
<e:Image source="avatar_png" y="0" horizontalCenter="0"/> <e:Image source="avatar_png" y="0" horizontalCenter="0"/>
<e:Group x="38.5" y="10" locked="true">
<e:Image id="avatar" y="0" source="testavatar_png" width="96" height="96" x="0"/>
<e:Rect id="avatarMask" width="96" height="96" x="0" y="0" ellipseWidth="96" ellipseHeight="96"/>
</e:Group>
<e:Image source="namebg_png" horizontalCenter="-4" bottom="-4"/> <e:Image source="namebg_png" horizontalCenter="-4" bottom="-4"/>
<e:Label id="nameTxt" text="La121233bel" y="91.5" size="20" horizontalCenter="1"/>
</e:Group> </e:Group>
<e:Image id="adBtn" y="648.02" source="ad_icon_png" right="12"/> <e:Image id="adBtn" y="648.02" source="ad_icon_png" right="12"/>
<w:Config id="16c89f4ae1a"/> <w:Config id="16c89f4ae1a"/>
......
...@@ -33,6 +33,8 @@ export default class MapScene extends Scene { ...@@ -33,6 +33,8 @@ export default class MapScene extends Scene {
super.start(); super.start();
this['avatar'].mask = this['avatarMask'];
// setTimeout(() => { // setTimeout(() => {
// PanelCtrl.instance.show('invite'); // PanelCtrl.instance.show('invite');
// }, 3000); // }, 3000);
......
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