Skip to content

X
xiaoxiaole
Commit 15471ee4 authored by 邱旭's avatar 邱旭
Browse files
Options

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

parents abace456 1971175a
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 33 deletions
egret/resource/assets/common/sharenums.fnt
View file @ 15471ee4
{"file":"sharenums.png","frames":{ {"file":"sharenums.png","frames":{
"0":{"x":61,"y":0,"w":58,"h":79,"offX":0,"offY":0,"sourceW":58,"sourceH":79}, "9":{"x":81,"y":0,"w":37,"h":51,"offX":0,"offY":4,"sourceW":37,"sourceH":58},
"1":{"x":170,"y":161,"w":31,"h":78,"offX":0,"offY":0,"sourceW":31,"sourceH":78}, "8":{"x":77,"y":53,"w":36,"h":51,"offX":0,"offY":4,"sourceW":36,"sourceH":58},
"2":{"x":57,"y":161,"w":53,"h":79,"offX":0,"offY":0,"sourceW":53,"sourceH":79}, "7":{"x":0,"y":105,"w":37,"h":49,"offX":0,"offY":6,"sourceW":37,"sourceH":58},
"3":{"x":114,"y":81,"w":54,"h":79,"offX":0,"offY":0,"sourceW":54,"sourceH":79}, "6":{"x":0,"y":52,"w":37,"h":51,"offX":0,"offY":4,"sourceW":37,"sourceH":58},
"4":{"x":0,"y":0,"w":59,"h":79,"offX":0,"offY":0,"sourceW":59,"sourceH":79}, "5":{"x":77,"y":106,"w":35,"h":50,"offX":0,"offY":5,"sourceW":35,"sourceH":58},
"5":{"x":170,"y":81,"w":54,"h":78,"offX":0,"offY":0,"sourceW":54,"sourceH":78}, "4":{"x":0,"y":0,"w":39,"h":50,"offX":0,"offY":4,"sourceW":39,"sourceH":58},
"6":{"x":121,"y":0,"w":55,"h":79,"offX":0,"offY":0,"sourceW":55,"sourceH":79}, "3":{"x":39,"y":53,"w":36,"h":51,"offX":0,"offY":4,"sourceW":36,"sourceH":58},
"7":{"x":57,"y":81,"w":55,"h":78,"offX":0,"offY":0,"sourceW":55,"sourceH":78}, "2":{"x":39,"y":106,"w":36,"h":50,"offX":0,"offY":4,"sourceW":36,"sourceH":58},
"8":{"x":178,"y":0,"w":55,"h":79,"offX":0,"offY":0,"sourceW":55,"sourceH":79}, "1":{"x":0,"y":156,"w":23,"h":49,"offX":2,"offY":5,"sourceW":29,"sourceH":58},
"9":{"x":0,"y":81,"w":55,"h":79,"offX":0,"offY":0,"sourceW":55,"sourceH":79}}} "0":{"x":41,"y":0,"w":38,"h":51,"offX":0,"offY":4,"sourceW":38,"sourceH":58}}}
\ No newline at end of file \ No newline at end of file
egret/resource/skins/Share3Skin.exml
View file @ 15471ee4
...@@ -2,20 +2,21 @@ ...@@ -2,20 +2,21 @@
<e:Skin class="Share2Skin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="Share2Skin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16cd6d4c8ff"/> <w:Config id="16cd6d4c8ff"/>
<e:Rect width="750" height="1624" fillAlpha="0.7"/> <e:Rect width="750" height="1624" fillAlpha="0.7"/>
<e:Group id="pic" x="86" y="46"> <e:Group id="pic" x="86" y="46" width="600" height="963">
<e:Group y="0" x="0"> <e:Group y="0" x="0">
<e:Image x="0" y="0" source="sharefriend_jpg"/> <e:Image x="0" y="0" source="sharefriend_jpg" scaleX="0.8" scaleY="0.8"/>
<e:Label id="lvTxt1" text="120" y="286.58" anchorOffsetX="0" anchorOffsetY="0" bold="true" textAlign="center" verticalAlign="middle" size="90" textColor="0xb14d00" horizontalCenter="0" visible="false"/> <e:Label id="lvTxt1" text="120" y="286.58" anchorOffsetX="0" anchorOffsetY="0" bold="true" textAlign="center" verticalAlign="middle" size="90" textColor="0xb14d00" horizontalCenter="0" visible="false"/>
<e:BitmapLabel id="lvTxt" y="294.38" text="888" font="sharenums_fnt" horizontalCenter="0" scaleX="0.8" scaleY="0.8"/> <e:BitmapLabel rotation="5" id="lvTxt" y="371.34" text="123" font="sharenums_fnt" horizontalCenter="103.5" scaleX="0.8" scaleY="0.8"/>
</e:Group> </e:Group>
<e:Group x="236.86" y="44.78"> <e:Group x="236.86" y="44.78">
<e:Image id="avatar" y="0" width="108" height="108" x="0" source=""/> <e:Image id="avatar" y="44.85" width="130" height="130" x="-7.82" source=""/>
<e:Rect id="avatarMask" width="108" height="108" y="0" ellipseWidth="108" ellipseHeight="108"/> <e:Rect id="avatarMask" width="124" height="124" y="44.85" ellipseWidth="124" ellipseHeight="124" x="-7.82"/>
<e:Group x="-33.4" y="87"> <e:Group x="-28.84" y="134.27">
<e:Image source="sharefriend_png" y="0" x="0"/> <e:Image y="0" x="0" source="commom_share1_png" scaleX="0.8" scaleY="0.8"/>
<e:Label id="nameTxt" text="打发顺丰" width="149" verticalAlign="middle" textAlign="center" size="18" height="45" x="16"/> <e:Label id="nameTxt" text="打发顺丰" width="149" verticalAlign="middle" textAlign="center" size="18" height="35" x="12.96" y="15.64"/>
</e:Group> </e:Group>
</e:Group> </e:Group>
<e:Label id="ranktxt" text="我在好友中排名第X" width="350" verticalAlign="middle" textAlign="center" size="22" height="42" x="122.03999999999999" y="448.02" scaleX="1" scaleY="1"/>
</e:Group> </e:Group>
<e:Group id="inviteGroup" x="0" bottom="0" locked="true"> <e:Group id="inviteGroup" x="0" bottom="0" locked="true">
<e:Image source="朋友圈中间分享蒙层1_jpg" y="0" x="0"/> <e:Image source="朋友圈中间分享蒙层1_jpg" y="0" x="0"/>
......
egret/resource/skins/TurntableNoPrizeSkin.exml
View file @ 15471ee4
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<e:Image source="common_yuanbao_png" x="94" scaleX="0.2" scaleY="0.2" verticalCenter="0"/> <e:Image source="common_yuanbao_png" x="94" scaleX="0.2" scaleY="0.2" verticalCenter="0"/>
</e:Group> </e:Group>
</e:Group> </e:Group>
<e:Image id="tips1" source="turnnoprize换个姿势再来一次！_png" y="436.8" horizontalCenter="0" visible="false"/> <e:Image id="tips1" source="turnnoprize换个姿势再来一次！_png" y="436" horizontalCenter="0" visible="false"/>
<e:Image id="tips2" source="turnnoprize奖励溜走了，再试一次吧！_png" y="423.65" horizontalCenter="0" visible="false"/> <e:Image id="tips2" source="turnnoprize奖励溜走了，再试一次吧！_png" y="423.65" horizontalCenter="0" visible="false"/>
<e:Image id="tips3" source="turnnoprize离奖励只差一毫米！ 再来一次吧！_png" y="403.65" horizontalCenter="0.5" visible="false"/> <e:Image id="tips3" source="turnnoprize离奖励只差一毫米！ 再来一次吧！_png" y="436" horizontalCenter="1" visible="false"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/src/panels/FriendPanel.ts
View file @ 15471ee4
...@@ -37,7 +37,7 @@ export default class FriendPanel extends Panel { ...@@ -37,7 +37,7 @@ export default class FriendPanel extends Panel {
`第<font color=0xfff000><b>${userRank.levelNum}</b></font>关`); `第<font color=0xfff000><b>${userRank.levelNum}</b></font>关`);
this.score.textFlow = (new egret.HtmlTextParser).parser( this.score.textFlow = (new egret.HtmlTextParser).parser(
`<font color=0xfff000><b>${userRank.maxScore}</b></font>分`); `<font color=0xfff000><b>${userRank.maxScore}</b></font>分`);
this['rankTxt'].text = userRank.rank this.rank = this['rankTxt'].text = userRank.rank;
this['star'].text = `X${userRank.stars}` this['star'].text = `X${userRank.stars}`
} }
...@@ -91,7 +91,7 @@ export default class FriendPanel extends Panel { ...@@ -91,7 +91,7 @@ export default class FriendPanel extends Panel {
if (iswx()) { if (iswx()) {
getFriendShareUrl(this.stage); getFriendShareUrl(this.stage);
} else } else
showShare3(); showShare3(this.rank);
// showShareCodePanel(CodeChannels.RankPlay);//mmp，排行榜的分享又不要口令了 // showShareCodePanel(CodeChannels.RankPlay);//mmp，排行榜的分享又不要口令了
} }
......
egret/src/panels/SignPanel.ts
View file @ 15471ee4
...@@ -363,11 +363,11 @@ export default class SignPanel extends Panel { ...@@ -363,11 +363,11 @@ export default class SignPanel extends Panel {
this['numsgroup'].visible=false; this['numsgroup'].visible=false;
}else{ }else{
if(itemid){//暂猜测是道具的时候有 if(itemid){//暂猜测是道具的时候有
if(itemid==59029){ if(itemid==33255){
propType = 4; propType = 4;
}else if(itemid==59030){ }else if(itemid==33256){
propType = 3; propType = 3;
}else if(itemid==59031){ }else if(itemid==33257){
propType = 5; propType = 5;
} }
// this['prizeimg2'].visible = true; // this['prizeimg2'].visible = true;
......
egret/src/shareCtrl3.ts
View file @ 15471ee4
...@@ -13,7 +13,8 @@ const img: any = document.getElementById('pic'); ...@@ -13,7 +13,8 @@ const img: any = document.getElementById('pic');
img.style.display = 'none'; img.style.display = 'none';
class Share3 extends ComponentBase { class Share3 extends ComponentBase {
start() { start(rank) {
this['ranktxt'].text =`我在好友中排名第${rank}`;
this['avatar'].mask = this['avatarMask']; this['avatar'].mask = this['avatarMask'];
const { data: user } = DataManager.ins.getData('hc_userInfo'); const { data: user } = DataManager.ins.getData('hc_userInfo');
this['avatar'].source = user.avatar; this['avatar'].source = user.avatar;
...@@ -52,11 +53,12 @@ class Share3 extends ComponentBase { ...@@ -52,11 +53,12 @@ class Share3 extends ComponentBase {
//channel 1 好友 2 朋友圈 //channel 1 好友 2 朋友圈
shareFunc(channel: string) { shareFunc(channel: string) {
Loading.instace.show(); Loading.instace.show();
const base64 = getPrintScreenData(this['pic'], 0, 0, 579, 864); const base64 = getPrintScreenData(this['pic'], 0, 0, 600, 963);
console.log(base64);
// img.src = base64;
NetManager.ins.imgUrl((success) => { NetManager.ins.imgUrl((success) => {
const data = DataManager.ins.getData('imgURL'); const data = DataManager.ins.getData('imgURL');
img.src = data.data; img.src = data.data;
// img.src = base64;
callShareApi(data.data, channel); callShareApi(data.data, channel);
Loading.instace.hide(); Loading.instace.hide();
}, base64); }, base64);
...@@ -69,17 +71,17 @@ class Share3 extends ComponentBase { ...@@ -69,17 +71,17 @@ class Share3 extends ComponentBase {
let inited = false; let inited = false;
let _share: Share3; let _share: Share3;
const initShare = () => { const initShare = (rank) => {
const layer = layers.shareLayer; const layer = layers.shareLayer;
const share = new Share3(); const share = new Share3();
share.loadSkin(); share.loadSkin();
share.start(); share.start(rank);
layer.addChild(share); layer.addChild(share);
_share = share; _share = share;
}; };
export const showShare3 = () => { export const showShare3 = (rank) => {
if (!inited) { if (!inited) {
initShare(); initShare(rank);
inited = true; inited = true;
} }
......
mock/sign/doSign.json
View file @ 15471ee4
...@@ -9,6 +9,6 @@ ...@@ -9,6 +9,6 @@
"prizeName":"奖品名称", "prizeName":"奖品名称",
"logo":"http://yun.duiba.com.cn/db_games/activity/game/guideImage/guide2.png", "logo":"http://yun.duiba.com.cn/db_games/activity/game/guideImage/guide2.png",
"prizeCount":11, "prizeCount":11,
"itemId":59031 "itemId":33257
} }
} }
\ 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