Commit 26f44727 authored by wangzhujun's avatar wangzhujun

123

parent d8e876cd
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
"resource/skins/FinishSkin.exml", "resource/skins/FinishSkin.exml",
"resource/skins/RankSkin.exml", "resource/skins/RankSkin.exml",
"resource/skins/RankItemSkin.exml", "resource/skins/RankItemSkin.exml",
"resource/skins/ConfirmSkin.exml", "resource/skins/ConfirmSkin.exml",
"resource/skins/JoinShareSkin.exml", "resource/skins/JoinShareSkin.exml",
"resource/skins/PKScoreSkin.exml", "resource/skins/PKScoreSkin.exml",
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="PKSCoreSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="PKScoreSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16eeaea9839"/> <w:Config id="16eeaea9839"/>
<e:Group width="750" height="1206" horizontalCenter="0" verticalCenter="-209"> <e:Group width="750" height="1206" horizontalCenter="0" verticalCenter="-209">
......
...@@ -122,7 +122,7 @@ class Main extends MainBase { ...@@ -122,7 +122,7 @@ class Main extends MainBase {
//PanelCtrl.instance.show(ModuleTypes.MSG_PANEL, msgData) //PanelCtrl.instance.show(ModuleTypes.MSG_PANEL, msgData)
}, this); }, this);
// 监听当预加载资源加载完毕 // 监听当预加载资源加载完毕
GDispatcher.addEvent('PreloadLoaded', () => { GDispatcher.addEvent('DelayLoaded', () => {
Waiting.instance.show() Waiting.instance.show()
this.createGameScene() this.createGameScene()
// Waiting.instance.hide() // Waiting.instance.hide()
...@@ -171,15 +171,15 @@ class Main extends MainBase { ...@@ -171,15 +171,15 @@ class Main extends MainBase {
// return; // return;
if (window['pageID']) { if (window['pageID']) {
if (GameConst.getQueryString("InviteSource")) { // if (GameConst.getQueryString("InviteSource")) {
yzwNet.homeBaseInfo((s) => { yzwNet.homeBaseInfo((s) => {
if (!s) { if (!s) {
ToastCtrl.instance.show(DataManager.ins.getData("homeBaseInfo").message) ToastCtrl.instance.show(DataManager.ins.getData("homeBaseInfo").message)
// ToastCtrl.instance.show("网络异常请重试~"); // ToastCtrl.instance.show("网络异常请重试~");
return; return;
} }
}, window['projectId'], GameConst.getQueryString("InviteSource")) }, window['projectId'])
} // }
Waiting.instance.hide(); Waiting.instance.hide();
if (window['pageID'] == 'JoinShareScene') { if (window['pageID'] == 'JoinShareScene') {
...@@ -214,20 +214,20 @@ class Main extends MainBase { ...@@ -214,20 +214,20 @@ class Main extends MainBase {
Buried.init(); Buried.init();
// 端内发接口 // 端内发接口
if (GameConst.getQueryString("InviteSource")) { // if (GameConst.getQueryString("InviteSource")) {
yzwNet.homeBaseInfo((s) => { // yzwNet.homeBaseInfo((s) => {
if (!s) { // if (!s) {
ToastCtrl.instance.show(DataManager.ins.getData("homeBaseInfo").message) // ToastCtrl.instance.show(DataManager.ins.getData("homeBaseInfo").message)
// ToastCtrl.instance.show("网络异常请重试~"); // // ToastCtrl.instance.show("网络异常请重试~");
return; // return;
} // }
Waiting.instance.hide(); // Waiting.instance.hide();
let data = DataManager.ins.getData("homeBaseInfo").data; // let data = DataManager.ins.getData("homeBaseInfo").data;
SceneCtrl.instance.change(ModuleTypes.START_SCENE, data); // SceneCtrl.instance.change(ModuleTypes.START_SCENE, data);
}, window['projectId'], GameConst.getQueryString("InviteSource")) // }, window['projectId'], GameConst.getQueryString("InviteSource"))
} else { // } else {
yzwNet.homeBaseInfo((s) => { yzwNet.homeBaseInfo((s) => {
if (!s) { if (!s) {
ToastCtrl.instance.show(DataManager.ins.getData("homeBaseInfo").message) ToastCtrl.instance.show(DataManager.ins.getData("homeBaseInfo").message)
...@@ -239,7 +239,7 @@ class Main extends MainBase { ...@@ -239,7 +239,7 @@ class Main extends MainBase {
SceneCtrl.instance.change(ModuleTypes.START_SCENE, data); SceneCtrl.instance.change(ModuleTypes.START_SCENE, data);
}, window['projectId']) }, window['projectId'])
} // }
......
...@@ -30,7 +30,7 @@ export class yzwNet{ ...@@ -30,7 +30,7 @@ export class yzwNet{
* 1.1首页基础信息 * 1.1首页基础信息
* @param callback 回调 * @param callback 回调
*/ */
public static homeBaseInfo(callback, projectId, InviteSource?){ public static homeBaseInfo(callback, projectId){
const net: INetData = { const net: INetData = {
name: 'homeBaseInfo', name: 'homeBaseInfo',
uri: `/projectx/${projectId}/join_1/homeBaseInfo.do`, uri: `/projectx/${projectId}/join_1/homeBaseInfo.do`,
...@@ -38,7 +38,6 @@ export class yzwNet{ ...@@ -38,7 +38,6 @@ export class yzwNet{
dataType: 'json', dataType: 'json',
hideMsg: true, hideMsg: true,
param: { param: {
InviteSource:InviteSource
}, },
callback: callback callback: callback
}; };
......
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