Skip to content

N
new_taobao
Commit 3d035dd5 authored by wildfirecode13's avatar wildfirecode13
Browse files
Options

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

parents bffd3324 bb292df6
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 32 deletions
project/src/canvas/game/output.js
View file @ 3d035dd5
......@@ -1889,7 +1889,7 @@ const resCanvasList = {
'624e8c63-963f-4b20-9802-b0fb006fbf93': {
name: 'catTalkDialog',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/catTalkDialog.6fa85b0929d7d8e0d42d0d30587cdbdc33059a8f.png',
url: 'https://yun.duiba.com.cn/spark/assets/catTalkDialog.6fa85b0929d7d8e0d42d0d30587cdbdc33059a8f.png',
uuid: '624e8c63-963f-4b20-9802-b0fb006fbf93'
}
};
......@@ -2515,7 +2515,7 @@ var Cat = (function (_super) {
};
Cat.prototype.initCatLottieArr = function () {
this.catLottieArr = {
"blue": {
1: {
sleep: lanmao01shuijiao_1.lanmao01shuijiao,
talk: lanmao02shuohua_1.lanmao02shuohua,
clear: lanmao03shumao_1.lanmao03shumao,
......@@ -2523,7 +2523,7 @@ var Cat = (function (_super) {
play: lanmao05wanqiu_1.lanmao05wanqiu,
touch: lanmao06motou_1.lanmao06motou
},
"orenge": {
2: {
sleep: jumao01_1.jumao01,
talk: jumaoshuohua_1.jumaoshuohua,
clear: jumaoshumao_1.jumaoshumao,
......@@ -2531,7 +2531,7 @@ var Cat = (function (_super) {
play: jumaowanshua_1.jumaowanshua,
touch: jumaomotoumao_1.jumaomotoumao
},
"sanhua": {
3: {
sleep: sanhua01shuijiao_1.sanhua01shuijiao,
talk: sanhua02shuohua_2_1.sanhua02shuohua2,
clear: sanhua03shumao_1.sanhua03shumao,
......@@ -2539,7 +2539,7 @@ var Cat = (function (_super) {
play: sanhua05wanqiu_1.sanhua05wanqiu,
touch: sanhua06motou_1.sanhua06motou
},
"xianluo": {
4: {
sleep: xianluomao01_1.xianluomao01,
talk: xianluoshuohua_1.xianluoshuohua,
clear: xianluo03shumao_1.xianluo03shumao,
......@@ -46764,7 +46764,7 @@ var MainScene = (function (_super) {
};
MainScene.prototype.initCat = function () {
var that = this;
that.cat = new Cat_1.Cat({ type: "orenge" });
that.cat = new Cat_1.Cat({ type: Ins_1.Ins.userInfo.catType });
that.addChild(that.cat);
if (Ins_1.Ins.catIsOut) {
that.cat.visible = false;
......@@ -47201,6 +47201,7 @@ var MainSceneBtnUi = (function (_super) {
};
MainSceneBtnUi.prototype.catRecallHandler = function () {
console.log("召回猫咪");
Ins_1.Ins.showModule("recallcatModal", { catType: Ins_1.Ins.userInfo.catType });
};
MainSceneBtnUi.prototype.getEnergy = function () {
console.log("补充精力");
project/src/canvas/game/output.js.map
View file @ 3d035dd5
This source diff could not be displayed because it is too large. You can view the blob instead.
project/src/canvas/game/released/output.js
View file @ 3d035dd5
......@@ -1891,7 +1891,7 @@ const resCanvasList = {
'624e8c63-963f-4b20-9802-b0fb006fbf93': {
name: 'catTalkDialog',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/catTalkDialog.6fa85b0929d7d8e0d42d0d30587cdbdc33059a8f.png',
url: 'https://yun.duiba.com.cn/spark/assets/catTalkDialog.6fa85b0929d7d8e0d42d0d30587cdbdc33059a8f.png',
uuid: '624e8c63-963f-4b20-9802-b0fb006fbf93'
}
};
......@@ -2517,7 +2517,7 @@ var Cat = (function (_super) {
};
Cat.prototype.initCatLottieArr = function () {
this.catLottieArr = {
"blue": {
1: {
sleep: lanmao01shuijiao_1.lanmao01shuijiao,
talk: lanmao02shuohua_1.lanmao02shuohua,
clear: lanmao03shumao_1.lanmao03shumao,
......@@ -2525,7 +2525,7 @@ var Cat = (function (_super) {
play: lanmao05wanqiu_1.lanmao05wanqiu,
touch: lanmao06motou_1.lanmao06motou
},
"orenge": {
2: {
sleep: jumao01_1.jumao01,
talk: jumaoshuohua_1.jumaoshuohua,
clear: jumaoshumao_1.jumaoshumao,
......@@ -2533,7 +2533,7 @@ var Cat = (function (_super) {
play: jumaowanshua_1.jumaowanshua,
touch: jumaomotoumao_1.jumaomotoumao
},
"sanhua": {
3: {
sleep: sanhua01shuijiao_1.sanhua01shuijiao,
talk: sanhua02shuohua_2_1.sanhua02shuohua2,
clear: sanhua03shumao_1.sanhua03shumao,
......@@ -2541,7 +2541,7 @@ var Cat = (function (_super) {
play: sanhua05wanqiu_1.sanhua05wanqiu,
touch: sanhua06motou_1.sanhua06motou
},
"xianluo": {
4: {
sleep: xianluomao01_1.xianluomao01,
talk: xianluoshuohua_1.xianluoshuohua,
clear: xianluo03shumao_1.xianluo03shumao,
......@@ -46766,7 +46766,7 @@ var MainScene = (function (_super) {
};
MainScene.prototype.initCat = function () {
var that = this;
that.cat = new Cat_1.Cat({ type: "orenge" });
that.cat = new Cat_1.Cat({ type: Ins_1.Ins.userInfo.catType });
that.addChild(that.cat);
if (Ins_1.Ins.catIsOut) {
that.cat.visible = false;
......@@ -47203,6 +47203,7 @@ var MainSceneBtnUi = (function (_super) {
};
MainSceneBtnUi.prototype.catRecallHandler = function () {
console.log("召回猫咪");
Ins_1.Ins.showModule("recallcatModal", { catType: Ins_1.Ins.userInfo.catType });
};
MainSceneBtnUi.prototype.getEnergy = function () {
console.log("补充精力");
project/src/canvas/game/resCanvasList.js
View file @ 3d035dd5
......@@ -656,7 +656,7 @@ const resCanvasList = {
'624e8c63-963f-4b20-9802-b0fb006fbf93': {
name: 'catTalkDialog',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/catTalkDialog.6fa85b0929d7d8e0d42d0d30587cdbdc33059a8f.png',
url: 'https://yun.duiba.com.cn/spark/assets/catTalkDialog.6fa85b0929d7d8e0d42d0d30587cdbdc33059a8f.png',
uuid: '624e8c63-963f-4b20-9802-b0fb006fbf93'
}
};
......
project/src/canvas/game/src/ResJson.ts
View file @ 3d035dd5
......@@ -10,5 +10,5 @@ export const ResJson = {
"name": "startScene"
}
],
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1600851674/resource/"
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1600930613/resource/"
}
\ No newline at end of file
taobao_mini/client/components/comcatname/comcatname.acss
View file @ 3d035dd5
......@@ -49,7 +49,7 @@
left: 111rpx;
top: 736rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
transform-origin: 50% 50% 0rpx;
}
.catname .catnameinput {
width: 500rpx;
......
taobao_mini/client/components/comcatname/comcatname.axml
View file @ 3d035dd5
......@@ -4,7 +4,7 @@
<image class="catnamedialogbg" src={{resList['50779aee-069e-4dd9-b2ff-88beda9f43d1'].url}} />
<label class="catnamedialoglabel">铲屎官～帮我取个名字吧！喵～</label>
</view>
<image class="catnamesure" onTap="catNameSure" src={{resList['c7916d41-ea9d-4f8e-b5aa-e2060d6ae265'].url}} />
<image class="catnamesure btn" onTap="catNameSure" src={{resList['c7916d41-ea9d-4f8e-b5aa-e2060d6ae265'].url}} />
<view class="catnameinput">
<image class="catnameinputbg" src={{resList['947d970f-52bf-4319-82f0-a3e65620ed75'].url}} />
<input class="catnameinputlabel" maxlength="6" onBlur="getCatName" value="{{catName}}" placeholder="输入名字" name="" ></input>
......
taobao_mini/client/components/comcatname/comcatname.js
View file @ 3d035dd5
......@@ -3,7 +3,7 @@ import API from '../../api';
import resList from '../../resconfig/resList';
Component({
props: {
catImgArr: ["90b114e6-83cb-46f1-b607-f88c50077b05", "003e9904-aee4-4b8d-8d5d-fb4b1188bec1", "90283bd3-4b18-4535-97a8-90318f068781", "4e471df6-01ab-421d-ba0b-084b2110dc6d"],
catImgArr: ["90b114e6-83cb-46f1-b607-f88c50077b05", "4e471df6-01ab-421d-ba0b-084b2110dc6d" , "003e9904-aee4-4b8d-8d5d-fb4b1188bec1","90283bd3-4b18-4535-97a8-90318f068781"],
catName: ""
},
data: {
......@@ -60,7 +60,8 @@ Component({
this.onModalClose();
this.onSelectCatOk();
} else {
my.showToast(adoptCat?adoptCat.message:null)
console.log("ergerg")
my.showToast({content: adoptCat?adoptCat.message:null})
}
}
console.log(this.props.catName)
......
taobao_mini/client/components/comgetcat/comgetcat.axml
View file @ 3d035dd5
<view class="getcat">
<image class="getcatimg" src={{resList['02aacfd1-3347-40a7-8a3a-9f20c1b5706b'].url}} />
<image class="getcatimg" src="{{catImg}}" />
<view class="getcatdialog">
<image class="getcatdialogbg" src={{resList['24b7d459-41d6-408c-9829-4768fe38abf5'].url}} />
<label class="getcatdialogtext">好了，现在你就是{{catName}}的铲屎官了～</label>
......
taobao_mini/client/components/comgetcat/comgetcat.js
View file @ 3d035dd5
'use strict';
import API from '../../api';
import resList from '../../resconfig/resList';
Component({
props: {
catImgArr: ["90b114e6-83cb-46f1-b607-f88c50077b05", "4e471df6-01ab-421d-ba0b-084b2110dc6d" , "003e9904-aee4-4b8d-8d5d-fb4b1188bec1","90283bd3-4b18-4535-97a8-90318f068781"],
catName: ''
},
data: {
resList: resList
resList: resList,
catImg:''
},
methods: {
onModalClose() {
......@@ -17,10 +20,22 @@ Component({
console.log('onModalClose')
},
onPostSelectCat() {
const {
onPostSelectCat
} = this.props;
onPostSelectCat && onPostSelectCat();
const userInfo = API.getUserInfo();
if(userInfo&&userInfo.success){
const {
onPostSelectCat
} = this.props;
this.onModalClose();
onPostSelectCat && onPostSelectCat(userInfo);
}else{
my.showToast(userInfo?userInfo.message:null)
}
}
},
didMount(){
this.setData({
catImg: resList[this.props.catImgArr[this.props.selectType - 1]].url
})
}
});
\ No newline at end of file
taobao_mini/client/pages/pagecanvas/output.js
View file @ 3d035dd5
......@@ -1890,7 +1890,7 @@ const resCanvasList = {
'624e8c63-963f-4b20-9802-b0fb006fbf93': {
name: 'catTalkDialog',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/catTalkDialog.6fa85b0929d7d8e0d42d0d30587cdbdc33059a8f.png',
url: 'https://yun.duiba.com.cn/spark/assets/catTalkDialog.6fa85b0929d7d8e0d42d0d30587cdbdc33059a8f.png',
uuid: '624e8c63-963f-4b20-9802-b0fb006fbf93'
}
};
......@@ -2516,7 +2516,7 @@ var Cat = (function (_super) {
};
Cat.prototype.initCatLottieArr = function () {
this.catLottieArr = {
"blue": {
1: {
sleep: lanmao01shuijiao_1.lanmao01shuijiao,
talk: lanmao02shuohua_1.lanmao02shuohua,
clear: lanmao03shumao_1.lanmao03shumao,
......@@ -2524,7 +2524,7 @@ var Cat = (function (_super) {
play: lanmao05wanqiu_1.lanmao05wanqiu,
touch: lanmao06motou_1.lanmao06motou
},
"orenge": {
2: {
sleep: jumao01_1.jumao01,
talk: jumaoshuohua_1.jumaoshuohua,
clear: jumaoshumao_1.jumaoshumao,
......@@ -2532,7 +2532,7 @@ var Cat = (function (_super) {
play: jumaowanshua_1.jumaowanshua,
touch: jumaomotoumao_1.jumaomotoumao
},
"sanhua": {
3: {
sleep: sanhua01shuijiao_1.sanhua01shuijiao,
talk: sanhua02shuohua_2_1.sanhua02shuohua2,
clear: sanhua03shumao_1.sanhua03shumao,
......@@ -2540,7 +2540,7 @@ var Cat = (function (_super) {
play: sanhua05wanqiu_1.sanhua05wanqiu,
touch: sanhua06motou_1.sanhua06motou
},
"xianluo": {
4: {
sleep: xianluomao01_1.xianluomao01,
talk: xianluoshuohua_1.xianluoshuohua,
clear: xianluo03shumao_1.xianluo03shumao,
......@@ -46765,7 +46765,7 @@ var MainScene = (function (_super) {
};
MainScene.prototype.initCat = function () {
var that = this;
that.cat = new Cat_1.Cat({ type: "orenge" });
that.cat = new Cat_1.Cat({ type: Ins_1.Ins.userInfo.catType });
that.addChild(that.cat);
if (Ins_1.Ins.catIsOut) {
that.cat.visible = false;
......@@ -47202,6 +47202,7 @@ var MainSceneBtnUi = (function (_super) {
};
MainSceneBtnUi.prototype.catRecallHandler = function () {
console.log("召回猫咪");
Ins_1.Ins.showModule("recallcatModal", { catType: Ins_1.Ins.userInfo.catType });
};
MainSceneBtnUi.prototype.getEnergy = function () {
console.log("补充精力");
taobao_mini/client/pages/pagecanvas/pagecanvas.axml
View file @ 3d035dd5
......@@ -10,7 +10,7 @@
<view class="popcontainer" a:if="{{selectcatModalVisible}}"><selectcat-modal onModalClose="closeSelectcatModal" onSelectCat="selectCat"></selectcat-modal></view>
<view class="popcontainer" a:if="{{catnameModalVisible}}" ><catname-modal selectType="{{catType}}" onModalClose="closeCatnameModal" onSelectCatOk="selectCatOk" /></view>
<view class="popcontainer" a:if="{{recallcatModalVisible}}"><recallcat-modal onRecallCat="recallCat" onModalClose="closeRecallcatModal"></recallcat-modal></view>
<view class="popcontainer" a:if="{{getcatModalVisible}}"><getcat-modal catName="{{catName}}" onPostSelectCat="postSelectCat" onModalClose="closeGetcatModal"></getcat-modal></view>
<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="{{getcatModalData}}" 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 onModalClose="closeCatruleModal"></catrule-modal></view>
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