Skip to content

X
xiaoxiaole
Commit 46d69171 authored by 邱旭's avatar 邱旭
Browse files
Options

Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev

parents 385e3973 e5ab954f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 739 additions and 1636 deletions
egret/libs/new_wx/MainBase.ts
View file @ 46d69171
......@@ -48,6 +48,7 @@ import InvitePanel from "../../src/panels/InvitePanel";
import FriendPanel from "../../src/panels/FriendPanel";
import InviteRulePanel from "../../src/panels/InviteRulePanel";
import InvitePrizePanel from "../../src/panels/InvitePrizePanel";
import BagPanel from "../../src/panels/BagPanel";
export default class MainBase extends eui.UILayer {
constructor() {
......@@ -65,6 +66,7 @@ export default class MainBase extends eui.UILayer {
[ModuleTypes.RULE_PANEL, { cls: RulePanel }],
[ModuleTypes.PRIZE_PANEL, { cls: PrizePanel }],
[ModuleTypes.NO_PRIZE_PANEL, { cls: NoPrizePanel }],
['bag', { cls: BagPanel }],
['bloodPanel', { cls: BloodPanel }],
['blood2Panel', { cls: BloodPanel2 }],
['GoldPanel', { cls: GoldPanel }],
......@@ -85,8 +87,8 @@ export default class MainBase extends eui.UILayer {
['taskPrize', { cls: TaskPrizePanel }],
['back', { cls: BackPanel }],
['invite', { cls: InvitePanel }],
['invitePrize', {cls: InvitePrizePanel}],
['inviteRule', {cls: InviteRulePanel}],
['invitePrize', { cls: InvitePrizePanel }],
['inviteRule', { cls: InviteRulePanel }],
['friend', { cls: FriendPanel }],
['ad', { cls: ADPanel }],
];
......@@ -289,10 +291,39 @@ export default class MainBase extends eui.UILayer {
})
}
protected createGameScene() {
let count = 2;
const check = () => {
if (count <= 0) {
getAd() {
return new Promise((r) => {
NetManager.ins.hc_advert(() => {
r();
})
});
}
ajaxElement() {
return new Promise((r) => {
NetManager.ins.ajaxElement(async () => {
r();
});
});
}
hcHome() {
return new Promise((r) => {
NetManager.ins.hc_home(() => {
r()
}, window['collectRuleId']);
});
}
protected async createGameScene() {
await Promise.all([
this.getAd(),
this.ajaxElement(),
this.hcHome(),
]);
MapScene.adData = DataManager.ins.getData('hc_advert');
Buried.init();
SceneCtrl.instance.change(ModuleTypes.START_SCENE, this.svgaList);
......@@ -302,18 +333,7 @@ export default class MainBase extends eui.UILayer {
window['registerWX'](result);
});
updateMainTimer();
}
}
NetManager.ins.hc_home(() => {
count--;
check();
}, window['collectRuleId']);
NetManager.ins.ajaxElement(async () => {
count--;
check();
});
initstatistics();
document.addEventListener("visibilitychange", () => {
......
egret/libs/tw/manager/NetManager.ts
View file @ 46d69171
......@@ -1269,12 +1269,36 @@ export class NetManager extends ABNetManager {
this.send(net);
}
/**
* 签到接口
* @param {Function} callback
* @param {number} signActivityId 签到活动ID
* @param {number} activityId 插件活动ID，用于加抽奖次数，不传则使用签到身上配置的插件活动ID，否则不加抽奖次数
*/
public mapRank(callback: Function): void {
const net: INetData = {
name:'mapRank',
uri: window['duiba']+'/customActivity/happyclear/mapRank',
type: 'post',
dataType: 'json',
param: {
activityId: DataManager.ins.customCfgData.actId
},
hideMsg:true,
callback: callback
};
this.send(net);
}
public hc_advert(callback: Function): void {
const net: INetData = {
name:'hc_advert',
uri: window['duiba']+'/customActivity/happyclear/advert',
type: 'post',
dataType: 'json',
param: {
activityId: DataManager.ins.customCfgData.actId
},
hideMsg:true,
callback: callback
};
this.send(net);
}
public doSign(callback: Function, signActivityId: number): void {
const net: INetData = {
name: 'dosign',
......
egret/resource/TextureMerger/blood.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"blood","version":5,"files":["..\\assets\\blood\\blood体力补济站.png","..\\assets\\blood\\blood按钮.png","..\\assets\\blood\\blood按钮 副本1.png","..\\assets\\blood\\blood按钮 副本.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"blood","version":5,"files":["../assets/blood/blood体力补济站.png","../assets/blood/blood按钮.png","../assets/blood/blood按钮 副本1.png","../assets/blood/blood按钮 副本.png"]}
\ No newline at end of file
egret/resource/TextureMerger/blood2.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"blood2","version":5,"files":["..\\assets\\blood2\\blood2按钮 副本1.png","..\\assets\\blood2\\blood2按钮 副本.png","..\\assets\\blood2\\blood2.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"blood2","version":5,"files":["../assets/blood2/blood2按钮 副本1.png","../assets/blood2/blood2按钮 副本.png","../assets/blood2/blood2.png"]}
\ No newline at end of file
egret/resource/TextureMerger/box.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"box","version":5,"files":["..\\assets\\box\\boxbtn.png","..\\assets\\box\\boxbg.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"box","version":5,"files":["../assets/box/boxbtn.png","../assets/box/boxbg.png"]}
\ No newline at end of file
egret/resource/TextureMerger/box2.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"box2","version":5,"files":["..\\assets\\box2\\box2_bg.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"box2","version":5,"files":["../assets/box2/box2_bg.png"]}
\ No newline at end of file
egret/resource/TextureMerger/buy1.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy1","version":5,"files":["..\\assets\\buy1\\购买锤子.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy1","version":5,"files":["../assets/buy1/购买锤子.png"]}
\ No newline at end of file
egret/resource/TextureMerger/buy2.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy2","version":5,"files":["..\\assets\\buy2\\购买炸弹.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy2","version":5,"files":["../assets/buy2/购买炸弹.png"]}
\ No newline at end of file
egret/resource/TextureMerger/buy3.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy3","version":5,"files":["..\\assets\\buy3\\购买步数增加.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy3","version":5,"files":["../assets/buy3/购买步数增加.png"]}
\ No newline at end of file
egret/resource/TextureMerger/common.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["..\\assets\\common\\toast.png","..\\assets\\common\\closeCommonBtn.png","..\\assets\\common\\btn.png","..\\assets\\common\\alertbg.png","..\\assets\\common\\按钮 副本 4.png","..\\assets\\common\\按钮 副本 3.png","..\\assets\\common\\share_btn2.png","..\\assets\\common\\share_btn1.png","..\\assets\\common\\commmon_okbtn1.png","..\\assets\\common\\lightani.png","..\\assets\\common\\prizePanelbg.png","..\\assets\\common\\common_prizelight.png","..\\assets\\common\\common_yuanbao.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/toast.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/prizePanelbg.png","../assets/common/lightani.png","../assets/common/common_yuanbao.png","../assets/common/common_prizelight.png","../assets/common/common_adbg.png","../assets/common/commmon_okbtn1.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png"]}
\ No newline at end of file
egret/resource/TextureMerger/exchange.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"exchange","version":5,"files":["..\\assets\\exchange\\exchangebtn.png","..\\assets\\exchange\\exchange.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"exchange","version":5,"files":["../assets/exchange/exchangebtn.png","../assets/exchange/exchange.png"]}
\ No newline at end of file
egret/resource/TextureMerger/fail.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"fail","version":5,"files":["..\\assets\\faild\\闯关失败.png","..\\assets\\faild\\按钮 副本 9.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"fail","version":5,"files":["../assets/faild/闯关失败.png","../assets/faild/按钮 副本 9.png"]}
\ No newline at end of file
egret/resource/TextureMerger/friend.tmproject 0 → 100644
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"friend","version":5,"files":["../assets/friend/friendbg.png","../assets/friend/friend按钮-炫耀.png","../assets/friend/friend_itembg.png","../assets/friend/friend_icon3.png","../assets/friend/friend_icon2.png","../assets/friend/friend_icon1.png"]}
\ No newline at end of file
egret/resource/TextureMerger/invite.tmproject 0 → 100644
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"invite","version":5,"files":["../assets/invite/invite_rule_bg.png","../assets/invite/invite_prize_btn.png","../assets/invite/invite_prize_bg.png","../assets/invite/invite_prize_ad.png","../assets/invite/invite_invite.png","../assets/invite/invite_help.png","../assets/invite/invite_btn.png","../assets/invite/invite_bg.png"]}
\ No newline at end of file
egret/resource/TextureMerger/map.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["..\\assets\\map\\progress2.png","..\\assets\\map\\progress1.png","..\\assets\\map\\icon.png","..\\assets\\map\\animal1.png","..\\assets\\map\\元宝bg.png","..\\assets\\map\\有星星.png","..\\assets\\map\\音乐.png","..\\assets\\map\\星星bg.png","..\\assets\\map\\星星.png","..\\assets\\map\\无星星.png","..\\assets\\map\\问题.png","..\\assets\\map\\退出.png","..\\assets\\map\\狮子.png","..\\assets\\map\\声音.png","..\\assets\\map\\设置bg.png","..\\assets\\map\\设置.png","..\\assets\\map\\关闭 拷贝.png","..\\assets\\map\\道具.png","..\\assets\\map\\宝箱btn.png","..\\assets\\map\\宝箱bg.png","..\\assets\\map\\宝箱.png","..\\assets\\map\\宝箱3.png","..\\assets\\map\\宝箱2.png","..\\assets\\map\\宝箱1.png","..\\assets\\map\\iconbg.png","..\\assets\\map\\光 副本 4.png","..\\assets\\map\\音乐关闭.png","..\\assets\\map\\声音关闭.png","..\\assets\\map\\recordbtn.png","..\\assets\\map\\msgTri.png","..\\assets\\map\\guideOver.png","..\\assets\\map\\guideLove.png","..\\assets\\map\\guideBox.png","..\\assets\\map\\guideLevel.png","..\\assets\\map\\guideMoney.png","..\\assets\\map\\lionMsgBg.png","..\\assets\\map\\map_signicon.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/taskicon.png","../assets/map/recordbtn.png","../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/namebg.png","../assets/map/msgTri.png","../assets/map/map_signicon.png","../assets/map/lionMsgBg.png","../assets/map/invite_txtbg.png","../assets/map/invite_icon.png","../assets/map/iconbg.png","../assets/map/icon.png","../assets/map/guideOver.png","../assets/map/guideMoney.png","../assets/map/guideLove.png","../assets/map/guideLevel.png","../assets/map/guideBox.png","../assets/map/friend_avatar.png","../assets/map/avatar.png","../assets/map/animal1.png","../assets/map/ad_icon.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐关闭.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音关闭.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/光 副本 4.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/宝箱.png"]}
\ No newline at end of file
egret/resource/TextureMerger/noprize.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"noprize","version":5,"files":["..\\assets\\nprize\\擦肩而过弹窗 .png","..\\assets\\nprize\\得分- 无发券.png","..\\assets\\nprize\\再来一次.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"noprize","version":5,"files":["../assets/nprize/擦肩而过弹窗 .png","../assets/nprize/得分- 无发券.png","../assets/nprize/再来一次.png"]}
\ No newline at end of file
egret/resource/TextureMerger/prize.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prize","version":5,"files":["..\\assets\\prize\\PrizePanelX.png","..\\assets\\prize\\prizePanelUseBtn.png","..\\assets\\prize\\点亮.png","..\\assets\\prize\\点亮 副本 2.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prize","version":5,"files":["../assets/prize/PrizePanelX.png","../assets/prize/prizePanelUseBtn.png","../assets/prize/点亮.png","../assets/prize/点亮 副本 2.png"]}
\ No newline at end of file
egret/resource/TextureMerger/prize2.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prize2","version":5,"files":["..\\assets\\prize2\\prize2_icon.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prize2","version":5,"files":["../assets/prize2/prize2_icon.png"]}
\ No newline at end of file
egret/resource/TextureMerger/quit.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"quit","version":5,"files":["..\\assets\\quit\\quit_bg.png","..\\assets\\quit\\关闭按钮.png","..\\assets\\quit\\按钮 副本 8.png","..\\assets\\quit\\按钮 副本 7.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"quit","version":5,"files":["../assets/quit/quit_bg.png","../assets/quit/关闭按钮.png","../assets/quit/按钮 副本 8.png","../assets/quit/按钮 副本 7.png"]}
\ No newline at end of file
egret/resource/TextureMerger/rule.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"rule","version":5,"files":["..\\assets\\rule\\ruleBg.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"rule","version":5,"files":["../assets/rule/ruleBg.png"]}
\ No newline at end of file
egret/resource/TextureMerger/shop.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"shop","version":5,"files":["..\\assets\\shop\\shopbtn1.png","..\\assets\\shop\\道具商城.png","..\\assets\\shop\\按钮 副本.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"shop","version":5,"files":["../assets/shop/shopbtn1.png","../assets/shop/道具商城.png","../assets/shop/按钮 副本.png"]}
\ No newline at end of file
egret/resource/TextureMerger/sign.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sign","version":5,"files":["..\\assets\\sign\\signitem.png","..\\assets\\sign\\signicon5.png","..\\assets\\sign\\signicon4.png","..\\assets\\sign\\signicon3.png","..\\assets\\sign\\signicon2.png","..\\assets\\sign\\signbtn4.png","..\\assets\\sign\\signbtn3.png","..\\assets\\sign\\signbtn2.png","..\\assets\\sign\\signbtn1.png","..\\assets\\sign\\signbg.png","..\\assets\\sign\\sign_line2.png","..\\assets\\sign\\sign_line.png","..\\assets\\sign\\sign_light.png","..\\assets\\sign\\sign_icon1.png","..\\assets\\sign\\signicon6.png","..\\assets\\sign\\signicon_blood.png","..\\assets\\sign\\sign_quan88.png","..\\assets\\sign\\sign_quan58.png","..\\assets\\sign\\sign_quan38.png","..\\assets\\sign\\sign_quan15.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sign","version":5,"files":["../assets/sign/signitem.png","../assets/sign/signicon5.png","../assets/sign/signicon4.png","../assets/sign/signicon3.png","../assets/sign/signicon2.png","../assets/sign/signbtn4.png","../assets/sign/signbtn3.png","../assets/sign/signbtn2.png","../assets/sign/signbtn1.png","../assets/sign/signbg.png","../assets/sign/sign_line2.png","../assets/sign/sign_line.png","../assets/sign/sign_light.png","../assets/sign/sign_icon1.png","../assets/sign/signicon6.png","../assets/sign/signicon_blood.png","../assets/sign/sign_quan88.png","../assets/sign/sign_quan58.png","../assets/sign/sign_quan38.png","../assets/sign/sign_quan15.png"]}
\ No newline at end of file
egret/resource/TextureMerger/signprize.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"signprize","version":5,"files":["..\\assets\\signprize\\singprizebg.png","..\\assets\\signprize\\singprize体力.png","..\\assets\\signprize\\signprize元宝.png","..\\assets\\signprize\\signprize_numsbg.png","..\\assets\\signprize\\signprize_btn.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"signprize","version":5,"files":["../assets/signprize/singprizebg.png","../assets/signprize/singprize体力.png","../assets/signprize/signprize元宝.png","../assets/signprize/signprize_numsbg.png","../assets/signprize/signprize_btn.png"]}
\ No newline at end of file
egret/resource/TextureMerger/start.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"start","version":5,"files":["..\\assets\\startScene\\mask3.png","..\\assets\\startScene\\mask2.png","..\\assets\\startScene\\mask.png","..\\assets\\startScene\\loadingbg.png","..\\assets\\startScene\\头顶树丛.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"start","version":5,"files":["../assets/startScene/mask3.png","../assets/startScene/mask2.png","../assets/startScene/mask.png","../assets/startScene/loadingbg.png","../assets/startScene/头顶树丛.png"]}
\ No newline at end of file
egret/resource/TextureMerger/startpanel.tmproject
View file @ 46d69171
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["..\\assets\\startpanel2\\startpanel通关条件.png","..\\assets\\startpanel2\\startpanel数量.png","..\\assets\\startpanel2\\startpanel数量 副本 3.png","..\\assets\\startpanel2\\startpanel目标33.png","..\\assets\\startpanel2\\startpanel目标3.png","..\\assets\\startpanel2\\startpanel按钮.png","..\\assets\\startpanel2\\startpanel_ice1.png","..\\assets\\startpanel2\\startpanel_ele6.png","..\\assets\\startpanel2\\startpanel_block2.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["../assets/startpanel2/startpanel通关条件.png","../assets/startpanel2/startpanel数量.png","../assets/startpanel2/startpanel数量 副本 3.png","../assets/startpanel2/startpanel目标33.png","../assets/startpanel2/startpanel目标3.png","../assets/startpanel2/startpanel按钮.png","../assets/startpanel2/startpanel_icon3.png","../assets/startpanel2/startpanel_icon2.png","../assets/startpanel2/startpanel_icon1.png","../assets/startpanel2/startpanel_icon.png","../assets/startpanel2/startpanel_ice1.png","../assets/startpanel2/startpanel_ele6.png","../assets/startpanel2/startpanel_block2.png","../assets/startpanel2/startpanel_bg2.png","../assets/startpanel2/startpanel_avatar.png"]}
\ No newline at end of file
egret/resource/default.res.json
View file @ 46d69171
This diff is collapsed.
egret/resource/default.thm.json
View file @ 46d69171
......@@ -2,9 +2,12 @@
"skins": {},
"autoGenerateExmlsList": true,
"exmls": [
"resource/skins/ADSkin.exml",
"resource/skins/ADSmallSkin.exml",
"resource/skins/AvatarSkin.exml",
"resource/skins/AlertSkin.exml",
"resource/skins/AvatarSkin.exml",
"resource/skins/BackSkin.exml",
"resource/skins/BagSkin.exml",
"resource/skins/Blood2Skin.exml",
"resource/skins/BloodSkin.exml",
"resource/skins/Box2Skin.exml",
......@@ -14,7 +17,14 @@
"resource/skins/Buy3Skin.exml",
"resource/skins/ExchangeSkin.exml",
"resource/skins/FailSkin.exml",
"resource/skins/FriendItem2Skin.exml",
"resource/skins/FriendItemSkin.exml",
"resource/skins/FriendSkin.exml",
"resource/skins/IconButtonSkin.exml",
"resource/skins/InviteItemSkin.exml",
"resource/skins/InvitePrizePanelSkin.exml",
"resource/skins/InviteRulePanelSkin.exml",
"resource/skins/InviteSkin.exml",
"resource/skins/Main2Skin.exml",
"resource/skins/MapBottomSkin.exml",
"resource/skins/MapRepeatSkin.exml",
......@@ -44,17 +54,8 @@
"resource/skins/StartSkin.exml",
"resource/skins/TargetItemSkin.exml",
"resource/skins/TaskItemSkin.exml",
"resource/skins/TaskSkin.exml",
"resource/skins/FriendSkin.exml",
"resource/skins/FriendItemSkin.exml",
"resource/skins/FriendItem2Skin.exml",
"resource/skins/TaskPrizeSkin.exml",
"resource/skins/ADSkin.exml",
"resource/skins/BackSkin.exml",
"resource/skins/InviteSkin.exml",
"resource/skins/InviteItemSkin.exml",
"resource/skins/InvitePrizePanelSkin.exml",
"resource/skins/InviteRulePanelSkin.exml",
"resource/skins/TaskSkin.exml",
"resource/skins/ToastSkin.exml",
"resource/skins/VScrollBarSkin.exml"
],
......
egret/resource/skins/BagSkin.exml 0 → 100644
View file @ 46d69171
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="BagSkin" width="400" height="300" xmlns:e="http://ns.egret.com/eui">
</e:Skin>
\ No newline at end of file
egret/resource/skins/Prize2Skin.exml
View file @ 46d69171
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="Prize2Skin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="169005181d0"/>
<e:Image id="light" source="common_prizelight_png" x="374.19" y="329.51" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
<e:Image source="prizePanelbg_png" y="134.96" horizontalCenter="0.5"/>
<e:Button id="closeBtn" label="" x="616" y="307">
<e:Component y="849.52" skinName="ADSmallSkin" horizontalCenter="0"/>
<e:Image id="light" source="common_prizelight_png" x="374.19" y="246.13" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
<e:Image source="prizePanelbg_png" y="51.58" horizontalCenter="0.5"/>
<e:Button id="closeBtn" label="" x="616" y="223.62">
<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"/>
......@@ -11,14 +12,14 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Image id="picb" source="点亮 副本 2_png" x="142" y="191"/>
<e:Image id="pica" source="点亮 副本 2_png" x="608" y="191" scaleX="-1"/>
<e:Image id="picc" source="点亮_png" y="142" x="280"/>
<e:Image id="pic1" source="点亮 副本 2_png" x="222" y="249" anchorOffsetX="80" anchorOffsetY="58"/>
<e:Image id="pic3" source="点亮 副本 2_png" x="536" y="243" scaleX="-1" anchorOffsetX="72" anchorOffsetY="52"/>
<e:Image id="pic2" source="点亮_png" y="218" horizontalCenter="0" anchorOffsetX="96" anchorOffsetY="76"/>
<e:Image source="signprize元宝_png" y="453.24" horizontalCenter="-2"/>
<e:Button id="shareBtn" label="" y="787" horizontalCenter="-145.5">
<e:Image id="picb" source="点亮 副本 2_png" x="142" y="107.62"/>
<e:Image id="pica" source="点亮 副本 2_png" x="608" y="107.62" scaleX="-1"/>
<e:Image id="picc" source="点亮_png" y="58.62" x="280"/>
<e:Image id="pic1" source="点亮 副本 2_png" x="222" y="165.62" anchorOffsetX="80" anchorOffsetY="58"/>
<e:Image id="pic3" source="点亮 副本 2_png" x="536" y="159.62" scaleX="-1" anchorOffsetX="72" anchorOffsetY="52"/>
<e:Image id="pic2" source="点亮_png" y="134.62" horizontalCenter="0" anchorOffsetX="96" anchorOffsetY="76"/>
<e:Image source="signprize元宝_png" y="369.86" horizontalCenter="-2"/>
<e:Button id="shareBtn" label="" y="703.62" horizontalCenter="-145.5">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮 副本 3_png" source.down="按钮 副本 3_png" source.disabled="按钮 副本 3_png"/>
......@@ -26,7 +27,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="goBtn" label="" y="787" horizontalCenter="144">
<e:Button id="goBtn" label="" y="703.62" horizontalCenter="144">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="按钮 副本 4_png" source.down="按钮 副本 4_png" source.disabled="按钮 副本 4_png"/>
......@@ -34,7 +35,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Group id="numsgroup" x="393.38" y="496.76">
<e:Group id="numsgroup" x="393.38" y="413.38">
<e:Image id="numsbg0" source="signprize_numsbg_png" x="0" y="0"/>
<e:Label id="tips" text="X8" size="22" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center"/>
</e:Group>
......
egret/resource/skins/PrizeSkin.exml
View file @ 46d69171
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="PrizeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="169005181d0"/>
<e:Component y="938.52" skinName="ADSmallSkin" horizontalCenter="0"/>
<e:Image id="light" source="common_prizelight_png" x="374.19" y="329.51" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
<e:Image source="prizePanelbg_png" y="136.9" horizontalCenter="0.5"/>
<e:Button id="closeBtn" label="" x="618" y="311">
......
egret/resource/skins/SignPrizeSkin.exml
View file @ 46d69171
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="SignPrizeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16d5c2563cb"/>
<e:Component y="698.52" skinName="ADSmallSkin" horizontalCenter="0"/>
<e:Image source="singprizebg_png" y="20" horizontalCenter="0"/>
<e:Image id="img" y="297" touchEnabled="true" source="{data.img}" width="512" height="240" scaleX="1" scaleY="1" horizontalCenter="0" visible="false"/>
<e:Image id="money" source="signprize元宝_png" y="234.88" horizontalCenter="0"/>
......
egret/resource/skins/TaskPrizeSkin.exml
View file @ 46d69171
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="TaskPrizeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui">
<e:Component y="757.52" skinName="ADSmallSkin" horizontalCenter="0"/>
<e:Image source="闯关失败_png" y="27" horizontalCenter="0"/>
<e:Button id="closeBtn" label="" x="609" y="197">
<e:skinName>
......
egret/src/mapScene/AdSmallComp.ts
View file @ 46d69171
import ComponentBase from "../../libs/new_wx/components/ComponentBase";
import { NetManager } from "../../libs/tw/manager/NetManager";
export default class AdSmallComp extends ComponentBase {
start(data?) {
this.touchEnabled=this.touchChildren=false;
super.start(data);
NetManager.ins.hc_advert(()=>{
this.data.img = ''
})
}
get skinKey(): string { return 'ADSmall' }
......
egret/src/mapScene/MapScene.ts
View file @ 46d69171
......@@ -22,6 +22,7 @@ import AvatarComp from "./AvatarComp";
export default class MapScene extends Scene {
static adData;
scrollGroup: eui.Group;
scroll: eui.Scroller;
topPart: MapTopPart;
......@@ -34,6 +35,7 @@ export default class MapScene extends Scene {
super.start();
this.updateAdData();
this['avatar'].mask = this['avatarMask'];
setTimeout(() => {
......@@ -183,6 +185,15 @@ export default class MapScene extends Scene {
}
}
updateAdData(){
// if(){
// this['adBtn'].visible=false;
// }
// this['adBtn'].source = '';
this['adBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP,()=>{
// window.location.href = '';
},this);
}
destroy() {
super.destroy();
......
egret/src/panels/BagPanel.ts 0 → 100644
View file @ 46d69171
import Panel from "../../libs/new_wx/components/Panel";
export default class BagPanel extends Panel {
start(data) {
super.start();
this.showlog();
}
showlog(){
// NetManager.ins.showLog(getlogItem(3));
// NetManager.ins.showLog(getlogItem(4));
}
initEvents() {
super.initEvents();
// this['inviteBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapInvite, this)
}
onTapInvite() {
}
protected get closeBtns(): eui.Button[] { return [this['closeBtn'],this['closeBtn2']] }
get skinKey() { return 'Bag' }
}
\ No newline at end of file
mock/config.js
View file @ 46d69171
const path = require('path');
const config = {
'/customActivity/happyclear/mapRank': {
data: './happyclear/mapRank.json'
},
'/customActivity/happyclear/advert': {
data: './happyclear/advert.json'
},
'/signactivity/getSignInfo': {
data: './sign/getSignInfo.json'
},
......
mock/happyclear/advert.json 0 → 100644
View file @ 46d69171
{
"success":true,
"code":null,
"desc":null,
"timestamp":1566199822308,
"data":[
{
"levelNum":1,
"rank":[
{
"nickName":"昵称",
"avatar":"头像",
"stars":1,
"maxScore":123,
"rank":"排名"
}
]
}
]
}
\ No newline at end of file
mock/happyclear/mapRank.json 0 → 100644
View file @ 46d69171
{
"success":true,
"code":null,
"desc":null,
"timestamp":1566199822308,
"data":[
{
"levelNum":1,
"rank":[
{
"nickName":"昵称",
"avatar":"头像",
"stars":1,
"maxScore":123,
"rank":"排名"
}
]
}
]
}
\ 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