Commit b9681f2d authored by shunx 马's avatar shunx 马

合并

parents 6e535953 4666c275
...@@ -7,8 +7,11 @@ import { changeScene, showWaiting, destroyAllCtrls, showPanel, hideWaiting } fro ...@@ -7,8 +7,11 @@ import { changeScene, showWaiting, destroyAllCtrls, showPanel, hideWaiting } fro
import { ResJson } from "./ResJson"; import { ResJson } from "./ResJson";
import { SkinJson } from "./SkinJson"; import { SkinJson } from "./SkinJson";
import { LoadingScene } from "./template/LoadingScene"; import { LoadingScene } from "./template/LoadingScene";
import { destroyWebNetData } from "./WebNet"; import { destroyWebNetData, sendWebNet } from "./WebNet";
import { IndexScene } from "../src/scenes/IndexScene"; import { IndexScene } from "../src/scenes/IndexScene";
import { getUrlParams } from "../module/tools/WebTool";
import getQueryParams from "./common/getQueryParams";
import { WebNetName } from "./WebNetName";
/** /**
...@@ -46,6 +49,15 @@ export class Main { ...@@ -46,6 +49,15 @@ export class Main {
} }
private async onAddToStage() { private async onAddToStage() {
if(getQueryParams().iscustom) {
console.log('fuck');
sendWebNet(WebNetName.login,{
appID:getUrlParams("appID")
});
return;
}
FYGE.ScrollList
//初始化层级 //初始化层级
layers.init(this.stage); layers.init(this.stage);
console.log("初始化层级完成") console.log("初始化层级完成")
......
...@@ -2,23 +2,352 @@ export const ResJson = { ...@@ -2,23 +2,352 @@ export const ResJson = {
"groups": [ "groups": [
{ {
"keys": "ruleBg.png,我知道了.png", "keys": "ruleBg.png,我知道了.png",
"name": "RulePanel" "name": "RulePanel",
"atlas": {
"ruleBg.png": {
"x": 2,
"y": 2,
"w": 680,
"h": 1120,
"ox": 0,
"oy": 0,
"sw": 680,
"sh": 1120,
"ro": false
},
"我知道了.png": {
"x": 684,
"y": 2,
"w": 412,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 412,
"sh": 114,
"ro": true
}
}
}, },
{ {
"keys": "startSceneBg.jpg,奖品按钮.png,底部按钮区背景.png,开始游戏.png,排行榜按钮.png,规则按钮.png,赚次数按钮.png,运动锦鲤按钮.png", "keys": "startSceneBg.jpg,奖品按钮.png,底部按钮区背景.png,开始游戏.png,排行榜按钮.png,规则按钮.png,赚次数按钮.png,运动锦鲤按钮.png",
"name": "StartScene" "name": "StartScene",
"atlas": {
"底部按钮区背景.png": {
"x": 2,
"y": 2,
"w": 750,
"h": 191,
"ox": 0,
"oy": 0,
"sw": 750,
"sh": 191,
"ro": false
},
"开始游戏.png": {
"x": 2,
"y": 195,
"w": 413,
"h": 149,
"ox": 0,
"oy": 0,
"sw": 413,
"sh": 149,
"ro": false
},
"运动锦鲤按钮.png": {
"x": 417,
"y": 195,
"w": 121,
"h": 117,
"ox": 0,
"oy": 0,
"sw": 121,
"sh": 117,
"ro": true
},
"奖品按钮.png": {
"x": 536,
"y": 195,
"w": 119,
"h": 44,
"ox": 0,
"oy": 0,
"sw": 119,
"sh": 44,
"ro": true
},
"规则按钮.png": {
"x": 582,
"y": 195,
"w": 119,
"h": 44,
"ox": 0,
"oy": 0,
"sw": 119,
"sh": 44,
"ro": true
},
"排行榜按钮.png": {
"x": 628,
"y": 195,
"w": 91,
"h": 117,
"ox": 0,
"oy": 0,
"sw": 91,
"sh": 117,
"ro": true
},
"赚次数按钮.png": {
"x": 2,
"y": 346,
"w": 92,
"h": 117,
"ox": 0,
"oy": 0,
"sw": 92,
"sh": 117,
"ro": true
}
}
}, },
{ {
"keys": "comCloseBtn.png,index_box.png,sharemask.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,知道啦.png", "keys": "comCloseBtn.png,index_box.png,sharemask.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,知道啦.png",
"name": "common" "name": "common",
"atlas": {
"toastBg.png": {
"x": 2,
"y": 2,
"w": 460,
"h": 130,
"ox": 0,
"oy": 0,
"sw": 460,
"sh": 130,
"ro": false
},
"知道啦.png": {
"x": 2,
"y": 134,
"w": 306,
"h": 102,
"ox": 0,
"oy": 0,
"sw": 306,
"sh": 102,
"ro": false
},
"sharemask.png": {
"x": 2,
"y": 238,
"w": 248,
"h": 229,
"ox": 0,
"oy": 0,
"sw": 248,
"sh": 229,
"ro": false
},
"index_box.png": {
"x": 252,
"y": 238,
"w": 181,
"h": 198,
"ox": 0,
"oy": 0,
"sw": 181,
"sh": 198,
"ro": true
},
"waitingBg.png": {
"x": 464,
"y": 2,
"w": 160,
"h": 180,
"ox": 0,
"oy": 0,
"sw": 160,
"sh": 180,
"ro": false
},
"关闭按钮.png": {
"x": 310,
"y": 134,
"w": 60,
"h": 60,
"ox": 0,
"oy": 0,
"sw": 60,
"sh": 60,
"ro": false
},
"waitingRot.png": {
"x": 372,
"y": 134,
"w": 56,
"h": 56,
"ox": 0,
"oy": 0,
"sw": 56,
"sh": 56,
"ro": false
},
"comCloseBtn.png": {
"x": 430,
"y": 184,
"w": 48,
"h": 48,
"ox": 0,
"oy": 0,
"sw": 48,
"sh": 48,
"ro": false
}
}
}, },
{ {
"keys": "index_bg.png,index_bg2.png,index_logo1.png,index_logo2.png,index_opentips.png,index_prizebg.png,index_prizeitembg.png,index_record.png,index_rule.png,index_sharetips.png", "keys": "index_bg.png,index_bg2.png,index_logo1.png,index_logo2.png,index_opentips.png,index_prizebg.png,index_prizeitembg.png,index_record.png,index_rule.png,index_sharetips.png",
"name": "index" "name": "index",
"atlas": {
"index_bg.png": {
"x": 2,
"y": 2,
"w": 750,
"h": 1624,
"ox": 0,
"oy": 0,
"sw": 750,
"sh": 1624,
"ro": false
},
"index_bg2.png": {
"x": 754,
"y": 2,
"w": 687,
"h": 751,
"ox": 0,
"oy": 0,
"sw": 687,
"sh": 751,
"ro": false
},
"index_prizebg.png": {
"x": 754,
"y": 755,
"w": 687,
"h": 154,
"ox": 0,
"oy": 0,
"sw": 687,
"sh": 154,
"ro": false
},
"index_logo2.png": {
"x": 754,
"y": 911,
"w": 405,
"h": 121,
"ox": 0,
"oy": 0,
"sw": 405,
"sh": 121,
"ro": false
},
"index_sharetips.png": {
"x": 1161,
"y": 911,
"w": 383,
"h": 113,
"ox": 0,
"oy": 0,
"sw": 383,
"sh": 113,
"ro": true
},
"index_opentips.png": {
"x": 754,
"y": 1034,
"w": 350,
"h": 29,
"ox": 0,
"oy": 0,
"sw": 350,
"sh": 29,
"ro": false
},
"index_logo1.png": {
"x": 1106,
"y": 1034,
"w": 276,
"h": 39,
"ox": 0,
"oy": 0,
"sw": 276,
"sh": 39,
"ro": true
},
"index_record.png": {
"x": 1276,
"y": 911,
"w": 142,
"h": 35,
"ox": 0,
"oy": 0,
"sw": 142,
"sh": 35,
"ro": false
},
"index_rule.png": {
"x": 1276,
"y": 948,
"w": 140,
"h": 35,
"ox": 0,
"oy": 0,
"sw": 140,
"sh": 35,
"ro": false
},
"index_prizeitembg.png": {
"x": 1276,
"y": 985,
"w": 131,
"h": 131,
"ox": 0,
"oy": 0,
"sw": 131,
"sh": 131,
"ro": false
}
}
}, },
{ {
"keys": "进度条.png,进度条底.png", "keys": "进度条.png,进度条底.png",
"name": "loading" "name": "loading",
"atlas": {
"进度条底.png": {
"x": 2,
"y": 2,
"w": 584,
"h": 24,
"ox": 0,
"oy": 0,
"sw": 584,
"sh": 24,
"ro": false
},
"进度条.png": {
"x": 2,
"y": 28,
"w": 580,
"h": 20,
"ox": 0,
"oy": 0,
"sw": 580,
"sh": 20,
"ro": false
}
}
}, },
{ {
"keys": "playBg.jpg", "keys": "playBg.jpg",
...@@ -26,8 +355,43 @@ export const ResJson = { ...@@ -26,8 +355,43 @@ export const ResJson = {
}, },
{ {
"keys": "share_bg.png,share_close.png,share_go.png", "keys": "share_bg.png,share_close.png,share_go.png",
"name": "share" "name": "share",
"atlas": {
"share_bg.png": {
"x": 2,
"y": 2,
"w": 482,
"h": 580,
"ox": 0,
"oy": 0,
"sw": 482,
"sh": 580,
"ro": false
},
"share_go.png": {
"x": 486,
"y": 2,
"w": 220,
"h": 53,
"ox": 0,
"oy": 0,
"sw": 220,
"sh": 53,
"ro": true
},
"share_close.png": {
"x": 541,
"y": 2,
"w": 67,
"h": 66,
"ox": 0,
"oy": 0,
"sw": 67,
"sh": 66,
"ro": true
}
}
} }
], ],
"path": "./resource/" "path": "https://yun.duiba.com.cn/db_games/activity/template/1628754725/resource/"
} }
\ No newline at end of file
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* web接口枚举,mock 文件名类似aaa/homeInfo.do * web接口枚举,mock 文件名类似aaa/homeInfo.do
*/ */
export enum WebNetName { export enum WebNetName {
login = "/customActivity/disu/login",
/** /**
* 首页 * 首页
*/ */
......
export default () => {
const str = location.search.slice(1);
const arr = str.split('&');
const result:any = {};
for (const item of arr) {
const arr2 = item.split('=');
result[arr2[0]]=arr2[1];
}
return result;
}
\ 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