Skip to content

Y
yyh
Commit 01914c2f authored by wildfirecode's avatar wildfirecode
Browse files
Options

1

parents 50d3cc60 a2ff3fd5
Show whitespace changes
Inline Side-by-side
Showing with 167 additions and 98 deletions
egret/resource/default.res.json
View file @ 01914c2f
......@@ -10,7 +10,11 @@
},
{
"name": "preload",
<<<<<<< HEAD
"keys": "hand_png,hand2_png,ydlight_png,ydlight2_png,ydline_png,mapBtn_png,maphz_png,mappass_png,mram_png,mrbg_png,mrcx_png,mrhg_png,mrhz_png,mrmg_png,mrrb_png,mrtb_png,mrtitle_png,mrxg_png,pkadd_png,pkagainBtn_png,pkaskBtn_png,pkBG_png,pkBtn_png,pkcirle_png,pkloselight_png,pkloselogo_png,pkmyline_png,pkotherline_png,pkprizebg_png,pkprizeBtn_png,pkrulebg_png,pkrulebtn_png,pkscorebg_png,pkwinbg_png,pkwinBtn_png,pkwinlogo_png,finishbg_png,finishBtn_png,finishlight_png,finishlogo_png,lessscorebg_png,lessscoreBtn_png,rankbg_png,rankbg2_png,rankline_png,rankmybg_png,rulebg_png,sharebg_png,shareBtn_png,sharelab_png,sharerecordbg_png,sharerecordBtn_png,背景@2x_png,BG_png,chaoxian_png,CHNaomen_png,CHNhangzhou_png,CHNtaiwan_png,CHNxianggang_png,closeBtn_png,fireBtn_png,getBtn_png,hanguo_png,horn_png,littletitle_png,lockBtn_png,menggu_png,prizeBtn_png,rankBtn_png,recordBtn_png,riben_png,ruleBtn_png,startBtn_png,starttitle_png,teamBtn_png,unchaoxian_png,unCHNaomen_png,unCHNhangzhou_png,unCHNtaiwan_png,unCHNxianggang_png,unhanguo_png,unmenggu_png,unriben_png,waitBtn_png,yylogo_png,closeBtn2_png,xuanshiBG_png,xuanshiBtn_png,ranklight_png,pknoton_png,box_png,head1_png,pkpeacelight_png,pkwinlight_png,pkendbg_png,mapshareBtn_png,pkscorebg2_png,hand3_png,hand22_png,ydlight3_png,ydlight22_png,ydline2_png,mapBtn2_png,maphz2_png,mappass2_png,mapshareBtn2_png,mram2_png,mrbg2_png,mrcx2_png,mrhg2_png,mrhz2_png,mrmg2_png,mrrb2_png,mrtb2_png,mrtitle2_png,mrxg2_png,box2_png,head12_png,pkadd2_png,pkagainBtn2_png,pkaskBtn2_png,pkBG2_png,pkBtn2_png,pkcirle2_png,pkendbg2_png,pkloselight2_png,pkloselogo2_png,pkmyline2_png,pknoton2_png,pkotherline2_png,pkpeacelight2_png,pkprizebg2_png,pkprizeBtn2_png,pkrulebg2_png,pkrulebtn2_png,pkscorebg3_png,pkscorebg22_png,pkwinbg2_png,pkwinBtn2_png,pkwinlight2_png,pkwinlogo2_png,finishbg2_png,finishBtn2_png,finishlight2_png,finishlogo2_png,lessscorebg2_png,lessscoreBtn2_png,rankbg3_png,rankbg22_png,ranklight2_png,rankline2_png,rankmybg2_png,rulebg2_png,sharebg2_png,shareBtn2_png,sharelab2_png,sharerecordbg2_png,sharerecordBtn2_png,背景@2x2_png,BG2_png,chaoxian2_png,CHNaomen2_png,CHNhangzhou2_png,CHNtaiwan2_png,CHNxianggang2_png,closeBtn3_png,fireBtn2_png,getBtn2_png,hanguo2_png,horn2_png,littletitle2_png,lockBtn2_png,menggu2_png,prizeBtn2_png,rankBtn2_png,recordBtn2_png,riben2_png,ruleBtn2_png,startBtn2_png,starttitle2_png,teamBtn2_png,unchaoxian2_png,unCHNaomen2_png,unCHNhangzhou2_png,unCHNtaiwan2_png,unCHNxianggang2_png,unhanguo2_png,unmenggu2_png,unriben2_png,waitBtn2_png,yylogo2_png,bg2_png,progress2_png,closeBtn4_png,xuanshiBG2_png,xuanshiBtn2_png,transfer _toast1_png,transfer _toast2_png,transfer _toast3_png,teamshare_btn_png,teamshare_bg_jpg,slogan_btn_png,slogan_bg_png,sharestarter_sharebtn_png,sharestarter_btn_png,sharestarter_bg_jpg,joinshare_bg_jpg,joinshare_btn_png,confirm_bg_png,confirm_btn_png,关闭按钮 _png,certificate_jpg,certificate_cover_png,certificate_btn_png,pkpeacelogo_png,transferrecord_bg_png,transferrecord_item_bg_png,trans_bg_jpg"
=======
"keys": "hand_png,hand2_png,ydlight_png,ydlight2_png,ydline_png,mapBtn_png,maphz_png,mappass_png,mram_png,mrbg_png,mrcx_png,mrhg_png,mrhz_png,mrmg_png,mrrb_png,mrtb_png,mrtitle_png,mrxg_png,pkadd_png,pkagainBtn_png,pkaskBtn_png,pkBG_png,pkBtn_png,pkcirle_png,pkloselight_png,pkloselogo_png,pkprizebg_png,pkprizeBtn_png,pkrulebg_png,pkrulebtn_png,pkscorebg_png,pkwinbg_png,pkwinBtn_png,pkwinlogo_png,finishbg_png,finishBtn_png,finishlight_png,finishlogo_png,lessscorebg_png,lessscoreBtn_png,rankbg_png,rankbg2_png,rankline_png,rankmybg_png,rulebg_png,sharebg_png,shareBtn_png,sharelab_png,sharerecordbg_png,sharerecordBtn_png,背景@2x_png,BG_png,chaoxian_png,CHNaomen_png,CHNhangzhou_png,CHNtaiwan_png,CHNxianggang_png,closeBtn_png,fireBtn_png,getBtn_png,hanguo_png,horn_png,littletitle_png,lockBtn_png,menggu_png,prizeBtn_png,rankBtn_png,recordBtn_png,riben_png,ruleBtn_png,startBtn_png,starttitle_png,teamBtn_png,unchaoxian_png,unCHNaomen_png,unCHNhangzhou_png,unCHNtaiwan_png,unCHNxianggang_png,unhanguo_png,unmenggu_png,unriben_png,waitBtn_png,yylogo_png,closeBtn2_png,xuanshiBG_png,xuanshiBtn_png,ranklight_png,pknoton_png,box_png,head1_png,pkpeacelight_png,pkwinlight_png,pkendbg_png,mapshareBtn_png,pkscorebg2_png,hand3_png,hand22_png,ydlight3_png,ydlight22_png,ydline2_png,mapBtn2_png,maphz2_png,mappass2_png,mapshareBtn2_png,mram2_png,mrbg2_png,mrcx2_png,mrhg2_png,mrhz2_png,mrmg2_png,mrrb2_png,mrtb2_png,mrtitle2_png,mrxg2_png,box2_png,head12_png,pkadd2_png,pkagainBtn2_png,pkaskBtn2_png,pkBG2_png,pkBtn2_png,pkcirle2_png,pkendbg2_png,pkloselight2_png,pkloselogo2_png,pknoton2_png,pkpeacelight2_png,pkprizebg2_png,pkprizeBtn2_png,pkrulebg2_png,pkrulebtn2_png,pkscorebg3_png,pkscorebg22_png,pkwinbg2_png,pkwinBtn2_png,pkwinlight2_png,pkwinlogo2_png,finishbg2_png,finishBtn2_png,finishlight2_png,finishlogo2_png,lessscorebg2_png,lessscoreBtn2_png,rankbg3_png,rankbg22_png,ranklight2_png,rankline2_png,rankmybg2_png,rulebg2_png,sharebg2_png,shareBtn2_png,sharelab2_png,sharerecordbg2_png,sharerecordBtn2_png,背景@2x2_png,BG2_png,chaoxian2_png,CHNaomen2_png,CHNhangzhou2_png,CHNtaiwan2_png,CHNxianggang2_png,closeBtn3_png,fireBtn2_png,getBtn2_png,hanguo2_png,horn2_png,littletitle2_png,lockBtn2_png,menggu2_png,prizeBtn2_png,rankBtn2_png,recordBtn2_png,riben2_png,ruleBtn2_png,startBtn2_png,starttitle2_png,teamBtn2_png,unchaoxian2_png,unCHNaomen2_png,unCHNhangzhou2_png,unCHNtaiwan2_png,unCHNxianggang2_png,unhanguo2_png,unmenggu2_png,unriben2_png,waitBtn2_png,yylogo2_png,bg2_png,progress2_png,closeBtn4_png,xuanshiBG2_png,xuanshiBtn2_png,transfer _toast1_png,transfer _toast2_png,transfer _toast3_png,teamshare_btn_png,teamshare_bg_jpg,slogan_btn_png,slogan_bg_png,sharestarter_sharebtn_png,sharestarter_btn_png,sharestarter_bg_jpg,joinshare_bg_jpg,joinshare_btn_png,confirm_bg_png,confirm_btn_png,关闭按钮 _png,certificate_jpg,certificate_cover_png,certificate_btn_png,pkpeacelogo_png,transferrecord_bg_png,transferrecord_item_bg_png,pkmyline2_png,pkotherline2_png"
>>>>>>> a2ff3fd5cfae1fcf5aaa9320e216ffe16686f3f2
}
],
"resources": [
......@@ -154,16 +158,6 @@
"type": "image",
"url": "assets/pk/pkloselogo.png"
},
{
"name": "pkmyline_png",
"type": "image",
"url": "assets/pk/pkmyline.png"
},
{
"name": "pkotherline_png",
"type": "image",
"url": "assets/pk/pkotherline.png"
},
{
"name": "pkprizebg_png",
"type": "image",
......@@ -659,21 +653,11 @@
"type": "image",
"url": "assets/pk/pkloselogo.png"
},
{
"name": "pkmyline2_png",
"type": "image",
"url": "assets/pk/pkmyline.png"
},
{
"name": "pknoton2_png",
"type": "image",
"url": "assets/pk/pknoton.png"
},
{
"name": "pkotherline2_png",
"type": "image",
"url": "assets/pk/pkotherline.png"
},
{
"name": "pkpeacelight2_png",
"type": "image",
......@@ -1110,9 +1094,20 @@
"url": "assets/transferrecord/transferrecord_item_bg.png"
},
{
<<<<<<< HEAD
"name": "trans_bg_jpg",
"type": "image",
"url": "assets/transfer/trans_bg.jpg"
=======
"name": "pkmyline2_png",
"type": "image",
"url": "assets/pk/pkmyline2.png"
},
{
"name": "pkotherline2_png",
"type": "image",
"url": "assets/pk/pkotherline2.png"
>>>>>>> a2ff3fd5cfae1fcf5aaa9320e216ffe16686f3f2
}
]
}
\ No newline at end of file
egret/resource/skins/FinishSkin.exml
View file @ 01914c2f
......@@ -4,7 +4,7 @@
<e:Image width="693" height="689" x="0" y="0" source="finishlight_png" scaleX="1" scaleY="1"/>
<e:Image width="638" height="554" x="30" y="204" source="finishbg_png" scaleX="1" scaleY="1"/>
<e:Image width="138" height="138" x="273" y="405" source="finishlogo_png" scaleX="1" scaleY="1"/>
<e:Button id="closeBtn" label="Button" x="646" y="109" icon="closeBtn_png" skinName="ui.IconButtonSkin" scaleX="1" scaleY="1"/>
<e:Button id="knowBtn" label="Button" x="203" y="583" skinName="ui.IconButtonSkin" icon="finishBtn_png" scaleX="1" scaleY="1"/>
<e:Button id="closeBtn" label="Button" icon="closeBtn_png" skinName="ui.IconButtonSkin" scaleX="1" scaleY="1" anchorOffsetX="24" anchorOffsetY="24" x="670" y="133" width="48" height="48"/>
<e:Button id="knowBtn" label="Button" skinName="ui.IconButtonSkin" icon="finishBtn_png" scaleX="1" scaleY="1" anchorOffsetX="145.5" anchorOffsetY="41" x="348.5" y="624" width="291" height="82"/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/resource/skins/GuideSkin.exml
View file @ 01914c2f
......@@ -10,24 +10,24 @@
<e:Image width="199" height="173" x="26" y="780" source="hanguo_png" scaleX="1" scaleY="1"/>
<e:Image width="200" height="173" x="270" y="825" source="chaoxian_png" scaleX="1" scaleY="1"/>
<e:Image width="200" height="184" x="543" y="823" source="menggu_png" scaleX="1" scaleY="1"/>
<e:Button id="unlockBtn" label="Button" x="220" y="1060" skinName="ui.IconButtonSkin" icon="startBtn_png" width="311" height="82" scaleX="1" scaleY="1"/>
<e:Button id="unlockBtn" label="Button" skinName="ui.IconButtonSkin" icon="startBtn_png" width="311" height="82" scaleX="1" scaleY="1" anchorOffsetX="155.5" anchorOffsetY="41" x="375.5" y="1101"/>
<e:Image id="hand" width="51" height="61" x="350" y="1037" source="hand_png"/>
<e:Label text="通过累计分数解锁每个国家/地区，传递火炬" x="0" y="1006" width="750" size="22" textAlign="center"/>
</e:Group>
<e:Group id="guide2" width="750" height="1169" anchorOffsetY="0" horizontalCenter="0" verticalCenter="-11.5" visible="false">
<e:Label text="点击这里参与组队PK\n胜利队伍可瓜分分数" x="526" y="915" size="22" textAlign="center" scaleX="1" scaleY="1" textColor="0xffffff" lineSpacing="5"/>
<e:Button id="pkBtn" label="Button" x="580" y="1040" skinName="ui.IconButtonSkin" icon="teamBtn_png" scaleX="1" scaleY="1"/>
<e:Button id="pkBtn" label="Button" skinName="ui.IconButtonSkin" icon="teamBtn_png" scaleX="1" scaleY="1" anchorOffsetX="64.5" anchorOffsetY="64.5" x="644.5" y="1104.5" width="129" height="129"/>
<e:Image width="50" height="60" x="619" y="983" source="hand_png"/>
</e:Group>
<e:Group id="guide3" width="750" height="1169" anchorOffsetY="0" horizontalCenter="0" verticalCenter="-11.5">
<e:Label text="通过火炬传递给\n好友，可获得分数奖励" x="19" y="915" size="22" textAlign="center" scaleX="1" scaleY="1" textColor="0xffffff" lineSpacing="5"/>
<e:Button id="firedBtn" label="Button" x="43" y="1040" skinName="ui.IconButtonSkin" icon="fireBtn_png" width="129" scaleX="1" scaleY="1"/>
<e:Button id="firedBtn" label="Button" skinName="ui.IconButtonSkin" icon="fireBtn_png" width="129" scaleX="1" scaleY="1" horizontalCenter="-267.5" verticalCenter="520" anchorOffsetX="64.5" anchorOffsetY="64.5" height="129"/>
<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" source="xuanshiBG_png" scaleX="1" scaleY="1"/>
<e:Button id="closeBtn" label="Button" x="616" y="0" skinName="ui.IconButtonSkin" icon="closeBtn_png" scaleX="1" scaleY="1"/>
<e:Button id="fireBtn" label="Button" x="173" y="481" skinName="ui.IconButtonSkin" icon="xuanshiBtn_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="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:Label text="宣誓口号" x="-57" y="203" width="750" textAlign="center" scaleX="1" scaleY="1"/>
<e:Label text="我愿成为第十九届亚运会线上火炬\n手传递火炬手，青春接力，时代领跑，\n相聚杭州，梦想不老" x="100" y="291" size="28" lineSpacing="5" scaleX="1" scaleY="1"/>
</e:Group>
......
egret/resource/skins/HeadItemSkin.exml
View file @ 01914c2f
......@@ -9,7 +9,7 @@
<e:Label id="onnum" text="+1586步" y="25" size="20" x="0" scaleX="1" scaleY="1" width="110" textAlign="center"/>
</e:Group>
<e:Group id="notGroup" width="106" height="58" y="111" horizontalCenter="0" visible="false">
<e:Button id="notonBtn" label="Button" y="0" skinName="ui.IconButtonSkin" icon="pkBtn_png" x="0" scaleX="1" scaleY="1"/>
<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"/>
......
egret/resource/skins/NoCreditsSkin.exml
View file @ 01914c2f
......@@ -2,7 +2,7 @@
<e:Skin class="NoCreditsSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Group width="664" height="499" horizontalCenter="14" verticalCenter="-210.5">
<e:Image width="638" height="404" x="0" y="95" source="lessscorebg_png" scaleX="1" scaleY="1"/>
<e:Button id="closeBtn" label="Button" x="616" y="0" icon="closeBtn_png" skinName="ui.IconButtonSkin" scaleX="1" scaleY="1"/>
<e:Button id="getCreditsBtn" label="Button" x="174" y="313" skinName="ui.IconButtonSkin" icon="lessscoreBtn_png" scaleX="1" scaleY="1"/>
<e:Button id="closeBtn" label="Button" icon="closeBtn_png" skinName="ui.IconButtonSkin" scaleX="1" scaleY="1" width="48" height="48" anchorOffsetX="24" anchorOffsetY="24" x="640" y="24"/>
<e:Button id="getCreditsBtn" label="Button" skinName="ui.IconButtonSkin" icon="lessscoreBtn_png" scaleX="1" scaleY="1" width="291" height="82" anchorOffsetX="145.5" anchorOffsetY="41" x="319.5" y="354"/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/resource/skins/PKPrizeSkin.exml
View file @ 01914c2f
......@@ -5,7 +5,7 @@
<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:Button id="prizeBtn" label="Button" x="203" y="583" icon="pkprizeBtn_png" skinName="ui.IconButtonSkin" scaleX="1" scaleY="1"/>
<e:Button id="closeBtn" label="Button" x="646" y="109" skinName="ui.IconButtonSkin" icon="closeBtn_png" 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>
</e:Skin>
\ No newline at end of file
egret/resource/skins/PKRuleSkin.exml
View file @ 01914c2f
......@@ -2,7 +2,7 @@
<e:Skin class="PKRuleSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Group width="664" height="769" horizontalCenter="14" verticalCenter="-75.5">
<e:Image width="638" height="680" x="0" y="89" source="pkrulebg_png" scaleX="1" scaleY="1"/>
<e:Button id="closeBtn" label="Button" x="616" y="0" skinName="ui.IconButtonSkin" icon="closeBtn_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="640" y="24"/>
<e:Scroller id="scroller" width="510" height="507" anchorOffsetY="0" anchorOffsetX="0" bounces="false" x="63" y="191" scaleX="1" scaleY="1">
<e:Group id="group" width="100%" anchorOffsetY="0" x="0" y="-252" height="100%">
<e:Rect height="10" x="206" y="59" fillAlpha="0" width="100%"/>
......
egret/resource/skins/PKSCoreSkin.exml
View file @ 01914c2f
......@@ -2,12 +2,12 @@
<e:Skin class="PKSCoreSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image id="light" width="693" height="689" x="27" y="243" source="pkwinlight_png"/>
<e:Image width="638" height="673" x="57" y="441" source="pkendbg_png"/>
<e:Button id="closeBtn" label="Button" x="673" y="352" skinName="ui.IconButtonSkin" icon="closeBtn_png"/>
<e:Button id="closeBtn" label="Button" skinName="ui.IconButtonSkin" icon="closeBtn_png" width="48" height="48" anchorOffsetX="24" anchorOffsetY="24" x="697" y="376"/>
<e:Image id="box" width="61" height="54" x="340" y="574" source="box_png"/>
<e:Label id="date" text="12月5日" x="293" y="547" size="18" width="166" textAlign="center"/>
<e:Label id="title" text="宝箱已发到胜利队伍" x="310" y="634" size="14" width="136" textAlign="center"/>
<e:Image id="status" width="84" height="98" x="486" y="563" source="pkwinlogo_png"/>
<e:Button id="prizeBtn" label="Button" x="230" y="976" skinName="ui.IconButtonSkin" icon="pkwinBtn_png"/>
<e:Button id="prizeBtn" label="Button" skinName="ui.IconButtonSkin" icon="pkwinBtn_png" width="291" height="82" anchorOffsetX="145.5" anchorOffsetY="41" x="375.5" y="1017"/>
<e:Label id="myscore" text="9999" x="248" y="679" textColor="0x4cfcfc" size="28"/>
<e:Label id="otherscore" text="7000" x="509" y="679" textColor="0x4cfcfc" size="28"/>
<e:Label id="endtitle" text="本场分数奖励" x="57" y="789" width="638" textAlign="center"/>
......
egret/resource/skins/PKSkin.exml
View file @ 01914c2f
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="PKSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image width="750" height="1624" x="0" y="0" source="pkBG_png"/>
<e:Image id="myline" width="212" height="941" source="pkmyline_png" scale9Grid="26,139,160,144" bottom="0" horizontalCenter="-157"/>
<e:Image id="otherline" width="212" height="826" x="426" source="pkotherline_png" scale9Grid="26,103,159,429" bottom="0"/>
<e:Image id="myline" width="212" height="941" scale9Grid="26,139,160,144" bottom="0" horizontalCenter="-157" anchorOffsetY="0" source="pkmyline2_png"/>
<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="otherteamnum" text="总步数：9999" x="426" y="772" size="30" verticalAlign="middle" width="212" textAlign="center" textColor="0x93f7fa"/>
<e:Group width="750" height="1206" x="0" y="209">
<e:Button id="ruleBtn" label="Button" x="644" y="16" skinName="ui.IconButtonSkin" icon="pkrulebtn_png" scaleX="1" scaleY="1"/>
<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"/>
......@@ -19,7 +19,7 @@
<e:Label id="min2" text="0" x="549.5" y="272.5" size="18" width="17" height="24" textColor="0x1F0477" textAlign="center" verticalAlign="middle" scaleX="1" scaleY="1"/>
<e:Label id="sec1" text="0" x="580.5" y="272.5" size="18" width="17" height="24" textColor="0x1F0477" textAlign="center" verticalAlign="middle" scaleX="1" scaleY="1"/>
<e:Label id="sec2" text="0" x="600.5" y="272.5" size="18" width="17" height="24" textColor="0x1F0477" textAlign="center" verticalAlign="middle" scaleX="1" scaleY="1"/>
<e:Button label="Button" x="239" y="1090" skinName="ui.IconButtonSkin" icon="pkaskBtn_png" scaleX="1" scaleY="1"/>
<e:Button id="addteamBtn" label="Button" skinName="ui.IconButtonSkin" icon="pkaskBtn_png" scaleX="1" scaleY="1" width="291" height="82" anchorOffsetX="145.5" anchorOffsetY="41" x="384.5" y="1131"/>
<e:Component id="team1" x="40" y="910" skinName="HeadItemSkin" scaleX="1" scaleY="1"/>
<e:Component id="team2" x="180" y="910" skinName="HeadItemSkin" scaleX="1" scaleY="1"/>
<e:Component id="team3" x="320" y="910" skinName="HeadItemSkin" scaleX="1" scaleY="1"/>
......
egret/resource/skins/PlaceSkin.exml
View file @ 01914c2f
......@@ -3,8 +3,8 @@
<e:Group width="714" height="1076" horizontalCenter="15" verticalCenter="-34">
<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" x="634" y="0" skinName="ui.IconButtonSkin" icon="closeBtn_png" scaleX="1" scaleY="1"/>
<e:Button id="knowBtn" label="Button" x="116" y="954" skinName="ui.IconButtonSkin" icon="mapBtn_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:Group>
......
egret/resource/skins/RankSkin.exml
View file @ 01914c2f
......@@ -3,7 +3,7 @@
<e:Group width="694" height="862" horizontalCenter="-1" verticalCenter="-138">
<e:Image width="693" height="689" x="0" y="0" source="ranklight_png" scaleX="1" scaleY="1"/>
<e:Image width="638" height="664" x="30" y="198" source="rankbg_png" scaleX="1" scaleY="1"/>
<e:Button id="closeBtn" label="Button" x="646" y="109" skinName="ui.IconButtonSkin" icon="closeBtn_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="670" y="133"/>
<e:Image width="534" height="52" x="80" y="279" source="rankbg2_png" scaleX="1" scaleY="1"/>
<e:Image width="534" height="461" x="80" y="340" source="rankbg2_png" scaleX="1" scaleY="1"/>
<e:Image width="513" height="40" x="91" y="743" source="rankmybg_png" scaleX="1" scaleY="1"/>
......
egret/resource/skins/RecordMapSkin.exml
View file @ 01914c2f
......@@ -4,7 +4,7 @@
<e:Group id="mapGroup" width="750" height="1039" x="0" y="301">
<e:Image id="mapBG" width="683" height="801" x="33" y="30" source="maphz_png" scaleX="1" scaleY="1"/>
<e:Image width="308" height="166" x="439" y="0" source="mappass_png" scaleX="1" scaleY="1"/>
<e:Button id="shareBtn" label="Button" x="149" y="873" skinName="ui.IconButtonSkin" icon="mapshareBtn_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" x="373.5" y="934"/>
<e:Label id="sharelab" text="首次分享可获得10能量" x="0" y="1011" size="28" textAlign="center" width="750" scaleX="1" scaleY="1"/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/resource/skins/RuleSkin.exml
View file @ 01914c2f
......@@ -19,7 +19,7 @@
</e:layout>
</e:Group>
</e:Scroller>
<e:Button id="closeBtn" label="" skinName="ui.IconButtonSkin" icon="closeBtn_png" x="616" y="0" scaleX="1" scaleY="1"/>
<e:Button id="closeBtn" label="" skinName="ui.IconButtonSkin" icon="closeBtn_png" scaleX="1" scaleY="1" width="48" height="48" anchorOffsetX="24" anchorOffsetY="24" x="640" y="24"/>
</e:Group>
......
egret/resource/skins/StartSkin.exml
View file @ 01914c2f
......@@ -2,8 +2,8 @@
<e:Skin class="StartSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image width="750" height="1624" x="0" y="0" source="BG_png"/>
<e:Group width="750" height="1169" anchorOffsetY="0" horizontalCenter="0" verticalCenter="-11.5">
<e:Button id="ruleBtn" label="Button" x="0" y="9" skinName="ui.IconButtonSkin" icon="ruleBtn_png" width="97" height="40" scaleX="1" scaleY="1"/>
<e:Button id="recordBtn" label="Button" x="644" y="9" skinName="ui.IconButtonSkin" icon="recordBtn_png" 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="90" height="86" x="330" y="0" source="yylogo_png" scaleX="1" scaleY="1"/>
<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"/>
......@@ -18,11 +18,11 @@
<e:Image id="cx" width="200" height="173" x="270" y="825" source="unchaoxian_png" scaleX="1" scaleY="1"/>
<e:Image id="mg" width="200" height="184" x="543" y="823" source="unmenggu_png" scaleX="1" scaleY="1"/>
<e:Label id="scorelab" text="我的分数：23333" x="0" y="1028" textColor="0x38f0fb" size="20" width="750" textAlign="center" scaleX="1" scaleY="1"/>
<e:Button id="unlockBtn" label="Button" x="220" y="1060" skinName="ui.IconButtonSkin" icon="startBtn_png" width="311" height="82" scaleX="1" scaleY="1"/>
<e:Button id="unlockBtn" label="Button" skinName="ui.IconButtonSkin" icon="startBtn_png" width="311" height="82" scaleX="1" scaleY="1" anchorOffsetX="155.5" anchorOffsetY="41" x="375.5" y="1101"/>
<e:Label id="needscore" text="需要达到13222分数" x="220" y="1114" size="20" textColor="0x323878" bold="true" scaleX="1" scaleY="1" width="311" textAlign="center" visible="false"/>
<e:Button id="firedBtn" label="Button" x="43" y="1040" skinName="ui.IconButtonSkin" icon="fireBtn_png" width="129" scaleX="1" scaleY="1"/>
<e:Button id="pkBtn" label="Button" x="580" y="1040" skinName="ui.IconButtonSkin" icon="teamBtn_png" scaleX="1" scaleY="1"/>
<e:Button id="rankBtn" label="Button" x="696" y="692" skinName="ui.IconButtonSkin" icon="rankBtn_png" scaleX="1" scaleY="1"/>
<e:Button id="firedBtn" label="Button" skinName="ui.IconButtonSkin" icon="fireBtn_png" width="129" scaleX="1" scaleY="1" height="129" anchorOffsetX="64.5" anchorOffsetY="64.5" x="107.5" y="1104.5"/>
<e:Button id="pkBtn" label="Button" skinName="ui.IconButtonSkin" icon="teamBtn_png" scaleX="1" scaleY="1" width="129" height="129" anchorOffsetX="64.5" anchorOffsetY="64.5" x="644.5" y="1104.5"/>
<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>
......
egret/src/NetConst.ts
View file @ 01914c2f
......@@ -65,7 +65,7 @@ export class yzwNet{
* 1.3轮询被邀请人的动画状态
* @param callback 回调
*/
public static pollingAnimationState(callback, projectId){
public static pollingAnimationState(callback, projectId,shareCode){
const net: INetData = {
name: 'pollingAnimationState',
uri: `/projectx/${projectId}/invite_2/pollingAnimationState.do`,
......@@ -73,6 +73,7 @@ export class yzwNet{
dataType: 'json',
hideMsg: true,
param: {
shareCode:shareCode
},
callback: callback
};
......@@ -101,8 +102,10 @@ export class yzwNet{
* 1.5被邀请人更改动画状态
* @param callback 回调
*/
public static updateAnimationState(callback, projectId){
public static updateAnimationState(callback, projectId,shareCode,state){
let param: any = {
shareCode:shareCode,
state:state
}
const net: INetData = {
name: 'updateAnimationState',
......@@ -116,15 +119,15 @@ export class yzwNet{
NetManager.ins.send(net);
}
/**
* 1.6生成队伍
* 1.6邀请码
* @param callback 回调
*/
public static createTeam(callback, projectId){
public static genInvite(callback, projectId){
let param: any = {
}
const net: INetData = {
name: 'createTeam',
uri: `/projectx/${projectId}/invite_1/createTeam.do`,
name: 'genInvite',
uri: `/projectx/${projectId}/invite_2/genInvite.do`,
type: 'get',
dataType: 'json',
hideMsg: true,
......@@ -143,7 +146,7 @@ export class yzwNet{
}
const net: INetData = {
name: 'rankInfo',
uri: `/projectx/${projectId}/join_2/join.do`,
uri: `/projectx/${projectId}/join_1/passRankList.do`,
type: 'get',
dataType: 'json',
hideMsg: true,
......@@ -174,8 +177,9 @@ export class yzwNet{
* 1.9参与火炬传递（是否开启动画）
* @param callback 回调
*/
public static accept(callback, projectId){
public static accept(callback, projectId,inviteCode){
let param: any = {
inviteCode:inviteCode
}
const net: INetData = {
name: 'accept',
......@@ -197,7 +201,7 @@ export class yzwNet{
}
const net: INetData = {
name: 'acceptInvite',
uri: `/projectx/${projectId}/invite_1/acceptInvite.do`,
uri: `/projectx/${projectId}/invite_1/accept.do`,
type: 'get',
dataType: 'json',
hideMsg: true,
......@@ -234,7 +238,7 @@ export class yzwNet{
}
const net: INetData = {
name: 'getPassingRecords',
uri: `/projectx/${projectId}/join_2/getPassingRecords.do`,
uri: `/projectx/${projectId}/invite_2/passRecord.do`,
type: 'get',
dataType: 'json',
hideMsg: true,
......@@ -252,7 +256,7 @@ export class yzwNet{
}
const net: INetData = {
name: 'getPkBaseInfo',
uri: `/projectx/${projectId}/invite_1/getPkBaseInfo.do`,
uri: `/projectx/${projectId}/invite_2/getPkBaseInfo.do`,
type: 'get',
dataType: 'json',
hideMsg: true,
......
egret/src/yazuwei/PKScene.ts
View file @ 01914c2f
......@@ -30,6 +30,7 @@ export default class PKScene extends Scene{
public team3:eui.Component;
public team4:eui.Component;
public team5:eui.Component;
public addteamBtn:eui.Button;
constructor(data){
......@@ -74,9 +75,18 @@ export default class PKScene extends Scene{
this.otherteam.y = this.otherline.y-this.otherline.height-70;
this.otherteamnum.y = this.otherline.y-this.otherline.height-35;
console.log(this.myteam.y)
let uiddata
NetManager.ins.getProjectUserInfo((s)=>{
if(!s){
return
}
uiddata = DataManager.ins.getData("getProjectUserInfo").data;
for(let i = 1;i<data.myTeamMembers.length+1;i++){
this["team"+i]["onnum"].text = "+"+data.myTeamMembers[i-1].memberStepCounts;
this["team"+i]["onphone"].text = data.myTeamMembers[i-1].phone;
this["team"+i]["headimg"].source = data.myTeamMembers[i-1].avatar;
let now = new Date();
let year = now.getFullYear();
let mon:any = now.getMonth()+1;
......@@ -98,16 +108,11 @@ export default class PKScene extends Scene{
this["team"+i]["notGroup"].visible = true;
this.setColor(this["team"+i]["headimg"]);
this["team"+i]["notonphone"].text = data.myTeamMembers[i-1].phone;
this.onTap(this["team"+i]["notonBtn"],this.askOnline);
}
NetManager.ins.getProjectUserInfo((s)=>{
if(!s){
return
}
let data = DataManager.ins.getData("getProjectUserInfo").data;
if(data.myTeamMembers[i-1].uid == data.consumerId){
if(data.myTeamMembers[i-1].uid == uiddata.consumerId){
this["team"+i]["onphone"].text = "我"
}
})
}
for(let n = 5;n>data.myTeamMembers.length;n--){
......@@ -116,7 +121,10 @@ 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.onTap(this["team"+n],this.askTeam);
}
})
this.onTap(this.addteamBtn,this.addTeam)
}
onEnterFrame(){
//倒计时 当天十二点
......@@ -166,12 +174,36 @@ export default class PKScene extends Scene{
}
addTeam(){
window['share']();
yzwNet.genInvite((s)=>{
if(!s){
ToastCtrl.instance.show("网络异常请重试~")
return
}
let data = DataManager.ins.getData('genInvite').data;
window['share'](data);
},window['projectId'])
// window['share']();
}
askTeam(){
window['share']();
yzwNet.genInvite((s)=>{
if(!s){
ToastCtrl.instance.show("网络异常请重试~")
return
}
let data = DataManager.ins.getData('genInvite').data;
window['share'](data);
},window['projectId'])
// window['share']();
}
askOnline(){
window['share']();
yzwNet.genInvite((s)=>{
if(!s){
ToastCtrl.instance.show("网络异常请重试~")
return
}
let data = DataManager.ins.getData('genInvite').data;
window['share'](data);
},window['projectId'])
// window['share']();
}
}
\ No newline at end of file
egret/src/yazuwei/PKScorePanel.ts
View file @ 01914c2f
......@@ -4,6 +4,7 @@ import { DataManager } from "../../libs/tw/manager/DataManager";
import ToastCtrl from "../ctrls/toastCtrl";
import SceneCtrl from "../ctrls/sceneCtrl";
import { ModuleTypes } from "../types/sceneTypes";
import { NetManager } from "../../libs/tw/manager/NetManager";
export default class PKScorePanel extends Panel{
protected get skinKey(){return 'PKScore'}
......@@ -53,6 +54,14 @@ export default class PKScorePanel extends Panel{
this.endtitle.text = "本场助力排行榜"
this.setColor(this.box);
}
let uiddata
NetManager.ins.getProjectUserInfo((s)=>{
if(!s){
return
}
uiddata = DataManager.ins.getData("getProjectUserInfo").data;
for(let i = 0;i<data.pkResult.myTeamMembers.length;i++){
this["team"+(i+1)]["onGroup"].visible = true;
if(data.pkResult.pkResult == 0){//pk结果 0 失败，1 获胜，2 平局
......@@ -62,12 +71,14 @@ export default class PKScorePanel extends Panel{
}else if(data.pkResult.pkResult == 2){
this["team"+(i+1)]["onnum"].text = data.pkResult.myTeamMembers[i].steps
}
if(data.pkResult.myTeamMembers[i].myFlag == 1){
this["team"+(i+1)]["headimg"].source = data.pkResult.myTeamMembers[i].avatar;
if(data.pkResult.myTeamMembers[i].uid == uiddata.consumerId){
this["team"+(i+1)]["onphone"].text = "我"
}else{
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;
......@@ -76,7 +87,7 @@ export default class PKScorePanel extends Panel{
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)
......
egret/src/yazuwei/RecordMapScene.ts
View file @ 01914c2f
import Scene from "../views/Scene";
import { yzwNet } from "../NetConst";
import ToastCtrl from "../ctrls/toastCtrl";
export default class RecordMapScene extends Scene{
protected get skinKey(){return 'RecordMap'}
......@@ -48,7 +50,16 @@ export default class RecordMapScene extends Scene{
}
sharePic(){
const arr = ["HZ","AM","XG","TB","RB","HG","CX","MG"];
yzwNet.shareFootprint((s)=>{
if(!s){
ToastCtrl.instance.show("网络异常请重新分享~")
return
}
// ToastCtrl.instance.show()
window['shareImg'](this.level);
},window['projectId'],arr[this.level-1])
}
}
\ No newline at end of file
mock/config.js
View file @ 01914c2f
......@@ -196,11 +196,11 @@ const config = {
data: './yzw/updateAnimationState.json'
},
//生成队伍
'/projectx/1/invite_1/createTeam.do': {
data: './yzw/createTeam.json'
'/projectx/1/invite_2/genInvite.do': {
data: './yzw/genInvite.json'
},
//排行榜
'/projectx/1/join_2/join.do': {
'/projectx/1/join_1/passRankList.do': {
data: './yzw/rankInfo.json'
},
//开启传递
......@@ -220,11 +220,11 @@ const config = {
data: './yzw/shareFootprint.json'
},
//传递记录
'/projectx/1/join_2/getPassingRecords.do': {
data: './yzw/getPassingRecords.json'
'/projectx/1/invite_2/passRecord.do': {
data: './yzw/passRecord.json'
},
//pk基础信息
'/projectx/1/invite_1/getPkBaseInfo.do': {
'/projectx/1/invite_2/getPkBaseInfo.do': {
data: './yzw/getPkBaseInfo.json'
}
,
......
mock/yzw/getPkBaseInfo.json
View file @ 01914c2f
......@@ -7,25 +7,41 @@
"enemyTeamSteps":50,
"myTeamMembers":[
{
"steps":1123,
"phone":"130****1236",
"onLineDate":"1992-11-01",
"myFlag":1
"consumerId":"1539361",
"id":678,
"memberStepCounts":0,
"onlineTime":"2019-12-09",
"phone":"189****6789",
"teamId":"1",
"uId":"1",
"avatar":"https://yun.duiba.com.cn/db_games/activity/yzw_hjcd/touxiang/qugun.png"
},{
"steps":1321,
"phone":"130****1236",
"onLineDate":"2019-12-06",
"myFlag":0
"consumerId":"1539361",
"id":678,
"memberStepCounts":0,
"onlineTime":"2019-12-09",
"phone":"189****6789",
"teamId":"1",
"uId":"1",
"avatar":"//yun.duiba.com.cn/db_games/activity/yzw_hjcd/touxiang/qugun.png"
},{
"steps":11111,
"phone":"130****1236",
"onLineDate":"2019-12-06",
"myFlag":0
"consumerId":"1539361",
"id":678,
"memberStepCounts":0,
"onlineTime":"2019-12-09",
"phone":"189****6789",
"teamId":"1",
"uId":"1",
"avatar":"https://yun.duiba.com.cn/db_games/activity/yzw_hjcd/touxiang/qugun.png"
},{
"steps":111,
"phone":"130****1236",
"onLineDate":"2019-12-06",
"myFlag":0
"consumerId":"1539361",
"id":678,
"memberStepCounts":0,
"onlineTime":"2019-12-09",
"phone":"189****6789",
"teamId":"1",
"uId":"1",
"avatar":"https://yun.duiba.com.cn/db_games/activity/yzw_hjcd/touxiang/qugun.png"
}]
},
......
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