Skip to content

N
new_taobao
Commit 82811e07 authored by Edwise's avatar Edwise 🍷
Browse files
Options

修改引导图

parent a5919b70
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 253 additions and 13 deletions
project/src/canvas/game/mock/miniTb/tmallCat.getSence.json
View file @ 82811e07
......@@ -2,7 +2,7 @@
"success": true,
"message":"",
"data": {
"sence": 4,
"sence": 2,
"senceTips":["测试","测试"],
"senceGuide":{
"1":false,
......
project/src/canvas/game/output.js
View file @ 82811e07
......@@ -1972,6 +1972,18 @@ const resCanvasList = {
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingFront1.cc7808012a9fd17a1dae55c64e0ba64a32a83f1d.png',
uuid: '8d5533a1-1d88-489f-bf6b-70b27c3e694b'
},
'4a6d3284-4c77-47d0-93cd-0efe6972650b': {
name: 'classRoomGuide2Final',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/classRoomGuide2Final.f2bdb3d66b0813b09cc1c0e4661c3c52ca45fac6.png',
uuid: '4a6d3284-4c77-47d0-93cd-0efe6972650b'
},
'7f326499-0adb-40ff-9a99-7de524460652': {
name: 'playGroundGuide2Final',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/playGroundGuide2Final.32c9c4f1494cd3b06d56b70dd1653af996a88834.png',
uuid: '7f326499-0adb-40ff-9a99-7de524460652'
},
};
/* harmony default export */ __webpack_exports__["default"] = (resCanvasList);
......@@ -2896,8 +2908,8 @@ var Guide = (function (_super) {
that.catPosArr = [80, 40, 60, 70];
var arr = [lanmao02shuohua_1.lanmao02shuohua, jumaoshuohua_1.jumaoshuohua, sanhua02shuohua_2_1.sanhua02shuohua2, xianluoshuohua_1.xianluoshuohua];
that.catImgUUIDArr = ['3e6311fd-15ab-4656-bb84-1c49f4ad4ed9', 'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d', '9fc6517e-debe-4457-88ef-9c733d5bc072', 'ecb49f23-2e65-4507-8be6-1eee021a3b35'];
that.guideUUIDArr_1 = ['5ae12c38-05d8-4105-9101-765e7f32525e', 'e8ad2e4e-925c-4db5-b229-882ee98881a7', 'c549f0a7-085e-444d-b839-4f2172094b0b', '3f48a757-495b-4ed7-957c-9ec95f82ea5e'];
that.guideUUIDArr_2 = ['d37358ea-ba10-4c08-ab3c-7ff682629ada', 'f44dd5ee-2fa3-4a47-b398-527b0398544b', '6583475b-201e-4324-b15e-4632f33f57ec', 'a90aa98b-2ff1-41a2-8a71-749bb76d6ba3'];
that.guideUUIDArr_1 = ['5ae12c38-05d8-4105-9101-765e7f32525e', '4a6d3284-4c77-47d0-93cd-0efe6972650b', 'c549f0a7-085e-444d-b839-4f2172094b0b', '3f48a757-495b-4ed7-957c-9ec95f82ea5e'];
that.guideUUIDArr_2 = ['d37358ea-ba10-4c08-ab3c-7ff682629ada', '7f326499-0adb-40ff-9a99-7de524460652', '6583475b-201e-4324-b15e-4632f33f57ec', 'a90aa98b-2ff1-41a2-8a71-749bb76d6ba3'];
that.guideUUIDArr_3 = ['d4740497-ed95-4e35-b107-df545896cf05', 'ba92a69d-fc74-482a-8839-6b483d2290b8', 'ff460e08-76fd-4888-8361-2b65b7ee95ea',
'f1154565-9a56-4d95-83de-44832d700b5f', '6ab7cbb8-6c9d-412f-9d57-8404465d9e35', 'df6ccefe-756c-4383-aac3-7da9f74b3a0f', '1a4f7c9e-0857-425a-8abe-3dd5c79b2528'];
that.guide = new FYGE.Sprite(Ins_1.Ins.getRes(that['guideUUIDArr_' + that.guideType][0]));
......@@ -46862,7 +46874,7 @@ var LoadingScene = (function (_super) {
that.zhuazi = new FYGE.Sprite(RES_1.RES.getRes(resloadingList_1.default["d01a19e5-fa4f-40b9-a6dc-9d21e0cc756e"].url));
that.loadingGroup.addChild(that.zhuazi);
that.zhuazi.y = -5;
FYGE.Tween.get(this.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: -80 }, 200).call(function () {
FYGE.Tween.get(this.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: -80 }, 2000).call(function () {
that.tweenEnd = true;
if (that.isEnd) {
FYGE.Tween.get(that.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: 9 }, 600).call(function () { ctrls_1.changeScene(StartScene_1.StartScene); });
project/src/canvas/game/output.js.map
View file @ 82811e07
This diff is collapsed.
project/src/canvas/game/released/output.js
View file @ 82811e07
......@@ -1974,6 +1974,18 @@ const resCanvasList = {
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingFront1.cc7808012a9fd17a1dae55c64e0ba64a32a83f1d.png',
uuid: '8d5533a1-1d88-489f-bf6b-70b27c3e694b'
},
'4a6d3284-4c77-47d0-93cd-0efe6972650b': {
name: 'classRoomGuide2Final',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/classRoomGuide2Final.f2bdb3d66b0813b09cc1c0e4661c3c52ca45fac6.png',
uuid: '4a6d3284-4c77-47d0-93cd-0efe6972650b'
},
'7f326499-0adb-40ff-9a99-7de524460652': {
name: 'playGroundGuide2Final',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/playGroundGuide2Final.32c9c4f1494cd3b06d56b70dd1653af996a88834.png',
uuid: '7f326499-0adb-40ff-9a99-7de524460652'
},
};
/* harmony default export */ __webpack_exports__["default"] = (resCanvasList);
......@@ -2898,8 +2910,8 @@ var Guide = (function (_super) {
that.catPosArr = [80, 40, 60, 70];
var arr = [lanmao02shuohua_1.lanmao02shuohua, jumaoshuohua_1.jumaoshuohua, sanhua02shuohua_2_1.sanhua02shuohua2, xianluoshuohua_1.xianluoshuohua];
that.catImgUUIDArr = ['3e6311fd-15ab-4656-bb84-1c49f4ad4ed9', 'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d', '9fc6517e-debe-4457-88ef-9c733d5bc072', 'ecb49f23-2e65-4507-8be6-1eee021a3b35'];
that.guideUUIDArr_1 = ['5ae12c38-05d8-4105-9101-765e7f32525e', 'e8ad2e4e-925c-4db5-b229-882ee98881a7', 'c549f0a7-085e-444d-b839-4f2172094b0b', '3f48a757-495b-4ed7-957c-9ec95f82ea5e'];
that.guideUUIDArr_2 = ['d37358ea-ba10-4c08-ab3c-7ff682629ada', 'f44dd5ee-2fa3-4a47-b398-527b0398544b', '6583475b-201e-4324-b15e-4632f33f57ec', 'a90aa98b-2ff1-41a2-8a71-749bb76d6ba3'];
that.guideUUIDArr_1 = ['5ae12c38-05d8-4105-9101-765e7f32525e', '4a6d3284-4c77-47d0-93cd-0efe6972650b', 'c549f0a7-085e-444d-b839-4f2172094b0b', '3f48a757-495b-4ed7-957c-9ec95f82ea5e'];
that.guideUUIDArr_2 = ['d37358ea-ba10-4c08-ab3c-7ff682629ada', '7f326499-0adb-40ff-9a99-7de524460652', '6583475b-201e-4324-b15e-4632f33f57ec', 'a90aa98b-2ff1-41a2-8a71-749bb76d6ba3'];
that.guideUUIDArr_3 = ['d4740497-ed95-4e35-b107-df545896cf05', 'ba92a69d-fc74-482a-8839-6b483d2290b8', 'ff460e08-76fd-4888-8361-2b65b7ee95ea',
'f1154565-9a56-4d95-83de-44832d700b5f', '6ab7cbb8-6c9d-412f-9d57-8404465d9e35', 'df6ccefe-756c-4383-aac3-7da9f74b3a0f', '1a4f7c9e-0857-425a-8abe-3dd5c79b2528'];
that.guide = new FYGE.Sprite(Ins_1.Ins.getRes(that['guideUUIDArr_' + that.guideType][0]));
......@@ -46864,7 +46876,7 @@ var LoadingScene = (function (_super) {
that.zhuazi = new FYGE.Sprite(RES_1.RES.getRes(resloadingList_1.default["d01a19e5-fa4f-40b9-a6dc-9d21e0cc756e"].url));
that.loadingGroup.addChild(that.zhuazi);
that.zhuazi.y = -5;
FYGE.Tween.get(this.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: -80 }, 200).call(function () {
FYGE.Tween.get(this.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: -80 }, 2000).call(function () {
that.tweenEnd = true;
if (that.isEnd) {
FYGE.Tween.get(that.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: 9 }, 600).call(function () { ctrls_1.changeScene(StartScene_1.StartScene); });
project/src/canvas/game/resCanvasList.js
View file @ 82811e07
......@@ -828,6 +828,18 @@ const resCanvasList = {
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingFront1.cc7808012a9fd17a1dae55c64e0ba64a32a83f1d.png',
uuid: '8d5533a1-1d88-489f-bf6b-70b27c3e694b'
},
'4a6d3284-4c77-47d0-93cd-0efe6972650b': {
name: 'classRoomGuide2Final',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/classRoomGuide2Final.f2bdb3d66b0813b09cc1c0e4661c3c52ca45fac6.png',
uuid: '4a6d3284-4c77-47d0-93cd-0efe6972650b'
},
'7f326499-0adb-40ff-9a99-7de524460652': {
name: 'playGroundGuide2Final',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/playGroundGuide2Final.32c9c4f1494cd3b06d56b70dd1653af996a88834.png',
uuid: '7f326499-0adb-40ff-9a99-7de524460652'
},
};
export default resCanvasList;
project/src/canvas/game/src/guide/Guide.ts
View file @ 82811e07
......@@ -52,9 +52,9 @@ export class Guide extends Module {
/**猫咪图片 */
that.catImgUUIDArr = ['3e6311fd-15ab-4656-bb84-1c49f4ad4ed9', 'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d', '9fc6517e-debe-4457-88ef-9c733d5bc072', 'ecb49f23-2e65-4507-8be6-1eee021a3b35']
/**教室引导图片 */
that.guideUUIDArr_1 = ['5ae12c38-05d8-4105-9101-765e7f32525e', 'e8ad2e4e-925c-4db5-b229-882ee98881a7', 'c549f0a7-085e-444d-b839-4f2172094b0b', '3f48a757-495b-4ed7-957c-9ec95f82ea5e'];
that.guideUUIDArr_1 = ['5ae12c38-05d8-4105-9101-765e7f32525e', '4a6d3284-4c77-47d0-93cd-0efe6972650b', 'c549f0a7-085e-444d-b839-4f2172094b0b', '3f48a757-495b-4ed7-957c-9ec95f82ea5e'];
/**操场引导图片 */
that.guideUUIDArr_2 = ['d37358ea-ba10-4c08-ab3c-7ff682629ada', 'f44dd5ee-2fa3-4a47-b398-527b0398544b', '6583475b-201e-4324-b15e-4632f33f57ec', 'a90aa98b-2ff1-41a2-8a71-749bb76d6ba3'];
that.guideUUIDArr_2 = ['d37358ea-ba10-4c08-ab3c-7ff682629ada', '7f326499-0adb-40ff-9a99-7de524460652', '6583475b-201e-4324-b15e-4632f33f57ec', 'a90aa98b-2ff1-41a2-8a71-749bb76d6ba3'];
/**寝室引导图片 */
that.guideUUIDArr_3 = ['d4740497-ed95-4e35-b107-df545896cf05', 'ba92a69d-fc74-482a-8839-6b483d2290b8', 'ff460e08-76fd-4888-8361-2b65b7ee95ea',
'f1154565-9a56-4d95-83de-44832d700b5f', '6ab7cbb8-6c9d-412f-9d57-8404465d9e35', 'df6ccefe-756c-4383-aac3-7da9f74b3a0f', '1a4f7c9e-0857-425a-8abe-3dd5c79b2528'];
......
project/src/canvas/game/src/scenes/LoadingScene.ts
View file @ 82811e07
......@@ -71,7 +71,7 @@ export class LoadingScene extends Scene{
that.loadingGroup.addChild(that.zhuazi);
that.zhuazi.y = -5;
FYGE.Tween.get(this.loading,{onChange:()=>{that.zhuazi.x = (that.loading.x+that.loading.width-30)},onChangeObj:that}).to({x:-80},200).call(()=>{
FYGE.Tween.get(this.loading,{onChange:()=>{that.zhuazi.x = (that.loading.x+that.loading.width-30)},onChangeObj:that}).to({x:-80},2000).call(()=>{
that.tweenEnd = true;
if(that.isEnd){
FYGE.Tween.get(that.loading,{onChange:()=>{that.zhuazi.x = (that.loading.x+that.loading.width-30)},onChangeObj:that}).to({x:9},600).call(()=>{changeScene(StartScene)});
......
taobao_mini/client/pages/pagecanvas/output.js
View file @ 82811e07
......@@ -1973,6 +1973,18 @@ const resCanvasList = {
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingFront1.cc7808012a9fd17a1dae55c64e0ba64a32a83f1d.png',
uuid: '8d5533a1-1d88-489f-bf6b-70b27c3e694b'
},
'4a6d3284-4c77-47d0-93cd-0efe6972650b': {
name: 'classRoomGuide2Final',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/classRoomGuide2Final.f2bdb3d66b0813b09cc1c0e4661c3c52ca45fac6.png',
uuid: '4a6d3284-4c77-47d0-93cd-0efe6972650b'
},
'7f326499-0adb-40ff-9a99-7de524460652': {
name: 'playGroundGuide2Final',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/playGroundGuide2Final.32c9c4f1494cd3b06d56b70dd1653af996a88834.png',
uuid: '7f326499-0adb-40ff-9a99-7de524460652'
},
};
/* harmony default export */ __webpack_exports__["default"] = (resCanvasList);
......@@ -2897,8 +2909,8 @@ var Guide = (function (_super) {
that.catPosArr = [80, 40, 60, 70];
var arr = [lanmao02shuohua_1.lanmao02shuohua, jumaoshuohua_1.jumaoshuohua, sanhua02shuohua_2_1.sanhua02shuohua2, xianluoshuohua_1.xianluoshuohua];
that.catImgUUIDArr = ['3e6311fd-15ab-4656-bb84-1c49f4ad4ed9', 'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d', '9fc6517e-debe-4457-88ef-9c733d5bc072', 'ecb49f23-2e65-4507-8be6-1eee021a3b35'];
that.guideUUIDArr_1 = ['5ae12c38-05d8-4105-9101-765e7f32525e', 'e8ad2e4e-925c-4db5-b229-882ee98881a7', 'c549f0a7-085e-444d-b839-4f2172094b0b', '3f48a757-495b-4ed7-957c-9ec95f82ea5e'];
that.guideUUIDArr_2 = ['d37358ea-ba10-4c08-ab3c-7ff682629ada', 'f44dd5ee-2fa3-4a47-b398-527b0398544b', '6583475b-201e-4324-b15e-4632f33f57ec', 'a90aa98b-2ff1-41a2-8a71-749bb76d6ba3'];
that.guideUUIDArr_1 = ['5ae12c38-05d8-4105-9101-765e7f32525e', '4a6d3284-4c77-47d0-93cd-0efe6972650b', 'c549f0a7-085e-444d-b839-4f2172094b0b', '3f48a757-495b-4ed7-957c-9ec95f82ea5e'];
that.guideUUIDArr_2 = ['d37358ea-ba10-4c08-ab3c-7ff682629ada', '7f326499-0adb-40ff-9a99-7de524460652', '6583475b-201e-4324-b15e-4632f33f57ec', 'a90aa98b-2ff1-41a2-8a71-749bb76d6ba3'];
that.guideUUIDArr_3 = ['d4740497-ed95-4e35-b107-df545896cf05', 'ba92a69d-fc74-482a-8839-6b483d2290b8', 'ff460e08-76fd-4888-8361-2b65b7ee95ea',
'f1154565-9a56-4d95-83de-44832d700b5f', '6ab7cbb8-6c9d-412f-9d57-8404465d9e35', 'df6ccefe-756c-4383-aac3-7da9f74b3a0f', '1a4f7c9e-0857-425a-8abe-3dd5c79b2528'];
that.guide = new FYGE.Sprite(Ins_1.Ins.getRes(that['guideUUIDArr_' + that.guideType][0]));
taobao_mini/debug.log
View file @ 82811e07
This diff is collapsed.
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