Commit b5cd7359 authored by wangzhujun's avatar wangzhujun

123

parent ca3beeae
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<e:Image width="100" height="100" y="0" horizontalCenter="0" source="pkcirle_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: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: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"/> <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:Label id="onnum" text="+1586步" y="25" size="20" x="0" scaleX="1" scaleY="1" width="110" textAlign="center"/>
</e:Group> </e:Group>
<e:Group id="notGroup" width="106" height="58" y="111" horizontalCenter="0" visible="false"> <e:Group id="notGroup" width="106" height="58" y="111" horizontalCenter="0" visible="false">
......
...@@ -149,11 +149,11 @@ class Main extends MainBase { ...@@ -149,11 +149,11 @@ class Main extends MainBase {
// 创建游戏场景 // 创建游戏场景
protected createGameScene() { protected createGameScene() {
super.createGameScene(); super.createGameScene();
SceneCtrl.instance.change(ModuleTypes.Share2Scene); // SceneCtrl.instance.change(ModuleTypes.Share2Scene);
// PanelCtrl.instance.show(ModuleTypes.JoinShareScene); // // PanelCtrl.instance.show(ModuleTypes.JoinShareScene);
Waiting.instance.hide(); // Waiting.instance.hide();
return; // return;
//获取UA信息 //获取UA信息
let userAgent = navigator.userAgent.toLowerCase(); let userAgent = navigator.userAgent.toLowerCase();
console.log(userAgent); console.log(userAgent);
......
...@@ -40,16 +40,18 @@ export default class PKScorePanel extends Panel{ ...@@ -40,16 +40,18 @@ export default class PKScorePanel extends Panel{
this.light.source = "pkpeacelight_png" this.light.source = "pkpeacelight_png"
this.title.text = "未能获得宝箱" this.title.text = "未能获得宝箱"
this.endtitle.text = "本场助力排行榜" this.endtitle.text = "本场助力排行榜"
this.setColor(this.box);
}else if(data.pkResult.pkResult == 1){ }else if(data.pkResult.pkResult == 1){
this.status.source = "pkwinlogo_png" this.status.source = "pkwinlogo_png"
this.light.source = "pkwinlight_png" this.light.source = "pkwinlight_png"
this.title.text = "宝箱已发到胜利队伍" this.title.text = "宝箱已发到胜利队伍"
this.endtitle.text = "本场分数奖励" this.endtitle.text = "本场分数奖励"
}else if(data.pkResult.pkResult == 2){ }else if(data.pkResult.pkResult == 2){
this.status.source = "pkloselogo_png" this.status.source = "pkloselogo_png"
this.light.source = "pkloselight_png" this.light.source = "pkloselight_png"
this.title.text = "未能获得宝箱" this.title.text = "未能获得宝箱"
this.endtitle.text = "本场助力排行榜" this.endtitle.text = "本场助力排行榜"
this.setColor(this.box);
} }
for(let i = 0;i<data.pkResult.myTeamMembers.length;i++){ for(let i = 0;i<data.pkResult.myTeamMembers.length;i++){
this["team"+(i+1)]["onGroup"].visible = true; this["team"+(i+1)]["onGroup"].visible = true;
...@@ -65,12 +67,18 @@ export default class PKScorePanel extends Panel{ ...@@ -65,12 +67,18 @@ export default class PKScorePanel extends Panel{
}else{ }else{
this["team"+(i+1)]["onphone"].text = data.pkResult.myTeamMembers[i].phone this["team"+(i+1)]["onphone"].text = data.pkResult.myTeamMembers[i].phone
} }
}
for(let n = 5;n>data.pkResult.myTeamMembers.length;n--){
this["team"+n]["notonline"].visible = false;
this["team"+n]["onGroup"].visible = false;
this["team"+n]["notGroup"].visible = false;
this["team"+n]["headimg"].source = "pkadd_png"
this["team"+n]["nopeople"].visible = false;
} }
this.onTap(this.closeBtn,this.onTap_PKBtn)
this.onTap(this.prizeBtn,this.onTap_PKBtn)
} }
onTap_PKBtn(){ onTap_PKBtn(){
...@@ -81,6 +89,7 @@ export default class PKScorePanel extends Panel{ ...@@ -81,6 +89,7 @@ export default class PKScorePanel extends Panel{
} }
let data = DataManager.ins.getData("getPkBaseInfo").data; let data = DataManager.ins.getData("getPkBaseInfo").data;
let pkdata = {data:data,startdata:this.startdata} let pkdata = {data:data,startdata:this.startdata}
this.hidePanel();
SceneCtrl.instance.change(ModuleTypes.PK_SCENE,pkdata); SceneCtrl.instance.change(ModuleTypes.PK_SCENE,pkdata);
},window['projectId']); },window['projectId']);
} }
......
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