1232

egret/resource/assets/share2/.gitignore

+/share2bg.jpg
+/share2btn.png
+/share2mask.png

egret/resource/assets/transferrecord/.gitignore

+/transferrecord_bg.png
+/transferrecord_item_bg.png

egret/resource/default.res.json

 {
 	"groups": [
 		{
-			"keys": "yylogo_png,yyhpklogo_png,yyhlogo_png,waitBtn_png,unriben_png,unmenggu_png,unhanguo_png,unCHNxianggang_png,unCHNtaiwan_png,unCHNhangzhou_png,unCHNaomen_png,unchaoxian_png,teamBtn_png,starttitle_png,startBtn_png,ruleBtn_png,riben_png,recordBtn_png,rankBtn_png,prizeBtn_png,menggu_png,lockBtn_png,littletitle_png,horn_png,hanguo_png,getBtn_png,fireBtn_png,CHNxianggang_png,CHNtaiwan_png,CHNhangzhou_png,CHNaomen_png,chaoxian_png,BG_jpg,closeBtn_png",
+			"keys": "yylogo_png,yyhpklogo_png,yyhlogo_png,waitBtn_png,unriben_png,unmenggu_png,unhanguo_png,unCHNxianggang_png,unCHNtaiwan_png,unCHNhangzhou_png,unCHNaomen_png,unchaoxian_png,teamBtn_png,starttitle_png,startBtn_png,ruleBtn_png,riben_png,recordBtn_png,rankBtn_png,prizeBtn_png,menggu_png,lockBtn_png,littletitle_png,horn_png,hanguo_png,getBtn_png,fireBtn_png,CHNxianggang_png,CHNtaiwan_png,CHNhangzhou_png,CHNaomen_png,chaoxian_png,closeBtn_png",
 			"name": "Preload"
 		},
 		{
-			"keys": "mrxg_png,mrtitle_png,mrtb_png,mrrb_png,mrmg_png,mrhz_png,mrhg_png,mrcx_png,mrbg_jpg,mram_png,mapshareBtn_png,mappass_png,maphz_png,mapBtn_png,rulebg_png,rankmybg_png,rankline_png,ranklight_png,rankbg2_png,rankbg_png,lessscoreBtn_png,lessscorebg_png,finishlogo_png,finishlight_png,finishBtn_png,finishbg_png,progress_png,bg_png,xuanshiBtn_png,xuanshiBG_png,mapcx_png,maphg_png,mapmg_png,mapxg_png,mapam_png,maprb_png,maptb_png",
+			"keys": "mrxg_png,mrtitle_png,mrtb_png,mrrb_png,mrmg_png,mrhz_png,mrhg_png,mrcx_png,mrbg_jpg,mram_png,mapshareBtn_png,mappass_png,mapBtn_png,rulebg_png,rankmybg_png,rankline_png,ranklight_png,rankbg2_png,lessscoreBtn_png,lessscorebg_png,finishlogo_png,finishlight_png,finishBtn_png,finishbg_png,progress_png,bg_png,xuanshiBtn_png",
 			"name": "Normal"
 		},
 		{
@@ -18,15 +18,10 @@
 		},
 		{
 			"name": "preload",
-			"keys": "xsBG_png,backstartBtn_png"
+			"keys": "backstartBtn_png,pkfinishbg_png,xsbg_png,startBG_jpg,rankbg_png,mapam_png,mapcx_png,maphg_png,maphz_png,mapmg_png,maprb_png,maptb_png,mapxg_png"
 		}
 	],
 	"resources": [
-		{
-			"url": "assets/xuanshi/xuanshiBG.png",
-			"type": "image",
-			"name": "xuanshiBG_png"
-		},
 		{
 			"url": "assets/xuanshi/xuanshiBtn.png",
 			"type": "image",
@@ -102,11 +97,6 @@
 			"type": "image",
 			"name": "mapBtn_png"
 		},
-		{
-			"url": "assets/map/maphz.png",
-			"type": "image",
-			"name": "maphz_png"
-		},
 		{
 			"url": "assets/map/mappass.png",
 			"type": "image",
@@ -327,11 +317,6 @@
 			"type": "image",
 			"name": "lessscoreBtn_png"
 		},
-		{
-			"url": "assets/pop/rankbg.png",
-			"type": "image",
-			"name": "rankbg_png"
-		},
 		{
 			"url": "assets/pop/rankbg2.png",
 			"type": "image",
@@ -397,11 +382,6 @@
 			"type": "image",
 			"name": "slogan_btn_png"
 		},
-		{
-			"url": "assets/startScene/BG.jpg",
-			"type": "image",
-			"name": "BG_jpg"
-		},
 		{
 			"url": "assets/startScene/chaoxian.png",
 			"type": "image",
@@ -628,49 +608,69 @@
 			"name": "progress_png"
 		},
 		{
-			"url": "assets/map/mapcx.png",
+			"name": "backstartBtn_png",
+			"type": "image",
+			"url": "assets/xuanshi/backstartBtn.png"
+		},
+		{
+			"name": "pkfinishbg_png",
 			"type": "image",
-			"name": "mapcx_png"
+			"url": "assets/pk/pkfinishbg.png"
 		},
 		{
-			"url": "assets/map/maphg.png",
+			"name": "xsbg_png",
 			"type": "image",
-			"name": "maphg_png"
+			"url": "assets/xuanshi/xsbg.png"
 		},
 		{
-			"url": "assets/map/mapmg.png",
+			"name": "startBG_jpg",
 			"type": "image",
-			"name": "mapmg_png"
+			"url": "assets/startScene/startBG.jpg"
 		},
 		{
-			"url": "assets/map/mapxg.png",
+			"name": "rankbg_png",
 			"type": "image",
-			"name": "mapxg_png"
+			"url": "assets/pop/rankbg.png"
 		},
 		{
-			"url": "assets/map/mapam.png",
+			"name": "mapam_png",
 			"type": "image",
-			"name": "mapam_png"
+			"url": "assets/map/mapam.png"
 		},
 		{
-			"url": "assets/map/maprb.png",
+			"name": "mapcx_png",
 			"type": "image",
-			"name": "maprb_png"
+			"url": "assets/map/mapcx.png"
 		},
 		{
-			"url": "assets/map/maptb.png",
+			"name": "maphg_png",
 			"type": "image",
-			"name": "maptb_png"
+			"url": "assets/map/maphg.png"
 		},
 		{
-			"name": "xsBG_png",
+			"name": "maphz_png",
 			"type": "image",
-			"url": "assets/xuanshi/xsBG.png"
+			"url": "assets/map/maphz.png"
 		},
 		{
-			"name": "backstartBtn_png",
+			"name": "mapmg_png",
 			"type": "image",
-			"url": "assets/xuanshi/backstartBtn.png"
+			"url": "assets/map/mapmg.png"
+		},
+		{
+			"name": "maprb_png",
+			"type": "image",
+			"url": "assets/map/maprb.png"
+		},
+		{
+			"name": "maptb_png",
+			"type": "image",
+			"url": "assets/map/maptb.png"
+		},
+		{
+			"name": "mapxg_png",
+			"type": "image",
+			"url": "assets/map/mapxg.png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/GuideSkin.exml

@@ -25,7 +25,7 @@
 		<e:Image width="50" height="60" x="81" y="983" source="hand_png" scaleX="1" scaleY="1"/>
 	</e:Group>
     <e:Group id="xuanshi" width="664" height="669" horizontalCenter="14" verticalCenter="-125.5" visible="false">
-		<e:Image width="638" height="580" x="0" y="89" scaleX="1" scaleY="1" source="xsBG_png"/>
+		<e:Image width="638" height="580" x="0" y="89" scaleX="1" scaleY="1" source="xsbg_png"/>
 		<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>

egret/resource/skins/HeadItemSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
-<e:Skin class="HeadItemSkin" width="110" height="169" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+<e:Skin class="HeadItemSkin" width="120" height="169" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16ed4c87c57"/>
-	<e:Image id="headimg" width="100" height="100" y="0" horizontalCenter="0" source="head1_png"/>
-	<e:Image width="100" height="100" y="0" horizontalCenter="0" source="pkcirle_png"/>
-	<e:Label id="notonline" text="未上线" y="41" size="20" horizontalCenter="0" visible="false"/>
-	<e:Group id="onGroup" width="110" height="45" y="113" horizontalCenter="1">
-		<e:Label id="onphone" text="130****1856" y="0" size="20" scaleX="1" scaleY="1" x="1" width="110" textAlign="center"/>
-		<e:Label id="onnum" text="+1586步" y="25" size="20" x="0" scaleX="1" scaleY="1" width="110" textAlign="center"/>
+	<e:Image id="headimg" width="100" height="100" y="0" horizontalCenter="0" source="head1_png" visible="false"/>
+
+
+	<e:Group id="onGroup" width="120" height="45" y="113" horizontalCenter="0">
+		<e:Label id="onphone" text="130****1856" y="0" size="19.5" scaleX="1" scaleY="1" x="0" width="120" textAlign="center" verticalAlign="middle"/>
+		<e:Label id="onnum" text="+1586步" y="25" size="20" x="0" scaleX="1" scaleY="1" width="120" textAlign="center"/>
 	</e:Group>
 	<e:Group id="notGroup" width="106" height="58" y="111" horizontalCenter="0" visible="false">
 		<e:Button id="notonBtn" label="Button" skinName="ui.IconButtonSkin" icon="pkBtn_png" scaleX="1" scaleY="1" width="106" height="36" anchorOffsetX="53" anchorOffsetY="18" x="53" y="18"/>
 		<e:Label id="notonphone" text="123****8856" y="41" size="17" x="7" scaleX="1" scaleY="1"/>
 	</e:Group>
 	<e:Label id="nopeople" text="待加入" y="113" size="20" horizontalCenter="0" visible="false"/>
+	<e:Group y="0" width="100" height="100" horizontalCenter="0">
+		<e:Image id="avatar" y="0" width="100" height="100" x="0" source=""/>
+		<e:Rect id="avatarMask" width="100" height="100" ellipseWidth="136" ellipseHeight="136"/>
+	</e:Group>
+	<e:Image width="100" height="100" y="0" horizontalCenter="0" source="pkcirle_png"/>
+	<e:Label id="notonline" text="未上线" y="41" size="20" horizontalCenter="0" visible="false"/>
 </e:Skin>
\ No newline at end of file

egret/resource/skins/PKSCoreSkin.exml

@@ -4,7 +4,7 @@
 	
 	<e:Group width="750" height="872" anchorOffsetY="0" horizontalCenter="0" verticalCenter="-133">
 		<e:Image id="light" width="693" height="689" x="27" y="0" source="pkwinlight_png" scaleX="1" scaleY="1"/>
-		<e:Image width="638" height="673" x="57" y="198" source="pkendbg_png" scaleX="1" scaleY="1"/>
+		<e:Image width="638" height="673" x="57" y="198" scaleX="1" scaleY="1" source="pkfinishbg_png"/>
 		<e:Button id="closeBtn" label="Button" skinName="ui.IconButtonSkin" icon="closeBtn_png" width="48" height="48" anchorOffsetX="24" anchorOffsetY="24" x="673" y="109" scaleX="1" scaleY="1"/>
 		<e:Image id="box" width="61" height="54" x="340" y="331" source="box_png" scaleX="1" scaleY="1"/>
 		<e:Label id="date" text="12月5日" x="293" y="304" size="18" width="166" textAlign="center" scaleX="1" scaleY="1"/>

egret/resource/skins/PKSkin.exml

@@ -5,10 +5,10 @@
 	<e:Image id="otherline" width="212" height="941" scale9Grid="26,103,159,429" bottom="0" horizontalCenter="157" source="pkotherline2_png"/>
 	<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="敌方队伍" x="426" y="738" size="29" textAlign="center" verticalAlign="middle" textColor="0xFCFFFF" width="212"/>
+	<e:Label id="otherteam" text="PK方队伍" x="426" y="738" size="29" textAlign="center" verticalAlign="middle" textColor="0xFCFFFF" width="212"/>
 	<e:Label id="otherteamnum" text="总步数：9999" x="426" y="772" size="30" verticalAlign="middle" width="212" textAlign="center" textColor="0x93f7fa"/>
 	<e:Group width="750" height="1206" horizontalCenter="0" verticalCenter="0">
-		<e:Button id="ruleBtn" label="Button" skinName="ui.IconButtonSkin" icon="pkrulebtn_png" scaleX="1" scaleY="1" width="106" height="40" anchorOffsetX="53" anchorOffsetY="20" x="697" y="36"/>
+
 		<e:Image width="575" height="265" x="87" y="80" scaleX="1" scaleY="1" source="pkscorebg2_png"/>
 		<e:Label id="allscore" text="100" x="178" y="166" size="43" textColor="0x4cfcfc" anchorOffsetX="0" width="127" textAlign="center" scaleX="1" scaleY="1"/>
 		<e:Label id="myscore" text="100" x="434" y="166" size="43" textColor="0x4CFCFC" anchorOffsetX="0" width="148" textAlign="center" scaleX="1" scaleY="1"/>
@@ -26,6 +26,8 @@
 		<e:Component id="team4" x="460" y="910" skinName="HeadItemSkin" scaleX="1" scaleY="1"/>
 		<e:Component id="team5" x="600" y="910" skinName="HeadItemSkin" scaleX="1" scaleY="1"/>
 		<e:Image width="110" height="65" x="151" y="243" source="yyhpklogo_png"/>
-		<e:Button id="backBtn" label="Button" skinName="ui.IconButtonSkin" icon="backstartBtn_png" width="104" height="40" scaleX="1" scaleY="1" anchorOffsetX="52" anchorOffsetY="20" x="52" y="36"/>
+
 	</e:Group>
+	<e:Button id="ruleBtn" label="Button" skinName="ui.IconButtonSkin" icon="pkrulebtn_png" scaleX="1" scaleY="1" width="106" height="40" anchorOffsetX="53" anchorOffsetY="20" x="697" y="50"/>
+	<e:Button id="backBtn" label="Button" skinName="ui.IconButtonSkin" icon="backstartBtn_png" width="104" height="40" scaleX="1" scaleY="1" anchorOffsetX="52" anchorOffsetY="20" x="52" y="50"/>
 </e:Skin>
\ No newline at end of file

egret/resource/skins/PlaceSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="PlaceSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
-	<e:Group width="714" height="1076" horizontalCenter="15" verticalCenter="-34">
+	<e:Group width="714" height="1181" horizontalCenter="15" verticalCenter="19.5" anchorOffsetY="0">
 		<e:Image id="mapBG" width="683" height="801" x="0" y="111" source="maphz_png" scaleX="1" scaleY="1"/>
 		<e:Image width="308" height="166" x="406" y="81" source="mappass_png" scaleX="1" scaleY="1"/>
 		<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="658" y="24"/>
 		<e:Button id="knowBtn" label="Button" skinName="ui.IconButtonSkin" icon="mapBtn_png" scaleX="1" scaleY="1" width="449" height="122" anchorOffsetX="224.5" anchorOffsetY="61" x="340.5" y="1015"/>
+		<e:Label id="sharelab" text="首次分享可获得10能量" size="28" textAlign="center" width="750" scaleX="1" scaleY="1" y="1126" x="-33"/>
 	</e:Group>
 
 

egret/resource/skins/RecordMapSkin.exml

@@ -6,6 +6,7 @@
 		<e:Image width="308" height="166" x="439" y="76" source="mappass_png" scaleX="1" scaleY="1"/>
 		<e:Button id="shareBtn" label="Button" skinName="ui.IconButtonSkin" icon="mapshareBtn_png" scaleX="1" scaleY="1" width="449" height="122" anchorOffsetX="224.5" anchorOffsetY="61" horizontalCenter="-1.5" y="1010"/>
 		<e:Label id="sharelab" text="首次分享可获得10能量" size="28" textAlign="center" width="750" scaleX="1" scaleY="1" horizontalCenter="0" y="1087"/>
-		<e:Button id="backBtn" label="Button" skinName="ui.IconButtonSkin" icon="backstartBtn_png" width="104" height="40" scaleX="1" scaleY="1" anchorOffsetX="52" anchorOffsetY="20" x="52" y="20"/>
+
 	</e:Group>
+	<e:Button id="backBtn" label="Button" skinName="ui.IconButtonSkin" icon="backstartBtn_png" width="104" height="40" scaleX="1" scaleY="1" anchorOffsetX="52" anchorOffsetY="20" x="52" y="50"/>
 </e:Skin>
\ No newline at end of file

egret/resource/skins/RecordSkin.exml

@@ -11,6 +11,7 @@
 		<e:Image id="hg" width="180" height="202" source="mrhg_png" scaleX="1" scaleY="1" horizontalCenter="222" y="440"/>
 		<e:Image id="cx" width="180" height="202" source="mrcx_png" scaleX="1" scaleY="1" horizontalCenter="-222" y="697"/>
 		<e:Image id="mg" width="180" height="202" source="mrmg_png" scaleX="1" scaleY="1" horizontalCenter="0" y="697"/>
-		<e:Button id="backBtn" label="Button" skinName="ui.IconButtonSkin" icon="backstartBtn_png" width="104" height="40" scaleX="1" scaleY="1" anchorOffsetX="52" anchorOffsetY="20" x="52" y="20"/>
+
 	</e:Group>
+	<e:Button id="backBtn" label="Button" skinName="ui.IconButtonSkin" icon="backstartBtn_png" width="104" height="40" scaleX="1" scaleY="1" anchorOffsetX="52" anchorOffsetY="20" x="52" y="50"/>
 </e:Skin>
\ No newline at end of file

egret/resource/skins/SloganSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="SloganSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
-	<e:Image y="222" horizontalCenter="0" source="xsBG_png"/>
+	<e:Image y="222" horizontalCenter="0" source="xsbg_png"/>
 	<e:Image id="btn" source="slogan_btn_png" y="636" horizontalCenter="0"/>
 	<e:Image id="closeBtn" source="关闭按钮 _png" x="652" y="139"/>
 </e:Skin>
\ No newline at end of file

egret/resource/skins/StartSkin.exml

@@ -2,9 +2,9 @@
 <e:Skin class="StartSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 
 	<e:Group width="750" height="1169" anchorOffsetY="0" horizontalCenter="0" verticalCenter="-11.5">
-		<e:Image width="750" height="1624" x="0" y="-216" source="BG_jpg" scaleX="1" scaleY="1"/>
-		<e:Button id="ruleBtn" label="Button" skinName="ui.IconButtonSkin" icon="ruleBtn_png" width="97" height="40" scaleX="1" scaleY="1" anchorOffsetX="48.5" anchorOffsetY="20" x="48.5" y="29"/>
-		<e:Button id="recordBtn" label="Button" skinName="ui.IconButtonSkin" icon="recordBtn_png" scaleX="1" scaleY="1" width="106" height="40" anchorOffsetX="53" anchorOffsetY="20" x="697" y="29"/>
+		<e:Image width="750" height="1624" x="0" y="-216" scaleX="1" scaleY="1" source="startBG_jpg"/>
+
+
 		<e:Image width="82" height="82" x="334" y="-2" scaleX="1" scaleY="1" source="yyhlogo_png"/>
 		<e:Image width="474" height="88" x="139" y="86" source="starttitle_png" scaleX="1" scaleY="1"/>
 		<e:Image width="384" height="52" x="184" y="184" source="littletitle_png" scaleX="1" scaleY="1"/>
@@ -26,6 +26,8 @@
 		<e:Button id="rankBtn" label="Button" skinName="ui.IconButtonSkin" icon="rankBtn_png" scaleX="1" scaleY="1" width="54" height="109" anchorOffsetX="27" anchorOffsetY="54.5" x="723" y="746.5"/>
 		<e:Image id="hand" width="69" height="65" x="463" y="1099" source="hand2_png" scaleX="1" scaleY="1"/>
 	</e:Group>
+	<e:Button id="ruleBtn" label="Button" skinName="ui.IconButtonSkin" icon="ruleBtn_png" width="97" height="40" scaleX="1" scaleY="1" anchorOffsetX="48.5" anchorOffsetY="20" x="48.5" y="50"/>
+	<e:Button id="recordBtn" label="Button" skinName="ui.IconButtonSkin" icon="recordBtn_png" scaleX="1" scaleY="1" width="106" height="40" anchorOffsetX="53" anchorOffsetY="20" x="697" y="50"/>
 
 
 

egret/src/Main.ts

@@ -172,7 +172,20 @@ class Main extends MainBase {
 
         if (window['pageID']) {
             Buried.init();
+            // if (GameConst.getQueryString("InviteSource")) {
+                yzwNet.homeBaseInfo((s) => {
+                    if (!s) {
+                        if((DataManager.ins.getData("homeBaseInfo").message)){
+                            ToastCtrl.instance.show(DataManager.ins.getData("homeBaseInfo").message)
+                        }else{
+                            ToastCtrl.instance.show("网络异常请重试~");
+                        }
                         
+                        // ToastCtrl.instance.show("网络异常请重试~");
+                        return;
+                    }
+                }, window['projectId'])
+            // }
             Waiting.instance.hide();
 
             if (window['pageID'] == 'Share2Scene') {
@@ -185,9 +198,7 @@ class Main extends MainBase {
                 SceneCtrl.instance.change(ModuleTypes.TeamShareScene);
             }
             if (window['pageID'] == 'TransScene') {
-                yzwNet.homeBaseInfo((s) => { 
                 SceneCtrl.instance.change(ModuleTypes.TransScene);
-                }, window['projectId']);  
             }
             return;
         }

egret/src/startScene/StartScene.ts

@@ -107,7 +107,7 @@ export default class StartScene extends Scene {
 
         
         this.once(egret.Event.ADDED_TO_STAGE, () => {
-            this.height = this.stage.stageHeight;
+            this.height = 750/window.innerWidth*window.innerHeight;
         }, this);
         if(GameConst.getQueryString("joinTeamCode")){
             GCache.writeCache("isGuide",true);
@@ -200,6 +200,14 @@ export default class StartScene extends Scene {
             }
             
         }
+        for(let i = this.level;i<this.arr.length;i++){
+            if(this.startdata.nextLevelScore>this.startdata.currentScore){
+                this.onTap(this[this.arr[i]],this.noCredits)
+            }else{
+                this.onTap(this[this.arr[i]],this.unlockArea);
+            }
+            
+        }
         
     }
     noCredits(){
@@ -396,6 +404,21 @@ export default class StartScene extends Scene {
         this.onTap(this.pkBtn,this.onTap_PKBtn);
         this.onTap(this.firedBtn,this.onTap_chuandi);
         GameConst.BtnAni(this.needscore,this.unlockBtn);
+        
+        
+    }
+
+
+
+    removeEvents(){
+        for(let i = this.level;i<this.arr.length;i++){
+            if(this.startdata.nextLevelScore>this.startdata.currentScore){
+                this.clearTap(this[this.arr[i]],this.noCredits)
+            }else{
+                this.clearTap(this[this.arr[i]],this.unlockArea);
+            }
+            
+        }
     }
 
     onTap_chuandi(){

egret/src/yazuwei/GuidePanel.ts

@@ -50,7 +50,12 @@ export default class GuidePanel extends Panel{
         this.xuanshi.visible = false;
         this.dianran.visible = false;
         this.hand.touchEnabled = true;
+        let now = new Date();
+        if(now.getTime()>window['PKstarttime']){
             this.onTap(this.unlockBtn,this.initGuide2);
+        }else{
+            this.onTap(this.unlockBtn,this.initGuide3);
+        }
     }
 
     initGuide2(){
@@ -59,7 +64,11 @@ export default class GuidePanel extends Panel{
         this.guide3.visible = false;
         this.xuanshi.visible = false;
         this.dianran.visible = false;
+        
+
         this.onTap(this.pkBtn,this.initGuide3);
+        
+        
     }
     initGuide3(){
         this.guide1.visible = false;

egret/src/yazuwei/PKScene.ts

@@ -53,7 +53,7 @@ export default class PKScene extends Scene{
     initUI(data){
         console.log("pk:"+data)
         this.once(egret.Event.ADDED_TO_STAGE, () => {
-            this.height = this.stage.stageHeight;
+            this.height = 750/window.innerWidth*window.innerHeight;
         }, this);
         this.addEventListener(egret.Event.ENTER_FRAME,this.onEnterFrame,this);
         this.allscore.text = data.pkTotalScore;
@@ -95,7 +95,7 @@ export default class PKScene extends Scene{
            
         
         for(let i = 1;i<data.myTeamMembers.length+1;i++){
-            this["team"+i]["onnum"].text = "+"+data.myTeamMembers[i-1].memberStepCounts;
+            this["team"+i]["onnum"].text = "+"+data.myTeamMembers[i-1].memberStepCounts+"步";
             if(data.myTeamMembers[i-1].phone ){
                 if(data.myTeamMembers[i-1].phone == "null"){
                     this["team"+i]["onphone"].text = "未知号码";
@@ -107,7 +107,8 @@ export default class PKScene extends Scene{
                 this["team"+i]["onphone"].text = "未知号码";
             }
             
-            this["team"+i]["headimg"].source = data.myTeamMembers[i-1].avatar;
+            this["team"+i]["avatar"].source = data.myTeamMembers[i-1].avatar;
+            this["team"+i]['avatar'].mask = this["team"+i]['avatarMask'];
             let now = new Date();
             let year = now.getFullYear();
             let mon:any = now.getMonth()+1;
@@ -153,6 +154,8 @@ export default class PKScene extends Scene{
             this["team"+n]["notGroup"].visible = false;
             this["team"+n]["headimg"].source = "pkadd_png"
             this["team"+n]["nopeople"].visible = true;
+            this["team"+n]["avatar"].source = "pkadd_png";
+            this["team"+n]['avatar'].mask = this["team"+n]['avatarMask'];
             this.onTap(this["team"+n],this.askTeam);
         }
     })

egret/src/yazuwei/PKScorePanel.ts

@@ -81,7 +81,8 @@ export default class PKScorePanel extends Panel{
 
                 this["team"+(i+1)]["onnum"].text = data.pkResult.myTeamMembers[i].steps
             }
-            this["team"+(i+1)]["headimg"].source = data.pkResult.myTeamMembers[i].avatar;
+            this["team"+(i+1)]["avatar"].source = data.pkResult.myTeamMembers[i].avatar;
+            this["team"+(i+1)]['avatar'].mask = this["team"+(i+1)]['avatarMask'];
             if(data.pkResult.myTeamMembers[i].uId == uiddata.partnerUserId){
                 this["team"+(i+1)]["onphone"].text = "我"
             }else{
@@ -105,7 +106,10 @@ export default class PKScorePanel extends Panel{
             this["team"+n]["onGroup"].visible = false;
             this["team"+n]["notGroup"].visible = false;
             this["team"+n]["headimg"].source = "pkadd_png"
+            this["team"+n]["avatar"].source = "pkadd_png"
+            this["team"+n]['avatar'].mask = this["team"+n]['avatarMask'];
             this["team"+n]["nopeople"].visible = false;
+            this["team"+n]['avatarMask'].visible = false;
         }
     })
         this.onTap(this.closeBtn,this.onTap_PKBtn)

egret/src/yazuwei/PlacePanel.ts

@@ -5,6 +5,7 @@ import Waiting from "../waiting/Waiting";
 import { DataManager } from "../../libs/tw/manager/DataManager";
 import SceneCtrl from "../ctrls/sceneCtrl";
 import { ModuleTypes } from "../types/sceneTypes";
+import StartScene from "../startScene/StartScene";
 
 export default class PlacePanel extends Panel{
     protected get skinKey(){return 'Place'}
@@ -21,7 +22,7 @@ export default class PlacePanel extends Panel{
     }
 
     initUI(data){
-        
+        this.knowBtn.icon = "mapshareBtn_png"
         if(data == 1){
             this.mapBG.source = "maphz_png"
         }else if(data == 2){
@@ -44,7 +45,7 @@ export default class PlacePanel extends Panel{
     initEvents(){
         super.initEvents();
         this.onTap(this.closeBtn,this.backStart)
-        this.onTap(this.knowBtn,this.backStart)
+        this.onTap(this.knowBtn,this.sharePic)
 
     }
     backStart(){
@@ -68,5 +69,29 @@ export default class PlacePanel extends Panel{
         },window['projectId'])
     }
 
+    sharePic(){
+        Waiting.instance.show();
+        const arr = ["HZ","AM","XG","TB","RB","HG","CX","MG"];
+        yzwNet.shareFootprint((s)=>{
+            Waiting.instance.hide();
+            if(!s){
+                if(DataManager.ins.getData("shareFootprint") && DataManager.ins.getData("shareFootprint").message){
+                    ToastCtrl.instance.show(DataManager.ins.getData("shareFootprint").message)
+                }else{
+                    ToastCtrl.instance.show("网络异常请重试~")
+                }
+                
+                // ToastCtrl.instance.show("网络异常请重新分享~")
+                return
+            }
+            // ToastCtrl.instance.show()
+            // setTimeout(()=>{
+            //     this.backStart()
+            // },3000)
+            window['shareImg'](StartScene.instance.level+1);
+            
+        },window['projectId'],arr[StartScene.instance.level])
+        
+    }
 
 }
\ No newline at end of file

mock/yzw/homeBaseInfo.json

 {
     "code":null,
     "data":{
-        "currentLevel":7,
+        "currentLevel":1,
         "treasureBoxNum":0,
-        "currentScore":1222,
+        "currentScore":2000,
         "pkResult":{
             "myTeamSteps":100,
             "enemyTeamSteps":2000,

mock/yzw/shareFootprint.json

+{
+    "code": null,
+    "data": null,
+    "message": null,
+    "success": true
+}
\ No newline at end of file