Skip to content

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

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

parents 6bc59c13 4161e372
Hide whitespace changes
Inline Side-by-side
Showing with 426 additions and 43 deletions
egret/index.html
View file @ b4cbd234
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<script src="libs/pad-zeropadding.js"></script> <script src="libs/pad-zeropadding.js"></script>
<img id="pic" style="width:100%;position: absolute;z-index: 999;display: none;" /> <img id="pic" style="width:100%;position: absolute;z-index: 999;display: none;" />
<script> <script>
// localStorage.clear(); localStorage.clear();
window['isInvitePage']=0; window['isInvitePage']=0;
var targetUrl='https://gameact.suning.com/sngame-web/api/duiba/private/v1/getLoginUrl.do?appCode=duiba&activityCode=3651404'; var targetUrl='https://gameact.suning.com/sngame-web/api/duiba/private/v1/getLoginUrl.do?appCode=duiba&activityCode=3651404';
/* /*
......
egret/resource/skins/MapSkin.exml
View file @ b4cbd234
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<e:Image source="namebg_png" horizontalCenter="-4" bottom="-4"/> <e:Image source="namebg_png" horizontalCenter="-4" bottom="-4"/>
<e:Label id="nameTxt" text="La121233bel" y="91.5" size="20" horizontalCenter="1"/> <e:Label id="nameTxt" text="La121233bel" y="91.5" size="20" horizontalCenter="1"/>
</e:Group> </e:Group>
<e:Image id="adBtn" y="519.02" source="ad_icon_png" right="12" width="143" height="122"/> <e:Image id="adBtn" y="519.02" source="ad_icon_png" right="12" width="122" height="122"/>
<e:Button id="taskBtn" label="" x="572.62" y="248.51" visible="false"> <e:Button id="taskBtn" label="" x="572.62" y="248.51" visible="false">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
......
egret/src/mapScene/AdSmallComp.ts
View file @ b4cbd234
...@@ -10,15 +10,15 @@ export default class AdSmallComp extends ComponentBase { ...@@ -10,15 +10,15 @@ export default class AdSmallComp extends ComponentBase {
super.start(data); super.start(data);
NetManager.ins.hc_advert(() => { NetManager.ins.hc_advert(() => {
const { data } = DataManager.ins.getData('hc_advert'); const { data } = DataManager.ins.getData('hc_advert');
let { noticeAdvert } = data; let { popupAdvert } = data;
if (noticeAdvert == null) if (popupAdvert == null)
noticeAdvert = { enable: false, advertList: [] } popupAdvert = { enable: false, advertList: [] }
this.visible = noticeAdvert.enable; this.visible = popupAdvert.enable;
if (noticeAdvert.enable) { if (popupAdvert.enable) {
result = noticeAdvert.advertList; result = popupAdvert.advertList;
if (Array.isArray(noticeAdvert.advertList)) { if (Array.isArray(popupAdvert.advertList)) {
const index = Math.floor(noticeAdvert.advertList.length * Math.random()); const index = Math.floor(popupAdvert.advertList.length * Math.random());
result = noticeAdvert.advertList[index]; result = popupAdvert.advertList[index];
} }
this.data.img = result.img; this.data.img = result.img;
} }
......
egret/src/mapScene/MapScene.ts
View file @ b4cbd234
...@@ -35,6 +35,8 @@ export default class MapScene extends Scene { ...@@ -35,6 +35,8 @@ export default class MapScene extends Scene {
_data; _data;
sendInvite() { sendInvite() {
const code = Utils.getRequestByKey('shareCode');
if(!code) return;
const dojoin = DataManager.ins.getData('hc_doJoin'); const dojoin = DataManager.ins.getData('hc_doJoin');
if(!dojoin) return; if(!dojoin) return;
NetManager.ins.doHelp((success, res) => { NetManager.ins.doHelp((success, res) => {
...@@ -90,37 +92,32 @@ export default class MapScene extends Scene { ...@@ -90,37 +92,32 @@ export default class MapScene extends Scene {
const oldTimerStr2 = localStorage.getItem('nowTimer2Str' + window['CFG'].consumerId); const oldTimerStr2 = localStorage.getItem('nowTimer2Str' + window['CFG'].consumerId);
const hc_advert = DataManager.ins.getData('hc_advert').data; const hc_advert = DataManager.ins.getData('hc_advert').data;
const {popupAdvert} = hc_advert; const { noticeAdvert} = hc_advert;
if(oldTimerStr2 != nowTimerStr2 && popupAdvert && popupAdvert.enable) {
if(oldTimerStr2 != nowTimerStr2 && noticeAdvert && noticeAdvert.enable) {
panels.push('ad'); panels.push('ad');
localStorage.setItem('nowTimer2Str' + window['CFG'].consumerId, nowTimerStr2); localStorage.setItem('nowTimer2Str' + window['CFG'].consumerId, nowTimerStr2);
} }
const {signInfoVO} = DataManager.ins.getData('getSignInfo');
if(signInfoVO.continueDay < 7) {
if(signInfoVO.todaySigned == 0 && oldTimerStr != nowTimerStr) {
panels.push('sign');
localStorage.setItem('nowTimerStr' + window['CFG'].consumerId, nowTimerStr);
}
}
if(!readCache() && getHomeData().levels.length <= 0) { //引导 if(!readCache() && getHomeData().levels.length <= 0) { //引导
const guide = new GuideCon(() => { const guide = new GuideCon(() => {
const {signInfoVO} = DataManager.ins.getData('getSignInfo');
if(signInfoVO.continueDay >= 7) return; PanelCtrl.instance.showPanels(panels);
if(signInfoVO.todaySigned == 0 && oldTimerStr != nowTimerStr) {
PanelCtrl.instance.show('sign');
localStorage.setItem('nowTimerStr' + window['CFG'].consumerId, nowTimerStr);
}
}); });
this.addChild(guide); this.addChild(guide);
guide.play(1) guide.play(1)
console.log(guide) console.log(guide)
} else { //不用引导 } else { //不用引导
const {signInfoVO} = DataManager.ins.getData('getSignInfo'); PanelCtrl.instance.showPanels(panels);
if(signInfoVO.continueDay >= 7) return;
if(signInfoVO.todaySigned == 0 && oldTimerStr != nowTimerStr) {
// PanelCtrl.instance.show('sign');
panels.push('sign');
localStorage.setItem('nowTimerStr' + window['CFG'].consumerId, nowTimerStr);
}
} }
PanelCtrl.instance.showPanels(panels);
}, window['signActivityId']); }, window['signActivityId']);
......
mock/happyclear/advert.json
View file @ b4cbd234
{ {
"success": true, "success":true,
"code": "0000000000", "code":null,
"desc": "OK", "desc":null,
"timestamp": 1571038218940, "timestamp":1566199822308,
"data": { "data":{
"noticeAdvert": null, "popupAdvert":{
"popupAdvert": null, "enable":true,
"mapAdvert": null "advertList":[
{
"img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
"url":"Http://www.baidu.com"
},
{
"img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
"url":"Http://www.baidu.com"
}
]
},
"noticeAdvert":{
"enable":true,
"advertList":[
{
"img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
"url":"Http://www.baidu.com"
},
{
"img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
"url":"Http://www.baidu.com"
}
]
},
"mapAdvert":{
"enable":false,
"advertList":[
{
"img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
"url":"Http://www.baidu.com"
},
{
"img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
"url":"Http://www.baidu.com"
}
]
}
} }
} }
\ No newline at end of file
mock/happyclear/home.json
View file @ b4cbd234
...@@ -7,24 +7,374 @@ ...@@ -7,24 +7,374 @@
"wealth": 7960, "wealth": 7960,
"totalStars": 145, "totalStars": 145,
"levels": [ "levels": [
{
"levelNum": 1,
"maxScore": 36320,
"stars": 3
},
{
"levelNum": 2,
"maxScore": 18680,
"stars": 3
},
{
"levelNum": 3,
"maxScore": 19530,
"stars": 3
},
{
"levelNum": 4,
"maxScore": 20230,
"stars": 3
},
{
"levelNum": 5,
"maxScore": 10710,
"stars": 3
},
{
"levelNum": 6,
"maxScore": 42580,
"stars": 3
},
{
"levelNum": 7,
"maxScore": 23700,
"stars": 3
},
{
"levelNum": 8,
"maxScore": 99999,
"stars": 3
},
{
"levelNum": 9,
"maxScore": 70330,
"stars": 3
},
{
"levelNum": 10,
"maxScore": 27710,
"stars": 3
},
{
"levelNum": 11,
"maxScore": 19410,
"stars": 3
},
{
"levelNum": 12,
"maxScore": 23650,
"stars": 3
},
{
"levelNum": 13,
"maxScore": 34150,
"stars": 1
},
{
"levelNum": 14,
"maxScore": 37110,
"stars": 1
},
{
"levelNum": 15,
"maxScore": 99999,
"stars": 2
},
{
"levelNum": 16,
"maxScore": 99999,
"stars": 3
},
{
"levelNum": 17,
"maxScore": 42420,
"stars": 3
},
{
"levelNum": 18,
"maxScore": 99999,
"stars": 2
},
{
"levelNum": 19,
"maxScore": 99999,
"stars": 3
},
{
"levelNum": 20,
"maxScore": 47520,
"stars": 3
},
{
"levelNum": 21,
"maxScore": 14080,
"stars": 3
},
{
"levelNum": 22,
"maxScore": 75790,
"stars": 1
},
{
"levelNum": 23,
"maxScore": 50340,
"stars": 3
},
{
"levelNum": 24,
"maxScore": 83590,
"stars": 3
},
{
"levelNum": 25,
"maxScore": 45570,
"stars": 3
},
{
"levelNum": 26,
"maxScore": 99999,
"stars": 3
},
{
"levelNum": 27,
"maxScore": 44540,
"stars": 2
},
{
"levelNum": 28,
"maxScore": 112230,
"stars": 3
},
{
"levelNum": 29,
"maxScore": 67810,
"stars": 3
},
{
"levelNum": 30,
"maxScore": 43530,
"stars": 2
},
{
"levelNum": 31,
"maxScore": 99999,
"stars": 3
},
{
"levelNum": 32,
"maxScore": 18450,
"stars": 1
},
{
"levelNum": 33,
"maxScore": 28560,
"stars": 1
},
{
"levelNum": 34,
"maxScore": 99999,
"stars": 1
},
{
"levelNum": 35,
"maxScore": 99999,
"stars": 3
},
{
"levelNum": 36,
"maxScore": 14860,
"stars": 0
},
{
"levelNum": 37,
"maxScore": 22300,
"stars": 0
},
{
"levelNum": 38,
"maxScore": 43380,
"stars": 3
},
{
"levelNum": 39,
"maxScore": 27610,
"stars": 0
},
{
"levelNum": 40,
"maxScore": 99999,
"stars": 3
},
{
"levelNum": 41,
"maxScore": 30890,
"stars": 2
},
{
"levelNum": 42,
"maxScore": 15660,
"stars": 3
},
{
"levelNum": 43,
"maxScore": 48170,
"stars": 1
},
{
"levelNum": 44,
"maxScore": 18080,
"stars": 1
},
{
"levelNum": 45,
"maxScore": 29170,
"stars": 1
},
{
"levelNum": 46,
"maxScore": 37980,
"stars": 1
},
{
"levelNum": 47,
"maxScore": 37800,
"stars": 3
},
{
"levelNum": 48,
"maxScore": 19950,
"stars": 1
},
{
"levelNum": 49,
"maxScore": 36190,
"stars": 0
},
{
"levelNum": 50,
"maxScore": 42610,
"stars": 2
},
{
"levelNum": 51,
"maxScore": 34300,
"stars": 1
},
{
"levelNum": 52,
"maxScore": 31650,
"stars": 3
},
{
"levelNum": 53,
"maxScore": 5140,
"stars": 0
},
{
"levelNum": 54,
"maxScore": 49630,
"stars": 3
},
{
"levelNum": 55,
"maxScore": 99999,
"stars": 1
},
{
"levelNum": 56,
"maxScore": 99999,
"stars": 3
},
{
"levelNum": 57,
"maxScore": 34090,
"stars": 2
},
{
"levelNum": 58,
"maxScore": 13030,
"stars": 3
},
{
"levelNum": 59,
"maxScore": 72760,
"stars": 1
},
{
"levelNum": 60,
"maxScore": 16250,
"stars": 1
},
{
"levelNum": 61,
"maxScore": 81870,
"stars": 3
},
{
"levelNum": 62,
"maxScore": 36110,
"stars": 1
},
{
"levelNum": 63,
"maxScore": 28240,
"stars": 3
},
{
"levelNum": 64,
"maxScore": 23910,
"stars": 1
},
{
"levelNum": 65,
"maxScore": 47990,
"stars": 1
},
{
"levelNum": 66,
"maxScore": 60740,
"stars": 3
},
{
"levelNum": 67,
"maxScore": 33670,
"stars": 1
},
{
"levelNum": 68,
"maxScore": 25370,
"stars": 3
},
{
"levelNum": 69,
"maxScore": 11650,
"stars": 0
},
{
"levelNum": 70,
"maxScore": 15910,
"stars": 1
}
], ],
"remainProp": [ "remainProp": [
{ {
"type": 2, "type": 2,
"num": 2 "num": 0
}, },
{ {
"type": 3, "type": 3,
"num": 2 "num": 0
}, },
{ {
"type": 4, "type": 4,
"num": 2 "num": 0
} }
], ],
"remainEnargy": 99, "remainEnargy": 9979,
"askForEnergy": false, "askForEnergy": false,
"canReceiveTreasureBoxNum": 10, "canReceiveTreasureBoxNum": 0,
"nextRangeStarsNum": 150 "nextRangeStarsNum": 150
} }
} }
\ 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