Skip to content

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

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

parents 2bf7ec71 34a5bf3d
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 29 deletions
egret/resource/TextureMerger/Delay_3.tmproject
View file @ 40294174
{"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
{"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
egret/resource/TextureMerger/Garbage_2.tmproject
View file @ 40294174
{"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
{"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
egret/resource/TextureMerger/Normal_1.tmproject
View file @ 40294174
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Normal_1","version":5,"files":["../assets/myrecord/mrxg.png","../assets/myrecord/mrtitle.png","../assets/myrecord/mrtb.png","../assets/myrecord/mrrb.png","../assets/myrecord/mrmg.png","../assets/myrecord/mrhz.png","../assets/myrecord/mrhg.png","../assets/myrecord/mrcx.png","../assets/myrecord/mram.png","../assets/map/mapshareBtn.png","../assets/map/mappass.png","../assets/map/maphz.png","../assets/map/mapBtn.png","../assets/pop/rulebg.png","../assets/pop/rankmybg.png","../assets/pop/rankline.png","../assets/pop/ranklight.png","../assets/pop/rankbg2.png","../assets/pop/rankbg.png","../assets/pop/lessscoreBtn.png","../assets/pop/lessscorebg.png","../assets/pop/finishlogo.png","../assets/pop/finishlight.png","../assets/pop/finishBtn.png","../assets/pop/finishbg.png","../assets/waiting/progress.png","../assets/waiting/bg.png","../assets/xuanshi/xuanshiBtn.png","../assets/xuanshi/xuanshiBG.png","../assets/map/mapcx.png","../assets/map/maphg.png","../assets/map/mapmg.png","../assets/map/mapxg.png","../assets/map/mapam.png","../assets/map/maprb.png","../assets/map/maptb.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Normal_1","version":5,"files":["..\\assets\\myrecord\\mrxg.png","..\\assets\\myrecord\\mrtitle.png","..\\assets\\myrecord\\mrtb.png","..\\assets\\myrecord\\mrrb.png","..\\assets\\myrecord\\mrmg.png","..\\assets\\myrecord\\mrhz.png","..\\assets\\myrecord\\mrhg.png","..\\assets\\myrecord\\mrcx.png","..\\assets\\myrecord\\mram.png","..\\assets\\map\\mapshareBtn.png","..\\assets\\map\\mappass.png","..\\assets\\map\\maphz.png","..\\assets\\map\\mapBtn.png","..\\assets\\pop\\rulebg.png","..\\assets\\pop\\rankmybg.png","..\\assets\\pop\\rankline.png","..\\assets\\pop\\ranklight.png","..\\assets\\pop\\rankbg2.png","..\\assets\\pop\\rankbg.png","..\\assets\\pop\\lessscoreBtn.png","..\\assets\\pop\\lessscorebg.png","..\\assets\\pop\\finishlogo.png","..\\assets\\pop\\finishlight.png","..\\assets\\pop\\finishBtn.png","..\\assets\\pop\\finishbg.png","..\\assets\\waiting\\progress.png","..\\assets\\waiting\\bg.png","..\\assets\\xuanshi\\xuanshiBtn.png","..\\assets\\xuanshi\\xuanshiBG.png","..\\assets\\map\\mapcx.png","..\\assets\\map\\maphg.png","..\\assets\\map\\mapmg.png","..\\assets\\map\\mapxg.png","..\\assets\\map\\mapam.png","..\\assets\\map\\maprb.png","..\\assets\\map\\maptb.png"]}
\ No newline at end of file
egret/resource/TextureMerger/Preload_0.tmproject
View file @ 40294174
{"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
{"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
egret/resource/default.res.json
View file @ 40294174
......@@ -15,6 +15,10 @@
{
"keys": "box_png,head1_png,pkadd_png,pkagainBtn_png,pkaskBtn_png,pkBG_jpg,pkBtn_png,pkcirle_png,pkendbg_png,pkloselight_png,pkloselogo_png,pkmyline2_png,pknoton_png,pkotherline2_png,pkpeacelight_png,pkpeacelogo_png,pkprizebg_png,pkprizeBtn_png,pkrulebg_png,pkrulebtn_png,pkscorebg_png,pkscorebg2_png,pkwinbg_png,pkwinBtn_png,pkwinlight_png,pkwinlogo_png,ydline_png,ydlight2_png,ydlight_png,hand2_png,hand_png",
"name": "Delay"
},
{
"name": "preload",
"keys": "xsBG_png,backstartBtn_png"
}
],
"resources": [
......@@ -657,6 +661,16 @@
"url": "assets/map/maptb.png",
"type": "image",
"name": "maptb_png"
},
{
"name": "xsBG_png",
"type": "image",
"url": "assets/xuanshi/xsBG.png"
},
{
"name": "backstartBtn_png",
"type": "image",
"url": "assets/xuanshi/backstartBtn.png"
}
]
}
\ No newline at end of file
egret/resource/skins/GuideSkin.exml
View file @ 40294174
......@@ -25,11 +25,9 @@
<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:Image width="638" height="580" x="0" y="89" scaleX="1" scaleY="1" source="xsBG_png"/>
<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>
<e:Group id="dianran" width="750" height="607" x="0" y="311" visible="false">
<e:Image width="327" height="327" x="435" y="0" source="ydlight_png" scaleX="1" scaleY="1"/>
......
egret/resource/skins/PKSkin.exml
View file @ 40294174
......@@ -26,5 +26,6 @@
<e:Component id="team4" x="460" y="910" skinName="HeadItemSkin" scaleX="1" scaleY="1"/>
<e:Component id="team5" x="600" y="910" skinName="HeadItemSkin" scaleX="1" scaleY="1"/>
<e:Image width="110" height="65" x="151" y="243" source="yyhpklogo_png"/>
<e:Button id="backBtn" label="Button" skinName="ui.IconButtonSkin" icon="backstartBtn_png" width="104" height="40" scaleX="1" scaleY="1" anchorOffsetX="52" anchorOffsetY="20" x="52" y="36"/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/resource/skins/RecordMapSkin.exml
View file @ 40294174
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="RecordMapSkin" 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="mrbg_jpg"/>
<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" 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 id="mapGroup" width="750" height="1115" horizontalCenter="0" verticalCenter="-29.5">
<e:Image id="mapBG" width="683" height="801" source="maphz_png" scaleX="1" scaleY="1" horizontalCenter="-0.5" y="106"/>
<e:Image width="308" height="166" x="439" y="76" source="mappass_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" horizontalCenter="-1.5" y="1010"/>
<e:Label id="sharelab" text="首次分享可获得10能量" size="28" textAlign="center" width="750" scaleX="1" scaleY="1" horizontalCenter="0" y="1087"/>
<e:Button id="backBtn" label="Button" skinName="ui.IconButtonSkin" icon="backstartBtn_png" width="104" height="40" scaleX="1" scaleY="1" anchorOffsetX="52" anchorOffsetY="20" x="52" y="20"/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/resource/skins/RecordSkin.exml
View file @ 40294174
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="RecordSkin" 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="mrbg_jpg"/>
<e:Group id="recordGroup" width="624" height="868" horizontalCenter="0" verticalCenter="-122">
<e:Image width="367" height="75" x="130" y="0" source="mrtitle_png" scaleX="1" scaleY="1"/>
<e:Image id="hz" width="180" height="202" x="0" y="153" source="mrhz_png" scaleX="1" scaleY="1"/>
<e:Image id="am" width="180" height="202" x="222" y="153" source="mram_png" scaleX="1" scaleY="1"/>
<e:Image id="xg" width="180" height="202" x="444" y="153" source="mrxg_png" scaleX="1" scaleY="1"/>
<e:Image id="tb" width="180" height="202" x="0" y="409" source="mrtb_png" scaleX="1" scaleY="1"/>
<e:Image id="rb" width="180" height="202" x="222" y="409" source="mrrb_png" scaleX="1" scaleY="1"/>
<e:Image id="hg" width="180" height="202" x="444" y="409" source="mrhg_png" scaleX="1" scaleY="1"/>
<e:Image id="cx" width="180" height="202" x="0" y="666" source="mrcx_png" scaleX="1" scaleY="1"/>
<e:Image id="mg" width="180" height="202" x="222" y="666" source="mrmg_png" scaleX="1" scaleY="1"/>
<e:Image width="750" height="1624" x="1" y="-1" source="mrbg_jpg"/>
<e:Group id="recordGroup" width="750" height="899" horizontalCenter="0" verticalCenter="-137.5">
<e:Image width="367" height="75" source="mrtitle_png" scaleX="1" scaleY="1" horizontalCenter="1.5" y="31"/>
<e:Image id="hz" width="180" height="202" source="mrhz_png" scaleX="1" scaleY="1" horizontalCenter="-222" y="184"/>
<e:Image id="am" width="180" height="202" source="mram_png" scaleX="1" scaleY="1" horizontalCenter="0" y="184"/>
<e:Image id="xg" width="180" height="202" source="mrxg_png" scaleX="1" scaleY="1" horizontalCenter="222" y="184"/>
<e:Image id="tb" width="180" height="202" source="mrtb_png" scaleX="1" scaleY="1" horizontalCenter="-222" y="440"/>
<e:Image id="rb" width="180" height="202" source="mrrb_png" scaleX="1" scaleY="1" horizontalCenter="0" y="440"/>
<e:Image id="hg" width="180" height="202" source="mrhg_png" scaleX="1" scaleY="1" horizontalCenter="222" y="440"/>
<e:Image id="cx" width="180" height="202" source="mrcx_png" scaleX="1" scaleY="1" horizontalCenter="-222" y="697"/>
<e:Image id="mg" width="180" height="202" source="mrmg_png" scaleX="1" scaleY="1" horizontalCenter="0" y="697"/>
<e:Button id="backBtn" label="Button" skinName="ui.IconButtonSkin" icon="backstartBtn_png" width="104" height="40" scaleX="1" scaleY="1" anchorOffsetX="52" anchorOffsetY="20" x="52" y="20"/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/resource/skins/SloganSkin.exml
View file @ 40294174
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="SloganSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image source="slogan_bg_png" y="222" horizontalCenter="0"/>
<e:Image y="222" horizontalCenter="0" source="xsBG_png"/>
<e:Image id="btn" source="slogan_btn_png" y="636" horizontalCenter="0"/>
<e:Image id="closeBtn" source="关闭按钮 _png" x="652" y="139" visible="false"/>
<e:Image id="closeBtn" source="关闭按钮 _png" x="652" y="139"/>
</e:Skin>
\ No newline at end of file
egret/src/rankPanel/RankPanel.ts
View file @ 40294174
......@@ -20,6 +20,9 @@ export default class RankPanel extends Panel{
this.initUI(data);
}
initUI(data){
this.once(egret.Event.ADDED_TO_STAGE, () => {
this.height = this.stage.stageHeight;
}, this);
if(data){
for(let i =0;i<data.list.length;i++){
let com = new eui.Component();
......
egret/src/rulePanel/RulePanel.ts
View file @ 40294174
......@@ -13,6 +13,9 @@ export default class RulePanel extends Panel {
start() {
Waiting.instance.hide()
this.once(egret.Event.ADDED_TO_STAGE, () => {
this.height = this.stage.stageHeight;
}, this);
if (window['ruleTxt']) {
this.labContent.textFlow = (new HtmlTextParser).parser(window['ruleTxt']);
this.labContent.textColor = 0xb1d1e7;;
......
egret/src/startScene/StartScene.ts
View file @ 40294174
......@@ -10,6 +10,7 @@ import Waiting from "../waiting/Waiting";
import GameConst from "../GameConst";
import { Buried } from "../../libs/tw/util/Buried";
import { NetManager } from "../../libs/tw/manager/NetManager";
import instance from "../views/layers";
export default class StartScene extends Scene {
......@@ -34,7 +35,7 @@ export default class StartScene extends Scene {
protected get skinKey() { return 'Start' }
private level;
public level;
private startdata;
private type;
......@@ -42,9 +43,11 @@ export default class StartScene extends Scene {
private chuandiExposure:any;
private huozhongExposure:any;
private pkExposure:any;
public static instance:StartScene;
constructor(data){
super();
this.initBuired();
StartScene.instance = this;
if(data.type){
this.startdata = data.data;
this.level = data.data.currentLevel
......
egret/src/yazuwei/FinishPanel.ts
View file @ 40294174
......@@ -8,6 +8,9 @@ export default class FinishPanel extends Panel{
constructor(){
super();
this.once(egret.Event.ADDED_TO_STAGE, () => {
this.height = this.stage.stageHeight;
}, this);
}
initEvents(){
super.initEvents();
......
egret/src/yazuwei/GuidePanel.ts
View file @ 40294174
......@@ -28,6 +28,9 @@ export default class GuidePanel extends Panel{
data;
constructor(data){
super();
this.once(egret.Event.ADDED_TO_STAGE, () => {
this.height = this.stage.stageHeight;
}, this);
//data.type == 1 第一次进入引导
this.data = data;
if(data.type == 1){
......@@ -40,9 +43,7 @@ export default class GuidePanel extends Panel{
}
initUI(){
this.once(egret.Event.ADDED_TO_STAGE, () => {
this.height = this.stage.stageHeight;
}, this);
this.guide1.visible = true;
this.guide2.visible = false;
this.guide3.visible = false;
......
egret/src/yazuwei/NoCreditsPanel.ts
View file @ 40294174
......@@ -9,6 +9,9 @@ export default class NoCreditsPanel extends Panel{
constructor(){
super();
this.once(egret.Event.ADDED_TO_STAGE, () => {
this.height = this.stage.stageHeight;
}, this);
}
initEvents(){
......
egret/src/yazuwei/PKPrizePanel.ts
View file @ 40294174
......@@ -11,6 +11,9 @@ export default class PKPrizePanel extends Panel{
this.initUI(data);
}
initUI(data){
this.once(egret.Event.ADDED_TO_STAGE, () => {
this.height = this.stage.stageHeight;
}, this);
this.energy.text = data.prizeName;
}
initEvents(){
......
egret/src/yazuwei/PKRulePanel.ts
View file @ 40294174
......@@ -14,6 +14,9 @@ export default class PKRulePanel extends Panel {
start() {
Waiting.instance.hide()
this.once(egret.Event.ADDED_TO_STAGE, () => {
this.height = this.stage.stageHeight;
}, this);
if (window['PKruleTxt']) {
this.labContent.textFlow = (new HtmlTextParser).parser(window['PKruleTxt']);
this.labContent.textColor = 0xb1d1e7;;
......
egret/src/yazuwei/PKScene.ts
View file @ 40294174
......@@ -7,6 +7,7 @@ import { DataManager } from "../../libs/tw/manager/DataManager";
import { NetManager } from "../../libs/tw/manager/NetManager";
import GameConst from "../GameConst";
import Waiting from "../waiting/Waiting";
import SceneCtrl from "../ctrls/sceneCtrl";
export default class PKScene extends Scene{
protected get skinKey(){return 'PK'}
......@@ -33,6 +34,7 @@ export default class PKScene extends Scene{
public team4:eui.Component;
public team5:eui.Component;
public addteamBtn:eui.Button;
public backBtn:eui.Button;
public myavater;
......@@ -177,6 +179,7 @@ export default class PKScene extends Scene{
}
initEvents(){
this.onTap(this.ruleBtn,()=>{PanelCtrl.instance.show(ModuleTypes.PKRULE_PANEL)});
this.onTap(this.backBtn,this.backStart);
}
onTap_OpenBox(){
Waiting.instance.show();
......@@ -258,4 +261,23 @@ export default class PKScene extends Scene{
// },window['projectId'])
// window['share']();
}
backStart(){
Waiting.instance.show();
yzwNet.homeBaseInfo((s)=>{
Waiting.instance.hide();
if(!s){
if(DataManager.ins.getData("homeBaseInfo") && DataManager.ins.getData("homeBaseInfo").message){
ToastCtrl.instance.show(DataManager.ins.getData("homeBaseInfo").message)
}else{
ToastCtrl.instance.show("网络异常请重试~");
}
// ToastCtrl.instance.show("网络异常请重试~");
return;
}
Waiting.instance.hide();
let data = DataManager.ins.getData("homeBaseInfo").data;
SceneCtrl.instance.change(ModuleTypes.START_SCENE,data);
},window['projectId'])
}
}
\ No newline at end of file
egret/src/yazuwei/PKScorePanel.ts
View file @ 40294174
......@@ -31,6 +31,9 @@ export default class PKScorePanel extends Panel{
this.startdata = data;
}
initUI(data){
this.once(egret.Event.ADDED_TO_STAGE, () => {
this.height = this.stage.stageHeight;
}, this);
this.myscore.text = data.pkResult.myTeamSteps;
this.otherscore.text = data.pkResult.enemyTeamSteps;
let now = new Date();
......
egret/src/yazuwei/PlacePanel.ts
View file @ 40294174
......@@ -14,10 +14,14 @@ export default class PlacePanel extends Panel{
public knowBtn:eui.Button;
constructor(data){
super();
this.once(egret.Event.ADDED_TO_STAGE, () => {
this.height = this.stage.stageHeight;
}, this);
this.initUI(data)
}
initUI(data){
if(data == 1){
this.mapBG.source = "maphz_png"
}else if(data == 2){
......
egret/src/yazuwei/RecordMapScene.ts
View file @ 40294174
......@@ -3,12 +3,16 @@ import { yzwNet } from "../NetConst";
import ToastCtrl from "../ctrls/toastCtrl";
import { DataManager } from "../../libs/tw/manager/DataManager";
import Waiting from "../waiting/Waiting";
import StartScene from "../startScene/StartScene";
import { ModuleTypes } from "../types/sceneTypes";
import SceneCtrl from "../ctrls/sceneCtrl";
export default class RecordMapScene extends Scene{
protected get skinKey(){return 'RecordMap'}
public mapBG:eui.Image;
public shareBtn:eui.Button;
public sharelab:eui.Label;
public backBtn:eui.Button;
private level;
constructor(data){
......@@ -54,6 +58,7 @@ export default class RecordMapScene extends Scene{
initEvents(){
super.initEvents();
this.onTap(this.shareBtn,this.sharePic)
this.onTap(this.backBtn,()=>{SceneCtrl.instance.change(ModuleTypes.RECORD_SCENE,StartScene.instance.level)})
}
sharePic(){
......
egret/src/yazuwei/RecordScene.ts
View file @ 40294174
......@@ -19,6 +19,8 @@ export default class RecordScene extends Scene{
public cx:eui.Image;
public mg:eui.Image;
public backBtn:eui.Button;
constructor(data){
super()
if(data){
......@@ -44,6 +46,7 @@ export default class RecordScene extends Scene{
for(let i = 0;i<8;i++){
this.onTap(this[arr[i]],this.showMap.bind(this,i+1))
}
this.onTap(this.backBtn,this.backStart)
}
showMap(num){
......@@ -66,4 +69,23 @@ export default class RecordScene extends Scene{
},window['projectId'])
}
backStart(){
Waiting.instance.show();
yzwNet.homeBaseInfo((s)=>{
Waiting.instance.hide();
if(!s){
if(DataManager.ins.getData("homeBaseInfo") && DataManager.ins.getData("homeBaseInfo").message){
ToastCtrl.instance.show(DataManager.ins.getData("homeBaseInfo").message)
}else{
ToastCtrl.instance.show("网络异常请重试~");
}
// ToastCtrl.instance.show("网络异常请重试~");
return;
}
Waiting.instance.hide();
let data = DataManager.ins.getData("homeBaseInfo").data;
SceneCtrl.instance.change(ModuleTypes.START_SCENE,data);
},window['projectId'])
}
}
\ No newline at end of file
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