Skip to content

X
xiaoxiaole
Commit bcbfa6df authored by wjf's avatar wjf
Browse files
Options

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

parents 4f64253d da59a54c
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 47 deletions
egret/libs/new_wx/MainBase.ts
View file @ bcbfa6df
......@@ -324,10 +324,12 @@ export default class MainBase extends eui.UILayer {
}
if (window['isInvitePage'] == 1) {
this.ajaxElement().then(() => {
Buried.init();
SceneCtrl.instance.change(ModuleTypes.INVITE_SCENE);
})
} else if (window['isInvitePage'] == 2) {
this.ajaxElement().then(() => {
Buried.init();
SceneCtrl.instance.change(ModuleTypes.INVITE_SCENE2);
})
}
......
egret/libs/new_wx/components/TurnRulePanel.ts
View file @ bcbfa6df
......@@ -15,9 +15,14 @@ export default class TurnRulePanel extends Panel {
group: eui.Group;
private addRule() {
const text =
`<br>1、新用户点击“去闯关”按钮后，进入游戏参与闯关即可为好友助力成功。<br>2、新用户仅包含未参与过狮狮连萌活动的用户。<br>3、用户不可为自己助力，或重复为好友助力。<br>`;
const text = `<br>抽奖说明
1、游戏期间，用户每成功闯过5个新关卡即可获得1次免费抽奖机会，免费抽奖机会可累计。
2、若免费抽奖机会全部用完，玩家还可以使用元宝进行抽奖。
3、转盘为概率中奖；奖励有红包、刮刮卡、体力、元宝、随机道具共5种奖励类型。
4、发放的奖励请在规定的有效时间内尽快领取或使用，逾期未领取或使用的会失效哦。
5、活动过程中，凡以不正当手段（包括但不限于作弊、恶意套现、扰乱系统、网络攻击等违规行为）参与本次活动的用户，苏宁易购有权终止其参加活动，并取消其获得奖励的资格。
6、极少数特殊情况下，若用户在完成活动的任务中被系统判定异常账户或风控账户，则可能导致奖励发放异常。
7、如遇不可抗力（包括但不限于重大自然灾害事件、活动受政府机关指令需要停止举办或调整的、活动遭受严重网络攻击不能正常进行的），苏宁易购有权取消、修改或暂停活动。<br>`;
this.labContent.textFlow = (new HtmlTextParser).parser(text);
}
......
egret/resource/TextureMerger/preload.tmproject deleted 100644 → 0
View file @ 4f64253d
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["../assets/blood/blood去分享.png","../assets/blood2/blood2去分享按钮.png"]}
\ No newline at end of file
egret/resource/assets/shop/shopbtn1.png
View replaced file @ 4f64253d View file @ bcbfa6df
egret/resource/assets/shop/shopbtn1.png

12.3 KB | W: | H:

egret/resource/assets/shop/shopbtn1.png

13.3 KB | W: | H:

