Skip to content

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

1

parent a00b52d0
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 364 deletions
egret/libs/new_wx/MainBase.ts
View file @ 1dd761f7
......@@ -40,6 +40,7 @@ import getHomeData, { BLOOD_NUMS_MAX } from "../../src/getHomeData";
import BloodPanel2 from "../../src/panels/BloodPanel2";
import ExchangePanel from "../../src/panels/ExchangePanel";
import { initstatistics } from "../../src/statistics";
import TaskPanel from "../../src/panels/TaskItemRenderer";
export default class MainBase extends eui.UILayer {
constructor() {
......@@ -73,6 +74,8 @@ export default class MainBase extends eui.UILayer {
['prize2', { cls: Prize2Panel }],
['sign', { cls: SignPanel }],
['signPrize', { cls: SignPrizePanel }],
['task', { cls: TaskPanel }],
// ['ad', { cls: AdPanel }],
];
const scenes = [
......
egret/libs/new_wx/components/PrizePanel.ts
View file @ 1dd761f7
......@@ -19,7 +19,7 @@ export default class PrizePanel extends Panel {
setGray(this['picc']);
this._level = parseInt(data.level + '');
const itemid = DataManager.ins.getData('getPlugOrderStatus').lottery.itemId;
this.data.img = `http://yun.duiba.com.cn/db_games/0930/${itemid}.png`;
this.data.img = `http://yun.duiba.com.cn/db_games/09302/${itemid}.png`;
this['shareBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
NetManager.ins.clickLog(getlogItem(15));
......
egret/resource/assets/map/元宝bg.png
View replaced file @ a00b52d0 View file @ 1dd761f7
egret/resource/assets/map/元宝bg.png

22.3 KB | W: | H:

egret/resource/assets/map/元宝bg.png

22.5 KB | W: | H:

egret/resource/assets/map/元宝bg.png
egret/resource/assets/map/元宝bg.png
egret/resource/assets/map/元宝bg.png
egret/resource/assets/map/元宝bg.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/assets/map/宝箱bg.png
View replaced file @ a00b52d0 View file @ 1dd761f7
egret/resource/assets/map/宝箱bg.png

5.68 KB | W: | H:

egret/resource/assets/map/宝箱bg.png

5.38 KB | W: | H:

egret/resource/assets/map/宝箱bg.png
egret/resource/assets/map/宝箱bg.png
egret/resource/assets/map/宝箱bg.png
egret/resource/assets/map/宝箱bg.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/assets/sign/signbtn1.png
View replaced file @ a00b52d0 View file @ 1dd761f7
egret/resource/assets/sign/signbtn1.png

7.84 KB | W: | H:

egret/resource/assets/sign/signbtn1.png

7.72 KB | W: | H:

egret/resource/assets/sign/signbtn1.png
egret/resource/assets/sign/signbtn1.png
egret/resource/assets/sign/signbtn1.png
egret/resource/assets/sign/signbtn1.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/skins/MapSkin.exml
View file @ 1dd761f7
......@@ -5,8 +5,8 @@
<e:Group id="scrollGroup">
</e:Group>
</e:Scroller>
<e:Group id="treasureboxBtn" x="20.61" y="136.24">
<e:Image source="宝箱bg_png"/>
<e:Group id="treasureboxBtn" y="-3.06" x="467.84">
<e:Image source="宝箱bg_png" y="22"/>
<e:Group x="41.08" y="45.48">
<e:Rect id="rect" width="124" height="45" x="0" y="0" visible="false"/>
<e:Image id="progressbg" source="progress2_png" y="0" x="0" visible="false"/>
......@@ -14,8 +14,8 @@
<e:Image source="星星_png" verticalCenter="-2.5" x="-17.31"/>
<e:Label id="totalStarTxt" text="0/0" x="24.04" verticalAlign="middle" textAlign="left" size="26" verticalCenter="1.5" bold="true"/>
</e:Group>
<e:Image id="box" source="宝箱_png" right="24" verticalCenter="3" anchorOffsetX="34" anchorOffsetY="34"/>
<e:Group id="boxiconWrapper" x="200.33" y="34.86" touchEnabled="false" touchChildren="false">
<e:Image id="box" source="宝箱_png" right="32" verticalCenter="13.5" anchorOffsetX="34" anchorOffsetY="34"/>
<e:Group id="boxiconWrapper" x="197.33" y="34.86" touchEnabled="false" touchChildren="false">
<e:Image x="8.32" y="0" source="iconbg_png"/>
<e:Label id="boxNumsTxt" text="0" x="0" verticalAlign="middle" textAlign="center" size="18" width="46" y="6.14"/>
</e:Group>
......@@ -24,7 +24,7 @@
<e:Image source="元宝bg_png" x="0" y="0"/>
<e:Label id="bloodTxt" text="5" x="12.71" y="22.84" width="49" verticalAlign="middle" textAlign="center" size="36"/>
<e:Label id="fullTxt" text="已满" x="76.71" y="29.84" width="82" verticalAlign="middle" textAlign="center" size="24" visible="false"/>
<e:Label id="goldTxt" text="0" x="396.04" y="27.84" width="88" verticalAlign="middle" textAlign="center"/>
<e:Label id="goldTxt" text="0" x="317.23" y="27.84" width="88" verticalAlign="middle" textAlign="center"/>
<e:Button id="bloodBtn" label="" x="168.38" y="16.6">
<e:skinName>
<e:Skin states="up,down,disabled">
......@@ -33,7 +33,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="goldBtn" label="" x="482.2" y="16.6" visible="false">
<e:Button id="goldBtn" label="" x="385.2" y="16.6" visible="false">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="关闭 拷贝_png" source.down="关闭 拷贝_png" source.disabled="关闭 拷贝_png"/>
......@@ -59,7 +59,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="signBtn" label="" x="605.08" y="452.41" scaleX="0.9" scaleY="0.9">
<e:Button id="signBtn" label="" x="29.48" y="158.57" scaleX="0.9" scaleY="0.9">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="map_signicon_png" source.down="map_signicon_png" source.disabled="recordbtn_png"/>
......
egret/src/mapScene/MapScene.ts
View file @ 1dd761f7
......@@ -311,7 +311,9 @@ export default class MapScene extends Scene {
console.log('onTap_taskBtn')
}
onTap_signBtn(){
PanelCtrl.instance.show('sign');
NetManager.ins.getSignInfo(() => {
PanelCtrl.instance.show('sign');
},window['signActivityId'])
}
protected initEvents() {
......
egret/src/panels/AddPanel.ts 0 → 100644
View file @ 1dd761f7
import Panel from "../../libs/new_wx/components/Panel";
import getHomeData, { BLOOD_NUMS_MAX } from "../getHomeData";
import { NetManager } from "../../libs/tw/manager/NetManager";
import SceneCtrl from "../../libs/new_wx/ctrls/sceneCtrl";
import { showToast } from "../../libs/new_wx/ctrls/toastCtrl";
import { getlogItem } from "../Main";
import wait from "../../libs/new_tc/wait";
import { showShare } from "../shareCtrl";
import { iswx } from "../iswx";
import getShowOffPic from "../getShowOffPic";
import getSharePic, { getShareUrl } from "../getSharePic";
import CountDown from "../mapScene/CountDown";
import { updateMainTimer } from "../../libs/new_wx/MainBase";
export default class AddPanel 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']] }
get skinKey() { return 'Task' }
}
\ No newline at end of file
egret/src/panels/BoxPanel.ts
View file @ 1dd761f7
......@@ -14,7 +14,7 @@ export default class BoxPanel extends Panel {
// this.data.img = DataManager.ins.getData('getPlugOrderStatus').lottery.imgurl;
const itemid = DataManager.ins.getData('getPlugOrderStatus').lottery.itemId;
this.data.img = `http://yun.duiba.com.cn/db_games/0930/${itemid}.png`;
this.data.img = `http://yun.duiba.com.cn/db_games/09302/${itemid}.png`;
}
showlog() {
NetManager.ins.showLog(getlogItem(17));
......
egret/src/panels/SignPrizePanel.ts
View file @ 1dd761f7
......@@ -17,7 +17,7 @@ export default class SignPrizePanel extends Panel {
this['numsgroup'].visible=false;
} else {
if(customInfo.itemId)
this['img'].source = `http://yun.duiba.com.cn/db_games/0930/${customInfo.itemId}.png`;
this['img'].source = `http://yun.duiba.com.cn/db_games/09302/${customInfo.itemId}.png`;
}
this['nums'].text ='x'+ customInfo.prizeCount;
......
mock/happyclear/home.json
View file @ 1dd761f7
......@@ -7,356 +7,6 @@
"wealth": 7960,
"totalStars": 145,
"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": [
{
......@@ -374,7 +24,7 @@
],
"remainEnargy": 9979,
"askForEnergy": false,
"canReceiveTreasureBoxNum": 0,
"canReceiveTreasureBoxNum": 10,
"nextRangeStarsNum": 150
}
}
\ No newline at end of file
mock/happyclear/submit.json
View file @ 1dd761f7
......@@ -4,7 +4,7 @@
"desc":"OK",
"timestamp":1566546925981,
"data":{
"prizeType":2,
"prizeType":1,
"prizeResponse":{
"errorCode":null,
"changeMoney":888,
......
mock/json/getPlugOrderStatus.json
View file @ 1dd761f7
......@@ -7,7 +7,7 @@
"imgurl": "//yun.duiba.com.cn/developer/img/activityTool/slotMachine/virtual.png",
"isAppHidden": true,
"isDownloadUrl": true,
"itemId": 59521,
"itemId": 59031,
"link": "//activity.m.duibadev.com.cn/activity/takePrizeNew?recordId=30035037&dbnewopen",
"linkTo": 0,
"title": "宝箱1",
......
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