Skip to content

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

1

parent 313f6a39
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 15 deletions
egret/libs/new_wx/MainBase.ts
View file @ b4f46283
......@@ -165,6 +165,7 @@ export default class MainBase extends eui.UILayer {
RES.getResAsync('mapBg_mp3');
RES.getResAsync('sharefriend_jpg');
RES.getResAsync(`nums_png`);
RES.getResAsync(`sharenums_fnt`);
RES.getResAsync(`nums_fnt`);
RES.getResAsync(`nums2_png`);
RES.getResAsync(`nums2_fnt`);
......
egret/resource/TextureMerger/map.tmproject
View file @ b4f46283
{"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
{"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","../assets/map/map明日可领.png","../assets/map/map今日可领.png"]}
\ No newline at end of file
egret/resource/assets/common/sharenums.fnt 0 → 100644
View file @ b4f46283
{"file":"sharenums.png","frames":{
"0":{"x":61,"y":0,"w":58,"h":79,"offX":0,"offY":0,"sourceW":58,"sourceH":79},
"1":{"x":170,"y":161,"w":31,"h":78,"offX":0,"offY":0,"sourceW":31,"sourceH":78},
"2":{"x":57,"y":161,"w":53,"h":79,"offX":0,"offY":0,"sourceW":53,"sourceH":79},
"3":{"x":114,"y":81,"w":54,"h":79,"offX":0,"offY":0,"sourceW":54,"sourceH":79},
"4":{"x":0,"y":0,"w":59,"h":79,"offX":0,"offY":0,"sourceW":59,"sourceH":79},
"5":{"x":170,"y":81,"w":54,"h":78,"offX":0,"offY":0,"sourceW":54,"sourceH":78},
"6":{"x":121,"y":0,"w":55,"h":79,"offX":0,"offY":0,"sourceW":55,"sourceH":79},
"7":{"x":57,"y":81,"w":55,"h":78,"offX":0,"offY":0,"sourceW":55,"sourceH":78},
"8":{"x":178,"y":0,"w":55,"h":79,"offX":0,"offY":0,"sourceW":55,"sourceH":79},
"9":{"x":0,"y":81,"w":55,"h":79,"offX":0,"offY":0,"sourceW":55,"sourceH":79}}}
\ No newline at end of file
egret/resource/default.res.json
View file @ b4f46283
......@@ -2284,6 +2284,16 @@
"url": "assets/map/map今日可领.png",
"type": "image",
"name": "map今日可领_png"
},
{
"url": "assets/common/sharenums.fnt",
"type": "font",
"name": "sharenums_fnt"
},
{
"url": "assets/common/sharenums.png",
"type": "image",
"name": "sharenums_png"
}
]
}
\ No newline at end of file
egret/resource/skins/FriendShareSkin.exml
View file @ b4f46283
......@@ -2,7 +2,7 @@
<e:Skin class="FriendShareSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Rect width="750" height="1624" fillAlpha="0.7"/>
<e:Image source="sharefriendwx_jpg"/>
<e:Label id="lvTxt" text="120" y="319.99" anchorOffsetX="0" anchorOffsetY="0" bold="true" textAlign="center" verticalAlign="middle" size="106" textColor="0xB14D00" x="280" width="189"/>
<e:Label id="lvTxt0" text="120" y="319.99" anchorOffsetX="0" anchorOffsetY="0" bold="true" textAlign="center" verticalAlign="middle" size="106" textColor="0xB14D00" x="280" width="189" visible="false"/>
<e:Group x="306" y="-8.7">
<e:Image id="avatar" y="0" width="140" height="140" x="0" source=""/>
<e:Rect id="avatarMask" width="140" height="140" y="0" ellipseWidth="140" ellipseHeight="140" x="0"/>
......@@ -11,4 +11,5 @@
<e:Image source="sharefriend_png" y="0" x="0"/>
<e:Label id="nameTxt" text="打发顺丰" width="149" verticalAlign="middle" textAlign="center" size="18" height="45" x="16"/>
</e:Group>
<e:BitmapLabel id="lvTxt" y="328.38" text="150" font="sharenums_fnt" horizontalCenter="0"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/MapSkin.exml
View file @ b4f46283
......@@ -43,7 +43,7 @@
</e:Button>
<e:Label id="countdown" text="00:00:00" x="77.39" y="31.19" verticalAlign="middle" textAlign="center" size="22"/>
</e:Group>
<e:Button id="shopBtn" label="" x="613.08" y="128.01">
<e:Button id="shopBtn" label="" x="613.08" y="174.01">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="道具_png" source.down="道具_png" source.disabled="道具_png"/>
......@@ -51,7 +51,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="recordBtn" label="" x="614.14" y="257.91">
<e:Button id="recordBtn" label="" x="614.14" y="323.76">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="recordbtn_png" source.down="recordbtn_png" source.disabled="recordbtn_png"/>
......@@ -68,7 +68,7 @@
<e:Image source="namebg_png" horizontalCenter="-4" bottom="-4"/>
<e:Label id="nameTxt" text="La121233bel" y="91.5" size="20" horizontalCenter="1"/>
</e:Group>
<e:Image id="adBtn" y="390.02" source="ad_icon_png" right="24" width="122" height="122"/>
<e:Image id="adBtn" y="474.02" source="ad_icon_png" right="24" width="122" height="122"/>
<e:Button id="taskBtn" label="" x="572.62" y="248.51" visible="false">
<e:skinName>
<e:Skin states="up,down,disabled">
......
egret/resource/skins/Share3Skin.exml
View file @ b4f46283
......@@ -5,7 +5,8 @@
<e:Group id="pic" x="86" y="46">
<e:Group y="0" x="0">
<e:Image x="0" y="0" source="sharefriend_jpg"/>
<e:Label id="lvTxt" text="120" y="286.58" anchorOffsetX="0" anchorOffsetY="0" bold="true" textAlign="center" verticalAlign="middle" size="90" textColor="0xb14d00" horizontalCenter="0"/>
<e:Label id="lvTxt1" text="120" y="286.58" anchorOffsetX="0" anchorOffsetY="0" bold="true" textAlign="center" verticalAlign="middle" size="90" textColor="0xb14d00" horizontalCenter="0" visible="false"/>
<e:BitmapLabel id="lvTxt" y="294.38" text="888" font="sharenums_fnt" horizontalCenter="0" scaleX="0.8" scaleY="0.8"/>
</e:Group>
<e:Group x="236.86" y="44.78">
<e:Image id="avatar" y="0" width="108" height="108" x="0" source=""/>
......
egret/src/mapScene/MapScene.ts
View file @ b4f46283
......@@ -24,7 +24,7 @@ import { GDispatcher } from "../../libs/tc/util/GDispatcher";
import Loading from "../../libs/new_wx/components/Loading";
let doHelpFlag = false;
let adTag = false;
// let adTag = false;
export default class MapScene extends Scene {
static adData;
scrollGroup: eui.Group;
......@@ -90,8 +90,8 @@ export default class MapScene extends Scene {
const nowTimerStr = date.getTime() + '';
const oldTimerStr = localStorage.getItem('nowTimerStr' + window['CFG'].consumerId);
// const nowTimerStr2 = date.getTime() + '';
// const oldTimerStr2 = localStorage.getItem('nowTimer2Str' + window['CFG'].consumerId);
const nowTimerStr2 = date.getTime() + '';
const oldTimerStr2 = localStorage.getItem('nowTimer2Str' + window['CFG'].consumerId);
const hc_advert = DataManager.ins.getData('hc_advert').data;
let { noticeAdvert } = hc_advert;
......@@ -99,12 +99,12 @@ export default class MapScene extends Scene {
noticeAdvert = { enable: false }
}
if (noticeAdvert && noticeAdvert.enable) {
if (!adTag) {
if (noticeAdvert && noticeAdvert.enable && nowTimerStr2 != oldTimerStr2) {
// if (!adTag) {
panels.push('ad');
adTag = true;
}
// localStorage.setItem('nowTimer2Str' + window['CFG'].consumerId, nowTimerStr2);
// adTag = true;
// }
localStorage.setItem('nowTimer2Str' + window['CFG'].consumerId, nowTimerStr2);
}
const { signInfoVO } = DataManager.ins.getData('getSignInfo');
......
mock/sign/getSignInfo.json
View file @ b4f46283
......@@ -2,6 +2,6 @@
"success": true,
"signInfoVO": {
"continueDay": 6,
"todaySigned": 1
"todaySigned": 0
}
}
\ 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