1232

egret/index.html

@@ -54,7 +54,7 @@
         // window['pageID'] = 'TeamShareScene';
         // window['pageID'] = 'JoinShareScene';
         // window['pageID'] = 'TransScene';
-        window['pageID'] = 'Share2Scene';
+        // window['pageID'] = 'Share2Scene';
         window['indexhtml'] = 'https://yazuwei.activity-1.m.duiba.com.cn/projectx/pbe1f2241/index.html'
         window['TransLink']='';
         window['projectId'] = "1";
@@ -344,9 +344,9 @@
         alert("进入分享");
         AlipayJSBridge.call('esportsShare', {title:'测试标题',content:'测试内容',imgUrl:'http://yun.duiba.com.cn/duibaManagerWeb/fgzpqk6zzo.png',url: 'http://activity.m.duiba.com.cn/customShare/share?id=3327&myavater'+encodeURIComponent(data),type:'3'});
     }
-    function shareteam(data){
+    function shareteam(data,data2){
         alert("进入分享");
-        AlipayJSBridge.call('esportsShare', {title:'测试标题',content:'测试内容',imgUrl:'http://yun.duiba.com.cn/duibaManagerWeb/fgzpqk6zzo.png',url: 'http://activity.m.duiba.com.cn/customShare/share?id=3327&joinTeamCode'+encodeURIComponent(data),type:'3'});
+        AlipayJSBridge.call('esportsShare', {title:'测试标题',content:'测试内容',imgUrl:'http://yun.duiba.com.cn/duibaManagerWeb/fgzpqk6zzo.png',url: 'http://activity.m.duiba.com.cn/customShare/share?id=3327&joinTeamCode'+encodeURIComponent(data)+'&avatar='+encodeURIComponent(data2),type:'3'});
     }
     function shareImg(num){
         console.log("进入分享图片");

egret/resource/default.res.json

@@ -13,7 +13,7 @@
 			"name": "Garbage"
 		},
 		{
-			"keys": "pkwinlogo_png,pkwinlight_png,pkwinBtn_png,pkwinbg_png,pkscorebg2_png,pkscorebg_png,pkrulebtn_png,pkrulebg_png,pkprizeBtn_png,pkprizebg_png,pkpeacelogo_png,pkpeacelight_png,pkotherline2_png,pknoton_png,pkmyline2_png,pkloselogo_png,pkloselight_png,pkfinishbg_png,pkendbg_png,pkcirle_png,pkBtn_png,pkaskBtn_png,pkagainBtn_png,pkadd_png,head1_png,box_png",
+			"keys": "pkwinlogo_png,pkwinlight_png,pkwinBtn_png,pkwinbg_png,pkscorebg_png,pkrulebtn_png,pkrulebg_png,pkprizeBtn_png,pkprizebg_png,pkpeacelogo_png,pkpeacelight_png,pkotherline2_png,pknoton_png,pkmyline2_png,pkloselogo_png,pkloselight_png,pkfinishbg_png,pkendbg_png,pkcirle_png,pkBtn_png,pkaskBtn_png,pkagainBtn_png,pkadd_png,head1_png,box_png,pkscorebg2_png",
 			"name": "Delay"
 		},
 		{
@@ -241,11 +241,6 @@
 			"type": "image",
 			"name": "pkscorebg_png"
 		},
-		{
-			"url": "assets/pk/pkscorebg2.png",
-			"type": "image",
-			"name": "pkscorebg2_png"
-		},
 		{
 			"url": "assets/pk/pkwinbg.png",
 			"type": "image",
@@ -667,14 +662,19 @@
 			"name": "mrbg_jpg"
 		},
 		{
-			"url": "assets/joinshare/joinshare_bg.jpg",
+			"url": "assets/teamshare/teamshare_bg.jpg",
 			"type": "image",
-			"name": "joinshare_bg_jpg"
+			"name": "teamshare_bg_jpg"
 		},
 		{
-			"url": "assets/teamshare/teamshare_bg.jpg",
+			"url": "assets/pk/pkscorebg2.png",
 			"type": "image",
-			"name": "teamshare_bg_jpg"
+			"name": "pkscorebg2_png"
+		},
+		{
+			"url": "assets/joinshare/joinshare_bg.jpg",
+			"type": "image",
+			"name": "joinshare_bg_jpg"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/GuideSkin.exml

@@ -29,8 +29,8 @@
 		<e:Button id="closeBtn" label="Button" skinName="ui.IconButtonSkin" icon="closeBtn_png" scaleX="1" scaleY="1" width="48" height="48" anchorOffsetX="24" anchorOffsetY="24" x="640" y="24"/>
 		<e:Button id="fireBtn" label="Button" skinName="ui.IconButtonSkin" icon="xuanshiBtn_png" scaleX="1" scaleY="1" width="291" height="82" anchorOffsetX="145.5" anchorOffsetY="41" x="318.5" y="522"/>
 	</e:Group>
-	<e:Group id="dianran" width="750" height="607" horizontalCenter="0" verticalCenter="-197.5" visible="false">
-		<e:Image width="327" height="327" x="435" y="0" source="ydlight_png" scaleX="1" scaleY="1"/>
+	<e:Group id="dianran" width="750" height="1073" anchorOffsetY="0" horizontalCenter="0" verticalCenter="35.5">
+		<e:Image width="327" height="327" source="ydlight_png" scaleX="1" scaleY="1" horizontalCenter="223.5" verticalCenter="-373"/>
 		<e:Image width="200" height="241" x="488" y="52" source="CHNhangzhou_png" scaleX="1" scaleY="1"/>
 		<e:Image width="484" height="485" x="133" y="122" source="ydlight2_png" scaleX="1" scaleY="1"/>
 		<e:Label text="恭喜您成为" x="0" y="308" size="40" textColor="0xfefff8" width="750" textAlign="center" scaleX="1" scaleY="1"/>

egret/resource/skins/JoinShareSkin.exml

@@ -3,6 +3,10 @@
 	<e:Group verticalCenter="0">
 		<e:Image source="joinshare_bg_jpg" scaleX="1" scaleY="1"/>
 		<e:Image id="btn" source="joinshare_btn_png" y="797" horizontalCenter="0" x="192.21" scaleX="1" scaleY="1"/>
+		<e:Group x="304.56" y="316.83" scaleX="1" scaleY="1">
+			<e:Image id="avatar" y="0" width="136" height="136" x="0" source=""/>
+			<e:Rect id="avatarMask" width="136" height="136" y="0" ellipseWidth="136" ellipseHeight="136"/>
+		</e:Group>
 	</e:Group>
 	<e:Group id="sharemask" x="0" y="0" visible="false">
 		<e:Rect id="rect0" width="750" height="1624" x="0" y="0" fillAlpha="0.7"/>

egret/resource/skins/PKSkin.exml

@@ -2,7 +2,7 @@
 <e:Skin class="PKSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<e:Image width="750" height="1624" x="0" y="0" source="pkBG_jpg"/>
 	<e:Image id="myline" width="212" height="941" scale9Grid="26,139,160,144" bottom="0" horizontalCenter="-157" anchorOffsetY="0" source="pkmyline2_png"/>
-	<e:Image id="otherline" width="212" height="505" scale9Grid="26,103,159,429" bottom="0" horizontalCenter="157" source="pkotherline2_png" anchorOffsetY="0"/>
+	<e:Image id="otherline" width="212" height="809" scale9Grid="26,103,159,429" bottom="0" horizontalCenter="157" source="pkotherline2_png" anchorOffsetY="0"/>
 	<e:Label id="myteam" text="我方队伍" x="112" y="613" size="29" textAlign="center" verticalAlign="middle" textColor="0xfcffff" width="212"/>
 	<e:Label id="myteamnum" text="总步数：9999" x="112" y="648" size="30" verticalAlign="middle" textColor="0xfe0f5a" width="212" textAlign="center"/>
 	<e:Label id="otherteam" text="PK方队伍" x="426" y="738" size="29" textAlign="center" verticalAlign="middle" textColor="0xFCFFFF" width="212"/>

egret/src/yazuwei/JoinShareScene.ts

@@ -20,6 +20,8 @@ export default class JoinShareScene extends Scene {
         NetManager.ins.showLog(getlogItem(5));
         // this['from'].text = '11111111';
         // this['to'].text = '22222222';
+        this['avatar'].mask = this['avatarMask'];
+        this['avatar'].source = GameConst.getQueryString('avatar');
     }
 
     onTap_btn() {

egret/src/yazuwei/PKScene.ts

@@ -247,7 +247,7 @@ export default class PKScene extends Scene{
                 return
             }
             let data = DataManager.ins.getData('genInvite').data;
-            window['shareteam'](data);
+            window['shareteam'](data,this.myavater);
         },window['projectId'])
         // window['share']();
     }
@@ -266,7 +266,7 @@ export default class PKScene extends Scene{
                 return
             }
             let data = DataManager.ins.getData('genInvite').data;
-            window['shareteam'](data);
+            window['shareteam'](data,this.myavater);
         },window['projectId'])
         // window['share']();
     }