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

egret/resource/default.thm.json

@@ -29,6 +29,10 @@
         "resource/skins/HeadItemSkin.exml",
         "resource/skins/PKRuleSkin.exml",
         "resource/skins/PKPrizeSkin.exml",
+        "resource/skins/FinishSkin.exml",
+        "resource/skins/RankSkin.exml",
+        "resource/skins/RankItemSkin.exml",
+        
         "resource/skins/ConfirmSkin.exml",
         "resource/skins/JoinShareSkin.exml",
         "resource/skins/PKScoreSkin.exml",

egret/src/startScene/StartScene.ts

@@ -102,6 +102,13 @@ export default class StartScene extends Scene {
                 PanelCtrl.instance.show(ModuleTypes.PKSCORE_PANEL,this.startdata);
             }
         }
+        if(data.currentLevel == 8){
+            if(!GCache.readCache("finishtzw")){
+                GCache.writeCache("finishtzw",true);
+                PanelCtrl.instance.show(ModuleTypes.FINISH_PANEL);
+            }
+            
+        }
         
     }
     noCredits(){
@@ -142,7 +149,7 @@ export default class StartScene extends Scene {
                 return;
             }
             let data = DataManager.ins.getData("rankInfo").data;
-            PanelCtrl.instance.show(ModuleTypes.RANK_PANEL);
+            PanelCtrl.instance.show(ModuleTypes.RANK_PANEL,data);
         },window['projectId'])
     }
     onTap_ruleBtn(){
@@ -152,14 +159,31 @@ export default class StartScene extends Scene {
         SceneCtrl.instance.change(ModuleTypes.RECORD_SCENE,this.level)
     }
     unlockArea(){
-        yzwNet.unlockArea((s)=>{
-            if(!s){
-                ToastCtrl.instance.show("网络异常请重试~");
-                return
-            }
-            this[this.arr[this.level]].source = this[this.arr[this.level]].source.substring(2);
-            PanelCtrl.instance.show(ModuleTypes.PLACE_PANEL,this.level+1);
-        },window['projectId']);
+        if(this.level == 0){
+            yzwNet.doStart((s)=>{
+                if(!s){
+                    ToastCtrl.instance.show("网络异常请重试~");
+                    return;
+                }
+                let startdata = DataManager.ins.getData("doStart").data;
+                let data = {startdata:startdata,type:3};
+                this.hz.source = "CHNhangzhou_png"
+                this.hand.visible = false;
+                this.clearTap(this.unlockBtn,this.GuideFive);
+                this.onTap(this.unlockBtn,this.unlockArea);
+                PanelCtrl.instance.show(ModuleTypes.GUIDE_PANEL,data);
+            },window['projectId'])
+        }else{
+            yzwNet.unlockArea((s)=>{
+                if(!s){
+                    ToastCtrl.instance.show("网络异常请重试~");
+                    return
+                }
+                this[this.arr[this.level]].source = this[this.arr[this.level]].source.substring(2);
+                PanelCtrl.instance.show(ModuleTypes.PLACE_PANEL,this.level+1);
+            },window['projectId']);
+        }
+        
     }
 
     initEvents(){

mock/yzw/rankInfo.json

 {
     "code":null,
-    "data":123456,
+    "data":{
+        "currentUserInfo":{
+            "count":1,
+            "rank":2
+        },
+        "list":[
+            {
+                "count":2,
+                "phone":"136****4582",
+                "rank":1,
+                "userId":"500095001"
+            },
+            {
+                "count":1,
+                "phone":"null",
+                "rank":2,
+                "userId":"1539361"
+            },
+            {
+                "count":1,
+                "phone":"null",
+                "rank":3,
+                "userId":"1539361"
+            },
+            {
+                "count":1,
+                "phone":"null",
+                "rank":4,
+                "userId":"1539361"
+            },
+            {
+                "count":1,
+                "phone":"null",
+                "rank":5,
+                "userId":"1539361"
+            },
+            {
+                "count":1,
+                "phone":"null",
+                "rank":6,
+                "userId":"1539361"
+            },
+            {
+                "count":1,
+                "phone":"null",
+                "rank":7,
+                "userId":"1539361"
+            },
+            {
+                "count":1,
+                "phone":"null",
+                "rank":8,
+                "userId":"1539361"
+            },
+            {
+                "count":1,
+                "phone":"null",
+                "rank":10,
+                "userId":"1539361"
+            },
+            {
+                "count":1,
+                "phone":"null",
+                "rank":11,
+                "userId":"1539361"
+            }
+        ]
+    },
     "message":null,
     "success":true
 }
\ No newline at end of file