egret/resource/assets/shop/shopbtn1.png
egret/resource/assets/shop/shopbtn1.png
egret/resource/assets/shop/shopbtn1.png
egret/resource/assets/shop/shopbtn1.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/skins/Buy1Skin.exml
View file @ bcbfa6df
......@@ -19,9 +19,9 @@
</e:skinName>
</e:Button>
<e:Group y="706" horizontalCenter="0">
<e:Label text="可使用的元宝：" x="34.88" y="0" textColor="0x885037" size="24"/>
<e:Label id="moneyTxt" text="00000" x="192.97" y="0" textColor="0x885037" size="24"/>
<e:Label text="可使用的元宝：" x="34.88" y="0" textColor="0x885037" size="24" fontFamily="FZY3JW"/>
<e:Label id="moneyTxt" text="00000" x="192.97" y="0" textColor="0x885037" size="24" fontFamily="FZY3JW"/>
<e:Image source="common_yuanbao_png" x="2.93" y="1.04"/>
</e:Group>
<e:Label id="priceTxt" text="-3" x="257.08" y="613" bold="true" size="47" touchEnabled="false" width="131" textAlign="right"/>
<e:Label id="priceTxt" text="-3" x="257.08" y="613" bold="true" size="47" touchEnabled="false" width="131" textAlign="right" fontFamily="FZY3JW"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/Buy2Skin.exml
View file @ bcbfa6df
......@@ -22,5 +22,5 @@
<e:Label id="moneyTxt" text="00000" x="192.97" y="0" textColor="0x885037" size="24"/>
<e:Image source="common_yuanbao_png" x="2.93" y="1.04"/>
</e:Group>
<e:Label id="priceTxt" text="-2" x="243.08" y="611" bold="true" size="50" touchEnabled="false" width="144" textAlign="right"/>
<e:Label id="priceTxt" text="-2" x="243.08" y="611" bold="true" size="50" touchEnabled="false" width="144" textAlign="right" fontFamily="FZY3JW"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/Buy3Skin.exml
View file @ bcbfa6df
......@@ -23,5 +23,5 @@
<e:Label id="moneyTxt" text="00000" x="192.97" y="0" textColor="0x885037" size="24"/>
<e:Image source="common_yuanbao_png" x="2.93" y="1.04"/>
</e:Group>
<e:Label id="priceTxt" text="-5" x="250.08" y="613" bold="true" size="48" touchEnabled="false" width="140" textAlign="right"/>
<e:Label id="priceTxt" text="-5" x="250.08" y="613" bold="true" size="48" touchEnabled="false" width="140" textAlign="right" fontFamily="FZY3JW"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/ExchangeSkin.exml
View file @ bcbfa6df
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="ExchangeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16c984f7919"/>
<e:Image y="50" horizontalCenter="0" source="exchange_png"/>
<e:Image y="55.2" source="exchange_png" horizontalCenter="0"/>
<e:Button id="buyBtn" label="" y="589" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
......@@ -18,7 +18,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="priceTxt" text="-1000" x="231.08" y="615" bold="true" size="44" touchEnabled="false" width="169" textAlign="right"/>
<e:Label id="priceTxt" text="-1000" x="231.08" y="615" bold="true" size="44" touchEnabled="false" width="169" textAlign="right" fontFamily="FZY3JW"/>
<e:Group y="706" horizontalCenter="0">
<e:Label text="可使用的元宝：" x="34.88" y="0" textColor="0x885037" size="24"/>
<e:Label id="moneyTxt" text="00000" x="192.97" y="0" textColor="0x885037" size="24"/>
......
egret/resource/skins/ScratchRuleSkin.exml
View file @ bcbfa6df
......@@ -4,7 +4,7 @@
<e:Image id="ruleBg" horizontalCenter="0.5" y="152" source="scratch_rule_bg_png"/>
<e:Scroller id="scroller" width="545" x="104.76" height="507" y="377.2">
<e:Group id="group" width="100%">
<e:Label id="labContent" width="100%" text="" lineSpacing="10" size="30" multiline="true" textColor="0xa54615"/>
<e:Label id="labContent" width="100%" text="" lineSpacing="10" size="30" multiline="true" textColor="0xa54615" fontFamily="FZY3JW"/>
<e:layout>
<e:VerticalLayout/>
</e:layout>
......
egret/resource/skins/ShopSkin.exml
View file @ bcbfa6df
......@@ -2,10 +2,10 @@
<e:Skin class="ShopSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16c953f5068" horizontalCenter="0"/>
<e:Image source="道具商城_png" y="42" horizontalCenter="0"/>
<e:Label id="price1Txt" text="20" y="395.86" x="294.52" size="27" textColor="0xc33700"/>
<e:Label id="price2Txt" text="20" y="541.44" textColor="0xC33700" x="295.4" size="27"/>
<e:Label id="price3Txt" text="20" y="680.64" textColor="0xC33700" x="294.76" size="27"/>
<e:Label id="price4Txt" text="20" y="819.28" textColor="0xC33700" x="297.16" size="27"/>
<e:Label id="price1Txt" text="20" y="395.86" x="294.52" size="27" textColor="0xc33700" fontFamily="FZY3JW"/>
<e:Label id="price2Txt" text="20" y="541.44" textColor="0xC33700" x="295.4" size="27" fontFamily="FZY3JW"/>
<e:Label id="price3Txt" text="20" y="680.64" textColor="0xC33700" x="294.76" size="27" fontFamily="FZY3JW"/>
<e:Label id="price4Txt" text="20" y="819.28" textColor="0xC33700" x="297.16" size="27" fontFamily="FZY3JW"/>
<e:Button id="closeBtn" label="" x="614" y="230">
<e:skinName>
<e:Skin states="up,down,disabled">
......@@ -46,5 +46,5 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="moneyTxt" text="0000" x="421.24" y="886" textColor="0x885037" size="24"/>
<e:Label id="moneyTxt" text="0000" x="421.24" y="886" textColor="0x885037" size="24" fontFamily="FZY3JW"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/TurnRuleSkin.exml
View file @ bcbfa6df
......@@ -3,7 +3,7 @@
<e:Image id="ruleBg" horizontalCenter="0.5" y="152" source="turnrule抽奖说明_png"/>
<e:Scroller id="scroller" width="545" x="104.76" height="507" y="377.2">
<e:Group id="group" width="100%">
<e:Label id="labContent" width="100%" text="" lineSpacing="10" size="30" multiline="true" textColor="0xa54615"/>
<e:Label id="labContent" width="100%" text="" lineSpacing="10" size="30" multiline="true" textColor="0xa54615" fontFamily="FZY3JW"/>
<e:layout>
<e:VerticalLayout/>
</e:layout>
......
egret/resource/skins/TurntableNoPrizeSkin.exml
View file @ bcbfa6df
......@@ -30,8 +30,8 @@
</e:Button>
<e:Label id="status2" text="（免费次数:1）" x="69.3" y="62.66" size="22" touchEnabled="false" visible="false"/>
<e:Group id="status1" x="52" y="60" touchChildren="false" touchEnabled="false">
<e:Label text="）" x="132" y="2" size="22" touchEnabled="false"/>
<e:Label id="nums" text="（-50" x="0" y="3" size="22" textAlign="right" width="82" touchEnabled="false"/>
<e:Label text="）" x="132" y="2" size="22" touchEnabled="false" fontFamily="FZY3JW"/>
<e:Label id="nums" text="（-50" x="0" y="3" size="22" textAlign="right" width="82" touchEnabled="false" fontFamily="FZY3JW"/>
<e:Image source="common_yuanbao_png" x="91.99" y="1.67"/>
</e:Group>
</e:Group>
......
egret/resource/skins/TurntablePrize2Skin.exml
View file @ bcbfa6df
......@@ -6,7 +6,7 @@
<e:Group id="container" y="-98.45" x="-3"/>
<e:Image source="turnprize2bg_png" y="159" horizontalCenter="0"/>
<e:Image y="323" source="scratch_card_bg_png" horizontalCenter="0"/>
<e:Image id="prizeImg" width="508" height="225" source="" x="121" y="345"/>
<e:Image id="prizeImg" width="508" height="225" source="" y="345" x="121"/>
<e:Button id="closeBtn" label="" y="242.88" x="615">
<e:skinName>
<e:Skin states="up,down,disabled">
......@@ -21,7 +21,7 @@
<e:Group id="progressGroup" x="8" verticalCenter="0">
<e:Image id="progressBg" source="scratch_progress_bg_png" anchorOffsetX="0" anchorOffsetY="0" x="0" y="0" width="437" height="22"/>
<e:Rect id="progress" fillColor="0xEB1917" left="0" verticalCenter="0" width="0" top="0" bottom="0"/>
<e:Label id="progressLabel" text="仅剩90.7%" size="18" bold="true" verticalAlign="middle" textAlign="center" horizontalCenter="0" verticalCenter="0"/>
<e:Label id="progressLabel" text="仅剩90.7%" size="18" bold="true" verticalAlign="middle" textAlign="center" horizontalCenter="0" verticalCenter="0" fontFamily="FZY3JW"/>
</e:Group>
<e:Image id="hongbao" source="scratch_hongbao_png" scaleX="1" scaleY="1" verticalCenter="0" horizontalCenter="219"/>
</e:Group>
......
egret/resource/skins/TurntablePrizeSkin.exml
View file @ bcbfa6df
......@@ -39,8 +39,8 @@
</e:skinName>
</e:Button>
<e:Group id="status1" x="52" y="60">
<e:Label text="）" x="128.96" y="2" size="22" touchEnabled="false"/>
<e:Label id="nums" text="（-50" x="3.04" y="1.52" size="22" textAlign="right" width="82" touchEnabled="false"/>
<e:Label text="）" x="128.96" y="2" size="22" touchEnabled="false" fontFamily="FZY3JW"/>
<e:Label id="nums" text="（-50" x="3.04" y="1.52" size="22" textAlign="right" width="82" touchEnabled="false" fontFamily="FZY3JW"/>
<e:Image source="common_yuanbao_png" x="91.99" y="1.67"/>
</e:Group>
</e:Group>
......
egret/resource/skins/TurntableSkin.exml
View file @ bcbfa6df
......@@ -38,7 +38,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="btnLabel" text="Label" size="20" verticalCenter="30.5" verticalAlign="middle" textAlign="center" bold="true" horizontalCenter="0" touchEnabled="false"/>
<e:Label id="btnLabel" text="Label" size="20" verticalCenter="30.5" verticalAlign="middle" textAlign="center" bold="true" horizontalCenter="0" touchEnabled="false" fontFamily="FZY3JW"/>
</e:Group>
<e:Button id="closeBtn" label="" y="292.88" x="565.89">
<e:skinName>
......@@ -49,6 +49,6 @@
</e:skinName>
</e:Button>
<e:Group id="container2"/>
<e:Label id="nums" text="当前可用元宝：0" y="951" textColor="0xffe9c0" horizontalCenter="0"/>
<e:Label id="nums" text="当前可用元宝：0" y="951" textColor="0xffe9c0" horizontalCenter="0" fontFamily="FZY3JW"/>
<e:Image id="rulebtn" source="turntable_rulebtn_png" y="1000" horizontalCenter="0"/>
</e:Skin>
\ No newline at end of file
egret/src/H5Scene.ts
View file @ bcbfa6df
import Scene from "../libs/new_wx/components/Scene";
import Utils from "./Utils";
import PanelCtrl from "../libs/new_wx/ctrls/panelCtrl";
import { NetManager } from "../libs/tw/manager/NetManager";
import { getlogItem } from "./Main";
export default class H5Scene extends Scene {
async start(data?) {
super.start();
NetManager.ins.showLog(getlogItem(35));
this['rulebtn'].addEventListener(egret.TouchEvent.TOUCH_TAP,()=>{
PanelCtrl.instance.show('inviterule')
},this);
this['gobtn'].addEventListener(egret.TouchEvent.TOUCH_TAP,()=>{
NetManager.ins.clickLog(getlogItem(35));
const code = Utils.getRequestByKey('shareCode');
window.location.href = `${window['targetUrl']}&shareCode=${code}`
},this);
}
get skinKey() { return 'H5' }
}
egret/src/mapScene/MapScene.ts
View file @ bcbfa6df
......@@ -801,6 +801,10 @@ export default class MapScene extends Scene {
showToast('哎呀！奖励与您擦肩而过！快继续闯关！');
}
NetManager.ins.hc_home(() => {
this.updateScene();
}, window['collectRuleId']);
} else {
PanelCtrl.instance.show('box2');
}
......
egret/src/panels/BackPanel.ts
View file @ bcbfa6df
......@@ -26,7 +26,7 @@ export default class BackPanel extends Panel {
}
onTapInvite() {
gotoNextLevel();
// gotoNextLevel();
}
updateOption(option: any) {
......
egret/src/panels/ScratchPanel.ts
View file @ bcbfa6df
......@@ -62,7 +62,6 @@ export default class ScratchPanel extends Panel {
this.setGtaphics(this["prizeImg"].x - 30, this["prizeImg"].y + this["prizeImg"].height);
}, 500);
const scratchData = DataManager.ins.getData('hc_turnableDojoin');
this['light1'].visible = this['light2'].visible = false;
this['con'].addChild(this.data.mv);
......
mock/happyclear/getBackReward.json
View file @ bcbfa6df
......@@ -16,6 +16,6 @@
"value":"虚拟商品标识符"
},
"desc":"OK",
"success":0,
"success":1,
"timestamp":1572079274940
}
\ No newline at end of file
mock/happyclear/home.json
View file @ bcbfa6df
......@@ -4,7 +4,7 @@
"desc": "OK",
"timestamp": 1571819565824,
"data": {
"wealth": 140,
"wealth": 999,
"totalStars": 359,
"levels": [
],
......@@ -25,8 +25,8 @@
"remainEnargy": 5,
"askForEnergy":false,
"canReceiveTreasureBoxNum": 10,
"nextRangeStarsNum": 0,
"isGetAllTreasureBox": true,
"nextRangeStarsNum": 100,
"isGetAllTreasureBox": false,
"refectionCountdown": 1685
}
}
\ No newline at end of file
mock/happyclear/scratchGetTaskInfo.json
View file @ bcbfa6df
......@@ -2,17 +2,17 @@
"success": true,
"code": "0000000000",
"desc": "OK",
"timestamp": 1572420059060,
"timestamp": 1572427313222,
"data": {
"scratchCardTaskId": 3,
"scratchCardTaskId": 9,
"taskStatus": 1,
"prizeImage": "//yun.dui88.com/images/201910/9u6nk8sjt8.jpg",
"currentTime": 1572420059060,
"endTime": 1572493282000,
"completePercent": "98",
"remainPercent": "0",
"prizeImage": "//yun.dui88.com/images/201910/gxqaecxymq.jpg",
"currentTime": 1572427313215,
"endTime": 1572513706000,
"completePercent": "91.0",
"remainPercent": "9.0",
"totalNeedCount": 1,
"helpedCount": 1,
"avatarList": null
"helpedCount": 0,
"avatarList": []
}
}
\ No newline at end of file
mock/happyclear/turnabledojoin.json
View file @ bcbfa6df
......@@ -2,14 +2,14 @@
"success": true,
"code": "0000000000",
"desc": "OK",
"timestamp": 1572327888728,
"timestamp": 1572428041912,
"data": {
"isScratchCard": true,
"option": {
"scratchCardTaskId": 7,
"prizeImage": "//yun.dui88.com/images/201910/e6pmpk2pne.png",
"completePercent": "98",
"remainPercent": null
"scratchCardTaskId": 12,
"prizeImage": "//yun.dui88.com/images/201910/dx04j91xfk.gif",
"completePercent": "90",
"remainPercent": "10"
},
"orderNum": null
}
......
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