Skip to content

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

我也没想到当年没提交

parent 23da194b
Show whitespace changes
Inline Side-by-side
Showing with 471 additions and 558 deletions
.history/egret/libs/tl/MainBase_20191212165354.ts deleted 100644 → 0
View file @ 23da194b
import { INetData } from '../tc/interface/INetData';
import { ABNetManager } from '../tc/manager/ABNetManager';
import { GDispatcher } from '../../libs/tc/util/GDispatcher';
import { ModuleTypes } from './../../src/types/sceneTypes';
import PanelCtrl from "../../src/ctrls/panelCtrl";
import SceneCtrl from "../../src/ctrls/sceneCtrl";
import Waiting from "../../src/waiting/Waiting";
import { getResPath } from "../../src/utils";
import layers from "../../src/views/layers";
import { DataManager } from "../tw/manager/DataManager";
import { NetManager } from "../tw/manager/NetManager";
import AssetAdapter from "./adapter/AssetAdapter";
import ThemeAdapter from "./adapter/ThemeAdapter";
import { check_webp_feature } from "../tc/util/GFun";
import MovieClipCtrl from "../../src/ctrls/MovieClipCtrl";
import ToastCtrl from '../../src/ctrls/toastCtrl';
export default class MainBase extends eui.UILayer {
constructor() {
super();
check_webp_feature();
this.initStateText();
Waiting.instance.loadImage();
this.GDispatchEvent();
}
// 设置派发事件
protected GDispatchEvent() {
GDispatcher.addEvent(ABNetManager.ERROR, (net: INetData, msg = '') => {
const msgData = {
net: net,
msg: msg,
// sureBtnTxt: TlLang.lang_011
};
PanelCtrl.instance.show(ModuleTypes.MSG_PANEL, msgData)
}, this);
// 监听当预加载资源加载完毕
GDispatcher.addEvent('PreloadLoaded', () => {
// this.createGameScene()
Waiting.instance.show()
}, this);
GDispatcher.addEvent('NormalLoaded', () => {
Waiting.instance.hide();
this.createGameScene()
}, this);
}
private injectRES() {
if (RES.fileSystem['getFileOld']) return;
RES.fileSystem['getFileOld'] = RES.fileSystem.getFile;
window['RES'].fileSystem.getFile = function (filename: string) {
//生效情况
//RES.getResByUrl spritesheet类型
//不生效
//RES.getResAsync('net_png') spritesheet类型
// if (filename.indexOf('.json') != -1) {
// var arr = filename.split('.json')[0].split('/');
// var filename1 = arr[arr.length - 1] + '_png';
// var filename2 = filename.split('.json')[0] + '.png';
// if (!RES.fileSystem['fsData'][filename1])
// RES.fileSystem['fsData'][filename1] =
// { name: filename1, type: 'image', url: filename2, root: '', extra: '1' };
// }
var result = RES.fileSystem['getFileOld'](filename);
if (result && result.url && check_webp_feature()) {
//生效情况
//RES.getResByUrl jpg or png类型
//RES.getResAsync('monkey_png')
if (filename.indexOf('png') != -1 || filename.indexOf('jpg') != -1)
result = JSON.parse(JSON.stringify(result));
// result.url = result.url.replace('.png', '.png?x-oss-process=image/format,webp');
result.url = result.url.replace('.jpg', '.jpg?x-oss-process=image/format,webp');
}
return result;
}
}
protected loadBg(name, callback?) {
const onImageLoaded = (e: egret.Event) => {
const imageLoader: egret.ImageLoader = e.currentTarget;
const bitmapData: egret.BitmapData = imageLoader.data;
const texture = new egret.Texture();
texture._setBitmapData(bitmapData);
const bitmap = new egret.Bitmap(texture);
if (callback) {
callback(bitmap);
}
}
const imageLoader = new egret.ImageLoader();
imageLoader.once(egret.Event.COMPLETE, onImageLoaded, this);
const url = getResPath() + `resource/assets/${name}`;
// url = getImgURL(url);
imageLoader.load(url);
}
protected createChildren(): void {
super.createChildren();
egret.lifecycle.addLifecycleListener((context) => {
// custom lifecycle plugin
})
egret.lifecycle.onPause = () => {
// egret.ticker.pause();
// console.log("我跳出去了 我暂停了")
}
egret.lifecycle.onResume = () => {
// egret.ticker.resume();
}
//inject the custom material parser
//注入自定义的素材解析器
let assetAdapter = new AssetAdapter();
egret.registerImplementation("eui.IAssetAdapter", assetAdapter);
egret.registerImplementation("eui.IThemeAdapter", new ThemeAdapter());
egret.ImageLoader.crossOrigin = "anonymous";
DataManager.ins.customCfgData = window['CFG'];
// DataManager.ins.gameCfgData = window['CFG'];
// DataManager.ins.gameCfgData.gameInfo.gameId = window["gameId"];
setTimeout(() => {
console.log('stageHeight', this.stage.stageHeight);
console.log('height', this.stage.height);
}, 2000);
// 层级初始化
layers.init(this);
Waiting.init(layers.topLayer);
ToastCtrl.instance.init(layers.toastLayer);
PanelCtrl.instance.init(layers.popupLayer);
SceneCtrl.instance.init(layers.sceneLayer);
// 固定宽
this.stage.scaleMode = egret.StageScaleMode.FIXED_WIDTH;
this.registerModules();
this.getData();
RES.setMaxLoadingThread(10);
this.runGame().catch(e => {
console.log(e);
})
}
protected getData() { }
protected registerModules() { }
private async runGame() {
await this.loadResource();
await MovieClipCtrl.instance.init();
}
private async loadResource() {
try {
Waiting.instance.show();
RES.addEventListener(RES.ResourceEvent.CONFIG_COMPLETE, this.onConfigComplete, this);
RES.addEventListener(RES.ResourceEvent.CONFIG_LOAD_ERROR,this.onConfigError,this);
console.log("开始加载配置文件");
await RES.loadConfig("default.res.json", getResPath() + "resource/");
await this.loadTheme();
// this.injectRES();
}
catch (e) {
// alert("加载异常,请检查网络后重试~");
// window.location.reload();
console.error(e);
}
}
private loadTheme() {
return new Promise((resolve, reject) => {
// load skin theme configuration file, you can manually modify the file. And replace the default skin.
//加载皮肤主题配置文件,可以手动修改这个文件。替换默认皮肤。
let theme = new eui.Theme("resource/default.thm.json", this.stage);
theme.addEventListener(eui.UIEvent.COMPLETE, () => {
resolve();
}, this);
}).catch(()=>{
// ToastCtrl.instance.show("网络异常，请刷新~");
// alert("网络异常，请刷新~")
// window.location.reload();
})
}
private onConfigError(event: RES.ResourceEvent){
// ToastCtrl.instance.show("活动太火爆了请刷新~");
// alert("活动太火爆了请刷新~");
// window.location.reload();
}
/**
* 配置文件加载完成,开始预加载Preload资源组。
*/
private onConfigComplete(event: RES.ResourceEvent): void {
this.trace("配置文件加载成功");
RES.removeEventListener(RES.ResourceEvent.CONFIG_COMPLETE, this.onConfigComplete, this);
//添加资源组加载完成事件
RES.addEventListener(RES.ResourceEvent.GROUP_COMPLETE, this.onResourceLoadComplete, this);
//添加资源组加载失败事件
RES.addEventListener(RES.ResourceEvent.GROUP_LOAD_ERROR, this.onResourceLoadError, this);
//添加资源加载失败事件
RES.addEventListener(RES.ResourceEvent.ITEM_LOAD_ERROR, this.onResourceItemLoadError, this);
//添加资源组加载进度事件
RES.addEventListener(RES.ResourceEvent.GROUP_PROGRESS, this.onResourceProgress, this);
//开始加载 preload 资源组
this.trace("开始加载Preload组");
RES.loadGroup("Preload");
}
/**
* preload资源组加载完成
*/
protected onResourceLoadComplete(event: RES.ResourceEvent): void {
if (event.groupName == "Preload") {
this.trace("preload组加载完成");
//this.trace("开始加载Normal资源");
GDispatcher.dispatchEvent('PreloadLoaded');
RES.loadGroup("Normal");
} else if (event.groupName == "Normal") {
this.trace("Normal组加载完成");
this.trace("开始加载Delay资源");
GDispatcher.dispatchEvent('NormalLoaded');
RES.loadGroup("BigImage");
} else if (event.groupName == 'BigImage') {
this.trace("BigImage组加载完成");
GDispatcher.dispatchEvent('BigImageLoaded');
RES.loadGroup("Delay");
} else if (event.groupName == 'Delay') {
this.trace("Delay组加载完成");
GDispatcher.dispatchEvent('DelayLoaded');
RES.loadGroup("Map");
} else if (event.groupName == 'Map') {
this.trace("Map组加载完成");
GDispatcher.dispatchEvent('MapLoaded');
RES.loadGroup("Record");
} else if (event.groupName == 'Record') {
this.trace("Record组加载完成");
GDispatcher.dispatchEvent('RecordLoaded');
RES.removeEventListener(RES.ResourceEvent.GROUP_COMPLETE, this.onResourceLoadComplete, this);
RES.removeEventListener(RES.ResourceEvent.GROUP_LOAD_ERROR, this.onResourceLoadError, this);
RES.removeEventListener(RES.ResourceEvent.GROUP_PROGRESS, this.onResourceProgress, this);
}
}
/**
* preload资源组加载进度
*/
protected onResourceProgress(event: RES.ResourceEvent): void {
// if (event.groupName == "Preload") {
// this.trace(`${event.groupName}资源加载进度 : ${event.itemsLoaded} / ${event.itemsTotal}`);
// } else if (event.groupName == "Normal") {
// this.trace(`${event.groupName}资源加载进度 : ${event.itemsLoaded} / ${event.itemsTotal}`);
// } else if (event.groupName == "Delay") {
// this.trace(`${event.groupName}资源加载进度 : ${event.itemsLoaded} / ${event.itemsTotal}`);
// } else if (event.groupName == "BigImage") {
// }
// this.trace(`${event.groupName}资源加载进度 : ${event.itemsLoaded} / ${event.itemsTotal}`);
}
/**
* 资源组加载出错
*/
protected onResourceLoadError(event: RES.ResourceEvent): void {
this.trace(`${event.groupName}组资源加载失败`);
//忽略加载失败的项目
this.onResourceLoadComplete(event);
}
/**
* 资源加载出错
*/
protected onResourceItemLoadError(event: RES.ResourceEvent): void {
this.trace("项目加载失败,url : " + event.resItem.url);
// alert("网络异常,请检查网络后重试~");
// window.location.reload();
}
private stateText: egret.TextField;
private text: string = "";
private initStateText(): void {
this.stateText = new egret.TextField();
this.stateText.size = 22;
this.stateText.text = this.text;
this.stateText.width = 480;
this.addChild(this.stateText);
}
protected trace(msg: any): void {
// this.text = this.text + "\n" + msg;
// this.stateText.text = this.text;
egret.log(msg);
}
/**
* 创建场景界面
* Create scene interface
*/
protected createGameScene() {
// GDispatcher.removeEvent('NormalLoaded',this.createGameScene,this);
console.log('创建开始场景')
}
}
\ No newline at end of file
egret/index.html
View file @ bd22072e
......@@ -59,8 +59,8 @@
// window['pageID'] = 'TransScene';
// window['pageID'] = 'Share2Scene';
window['indexhtml'] = 'https://yazuwei.activity-1.m.duiba.com.cn/projectx/pbe1f2241/index.html'
window['shareLink']='https://yazuwei.activity-1.m.duiba.com.cn/projectx/paa9a1f85/f97a185ad.html';
window['TransLink']='';
window['shareLink'] ='https://yazuwei.activity-1.m.duiba.com.cn/projectx/paa9a1f85/f97a185ad.html';
window['TransLink'] ='';
window['projectId'] = "1";
window['playwayId'] = "join_1";
window["appId"] = "";
......
egret/libs/tl/MainBase.ts
View file @ bd22072e
......@@ -38,11 +38,12 @@ export default class MainBase extends eui.UILayer {
GDispatcher.addEvent('PreloadLoaded', () => {
// this.createGameScene()
Waiting.instance.show()
}, this);
GDispatcher.addEvent('NormalLoaded', () => {
Waiting.instance.hide();
this.createGameScene()
}, this);
// GDispatcher.addEvent('NormalLoaded', () => {
// Waiting.instance.hide();
// this.createGameScene()
// }, this);
}
private injectRES() {
......@@ -241,6 +242,23 @@ export default class MainBase extends eui.UILayer {
} else if (event.groupName == 'Record') {
this.trace("Record组加载完成");
GDispatcher.dispatchEvent('RecordLoaded');
RES.loadGroup("Garbage");
}else if (event.groupName == 'Garbage') {
this.trace("Garbage组加载完成");
GDispatcher.dispatchEvent('GarbageLoaded');
RES.loadGroup("Mapping");
} else if (event.groupName == 'Mapping') {
this.trace("Mapping组加载完成");
GDispatcher.dispatchEvent('MappingLoaded');
RES.loadGroup("Delaying");
} else if (event.groupName == 'Delaying') {
this.trace("Delay组加载完成");
GDispatcher.dispatchEvent('DelayingLoaded');
RES.loadGroup("Garbageing");
} else if (event.groupName == 'Garbageing') {
this.trace("Garbageing组加载完成");
GDispatcher.dispatchEvent('GarbageingLoaded');
RES.removeEventListener(RES.ResourceEvent.GROUP_COMPLETE, this.onResourceLoadComplete, this);
RES.removeEventListener(RES.ResourceEvent.GROUP_LOAD_ERROR, this.onResourceLoadError, this);
RES.removeEventListener(RES.ResourceEvent.GROUP_PROGRESS, this.onResourceProgress, this);
......
egret/publish.js
View file @ bd22072e
......@@ -24,8 +24,8 @@ class TuiaAutoUpload {
var _this = this;
this.client = new OSS({
region: 'oss-cn-hangzhou',
accessKeyId: 'LTAIqO2wblIxQvwc',
accessKeySecret: '4brsaSRbRpjxw3oDIxJi6bNMcndIR6',
accessKeyId: 'LTAI4Fw25WcfcGv7FvcHoiHK',
accessKeySecret: 'NZk1NtT9J5HFaAolNbtQdzTzLLvLYm',
bucket: _this.type === 'prod' ? 'duiba' : 'daily-duiba'
});
this.bar = new ProgressBar(chalk.yellow(` 文件上传中 [:bar] :current/${this.files().length} :percent :elapseds`), {
......
egret/resource/TextureMerger/Delay_3.tmproject deleted 100644 → 0
View file @ 23da194b
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Delay_3","version":5,"files":["..\\assets\\pk\\pkwinlogo.png","..\\assets\\pk\\pkwinlight.png","..\\assets\\pk\\pkwinBtn.png","..\\assets\\pk\\pkwinbg.png","..\\assets\\pk\\pkscorebg.png","..\\assets\\pk\\pkrulebtn.png","..\\assets\\pk\\pkrulebg.png","..\\assets\\pk\\pkprizeBtn.png","..\\assets\\pk\\pkprizebg.png","..\\assets\\pk\\pkpeacelogo.png","..\\assets\\pk\\pkpeacelight.png","..\\assets\\pk\\pkotherline2.png","..\\assets\\pk\\pknoton.png","..\\assets\\pk\\pkmyline2.png","..\\assets\\pk\\pkloselogo.png","..\\assets\\pk\\pkloselight.png","..\\assets\\pk\\pkfinishbg.png","..\\assets\\pk\\pkendbg.png","..\\assets\\pk\\pkcirle.png","..\\assets\\pk\\pkBtn.png","..\\assets\\pk\\pkaskBtn.png","..\\assets\\pk\\pkagainBtn.png","..\\assets\\pk\\pkadd.png","..\\assets\\pk\\head1.png","..\\assets\\pk\\box.png","..\\assets\\pk\\pkscorebg2.png"]}
\ No newline at end of file
egret/resource/TextureMerger/Delay_6.tmproject 0 → 100644
View file @ bd22072e
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Delay_6","version":5,"files":["..\\assets\\pk\\pkwinlogo.png","..\\assets\\pk\\pkwinlight.png","..\\assets\\pk\\pkwinBtn.png","..\\assets\\pk\\pkwinbg.png","..\\assets\\pk\\pkscorebg2.png","..\\assets\\pk\\pkscorebg.png","..\\assets\\pk\\pkrulebtn.png","..\\assets\\pk\\pkrulebg.png","..\\assets\\pk\\pkprizeBtn.png","..\\assets\\pk\\pkprizebg.png","..\\assets\\pk\\pkpeacelogo.png","..\\assets\\pk\\pkpeacelight.png"]}
\ No newline at end of file
egret/resource/TextureMerger/Delaying_5.tmproject 0 → 100644
View file @ bd22072e
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Delaying_5","version":5,"files":["..\\assets\\pk\\pkotherline2.png","..\\assets\\pk\\pknoton.png","..\\assets\\pk\\pkmyline2.png","..\\assets\\pk\\pkloselogo.png","..\\assets\\pk\\pkloselight.png","..\\assets\\pk\\pkfinishbg.png","..\\assets\\pk\\pkendbg.png","..\\assets\\pk\\pkcirle.png","..\\assets\\pk\\pkBtn.png","..\\assets\\pk\\pkaskBtn.png","..\\assets\\pk\\pkagainBtn.png","..\\assets\\pk\\pkadd.png","..\\assets\\pk\\head1.png","..\\assets\\pk\\box.png"]}
\ No newline at end of file
egret/resource/TextureMerger/Garbage_2.tmproject deleted 100644 → 0
View file @ 23da194b
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Garbage_2","version":5,"files":["..\\assets\\xuanshi\\xuanshiBtn.png","..\\assets\\xuanshi\\xsbg.png","..\\assets\\xuanshi\\backstartBtn.png","..\\assets\\waiting\\bg.png","..\\assets\\waiting\\progress.png","..\\assets\\slogan\\slogan_btn.png","..\\assets\\slogan\\slogan_bg.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\\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_7.tmproject 0 → 100644
View file @ bd22072e
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Garbage_7","version":5,"files":["..\\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\\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/Garbageing_8.tmproject 0 → 100644
View file @ bd22072e
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Garbageing_8","version":5,"files":["..\\assets\\slogan\\slogan_btn.png","..\\assets\\slogan\\slogan_bg.png","..\\assets\\waiting\\progress.png","..\\assets\\waiting\\bg.png","..\\assets\\xuanshi\\xuanshiBtn.png","..\\assets\\xuanshi\\xsbg.png","..\\assets\\xuanshi\\oldtipbtn.png","..\\assets\\xuanshi\\oldtipbg.png","..\\assets\\xuanshi\\backstartBtn.png"]}
\ No newline at end of file
egret/resource/TextureMerger/Map_4.tmproject
View file @ bd22072e
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Map_4","version":5,"files":["..\\assets\\map\\mapshareBtn.png","..\\assets\\map\\mappass.png","..\\assets\\map\\mapBtn.png","..\\assets\\map\\mapam.png","..\\assets\\map\\mapcx.png","..\\assets\\map\\maphg.png","..\\assets\\map\\maphz.png","..\\assets\\map\\mapmg.png","..\\assets\\map\\maprb.png","..\\assets\\map\\mapxg.png","..\\assets\\map\\maptb.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Map_4","version":5,"files":["..\\assets\\map\\mapam.png","..\\assets\\map\\mapBtn.png","..\\assets\\map\\mapcx.png","..\\assets\\map\\maphg.png","..\\assets\\map\\maphz.png","..\\assets\\map\\mapmg.png"]}
\ No newline at end of file
egret/resource/TextureMerger/Mapping_3.tmproject 0 → 100644
View file @ bd22072e
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Mapping_3","version":5,"files":["..\\assets\\map\\mapshareBtn.png","..\\assets\\map\\mappass.png","..\\assets\\map\\maprb.png","..\\assets\\map\\mapxg.png","..\\assets\\map\\maptb.png"]}
\ No newline at end of file
egret/resource/TextureMerger/Normal_1.tmproject
View file @ bd22072e
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Normal_1","version":5,"files":["..\\assets\\certificate\\certificate_btn.png","..\\assets\\joinshare\\joinshare_btn.png","..\\assets\\sharestarter\\sharestarter_btn.png","..\\assets\\sharestarter\\sharestarter_sharebtn.png","..\\assets\\share2\\share2mask.png","..\\assets\\share2\\share2btn.png","..\\assets\\confirm\\confirm_btn.png","..\\assets\\confirm\\confirm_bg.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\\teamshare\\teamshare_btn.png","..\\assets\\transferrecord\\transferrecord_bg.png","..\\assets\\transferrecord\\transferrecord_item_bg.png","..\\assets\\common\\关闭按钮 .png","..\\assets\\certificate\\certificate_bg.png","..\\assets\\xuanshi\\xsbg.png","..\\assets\\xuanshi\\xuanshiBtn.png","..\\assets\\xuanshi\\backstartBtn.png","..\\assets\\certificate\\certificate_cover.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\\certificate\\certificate_btn.png","..\\assets\\joinshare\\joinshare_btn.png","..\\assets\\sharestarter\\sharestarter_btn.png","..\\assets\\share2\\share2mask.png","..\\assets\\confirm\\confirm_btn.png","..\\assets\\confirm\\confirm_bg.png","..\\assets\\transfer\\transfer _toast1.png","..\\assets\\teamshare\\teamshare_btn.png","..\\assets\\transferrecord\\transferrecord_bg.png","..\\assets\\transferrecord\\transferrecord_item_bg.png","..\\assets\\common\\关闭按钮 .png","..\\assets\\xuanshi\\backstartBtn.png","..\\assets\\xuanshi\\oldtipbtn.png","..\\assets\\xuanshi\\xsbg.png","..\\assets\\xuanshi\\xuanshiBtn.png","..\\assets\\transfer\\transfer _btn.png","..\\assets\\transfer\\transfer _toast3.png","..\\assets\\transfer\\transfer _toast2.png","..\\assets\\slogan\\slogan_btn.png","..\\assets\\slogan\\slogan_bg.png","..\\assets\\sharestarter\\sharestarter_sharebtn.png","..\\assets\\share2\\share2btn.png","..\\assets\\certificate\\certificate_bg.png","..\\assets\\certificate\\certificate_cover.png","..\\assets\\transfer\\translogo.png","..\\assets\\xuanshi\\oldtipbg.png","..\\assets\\transfer\\transfer _title.png"]}
\ No newline at end of file
egret/resource/TextureMerger/Preload_0.tmproject
View file @ bd22072e
{"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\\closeBtn.png","..\\assets\\startScene\\CHNxianggang.png","..\\assets\\startScene\\CHNtaiwan.png","..\\assets\\startScene\\CHNhangzhou.png","..\\assets\\startScene\\CHNaomen.png","..\\assets\\startScene\\chaoxian.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\\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\\horn.png","..\\assets\\startScene\\hanguo.png","..\\assets\\startScene\\getBtn.png","..\\assets\\startScene\\closeBtn.png","..\\assets\\startScene\\CHNxianggang.png","..\\assets\\startScene\\CHNtaiwan.png","..\\assets\\startScene\\CHNhangzhou.png","..\\assets\\startScene\\CHNaomen.png","..\\assets\\startScene\\chaoxian.png","..\\assets\\startScene\\fireBtn.png","..\\assets\\startScene\\starttitle.png","..\\assets\\startScene\\yyhlogol.png","..\\assets\\startScene\\littletitle.png"]}
\ No newline at end of file
egret/resource/TextureMerger/Record_5.tmproject → egret/resource/TextureMerger/Record_2.tmproject
View file @ bd22072e
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Record_5","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"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"Record_2","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"]}
\ No newline at end of file
egret/resource/assets/map/mapam.png
View replaced file @ 23da194b View file @ bd22072e
egret/resource/assets/map/mapam.png

359 KB | W: | H:

egret/resource/assets/map/mapam.png

389 KB | W: | H:

egret/resource/assets/map/mapam.png
egret/resource/assets/map/mapam.png
egret/resource/assets/map/mapam.png
egret/resource/assets/map/mapam.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/assets/map/mapcx.png
View replaced file @ 23da194b View file @ bd22072e
egret/resource/assets/map/mapcx.png

274 KB | W: | H:

egret/resource/assets/map/mapcx.png

304 KB | W: | H:

egret/resource/assets/map/mapcx.png
egret/resource/assets/map/mapcx.png
egret/resource/assets/map/mapcx.png
egret/resource/assets/map/mapcx.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/assets/map/maphg.png
View replaced file @ 23da194b View file @ bd22072e
egret/resource/assets/map/maphg.png

312 KB | W: | H:

egret/resource/assets/map/maphg.png

342 KB | W: | H:

egret/resource/assets/map/maphg.png
egret/resource/assets/map/maphg.png
egret/resource/assets/map/maphg.png
egret/resource/assets/map/maphg.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/assets/map/maphz.png
View replaced file @ 23da194b View file @ bd22072e
egret/resource/assets/map/maphz.png

178 KB | W: | H:

egret/resource/assets/map/maphz.png

201 KB | W: | H:

egret/resource/assets/map/maphz.png
egret/resource/assets/map/maphz.png
egret/resource/assets/map/maphz.png
egret/resource/assets/map/maphz.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/assets/map/mapmg.png
View replaced file @ 23da194b View file @ bd22072e
egret/resource/assets/map/mapmg.png

233 KB | W: | H:

egret/resource/assets/map/mapmg.png

262 KB | W: | H:

egret/resource/assets/map/mapmg.png
egret/resource/assets/map/mapmg.png
egret/resource/assets/map/mapmg.png
egret/resource/assets/map/mapmg.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/assets/map/maprb.png
View replaced file @ 23da194b View file @ bd22072e
egret/resource/assets/map/maprb.png

346 KB | W: | H:

egret/resource/assets/map/maprb.png

378 KB | W: | H:

egret/resource/assets/map/maprb.png
egret/resource/assets/map/maprb.png
egret/resource/assets/map/maprb.png
egret/resource/assets/map/maprb.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/assets/map/maptb.png
View replaced file @ 23da194b View file @ bd22072e
egret/resource/assets/map/maptb.png

259 KB | W: | H:

egret/resource/assets/map/maptb.png

290 KB | W: | H:

egret/resource/assets/map/maptb.png
egret/resource/assets/map/maptb.png
egret/resource/assets/map/maptb.png
egret/resource/assets/map/maptb.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/assets/map/mapxg.png
View replaced file @ 23da194b View file @ bd22072e
egret/resource/assets/map/mapxg.png

324 KB | W: | H:

egret/resource/assets/map/mapxg.png

355 KB | W: | H:

egret/resource/assets/map/mapxg.png
egret/resource/assets/map/mapxg.png
egret/resource/assets/map/mapxg.png
egret/resource/assets/map/mapxg.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/assets/pop/rankbg.png
View replaced file @ 23da194b View file @ bd22072e
egret/resource/assets/pop/rankbg.png

287 KB | W: | H:

egret/resource/assets/pop/rankbg.png

302 KB | W: | H:

egret/resource/assets/pop/rankbg.png
egret/resource/assets/pop/rankbg.png
egret/resource/assets/pop/rankbg.png
egret/resource/assets/pop/rankbg.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/default.res.json
View file @ bd22072e
{
"groups": [
{
"keys": "yylogo_png,yyhpklogo_png,yyhlogo_png,waitBtn_png,unriben_png,unmenggu_png,unhanguo_png,unCHNxianggang_png,unCHNtaiwan_png,unCHNhangzhou_png,unCHNaomen_png,unchaoxian_png,teamBtn_png,starttitle_png,startBtn_png,startBG_jpg,ruleBtn_png,riben_png,recordBtn_png,rankBtn_png,prizeBtn_png,menggu_png,lockBtn_png,littletitle_png,horn_png,hanguo_png,getBtn_png,fireBtn_png,closeBtn_png,CHNxianggang_png,CHNtaiwan_png,CHNhangzhou_png,CHNaomen_png,chaoxian_png",
"keys": "yylogo_png,yyhpklogo_png,yyhlogo_png,waitBtn_png,unriben_png,unmenggu_png,unhanguo_png,unCHNxianggang_png,unCHNtaiwan_png,unCHNhangzhou_png,unCHNaomen_png,unchaoxian_png,teamBtn_png,startBtn_png,startBG_jpg,ruleBtn_png,riben_png,recordBtn_png,rankBtn_png,prizeBtn_png,menggu_png,lockBtn_png,horn_png,hanguo_png,getBtn_png,closeBtn_png,CHNxianggang_png,CHNtaiwan_png,CHNhangzhou_png,CHNaomen_png,chaoxian_png,fireBtn_png,starttitle_png,yyhlogol_png,littletitle_png",
"name": "Preload"
},
{
"keys": "certificate_btn_png,joinshare_btn_png,sharestarter_bg_jpg,sharestarter_btn_png,sharestarter_sharebtn_png,share2mask_png,share2btn_png,share2bg_jpg,confirm_btn_png,confirm_bg_png,transfer _toast3_png,transfer _toast2_png,transfer _toast1_png,transfer _title_png,transfer _btn_png,trans_bg_jpg,teamshare_btn_png,transferrecord_bg_png,transferrecord_item_bg_png,关闭按钮 _png,teamshare_bg_jpg,certificate_jpg,certificate_bg_png,joinshare_bg_jpg,xsbg_png,xuanshiBtn_png,backstartBtn_png,certificate_cover_png",
"keys": "certificate_btn_png,joinshare_btn_png,sharestarter_bg_jpg,sharestarter_btn_png,share2mask_png,confirm_btn_png,confirm_bg_png,transfer _toast1_png,trans_bg_jpg,teamshare_btn_png,transferrecord_bg_png,transferrecord_item_bg_png,关闭按钮 _png,teamshare_bg_jpg,certificate_jpg,backstartBtn_png,share2bg_jpg,oldtipbtn_png,xsbg_png,xuanshiBtn_png,transfer _btn_png,transfer _toast3_png,transfer _toast2_png,slogan_btn_png,slogan_bg_png,sharestarter_sharebtn_png,share2btn_png,joinshare_bg_jpg,certificate_bg_png,certificate_cover_png,translogo_png,oldtipbg_png,transfer _title_png",
"name": "Normal"
},
{
"keys": "xuanshiBtn_png,xsbg_png,backstartBtn_png,bg_png,progress_png,slogan_btn_png,slogan_bg_png,rulebg_png,rankmybg_png,rankline_png,ranklight_png,rankbg2_png,rankbg_png,lessscoreBtn_png,lessscorebg_png,finishlogo_png,finishlight_png,finishBtn_png,finishbg_png,ydline_png,ydlight2_png,ydlight_png,hand2_png,hand_png",
"name": "Garbage"
"keys": "mrxg_png,mrtitle_png,mrtb_png,mrrb_png,mrmg_png,mrhz_png,mrhg_png,mrcx_png,mram_png,mrbg_jpg,pkBG_jpg",
"name": "Record"
},
{
"keys": "pkwinlogo_png,pkwinlight_png,pkwinBtn_png,pkwinbg_png,pkscorebg_png,pkrulebtn_png,pkrulebg_png,pkprizeBtn_png,pkprizebg_png,pkpeacelogo_png,pkpeacelight_png,pkotherline2_png,pknoton_png,pkmyline2_png,pkloselogo_png,pkloselight_png,pkfinishbg_png,pkendbg_png,pkcirle_png,pkBtn_png,pkaskBtn_png,pkagainBtn_png,pkadd_png,head1_png,box_png,pkscorebg2_png",
"name": "Delay"
"keys": "mapshareBtn_png,mappass_png,maprb_png,mapxg_png,maptb_png",
"name": "Mapping"
},
{
"keys": "mapshareBtn_png,mappass_png,mapBtn_png,mapam_png,mapcx_png,maphg_png,maphz_png,mapmg_png,maprb_png,mapxg_png,maptb_png",
"keys": "mapam_png,mapBtn_png,mapcx_png,maphg_png,maphz_png,mapmg_png",
"name": "Map"
},
{
"keys": "mrxg_png,mrtitle_png,mrtb_png,mrrb_png,mrmg_png,mrhz_png,mrhg_png,mrcx_png,mram_png,mrbg_jpg,pkBG_jpg",
"name": "Record"
"keys": "pkotherline2_png,pknoton_png,pkmyline2_png,pkloselogo_png,pkloselight_png,pkfinishbg_png,pkendbg_png,pkcirle_png,pkBtn_png,pkBG_jpg,pkaskBtn_png,pkagainBtn_png,pkadd_png,head1_png,box_png",
"name": "Delaying"
},
{
"keys": "pkwinlogo_png,pkwinlight_png,pkwinBtn_png,pkwinbg_png,pkscorebg2_png,pkscorebg_png,pkrulebtn_png,pkrulebg_png,pkprizeBtn_png,pkprizebg_png,pkpeacelogo_png,pkpeacelight_png",
"name": "Delay"
},
{
"keys": "rulebg_png,rankmybg_png,rankline_png,ranklight_png,rankbg2_png,rankbg_png,lessscoreBtn_png,lessscorebg_png,finishlogo_png,finishlight_png,finishBtn_png,finishbg_png,ydline_png,ydlight2_png,ydlight_png,hand2_png,hand_png",
"name": "Garbage"
},
{
"keys": "slogan_btn_png,slogan_bg_png,progress_png,bg_png,xuanshiBtn_png,xsbg_png,oldtipbtn_png,oldtipbg_png,backstartBtn_png",
"name": "Garbageing"
}
],
"resources": [
{
"url": "assets/xuanshi/xuanshiBtn.png",
"type": "image",
"name": "xuanshiBtn_png"
},
{
"url": "assets/certificate/certificate_btn.png",
"type": "image",
......@@ -316,16 +323,6 @@
"type": "image",
"name": "rulebg_png"
},
{
"url": "assets/share2/share2bg.jpg",
"type": "image",
"name": "share2bg_jpg"
},
{
"url": "assets/share2/share2btn.png",
"type": "image",
"name": "share2btn_png"
},
{
"url": "assets/share2/share2mask.png",
"type": "image",
......@@ -341,11 +338,6 @@
"type": "image",
"name": "sharestarter_btn_png"
},
{
"url": "assets/sharestarter/sharestarter_sharebtn.png",
"type": "image",
"name": "sharestarter_sharebtn_png"
},
{
"url": "assets/slogan/slogan_bg.png",
"type": "image",
......@@ -386,11 +378,6 @@
"type": "image",
"name": "closeBtn_png"
},
{
"url": "assets/startScene/fireBtn.png",
"type": "image",
"name": "fireBtn_png"
},
{
"url": "assets/startScene/getBtn.png",
"type": "image",
......@@ -406,11 +393,6 @@
"type": "image",
"name": "horn_png"
},
{
"url": "assets/startScene/littletitle.png",
"type": "image",
"name": "littletitle_png"
},
{
"url": "assets/startScene/lockBtn.png",
"type": "image",
......@@ -451,11 +433,6 @@
"type": "image",
"name": "startBtn_png"
},
{
"url": "assets/startScene/starttitle.png",
"type": "image",
"name": "starttitle_png"
},
{
"url": "assets/startScene/teamBtn.png",
"type": "image",
......@@ -526,31 +503,11 @@
"type": "image",
"name": "teamshare_btn_png"
},
{
"url": "assets/transfer/transfer _btn.png",
"type": "image",
"name": "transfer _btn_png"
},
{
"url": "assets/transfer/transfer _title.png",
"type": "image",
"name": "transfer _title_png"
},
{
"url": "assets/transfer/transfer _toast1.png",
"type": "image",
"name": "transfer _toast1_png"
},
{
"url": "assets/transfer/transfer _toast2.png",
"type": "image",
"name": "transfer _toast2_png"
},
{
"url": "assets/transfer/transfer _toast3.png",
"type": "image",
"name": "transfer _toast3_png"
},
{
"url": "assets/transfer/trans_bg.jpg",
"type": "image",
......@@ -586,21 +543,11 @@
"type": "image",
"name": "pkfinishbg_png"
},
{
"url": "assets/xuanshi/xsbg.png",
"type": "image",
"name": "xsbg_png"
},
{
"url": "assets/startScene/startBG.jpg",
"type": "image",
"name": "startBG_jpg"
},
{
"url": "assets/pop/rankbg.png",
"type": "image",
"name": "rankbg_png"
},
{
"url": "assets/pk/pkBG.jpg",
"type": "image",
......@@ -626,20 +573,80 @@
"type": "image",
"name": "certificate_jpg"
},
{
"url": "assets/startScene/fireBtn.png",
"type": "image",
"name": "fireBtn_png"
},
{
"url": "assets/xuanshi/xuanshiBtn.png",
"type": "image",
"name": "xuanshiBtn_png"
},
{
"url": "assets/xuanshi/oldtipbtn.png",
"type": "image",
"name": "oldtipbtn_png"
},
{
"url": "assets/pop/rankbg.png",
"type": "image",
"name": "rankbg_png"
},
{
"url": "assets/xuanshi/xsbg.png",
"type": "image",
"name": "xsbg_png"
},
{
"url": "assets/startScene/yyhlogol.png",
"type": "image",
"name": "yyhlogol_png"
},
{
"url": "assets/sharestarter/sharestarter_sharebtn.png",
"type": "image",
"name": "sharestarter_sharebtn_png"
},
{
"url": "assets/certificate/certificate_bg.png",
"type": "image",
"name": "certificate_bg_png"
},
{
"url": "assets/certificate/certificate_cover.png",
"type": "image",
"name": "certificate_cover_png"
},
{
"url": "assets/transfer/transfer _toast2.png",
"type": "image",
"name": "transfer _toast2_png"
},
{
"url": "assets/transfer/transfer _toast3.png",
"type": "image",
"name": "transfer _toast3_png"
},
{
"url": "assets/joinshare/joinshare_bg.jpg",
"type": "image",
"name": "joinshare_bg_jpg"
},
{
"url": "assets/certificate/certificate_cover.png",
"url": "assets/share2/share2bg.jpg",
"type": "image",
"name": "certificate_cover_png"
"name": "share2bg_jpg"
},
{
"url": "assets/transfer/transfer _btn.png",
"type": "image",
"name": "transfer _btn_png"
},
{
"url": "assets/share2/share2btn.png",
"type": "image",
"name": "share2btn_png"
},
{
"url": "assets/map/mapxg.png",
......@@ -680,6 +687,31 @@
"url": "assets/map/maptb.png",
"type": "image",
"name": "maptb_png"
},
{
"url": "assets/startScene/starttitle.png",
"type": "image",
"name": "starttitle_png"
},
{
"url": "assets/startScene/littletitle.png",
"type": "image",
"name": "littletitle_png"
},
{
"url": "assets/transfer/translogo.png",
"type": "image",
"name": "translogo_png"
},
{
"url": "assets/xuanshi/oldtipbg.png",
"type": "image",
"name": "oldtipbg_png"
},
{
"url": "assets/transfer/transfer _title.png",
"type": "image",
"name": "transfer _title_png"
}
]
}
\ No newline at end of file
egret/resource/default.thm.json
View file @ bd22072e
......@@ -40,7 +40,8 @@
"resource/skins/ui/MusicButtonSkin.exml",
"resource/skins/ui/ProgressBarSkin.exml",
"resource/skins/ui/SliderSkin.exml",
"resource/skins/ui/StartButtonSkin.exml"
"resource/skins/ui/StartButtonSkin.exml",
"resource/skins/OldTipSkin.exml"
],
"path": "resource/default.thm.json"
}
\ No newline at end of file
egret/resource/skins/GuideSkin.exml
View file @ bd22072e
......@@ -12,7 +12,7 @@
<e:Image width="200" height="184" x="543" y="823" source="menggu_png" 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:Label text="通过积累分数解锁每个国家/地区，传递亚运口号" x="0" y="1010" 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"/>
......@@ -20,7 +20,7 @@
<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: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" 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>
......@@ -34,6 +34,6 @@
<e:Image width="200" height="241" x="488" y="52" source="CHNhangzhou_png" scaleX="1" scaleY="1"/>
<e:Image width="484" height="485" x="133" y="122" source="ydlight2_png" scaleX="1" scaleY="1"/>
<e:Label text="恭喜您成为" x="0" y="308" size="40" textColor="0xfefff8" width="750" textAlign="center" scaleX="1" scaleY="1"/>
<e:Label id="numlab" text="第3333线上火炬手" x="0" y="359" size="52" width="750" textAlign="center" scaleX="1" scaleY="1"/>
<e:Label id="numlab" text="第3333亚运口号传递使者" x="0" y="359" size="52" width="750" textAlign="center" scaleX="1" scaleY="1"/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/resource/skins/JoinShareSkin.exml
View file @ bd22072e
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="CertificateSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Group verticalCenter="0">
<e:Image source="joinshare_bg_jpg" scaleX="1" scaleY="1"/>
<e:Image source="joinshare_bg_jpg" scaleX="1" scaleY="1" height="1624"/>
<e:Image id="btn" source="joinshare_btn_png" y="772" horizontalCenter="0" x="192.21" scaleX="1" scaleY="1"/>
<e:Image id="logo" width="474" height="88" y="241" source="starttitle_png" scaleX="1" scaleY="1" horizontalCenter="0"/>
......
egret/resource/skins/NewFile.exml deleted 100644 → 0
View file @ 23da194b
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="NewFile" width="400" height="300" xmlns:e="http://ns.egret.com/eui">
</e:Skin>
\ No newline at end of file
egret/resource/skins/OldTipSkin.exml 0 → 100644
View file @ bd22072e
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="OldTipSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui">
<e:Image y="441" horizontalCenter="0" source="oldtipbg_png"/>
<e:Image id="btn" y="876" source="oldtipbtn_png" x="230"/>
<e:Image id="closeBtn" source="关闭按钮 _png" x="673" y="352"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/PlaceSkin.exml
View file @ bd22072e
......@@ -3,7 +3,7 @@
<e:Group width="714" height="1123" horizontalCenter="15" verticalCenter="-9.5" anchorOffsetY="0">
<e:Group id="printGroup" width="683" height="801" x="0" y="111">
<e:Image id="mapBG" width="683" height="801" x="0" y="0" source="maphz_png" scaleX="1" scaleY="1"/>
<e:Image id="erweiImg" width="123" height="123" x="522" y="590" anchorOffsetX="0" anchorOffsetY="0" scaleX="1" scaleY="1"/>
<e:Image id="erweiImg" width="123" height="123" x="522" y="556" anchorOffsetX="0" anchorOffsetY="0" scaleX="1" scaleY="1"/>
</e:Group>
<e:Image width="308" height="166" x="406" y="81" source="mappass_png" scaleX="1" scaleY="1"/>
......
egret/resource/skins/RankSkin.exml
View file @ bd22072e
......@@ -9,7 +9,7 @@
<e:Image width="513" height="40" x="91" y="743" source="rankmybg_png" scaleX="1" scaleY="1"/>
<e:Label text="排 名" x="131" y="292" size="28" scaleX="1" scaleY="1"/>
<e:Label text="用 户" x="315" y="292" size="28" scaleX="1" scaleY="1"/>
<e:Label text="传递火种" x="477" y="292" size="28" scaleX="1" scaleY="1"/>
<e:Label text="口号传递" x="477" y="292" size="28" scaleX="1" scaleY="1"/>
<e:Component id="myRank" x="91" y="743" skinName="RankItemSkin" scaleX="1" scaleY="1"/>
<e:Scroller id="rankList" width="513" height="379" x="91" y="354" anchorOffsetY="0" scaleX="1" scaleY="1">
<e:Group id="rankGroup" width="100%" height="100%"/>
......
egret/resource/skins/RecordMapSkin.exml
View file @ bd22072e
......@@ -4,7 +4,7 @@
<e:Group id="mapGroup" width="750" height="1115" horizontalCenter="0" verticalCenter="-29.5">
<e:Group id="printGroup" width="683" height="801" y="106" scaleX="1" scaleY="1" horizontalCenter="-0.5">
<e:Image id="mapBG" width="683" height="801" x="0" y="0" source="maphz_png" scaleX="1" scaleY="1"/>
<e:Image id="erweiImg" width="123" height="123" x="522" y="590" anchorOffsetX="0" anchorOffsetY="0" scaleX="1" scaleY="1"/>
<e:Image id="erweiImg" width="123" height="123" x="522" y="556" anchorOffsetX="0" anchorOffsetY="0" scaleX="1" scaleY="1"/>
</e:Group>
<e:Image width="308" height="166" x="439" y="76" source="mappass_png" scaleX="1" scaleY="1"/>
......
egret/resource/skins/Share2Skin.exml
View file @ bd22072e
......@@ -4,7 +4,7 @@
<e:Image source="share2bg_jpg" x="0" y="0"/>
<e:Image id="btn" source="share2btn_png" y="1219" horizontalCenter="0"/>
</e:Group>
<e:Image id="title" source="transfer _title_png" x="54" top="23"/>
<e:Image id="title" source="transfer _title_png" top="23" horizontalCenter="0"/>
<e:Group id="sharemask" x="0" y="0" visible="false">
<e:Rect id="rect" width="750" height="1624" x="0" y="0" fillAlpha="0.7"/>
<e:Image id="cover" source="share2mask_png" x="177" y="73"/>
......
egret/resource/skins/ShareStarterSkin.exml
View file @ bd22072e
......@@ -6,6 +6,7 @@
<e:Image id="matchingTips" source="transfer _toast2_png" horizontalCenter="0" x="139" scaleX="1" scaleY="1" verticalCenter="0" y="10" visible="false"/>
<e:Image id="shareTips" source="transfer _toast3_png" horizontalCenter="0" x="139" scaleX="1" scaleY="1" verticalCenter="0" y="10" visible="false"/>
<e:Image width="90" height="86" x="330" y="226" source="yyhlogo_png"/>
<e:Image width="231" height="56" y="327" horizontalCenter="0" source="yyhlogol_png"/>
</e:Group>
<e:Image id="transbtn" source="sharestarter_btn_png" x="622" y="27"/>
<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="50"/>
......
egret/resource/skins/SloganSkin.exml
View file @ bd22072e
<?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 y="222" horizontalCenter="0" source="xsbg_png"/>
<e:Image id="btn" source="slogan_btn_png" y="636" horizontalCenter="0"/>
<e:Image id="btn" y="636" horizontalCenter="0" source="xuanshiBtn_png"/>
<e:Image id="closeBtn" source="关闭按钮 _png" x="652" y="139"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/StartSkin.exml
View file @ bd22072e
......@@ -3,12 +3,12 @@
<e:Group width="750" height="1169" anchorOffsetY="0" horizontalCenter="0" verticalCenter="-11.5">
<e:Image width="750" height="1624" x="0" y="-216" scaleX="1" scaleY="1" source="startBG_jpg"/>
<e:Group id="logoGroup" width="474" height="268" x="139" y="-2">
<e:Group id="logoGroup" width="474" height="299" x="139" y="-2" anchorOffsetY="0">
<e:Image width="82" height="82" x="195" y="0" scaleX="1" scaleY="1" source="yyhlogo_png"/>
<e:Image width="474" height="88" x="0" y="88" source="starttitle_png" scaleX="1" scaleY="1"/>
<e:Image width="384" height="52" x="45" y="186" source="littletitle_png" scaleX="1" scaleY="1"/>
<e:Image width="23" height="19" x="122" y="250" source="horn_png" scaleX="1" scaleY="1"/>
<e:Label id="peolab" text="总共有100人参与活动" x="152" y="250" size="18" textColor="0xfefeff" scaleX="1" scaleY="1"/>
<e:Image width="514" height="83" y="88" source="starttitle_png" scaleX="1" scaleY="1" horizontalCenter="0"/>
<e:Image width="328" height="72" y="186" source="littletitle_png" scaleX="1" scaleY="1" x="73"/>
<e:Image width="23" height="19" x="122" y="270" source="horn_png" scaleX="1" scaleY="1"/>
<e:Label id="peolab" text="总共有100人参与活动" x="152" y="270" size="18" textColor="0xfefeff" scaleX="1" scaleY="1"/>
</e:Group>
......
egret/resource/skins/TransSkin.exml
View file @ bd22072e
......@@ -5,9 +5,9 @@
<e:Image id="waitTips" source="transfer _toast1_png" horizontalCenter="0" x="129" scaleX="1" scaleY="1" verticalCenter="0" visible="false"/>
<e:Image id="matchingTips" source="transfer _toast2_png" horizontalCenter="0" x="129" scaleX="1" scaleY="1" verticalCenter="0" visible="false"/>
<e:Image id="shareTips" source="transfer _toast3_png" horizontalCenter="0" x="129" scaleX="1" scaleY="1" verticalCenter="0" visible="false"/>
<e:Image id="title" source="transfer _title_png" y="239" x="54"/>
<e:Image id="title" source="transfer _title_png" y="239" horizontalCenter="0"/>
</e:Group>
<e:Image id="btn" source="transfer _btn_png" x="179" bottom="93"/>
<e:Image id="btn" x="179" bottom="93" source="share2btn_png"/>
<e:Group id="sharemask" x="0" y="0" visible="false">
<e:Rect id="rect1" width="750" height="1624" x="0" y="0" fillAlpha="0.7"/>
<e:Image id="cover1" source="share2mask_png" x="177" y="73"/>
......
egret/src/GameConst.ts
View file @ bd22072e
......@@ -10,6 +10,8 @@ export default class GameConst {
// 用于控制全局音乐是否播放和音乐按钮状态
public static isPlayMusic: boolean = true;
public static isNew:boolean = true;
// 数组类方法
public static arr = {
/**
......
egret/src/Main.ts
View file @ bd22072e
......@@ -51,6 +51,7 @@ import { loadSvgaRes } from './loadSvga';
import { getResPath } from './utils';
import { GCache } from '../libs/tc/util/GCache';
import { GFun } from '../libs/tc/util/GFun';
import OldTipPanel from './yazuwei/OldTipPanel';
class Main extends MainBase {
protected registerModules() {
......@@ -95,7 +96,7 @@ class Main extends MainBase {
PanelCtrl.instance.registerClass(ModuleTypes.PKSCORE_PANEL, PKScorePanel);
PanelCtrl.instance.registerClass(ModuleTypes.FINISH_PANEL, FinishPanel);
PanelCtrl.instance.registerClass(ModuleTypes.RANK_PANEL, RankPanel);
PanelCtrl.instance.registerClass(ModuleTypes.OLDTIP_PANEL,OldTipPanel);
// NetManager.ins.onNotSuccess = (msg) => {
// showAlertPanel(msg)
// }
......@@ -124,7 +125,7 @@ class Main extends MainBase {
//PanelCtrl.instance.show(ModuleTypes.MSG_PANEL, msgData)
}, this);
// 监听当预加载资源加载完毕
GDispatcher.addEvent('NormalLoaded', () => {
GDispatcher.addEvent('PreloadLoaded', () => {
Waiting.instance.show()
this.createGameScene()
// Waiting.instance.hide()
......@@ -166,7 +167,22 @@ class Main extends MainBase {
RES.loadGroup("Record");
} else if (event.groupName == "Record") {
this.trace("Record组加载完成");
GDispatcher.dispatchEvent('RecordLoaded');
this.trace("开始加载Garbageing资源");
GDispatcher.dispatchEvent('GarbageingLoaded');
RES.loadGroup("Garbageing");
}else if (event.groupName == "Garbageing") {
this.trace("Garbageing组加载完成");
this.trace("开始加载Delaying资源");
GDispatcher.dispatchEvent('GarbageingLoaded');
RES.loadGroup("Delaying");
} else if (event.groupName == "Delaying") {
this.trace("Delaying组加载完成");
this.trace("开始加载Mapping资源");
GDispatcher.dispatchEvent('DelayingLoaded');
RES.loadGroup("Mapping");
} else if (event.groupName == "Mapping") {
this.trace("Map组加载完成");
GDispatcher.dispatchEvent('MappingLoaded');
RES.removeEventListener(RES.ResourceEvent.GROUP_COMPLETE, this.onResourceLoadComplete, this);
RES.removeEventListener(RES.ResourceEvent.GROUP_LOAD_ERROR, this.onResourceLoadError, this);
RES.removeEventListener(RES.ResourceEvent.GROUP_PROGRESS, this.onResourceProgress, this);
......@@ -203,8 +219,6 @@ class Main extends MainBase {
// }
// }, window['projectId'])
// }
GCache.writeCache("isGuide",true);
GCache.writeCache("isGuide2",true);
Waiting.instance.hide();
if (window['pageID'] == 'Share2Scene') {
......@@ -261,9 +275,9 @@ class Main extends MainBase {
}
Waiting.instance.hide();
let data = DataManager.ins.getData("homeBaseInfo").data;
if(data.currentLevel == 8){
GCache.writeCache("finishtzw",true);
}
// if(data.currentLevel == 8){
// GCache.writeCache("finishtzw",true);
// }
SceneCtrl.instance.change(ModuleTypes.START_SCENE, data);
}, window['projectId'])
......
egret/src/NetConst.ts
View file @ bd22072e
......@@ -327,7 +327,6 @@ export class yzwNet{
img64:img64
}
const net: INetData = {
name: 'imgUrl',
uri: `/customActivity/duiba/imgUrl`,
......@@ -386,6 +385,28 @@ export class yzwNet{
NetManager.ins.send(net);
}
/**
* 1.19 保存弹窗状态
* @param callback 回调
*/
public static savePopupState(callback, projectId, type){
let param: any = {
type:type
}
const net: INetData = {
name: 'savePopupState',
uri: `/projectx/${projectId}/join_1/savePopupState.do`,
type: 'post',
dataType: 'json',
hideMsg: true,
param:param,
callback: callback
};
NetManager.ins.send(net);
}
}
......
egret/src/startScene/StartScene.ts
View file @ bd22072e
......@@ -145,19 +145,13 @@ export default class StartScene extends Scene {
}else{
this.scorelab.text = "我的分数：0";
}
if(this.level>0){
GCache.writeCache("isGuide",true);
GCache.writeCache("isGuide2",true);
}else{
if(!GCache.readCache("isGuide")){
GCache.writeCache("isGuide",true);
this.openGuide();
}else{
if(!GCache.readCache("isGuide2")){
let data = {type : 2}
PanelCtrl.instance.show(ModuleTypes.GUIDE_PANEL,data);
}
console.log(GameConst.isNew)
if(GameConst.isNew == true){
GameConst.isNew = data.isNewUser;
}
if(GameConst.isNew == true){
this.openGuide();
}
......@@ -193,7 +187,26 @@ export default class StartScene extends Scene {
this.onTap(this.unlockBtn,this.unlockArea);
}
}
if(!GameConst.isNew){
if(data.canPopupRevision){
PanelCtrl.instance.show(ModuleTypes.OLDTIP_PANEL);
yzwNet.savePopupState((s)=>{
if(!s){
ToastCtrl.instance.show("网路异常请重试~")
}
console.log("已点亮")
},window['projectId'],2)
}else{
if(data.canPopupLight){
PanelCtrl.instance.show(ModuleTypes.FINISH_PANEL);
yzwNet.savePopupState((s)=>{
if(!s){
ToastCtrl.instance.show("网路异常请重试~")
}
console.log("已点亮")
},window['projectId'],1)
}else{
//显示PK结果弹窗
if(data.pkResult){
let now = new Date();
......@@ -205,13 +218,10 @@ export default class StartScene extends Scene {
PanelCtrl.instance.show(ModuleTypes.PKSCORE_PANEL,this.startdata);
}
}
if(data.currentLevel == 8){
if(!GCache.readCache("finishtzw")){
GCache.writeCache("finishtzw",true);
PanelCtrl.instance.show(ModuleTypes.FINISH_PANEL);
}
}
}
}
for(let n = 0;n<this.level;n++){
this.onTap(this[this.arr[n]],()=>{
Waiting.instance.show();
......
egret/src/types/sceneTypes.ts
View file @ bd22072e
......@@ -49,5 +49,6 @@ export enum ModuleTypes {
TransInviterScene,
TransScene,
TransRecordPanel,
TOAST
TOAST,
OLDTIP_PANEL
}
\ No newline at end of file
egret/src/yazuwei/FinishPanel.ts
View file @ bd22072e
import Panel from "../views/Panel";
import { DataManager } from "../../libs/tw/manager/DataManager";
import { GCache } from "../../libs/tc/util/GCache";
import PanelCtrl from "../ctrls/panelCtrl";
import { ModuleTypes } from "../types/sceneTypes";
export default class FinishPanel extends Panel{
protected get skinKey(){return 'Finish'}
......@@ -14,7 +18,21 @@ export default class FinishPanel extends Panel{
}
initEvents(){
super.initEvents();
this.onTap(this.closeBtn,()=>{this.hidePanel();})
this.onTap(this.knowBtn,()=>{this.hidePanel();})
this.onTap(this.closeBtn,this.onTap_btn)
this.onTap(this.knowBtn,this.onTap_btn)
}
onTap_btn(){
this.hidePanel()
let data = DataManager.ins.getData("homeBaseInfo").data
if(data.pkResult){
let now = new Date();
let year = now.getFullYear();
let mon = now.getMonth()+1;
let day = now.getDate();
if(!GCache.readCache((year+"/"+mon+"/"+day))){
GCache.writeCache((year+"/"+mon+"/"+day),true)
PanelCtrl.instance.show(ModuleTypes.PKSCORE_PANEL,data);
}
}
}
}
\ No newline at end of file
egret/src/yazuwei/GuidePanel.ts
View file @ bd22072e
......@@ -5,6 +5,7 @@ import PanelCtrl from "../ctrls/panelCtrl";
import { GCache } from "../../libs/tc/util/GCache";
import { DataManager } from "../../libs/tw/manager/DataManager";
import StartScene from "../startScene/StartScene";
import GameConst from "../GameConst";
export default class GuidePanel extends Panel{
......@@ -26,12 +27,14 @@ export default class GuidePanel extends Panel{
public dianran:eui.Group;
public numlab:eui.Label;
data;
constructor(data){
super();
this.once(egret.Event.ADDED_TO_STAGE, () => {
this.height = this.stage.stageHeight;
}, this);
GameConst.isNew = false;
//data.type == 1 第一次进入引导
this.data = data;
if(data.type == 1){
......@@ -93,7 +96,7 @@ export default class GuidePanel extends Panel{
// this.onTap(this.fireBtn,()=>{this.hidePanel()});
// }else{
this.onTap(this,this.backStartScene);
this.onTap(this,this.backStartScene);
// this.onTap(this,this.backStartScene);
// }
}
......@@ -103,7 +106,7 @@ export default class GuidePanel extends Panel{
this.guide3.visible = false;
this.xuanshi.visible = false;
this.dianran.visible = true;
this.numlab.text = "第"+data.startdata+"位线上火炬手"
this.numlab.text = "第"+data.startdata+"位亚运口号传递使者"
this.onTap(this,this.goPlace);
}
backStartScene(){
......
egret/src/yazuwei/OldTipPanel.ts 0 → 100644
View file @ bd22072e
import Panel from "../views/Panel";
import { DataManager } from "../../libs/tw/manager/DataManager";
import PanelCtrl from "../ctrls/panelCtrl";
import { ModuleTypes } from "../types/sceneTypes";
import { yzwNet } from "../NetConst";
import ToastCtrl from "../ctrls/toastCtrl";
import { GCache } from "../../libs/tc/util/GCache";
export default class OldTipPanel extends Panel {
protected get skinKey() { return 'OldTip' }
constructor(data) {
super();
this.initUI();
}
initUI() {
}
initEvents() {
super.initEvents();
this.onTap(this['btn'], this.onTap_btn);
this.onTap(this['closeBtn'], this.onTap_btn);
}
onTap_btn() {
this.onTouchTap();
let data = DataManager.ins.getData("homeBaseInfo").data;
if(data.canPopupLight){
PanelCtrl.instance.show(ModuleTypes.FINISH_PANEL);
yzwNet.savePopupState((s)=>{
if(!s){
ToastCtrl.instance.show("网路异常请重试~")
}
console.log("已点亮")
},window['projectId'],1)
}else{
//显示PK结果弹窗
if(data.pkResult){
let now = new Date();
let year = now.getFullYear();
let mon = now.getMonth()+1;
let day = now.getDate();
if(!GCache.readCache((year+"/"+mon+"/"+day))){
GCache.writeCache((year+"/"+mon+"/"+day),true)
PanelCtrl.instance.show(ModuleTypes.PKSCORE_PANEL,data);
}
}
}
}
}
\ No newline at end of file
egret/src/yazuwei/PlacePanel.ts
View file @ bd22072e
......@@ -66,7 +66,7 @@ export default class PlacePanel extends Panel{
return
}
let sharecode = DataManager.ins.getData('genInvite').data;
let shareurl = window['shareLink'] + '?shareCode=' + sharecode
let shareurl = window['shareLink'] + '&shareCode=' + sharecode
yzwNet.getQrcode((ss)=>{
if(!ss){
if(DataManager.ins.getData("getQrcode") && DataManager.ins.getData("getQrcode").message){
......@@ -93,7 +93,7 @@ export default class PlacePanel extends Panel{
// img['src'] = data;
this.getTexture(data)
},shareurl,124,124)
},shareurl,496,496)
},window['projectId'])
}
......
egret/src/yazuwei/RecordMapScene.ts
View file @ bd22072e
......@@ -109,7 +109,7 @@ export default class RecordMapScene extends Scene{
return
}
let sharecode = DataManager.ins.getData('genInvite').data;
let shareurl = window['shareLink'] + '?shareCode=' + sharecode;
let shareurl = window['shareLink'] + '&shareCode=' + sharecode;
yzwNet.getQrcode((ss)=>{
if(!ss){
if(DataManager.ins.getData("getQrcode") && DataManager.ins.getData("getQrcode").message){
......@@ -135,7 +135,7 @@ export default class RecordMapScene extends Scene{
// img.style.opacity = 1;
// img['src'] = data;
this.getTexture(data)
},shareurl,124,124)
},shareurl,496,496)
},window['projectId'])
}
......
egret/src/yazuwei/Share2Scene.ts
View file @ bd22072e
......@@ -27,7 +27,7 @@ export default class Share2Scene extends Scene {
this['sharemask'].visible = false;
}, this);
}else {
const url = `${window['TransLink']}?shareCode=${GameConst.getQueryString("shareCode")}`
const url = `${window['TransLink']}&shareCode=${GameConst.getQueryString("shareCode")}`
deeplink(url);
}
}
......
egret/src/yazuwei/ShareStarterScene.ts
View file @ bd22072e
......@@ -28,11 +28,18 @@ export default class ShareStarterScene extends Scene {
this._standby = await loadSvga(getResPath() + 'resource/assets/svgas/standby.svga', this['group']) as SVGA.EgretMovieClip;
this._standby.visible = true;
// this._standby.once(egret.Event.COMPLETE,()=>{
this._standby.lockStep = true;
// },this)
this._bg = await loadSvga(getResPath() + 'resource/assets/svgas/bg.svga', this['group']) as SVGA.EgretMovieClip;
this._bg.visible = false;
this._bg.lockStep = true;
this._trans = await loadSvga(getResPath() + 'resource/assets/svgas/trans.svga', this['group']) as SVGA.EgretMovieClip;
this._trans.visible = false;
this._trans.lockStep = true;
this.changeToStandBy();
this['group'].addChild(this['waitTips']);
......@@ -53,11 +60,11 @@ export default class ShareStarterScene extends Scene {
changeToStandBy() {
this._standby.visible = true;
this._trans.visible = false;
this._standby.gotoAndPlay(1, true);
// this._standby.gotoAndPlay(1, true);
}
async changeToTrans() {
this._trans.gotoAndPlay(40, true);
wait(500).then(async () => {
this._bg.gotoAndPlay(1, true);
await wait(100);
......@@ -66,9 +73,17 @@ export default class ShareStarterScene extends Scene {
this._bg.stop();
}, this);
});
await wait(100);
this._standby.visible = false;
await wait(1000);
// this._standby.startAniRange(1,this._standby.totalFrames,1,()=>{
// SceneCtrl.instance.change(ModuleTypes.GAME_SCENE);
this._standby.once(egret.Event.COMPLETE,()=>{
this._trans.gotoAndPlay(1, true);
this._trans.visible = true;
this._standby.visible = false;
this._trans.once(egret.Event.COMPLETE, () => {
console.log('COMPLETE')
this.changeToStandBy();
......@@ -79,6 +94,9 @@ export default class ShareStarterScene extends Scene {
data.from = 'ShareStarterScene';
SceneCtrl.instance.change(ModuleTypes.CertificateScene, data);
}, this);
// })
},this)
}
onTap_sharebtn() {
......@@ -92,10 +110,10 @@ export default class ShareStarterScene extends Scene {
window['AlipayJSBridge'].call(
'esportsShare',
{
title: '参与线上火炬传递，为亚运赋能',
title: '参与杭州亚运口号传递，为亚运赋能',
content: '有机会成为“杭州2022年第19届亚运会火炬手”',
imgUrl: 'https://yun.duiba.com.cn/db_games/activity/yzw_hjcd/share.png',
url: window['shareLink'] + '?shareCode=' + sharecode, type: '3'
imgUrl: 'https://yun.duiba.com.cn/db_games/activity/yzw_hjcd/shareimg.png',
url: window['shareLink'] + '&shareCode=' + sharecode, type: '3'
});
} catch (error) {
......@@ -103,6 +121,8 @@ export default class ShareStarterScene extends Scene {
this['matchingTips'].visible = true;
this._playingAni = true;
NetManager.ins.yyh_pollingAnimationState((success) => {
const data = DataManager.ins.getData('yyh_pollingAnimationState').data;
if (data.state == 3) {//摇一摇
......
egret/src/yazuwei/TransRecordPanel.ts
View file @ bd22072e
......@@ -2,6 +2,7 @@ import Panel from "../views/Panel";
import TransRecordItemRenderer from "./TransRecordItemRenderer";
import { NetManager } from "../../libs/tw/manager/NetManager";
import { DataManager } from "../../libs/tw/manager/DataManager";
import GuidePanel from "./GuidePanel";
export default class TransRecordPanel extends Panel {
......@@ -11,6 +12,9 @@ export default class TransRecordPanel extends Panel {
scrol:eui.Scroller;
constructor(data) {
super();
// GuidePanel.instance.hidePanel();
console.log("引导什么鬼")
console.log(this);
this.initUI();
}
......
egret/src/yazuwei/TransScene.ts
View file @ bd22072e
......@@ -54,10 +54,13 @@ export default class TransScene extends Scene {
}, this);
this._bg = await loadSvga(getResPath() + 'resource/assets/svgas/bg.svga', this['group']) as SVGA.EgretMovieClip;
this._bg.visible = false;
this._bg.lockStep = true;
this._standby = await loadSvga(getResPath() + 'resource/assets/svgas/standby.svga', this['group']) as SVGA.EgretMovieClip;
this._standby.visible = false;
this._standby.lockStep = true;
this._trans = await loadSvga(getResPath() + 'resource/assets/svgas/trans.svga', this['group']) as SVGA.EgretMovieClip;
this._trans.visible = false;
this._trans.lockStep = true;
this.changeToStandBy();
......@@ -82,6 +85,7 @@ export default class TransScene extends Scene {
_shakeTag;
addShareEvent() {
console.log('addShareEvent window.DeviceMotionEvent', window.DeviceMotionEvent);
// this.onshake();
if (window.DeviceMotionEvent) {
var speed = 25;
var x = 0, y = 0, z = 0, lastX = 0, lastY = 0, lastZ = 0;
......@@ -116,8 +120,8 @@ export default class TransScene extends Scene {
}
setRightPhone() {
this._standby.x = -750;
this._trans.x = -750;
this._standby.x = -720;
this._trans.x = -720;
}
changeToStandBy() {
......@@ -127,7 +131,7 @@ export default class TransScene extends Scene {
}
async changeToTrans() {
this._trans.gotoAndPlay(40, true);
wait(500).then(async () => {
this._bg.gotoAndPlay(1, true);
await wait(100);
......@@ -136,7 +140,9 @@ export default class TransScene extends Scene {
this._bg.stop();
}, this);
});
await wait(100);
await wait(1000);
this._standby.once(egret.Event.COMPLETE,()=>{
this._trans.gotoAndPlay(1, true);
this._standby.visible = false;
this._trans.visible = true;
this._trans.once(egret.Event.COMPLETE, () => {
......@@ -157,12 +163,13 @@ export default class TransScene extends Scene {
SceneCtrl.instance.change(ModuleTypes.CertificateScene, data);
}, this);
},this)
}
onTap_btn() {
this['title'].visible = false;
this['title'].source = "translogo_png";
this['btn'].visible = false;
console.log('onTap_btn');
......
mock/config.js
View file @ bd22072e
......@@ -249,9 +249,11 @@ const config = {
},
'/customActivity/qrcode/getQrcode': {
data: './yzw/getQrcode.json'
},
'/projectx/1/join_1/savePopupState.do': {
data: './yzw/savePopupState.json'
}
}
for (let item in config) {
......
mock/yzw/homeBaseInfo.json
View file @ bd22072e
......@@ -33,7 +33,10 @@
]
},
"nextLevelScore":10,
"activityJoinNum":1
"activityJoinNum":1,
"canPopupLight":false,
"isNewUser":false,
"canPopupRevision":true
},
"message":null,
"success":true
......
mock/yzw/savePopupState.json 0 → 100644
View file @ bd22072e
{
"code":null,
"data":null,
"message":null,
"success":true
}
\ 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