Skip to content

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

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

parents 49695d25 b669348b
Show whitespace changes
Inline Side-by-side
Showing with 226 additions and 144 deletions
egret/index.html
View file @ bd37f437
......@@ -5,12 +5,12 @@
<meta charset="utf-8">
<title>Egret</title>
<meta name="viewport"
content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="full-screen" content="true" />
<meta name="screen-orientation" content="portrait" />
<meta name="x5-fullscreen" content="true" />
<meta name="360-fullscreen" content="true" />
content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<meta name="apple-mobile-web-app-capable" content="yes"/>
<meta name="full-screen" content="true"/>
<meta name="screen-orientation" content="portrait"/>
<meta name="x5-fullscreen" content="true"/>
<meta name="360-fullscreen" content="true"/>
<style>
html,
body {
......@@ -25,39 +25,46 @@
margin: 0;
height: 100%;
}
@font-face{
font-family: "z2";
src: url("resource/assets/common/HuaKang_YuanTi_W5.TTF");
@font-face {
font-family: "FZY3JW";
src: url("resource/assets/common/FZY3JW_1.TTF");
}
@font-face {
font-family: "FZY4JW";
src: url("resource/assets/common/FZY4JW.TTF");
}
</style>
</head>
<body>
<div style="margin: auto;width: 100%;height: 100%;" class="egret-player" data-entry-class="Main"
<div style="margin: auto;width: 100%;height: 100%;" class="egret-player" data-entry-class="Main"
data-orientation="auto" data-scale-mode="showAll" data-frame-rate="60" data-content-width="750"
data-content-height="1624" data-multi-fingered="2" data-show-fps="false" data-show-log="false"
data-show-fps-style="x:0,y:0,size:12,textColor:0xffffff,bgAlpha:0.9">
</div>
</div>
<script src="libs/modules/egret/egret.js"></script>
<script src="libs/modules/egret/egret.web.js"></script>
<script src="libs/modules/eui/eui.js"></script>
<script src="libs/modules/assetsmanager/assetsmanager.js"></script>
<script src="libs/modules/tween/tween.js"></script>
<script src="libs/zepto.min.js"></script>
<script src="libs/security.js"></script>
<script src="libs/downloadApp.js"></script>
<script src="libs/svga.egret.min2.js"></script>
<script src="libs/aes.js"></script>
<script src="libs/pad-zeropadding.js"></script>
<!-- //线上不需要 -->
<script src="libs/fileSave.js"></script>
<img id="pic" style="width:100%;position: absolute;z-index: 999;display: none;" />
<script>
window['plugs']=[1,2,3]
<script src="libs/modules/egret/egret.js"></script>
<script src="libs/modules/egret/egret.web.js"></script>
<script src="libs/modules/eui/eui.js"></script>
<script src="libs/modules/assetsmanager/assetsmanager.js"></script>
<script src="libs/modules/tween/tween.js"></script>
<script src="libs/zepto.min.js"></script>
<script src="libs/security.js"></script>
<script src="libs/downloadApp.js"></script>
<script src="libs/svga.egret.min2.js"></script>
<script src="libs/aes.js"></script>
<script src="libs/pad-zeropadding.js"></script>
<!-- //线上不需要 -->
<script src="libs/fileSave.js"></script>
<img id="pic" style="width:100%;position: absolute;z-index: 999;display: none;"/>
<script>
window['plugs'] = [1, 2, 3]
// localStorage.clear();
window['isInvitePage']=0;
var targetUrl='https://gameact.suning.com/sngame-web/api/duiba/private/v1/getLoginUrl.do?appCode=duiba&activityCode=3651404';
window['isInvitePage'] = 0;
var targetUrl = 'https://gameact.suning.com/sngame-web/api/duiba/private/v1/getLoginUrl.do?appCode=duiba&activityCode=3651404';
/*
* 邀请有礼分享
*/
......@@ -71,7 +78,8 @@
if (isIphone()) {
console.log("IOS");
console.log(window.SNNativeClient);
window.callNativeShareResult = function () { };
window.callNativeShareResult = function () {
};
window.SNNativeClient.callNativeShare(title, content, targetUrl, iconUrl, shareWays);
} else {
console.log("安卓");
......@@ -80,6 +88,7 @@
shareApi.callNativeShare(title, content, targetUrl, iconUrl, shareWays);
}
}
function share() {
let title = "";
let content = "";
......@@ -90,7 +99,8 @@
if (isIphone()) {
console.log("IOS");
console.log(window.SNNativeClient);
window.callNativeShareResult = function () { };
window.callNativeShareResult = function () {
};
window.SNNativeClient.callNativeShare(title, content, targetUrl, iconUrl, shareWays);
} else {
console.log("安卓");
......@@ -99,6 +109,7 @@
shareApi.callNativeShare(title, content, targetUrl, iconUrl, shareWays);
}
}
function isIphone() {
var ua = navigator.userAgent.toLocaleLowerCase();
if (ua.match(/iphone|ipad/)) {
......@@ -107,54 +118,110 @@
return false;
}
}
</script>
<script>
</script>
<script>
window['signconfigs'] = [
{ nums: '0.15元', type: 'quan15' },
{ nums: '*1', type: 'hammer' },
{ nums: '0.38元', type: 'quan38' },
{ nums: '*1', type: 'boom' },
{ nums: '0.58元', type: 'quan58' },
{ nums: '*1', type: 'steps' },
{ nums: '随机奖励', type: 'random' }
{nums: '0.15元', type: 'quan15'},
{nums: '*1', type: 'hammer'},
{nums: '0.38元', type: 'quan38'},
{nums: '*1', type: 'boom'},
{nums: '0.58元', type: 'quan58'},
{nums: '*1', type: 'steps'},
{nums: '随机奖励', type: 'random'}
];
// localStorage.clear();
window['imgver']='1022'
window['imgver'] = '1022'
window['total_level'] = 18 + 13 * 14;
window['last_level'] = 200;//必须大于等于total_level
window['last_level'] = 200;//必须大于等于total_level
// localStorage.clear();
var sharePic = document.getElementById('pic');
sharePic.onclick = function(){
sharePic.style.display='none'
sharePic.onclick = function () {
sharePic.style.display = 'none'
}
window['duiba'] = '';
// window['duiba'] = '/duiba';
window['registerWX']=(result)=>{console.log(result)}
window['price1']=123;
window['price2']=2;
window['price3']=3;
window['price4']=4;
window['price5']=555;
window['INIT_BALL_NUMS']=1;
window['registerWX'] = (result) => {
console.log(result)
}
window['price1'] = 123;
window['price2'] = 2;
window['price3'] = 3;
window['price4'] = 4;
window['price5'] = 555;
window['INIT_BALL_NUMS'] = 1;
window['numsP'] = 0.1;
// window['debugPhysics']=true;
window['renderMode'] = 'webgl';
window['development'] = true;
var gameId = 1;
var CFG = { "actId": "3335069", "oaId": "3335069", "unitName": "积分", "btnUnitName": "积分", "doJoin": "/hdtool/doJoin?dpm=1.3.1.0&activityId=3335069", "quireOrder": "/hdtool/getOrderStatus", "styleConfig": "/hdtool/getHdtoolConfig", "getElement": "/hdtool/ajaxElement", "getPrizeDetail": "/hdtool/prizeDetail", "ajaxThroughInfo": "/hdtool/ajaxThroughInfo", "throughSubmit": "/hdtool/throughSubmit", "gameGetOrder": "/hdtool/getOrderInfo", "gameSubmit": "/hdtool/gameSubmit", "doSubmit": "/hdtool/submit", "adslotId": "", "consumerId": "1", "isNotLoginUser": false, "uid": "1", "hdType": "duiba", "hdToolId": "42363", "appType": "credits", "subType": "custom", "directSendCoupon": "false", "ajaxAction": "", "recommendQueue": "/recommend/getRecommend", "recommendSkin": "/recommend/getRecommendSkin", "isShowDetail": true, "preview": false, "from": "", "login": "//activity.m.duiba.com.cn/hdtool/login?dpm=1.3.3.0", "flowRedirectUrl": "", "flowRedirectTuiaUrl": "", "isOpenRecommend": false, "getCreditsLink": "http://baidu.com?uid=1&dbnewopen", "appId": "1", "recordUrl": "//activity.m.duiba.com.cn/crecord/record?dbnewopen&dpm=1.3.2.0", "shareDesc": "分享分享文案文案", "entranceDesc": "测试领奖，也可到我的奖品领奖，24小时内有效哦", "isSHowMeat": true, "needCouponModal": true, "needRecommendModal": true, "asyncFiles": [], "shareAndroidLinkActivity": "http://www.duiba.com.cn", "shareIosLinkActivity": "http://www.iqiyi.com", "appName": "custom", "needShare": true, "shareTitle": "", "shareSubTitle": "", "sharePicUrl": "", "shareLink": "", "shareAndroidDeeplink": "", "shareIOSDeeplink": "" };
var CFG = {
"actId": "3335069",
"oaId": "3335069",
"unitName": "积分",
"btnUnitName": "积分",
"doJoin": "/hdtool/doJoin?dpm=1.3.1.0&activityId=3335069",
"quireOrder": "/hdtool/getOrderStatus",
"styleConfig": "/hdtool/getHdtoolConfig",
"getElement": "/hdtool/ajaxElement",
"getPrizeDetail": "/hdtool/prizeDetail",
"ajaxThroughInfo": "/hdtool/ajaxThroughInfo",
"throughSubmit": "/hdtool/throughSubmit",
"gameGetOrder": "/hdtool/getOrderInfo",
"gameSubmit": "/hdtool/gameSubmit",
"doSubmit": "/hdtool/submit",
"adslotId": "",
"consumerId": "1",
"isNotLoginUser": false,
"uid": "1",
"hdType": "duiba",
"hdToolId": "42363",
"appType": "credits",
"subType": "custom",
"directSendCoupon": "false",
"ajaxAction": "",
"recommendQueue": "/recommend/getRecommend",
"recommendSkin": "/recommend/getRecommendSkin",
"isShowDetail": true,
"preview": false,
"from": "",
"login": "//activity.m.duiba.com.cn/hdtool/login?dpm=1.3.3.0",
"flowRedirectUrl": "",
"flowRedirectTuiaUrl": "",
"isOpenRecommend": false,
"getCreditsLink": "http://baidu.com?uid=1&dbnewopen",
"appId": "1",
"recordUrl": "//activity.m.duiba.com.cn/crecord/record?dbnewopen&dpm=1.3.2.0",
"shareDesc": "分享分享文案文案",
"entranceDesc": "测试领奖，也可到我的奖品领奖，24小时内有效哦",
"isSHowMeat": true,
"needCouponModal": true,
"needRecommendModal": true,
"asyncFiles": [],
"shareAndroidLinkActivity": "http://www.duiba.com.cn",
"shareIosLinkActivity": "http://www.iqiyi.com",
"appName": "custom",
"needShare": true,
"shareTitle": "",
"shareSubTitle": "",
"sharePicUrl": "",
"shareLink": "",
"shareAndroidDeeplink": "",
"shareIOSDeeplink": ""
};
var recordUrl = 'record/';
var resPath = '';
function resolve(a) {
var b = eval(a);
return b;
}
</script>
</script>
<script src="output.js"></script>
<script src="output.js"></script>
</body>
</html>
\ No newline at end of file
egret/resource/default.res.json
View file @ bd37f437
......@@ -81,7 +81,7 @@
"name": "signprize"
},
{
"keys": "toast_png,share_btn2_png,share_btn1_png,prizePanelbg_png,nums2_png,nums2_fnt,nums_png,nums_fnt,lightani_png,common_yuanbao_png,common_prizelight_png,common_adbg_png,commmon_okbtn1_png,closeCommonBtn_png,btn_png,alertbg_png,朋友圈中间分享蒙层1_jpg,按钮 副本 4_png,按钮 副本 3_png,exchangebtn_png,turnnoprize再来一次2_png",
"keys": "toast_png,share_btn2_png,share_btn1_png,prizePanelbg_png,nums2_png,nums2_fnt,nums_png,nums_fnt,lightani_png,common_yuanbao_png,common_prizelight_png,common_adbg_png,commmon_okbtn1_png,closeCommonBtn_png,btn_png,alertbg_png,朋友圈中间分享蒙层1_jpg,按钮 副本 4_png,按钮 副本 3_png,exchangebtn_png,turnnoprize再来一次2_png,FZY4JW_TTF,FZY3JW_1_TTF",
"name": "common"
},
{
......@@ -2849,9 +2849,9 @@
"name": "eyeDownRight_png"
},
{
"url": "assets/common/HuaKang_YuanTi_W5.TTF",
"url": "assets/common/FZY3JW_1.TTF",
"type": "bin",
"name": "HuaKang_YuanTi_W5_TTF"
"name": "FZY3JW_1_TTF"
},
{
"url": "assets/mainScene/hairballDisBg.png",
......@@ -2912,6 +2912,11 @@
"url": "assets/mainScene/hairballPiece11.png",
"type": "image",
"name": "hairballPiece11_png"
},
{
"url": "assets/common/FZY4JW.TTF",
"type": "bin",
"name": "FZY4JW_TTF"
}
]
}
\ No newline at end of file
egret/resource/skins/ScratchSkin.exml
View file @ bd37f437
......@@ -26,7 +26,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Label id="cutTimeLabel" text="将在23:43:21后失效" y="895.33" size="28" textColor="0xffffff" horizontalCenter="0.5" fontFamily="z2"/>
<e:Label id="cutTimeLabel" text="将在23:43:21后失效" y="895.33" size="28" textColor="0xffffff" horizontalCenter="0.5" fontFamily="z2" bold="true"/>
<e:Label text="帮刮\n记录" y="805" size="28" textColor="0xFFFFFF" horizontalCenter="-248"/>
<e:Scroller width="487" height="90" y="783" anchorOffsetX="0" anchorOffsetY="0" horizontalCenter="32.5">
<e:Group anchorOffsetX="0" y="2">
......
egret/resource/skins/StartSkin.exml
View file @ bd37f437
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="StartSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16705cb4eec"/>
<e:Label id="FZYTW3" text="1" y="1048" textColor="0x244B00" fontFamily="FZYTW3" horizontalCenter="0"/>
<e:Label id="FZYTW4" text="1" y="1048" textColor="0x244B00" fontFamily="FZYTW4" horizontalCenter="0"/>
<e:Component id="container1" width="20" height="20" x="0" y="0"/>
<e:Component id="container2" width="20" height="20" x="0" y="0"/>
<e:Group x="140" y="1023.94">
......
egret/src/panels/ScratchPanel.ts
View file @ bd37f437
......@@ -93,7 +93,7 @@ export default class ScratchPanel extends Panel {
// 添加邀请图标
let noAvatarNum = this.data.helpedCount - this.data.avatarList.length; // 没有头像的人数
let dNum = this.data.totalNeedCount - this.data.avatarList.length - noAvatarNum; // 没邀请的人数
for(let i = 0; i < noAvatarNum; i++){
for(let i = 0; i < noAvatarNum; i++) {
this.data.avatarList.push("");
}
for(let i = 0; i < dNum; i++) {
......@@ -119,7 +119,7 @@ export default class ScratchPanel extends Panel {
this.setProgress(+this.data.completePercent);
// 倒计时
this.cutTimer = new CutTimer(this["cutTimeLabel"], "将在hh:mm:ss后消失", () => {
this.cutTimer = new CutTimer(this["cutTimeLabel"], "将在hh:mm:ss后失效", () => {
this.hidePanel();
GDispatcher.dispatchEvent("updateScratchTips");
}
......@@ -141,7 +141,7 @@ export default class ScratchPanel extends Panel {
} else if(progress < 0) {
progress = 0;
}
this['numLabel'].text = `共${this.data.avatarList.length}位好友帮你刮了${progress.toFixed(2)}%`;
this['numLabel'].text = `共${2 + this.data.helpedCount}位好友帮你刮了${progress.toFixed(2)}%`;
this["progressLabel"].text = `仅剩${(100 - progress).toFixed(2)}%`; // 进度条文字
let _width = this["progressBg"].width * progress / 100; // 宽度
let dProgress = Math.abs(progress - this["progress"].width / this["progressBg"].width); // 比当前进度的差值的绝对值
......
mock/happyclear/scratchGetTaskInfo.json
View file @ bd37f437
......@@ -2,19 +2,17 @@
"success": true,
"code": "0000000000",
"desc": "OK",
"timestamp": 1572318933388,
"timestamp": 1572405066301,
"data": {
"scratchCardTaskId": 1,
"taskStatus": 1,
"prizeImage": "//yun.dui88.com/images/201910/e6pmpk2pne.png",
"currentTime": 1572318933366,
"endTime": 1572358710000,
"prizeImage": "//yun.dui88.com/images/201910/9u6nk8sjt8.jpg",
"currentTime": 1572405066290,
"endTime": 1572491337000,
"completePercent": "91.0",
"remainPercent": "9.0",
"totalNeedCount": 3,
"helpedCount": 2,
"avatarList": [
null
]
"totalNeedCount": 1,
"helpedCount": 0,
"avatarList": []
}
}
\ No newline at end of file
mock/happyclear/turnablebaseInfo.json
View file @ bd37f437
......@@ -4,7 +4,7 @@
"desc": "OK",
"timestamp": 1572263074076,
"data": {
"remainTimes": null,
"remainTimes": 7,
"costCoinJoinTimes": 0,
"nextTimeNeedCoin": 20,
"luckyDrawInfo": {
......
mock/happyclear/turnabledojoin.json
View file @ bd37f437
......@@ -4,12 +4,22 @@
"desc": "OK",
"timestamp": 1572327888728,
"data": {
"isScratchCard": true,
"isScratchCard": false,
"option": {
"scratchCardTaskId": 7,
"prizeImage": "//yun.dui88.com/images/201910/e6pmpk2pne.png",
"completePercent": "8",
"remainPercent": null
"id": "",
"day": null,
"categoryType": 2,
"title": "11",
"rate": "11",
"minValue": null,
"maxValue": null,
"coinType": null,
"propType": null,
"num": 3,
"img": "",
"appItemId": null,
"name": "",
"value": ""
},
"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