Skip to content

N
new_taobao
Commit 08bf0c2c authored by wildfirecode13's avatar wildfirecode13
Browse files
Options

Merge branch 'tianmaoxiaoyuan' of gitlab2.dui88.com:wanghongyuan/new_taobao into tianmaoxiaoyuan

parents dbb5c94e d1e4d41b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6071 additions and 49 deletions
project/src/canvas/game/mock/miniTb/tmallCat.getUserInfo.json
View file @ 08bf0c2c
......@@ -6,14 +6,14 @@
"userNick": "Edwise",
"energy": 1000,
"happyCoin":1000,
"experience": 80,
"experience": 1000,
"level": "1",
"avatar": "http://wwc.alicdn.com/avatar/getAvatar.do?userIdStr=Pk*HOFxSPCNGOHgyX8R-MGIyPCZzPk8uOmHuvkxYOHQT&width=80&height=80&type=sns",
"sence": 1,
"catName": "哈哈哈",
"senceTips":["1说话说话说话说话说话说话说话说话说话说话说话","2说话说话说话说话说话说话说话说话说话说话说话说话","3说话说话说话说话说话说话说话说话说话说话说话说话"],
"energyMax":2000,
"experienceMax":100,
"experienceMax":1000,
"senceGuide":true
}
......
project/src/canvas/game/output.js
View file @ 08bf0c2c
......@@ -1975,6 +1975,18 @@ const resCanvasList = {
uuid: '1a4f7c9e-0857-425a-8abe-3dd5c79b2528',
url: 'https://yun.duiba.com.cn/spark/assets/e2822fc4c01310e66f2276f9b03d56519b122e1e.png'
},
'c647044e-5cc9-4701-8b98-53451ae49b40': {
name: 'exLoadingBg1',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingBg1.ad9dad9b1be1194886c5ca6ef820b28fc2a4b4b4.png',
uuid: 'c647044e-5cc9-4701-8b98-53451ae49b40'
},
'8d5533a1-1d88-489f-bf6b-70b27c3e694b': {
name: 'exLoadingFront1',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingFront1.cc7808012a9fd17a1dae55c64e0ba64a32a83f1d.png',
uuid: '8d5533a1-1d88-489f-bf6b-70b27c3e694b'
},
};
/* harmony default export */ __webpack_exports__["default"] = (resCanvasList);
......@@ -2317,6 +2329,7 @@ var Main = (function () {
console.log('resloadingList 加载完毕');
ctrls_1.changeScene(LoadingScene_1.LoadingScene);
return [4, RES_1.RES.loadSparkAssets(resCanvasList_1.default).catch(function () {
Ins_1.Ins.showToast("加载资源失败");
console.log('loadSparkAssets resCanvasList 失败');
})];
case 2:
......@@ -2772,7 +2785,12 @@ var Cat = (function (_super) {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.interaction, { type: type, sence: Ins_1.Ins.curScene }, function (s, r) {
if (s) {
if (r.data.isUpgrade) {
Ins_1.Ins.showModule("levelupModal", { prizeData: r.data, energyMax1: Ins_1.Ins.userInfo.energyMax, energyMax2: r.data.energyMax });
if (r.data.name == "谢谢参与") {
Ins_1.Ins.showModule("thanksModal");
}
else {
Ins_1.Ins.showModule("levelupModal", { prizeData: r.data, energyMax1: Ins_1.Ins.userInfo.energyMax, energyMax2: r.data.energyMax });
}
}
Main_1.GDispatcher.dispatchEvent(Enum_1.MSG.UPDATE_USERINFO);
that.actRunning = true;
......@@ -46906,15 +46924,16 @@ var letter_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/letter */ "./src/lo
var Guide_1 = __webpack_require__(/*! ../guide/Guide */ "./src/guide/Guide.ts");
var MainScene = (function (_super) {
__extends(MainScene, _super);
function MainScene() {
var _this = _super !== null && _super.apply(this, arguments) || this;
function MainScene(data) {
var _this = _super.call(this, data) || this;
_this.bgUUID = [];
_this.maxEnergy = 1500;
_this.level = 0;
_this.isShow = false;
_this.initScene();
return _this;
}
MainScene.prototype.initUi = function () {
MainScene.prototype.initScene = function () {
var that = this;
that.initSceneEle();
};
......@@ -47204,7 +47223,6 @@ var MainScene = (function (_super) {
that.mainUi.updateUserInfo();
}
else {
Ins_1.Ins.showToast(r.message);
}
});
};
......@@ -47553,23 +47571,29 @@ var MainSceneBtnUi = (function (_super) {
mask.position.set(33, 33);
that.catInfoGroup.addChild(mask);
that.catAvatar.mask = mask;
that.catNameLabel = Ins_1.Ins.initLabel({ color: "black", size: 24, text: "喵喵喵", x: (95 - 19), y: (167 - 145) });
that.catNameLabel = Ins_1.Ins.initLabel({ color: "black", size: 24, text: "喵喵喵", x: 66, y: (167 - 145) });
that.catInfoGroup.addChild(that.catNameLabel);
that.catLevelLabel = Ins_1.Ins.initLabel({ color: "black", size: 24, text: "Lv.1", x: (192 - 19), y: (167 - 145) });
that.catLevelLabel = Ins_1.Ins.initLabel({ color: "black", size: 24, text: "Lv.1", x: (212 - 19), y: (167 - 145) });
that.catInfoGroup.addChild(that.catLevelLabel);
that.catExperienceBg = Ins_1.Ins.initSprite("60d6bb5e-5af1-459d-8a0f-ac7a3edcb703", 76, 52);
that.catExperienceBg = Ins_1.Ins.initSprite("c647044e-5cc9-4701-8b98-53451ae49b40", 66, 52);
that.catInfoGroup.addChild(that.catExperienceBg);
that.catExperience = Ins_1.Ins.initSprite("f2a39dcf-acc3-4cc8-9dd1-e82e915048db");
that.catExperience = Ins_1.Ins.initSprite("8d5533a1-1d88-489f-bf6b-70b27c3e694b");
that.catExperience.anchorY = that.catExperience.height >> 1;
that.catExperienceBg.addChild(that.catExperience);
var mask = new FYGE.Shape();
mask.beginFill(6, 1);
mask.drawRoundedRect(0, 0, that.catExperience.width, that.catExperience.height, 38, 38, 38, 38);
mask.drawRoundedRect(-4, 0, that.catExperience.width, that.catExperience.height, 45, 45, 45, 45);
mask.endFill();
mask.x = 5;
mask.y = 0;
that.catExperienceBg.addChild(mask);
that.catExperience.mask = mask;
that.experience = Ins_1.Ins.initLabel({ size: 18 });
that.experience.position.set(144, 53);
that.experience.textWidth = 110;
that.experience.bold = true;
that.experience.textAlign = FYGE.TEXT_ALIGN.CENTER;
that.catInfoGroup.addChild(that.experience);
};
MainSceneBtnUi.prototype.initFishPointGroup = function () {
var that = this;
......@@ -47606,6 +47630,7 @@ var MainSceneBtnUi = (function (_super) {
that.catLevelLabel.text = "Lv." + level;
that.fishPointLabel.text = "" + happyCoin;
that.catExperience.scaleX = experience / experienceMax;
that.experience.text = experience + "/" + experienceMax;
};
MainSceneBtnUi.prototype.hideAllActBtn = function () {
var that = this;
project/src/canvas/game/output.js.map
View file @ 08bf0c2c
This diff is collapsed.
project/src/canvas/game/released/output.js
View file @ 08bf0c2c
......@@ -1977,6 +1977,18 @@ const resCanvasList = {
uuid: '1a4f7c9e-0857-425a-8abe-3dd5c79b2528',
url: 'https://yun.duiba.com.cn/spark/assets/e2822fc4c01310e66f2276f9b03d56519b122e1e.png'
},
'c647044e-5cc9-4701-8b98-53451ae49b40': {
name: 'exLoadingBg1',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingBg1.ad9dad9b1be1194886c5ca6ef820b28fc2a4b4b4.png',
uuid: 'c647044e-5cc9-4701-8b98-53451ae49b40'
},
'8d5533a1-1d88-489f-bf6b-70b27c3e694b': {
name: 'exLoadingFront1',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingFront1.cc7808012a9fd17a1dae55c64e0ba64a32a83f1d.png',
uuid: '8d5533a1-1d88-489f-bf6b-70b27c3e694b'
},
};
/* harmony default export */ __webpack_exports__["default"] = (resCanvasList);
......@@ -2319,6 +2331,7 @@ var Main = (function () {
console.log('resloadingList 加载完毕');
ctrls_1.changeScene(LoadingScene_1.LoadingScene);
return [4, RES_1.RES.loadSparkAssets(resCanvasList_1.default).catch(function () {
Ins_1.Ins.showToast("加载资源失败");
console.log('loadSparkAssets resCanvasList 失败');
})];
case 2:
......@@ -2774,7 +2787,12 @@ var Cat = (function (_super) {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.interaction, { type: type, sence: Ins_1.Ins.curScene }, function (s, r) {
if (s) {
if (r.data.isUpgrade) {
Ins_1.Ins.showModule("levelupModal", { prizeData: r.data, energyMax1: Ins_1.Ins.userInfo.energyMax, energyMax2: r.data.energyMax });
if (r.data.name == "谢谢参与") {
Ins_1.Ins.showModule("thanksModal");
}
else {
Ins_1.Ins.showModule("levelupModal", { prizeData: r.data, energyMax1: Ins_1.Ins.userInfo.energyMax, energyMax2: r.data.energyMax });
}
}
Main_1.GDispatcher.dispatchEvent(Enum_1.MSG.UPDATE_USERINFO);
that.actRunning = true;
......@@ -46908,15 +46926,16 @@ var letter_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/letter */ "./src/lo
var Guide_1 = __webpack_require__(/*! ../guide/Guide */ "./src/guide/Guide.ts");
var MainScene = (function (_super) {
__extends(MainScene, _super);
function MainScene() {
var _this = _super !== null && _super.apply(this, arguments) || this;
function MainScene(data) {
var _this = _super.call(this, data) || this;
_this.bgUUID = [];
_this.maxEnergy = 1500;
_this.level = 0;
_this.isShow = false;
_this.initScene();
return _this;
}
MainScene.prototype.initUi = function () {
MainScene.prototype.initScene = function () {
var that = this;
that.initSceneEle();
};
......@@ -47206,7 +47225,6 @@ var MainScene = (function (_super) {
that.mainUi.updateUserInfo();
}
else {
Ins_1.Ins.showToast(r.message);
}
});
};
......@@ -47555,23 +47573,29 @@ var MainSceneBtnUi = (function (_super) {
mask.position.set(33, 33);
that.catInfoGroup.addChild(mask);
that.catAvatar.mask = mask;
that.catNameLabel = Ins_1.Ins.initLabel({ color: "black", size: 24, text: "喵喵喵", x: (95 - 19), y: (167 - 145) });
that.catNameLabel = Ins_1.Ins.initLabel({ color: "black", size: 24, text: "喵喵喵", x: 66, y: (167 - 145) });
that.catInfoGroup.addChild(that.catNameLabel);
that.catLevelLabel = Ins_1.Ins.initLabel({ color: "black", size: 24, text: "Lv.1", x: (192 - 19), y: (167 - 145) });
that.catLevelLabel = Ins_1.Ins.initLabel({ color: "black", size: 24, text: "Lv.1", x: (212 - 19), y: (167 - 145) });
that.catInfoGroup.addChild(that.catLevelLabel);
that.catExperienceBg = Ins_1.Ins.initSprite("60d6bb5e-5af1-459d-8a0f-ac7a3edcb703", 76, 52);
that.catExperienceBg = Ins_1.Ins.initSprite("c647044e-5cc9-4701-8b98-53451ae49b40", 66, 52);
that.catInfoGroup.addChild(that.catExperienceBg);
that.catExperience = Ins_1.Ins.initSprite("f2a39dcf-acc3-4cc8-9dd1-e82e915048db");
that.catExperience = Ins_1.Ins.initSprite("8d5533a1-1d88-489f-bf6b-70b27c3e694b");
that.catExperience.anchorY = that.catExperience.height >> 1;
that.catExperienceBg.addChild(that.catExperience);
var mask = new FYGE.Shape();
mask.beginFill(6, 1);
mask.drawRoundedRect(0, 0, that.catExperience.width, that.catExperience.height, 38, 38, 38, 38);
mask.drawRoundedRect(-4, 0, that.catExperience.width, that.catExperience.height, 45, 45, 45, 45);
mask.endFill();
mask.x = 5;
mask.y = 0;
that.catExperienceBg.addChild(mask);
that.catExperience.mask = mask;
that.experience = Ins_1.Ins.initLabel({ size: 18 });
that.experience.position.set(144, 53);
that.experience.textWidth = 110;
that.experience.bold = true;
that.experience.textAlign = FYGE.TEXT_ALIGN.CENTER;
that.catInfoGroup.addChild(that.experience);
};
MainSceneBtnUi.prototype.initFishPointGroup = function () {
var that = this;
......@@ -47608,6 +47632,7 @@ var MainSceneBtnUi = (function (_super) {
that.catLevelLabel.text = "Lv." + level;
that.fishPointLabel.text = "" + happyCoin;
that.catExperience.scaleX = experience / experienceMax;
that.experience.text = experience + "/" + experienceMax;
};
MainSceneBtnUi.prototype.hideAllActBtn = function () {
var that = this;
project/src/canvas/game/resCanvasList.js
View file @ 08bf0c2c
......@@ -816,6 +816,18 @@ const resCanvasList = {
uuid: '1a4f7c9e-0857-425a-8abe-3dd5c79b2528',
url: 'https://yun.duiba.com.cn/spark/assets/e2822fc4c01310e66f2276f9b03d56519b122e1e.png'
},
'c647044e-5cc9-4701-8b98-53451ae49b40': {
name: 'exLoadingBg1',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingBg1.ad9dad9b1be1194886c5ca6ef820b28fc2a4b4b4.png',
uuid: 'c647044e-5cc9-4701-8b98-53451ae49b40'
},
'8d5533a1-1d88-489f-bf6b-70b27c3e694b': {
name: 'exLoadingFront1',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingFront1.cc7808012a9fd17a1dae55c64e0ba64a32a83f1d.png',
uuid: '8d5533a1-1d88-489f-bf6b-70b27c3e694b'
},
};
export default resCanvasList;
project/src/canvas/game/src/Main.ts
View file @ 08bf0c2c
......@@ -88,6 +88,7 @@ export class Main {
console.log('resloadingList 加载完毕')
changeScene(LoadingScene);
await RES.loadSparkAssets(resCanvasList).catch(()=>{
Ins.showToast("加载资源失败")
console.log('loadSparkAssets resCanvasList 失败')
});
console.log('resCanvasList 加载完毕')
......
project/src/canvas/game/src/cat/Cat.ts
View file @ 08bf0c2c
......@@ -230,7 +230,12 @@ export class Cat extends Module {
sendTbNet(TbNetName.interaction, {type:type,sence:Ins.curScene}, (s, r) => {
if (s) {
if(r.data.isUpgrade){
Ins.showModule("levelupModal",{prizeData:r.data,energyMax1:Ins.userInfo.energyMax,energyMax2:r.data.energyMax});
if(r.data.name=="谢谢参与")
{
Ins.showModule("thanksModal");
}else{
Ins.showModule("levelupModal",{prizeData:r.data,energyMax1:Ins.userInfo.energyMax,energyMax2:r.data.energyMax});
}
}
GDispatcher.dispatchEvent(MSG.UPDATE_USERINFO);
that.actRunning = true;
......
project/src/canvas/game/src/scenes/MainScene.ts
View file @ 08bf0c2c
......@@ -55,7 +55,12 @@ export class MainScene extends Scene {
/**页面是否显示 */
private isShow:boolean = false;
initUi() {
constructor(data?){
super(data);
this.initScene();
}
initScene() {
var that = this;
that.initSceneEle();
}
......@@ -387,7 +392,7 @@ export class MainScene extends Scene {
that.setEnergy();
that.mainUi.updateUserInfo();
} else {
Ins.showToast(r.message)
// Ins.showToast(r.message)
}
})
}
......
project/src/canvas/game/src/ui/MainSceneBtnUi.ts
View file @ 08bf0c2c
......@@ -52,6 +52,8 @@ export class MainSceneBtnUi extends Module {
private catLevelLabel: FYGE.TextField; //猫猫等级文本
private catExperienceBg: FYGE.Sprite; //经验值进度条背景
private catExperience: FYGE.Sprite; //经验值进度条
private experience: FYGE.TextField;
// private maxExperience: FYGE.TextField;
/**鱼鱼积分组 */
private fishPointGroup: FYGE.Sprite;
private fishPointLabel: FYGE.TextField; //鱼鱼积分文本
......@@ -121,27 +123,38 @@ export class MainSceneBtnUi extends Module {
that.catInfoGroup.addChild(mask);
that.catAvatar.mask = mask;
that.catNameLabel = Ins.initLabel({ color: "black", size: 24, text: "喵喵喵", x: (95 - 19), y: (167 - 145) })
that.catNameLabel = Ins.initLabel({ color: "black", size: 24, text: "喵喵喵", x: 66, y: (167 - 145) })
that.catInfoGroup.addChild(that.catNameLabel);
that.catLevelLabel = Ins.initLabel({ color: "black", size: 24, text: "Lv.1", x: (192 - 19), y: (167 - 145) })
that.catLevelLabel = Ins.initLabel({ color: "black", size: 24, text: "Lv.1", x: (212 - 19), y: (167 - 145) })
that.catInfoGroup.addChild(that.catLevelLabel);
that.catExperienceBg = Ins.initSprite("60d6bb5e-5af1-459d-8a0f-ac7a3edcb703", 76, 52);
that.catExperienceBg = Ins.initSprite("c647044e-5cc9-4701-8b98-53451ae49b40", 66, 52);
// that.catExperienceBg.width = 89;
that.catInfoGroup.addChild(that.catExperienceBg);
that.catExperience = Ins.initSprite("f2a39dcf-acc3-4cc8-9dd1-e82e915048db");
that.catExperience = Ins.initSprite("8d5533a1-1d88-489f-bf6b-70b27c3e694b");
// that.catExperience.width = 89;
that.catExperience.anchorY = that.catExperience.height >> 1;
that.catExperienceBg.addChild(that.catExperience);
var mask = new FYGE.Shape();
mask.beginFill(6, 1);
mask.drawRoundedRect(0, 0, that.catExperience.width, that.catExperience.height, 38, 38, 38, 38);
mask.drawRoundedRect(-4, 0, that.catExperience.width, that.catExperience.height, 45, 45, 45, 45);
mask.endFill();
mask.x = 5;
mask.y = 0;
that.catExperienceBg.addChild(mask);
that.catExperience.mask = mask;
that.experience = Ins.initLabel({size:18});
that.experience.position.set(144,53)
that.experience.textWidth = 110;
that.experience.bold = true;
that.experience.textAlign = FYGE.TEXT_ALIGN.CENTER
that.catInfoGroup.addChild(that.experience);
// that.catLevelLabel
}
......@@ -186,6 +199,7 @@ export class MainSceneBtnUi extends Module {
that.catLevelLabel.text = "Lv." + level;
that.fishPointLabel.text = "" + happyCoin;
that.catExperience.scaleX = experience / experienceMax;
that.experience.text = experience+"/"+experienceMax;
}
......
project/src/components/comthanks/comthanks.jsx 0 → 100644
View file @ 08bf0c2c
'use strict';
import React, { Component } from 'react';
import resList from '../../resconfig/resList';
import './comthanksmodal.less';
class Comthanksmodal extends Component {
constructor(props) {
super(props);
this.state = { resList: resList };
}
render() {
return (
<div className="thanksmodal ">
<img className="thanksbg " src={this.state.resList['255668e8-739f-41a5-9f83-207def3aa3fd'].url} />
<img className="thanksclose " src={this.state.resList['29e80fbb-98ed-40fb-a11b-e14b45fee158'].url} />
</div>
);
}
}
export default Comthanksmodal;
\ No newline at end of file
project/src/components/comthanks/comthanks.less 0 → 100644
View file @ 08bf0c2c
.thanksmodal {
width: 721px;
height: 452px;
opacity: 1;
left: 18px;
top: 392px;
position: absolute;
transform-origin: 0px 0px 0px;
.thanksbg {
width: 721px;
height: 452px;
opacity: 1;
position: absolute;
transform-origin: 0px 0px 0px;
}
.thanksclose {
width: 43px;
height: 43px;
opacity: 1;
left: 624px;
top: 41px;
position: absolute;
transform-origin: 0px 0px 0px;
}
}
\ No newline at end of file
taobao_mini/client/components/comcatbackbed/comcatbackbed.js
View file @ 08bf0c2c
'use strict';
import resList from '../../resconfig/resList';
const app = getApp();
const {
tbcc
} = app;
const {
commonToast,
getAuthUserInfo,
navigateToOutside,
getSystemInfo
} = tbcc.tb;
Component({
props: {
catImgArr: { //回归猫的图片，1：惊喜欢乐币，2：意外精力值，3：倒霉
......@@ -37,6 +47,10 @@ Component({
},
methods: {
onModalClose() {
const { message } = this.props.recallCatInfo;
if(message){
commonToast(message);
}
const {
onModalClose
} = this.props;
......
taobao_mini/client/components/comcatname/comcatname.js
View file @ 08bf0c2c
......@@ -99,13 +99,14 @@ Component({
},
/**检测emoji */
haveEmoji(str) {
var regRule = /\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g;
return str.match(regRule)
// var regRule = /\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g;
var char=/^[\u4e00-\u9fa5_a-zA-Z0-9]+$/;
return str.match(char)
},
/**确认领养 */
async catNameSure() {
let name = this.props.catName;
if (this.isSqure(name)||this.haveEmoji(name)) {
if (this.isSqure(name)||!this.haveEmoji(name)) {
my.showToast({
content: "您输入的昵称不可用",
});
......
taobao_mini/client/components/comthanks/comthanks.acss 0 → 100644
View file @ 08bf0c2c
.thanksmodal {
width: 721rpx;
height: 452rpx;
opacity: 1;
left: 18rpx;
top: 562rpx;
position: absolute;
transform-origin: 50% 50% 0rpx;
}
.thanksmodal .thanksbg {
width: 721rpx;
height: 452rpx;
opacity: 1;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.thanksmodal .thanksclose {
width: 43rpx;
height: 43rpx;
opacity: 1;
left: 624rpx;
top: 41rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
taobao_mini/client/components/comthanks/comthanks.axml 0 → 100644
View file @ 08bf0c2c
<view class="thanksmodal modal-animate-zoom-in">
<image class="thanksbg " src={{resList['255668e8-739f-41a5-9f83-207def3aa3fd'].url}} />
<image class="thanksclose " onTap="onModalClose" src={{resList['29e80fbb-98ed-40fb-a11b-e14b45fee158'].url}} />
</view>
\ No newline at end of file
taobao_mini/client/components/comthanks/comthanks.js 0 → 100644
View file @ 08bf0c2c
'use strict';
import resList from '../../resconfig/resList';
Component({
props: {},
data: {
resList: resList
},
methods: {
onModalClose() {
const {
onModalClose
} = this.props;
onModalClose && onModalClose();
console.log('onModalClose')
},
},
});
\ No newline at end of file
taobao_mini/client/components/comthanks/comthanks.json 0 → 100644
View file @ 08bf0c2c
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
taobao_mini/client/pages/pagecanvas/output.js
View file @ 08bf0c2c
......@@ -1977,6 +1977,18 @@ const resCanvasList = {
uuid: '1a4f7c9e-0857-425a-8abe-3dd5c79b2528',
url: 'https://yun.duiba.com.cn/spark/assets/e2822fc4c01310e66f2276f9b03d56519b122e1e.png'
},
'c647044e-5cc9-4701-8b98-53451ae49b40': {
name: 'exLoadingBg1',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingBg1.ad9dad9b1be1194886c5ca6ef820b28fc2a4b4b4.png',
uuid: 'c647044e-5cc9-4701-8b98-53451ae49b40'
},
'8d5533a1-1d88-489f-bf6b-70b27c3e694b': {
name: 'exLoadingFront1',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/exLoadingFront1.cc7808012a9fd17a1dae55c64e0ba64a32a83f1d.png',
uuid: '8d5533a1-1d88-489f-bf6b-70b27c3e694b'
},
};
/* harmony default export */ __webpack_exports__["default"] = (resCanvasList);
......@@ -2319,6 +2331,7 @@ var Main = (function () {
console.log('resloadingList 加载完毕');
ctrls_1.changeScene(LoadingScene_1.LoadingScene);
return [4, RES_1.RES.loadSparkAssets(resCanvasList_1.default).catch(function () {
Ins_1.Ins.showToast("加载资源失败");
console.log('loadSparkAssets resCanvasList 失败');
})];
case 2:
......@@ -2774,7 +2787,12 @@ var Cat = (function (_super) {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.interaction, { type: type, sence: Ins_1.Ins.curScene }, function (s, r) {
if (s) {
if (r.data.isUpgrade) {
Ins_1.Ins.showModule("levelupModal", { prizeData: r.data, energyMax1: Ins_1.Ins.userInfo.energyMax, energyMax2: r.data.energyMax });
if (r.data.name == "谢谢参与") {
Ins_1.Ins.showModule("thanksModal");
}
else {
Ins_1.Ins.showModule("levelupModal", { prizeData: r.data, energyMax1: Ins_1.Ins.userInfo.energyMax, energyMax2: r.data.energyMax });
}
}
Main_1.GDispatcher.dispatchEvent(Enum_1.MSG.UPDATE_USERINFO);
that.actRunning = true;
......@@ -46908,15 +46926,16 @@ var letter_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/letter */ "./src/lo
var Guide_1 = __webpack_require__(/*! ../guide/Guide */ "./src/guide/Guide.ts");
var MainScene = (function (_super) {
__extends(MainScene, _super);
function MainScene() {
var _this = _super !== null && _super.apply(this, arguments) || this;
function MainScene(data) {
var _this = _super.call(this, data) || this;
_this.bgUUID = [];
_this.maxEnergy = 1500;
_this.level = 0;
_this.isShow = false;
_this.initScene();
return _this;
}
MainScene.prototype.initUi = function () {
MainScene.prototype.initScene = function () {
var that = this;
that.initSceneEle();
};
......@@ -47206,7 +47225,6 @@ var MainScene = (function (_super) {
that.mainUi.updateUserInfo();
}
else {
Ins_1.Ins.showToast(r.message);
}
});
};
......@@ -47555,23 +47573,29 @@ var MainSceneBtnUi = (function (_super) {
mask.position.set(33, 33);
that.catInfoGroup.addChild(mask);
that.catAvatar.mask = mask;
that.catNameLabel = Ins_1.Ins.initLabel({ color: "black", size: 24, text: "喵喵喵", x: (95 - 19), y: (167 - 145) });
that.catNameLabel = Ins_1.Ins.initLabel({ color: "black", size: 24, text: "喵喵喵", x: 66, y: (167 - 145) });
that.catInfoGroup.addChild(that.catNameLabel);
that.catLevelLabel = Ins_1.Ins.initLabel({ color: "black", size: 24, text: "Lv.1", x: (192 - 19), y: (167 - 145) });
that.catLevelLabel = Ins_1.Ins.initLabel({ color: "black", size: 24, text: "Lv.1", x: (212 - 19), y: (167 - 145) });
that.catInfoGroup.addChild(that.catLevelLabel);
that.catExperienceBg = Ins_1.Ins.initSprite("60d6bb5e-5af1-459d-8a0f-ac7a3edcb703", 76, 52);
that.catExperienceBg = Ins_1.Ins.initSprite("c647044e-5cc9-4701-8b98-53451ae49b40", 66, 52);
that.catInfoGroup.addChild(that.catExperienceBg);
that.catExperience = Ins_1.Ins.initSprite("f2a39dcf-acc3-4cc8-9dd1-e82e915048db");
that.catExperience = Ins_1.Ins.initSprite("8d5533a1-1d88-489f-bf6b-70b27c3e694b");
that.catExperience.anchorY = that.catExperience.height >> 1;
that.catExperienceBg.addChild(that.catExperience);
var mask = new FYGE.Shape();
mask.beginFill(6, 1);
mask.drawRoundedRect(0, 0, that.catExperience.width, that.catExperience.height, 38, 38, 38, 38);
mask.drawRoundedRect(-4, 0, that.catExperience.width, that.catExperience.height, 45, 45, 45, 45);
mask.endFill();
mask.x = 5;
mask.y = 0;
that.catExperienceBg.addChild(mask);
that.catExperience.mask = mask;
that.experience = Ins_1.Ins.initLabel({ size: 18 });
that.experience.position.set(144, 53);
that.experience.textWidth = 110;
that.experience.bold = true;
that.experience.textAlign = FYGE.TEXT_ALIGN.CENTER;
that.catInfoGroup.addChild(that.experience);
};
MainSceneBtnUi.prototype.initFishPointGroup = function () {
var that = this;
......@@ -47608,6 +47632,7 @@ var MainSceneBtnUi = (function (_super) {
that.catLevelLabel.text = "Lv." + level;
that.fishPointLabel.text = "" + happyCoin;
that.catExperience.scaleX = experience / experienceMax;
that.experience.text = experience + "/" + experienceMax;
};
MainSceneBtnUi.prototype.hideAllActBtn = function () {
var that = this;
taobao_mini/client/pages/pagecanvas/pagecanvas.axml
View file @ 08bf0c2c
......@@ -14,4 +14,5 @@
<view class="popcontainer" a:if="{{getcatModalVisible}}"><getcat-modal selectType="{{catType}}" catName="{{catName}}" onPostSelectCat="postSelectCat" onModalClose="closeGetcatModal"></getcat-modal></view>
<view class="popcontainer" a:if="{{catbackbedModalVisible}}"><catbackbed-modal mydata="{{recallcatModalData}}" recallCatInfo="{{recallCatInfo}}" onUpdateUserInfo="updateUserInfo" onModalClose="closeCatbackModal"></catbackbed-modal></view>
<task-modal a:if="{{taskModalVisible}}" onModalClose="closeTaskModal"></task-modal>
<view class="popcontainer" a:if="{{catruleModalVisible}}"><catrule-modal rule="{{activityBaseInfo}}" onModalClose="closeCatruleModal"></catrule-modal></view>
<view class="popcontainer" a:if="{{catruleModalVisible}}"><catrule-modal rule="{{activityBaseInfo}}" onModalClose="closeCatruleModal"></catrule-modal></view>
<view class="popcontainer" a:if="{{thanksModalVisible}}"><thanks-modal onModalClose="closeThanksModal"></thanks-modal></view>
taobao_mini/client/pages/pagecanvas/pagecanvas.js
View file @ 08bf0c2c
......@@ -51,7 +51,8 @@ Page({
getcatModalVisible: false,
getcatModalData: {},
catbackbedModalVisible: false,
catruleModalVisible: 0
catruleModalVisible: 0,
thanksModalVisible:false
},
async doHelp() {
if (!app.inviteId) return;
......@@ -391,7 +392,7 @@ Page({
avatar
}).catch(res => {
// commonToast(res && res.message);
commonToast("页面显示登录失败")
// commonToast("页面显示登录失败")
}) || {};
if (success) {
......@@ -484,6 +485,11 @@ Page({
catruleModalVisible: false
})
},
closeThanksModal() {
this.setData({
thanksModalVisible: false
})
},
onShareAppMessage() {
// 返回自定义分享信息
let {
......
taobao_mini/client/pages/pagecanvas/pagecanvas.json
View file @ 08bf0c2c
......@@ -10,7 +10,9 @@
"recallcat-modal":"/components/comrecallcat/comrecallcat",
"getcat-modal":"/components/comgetcat/comgetcat",
"catbackbed-modal":"/components/comcatbackbed/comcatbackbed",
"catrule-modal":"/components/comcatrule/comcatrule"
"catrule-modal":"/components/comcatrule/comcatrule",
"thanks-modal":"/components/comthanks/comthanks"
}
}
......
taobao_mini/client/resconfig/resList.js
View file @ 08bf0c2c
......@@ -568,6 +568,12 @@ const resList = {
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/catNameBtnGray.954587775085edff2210de9ab0d7ca1ef9e34e4e.png',
uuid: '3fe9ac60-f1aa-4da3-93da-c67e5a9dc3a6'
}
},
'255668e8-739f-41a5-9f83-207def3aa3fd': {
name: 'thanksBg',
ext: '.png',
uuid: '255668e8-739f-41a5-9f83-207def3aa3fd',
url: '//yun.duiba.com.cn/spark/assets/cf23d4ed33f7fa384c206ba3f4c1c965f3aaa000.png'
},
};
export default resList;
taobao_mini/debug.log
View file @ 08bf0c2c
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