Skip to content

N
new_taobao
Commit 48d12a7f authored by Edwise's avatar Edwise 🍷
Browse files
Options

123

parent e0110573
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3218 additions and 92 deletions
project/src/canvas/game/output.js
View file @ 48d12a7f
......@@ -1827,25 +1827,25 @@ const resCanvasList = {
'60d6bb5e-5af1-459d-8a0f-ac7a3edcb703': {
name: 'exLoadingBg',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/exLoadingBg.a9104e208e4d425d0dc3fef446acae78d3e2753f.png',
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingBg.a9104e208e4d425d0dc3fef446acae78d3e2753f.png',
uuid: '60d6bb5e-5af1-459d-8a0f-ac7a3edcb703'
},
'f2a39dcf-acc3-4cc8-9dd1-e82e915048db': {
name: 'exLoadingFront',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/exLoadingFront.a21f9697486f4433973e5f521ff9d6a978098503.png',
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingFront.a21f9697486f4433973e5f521ff9d6a978098503.png',
uuid: 'f2a39dcf-acc3-4cc8-9dd1-e82e915048db'
},
'3e9351dd-787d-4dca-bbf3-793d129c6332': {
name: 'shapGoBtn',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/shapGoBtn.78caf5d5af696b5510dd675e626089a320a5c3f1.png',
url: 'https://yun.duiba.com.cn/spark/assets/shapGoBtn.78caf5d5af696b5510dd675e626089a320a5c3f1.png',
uuid: '3e9351dd-787d-4dca-bbf3-793d129c6332'
},
'dba58651-57a3-4b75-9447-0e4d498dd8cd': {
name: 'shapGoBtn1',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/shapGoBtn1.d4d2cbdd9ab87642e34600c20ca627c9a377ffb7.png',
url: 'https://yun.duiba.com.cn/spark/assets/shapGoBtn1.d4d2cbdd9ab87642e34600c20ca627c9a377ffb7.png',
uuid: 'dba58651-57a3-4b75-9447-0e4d498dd8cd'
}
};
......@@ -46752,8 +46752,13 @@ var MainScene = (function (_super) {
return;
}
else {
if (Ins_1.Ins.userInfo.energy != r.data.energyMax) {
that.getUserEnergy();
}
else {
return;
}
}
}
else {
Ins_1.Ins.showToast(r.message);
......@@ -46808,22 +46813,6 @@ var MainScene = (function (_super) {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getUserInfo, {}, function (s, r) {
if (s) {
Ins_1.Ins.userInfo = r.data;
if (r.data.sence > 3) {
Ins_1.Ins.catIsOut = true;
that.cat.visible = false;
that.cat.stopCatAct();
that.mainUi.changeBtnByCatIsOuT(Ins_1.Ins.curScene);
if (Ins_1.Ins.curScene == 3) {
that.letter.visible = true;
}
}
else {
if (Ins_1.Ins.catIsOut) {
that.cat.visible = true;
that.letter.visible = false;
}
Ins_1.Ins.catIsOut = false;
}
that.setEnergy();
that.mainUi.updateUserInfo();
}
......@@ -47086,7 +47075,12 @@ var MainSceneBtnUi = (function (_super) {
MainSceneBtnUi.prototype.updateUserInfo = function () {
var that = this;
var _a = Ins_1.Ins.userInfo, catName = _a.catName, happyCoin = _a.happyCoin, level = _a.level, avatar = _a.avatar, experience = _a.experience, experienceMax = _a.experienceMax;
that.catAvatar.texture = RES_1.RES.getRes(avatar);
var type = avatar.substring(avatar.lastIndexOf(".") + 1, avatar.length);
var avatar1 = avatar;
if (type != 'png' && type != 'jpg') {
avatar1 = avatar + '.jpg';
}
that.catAvatar.texture = RES_1.RES.getRes(avatar1);
that.catAvatar.width = 52;
that.catAvatar.height = 52;
that.catAvatar.x = that.catAvatar.y = 5;
project/src/canvas/game/output.js.map
View file @ 48d12a7f
This diff is collapsed.
project/src/canvas/game/released/output.js
View file @ 48d12a7f
......@@ -1829,25 +1829,25 @@ const resCanvasList = {
'60d6bb5e-5af1-459d-8a0f-ac7a3edcb703': {
name: 'exLoadingBg',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/exLoadingBg.a9104e208e4d425d0dc3fef446acae78d3e2753f.png',
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingBg.a9104e208e4d425d0dc3fef446acae78d3e2753f.png',
uuid: '60d6bb5e-5af1-459d-8a0f-ac7a3edcb703'
},
'f2a39dcf-acc3-4cc8-9dd1-e82e915048db': {
name: 'exLoadingFront',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/exLoadingFront.a21f9697486f4433973e5f521ff9d6a978098503.png',
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingFront.a21f9697486f4433973e5f521ff9d6a978098503.png',
uuid: 'f2a39dcf-acc3-4cc8-9dd1-e82e915048db'
},
'3e9351dd-787d-4dca-bbf3-793d129c6332': {
name: 'shapGoBtn',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/shapGoBtn.78caf5d5af696b5510dd675e626089a320a5c3f1.png',
url: 'https://yun.duiba.com.cn/spark/assets/shapGoBtn.78caf5d5af696b5510dd675e626089a320a5c3f1.png',
uuid: '3e9351dd-787d-4dca-bbf3-793d129c6332'
},
'dba58651-57a3-4b75-9447-0e4d498dd8cd': {
name: 'shapGoBtn1',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/shapGoBtn1.d4d2cbdd9ab87642e34600c20ca627c9a377ffb7.png',
url: 'https://yun.duiba.com.cn/spark/assets/shapGoBtn1.d4d2cbdd9ab87642e34600c20ca627c9a377ffb7.png',
uuid: 'dba58651-57a3-4b75-9447-0e4d498dd8cd'
}
};
......@@ -46754,8 +46754,13 @@ var MainScene = (function (_super) {
return;
}
else {
if (Ins_1.Ins.userInfo.energy != r.data.energyMax) {
that.getUserEnergy();
}
else {
return;
}
}
}
else {
Ins_1.Ins.showToast(r.message);
......@@ -46810,22 +46815,6 @@ var MainScene = (function (_super) {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getUserInfo, {}, function (s, r) {
if (s) {
Ins_1.Ins.userInfo = r.data;
if (r.data.sence > 3) {
Ins_1.Ins.catIsOut = true;
that.cat.visible = false;
that.cat.stopCatAct();
that.mainUi.changeBtnByCatIsOuT(Ins_1.Ins.curScene);
if (Ins_1.Ins.curScene == 3) {
that.letter.visible = true;
}
}
else {
if (Ins_1.Ins.catIsOut) {
that.cat.visible = true;
that.letter.visible = false;
}
Ins_1.Ins.catIsOut = false;
}
that.setEnergy();
that.mainUi.updateUserInfo();
}
......@@ -47088,7 +47077,12 @@ var MainSceneBtnUi = (function (_super) {
MainSceneBtnUi.prototype.updateUserInfo = function () {
var that = this;
var _a = Ins_1.Ins.userInfo, catName = _a.catName, happyCoin = _a.happyCoin, level = _a.level, avatar = _a.avatar, experience = _a.experience, experienceMax = _a.experienceMax;
that.catAvatar.texture = RES_1.RES.getRes(avatar);
var type = avatar.substring(avatar.lastIndexOf(".") + 1, avatar.length);
var avatar1 = avatar;
if (type != 'png' && type != 'jpg') {
avatar1 = avatar + '.jpg';
}
that.catAvatar.texture = RES_1.RES.getRes(avatar1);
that.catAvatar.width = 52;
that.catAvatar.height = 52;
that.catAvatar.x = that.catAvatar.y = 5;
project/src/canvas/game/resCanvasList.js
View file @ 48d12a7f
......@@ -668,25 +668,25 @@ const resCanvasList = {
'60d6bb5e-5af1-459d-8a0f-ac7a3edcb703': {
name: 'exLoadingBg',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/exLoadingBg.a9104e208e4d425d0dc3fef446acae78d3e2753f.png',
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingBg.a9104e208e4d425d0dc3fef446acae78d3e2753f.png',
uuid: '60d6bb5e-5af1-459d-8a0f-ac7a3edcb703'
},
'f2a39dcf-acc3-4cc8-9dd1-e82e915048db': {
name: 'exLoadingFront',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/exLoadingFront.a21f9697486f4433973e5f521ff9d6a978098503.png',
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingFront.a21f9697486f4433973e5f521ff9d6a978098503.png',
uuid: 'f2a39dcf-acc3-4cc8-9dd1-e82e915048db'
},
'3e9351dd-787d-4dca-bbf3-793d129c6332': {
name: 'shapGoBtn',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/shapGoBtn.78caf5d5af696b5510dd675e626089a320a5c3f1.png',
url: 'https://yun.duiba.com.cn/spark/assets/shapGoBtn.78caf5d5af696b5510dd675e626089a320a5c3f1.png',
uuid: '3e9351dd-787d-4dca-bbf3-793d129c6332'
},
'dba58651-57a3-4b75-9447-0e4d498dd8cd': {
name: 'shapGoBtn1',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/shapGoBtn1.d4d2cbdd9ab87642e34600c20ca627c9a377ffb7.png',
url: 'https://yun.duiba.com.cn/spark/assets/shapGoBtn1.d4d2cbdd9ab87642e34600c20ca627c9a377ffb7.png',
uuid: 'dba58651-57a3-4b75-9447-0e4d498dd8cd'
}
};
......
project/src/canvas/game/src/ResJson.ts
View file @ 48d12a7f
......@@ -10,5 +10,5 @@ export const ResJson = {
"name": "startScene"
}
],
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1601003410/resource/"
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1601005193/resource/"
}
\ No newline at end of file
project/src/canvas/game/src/scenes/MainScene.ts
View file @ 48d12a7f
......@@ -185,8 +185,13 @@ export class MainScene extends Scene {
that.setEnergy();
return;
}else{
if(Ins.userInfo.energy!=r.data.energyMax){
that.getUserEnergy();
}
else{
return;
}
}
}else{
Ins.showToast(r.message);
}
......@@ -246,22 +251,22 @@ export class MainScene extends Scene {
sendTbNet(TbNetName.getUserInfo, {}, (s, r) => {
if (s) {
Ins.userInfo = r.data;
if (r.data.sence > 3) {
Ins.catIsOut = true;
that.cat.visible = false;
that.cat.stopCatAct();
that.mainUi.changeBtnByCatIsOuT(Ins.curScene)
if (Ins.curScene == 3) {
that.letter.visible = true;
}
} else {
if (Ins.catIsOut) {
that.cat.visible = true;
that.letter.visible = false;
}
Ins.catIsOut = false;
// if (r.data.sence > 3) {
// Ins.catIsOut = true;
// that.cat.visible = false;
// that.cat.stopCatAct();
// that.mainUi.changeBtnByCatIsOuT(Ins.curScene)
// if (Ins.curScene == 3) {
// that.letter.visible = true;
// }
// } else {
// if (Ins.catIsOut) {
// that.cat.visible = true;
// that.letter.visible = false;
// }
// Ins.catIsOut = false;
}
// }
that.setEnergy();
that.mainUi.updateUserInfo();
......
project/src/canvas/game/src/ui/MainSceneBtnUi.ts
View file @ 48d12a7f
......@@ -171,7 +171,12 @@ export class MainSceneBtnUi extends Module {
updateUserInfo() {
var that = this;
const { catName, happyCoin, level, avatar,experience,experienceMax } = Ins.userInfo;
that.catAvatar.texture = RES.getRes(avatar);
var type = avatar.substring(avatar.lastIndexOf(".") + 1, avatar.length);
let avatar1 = avatar;
if(type!='png'&&type!='jpg'){
avatar1 = avatar + '.jpg'
}
that.catAvatar.texture = RES.getRes(avatar1);
that.catAvatar.width = 52;
that.catAvatar.height = 52;
that.catAvatar.x = that.catAvatar.y = 5
......
taobao_mini/client/components/comcatbackbed/comcatbackbed.js
View file @ 48d12a7f
......@@ -43,7 +43,7 @@ Component({
},
didMount() {
console.log(this.props.catImgArr)
console.log(this.props.catImgArr,this.props.recallCatInfo)
const { value, type, backType, desc } = this.props.recallCatInfo;
let getText = '';
let getTextColor = '';
......
taobao_mini/client/components/comrecallcat/comrecallcat.js
View file @ 48d12a7f
......@@ -56,9 +56,10 @@ Component({
onRecallCat
} = this.props;
onRecallCat && onRecallCat(recallCat.data);
my.__updateUserInfo__();
} else {
my.showToast(recallCat ? recallCat.message : null)
my.showToast({content:recallCat ? recallCat.message : null})
}
}
......
taobao_mini/client/pages/pagecanvas/output.js
View file @ 48d12a7f
......@@ -1828,25 +1828,25 @@ const resCanvasList = {
'60d6bb5e-5af1-459d-8a0f-ac7a3edcb703': {
name: 'exLoadingBg',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/exLoadingBg.a9104e208e4d425d0dc3fef446acae78d3e2753f.png',
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingBg.a9104e208e4d425d0dc3fef446acae78d3e2753f.png',
uuid: '60d6bb5e-5af1-459d-8a0f-ac7a3edcb703'
},
'f2a39dcf-acc3-4cc8-9dd1-e82e915048db': {
name: 'exLoadingFront',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/exLoadingFront.a21f9697486f4433973e5f521ff9d6a978098503.png',
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingFront.a21f9697486f4433973e5f521ff9d6a978098503.png',
uuid: 'f2a39dcf-acc3-4cc8-9dd1-e82e915048db'
},
'3e9351dd-787d-4dca-bbf3-793d129c6332': {
name: 'shapGoBtn',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/shapGoBtn.78caf5d5af696b5510dd675e626089a320a5c3f1.png',
url: 'https://yun.duiba.com.cn/spark/assets/shapGoBtn.78caf5d5af696b5510dd675e626089a320a5c3f1.png',
uuid: '3e9351dd-787d-4dca-bbf3-793d129c6332'
},
'dba58651-57a3-4b75-9447-0e4d498dd8cd': {
name: 'shapGoBtn1',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/shapGoBtn1.d4d2cbdd9ab87642e34600c20ca627c9a377ffb7.png',
url: 'https://yun.duiba.com.cn/spark/assets/shapGoBtn1.d4d2cbdd9ab87642e34600c20ca627c9a377ffb7.png',
uuid: 'dba58651-57a3-4b75-9447-0e4d498dd8cd'
}
};
......@@ -46753,8 +46753,13 @@ var MainScene = (function (_super) {
return;
}
else {
if (Ins_1.Ins.userInfo.energy != r.data.energyMax) {
that.getUserEnergy();
}
else {
return;
}
}
}
else {
Ins_1.Ins.showToast(r.message);
......@@ -46809,22 +46814,6 @@ var MainScene = (function (_super) {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getUserInfo, {}, function (s, r) {
if (s) {
Ins_1.Ins.userInfo = r.data;
if (r.data.sence > 3) {
Ins_1.Ins.catIsOut = true;
that.cat.visible = false;
that.cat.stopCatAct();
that.mainUi.changeBtnByCatIsOuT(Ins_1.Ins.curScene);
if (Ins_1.Ins.curScene == 3) {
that.letter.visible = true;
}
}
else {
if (Ins_1.Ins.catIsOut) {
that.cat.visible = true;
that.letter.visible = false;
}
Ins_1.Ins.catIsOut = false;
}
that.setEnergy();
that.mainUi.updateUserInfo();
}
......@@ -47087,7 +47076,12 @@ var MainSceneBtnUi = (function (_super) {
MainSceneBtnUi.prototype.updateUserInfo = function () {
var that = this;
var _a = Ins_1.Ins.userInfo, catName = _a.catName, happyCoin = _a.happyCoin, level = _a.level, avatar = _a.avatar, experience = _a.experience, experienceMax = _a.experienceMax;
that.catAvatar.texture = RES_1.RES.getRes(avatar);
var type = avatar.substring(avatar.lastIndexOf(".") + 1, avatar.length);
var avatar1 = avatar;
if (type != 'png' && type != 'jpg') {
avatar1 = avatar + '.jpg';
}
that.catAvatar.texture = RES_1.RES.getRes(avatar1);
that.catAvatar.width = 52;
that.catAvatar.height = 52;
that.catAvatar.x = that.catAvatar.y = 5;
taobao_mini/client/pages/pagecanvas/pagecanvas.js
View file @ 48d12a7f
......@@ -39,7 +39,7 @@ Page({
catnameModalVisible: false,
recallcatModalVisible: false,
recallcatModalData: {},
getcatModalVisible: true,
getcatModalVisible: false,
getcatModalData: {},
catbackbedModalVisible: false,
catruleModalVisible: 0
......@@ -252,6 +252,7 @@ Page({
if (this.main) {
this.main.run();
this.main.dispatchGlobalEvent("onShow");
my.__updateUserInfo__();
}
},
......
taobao_mini/debug.log
View file @ 48d12a7f
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