Skip to content

N
new_taobao
Commit 0691ec6d authored by AU-Pro-mac's avatar AU-Pro-mac
Browse files
Options

add new code

parent 901551b9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 157 additions and 75 deletions
project/src/canvas/game/output.js
View file @ 0691ec6d
...@@ -1233,11 +1233,11 @@ const resCanvasList = { ...@@ -1233,11 +1233,11 @@ const resCanvasList = {
url: 'https://yun.duiba.com.cn/spark-dev/assets/白色.41dae4fd01f4750aea58f694b40d97a9da8f23ca.png', url: 'https://yun.duiba.com.cn/spark-dev/assets/白色.41dae4fd01f4750aea58f694b40d97a9da8f23ca.png',
uuid: '2a747211-0210-4215-86a2-a6955b37c45b' uuid: '2a747211-0210-4215-86a2-a6955b37c45b'
}, },
'7fcd3fb3-57bd-436a-afca-989b68b6b311': { '3e1043ce-067c-4941-95bc-08b0120ae18a': {
name: '背景', name: '时光挑3817a2jpg',
ext: '.png', ext: '.jpg',
url: 'https://yun.duiba.com.cn/spark-dev/assets/时光挑战赛背景__m.0a7dc2a8e1dc99921330774023817a27285b17d2.png', url: '//yun.duiba.com.cn/spark/assets/时光挑3817a2jpg.8d41ee7a44c43873977b8db844f30e79e2bc19c5.jpg',
uuid: '7fcd3fb3-57bd-436a-afca-989b68b6b311' uuid: '3e1043ce-067c-4941-95bc-08b0120ae18a'
}, },
'7d1ec658-9371-4d52-b4d7-e75d04037daf': { '7d1ec658-9371-4d52-b4d7-e75d04037daf': {
name: '粉色', name: '粉色',
...@@ -1680,11 +1680,29 @@ const resCanvasListCsd = { ...@@ -1680,11 +1680,29 @@ const resCanvasListCsd = {
url: 'https://yun.duiba.com.cn/spark/assets/csd引导3.3cb22a085628a6e43b4e13182c1a26c1ec4c259d.png', url: 'https://yun.duiba.com.cn/spark/assets/csd引导3.3cb22a085628a6e43b4e13182c1a26c1ec4c259d.png',
uuid: '0668f8d0-6fb3-46f9-a5e4-952aef42f05c' uuid: '0668f8d0-6fb3-46f9-a5e4-952aef42f05c'
}, },
'62a701fa-32cc-42a4-a097-b7c451440b36': { // '62a701fa-32cc-42a4-a097-b7c451440b36': {
name: '导出lottie', // name: '导出lottie',
// ext: '.png',
// url: 'https://yun.duiba.com.cn/spark/assets/导出lottie.4f99495be3d5447ac215107bcb935d1434261088.png',
// uuid: '62a701fa-32cc-42a4-a097-b7c451440b36'
// },
'b2489966-e840-477b-bc25-6cb820bc95d8': {
name: '引导页文案修改',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/引导页文案修改.c8d31238e7b2a314590ea0c287cd23756b02a1fc.png',
uuid: 'b2489966-e840-477b-bc25-6cb820bc95d8'
},
'27abf038-2a6b-4914-a212-143628fc7d47': {
name: '引导2_修改',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/引导2_修改.6b93186059aa98bef860061c4936029d3fc95617.png',
uuid: '27abf038-2a6b-4914-a212-143628fc7d47'
},
'b006e393-b6a4-4757-8b56-9762ff9a3319': {
name: 'lottie_new_new',
ext: '.png', ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/导出lottie.4f99495be3d5447ac215107bcb935d1434261088.png', url: '//yun.duiba.com.cn/spark/assets/lottie_new_new.dd99c4444eb07f98afae2a6e05bbcae19f5d132b.png',
uuid: '62a701fa-32cc-42a4-a097-b7c451440b36' uuid: 'b006e393-b6a4-4757-8b56-9762ff9a3319'
} }
}; };
/* harmony default export */ __webpack_exports__["default"] = (resCanvasListCsd); /* harmony default export */ __webpack_exports__["default"] = (resCanvasListCsd);
...@@ -1863,7 +1881,7 @@ var Main = (function () { ...@@ -1863,7 +1881,7 @@ var Main = (function () {
resolve('complete'); resolve('complete');
}, 200); }, 200);
} }
}, resCanvasList['62a701fa-32cc-42a4-a097-b7c451440b36'].url); }, resCanvasList['b006e393-b6a4-4757-8b56-9762ff9a3319'].url);
}); });
}; };
Main.prototype.loadImageTexturesCsd01 = function (resCanvasList) { Main.prototype.loadImageTexturesCsd01 = function (resCanvasList) {
...@@ -1900,7 +1918,6 @@ var Main = (function () { ...@@ -1900,7 +1918,6 @@ var Main = (function () {
return [4, this.loadLottieFasterAndFaster()]; return [4, this.loadLottieFasterAndFaster()];
case 1: case 1:
_a.sent(); _a.sent();
ctrls_1.changeScene(MainScene_2.OpenAni);
resCanvasList = Object.assign(resCanvasList_1.default, resCanvasListCsd_1.default); resCanvasList = Object.assign(resCanvasList_1.default, resCanvasListCsd_1.default);
return [4, RES_1.RES.loadSparkAssets(resCanvasList)]; return [4, RES_1.RES.loadSparkAssets(resCanvasList)];
case 2: case 2:
...@@ -1913,6 +1930,7 @@ var Main = (function () { ...@@ -1913,6 +1930,7 @@ var Main = (function () {
_a.sent(); _a.sent();
console.log('resloadingList 加载完毕'); console.log('resloadingList 加载完毕');
FYGE.GDispatcher.dispatchEvent("loadEnd"); FYGE.GDispatcher.dispatchEvent("loadEnd");
ctrls_1.changeScene(MainScene_1.CsdScene);
return [2]; return [2];
} }
}); });
...@@ -2474,7 +2492,7 @@ var Root = (function (_super) { ...@@ -2474,7 +2492,7 @@ var Root = (function (_super) {
_this.guideIndex = 0; _this.guideIndex = 0;
_this.baseOption = options; _this.baseOption = options;
_this.time = options.gameParm.time; _this.time = options.gameParm.time;
_this.guideRes = ["828f6676-7956-473a-a951-bc2f5f1ba8a3", "bc6aa86d-7cd8-4a11-9bd1-931040af3c6e", "0668f8d0-6fb3-46f9-a5e4-952aef42f05c"]; _this.guideRes = ["828f6676-7956-473a-a951-bc2f5f1ba8a3", "27abf038-2a6b-4914-a212-143628fc7d47", "0668f8d0-6fb3-46f9-a5e4-952aef42f05c"];
_this.once(FYGE.Event.ADDED_TO_STAGE, _this.onAddToStage, _this); _this.once(FYGE.Event.ADDED_TO_STAGE, _this.onAddToStage, _this);
return _this; return _this;
} }
...@@ -5440,7 +5458,7 @@ var Root = (function (_super) { ...@@ -5440,7 +5458,7 @@ var Root = (function (_super) {
this.backGround.y = 0; this.backGround.y = 0;
this.backGround.width = 750; this.backGround.width = 750;
this.backGround.height = 1624; this.backGround.height = 1624;
this.backGround.texture = RES_1.RES.getRes(resCanvasList_1.default['7fcd3fb3-57bd-436a-afca-989b68b6b311'].url); this.backGround.texture = RES_1.RES.getRes(resCanvasList_1.default['3e1043ce-067c-4941-95bc-08b0120ae18a'].url);
this.backGround.visible = false; this.backGround.visible = false;
this.addChild(this.backGround); this.addChild(this.backGround);
this.openAni = new FYGE.Lottie(open_1.open); this.openAni = new FYGE.Lottie(open_1.open);
...@@ -15371,7 +15389,7 @@ var XxlScene = (function (_super) { ...@@ -15371,7 +15389,7 @@ var XxlScene = (function (_super) {
} }
})(); })();
this.robot = new Robot_1.Robot(!this.userInfo.win); this.robot = new Robot_1.Robot(!this.userInfo.win);
this.bg = Ins_1.Ins.initSprite("7fcd3fb3-57bd-436a-afca-989b68b6b311"); this.bg = Ins_1.Ins.initSprite('3e1043ce-067c-4941-95bc-08b0120ae18a');
this.addChild(this.bg); this.addChild(this.bg);
this.x = (Ins_1.Ins.stageW - 750) >> 1; this.x = (Ins_1.Ins.stageW - 750) >> 1;
this.y = (Ins_1.Ins.stageH - 1624) >> 1; this.y = (Ins_1.Ins.stageH - 1624) >> 1;
......
project/src/canvas/game/output.js.map
View file @ 0691ec6d
This diff is collapsed.
project/src/canvas/game/released/output.js
View file @ 0691ec6d
...@@ -1235,11 +1235,11 @@ const resCanvasList = { ...@@ -1235,11 +1235,11 @@ const resCanvasList = {
url: 'https://yun.duiba.com.cn/spark-dev/assets/白色.41dae4fd01f4750aea58f694b40d97a9da8f23ca.png', url: 'https://yun.duiba.com.cn/spark-dev/assets/白色.41dae4fd01f4750aea58f694b40d97a9da8f23ca.png',
uuid: '2a747211-0210-4215-86a2-a6955b37c45b' uuid: '2a747211-0210-4215-86a2-a6955b37c45b'
}, },
'7fcd3fb3-57bd-436a-afca-989b68b6b311': { '3e1043ce-067c-4941-95bc-08b0120ae18a': {
name: '背景', name: '时光挑3817a2jpg',
ext: '.png', ext: '.jpg',
url: 'https://yun.duiba.com.cn/spark-dev/assets/时光挑战赛背景__m.0a7dc2a8e1dc99921330774023817a27285b17d2.png', url: '//yun.duiba.com.cn/spark/assets/时光挑3817a2jpg.8d41ee7a44c43873977b8db844f30e79e2bc19c5.jpg',
uuid: '7fcd3fb3-57bd-436a-afca-989b68b6b311' uuid: '3e1043ce-067c-4941-95bc-08b0120ae18a'
}, },
'7d1ec658-9371-4d52-b4d7-e75d04037daf': { '7d1ec658-9371-4d52-b4d7-e75d04037daf': {
name: '粉色', name: '粉色',
...@@ -1682,11 +1682,29 @@ const resCanvasListCsd = { ...@@ -1682,11 +1682,29 @@ const resCanvasListCsd = {
url: 'https://yun.duiba.com.cn/spark/assets/csd引导3.3cb22a085628a6e43b4e13182c1a26c1ec4c259d.png', url: 'https://yun.duiba.com.cn/spark/assets/csd引导3.3cb22a085628a6e43b4e13182c1a26c1ec4c259d.png',
uuid: '0668f8d0-6fb3-46f9-a5e4-952aef42f05c' uuid: '0668f8d0-6fb3-46f9-a5e4-952aef42f05c'
}, },
'62a701fa-32cc-42a4-a097-b7c451440b36': { // '62a701fa-32cc-42a4-a097-b7c451440b36': {
name: '导出lottie', // name: '导出lottie',
// ext: '.png',
// url: 'https://yun.duiba.com.cn/spark/assets/导出lottie.4f99495be3d5447ac215107bcb935d1434261088.png',
// uuid: '62a701fa-32cc-42a4-a097-b7c451440b36'
// },
'b2489966-e840-477b-bc25-6cb820bc95d8': {
name: '引导页文案修改',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/引导页文案修改.c8d31238e7b2a314590ea0c287cd23756b02a1fc.png',
uuid: 'b2489966-e840-477b-bc25-6cb820bc95d8'
},
'27abf038-2a6b-4914-a212-143628fc7d47': {
name: '引导2_修改',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/引导2_修改.6b93186059aa98bef860061c4936029d3fc95617.png',
uuid: '27abf038-2a6b-4914-a212-143628fc7d47'
},
'b006e393-b6a4-4757-8b56-9762ff9a3319': {
name: 'lottie_new_new',
ext: '.png', ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/导出lottie.4f99495be3d5447ac215107bcb935d1434261088.png', url: '//yun.duiba.com.cn/spark/assets/lottie_new_new.dd99c4444eb07f98afae2a6e05bbcae19f5d132b.png',
uuid: '62a701fa-32cc-42a4-a097-b7c451440b36' uuid: 'b006e393-b6a4-4757-8b56-9762ff9a3319'
} }
}; };
/* harmony default export */ __webpack_exports__["default"] = (resCanvasListCsd); /* harmony default export */ __webpack_exports__["default"] = (resCanvasListCsd);
...@@ -1865,7 +1883,7 @@ var Main = (function () { ...@@ -1865,7 +1883,7 @@ var Main = (function () {
resolve('complete'); resolve('complete');
}, 200); }, 200);
} }
}, resCanvasList['62a701fa-32cc-42a4-a097-b7c451440b36'].url); }, resCanvasList['b006e393-b6a4-4757-8b56-9762ff9a3319'].url);
}); });
}; };
Main.prototype.loadImageTexturesCsd01 = function (resCanvasList) { Main.prototype.loadImageTexturesCsd01 = function (resCanvasList) {
...@@ -1902,7 +1920,6 @@ var Main = (function () { ...@@ -1902,7 +1920,6 @@ var Main = (function () {
return [4, this.loadLottieFasterAndFaster()]; return [4, this.loadLottieFasterAndFaster()];
case 1: case 1:
_a.sent(); _a.sent();
ctrls_1.changeScene(MainScene_2.OpenAni);
resCanvasList = Object.assign(resCanvasList_1.default, resCanvasListCsd_1.default); resCanvasList = Object.assign(resCanvasList_1.default, resCanvasListCsd_1.default);
return [4, RES_1.RES.loadSparkAssets(resCanvasList)]; return [4, RES_1.RES.loadSparkAssets(resCanvasList)];
case 2: case 2:
...@@ -1915,6 +1932,7 @@ var Main = (function () { ...@@ -1915,6 +1932,7 @@ var Main = (function () {
_a.sent(); _a.sent();
console.log('resloadingList 加载完毕'); console.log('resloadingList 加载完毕');
FYGE.GDispatcher.dispatchEvent("loadEnd"); FYGE.GDispatcher.dispatchEvent("loadEnd");
ctrls_1.changeScene(MainScene_1.CsdScene);
return [2]; return [2];
} }
}); });
...@@ -2476,7 +2494,7 @@ var Root = (function (_super) { ...@@ -2476,7 +2494,7 @@ var Root = (function (_super) {
_this.guideIndex = 0; _this.guideIndex = 0;
_this.baseOption = options; _this.baseOption = options;
_this.time = options.gameParm.time; _this.time = options.gameParm.time;
_this.guideRes = ["828f6676-7956-473a-a951-bc2f5f1ba8a3", "bc6aa86d-7cd8-4a11-9bd1-931040af3c6e", "0668f8d0-6fb3-46f9-a5e4-952aef42f05c"]; _this.guideRes = ["828f6676-7956-473a-a951-bc2f5f1ba8a3", "27abf038-2a6b-4914-a212-143628fc7d47", "0668f8d0-6fb3-46f9-a5e4-952aef42f05c"];
_this.once(FYGE.Event.ADDED_TO_STAGE, _this.onAddToStage, _this); _this.once(FYGE.Event.ADDED_TO_STAGE, _this.onAddToStage, _this);
return _this; return _this;
} }
...@@ -5442,7 +5460,7 @@ var Root = (function (_super) { ...@@ -5442,7 +5460,7 @@ var Root = (function (_super) {
this.backGround.y = 0; this.backGround.y = 0;
this.backGround.width = 750; this.backGround.width = 750;
this.backGround.height = 1624; this.backGround.height = 1624;
this.backGround.texture = RES_1.RES.getRes(resCanvasList_1.default['7fcd3fb3-57bd-436a-afca-989b68b6b311'].url); this.backGround.texture = RES_1.RES.getRes(resCanvasList_1.default['3e1043ce-067c-4941-95bc-08b0120ae18a'].url);
this.backGround.visible = false; this.backGround.visible = false;
this.addChild(this.backGround); this.addChild(this.backGround);
this.openAni = new FYGE.Lottie(open_1.open); this.openAni = new FYGE.Lottie(open_1.open);
...@@ -15373,7 +15391,7 @@ var XxlScene = (function (_super) { ...@@ -15373,7 +15391,7 @@ var XxlScene = (function (_super) {
} }
})(); })();
this.robot = new Robot_1.Robot(!this.userInfo.win); this.robot = new Robot_1.Robot(!this.userInfo.win);
this.bg = Ins_1.Ins.initSprite("7fcd3fb3-57bd-436a-afca-989b68b6b311"); this.bg = Ins_1.Ins.initSprite('3e1043ce-067c-4941-95bc-08b0120ae18a');
this.addChild(this.bg); this.addChild(this.bg);
this.x = (Ins_1.Ins.stageW - 750) >> 1; this.x = (Ins_1.Ins.stageW - 750) >> 1;
this.y = (Ins_1.Ins.stageH - 1624) >> 1; this.y = (Ins_1.Ins.stageH - 1624) >> 1;
......
project/src/canvas/game/resCanvasList.js
View file @ 0691ec6d
...@@ -5,11 +5,11 @@ const resCanvasList = { ...@@ -5,11 +5,11 @@ const resCanvasList = {
url: 'https://yun.duiba.com.cn/spark-dev/assets/白色.41dae4fd01f4750aea58f694b40d97a9da8f23ca.png', url: 'https://yun.duiba.com.cn/spark-dev/assets/白色.41dae4fd01f4750aea58f694b40d97a9da8f23ca.png',
uuid: '2a747211-0210-4215-86a2-a6955b37c45b' uuid: '2a747211-0210-4215-86a2-a6955b37c45b'
}, },
'7fcd3fb3-57bd-436a-afca-989b68b6b311': { '3e1043ce-067c-4941-95bc-08b0120ae18a': {
name: '背景', name: '时光挑3817a2jpg',
ext: '.png', ext: '.jpg',
url: 'https://yun.duiba.com.cn/spark-dev/assets/时光挑战赛背景__m.0a7dc2a8e1dc99921330774023817a27285b17d2.png', url: '//yun.duiba.com.cn/spark/assets/时光挑3817a2jpg.8d41ee7a44c43873977b8db844f30e79e2bc19c5.jpg',
uuid: '7fcd3fb3-57bd-436a-afca-989b68b6b311' uuid: '3e1043ce-067c-4941-95bc-08b0120ae18a'
}, },
'7d1ec658-9371-4d52-b4d7-e75d04037daf': { '7d1ec658-9371-4d52-b4d7-e75d04037daf': {
name: '粉色', name: '粉色',
......
project/src/canvas/game/resCanvasListCsd.js
View file @ 0691ec6d
...@@ -143,11 +143,29 @@ const resCanvasListCsd = { ...@@ -143,11 +143,29 @@ const resCanvasListCsd = {
url: 'https://yun.duiba.com.cn/spark/assets/csd引导3.3cb22a085628a6e43b4e13182c1a26c1ec4c259d.png', url: 'https://yun.duiba.com.cn/spark/assets/csd引导3.3cb22a085628a6e43b4e13182c1a26c1ec4c259d.png',
uuid: '0668f8d0-6fb3-46f9-a5e4-952aef42f05c' uuid: '0668f8d0-6fb3-46f9-a5e4-952aef42f05c'
}, },
'62a701fa-32cc-42a4-a097-b7c451440b36': { // '62a701fa-32cc-42a4-a097-b7c451440b36': {
name: '导出lottie', // name: '导出lottie',
// ext: '.png',
// url: 'https://yun.duiba.com.cn/spark/assets/导出lottie.4f99495be3d5447ac215107bcb935d1434261088.png',
// uuid: '62a701fa-32cc-42a4-a097-b7c451440b36'
// },
'b2489966-e840-477b-bc25-6cb820bc95d8': {
name: '引导页文案修改',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/引导页文案修改.c8d31238e7b2a314590ea0c287cd23756b02a1fc.png',
uuid: 'b2489966-e840-477b-bc25-6cb820bc95d8'
},
'27abf038-2a6b-4914-a212-143628fc7d47': {
name: '引导2_修改',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/引导2_修改.6b93186059aa98bef860061c4936029d3fc95617.png',
uuid: '27abf038-2a6b-4914-a212-143628fc7d47'
},
'b006e393-b6a4-4757-8b56-9762ff9a3319': {
name: 'lottie_new_new',
ext: '.png', ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/导出lottie.4f99495be3d5447ac215107bcb935d1434261088.png', url: '//yun.duiba.com.cn/spark/assets/lottie_new_new.dd99c4444eb07f98afae2a6e05bbcae19f5d132b.png',
uuid: '62a701fa-32cc-42a4-a097-b7c451440b36' uuid: 'b006e393-b6a4-4757-8b56-9762ff9a3319'
} }
}; };
export default resCanvasListCsd; export default resCanvasListCsd;
\ No newline at end of file
project/src/canvas/game/src/Main.ts
View file @ 0691ec6d
...@@ -111,7 +111,7 @@ export class Main { ...@@ -111,7 +111,7 @@ export class Main {
resolve('complete') resolve('complete')
}, 200); }, 200);
} }
}, resCanvasList['62a701fa-32cc-42a4-a097-b7c451440b36'].url) }, resCanvasList['b006e393-b6a4-4757-8b56-9762ff9a3319'].url)
// [ // [
// resCanvasList['bdb3cbec-1af5-49e9-89ba-2c2ecd90f760'].url, // resCanvasList['bdb3cbec-1af5-49e9-89ba-2c2ecd90f760'].url,
// resCanvasList['e2adae2c-ac89-49cc-a200-8daec42da146'].url // resCanvasList['e2adae2c-ac89-49cc-a200-8daec42da146'].url
...@@ -162,7 +162,7 @@ export class Main { ...@@ -162,7 +162,7 @@ export class Main {
// changeScene(CsdScene) // changeScene(CsdScene)
// changeScene(XxlScene) // changeScene(XxlScene)
await this.loadLottieFasterAndFaster() await this.loadLottieFasterAndFaster()
changeScene(OpenAni) // changeScene(OpenAni)
let resCanvasList = Object.assign(resCanvasList_, resCanvasListCsd) let resCanvasList = Object.assign(resCanvasList_, resCanvasListCsd)
...@@ -172,7 +172,7 @@ export class Main { ...@@ -172,7 +172,7 @@ export class Main {
console.log('resloadingList 加载完毕') console.log('resloadingList 加载完毕')
FYGE.GDispatcher.dispatchEvent("loadEnd"); FYGE.GDispatcher.dispatchEvent("loadEnd");
// changeScene(CsdScene) changeScene(CsdScene)
// showPanel(NoStepPanel) // showPanel(NoStepPanel)
//测试 //测试
......
project/src/canvas/game/src/chuansongdai/Root.ts
View file @ 0691ec6d
...@@ -56,7 +56,7 @@ export default class Root extends FYGE.Container { ...@@ -56,7 +56,7 @@ export default class Root extends FYGE.Container {
// Main // Main
this.baseOption = options this.baseOption = options
this.time = options.gameParm.time this.time = options.gameParm.time
this.guideRes = ["828f6676-7956-473a-a951-bc2f5f1ba8a3", "bc6aa86d-7cd8-4a11-9bd1-931040af3c6e", "0668f8d0-6fb3-46f9-a5e4-952aef42f05c"] this.guideRes = ["828f6676-7956-473a-a951-bc2f5f1ba8a3", "27abf038-2a6b-4914-a212-143628fc7d47", "0668f8d0-6fb3-46f9-a5e4-952aef42f05c"]
this.once(FYGE.Event.ADDED_TO_STAGE, this.onAddToStage, this) this.once(FYGE.Event.ADDED_TO_STAGE, this.onAddToStage, this)
} }
......
project/src/canvas/game/src/openAnimation/Root.ts
View file @ 0691ec6d
...@@ -26,7 +26,7 @@ export default class Root extends FYGE.Container { ...@@ -26,7 +26,7 @@ export default class Root extends FYGE.Container {
this.backGround.y = 0 this.backGround.y = 0
this.backGround.width = 750 this.backGround.width = 750
this.backGround.height = 1624 this.backGround.height = 1624
this.backGround.texture = RES.getRes(resCanvasList['7fcd3fb3-57bd-436a-afca-989b68b6b311'].url) this.backGround.texture = RES.getRes(resCanvasList['3e1043ce-067c-4941-95bc-08b0120ae18a'].url)
this.backGround.visible = false this.backGround.visible = false
this.addChild(this.backGround) this.addChild(this.backGround)
......
project/src/canvas/game/src/xiaoxiaole/XxlScene.ts
View file @ 0691ec6d
...@@ -244,7 +244,7 @@ export class XxlScene extends Scene { ...@@ -244,7 +244,7 @@ export class XxlScene extends Scene {
this.robot = new Robot(!this.userInfo.win) this.robot = new Robot(!this.userInfo.win)
this.bg = Ins.initSprite("7fcd3fb3-57bd-436a-afca-989b68b6b311") this.bg = Ins.initSprite('3e1043ce-067c-4941-95bc-08b0120ae18a')
this.addChild(this.bg); this.addChild(this.bg);
this.x = (Ins.stageW - 750) >> 1; this.x = (Ins.stageW - 750) >> 1;
......
taobao_mini/client/app.json
View file @ 0691ec6d
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
"window": { "window": {
"enableSkia": "true", "enableSkia": "true",
"allowsBounceVertical": "NO", "allowsBounceVertical": "NO",
"defaultTitle": "雅顿双十一" "defaultTitle": "雅顿限时心动胶囊店",
"title": "雅顿限时心动胶囊店"
} }
} }
\ No newline at end of file
taobao_mini/client/components/comMissionModal/comMissionModal.axml
View file @ 0691ec6d
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</view> </view>
<view class="mission_btn {{ item.status === 1 ? 'mission_btn_active' : '' }}" <view class="mission_btn {{ item.status === 1 ? 'mission_btn_active' : '' }}"
data-taskType="{{item.taskType}}" data-status="{{item.status}}" data-itemIds="{{item.itemIds}}" data-info="{{item}}" onTap="doTaskByType"> data-taskType="{{item.taskType}}" data-status="{{item.status}}" data-itemIds="{{item.itemIds}}" data-info="{{item}}" onTap="handleDoTaskByType">
<text a:if="{{item.status === 1}}" class="mission_btn_text">{{item.btnText}}</text> <text a:if="{{item.status === 1}}" class="mission_btn_text">{{item.btnText}}</text>
<text a:if="{{item.status === 2}}" class="mission_btn_text">待领取</text> <text a:if="{{item.status === 2}}" class="mission_btn_text">待领取</text>
<text a:if="{{item.status === 3}}" class="mission_btn_text">已完成</text> <text a:if="{{item.status === 3}}" class="mission_btn_text">已完成</text>
......
taobao_mini/client/components/comMissionModal/comMissionModal.js
View file @ 0691ec6d
import API from '../../api'; import API from '../../api';
const app = getApp(); const app = getApp();
const { tbcc } = app; const { tbcc } = app;
const { commonToast, getAuthUserInfo, navigateToOutside, getSystemInfo, ConsoleStyle, favorShop } = tbcc.tb; const { commonToast, getAuthUserInfo, navigateToOutside, getSystemInfo, ConsoleStyle, favorShop, debounce } = tbcc.tb;
const { SHARE_CONFIG, REDIRECT_URL } = tbcc.constants; const { SHARE_CONFIG, REDIRECT_URL } = tbcc.constants;
import resList from '../../resconfig/resList' import resList from '../../resconfig/resList'
...@@ -112,6 +112,9 @@ Component({ ...@@ -112,6 +112,9 @@ Component({
onModalClose && onModalClose(); onModalClose && onModalClose();
}, },
// 去游戏 防抖
handleDoTaskByType (e) { debounce(this.doTaskByType(e), 1000) },
doTaskByType (e) { doTaskByType (e) {
let ds = e.currentTarget.dataset let ds = e.currentTarget.dataset
if (ds.status === 1) { if (ds.status === 1) {
...@@ -151,7 +154,7 @@ Component({ ...@@ -151,7 +154,7 @@ Component({
console.log('%c--------领取成功\n' + '-----yd.receiveTaskRewards\n', ConsoleStyle, data) console.log('%c--------领取成功\n' + '-----yd.receiveTaskRewards\n', ConsoleStyle, data)
console.log(`%c--------任务类型\n-----${ds.taskType}\n`, ConsoleStyle) console.log(`%c--------任务类型\n-----${ds.taskType}\n`, ConsoleStyle)
if (ds.taskType === 'invites') { if (ds.taskType === 'invites') {
commonToast(`已有${ds.info.todayCompleteTimes}位还有为你助力，获得次数，乐园门票+${Number(ds.info.todayCompleteTimes) * Number(ds.info.rewards)}`) commonToast(`已有${ds.info.todayCompleteTimes}位还有为你助力，乐园门票+${Number(ds.info.todayCompleteTimes) * Number(ds.info.rewards)}`)
} else if (ds.taskType === 'follow') { } else if (ds.taskType === 'follow') {
commonToast(`成功关注店铺，乐园门票+${Number(ds.info.waitReceive)}`) commonToast(`成功关注店铺，乐园门票+${Number(ds.info.waitReceive)}`)
} else if (ds.taskType === 'member') { } else if (ds.taskType === 'member') {
......
taobao_mini/client/pages/homePage/homePage.acss
View file @ 0691ec6d
...@@ -97,10 +97,10 @@ ...@@ -97,10 +97,10 @@
} }
.head { .head {
width: 100%; width: 710rpx;
height: 60rpx; height: 60rpx;
top: 28rpx; top: 178rpx;
left: 0; left: 20rpx;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
display: flex; display: flex;
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
height: 310rpx; height: 310rpx;
opacity: 1; opacity: 1;
left: 42rpx; left: 42rpx;
bottom: 22rpx; bottom: 82rpx;
position: absolute; position: absolute;
z-index: 5; z-index: 5;
} }
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
.video_hide { .video_hide {
position: fixed; position: fixed;
z-index: 40; z-index: 40;
width: 48rpx; width: 94rpx;
height: 48rpx; height: 48rpx;
top: 80rpx; top: 80rpx;
right: 50rpx; right: 50rpx;
......
taobao_mini/client/pages/homePage/homePage.axml
View file @ 0691ec6d
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<view class="transMask-noStart" a:if="{{noStart}}"></view> <view class="transMask-noStart" a:if="{{noStart}}"></view>
<view class="transMask-end" a:if="{{end}}"></view> <view class="transMask-end" a:if="{{end}}"></view>
<!-- 头部 规则-奖品 按钮 --> <!-- 头部 规则-奖品 按钮 -->
<!-- style='top: {{headTop}}rpx' -->
<view class="head"> <view class="head">
<image class="head_ruler" onTap="showRuleModal" src="{{resList['ee8882be-4b1d-43eb-bad7-8d96318c5022'].url}}" /> <image class="head_ruler" onTap="showRuleModal" src="{{resList['ee8882be-4b1d-43eb-bad7-8d96318c5022'].url}}" />
<!-- <image class="head_ruler" onTap="showCommonMoadalT1" src="{{resList['ee8882be-4b1d-43eb-bad7-8d96318c5022'].url}}" /> --> <!-- <image class="head_ruler" onTap="showCommonMoadalT1" src="{{resList['ee8882be-4b1d-43eb-bad7-8d96318c5022'].url}}" /> -->
...@@ -50,7 +51,7 @@ ...@@ -50,7 +51,7 @@
</view> </view>
<view a:if="{{videoShow}}" class="video_hide" onTap="videoHideFunc"> <view a:if="{{videoShow}}" class="video_hide" onTap="videoHideFunc">
<image class="video_hide_img" src="{{resList['4d77ca71-1a5f-4db9-87dd-e54dfc671266'].url}}" mode="aspectFill" /> <image class="video_hide_img" src="{{resList['ed0d1c0b-722b-4fbd-806f-ed061c228566'].url}}" mode="aspectFill" />
</view> </view>
<!-- 视频部分 --> <!-- 视频部分 -->
...@@ -61,7 +62,7 @@ ...@@ -61,7 +62,7 @@
<view class="video_block_wrapper_postersmall_mask"></view> <view class="video_block_wrapper_postersmall_mask"></view>
<image class="video_block_wrapper_postersmall" src="{{videoImgSrcSmall}}" mode="aspectFill" /> <image class="video_block_wrapper_postersmall" src="{{videoImgSrcSmall}}" mode="aspectFill" />
<view class="video_block_text"> <view class="video_block_text">
<view>观看视频</view> <view>观看任一视频15s</view>
<view>赢惊喜抽奖次数</view> <view>赢惊喜抽奖次数</view>
</view> </view>
<!-- <!--
......
taobao_mini/client/pages/homePage/homePage.js
View file @ 0691ec6d
...@@ -110,7 +110,6 @@ Page({ ...@@ -110,7 +110,6 @@ Page({
// if (this.query && this.query.inviteId) this.inviteId = this.query.inviteId // if (this.query && this.query.inviteId) this.inviteId = this.query.inviteId
// if (this.query && this.query.refresh) this.refresh = this.query.refresh // if (this.query && this.query.refresh) this.refresh = this.query.refresh
// } // }
this.query = query this.query = query
if (this.query && this.query.inviteId) this.inviteId = this.query.inviteId if (this.query && this.query.inviteId) this.inviteId = this.query.inviteId
if (this.query && this.query.refresh) this.refresh = this.query.refresh if (this.query && this.query.refresh) this.refresh = this.query.refresh
...@@ -455,7 +454,7 @@ Page({ ...@@ -455,7 +454,7 @@ Page({
onShareAppMessage() { onShareAppMessage() {
// 返回自定义分享信息 // 返回自定义分享信息
clickStat(app.activityId, 'share') clickStat(app.activityId, 'share')
SHARE_CONFIG.imageUrl = 'https://yun.duiba.com.cn/spark/assets/雅顿分享.df56b46d59b3048292e0891ab2f5540bfa1d6dd8.png' SHARE_CONFIG.imageUrl = 'https://isv.alibabausercontent.com/00000000/imgextra/i1/1818112088/O1CN01l20XZd1RILc3NH4pn_!!1818112088-2-isvtu-00000000.png'
SHARE_CONFIG.path = this.changeURLArg('/pages/homePage/homePage', 'inviteId', app.openId) SHARE_CONFIG.path = this.changeURLArg('/pages/homePage/homePage', 'inviteId', app.openId)
return SHARE_CONFIG; return SHARE_CONFIG;
}, },
......
taobao_mini/client/pages/myprize/myprize.js
View file @ 0691ec6d
...@@ -48,7 +48,7 @@ Page({ ...@@ -48,7 +48,7 @@ Page({
onShareAppMessage() { onShareAppMessage() {
// 返回自定义分享信息 // 返回自定义分享信息
clickStat(app.activityId, 'share') clickStat(app.activityId, 'share')
SHARE_CONFIG.imageUrl = 'https://yun.duiba.com.cn/spark/assets/雅顿分享.df56b46d59b3048292e0891ab2f5540bfa1d6dd8.png' SHARE_CONFIG.imageUrl = 'https://isv.alibabausercontent.com/00000000/imgextra/i1/1818112088/O1CN01l20XZd1RILc3NH4pn_!!1818112088-2-isvtu-00000000.png'
SHARE_CONFIG.path = this.changeURLArg('/pages/homePage/homePage', 'inviteId', app.openId) SHARE_CONFIG.path = this.changeURLArg('/pages/homePage/homePage', 'inviteId', app.openId)
return SHARE_CONFIG; return SHARE_CONFIG;
}, },
......
taobao_mini/client/pages/pagecanvas/output.js
View file @ 0691ec6d
...@@ -1235,11 +1235,11 @@ const resCanvasList = { ...@@ -1235,11 +1235,11 @@ const resCanvasList = {
url: 'https://yun.duiba.com.cn/spark-dev/assets/白色.41dae4fd01f4750aea58f694b40d97a9da8f23ca.png', url: 'https://yun.duiba.com.cn/spark-dev/assets/白色.41dae4fd01f4750aea58f694b40d97a9da8f23ca.png',
uuid: '2a747211-0210-4215-86a2-a6955b37c45b' uuid: '2a747211-0210-4215-86a2-a6955b37c45b'
}, },
'7fcd3fb3-57bd-436a-afca-989b68b6b311': { '3e1043ce-067c-4941-95bc-08b0120ae18a': {
name: '背景', name: '时光挑3817a2jpg',
ext: '.png', ext: '.jpg',
url: 'https://yun.duiba.com.cn/spark-dev/assets/时光挑战赛背景__m.0a7dc2a8e1dc99921330774023817a27285b17d2.png', url: '//yun.duiba.com.cn/spark/assets/时光挑3817a2jpg.8d41ee7a44c43873977b8db844f30e79e2bc19c5.jpg',
uuid: '7fcd3fb3-57bd-436a-afca-989b68b6b311' uuid: '3e1043ce-067c-4941-95bc-08b0120ae18a'
}, },
'7d1ec658-9371-4d52-b4d7-e75d04037daf': { '7d1ec658-9371-4d52-b4d7-e75d04037daf': {
name: '粉色', name: '粉色',
...@@ -1682,11 +1682,29 @@ const resCanvasListCsd = { ...@@ -1682,11 +1682,29 @@ const resCanvasListCsd = {
url: 'https://yun.duiba.com.cn/spark/assets/csd引导3.3cb22a085628a6e43b4e13182c1a26c1ec4c259d.png', url: 'https://yun.duiba.com.cn/spark/assets/csd引导3.3cb22a085628a6e43b4e13182c1a26c1ec4c259d.png',
uuid: '0668f8d0-6fb3-46f9-a5e4-952aef42f05c' uuid: '0668f8d0-6fb3-46f9-a5e4-952aef42f05c'
}, },
'62a701fa-32cc-42a4-a097-b7c451440b36': { // '62a701fa-32cc-42a4-a097-b7c451440b36': {
name: '导出lottie', // name: '导出lottie',
// ext: '.png',
// url: 'https://yun.duiba.com.cn/spark/assets/导出lottie.4f99495be3d5447ac215107bcb935d1434261088.png',
// uuid: '62a701fa-32cc-42a4-a097-b7c451440b36'
// },
'b2489966-e840-477b-bc25-6cb820bc95d8': {
name: '引导页文案修改',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/引导页文案修改.c8d31238e7b2a314590ea0c287cd23756b02a1fc.png',
uuid: 'b2489966-e840-477b-bc25-6cb820bc95d8'
},
'27abf038-2a6b-4914-a212-143628fc7d47': {
name: '引导2_修改',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/引导2_修改.6b93186059aa98bef860061c4936029d3fc95617.png',
uuid: '27abf038-2a6b-4914-a212-143628fc7d47'
},
'b006e393-b6a4-4757-8b56-9762ff9a3319': {
name: 'lottie_new_new',
ext: '.png', ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/导出lottie.4f99495be3d5447ac215107bcb935d1434261088.png', url: '//yun.duiba.com.cn/spark/assets/lottie_new_new.dd99c4444eb07f98afae2a6e05bbcae19f5d132b.png',
uuid: '62a701fa-32cc-42a4-a097-b7c451440b36' uuid: 'b006e393-b6a4-4757-8b56-9762ff9a3319'
} }
}; };
/* harmony default export */ __webpack_exports__["default"] = (resCanvasListCsd); /* harmony default export */ __webpack_exports__["default"] = (resCanvasListCsd);
...@@ -1865,7 +1883,7 @@ var Main = (function () { ...@@ -1865,7 +1883,7 @@ var Main = (function () {
resolve('complete'); resolve('complete');
}, 200); }, 200);
} }
}, resCanvasList['62a701fa-32cc-42a4-a097-b7c451440b36'].url); }, resCanvasList['b006e393-b6a4-4757-8b56-9762ff9a3319'].url);
}); });
}; };
Main.prototype.loadImageTexturesCsd01 = function (resCanvasList) { Main.prototype.loadImageTexturesCsd01 = function (resCanvasList) {
...@@ -1902,7 +1920,6 @@ var Main = (function () { ...@@ -1902,7 +1920,6 @@ var Main = (function () {
return [4, this.loadLottieFasterAndFaster()]; return [4, this.loadLottieFasterAndFaster()];
case 1: case 1:
_a.sent(); _a.sent();
ctrls_1.changeScene(MainScene_2.OpenAni);
resCanvasList = Object.assign(resCanvasList_1.default, resCanvasListCsd_1.default); resCanvasList = Object.assign(resCanvasList_1.default, resCanvasListCsd_1.default);
return [4, RES_1.RES.loadSparkAssets(resCanvasList)]; return [4, RES_1.RES.loadSparkAssets(resCanvasList)];
case 2: case 2:
...@@ -1915,6 +1932,7 @@ var Main = (function () { ...@@ -1915,6 +1932,7 @@ var Main = (function () {
_a.sent(); _a.sent();
console.log('resloadingList 加载完毕'); console.log('resloadingList 加载完毕');
FYGE.GDispatcher.dispatchEvent("loadEnd"); FYGE.GDispatcher.dispatchEvent("loadEnd");
ctrls_1.changeScene(MainScene_1.CsdScene);
return [2]; return [2];
} }
}); });
...@@ -2476,7 +2494,7 @@ var Root = (function (_super) { ...@@ -2476,7 +2494,7 @@ var Root = (function (_super) {
_this.guideIndex = 0; _this.guideIndex = 0;
_this.baseOption = options; _this.baseOption = options;
_this.time = options.gameParm.time; _this.time = options.gameParm.time;
_this.guideRes = ["828f6676-7956-473a-a951-bc2f5f1ba8a3", "bc6aa86d-7cd8-4a11-9bd1-931040af3c6e", "0668f8d0-6fb3-46f9-a5e4-952aef42f05c"]; _this.guideRes = ["828f6676-7956-473a-a951-bc2f5f1ba8a3", "27abf038-2a6b-4914-a212-143628fc7d47", "0668f8d0-6fb3-46f9-a5e4-952aef42f05c"];
_this.once(FYGE.Event.ADDED_TO_STAGE, _this.onAddToStage, _this); _this.once(FYGE.Event.ADDED_TO_STAGE, _this.onAddToStage, _this);
return _this; return _this;
} }
...@@ -5442,7 +5460,7 @@ var Root = (function (_super) { ...@@ -5442,7 +5460,7 @@ var Root = (function (_super) {
this.backGround.y = 0; this.backGround.y = 0;
this.backGround.width = 750; this.backGround.width = 750;
this.backGround.height = 1624; this.backGround.height = 1624;
this.backGround.texture = RES_1.RES.getRes(resCanvasList_1.default['7fcd3fb3-57bd-436a-afca-989b68b6b311'].url); this.backGround.texture = RES_1.RES.getRes(resCanvasList_1.default['3e1043ce-067c-4941-95bc-08b0120ae18a'].url);
this.backGround.visible = false; this.backGround.visible = false;
this.addChild(this.backGround); this.addChild(this.backGround);
this.openAni = new FYGE.Lottie(open_1.open); this.openAni = new FYGE.Lottie(open_1.open);
...@@ -15373,7 +15391,7 @@ var XxlScene = (function (_super) { ...@@ -15373,7 +15391,7 @@ var XxlScene = (function (_super) {
} }
})(); })();
this.robot = new Robot_1.Robot(!this.userInfo.win); this.robot = new Robot_1.Robot(!this.userInfo.win);
this.bg = Ins_1.Ins.initSprite("7fcd3fb3-57bd-436a-afca-989b68b6b311"); this.bg = Ins_1.Ins.initSprite('3e1043ce-067c-4941-95bc-08b0120ae18a');
this.addChild(this.bg); this.addChild(this.bg);
this.x = (Ins_1.Ins.stageW - 750) >> 1; this.x = (Ins_1.Ins.stageW - 750) >> 1;
this.y = (Ins_1.Ins.stageH - 1624) >> 1; this.y = (Ins_1.Ins.stageH - 1624) >> 1;
......
taobao_mini/client/pages/turnTablePage/turnTablePage.js
View file @ 0691ec6d
...@@ -368,7 +368,7 @@ Page({ ...@@ -368,7 +368,7 @@ Page({
onShareAppMessage() { onShareAppMessage() {
// 返回自定义分享信息 // 返回自定义分享信息
clickStat(app.activityId, 'share') clickStat(app.activityId, 'share')
SHARE_CONFIG.imageUrl = 'https://yun.duiba.com.cn/spark/assets/雅顿分享.df56b46d59b3048292e0891ab2f5540bfa1d6dd8.png' SHARE_CONFIG.imageUrl = 'https://isv.alibabausercontent.com/00000000/imgextra/i1/1818112088/O1CN01l20XZd1RILc3NH4pn_!!1818112088-2-isvtu-00000000.png'
SHARE_CONFIG.path = this.changeURLArg('/pages/homePage/homePage', 'inviteId', app.openId) SHARE_CONFIG.path = this.changeURLArg('/pages/homePage/homePage', 'inviteId', app.openId)
return SHARE_CONFIG; return SHARE_CONFIG;
}, },
......
taobao_mini/client/resconfig/resList.js
View file @ 0691ec6d
...@@ -742,6 +742,12 @@ const resList = { ...@@ -742,6 +742,12 @@ const resList = {
ext: '.png', ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/雅顿分享.df56b46d59b3048292e0891ab2f5540bfa1d6dd8.png', url: '//yun.duiba.com.cn/spark/assets/雅顿分享.df56b46d59b3048292e0891ab2f5540bfa1d6dd8.png',
uuid: 'b93248a7-a134-4b2f-8426-a52864ded90f' uuid: 'b93248a7-a134-4b2f-8426-a52864ded90f'
},
'ed0d1c0b-722b-4fbd-806f-ed061c228566': {
name: '视频关闭按钮close',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/视频关闭按钮close.4f85e4d486ec18f6a68898467e6a9b87778b69e2.png',
uuid: 'ed0d1c0b-722b-4fbd-806f-ed061c228566'
} }
}; };
export default resList; export default resList;
taobao_mini/client/tbcc-sdk/lib/constants.js
View file @ 0691ec6d
// 分享配置 // 分享配置
export let SHARE_CONFIG = { export let SHARE_CONFIG = {
title: '雅顿乐园', title: '【集美！一起去雅顿乐园赢伊丽莎白金胶】',
desc: '雅顿乐园 邀请好友助力', desc: '【集美！一起去雅顿乐园赢伊丽莎白金胶】',
imageUrl: 'https://isv.alibabausercontent.com/00000000/imgextra/i2/676606897/O1CN01eNrwLl20osHoB4Y7d_!!676606897-2-isvtu-00000000.png', // 分享图片URL imageUrl: 'https://isv.alibabausercontent.com/00000000/imgextra/i2/676606897/O1CN01eNrwLl20osHoB4Y7d_!!676606897-2-isvtu-00000000.png', // 分享图片URL
path: '/pages/homePage/homePage' path: '/pages/homePage/homePage'
}; };
......
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