Skip to content

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

1232

parent 294f78a8
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 58 deletions
egret/index.html
View file @ e151d425
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
// window['pageID'] = 'TeamShareScene'; // window['pageID'] = 'TeamShareScene';
// window['pageID'] = 'JoinShareScene'; // window['pageID'] = 'JoinShareScene';
// window['pageID'] = 'Share2Scene'; // window['pageID'] = 'Share2Scene';
window['pageID'] = 'TransScene'; // window['pageID'] = 'TransScene';
window['projectId'] = "1"; window['projectId'] = "1";
window['playwayId'] = "join_1"; window['playwayId'] = "join_1";
window["appId"] = ""; window["appId"] = "";
......
egret/resource/TextureMerger/Delay_3.tmproject
View file @ e151d425
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Delay_3","version":5,"files":["../assets/pk/box.png","../assets/pk/head1.png","../assets/pk/pkadd.png","../assets/pk/pkagainBtn.png","../assets/pk/pkaskBtn.png","../assets/pk/pkBtn.png","../assets/pk/pkcirle.png","../assets/pk/pkendbg.png","../assets/pk/pkloselight.png","../assets/pk/pkloselogo.png","../assets/pk/pkmyline2.png","../assets/pk/pknoton.png","../assets/pk/pkotherline2.png","../assets/pk/pkpeacelight.png","../assets/pk/pkpeacelogo.png","../assets/pk/pkprizebg.png","../assets/pk/pkprizeBtn.png","../assets/pk/pkrulebg.png","../assets/pk/pkrulebtn.png","../assets/pk/pkscorebg.png","../assets/pk/pkscorebg2.png","../assets/pk/pkwinbg.png","../assets/pk/pkwinBtn.png","../assets/pk/pkwinlight.png","../assets/pk/pkwinlogo.png","../assets/guide/ydline.png","../assets/guide/ydlight2.png","../assets/guide/ydlight.png","../assets/guide/hand2.png","../assets/guide/hand.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Delay_3","version":5,"files":["..\\assets\\pk\\box.png","..\\assets\\pk\\head1.png","..\\assets\\pk\\pkadd.png","..\\assets\\pk\\pkagainBtn.png","..\\assets\\pk\\pkaskBtn.png","..\\assets\\pk\\pkBtn.png","..\\assets\\pk\\pkcirle.png","..\\assets\\pk\\pkendbg.png","..\\assets\\pk\\pkloselight.png","..\\assets\\pk\\pkloselogo.png","..\\assets\\pk\\pkmyline2.png","..\\assets\\pk\\pknoton.png","..\\assets\\pk\\pkotherline2.png","..\\assets\\pk\\pkpeacelight.png","..\\assets\\pk\\pkpeacelogo.png","..\\assets\\pk\\pkprizebg.png","..\\assets\\pk\\pkprizeBtn.png","..\\assets\\pk\\pkrulebg.png","..\\assets\\pk\\pkrulebtn.png","..\\assets\\pk\\pkscorebg.png","..\\assets\\pk\\pkscorebg2.png","..\\assets\\pk\\pkwinbg.png","..\\assets\\pk\\pkwinBtn.png","..\\assets\\pk\\pkwinlight.png","..\\assets\\pk\\pkwinlogo.png","..\\assets\\guide\\ydline.png","..\\assets\\guide\\ydlight2.png","..\\assets\\guide\\ydlight.png","..\\assets\\guide\\hand2.png","..\\assets\\guide\\hand.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/TextureMerger/Garbage_2.tmproject
View file @ e151d425
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Garbage_2","version":5,"files":["../assets/share2/share2mask.png","../assets/share2/share2btn.png","../assets/sharestarter/sharestarter_sharebtn.png","../assets/sharestarter/sharestarter_btn.png","../assets/joinshare/joinshare_btn.png","../assets/certificate/certificate_btn.png","../assets/certificate/certificate_cover.png","../assets/slogan/slogan_btn.png","../assets/slogan/slogan_bg.png","../assets/teamshare/teamshare_btn.png","../assets/transfer/transfer _toast3.png","../assets/transfer/transfer _toast2.png","../assets/transfer/transfer _toast1.png","../assets/transfer/transfer _title.png","../assets/transfer/transfer _btn.png","../assets/transferrecord/transferrecord_item_bg.png","../assets/transferrecord/transferrecord_bg.png","../assets/confirm/confirm_bg.png","../assets/confirm/confirm_btn.png","../assets/common/关闭按钮 .png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Garbage_2","version":5,"files":["..\\assets\\share2\\share2mask.png","..\\assets\\share2\\share2btn.png","..\\assets\\sharestarter\\sharestarter_sharebtn.png","..\\assets\\sharestarter\\sharestarter_btn.png","..\\assets\\joinshare\\joinshare_btn.png","..\\assets\\certificate\\certificate_btn.png","..\\assets\\certificate\\certificate_cover.png","..\\assets\\slogan\\slogan_btn.png","..\\assets\\slogan\\slogan_bg.png","..\\assets\\teamshare\\teamshare_btn.png","..\\assets\\transfer\\transfer _toast3.png","..\\assets\\transfer\\transfer _toast2.png","..\\assets\\transfer\\transfer _toast1.png","..\\assets\\transfer\\transfer _title.png","..\\assets\\transfer\\transfer _btn.png","..\\assets\\transferrecord\\transferrecord_item_bg.png","..\\assets\\transferrecord\\transferrecord_bg.png","..\\assets\\confirm\\confirm_bg.png","..\\assets\\confirm\\confirm_btn.png","..\\assets\\common\\关闭按钮 .png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/TextureMerger/Preload_0.tmproject
View file @ e151d425
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Preload_0","version":5,"files":["../assets/startScene/yylogo.png","../assets/startScene/yyhpklogo.png","../assets/startScene/yyhlogo.png","../assets/startScene/waitBtn.png","../assets/startScene/unriben.png","../assets/startScene/unmenggu.png","../assets/startScene/unhanguo.png","../assets/startScene/unCHNxianggang.png","../assets/startScene/unCHNtaiwan.png","../assets/startScene/unCHNhangzhou.png","../assets/startScene/unCHNaomen.png","../assets/startScene/unchaoxian.png","../assets/startScene/teamBtn.png","../assets/startScene/starttitle.png","../assets/startScene/startBtn.png","../assets/startScene/ruleBtn.png","../assets/startScene/riben.png","../assets/startScene/recordBtn.png","../assets/startScene/rankBtn.png","../assets/startScene/prizeBtn.png","../assets/startScene/menggu.png","../assets/startScene/lockBtn.png","../assets/startScene/littletitle.png","../assets/startScene/horn.png","../assets/startScene/hanguo.png","../assets/startScene/getBtn.png","../assets/startScene/fireBtn.png","../assets/startScene/CHNxianggang.png","../assets/startScene/CHNtaiwan.png","../assets/startScene/CHNhangzhou.png","../assets/startScene/CHNaomen.png","../assets/startScene/chaoxian.png","../assets/startScene/closeBtn.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Preload_0","version":5,"files":["..\\assets\\startScene\\yylogo.png","..\\assets\\startScene\\yyhpklogo.png","..\\assets\\startScene\\yyhlogo.png","..\\assets\\startScene\\waitBtn.png","..\\assets\\startScene\\unriben.png","..\\assets\\startScene\\unmenggu.png","..\\assets\\startScene\\unhanguo.png","..\\assets\\startScene\\unCHNxianggang.png","..\\assets\\startScene\\unCHNtaiwan.png","..\\assets\\startScene\\unCHNhangzhou.png","..\\assets\\startScene\\unCHNaomen.png","..\\assets\\startScene\\unchaoxian.png","..\\assets\\startScene\\teamBtn.png","..\\assets\\startScene\\starttitle.png","..\\assets\\startScene\\startBtn.png","..\\assets\\startScene\\ruleBtn.png","..\\assets\\startScene\\riben.png","..\\assets\\startScene\\recordBtn.png","..\\assets\\startScene\\rankBtn.png","..\\assets\\startScene\\prizeBtn.png","..\\assets\\startScene\\menggu.png","..\\assets\\startScene\\lockBtn.png","..\\assets\\startScene\\littletitle.png","..\\assets\\startScene\\horn.png","..\\assets\\startScene\\hanguo.png","..\\assets\\startScene\\getBtn.png","..\\assets\\startScene\\fireBtn.png","..\\assets\\startScene\\CHNxianggang.png","..\\assets\\startScene\\CHNtaiwan.png","..\\assets\\startScene\\CHNhangzhou.png","..\\assets\\startScene\\CHNaomen.png","..\\assets\\startScene\\chaoxian.png","..\\assets\\startScene\\closeBtn.png"]}
\ No newline at end of file \ No newline at end of file
egret/resource/skins/PKSCoreSkin.exml
View file @ e151d425
...@@ -2,23 +2,23 @@ ...@@ -2,23 +2,23 @@
<e:Skin class="PKScoreSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="PKScoreSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16eeaea9839"/> <w:Config id="16eeaea9839"/>
<e:Group width="750" height="1206" horizontalCenter="0" verticalCenter="-209"> <e:Group width="750" height="872" anchorOffsetY="0" horizontalCenter="0" verticalCenter="-133">
<e:Image id="light" width="693" height="689" x="27" y="243" source="pkwinlight_png"/> <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="441" source="pkendbg_png"/> <e:Image width="638" height="673" x="57" y="198" source="pkendbg_png" scaleX="1" scaleY="1"/>
<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: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="574" source="box_png"/> <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="547" size="18" width="166" textAlign="center"/> <e:Label id="date" text="12月5日" x="293" y="304" size="18" width="166" textAlign="center" scaleX="1" scaleY="1"/>
<e:Label id="title" text="宝箱已发到胜利队伍" x="310" y="634" size="14" width="136" textAlign="center"/> <e:Label id="title" text="宝箱已发到胜利队伍" x="310" y="391" size="14" width="136" textAlign="center" scaleX="1" scaleY="1"/>
<e:Image id="status" width="84" height="98" x="486" y="563" source="pkwinlogo_png"/> <e:Image id="status" width="84" height="98" x="486" y="320" source="pkwinlogo_png" scaleX="1" scaleY="1"/>
<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:Button id="prizeBtn" label="Button" skinName="ui.IconButtonSkin" icon="pkwinBtn_png" width="291" height="82" anchorOffsetX="145.5" anchorOffsetY="41" y="766" scaleX="1" scaleY="1" horizontalCenter="0.5"/>
<e:Label id="myscore" text="9999" x="248" y="679" textColor="0x4cfcfc" size="28"/> <e:Label id="myscore" text="9999" x="248" y="436" textColor="0x4cfcfc" size="28" scaleX="1" scaleY="1"/>
<e:Label id="otherscore" text="7000" x="509" y="679" textColor="0x4cfcfc" size="28"/> <e:Label id="otherscore" text="7000" x="509" y="436" textColor="0x4cfcfc" size="28" scaleX="1" scaleY="1"/>
<e:Label id="endtitle" text="本场分数奖励" x="57" y="789" width="638" textAlign="center" scaleX="1" scaleY="1"/> <e:Label id="endtitle" text="本场分数奖励" x="57" y="546" width="638" textAlign="center" scaleX="1" scaleY="1"/>
<e:Component id="team1" x="111" y="836" skinName="HeadItemSkin" scaleX="0.68" scaleY="0.68"/> <e:Component id="team1" x="111" y="593" skinName="HeadItemSkin" scaleX="0.68" scaleY="0.68"/>
<e:Component id="team2" x="222" y="836" skinName="HeadItemSkin" scaleX="0.68" scaleY="0.68"/> <e:Component id="team2" x="222" y="593" skinName="HeadItemSkin" scaleX="0.68" scaleY="0.68"/>
<e:Component id="team3" x="333" y="836" skinName="HeadItemSkin" scaleX="0.68" scaleY="0.68"/> <e:Component id="team3" x="333" y="593" skinName="HeadItemSkin" scaleX="0.68" scaleY="0.68"/>
<e:Component id="team4" x="444" y="836" skinName="HeadItemSkin" scaleX="0.68" scaleY="0.68"/> <e:Component id="team4" x="444" y="593" skinName="HeadItemSkin" scaleX="0.68" scaleY="0.68"/>
<e:Component id="team5" x="555" y="836" skinName="HeadItemSkin" scaleX="0.68" scaleY="0.68"/> <e:Component id="team5" x="555" y="593" skinName="HeadItemSkin" scaleX="0.68" scaleY="0.68"/>
<e:Image width="110" height="65" x="151" y="581" source="yyhpklogo_png" scaleX="1" scaleY="1"/> <e:Image width="110" height="65" x="151" y="338" source="yyhpklogo_png" scaleX="1" scaleY="1"/>
</e:Group> </e:Group>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/src/yazuwei/PKScene.ts
View file @ e151d425
...@@ -47,6 +47,7 @@ export default class PKScene extends Scene{ ...@@ -47,6 +47,7 @@ export default class PKScene extends Scene{
} }
} }
initUI(data){ initUI(data){
console.log("pk:"+data)
this.once(egret.Event.ADDED_TO_STAGE, () => { this.once(egret.Event.ADDED_TO_STAGE, () => {
this.height = this.stage.stageHeight; this.height = this.stage.stageHeight;
}, this); }, this);
...@@ -124,7 +125,7 @@ export default class PKScene extends Scene{ ...@@ -124,7 +125,7 @@ export default class PKScene extends Scene{
this.onTap(this["team"+i]["notonBtn"],this.askOnline); this.onTap(this["team"+i]["notonBtn"],this.askOnline);
} }
if(data.myTeamMembers[i-1].consumerId == uiddata.consumerId){ if(data.myTeamMembers[i-1].uId == uiddata.partnerUserId){
this["team"+i]["onphone"].text = "我" this["team"+i]["onphone"].text = "我"
} }
......
egret/src/yazuwei/PKScorePanel.ts
View file @ e151d425
...@@ -39,6 +39,11 @@ export default class PKScorePanel extends Panel{ ...@@ -39,6 +39,11 @@ export default class PKScorePanel extends Panel{
if(data.pkResult.pkResult == 0){//pk结果 0 失败，1 获胜，2 平局 if(data.pkResult.pkResult == 0){//pk结果 0 失败，1 获胜，2 平局
this.status.source = "pkpeacelogo_png" this.status.source = "pkpeacelogo_png"
this.light.source = "pkpeacelight_png" this.light.source = "pkpeacelight_png"
this.status.x = 486
this.status.y = 329
this.status.width = 83
this.status.height = 81
this.title.text = "未能获得宝箱" this.title.text = "未能获得宝箱"
this.endtitle.text = "本场助力排行榜" this.endtitle.text = "本场助力排行榜"
this.setColor(this.box); this.setColor(this.box);
...@@ -69,10 +74,11 @@ export default class PKScorePanel extends Panel{ ...@@ -69,10 +74,11 @@ export default class PKScorePanel extends Panel{
}else if(data.pkResult.pkResult == 1){ }else if(data.pkResult.pkResult == 1){
this["team"+(i+1)]["onnum"].text = data.pkResult.myTeamMembers[i].score this["team"+(i+1)]["onnum"].text = data.pkResult.myTeamMembers[i].score
}else if(data.pkResult.pkResult == 2){ }else if(data.pkResult.pkResult == 2){
this["team"+(i+1)]["onnum"].text = data.pkResult.myTeamMembers[i].steps 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)]["headimg"].source = data.pkResult.myTeamMembers[i].avatar;
if(data.pkResult.myTeamMembers[i].uid == uiddata.consumerId){ if(data.pkResult.myTeamMembers[i].uId == uiddata.partnerUserId){
this["team"+(i+1)]["onphone"].text = "我" this["team"+(i+1)]["onphone"].text = "我"
}else{ }else{
if(data.pkResult.myTeamMembers[i].phone){ if(data.pkResult.myTeamMembers[i].phone){
......
mock/getProjectUserInfo.json
View file @ e151d425
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"credits": "999", "credits": "999",
"unitName": "金币", "unitName": "金币",
"consumerId": 500409031, "consumerId": 500409031,
"partnerUserId": "208812345678929", "partnerUserId": "10000",
"consumerCredits": 9990, "consumerCredits": 9990,
"loginJs": "<script>window.requirelogin=function(){\nvar ua = navigator.userAgent.toLowerCase();\nif(ua.match(/iphone/ig) || ua.match(/ipad/ig)){\ndocument.location='objc://duiba/login';\n}\nelse if(ua.match(/android/ig)){\ntry{\nduiba_app.login();\n}catch(e){}\n}\n}</script>" "loginJs": "<script>window.requirelogin=function(){\nvar ua = navigator.userAgent.toLowerCase();\nif(ua.match(/iphone/ig) || ua.match(/ipad/ig)){\ndocument.location='objc://duiba/login';\n}\nelse if(ua.match(/android/ig)){\ntry{\nduiba_app.login();\n}catch(e){}\n}\n}</script>"
} }
......
mock/yzw/getPkBaseInfo.json
View file @ e151d425
...@@ -10,37 +10,10 @@ ...@@ -10,37 +10,10 @@
"consumerId":"1539361", "consumerId":"1539361",
"id":678, "id":678,
"memberStepCounts":0, "memberStepCounts":0,
"onlineTime":"2019-12-09", "onlineTime":"2019-12-10",
"phone":"189****6789", "phone":"189****6789",
"teamId":"1", "teamId":"1",
"uId":"1", "uId":"10000",
"avatar":"https://yun.duiba.com.cn/db_games/activity/yzw_hjcd/touxiang/qugun.png"
},{
"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"
},{
"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"
},{
"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" "avatar":"https://yun.duiba.com.cn/db_games/activity/yzw_hjcd/touxiang/qugun.png"
}] }]
......
mock/yzw/homeBaseInfo.json
View file @ e151d425
{ {
"code":null, "code":null,
"data":{ "data":{
"currentLevel":0, "currentLevel":7,
"treasureBoxNum":0, "treasureBoxNum":0,
"currentScore":1222, "currentScore":1222,
"pkResult":{ "pkResult":{
...@@ -13,19 +13,22 @@ ...@@ -13,19 +13,22 @@
"steps":122, "steps":122,
"phone":182677888, "phone":182677888,
"score":10, "score":10,
"myFlag":0 "myFlag":0,
"uid":10000
}, },
{ {
"steps":122, "steps":122,
"phone":182677888, "phone":182677888,
"score":10, "score":10,
"myFlag":1 "myFlag":1,
"uid":100100
}, },
{ {
"steps":122, "steps":122,
"phone":182677888, "phone":182677888,
"score":10, "score":10,
"myFlag":1 "myFlag":1,
"uid":100100
} }
] ]
}, },
......
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