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

egret/resource/skins/ShareSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
-<e:Skin class="ShareSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+<e:Skin class="ShareSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<e:Rect width="750" height="1624" fillAlpha="0.7"/>
 	<e:Image source="share2_jpg"/>
 	<e:Label id="lvTxt" text="2" x="336.65" y="918.94" size="20" anchorOffsetX="0" width="42.33" textAlign="center" verticalAlign="middle" textColor="0xea2917"/>
 </e:Skin>
\ No newline at end of file

egret/resource/skins/ShowOffSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
-<e:Skin class="ShowOffSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+<e:Skin class="ShowOffSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<e:Group id="pic" x="0" y="0">
 		<e:Image source="showoff_jpg" x="0" y="0"/>
-		<e:Label id="lvTxt" text="88" x="237.88" y="284" anchorOffsetX="0" width="179" anchorOffsetY="0" bold="true" textColor="0xec1f09" textAlign="right" verticalAlign="middle" size="106"/>
-		<e:Label id="tipsTxt" text="超过了60%的好友" y="403" anchorOffsetX="0" anchorOffsetY="0" textColor="0xEC1F09" textAlign="center" verticalAlign="middle" size="29" x="259"/>
+		<e:Label id="lvTxt" text="88" x="237.88" y="308" anchorOffsetX="0" width="179" anchorOffsetY="0" bold="true" textColor="0xec1f09" textAlign="right" verticalAlign="middle" size="106"/>
+		<e:Label id="tipsTxt" text="超过了60%的好友" y="427" anchorOffsetX="0" anchorOffsetY="0" textColor="0xEC1F09" textAlign="center" verticalAlign="middle" size="29" x="259"/>
 	</e:Group>
 </e:Skin>
\ No newline at end of file

egret/src/getSharePic.ts

@@ -23,7 +23,7 @@ export default async (parent?: egret.DisplayObjectContainer) => {
         return getPrintScreenData(showoff, 0, 0, pic.textureWidth, pic.textureHeight);
     })
 }
-const img:any = document.getElementById('pic');
+const img: any = document.getElementById('pic');
 img.style.display = 'none';
 export const getShareUrl = async (parent?: egret.DisplayObjectContainer) => {
     return new Promise(async (r) => {
@@ -32,12 +32,13 @@ export const getShareUrl = async (parent?: egret.DisplayObjectContainer) => {
         showoff.loadSkin();
         showoff.start();
         if (parent) parent.addChild(showoff);
-        showoff.visible=false;
+        showoff.visible = false;
+        img.style.display = 'block';
         const base64 = getPrintScreenData(showoff, 0, 0, pic.textureWidth, parent.stage.stageHeight);
         // NetManager.ins.imgUrl((success) => {
-            // const data = DataManager.ins.getData('imgURL');
-            img.src = base64;
-            // r(data);
+        // const data = DataManager.ins.getData('imgURL');
+        img.src = base64;
+        // r(data);
         // }, base64);
     })
 }
\ No newline at end of file

egret/src/panels/BloodPanel.ts

@@ -8,7 +8,7 @@ import wait from "../../libs/new_tc/wait";
 import { showShare } from "../shareCtrl";
 import { iswx } from "../iswx";
 import getShowOffPic from "../getShowOffPic";
-import getSharePic from "../getSharePic";
+import getSharePic, { getShareUrl } from "../getSharePic";
 
 export default class BloodPanel extends Panel {
     start(data) {
@@ -57,7 +57,7 @@ this['price1Txt'].text = window['price1']
     onTapInvite() {
         
         if (iswx()) {
-            getSharePic(this.stage);
+            getShareUrl(this.stage);
         } else
         showShare(1);
         NetManager.ins.clickLog(getlogItem(4));