Skip to content

X
xiaoxiaole
Commit 38fa88e1 authored by 邱旭's avatar 邱旭
Browse files
Options

1

parent 9d4d0022
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 172 additions and 2764 deletions
egret/libs/new_wx/MainBase.ts
View file @ 38fa88e1
......@@ -403,6 +403,7 @@ export default class MainBase extends eui.UILayer {
"lionMsgBg",
"guideBox",
"msgTri",
"arrow",
"guideOver",
"guideLove",
"guideLevel",
......
egret/resource/assets/map/guideOver.png
View replaced file @ 9d4d0022 View file @ 38fa88e1
egret/resource/assets/map/guideOver.png

34.8 KB | W: | H:

egret/resource/assets/map/guideOver.png

15.4 KB | W: | H:

egret/resource/assets/map/guideOver.png
egret/resource/assets/map/guideOver.png
egret/resource/assets/map/guideOver.png
egret/resource/assets/map/guideOver.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/assets/map/msgTri.png
View replaced file @ 9d4d0022 View file @ 38fa88e1
egret/resource/assets/map/msgTri.png

919 Bytes | W: | H:

egret/resource/assets/map/msgTri.png

2.99 KB | W: | H:

egret/resource/assets/map/msgTri.png
egret/resource/assets/map/msgTri.png
egret/resource/assets/map/msgTri.png
egret/resource/assets/map/msgTri.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/default.res.json
View file @ 38fa88e1
......@@ -21,7 +21,7 @@
"name": "buy3"
},
{
"keys": "宝箱_png,宝箱1_png,宝箱2_png,宝箱3_png,宝箱bg_png,宝箱btn_png,道具_png,关闭 拷贝_png,光 副本 4_png,设置_png,设置bg_png,声音_png,声音关闭_png,狮子_png,退出_png,问题_png,无星星_png,星星_png,星星bg_png,音乐_png,音乐关闭_png,有星星_png,有星星2_png,有星星3_png,元宝bg_png,ad_icon_png,animal1_png,avatar_png,friend_avatar_png,guideBox_png,guideLevel_png,guideLove_png,guideMoney_png,guideOver_png,icon_png,iconbg_png,icongray_png,invite_icon_png,invite_txtbg_png,lionMsgBg_png,map_signicon_png,map1_jpg,map2_jpg,map2+_png,map2+bg_png,map2红包大作战_png,map2热门引导_png,map2周一红包雨_png,map3_jpg,map大转盘_png,map刮现金红包_png,map今日可领_png,map明日可领_png,maphot_png,msgTri_png,namebg_png,progress1_png,progress2_png,recordbtn_png,taskicon_png,map2+bg2_png,mapredbagicom_png,maplight2_png,taskBtn_png,txtbg_blue_png,txtbg_orange_png,txtbg_purple_png,mapredbagicom2_png,iconnow_png",
"keys": "宝箱_png,宝箱1_png,宝箱2_png,宝箱3_png,宝箱bg_png,宝箱btn_png,道具_png,关闭 拷贝_png,光 副本 4_png,设置_png,设置bg_png,声音_png,声音关闭_png,狮子_png,退出_png,问题_png,无星星_png,星星_png,星星bg_png,音乐_png,音乐关闭_png,有星星_png,有星星2_png,有星星3_png,元宝bg_png,ad_icon_png,animal1_png,avatar_png,friend_avatar_png,guideBox_png,guideLevel_png,guideLove_png,guideMoney_png,guideOver_png,icon_png,iconbg_png,icongray_png,invite_icon_png,invite_txtbg_png,lionMsgBg_png,map_signicon_png,map1_jpg,map2_jpg,map2+_png,map2+bg_png,map2红包大作战_png,map2热门引导_png,map2周一红包雨_png,map3_jpg,map大转盘_png,map刮现金红包_png,map今日可领_png,map明日可领_png,maphot_png,msgTri_png,namebg_png,progress1_png,progress2_png,recordbtn_png,taskicon_png,map2+bg2_png,mapredbagicom_png,maplight2_png,taskBtn_png,txtbg_blue_png,txtbg_orange_png,txtbg_purple_png,mapredbagicom2_png,iconnow_png,arrow_png",
"name": "map"
},
{
......@@ -89,7 +89,7 @@
"name": "friend"
},
{
"keys": "invite_invite_png,invite_help_png,invite_btn_png,invite_bg_png,invitePrize_btn_png,invitePrize_bg_png,invitePrize_game_btn_png,invateCut_bg_png,invateCut_btn_png,invite_wx_tip_png,invite_rule_bg_png,invitebg2_png",
"keys": "invite_invite_png,invite_help_png,invite_btn_png,invite_bg_png,invitePrize_btn_png,invitePrize_bg_png,invitePrize_game_btn_png,invateCut_btn_png,invite_wx_tip_png,invitebg2_png,invateCut_bg_png,invite_rule_bg_png",
"name": "invite"
},
{
......@@ -113,11 +113,7 @@
"name": "inviteprizepanel"
},
{
"keys": "invite_rule_bg_png",
"name": "inviterulepanel"
},
{
"keys": "invateCut_btn_png,invateCut_bg_png",
"keys": "invateCut_btn_png",
"name": "invitecuttimepanel"
},
{
......@@ -1155,11 +1151,6 @@
"type": "image",
"name": "startpanel通关条件_png"
},
{
"url": "assets/invite/rule/invite_rule_bg.png",
"type": "image",
"name": "invite_rule_bg_png"
},
{
"url": "assets/invite/prize/invitePrize_btn.png",
"type": "image",
......@@ -1175,11 +1166,6 @@
"type": "image",
"name": "invitePrize_game_btn_png"
},
{
"url": "assets/invite/cutTime/invateCut_bg.png",
"type": "image",
"name": "invateCut_bg_png"
},
{
"url": "assets/invite/cutTime/invateCut_btn.png",
"type": "image",
......@@ -5205,6 +5191,21 @@
"url": "assets/TaskCenterPrize/taskPrize_chuizi.png",
"type": "image",
"name": "taskPrize_chuizi_png"
},
{
"url": "assets/invite/cutTime/invateCut_bg.png",
"type": "image",
"name": "invateCut_bg_png"
},
{
"url": "assets/invite/rule/invite_rule_bg.png",
"type": "image",
"name": "invite_rule_bg_png"
},
{
"url": "assets/map/arrow.png",
"type": "image",
"name": "arrow_png"
}
]
}
\ No newline at end of file
egret/resource/skins/HbPrizeSkin.exml
View file @ 38fa88e1
......@@ -17,7 +17,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="closeBtn" label="" x="597" y="282.33">
<e:Button id="closeBtn" label="" x="597" y="277.33">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
......
egret/resource/skins/InviteCutTimePanelSkin.exml
View file @ 38fa88e1
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="InviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui"
xmlns:w="http://ns.egret.com/wing">
<e:Image y="216.33" source="invateCut_bg_png" horizontalCenter="0"/>
<e:BitmapLabel id="cutTimeLabel" y="396.33" font="cutTimeFont_fnt" text="00:00:00" letterSpacing="10" horizontalCenter="0"/>
<e:Button id="closeBtn" label="" x="615" y="208.33">
<e:Image y="239.33" source="invateCut_bg_png" horizontalCenter="0"/>
<e:BitmapLabel id="cutTimeLabel" y="408.33" text="00时00分00" letterSpacing="10" horizontalCenter="0" font="hbCutTimeFont_fnt"/>
<e:Button id="closeBtn" label="" x="600" y="239.33">
<e:skinName>
<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png"
......@@ -12,7 +12,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="ok_btn" label="" y="596" anchorOffsetX="150" anchorOffsetY="48" horizontalCenter="0">
<e:Button id="ok_btn" label="" y="595" anchorOffsetX="150" anchorOffsetY="48" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="invateCut_btn_png"/>
......@@ -20,4 +20,5 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Component y="695" skinName="ADSmallSkin" anchorOffsetX="0" anchorOffsetY="0" horizontalCenter="0" visible="false"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/InvitePrizePanelSkin.exml
View file @ 38fa88e1
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="InviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui"
xmlns:w="http://ns.egret.com/wing">
<e:Image y="45.33" horizontalCenter="0" source="invitePrize_bg_png"/>
<e:Image id="prizeImg" y="426.77" source="" horizontalCenter="0" width="510" height="228"/>
<e:Button id="closeBtn" label="" x="624" y="313.33">
xmlns:w="http://ns.egret.com/wing" xmlns:ns1="*">
<e:Component y="910" skinName="ADSmallSkin" anchorOffsetX="0" anchorOffsetY="0" horizontalCenter="0" visible="false"/>
<e:Image y="-108.73" source="invitePrize_bg_png" horizontalCenter="0"/>
<e:Image id="prizeImg" y="455.77" source="" horizontalCenter="0" width="510" height="228"/>
<e:Button id="closeBtn" label="" x="612" y="311.77">
<e:skinName>
<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png"
......@@ -12,7 +13,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="ok_btn" label="" y="760" anchorOffsetX="138.5" anchorOffsetY="56.5" x="236.5">
<e:Button id="ok_btn" label="" y="790" anchorOffsetX="138.5" anchorOffsetY="56.5" x="236.5">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="invitePrize_btn_png"/>
......@@ -20,7 +21,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="game_btn" label="" y="760" anchorOffsetX="139" anchorOffsetY="56.5" x="527">
<e:Button id="game_btn" label="" y="790" anchorOffsetX="139" anchorOffsetY="56.5" x="527">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="invitePrize_game_btn_png"/>
......
egret/resource/skins/InviteRulePanelSkin.exml
View file @ 38fa88e1
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="RuleSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Rect left="0" bottom="0" top="0" right="0" fillColor="0x000000" fillAlpha="0.7"/>
<e:Image id="ruleBg" horizontalCenter="0.5" verticalCenter="-231" source="invite_rule_bg_png"/>
<e:Scroller id="scroller" width="545" height="527" y="398.2" horizontalCenter="0.5" anchorOffsetY="0">
<e:Group id="group" width="100%" x="-1.26" y="36" anchorOffsetY="0" height="515">
<e:Image id="ruleBg" horizontalCenter="0" verticalCenter="-177" source="invite_rule_bg_png"/>
<e:Scroller id="scroller" width="545" height="534" y="391.2" horizontalCenter="0.5" anchorOffsetY="0">
<e:Group id="group" width="100%" x="0" y="-8" anchorOffsetY="0" height="535">
<e:Label id="labContent" width="100%" text="" lineSpacing="10" size="30" multiline="true" textColor="0xa54615" fontFamily="FZY3JW"/>
<e:layout>
<e:VerticalLayout/>
</e:layout>
</e:Group>
</e:Scroller>
<e:Button id="closeBtn" label="" x="604" y="340">
<e:Button id="closeBtn" label="" x="604.5" y="276">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
......
egret/resource/skins/InviteRuleSkin.exml
View file @ 38fa88e1
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="InviteRuleSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image id="ruleBg" horizontalCenter="0.5" source="inviterulebg_png" y="152"/>
<e:Scroller id="scroller" width="545" x="104.76" height="507" y="377.2">
<e:Group id="group" width="100%">
<e:Image id="ruleBg" horizontalCenter="0" source="inviterulebg_png" y="117.2"/>
<e:Scroller id="scroller" width="545" height="497" y="365.2" anchorOffsetY="0" horizontalCenter="0.5">
<e:Group id="group" width="100%" y="2" x="1" anchorOffsetY="0" height="528">
<e:Label id="labContent" width="100%" text="" lineSpacing="10" size="30" multiline="true" textColor="0xa54615"/>
<e:layout>
<e:VerticalLayout/>
</e:layout>
</e:Group>
</e:Scroller>
<e:Button id="closeBtn" label="" x="614" y="301">
<e:Button id="closeBtn" label="" x="601" y="271.7">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
......
egret/resource/skins/InviteSkin.exml
View file @ 38fa88e1
......@@ -2,13 +2,13 @@
<e:Skin class="InviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui"
xmlns:w="http://ns.egret.com/wing">
<w:Config id="16dd8f58b77" visible="false"/>
<e:Image id="light2" source="invitebg2_png" x="376" y="317" anchorOffsetX="356" anchorOffsetY="296"/>
<e:Image id="light1" source="invitebg2_png" x="376" y="317" anchorOffsetX="356" anchorOffsetY="296"/>
<e:Image y="241.33" horizontalCenter="0" source="invite_bg_png"/>
<e:Group id="con" y="-67"/>
<e:Label text="邀请新玩家闯关可得现金券!" y="381.33" textColor="0xF54500" size="28" horizontalCenter="0" fontFamily="FZY3JW"/>
<e:Image id="prizeImg" y="439.33" horizontalCenter="0.5" source="" width="510" height="228"/>
<e:Button id="closeBtn" label="" x="605" y="227.33">
<e:Image id="light2" source="invitebg2_png" x="376" y="317" anchorOffsetX="356" anchorOffsetY="296" visible="false"/>
<e:Image id="light1" source="invitebg2_png" x="376" y="317" anchorOffsetX="356" anchorOffsetY="296" visible="false"/>
<e:Image y="-103.17" horizontalCenter="0" source="invite_bg_png"/>
<e:Group id="con" y="-67" visible="false"/>
<e:Label text="邀请新玩家闯关可得现金券!" y="381.33" size="28" horizontalCenter="0" fontFamily="FZY3JW" textColor="0xc17343"/>
<e:Image id="prizeImg" y="433.33" source="" width="510" height="228" horizontalCenter="0"/>
<e:Button id="closeBtn" label="" x="604.5" y="312.5">
<e:skinName>
<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png"
......@@ -26,7 +26,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="numLabel" text="仅差3人可获得" y="679.33" textColor="0xf54500" size="28" horizontalCenter="0" />
<e:Label id="numLabel" text="仅差3人可获得" y="682.33" size="28" horizontalCenter="0" textColor="0xc17343"/>
<e:Label id="cutTimeLabel" text="将在23:43:21后失效" y="883.33" size="28" textColor="0xffffff" horizontalCenter="0" fontFamily="FZY3JW"/>
<e:Scroller width="545" height="90" y="766.33" anchorOffsetX="0" anchorOffsetY="0" horizontalCenter="0">
<e:Group anchorOffsetX="0">
......
egret/resource/skins/TaskCenterItemSkin.exml
View file @ 38fa88e1
......@@ -10,7 +10,7 @@
<e:Label id="moneyCount" text="×999" x="37.7" size="28" fontFamily="FZY3JW" textColor="0xf25d45" bold="true" verticalCenter="0"/>
</e:Group>
<e:Group id="btnGroup" x="441" width="217" height="91" verticalCenter="0">
<e:Image id="btnImg" source="TaskCenter_doneBtn_png" horizontalCenter="0" verticalCenter="0"/>
<e:Image id="btnImg" horizontalCenter="0" verticalCenter="-1" source="TaskCenter_doneBtn_png"/>
<e:Label id="btnLabel" text="去完成" verticalAlign="middle" textAlign="center" horizontalCenter="0.5" verticalCenter="-4.5" strokeColor="0x7e7e7e" stroke="2" fontFamily="FZY3JW" size="30"/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/src/mapScene/GuideCon.ts
View file @ 38fa88e1
......@@ -4,23 +4,25 @@ import { ShowWord } from "../something/uis/ShowWord";
let cacheKey = "happyClear" + window["CFG"].consumerId;
export const getCacheKey=()=>{
export const getCacheKey = () => {
return cacheKey
}
/**
* 读取缓存
*/
export function readCache(key: string = cacheKey, type: string = 'localStorage') {
if (!window[type]) {
if(!window[type]) {
return false;
}
return window[type].getItem(key);
}
/**
* 写缓存
*/
export function writeCache(key: string = cacheKey, value: any = 'true', type: string = 'localStorage') {
if (!window[type]) {
if(!window[type]) {
// trace(Func.replace(SysLang.lang_012, [type]));
return;
}
......@@ -30,10 +32,12 @@ export function writeCache(key: string = cacheKey, value: any = 'true', type: st
const resPath = getResPath();
const parser = new window["SVGA"].Parser();
/**
/**
* 箭头的svga，只加载一次
*/
let arrow: egret.DisplayObjectContainer;
// let arrow: egret.DisplayObjectContainer;
let arrow: eui.Group;
/**
* 地图页面的引导
* 进地图页面先判断缓存，显示界面
......@@ -45,13 +49,14 @@ export class GuideCon extends egret.DisplayObjectContainer {
groups: any[];
couldOver: boolean = false;
timeoutId: number;
tri: egret.Bitmap;
// tri: egret.Bitmap;
showWord: ShowWord;
callback;
constructor(callback) {
super();
this.callback=callback;
this.callback = callback;
var bg: egret.Shape = new egret.Shape();
bg.graphics.beginFill(0x000000, 0.7);
bg.graphics.drawRect(0, 0, 750, 1624);
......@@ -60,26 +65,26 @@ export class GuideCon extends egret.DisplayObjectContainer {
this.addChild(bg);
var board = new egret.Bitmap(RES.getRes("lionMsgBg_png"))
board.x = 30;
board.y = 620;
board.x = 143;
board.y = 737;
board.touchEnabled = true;
board.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
if (this.couldOver) {
if(this.couldOver) {
clearTimeout(this.timeoutId);
this.couldOver = false;
this.goNext();
}
}, this)
this.addChild(board);
var tri = new egret.Bitmap(RES.getRes("msgTri_png"))
tri.x = 638;
tri.y = 804;
tri.visible = false;
this.tri = tri;
this.addChild(tri);
// var tri = new egret.Bitmap(RES.getRes("msgTri_png"))
// tri.x = 638;
// tri.y = 804;
// tri.visible = false;
// this.tri = tri;
// this.addChild(tri);
this.showWord = new ShowWord();
this.showWord.x = 315;
this.showWord.y = 742;
this.showWord.x = 165;
this.showWord.y = 818;
this.addChild(this.showWord);
this.groups = [];
......@@ -111,8 +116,8 @@ export class GuideCon extends egret.DisplayObjectContainer {
var gg = new egret.DisplayObjectContainer();
gg.addChild(new egret.Bitmap(RES.getRes("道具_png")));
var recordBtn = new egret.Bitmap(RES.getRes("recordbtn_png"));
recordBtn.x = 620.14-615.08;
recordBtn.y = 255.91-128.01;
recordBtn.x = 620.14 - 615.08;
recordBtn.y = 255.91 - 128.01;
gg.addChild(recordBtn);
this.addChild(gg);
this.groups.push(gg);
......@@ -125,38 +130,62 @@ export class GuideCon extends egret.DisplayObjectContainer {
guideOver.y = 1024;
guideOver.touchEnabled = true;
guideOver.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
if (this.parent) this.parent.removeChild(this);
if(this.parent) this.parent.removeChild(this);
clearTimeout(this.timeoutId);
writeCache();
if(this.callback)this.callback();
if(this.callback) this.callback();
}, this)
this.addChild(guideOver);
//箭头
if (!arrow) {
arrow = new window["SVGA"].EgretMovieClip();
arrow["lockStep"] = true;
this.addChild(arrow);
parser.load(resPath + 'resource/assets/svgas/' + 'guideArrow.svga', (videoItem) => {
arrow["init"](videoItem)
}, function (error) {
// alert(error.message);
})
} else {
// if(!arrow) {
// arrow = new window["SVGA"].EgretMovieClip();
// arrow["lockStep"] = true;
// this.addChild(arrow);
// parser.load(resPath + 'resource/assets/svgas/' + 'guideArrow.svga', (videoItem) => {
// arrow["init"](videoItem)
// }, function(error) {
// // alert(error.message);
// })
// } else {
// this.addChild(arrow);
// }
if(!arrow) {
arrow = new eui.Group();
let arrowImg = new egret.Bitmap(RES.getRes("arrow_png"));
arrow.addChild(arrowImg);
this.addChild(arrow);
egret.Tween.get(arrowImg, {loop: true})
.set({x: 0, y: 0})
.to({x: 0, y: -40}, 350, egret.Ease.quadInOut)
.to({x: 0, y: 0}, 350, egret.Ease.quadInOut);
// this.groups.push(arrowImg);
}
//先都隐藏
for (var i = 0; i < this.groups.length; i++) {
for(var i = 0; i < this.groups.length; i++) {
this.groups[i].visible = false;
}
}
// positions: number[][] = [
// [338, 310, 180],
// [530, 310, 180],
// [369, 380, 0],
// [743, 310, 180],
// [440, 350, -90],
// ];
positions: number[][] = [
[338, 310, 180],
[530, 310, 180],
[369, 380, 0],
[743, 310, 180],
[283, 190, 180],
[473, 190, 180],
[445, 500, 0],
[675, 190, 180],
[440, 350, -90],
];
words: string[] = [
......@@ -166,9 +195,10 @@ export class GuideCon extends egret.DisplayObjectContainer {
"每个关卡收集的星星可用于\n开启宝箱，宝箱里还有更多\n无敌券、品牌券在等你！",
"进入道具商城去兑换道具为\n游戏加分吧~获得的奖励可\n在“我的奖励”中查看哦"
];
/**
* 1开始
* @param step
* @param step
*/
public play(step: number) {
this.curStep = step;
......@@ -182,11 +212,11 @@ export class GuideCon extends egret.DisplayObjectContainer {
this.showWord.play(this.words[step - 1], () => {
this.couldOver = true;
this.tri.visible = true;
egret.Tween.get(this.tri, { loop: true }, null, true)
.set({ y: 804 })
.to({ y: 814 }, 300)
.to({ y: 804 }, 300)
// this.tri.visible = true;
// egret.Tween.get(this.tri, { loop: true }, null, true)
// .set({ y: 804 })
// .to({ y: 814 }, 300)
// .to({ y: 804 }, 300)
this.timeoutId = setTimeout(() => {
clearTimeout(this.timeoutId);
this.couldOver = false;
......@@ -197,8 +227,8 @@ export class GuideCon extends egret.DisplayObjectContainer {
private toggleVisible(step: number) {
for (var i = 0; i < this.groups.length; i++) {
if (i + 1 == step) {
for(var i = 0; i < this.groups.length; i++) {
if(i + 1 == step) {
this.groups[i].visible = true;
} else {
this.groups[i].visible = false
......@@ -208,15 +238,15 @@ export class GuideCon extends egret.DisplayObjectContainer {
private goNext() {
this.curStep++;
if (this.curStep > this.steps) {
if (this.parent) this.parent.removeChild(this);
if(this.curStep > this.steps) {
if(this.parent) this.parent.removeChild(this);
writeCache();
if(this.callback)this.callback();
if(this.callback) this.callback();
} else {
this.play(this.curStep);
//隐藏三角形
this.tri.visible = false;
egret.Tween.removeTweens(this.tri)
// this.tri.visible = false;
// egret.Tween.removeTweens(this.tri)
}
}
......
egret/src/mapScene/MapScene.ts
View file @ 38fa88e1
......@@ -809,23 +809,25 @@ export default class MapScene extends Scene {
}
loadsvga(res) {
if (MapScene['svga']) {
const mv = MapScene['svga']
mv.gotoAndStop(1);
res.data.svga = mv;
PanelCtrl.instance.show('invite', res.data);
return;
}
Loading.instace.show();
loadSvga(getResPath() + 'resource/assets/svgas/invite.svga').then(async (mv: any) => {
console.log('svga', mv)
MapScene['svga'] = mv;
await wait(200);
Loading.instace.hide();
mv.gotoAndStop(1);
res.data.svga = mv;
PanelCtrl.instance.show('invite', res.data);
})
PanelCtrl.instance.show('invite', res.data);
// if (MapScene['svga']) {
// const mv = MapScene['svga']
// mv.gotoAndStop(1);
// res.data.svga = mv;
// PanelCtrl.instance.show('invite', res.data);
// return;
// }
// Loading.instace.show();
// loadSvga(getResPath() + 'resource/assets/svgas/invite.svga').then(async (mv: any) => {
// console.log('svga', mv)
// MapScene['svga'] = mv;
// await wait(200);
// Loading.instace.hide();
// mv.gotoAndStop(1);
// res.data.svga = mv;
// PanelCtrl.instance.show('invite', res.data);
// })
}
//1234变化的情况
updateIconLayout() {
......
egret/src/panels/InviteCutTimePanel.ts
View file @ 38fa88e1
......@@ -69,7 +69,7 @@ export default class InviteCutTimePanel extends Panel {
this.timer.addEventListener(egret.TimerEvent.TIMER, this.cutTimer, this);
this.timer.start();
this.cutTimer();
addAdComp(84, 726.33, this,38);
addAdComp(84, 695, this,38);
}
private cutTimer() {
......@@ -80,7 +80,7 @@ export default class InviteCutTimePanel extends Panel {
this.timer.stop();
this.hidePanel();
}
this.cutTimeLabel.text = `${timer.hour}:${timer.min}:${timer.sec}`;
this.cutTimeLabel.text = `${timer.hour}时${timer.min}分${timer.sec}`;
}
private convertTime(time: number) {
......
egret/src/panels/InvitePanel.ts
View file @ 38fa88e1
......@@ -5,7 +5,7 @@ import { NetManager } from "../../libs/tw/manager/NetManager";
import { iswx } from "../iswx";
import Utils from "../Utils";
import InviteRulePanel from "./InviteRulePanel";
import wait from "../../libs/new_tc/wait";
// import wait from "../../libs/new_tc/wait";
import { getlogItem } from "../Main";
import { showShareCodePanel, CodeChannels } from "./ShareCodePanel";
......@@ -30,17 +30,17 @@ export default class InvitePanel extends Panel {
async start(data) {
super.start();
this.showlog();
this['light1'].visible = this['light2'].visible = false;
this['con'].addChild(this.data.svga);
this.data.svga.gotoAndPlay(1, true);
this.data.svga.once(egret.Event.COMPLETE, () => {
this.data.svga.stop(1);
}, this);
setTimeout(() => {
this.playBgAni();
}, 500);
// this['light1'].visible = this['light2'].visible = false;
// this['con'].addChild(this.data.svga);
// this.data.svga.gotoAndPlay(1, true);
// this.data.svga.once(egret.Event.COMPLETE, () => {
// this.data.svga.stop(1);
// }, this);
//
// setTimeout(() => {
// this.playBgAni();
// }, 500);
// wait(500).then(()=>{
// loadSvga2(
// ,
......@@ -51,12 +51,12 @@ export default class InvitePanel extends Panel {
}
playBgAni() {
this['light1'].visible = this['light2'].visible = true;
const time = 7000;
egret.Tween.get(this['light1'], { loop: true }).to({ rotation: 360 }, time);
egret.Tween.get(this['light2'], { loop: true }).to({ rotation: -360 }, time);
}
// playBgAni() {
// this['light1'].visible = this['light2'].visible = true;
// const time = 7000;
// egret.Tween.get(this['light1'], { loop: true }).to({ rotation: 360 }, time);
// egret.Tween.get(this['light2'], { loop: true }).to({ rotation: -360 }, time);
// }
showlog() {
// NetManager.ins.showLog(getlogItem(3));
......
egret/src/panels/InvitePrizePanel.ts
View file @ 38fa88e1
......@@ -66,7 +66,7 @@ export default class InvitePrizePanel extends Panel {
initUI() {
this.prizeImg.source = this.data.prizeImg;
addAdComp(84, 845.33, this,38);
addAdComp(84, 910, this,38);
}
protected get closeBtns(): eui.Button[] {
......
egret/src/something/uis/ShowWord.ts
View file @ 38fa88e1
......@@ -6,9 +6,9 @@ export class ShowWord extends egret.DisplayObjectContainer {
constructor() {
super();
this.showText = new egret.TextField();
this.showText.size = 28;
this.showText.textColor = 0x000000;
this.showText.width = 410;
this.showText.size = 24;
this.showText.textColor = 0xc17343;
this.showText.width = 380;
this.showText.textAlign = egret.HorizontalAlign.LEFT;
this.showText.lineSpacing = 10;
this.addChild(this.showText);
......
mock/happyclear/home.json
View file @ 38fa88e1
This diff is collapsed.
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