Skip to content

X
xiaoxiaole
Commit 849e9f3d authored by wildfirecode's avatar wildfirecode
Browse files
Options

1

parent 9805ca52
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 29 deletions
egret/libs/new_wx/MainBase.ts
View file @ 849e9f3d
...@@ -510,9 +510,9 @@ export default class MainBase extends eui.UILayer { ...@@ -510,9 +510,9 @@ export default class MainBase extends eui.UILayer {
}); });
} }
getSignConfig() { getConfig() {
return new Promise((r) => { return new Promise((r) => {
NetManager.ins.getSignConfig(() => { NetManager.ins.getConfigInfo(() => {
r(); r();
}) })
}); });
...@@ -583,7 +583,7 @@ export default class MainBase extends eui.UILayer { ...@@ -583,7 +583,7 @@ export default class MainBase extends eui.UILayer {
this.hc_userInfo(), this.hc_userInfo(),
this.getBackReward(), this.getBackReward(),
this.hcRedBoobBaseInfo(), this.hcRedBoobBaseInfo(),
this.getSignConfig(), this.getConfig(),
this.getInviteInfo(), this.getInviteInfo(),
this.hbRainBaseInfo(), this.hbRainBaseInfo(),
]); ]);
......
egret/libs/tw/manager/NetManager.ts
View file @ 849e9f3d
...@@ -2210,21 +2210,6 @@ export class NetManager extends ABNetManager { ...@@ -2210,21 +2210,6 @@ export class NetManager extends ABNetManager {
this.send(net); this.send(net);
} }
public getSignConfig(callback: Function): void {
const net: INetData = {
name: 'getSignConfig',
uri: window['duiba'] + '/customActivity/happyclear/getSignConfig',
type: 'get',
dataType: 'json',
hideMsg: true,
param: {
activityId: DataManager.ins.customCfgData.actId
},
callback: callback
};
this.send(net);
}
/** /**
* 获取邀请码 * 获取邀请码
* @param callback * @param callback
......
egret/resource/skins/SignSkin.exml
View file @ 849e9f3d
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="SignSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="SignSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Image source="signbg_png" y="66.75" horizontalCenter="0"/> <e:Image source="signbg_png" y="66.75" horizontalCenter="0"/>
<e:Button id="closeBtn" label="" x="630" y="211.77"> <e:Button id="closeBtn" label="" x="632" y="257.77">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing"> <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" source.disabled="closeCommonBtn_png"/> <e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
......
egret/src/mapScene/MapScene.ts
View file @ 849e9f3d
...@@ -1212,8 +1212,10 @@ export default class MapScene extends Scene { ...@@ -1212,8 +1212,10 @@ export default class MapScene extends Scene {
updateSignBtn() { updateSignBtn() {
this['signGroup'].visible = false; this['signGroup'].visible = false;
const getSignConfig = DataManager.ins.getData('getSignConfig');
if (getSignConfig && getSignConfig.data && getSignConfig.data.closeStatus) { let config = DataManager.ins.getData(NetName.GET_CONFIG).data;
const getSignConfig = config && config.signConf;
if (getSignConfig && getSignConfig.closeStatus) {
this['signGroup'].visible = true; this['signGroup'].visible = true;
} }
......
egret/src/mapScene/getSignBtn.ts
View file @ 849e9f3d
...@@ -2,8 +2,9 @@ import { DataManager } from "../../libs/tw/manager/DataManager"; ...@@ -2,8 +2,9 @@ import { DataManager } from "../../libs/tw/manager/DataManager";
import { NetName } from "../../libs/tw/enum/NetName"; import { NetName } from "../../libs/tw/enum/NetName";
export default () => { export default () => {
const getSignConfig = DataManager.ins.getData('getSignConfig'); let config = DataManager.ins.getData(NetName.GET_CONFIG).data;
if (getSignConfig && getSignConfig.data) let getSignConfig = config && config.signConf;
return getSignConfig.data.closeStatus; if (getSignConfig)
return getSignConfig.closeStatus;
return false; return false;
} }
\ No newline at end of file
egret/src/panels/SignPanel.ts
View file @ 849e9f3d
...@@ -10,6 +10,7 @@ import PanelCtrl from "../../libs/new_wx/ctrls/panelCtrl"; ...@@ -10,6 +10,7 @@ import PanelCtrl from "../../libs/new_wx/ctrls/panelCtrl";
import { getlogItem } from "../Main"; import { getlogItem } from "../Main";
import {hortileLayout} from "../layout/hortileLayout"; import {hortileLayout} from "../layout/hortileLayout";
import Utils from "../Utils"; import Utils from "../Utils";
import { NetName } from "../../libs/tw/enum/NetName";
export default class SignPanel extends Panel { export default class SignPanel extends Panel {
list: eui.List; list: eui.List;
...@@ -134,9 +135,10 @@ export default class SignPanel extends Panel { ...@@ -134,9 +135,10 @@ export default class SignPanel extends Panel {
// { nums: 'x1', type: 'steps' }, // { nums: 'x1', type: 'steps' },
// { nums: '0.3元', type: 'quan30' } // { nums: '0.3元', type: 'quan30' }
private getConfigs() { private getConfigs() {
const getSignConfig = DataManager.ins.getData('getSignConfig'); let config = DataManager.ins.getData(NetName.GET_CONFIG).data;
if (getSignConfig && getSignConfig.data && getSignConfig.data.sixDaysBeforeOptions && getSignConfig.data.theSeventhDayOptions) { let getSignConfig = config && config.signConf;
const { sixDaysBeforeOptions, theSeventhDayOptions } = getSignConfig.data; if (getSignConfig && getSignConfig.sixDaysBeforeOptions && getSignConfig.theSeventhDayOptions) {
const { sixDaysBeforeOptions, theSeventhDayOptions } = getSignConfig;
const result = []; const result = [];
sixDaysBeforeOptions.forEach(option => { //todo假设按天数排序 sixDaysBeforeOptions.forEach(option => { //todo假设按天数排序
//类型 2 次数，3 道具，4 元宝，5其他 //类型 2 次数，3 道具，4 元宝，5其他
......
mock/happyclear/getConfigInfo.json
View file @ 849e9f3d
...@@ -5,10 +5,155 @@ ...@@ -5,10 +5,155 @@
"timestamp": 1585203242370, "timestamp": 1585203242370,
"data": { "data": {
"signConf": { "signConf": {
"closeStatus": false, "closeStatus": true,
"sixDaysBeforeOptions": [ "sixDaysBeforeOptions": [
{
"id": null,
"day": 1,
"categoryType": 7,
"title": null,
"rate": null,
"minValue": null,
"maxValue": null,
"coinType": null,
"realValue": null,
"propType": null,
"num": null,
"img": "//yun.dui88.com/images/202003/n3exi2tenh.png",
"smallImg": "//yun.dui88.com/images/202003/cfay38i1rl.jpg",
"appItemId": 10361,
"name": "111",
"value": "963"
},
{
"id": null,
"day": 2,
"categoryType": 2,
"title": null,
"rate": null,
"minValue": null,
"maxValue": null,
"coinType": null,
"realValue": null,
"propType": null,
"num": 2,
"img": null,
"smallImg": null,
"appItemId": null,
"name": null,
"value": null
},
{
"id": null,
"day": 3,
"categoryType": 4,
"title": null,
"rate": null,
"minValue": 10,
"maxValue": 10,
"coinType": 1,
"realValue": null,
"propType": null,
"num": null,
"img": null,
"smallImg": null,
"appItemId": null,
"name": null,
"value": null
},
{
"id": null,
"day": 4,
"categoryType": 3,
"title": null,
"rate": null,
"minValue": null,
"maxValue": null,
"coinType": null,
"realValue": null,
"propType": 2,
"num": null,
"img": null,
"smallImg": null,
"appItemId": null,
"name": null,
"value": null
},
{
"id": null,
"day": 5,
"categoryType": 4,
"title": null,
"rate": null,
"minValue": 0,
"maxValue": 20,
"coinType": 2,
"realValue": null,
"propType": null,
"num": null,
"img": null,
"smallImg": null,
"appItemId": null,
"name": null,
"value": null
},
{
"id": null,
"day": 6,
"categoryType": 3,
"title": null,
"rate": null,
"minValue": null,
"maxValue": null,
"coinType": null,
"realValue": null,
"propType": 2,
"num": null,
"img": null,
"smallImg": null,
"appItemId": null,
"name": null,
"value": null
}
], ],
"theSeventhDayOptions": null "theSeventhDayOptions": [
{
"id": "",
"day": null,
"categoryType": 2,
"title": "1",
"rate": "11",
"minValue": null,
"maxValue": null,
"coinType": null,
"realValue": null,
"propType": null,
"num": 1,
"img": "",
"smallImg": null,
"appItemId": null,
"name": "",
"value": ""
},
{
"id": "",
"day": null,
"categoryType": 7,
"title": "1122",
"rate": "11",
"minValue": null,
"maxValue": null,
"coinType": null,
"realValue": null,
"propType": null,
"num": null,
"img": "//yun.dui88.com/images/202003/cjusviko1v.png",
"smallImg": "//yun.dui88.com/images/202003/1fcggjz048.jpg",
"appItemId": 10000,
"name": "虚拟",
"value": "fe"
}
]
}, },
"luckyDrawConf": { "luckyDrawConf": {
"enable": true, "enable": true,
......
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