Skip to content

Y
yyh
Commit 10f8e48e authored by wangzhujun's avatar wangzhujun
Browse files
Options

1232

parent 8ba07105
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 27 deletions
egret/resource/default.res.json
View file @ 10f8e48e
......@@ -5,7 +5,7 @@
"name": "Preload"
},
{
"keys": "certificate_btn_png,certificate_cover_png,certificate_jpg,joinshare_btn_png,joinshare_bg_jpg,sharestarter_bg_jpg,sharestarter_btn_png,sharestarter_sharebtn_png,share2mask_png,share2btn_png,share2bg_jpg,confirm_btn_png,confirm_bg_png,transfer _toast3_png,transfer _toast2_png,transfer _toast1_png,transfer _title_png,transfer _btn_png,trans_bg_jpg,teamshare_bg_jpg,teamshare_btn_png,transferrecord_bg_png,transferrecord_item_bg_png,关闭按钮 _png",
"keys": "certificate_btn_png,certificate_cover_png,certificate_jpg,joinshare_btn_png,sharestarter_bg_jpg,sharestarter_btn_png,sharestarter_sharebtn_png,share2mask_png,share2btn_png,share2bg_jpg,confirm_btn_png,confirm_bg_png,transfer _toast3_png,transfer _toast2_png,transfer _toast1_png,transfer _title_png,transfer _btn_png,trans_bg_jpg,teamshare_btn_png,transferrecord_bg_png,transferrecord_item_bg_png,关闭按钮 _png,teamshare_bg_jpg,joinshare_bg_jpg",
"name": "Normal"
},
{
......@@ -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,pkBG_jpg,pkaskBtn_png,pkagainBtn_png,pkadd_png,head1_png,box_png",
"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",
"name": "Delay"
},
{
......@@ -21,7 +21,7 @@
"name": "Map"
},
{
"keys": "mrxg_png,mrtitle_png,mrtb_png,mrrb_png,mrmg_png,mrhz_png,mrhg_png,mrcx_png,mrbg_jpg,mram_png",
"keys": "mrxg_png,mrtitle_png,mrtb_png,mrrb_png,mrmg_png,mrhz_png,mrhg_png,mrcx_png,mram_png,mrbg_jpg,pkBG_jpg",
"name": "Record"
}
],
......@@ -76,11 +76,6 @@
"type": "image",
"name": "ydline_png"
},
{
"url": "assets/joinshare/joinshare_bg.jpg",
"type": "image",
"name": "joinshare_bg_jpg"
},
{
"url": "assets/joinshare/joinshare_btn.png",
"type": "image",
......@@ -106,11 +101,6 @@
"type": "image",
"name": "mram_png"
},
{
"url": "assets/myrecord/mrbg.jpg",
"type": "image",
"name": "mrbg_jpg"
},
{
"url": "assets/myrecord/mrcx.png",
"type": "image",
......@@ -176,11 +166,6 @@
"type": "image",
"name": "pkaskBtn_png"
},
{
"url": "assets/pk/pkBG.jpg",
"type": "image",
"name": "pkBG_jpg"
},
{
"url": "assets/pk/pkBtn.png",
"type": "image",
......@@ -541,11 +526,6 @@
"type": "image",
"name": "yylogo_png"
},
{
"url": "assets/teamshare/teamshare_bg.jpg",
"type": "image",
"name": "teamshare_bg_jpg"
},
{
"url": "assets/teamshare/teamshare_btn.png",
"type": "image",
......@@ -675,6 +655,26 @@
"url": "assets/certificate/certificate.jpg",
"type": "image",
"name": "certificate_jpg"
},
{
"url": "assets/pk/pkBG.jpg",
"type": "image",
"name": "pkBG_jpg"
},
{
"url": "assets/myrecord/mrbg.jpg",
"type": "image",
"name": "mrbg_jpg"
},
{
"url": "assets/joinshare/joinshare_bg.jpg",
"type": "image",
"name": "joinshare_bg_jpg"
},
{
"url": "assets/teamshare/teamshare_bg.jpg",
"type": "image",
"name": "teamshare_bg_jpg"
}
]
}
\ No newline at end of file
egret/resource/skins/PKPrizeSkin.exml
View file @ 10f8e48e
......@@ -3,8 +3,8 @@
<e:Group width="694" height="758" anchorOffsetY="0" horizontalCenter="-1" verticalCenter="-190">
<e:Image width="693" height="689" x="0" y="0" scaleX="1" scaleY="1" source="ranklight_png"/>
<e:Image width="638" height="554" x="30" y="204" source="pkprizebg_png" scaleX="1" scaleY="1"/>
<e:Label id="energy" text="30" x="243" y="416" size="125" fontFamily="Arial" scaleX="1" scaleY="1"/>
<e:Label text="能量" x="393" y="476" size="32" scaleX="1" scaleY="1"/>
<e:Label id="energy" text="30" x="56" y="416" size="125" fontFamily="Arial" scaleX="1" scaleY="1" anchorOffsetX="0" width="327" textAlign="right"/>
<e:Label id="enerlab" text="能量" x="393" y="476" size="32" scaleX="1" scaleY="1"/>
<e:Button id="prizeBtn" label="Button" icon="pkprizeBtn_png" skinName="ui.IconButtonSkin" scaleX="1" scaleY="1" width="291" height="82" anchorOffsetX="145.5" anchorOffsetY="41" x="348.5" y="624"/>
<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="670" y="133"/>
</e:Group>
......
egret/src/yazuwei/PKScene.ts
View file @ 10f8e48e
......@@ -144,7 +144,7 @@ export default class PKScene extends Scene{
this["team"+i]["notonline"].visible = true;
this["team"+i]["onGroup"].visible = false;
this["team"+i]["notGroup"].visible = true;
this.setColor(this["team"+i]["headimg"]);
this.setColor(this["team"+i]["avatar"]);
if(data.myTeamMembers[i-1].phone ){
if(data.myTeamMembers[i-1].phone == "null"){
this["team"+i]["notonphone"].text = "未知号码";
......@@ -211,7 +211,12 @@ export default class PKScene extends Scene{
let data = DataManager.ins.getData("getTreasureBox").data;
this.setColor(this.box)
this.clearTap(this.box,this.onTap_OpenBox);
PanelCtrl.instance.show(ModuleTypes.PKPRIZE_PANEL,data)
if(data.prizeType == "0"){
ToastCtrl.instance.show("啊哦，什么也没有~")
}else{
PanelCtrl.instance.show(ModuleTypes.PKPRIZE_PANEL,data)
}
},window['projectId'])
}
setColor(group) {
......
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