Skip to content

S
shuijf
Commit 89d66558 authored by wildfirecode's avatar wildfirecode
Browse files
Options

1

parent 4c05defa
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 72 deletions
assets/scenes/main.scene
View file @ 89d66558
...@@ -579,7 +579,7 @@ ...@@ -579,7 +579,7 @@
"properties": { "properties": {
"position": { "position": {
"x": -25, "x": -25,
"y": -627.5 "y": -641.525974025974
} }
} }
}, },
...@@ -777,7 +777,7 @@ ...@@ -777,7 +777,7 @@
"properties": { "properties": {
"position": { "position": {
"x": 0, "x": 0,
"y": 324.14285714285717 "y": 287
} }
} }
}, },
...@@ -802,7 +802,7 @@ ...@@ -802,7 +802,7 @@
"properties": { "properties": {
"position": { "position": {
"x": 0, "x": 0,
"y": 284.14285714285717 "y": -541.8311688311687
} }
} }
}, },
......
assets/scripts/dialogs/PrizeDialogContent.ts
View file @ 89d66558
...@@ -9,6 +9,7 @@ import { createTexture, EngineConfig, Entity, Texture } from "scilla/src"; ...@@ -9,6 +9,7 @@ import { createTexture, EngineConfig, Entity, Texture } from "scilla/src";
import DialogContent from "../popup/DialogContent"; import DialogContent from "../popup/DialogContent";
import { setScale, getY, setY } from "../transformUtils"; import { setScale, getY, setY } from "../transformUtils";
import { setText } from "../entityUtils"; import { setText } from "../entityUtils";
import { callApi } from "../net/webService";
export default class PrizeDialogContent extends DialogContent { export default class PrizeDialogContent extends DialogContent {
name: Entity; name: Entity;
...@@ -57,7 +58,18 @@ export default class PrizeDialogContent extends DialogContent { ...@@ -57,7 +58,18 @@ export default class PrizeDialogContent extends DialogContent {
if (isDuibaPrize) {//大牌券 if (isDuibaPrize) {//大牌券
this._link = data.luckBagDetail.link; this._link = data.luckBagDetail.link;
imgUrl = data.luckBagDetail.imgurl; imgUrl = data.luckBagDetail.imgurl;
setY(this.useBtn, this._y) setY(this.useBtn, this._y);
const exposure = data.exposure;
const domain = (exposure.domain ? exposure.domain : '') + '/engine/';
callApi(
domain + 'spmshow',
exposure,
'get', 'jsonp'
).catch(e => {
console.log(e);
});
} else {//线下 } else {//线下
imgUrl = data.imgurl; imgUrl = data.imgurl;
this._link = window['recordUrl']; this._link = window['recordUrl'];
......
assets/scripts/scenes/SceneStart.ts
View file @ 89d66558
...@@ -83,8 +83,8 @@ export default class SceneStart extends ScillaComponent implements INavigatorVie ...@@ -83,8 +83,8 @@ export default class SceneStart extends ScillaComponent implements INavigatorVie
}); });
} }
private STREN = 3; private STREN = 6;
private FREQ = 5; private FREQ = 3;
private SHAK_TIMERS = 10; private SHAK_TIMERS = 10;
private _shakeTimes = -1; private _shakeTimes = -1;
......
fuck.html
View file @ 89d66558
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<div id="gameContainer" style="width: 100%;height: 100%;overflow: hidden;"></div> <div id="gameContainer" style="width: 100%;height: 100%;overflow: hidden;"></div>
<script src="//yun.duiba.com.cn/db_games/zepto.min.js"></script> <script src="//yun.duiba.com.cn/db_games/zepto.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/security.js"></script> <script src="//yun.duiba.com.cn/db_games/security.js"></script>
<script src="//yun.duiba.com.cn/db_games/1561541612/bundle.js"></script> <script src="//yun.duiba.com.cn/db_games/1561607340/bundle.js"></script>
<script> <script>
setTimeout(function () { setTimeout(function () {
var loadingEl = document.getElementById('loading'); var loadingEl = document.getElementById('loading');
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
} }
var options = { var options = {
resPath: "//yun.duiba.com.cn/db_games/1561541612/" resPath: "//yun.duiba.com.cn/db_games/1561607340/"
}; };
window['shuijf'].startup(document.getElementById('gameContainer'), options, onProcess); window['shuijf'].startup(document.getElementById('gameContainer'), options, onProcess);
}, 100); }, 100);
......
manifest.json
View file @ 89d66558
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
"entryScene": "main" "entryScene": "main"
}, },
"webServiceUrl-": "http://10.10.93.204:7555 http://localhost:3010", "webServiceUrl-": "http://10.10.93.204:7555 http://localhost:3010",
"webServiceUrl": "http://localhost:4001", "webServiceUrl": "",
"webServiceUrl2": "http://localhost:4001" "webServiceUrl2": "http://localhost:4001"
}, },
"dataCenterConfig": { "dataCenterConfig": {
......
mock/customActivity/sjf/activity/dojion.json
View file @ 89d66558
{ {
"code": null, "code": null,
"data": { "data": {
"imgurl": "//yun.dui88.com/upload/uP99F1462438316972.png", "imgurl": null,
"luck": null, "luck": {
"orderId": 22, "exposure": {
"freeLimit":1, "dpm": "1.4.1.0",
"prizeType": 4, "os": "Android",
"isEmbed": true,
"orderId": "39",
"consumerId": 1561541886179,
"ip": "127.0.0.1",
"materialId": 18245,
"advertId": 2958,
"dcm": "104.2958.0.0",
"activityId": 2,
"activityUseType": "0",
"appId": 1,
"domain": "//activity.tuia.cn",
"slotId": null
},
"luckBagDetail": {
"androidDownloadUrl": "//activity.tuia.cn/activity/redirect?orderId=39&activityId=2&appId=1&consumerId=1561541886179&materialId=18245&os=Android&advertId=2958&ip=127.0.0.1&activityUseType=0&dpm=1.4.1.0&dcm=104.2958.0.0&device_type=directad&url=www.baidu.com",
"link": null,
"stInfoDpmImg": null,
"useBtnText": "马上使用",
"title": "mock test",
"stInfoDpmGoUse": null,
"stInfoDpmClose": null,
"openUrl": "",
"imgurl": "//yun.dui88.com/babi/img/2omlvuy6mf.jpg",
"showUse": true,
"linkTo": null,
"iosDownloadUrl": "//activity.tuia.cn/activity/redirect?orderId=39&activityId=2&appId=1&consumerId=1561541886179&materialId=18245&os=Android&advertId=2958&ip=127.0.0.1&activityUseType=0&dpm=1.4.1.0&dcm=104.2958.0.0&device_type=directad&url=www.baidu.com",
"couponKey": null,
"tip": "1",
"couponCode": null,
"isDownloadUrl": null,
"validate": "2019-04-26"
}
},
"orderId": 39,
"freeLimit": -6,
"prizeType": 0,
"link": null, "link": null,
"orderStatus": 2, "orderStatus": 2,
"title": "惊喜娃娃机奖品1", "title": "福袋",
"prizeId": 3 "prizeId": null
}, },
"success": true, "success": true,
"desc": null, "desc": null,
"timestamp": 1561540156975 "timestamp": 1561541886231
} }
\ No newline at end of file
mock/customActivity/sjf/activity/dojion1.json 0 → 100644
View file @ 89d66558
{
"code": null,
"data": {
"imgurl": "//yun.dui88.com/upload/uP99F1462438316972.png",
"luck": null,
"orderId": 22,
"freeLimit":1,
"prizeType": 4,
"link": null,
"orderStatus": 2,
"title": "惊喜娃娃机奖品1",
"prizeId": 3
},
"success": true,
"desc": null,
"timestamp": 1561540156975
}
\ No newline at end of file
mock/customActivity/sjf/activity/dojion2.json deleted 100644 → 0
View file @ 4c05defa
{
"code": null,
"data": {
"imgurl": null,
"luck": {
"exposure": {
"dpm": "1.4.1.0",
"os": "Android",
"isEmbed": true,
"orderId": "39",
"consumerId": 1561541886179,
"ip": "127.0.0.1",
"materialId": 18245,
"advertId": 2958,
"dcm": "104.2958.0.0",
"activityId": 2,
"activityUseType": "0",
"appId": 1,
"domain": "//activity.tuia.cn",
"slotId": null
},
"luckBagDetail": {
"androidDownloadUrl": "//activity.tuia.cn/activity/redirect?orderId=39&activityId=2&appId=1&consumerId=1561541886179&materialId=18245&os=Android&advertId=2958&ip=127.0.0.1&activityUseType=0&dpm=1.4.1.0&dcm=104.2958.0.0&device_type=directad&url=www.baidu.com",
"link": null,
"stInfoDpmImg": null,
"useBtnText": "马上使用",
"title": "mock test",
"stInfoDpmGoUse": null,
"stInfoDpmClose": null,
"openUrl": "",
"imgurl": "//yun.dui88.com/babi/img/2omlvuy6mf.jpg",
"showUse": true,
"linkTo": null,
"iosDownloadUrl": "//activity.tuia.cn/activity/redirect?orderId=39&activityId=2&appId=1&consumerId=1561541886179&materialId=18245&os=Android&advertId=2958&ip=127.0.0.1&activityUseType=0&dpm=1.4.1.0&dcm=104.2958.0.0&device_type=directad&url=www.baidu.com",
"couponKey": null,
"tip": "1",
"couponCode": null,
"isDownloadUrl": null,
"validate": "2019-04-26"
}
},
"orderId": 39,
"freeLimit": -6,
"prizeType": 0,
"link": null,
"orderStatus": 2,
"title": "福袋",
"prizeId": null
},
"success": true,
"desc": null,
"timestamp": 1561541886231
}
\ No newline at end of file
mock/customActivity/sjf/activity/rankInfo.json
View file @ 89d66558
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"timestamp": 1561377481101, "timestamp": 1561377481101,
"data": { "data": {
"openPrize": false, "openPrize": false,
"rank": "3", "rank": "501",
"list": [ "list": [
{ {
"weiXinUid": "weiXinUid", "weiXinUid": "weiXinUid",
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
"nickName": "nickName4", "nickName": "nickName4",
"avatar": "//yun.duiba.com.cn/db_games/1.jpg", "avatar": "//yun.duiba.com.cn/db_games/1.jpg",
"score": 204, "score": 204,
"rank": "4" "rank": "未上榜"
}, },
{ {
"weiXinUid": "weiXinUid", "weiXinUid": "weiXinUid",
......
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