Skip to content

N
new_taobao
Commit 6d6bce2f authored by wildfirecode13's avatar wildfirecode13
Browse files
Options

1

parent 283a99a7
Hide whitespace changes
Inline Side-by-side
Showing with 6315 additions and 35 deletions
project/src/canvas/game/output.js
View file @ 6d6bce2f
......@@ -860,7 +860,6 @@ var Waiting = (function (_super) {
}
Waiting.prototype.show = function (msg) {
if (msg === void 0) { msg = "加载中"; }
this.msg.text = msg;
};
Waiting.prototype.destroy = function () {
_super.prototype.destroy.call(this);
......@@ -1886,6 +1885,12 @@ const resCanvasList = {
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/LetterTexture.78192e79fa3b21a85b245038f23561eeb5141d4d.png',
uuid: '3b12798d-d932-4f5b-a442-6e4877ba5c16'
},
'624e8c63-963f-4b20-9802-b0fb006fbf93': {
name: 'catTalkDialog',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/catTalkDialog.6fa85b0929d7d8e0d42d0d30587cdbdc33059a8f.png',
uuid: '624e8c63-963f-4b20-9802-b0fb006fbf93'
}
};
/* harmony default export */ __webpack_exports__["default"] = (resCanvasList);
......@@ -2459,6 +2464,7 @@ var jumaolumao04_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/orengeCat/jum
var jumao01_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/orengeCat/jumao01 */ "./src/lottieSrc/lottieTs/orengeCat/jumao01.ts");
var jumaomotoumao_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/orengeCat/jumaomotoumao */ "./src/lottieSrc/lottieTs/orengeCat/jumaomotoumao.ts");
var jumaoshumao_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/orengeCat/jumaoshumao */ "./src/lottieSrc/lottieTs/orengeCat/jumaoshumao.ts");
var jumaoshuohua_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/orengeCat/jumaoshuohua */ "./src/lottieSrc/lottieTs/orengeCat/jumaoshuohua.ts");
var jumaowanshua_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/orengeCat/jumaowanshua */ "./src/lottieSrc/lottieTs/orengeCat/jumaowanshua.ts");
var sanhua01shuijiao_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/sanhuaCat/sanhua01shuijiao */ "./src/lottieSrc/lottieTs/sanhuaCat/sanhua01shuijiao.ts");
var sanhua02shuohua_2_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/sanhuaCat/sanhua02shuohua 2 */ "./src/lottieSrc/lottieTs/sanhuaCat/sanhua02shuohua 2.ts");
......@@ -2482,7 +2488,6 @@ var Cat = (function (_super) {
var _this = _super.call(this, data) || this;
_this.catAnimArr = [];
_this.actRunning = false;
_this.curAnim = 0;
_this.catType = data.type;
return _this;
}
......@@ -2490,7 +2495,8 @@ var Cat = (function (_super) {
this.initCatLottieArr();
console.log(this.catLottieArr);
this.initCat();
this.setCatAnimShow(0);
this.initDialog();
this.setCatAnimShow(1);
this.initEvents();
};
Cat.prototype.initCatLottieArr = function () {
......@@ -2505,7 +2511,7 @@ var Cat = (function (_super) {
},
"orenge": {
sleep: jumao01_1.jumao01,
talk: jumaoshumao_1.jumaoshumao,
talk: jumaoshuohua_1.jumaoshuohua,
clear: jumaoshumao_1.jumaoshumao,
rua: jumaolumao04_1.jumaolumao04,
play: jumaowanshua_1.jumaowanshua,
......@@ -2550,6 +2556,25 @@ var Cat = (function (_super) {
that.addChild(that.cat_touch);
that.catAnimArr.push(that.cat_touch);
};
Cat.prototype.initDialog = function () {
var that = this;
that.dialog = Ins_1.Ins.initSprite("624e8c63-963f-4b20-9802-b0fb006fbf93");
that.dialog.position.set(280, 526);
that.addChild(that.dialog);
that.dialogText = Ins_1.Ins.initLabel({ size: 24, x: 30, y: 20 });
that.dialogText.textWidth = 280;
that.dialog.addChild(that.dialogText);
that.dialogText.text = "哈哈哈哈哈哈哈哈哈哈哈\n哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈";
console.log("最大长度为" + that.dialogText.text.length);
that.dialog.visible = false;
};
Cat.prototype.showDialog = function (msg) {
this.dialogText.text = msg;
this.dialog.visible = true;
};
Cat.prototype.hideDialog = function () {
this.dialog.visible = false;
};
Cat.prototype.setCatAnimShow = function (index, callback) {
if (index == 0 || index == 1) {
this.actRunning = false;
......@@ -2583,7 +2608,10 @@ var Cat = (function (_super) {
case Enum_1.CAT_ACTTYPEP.SLEEP:
break;
default:
that.setCatAnimShow(actType, function () { that.setCatAnimShow(0, null); });
that.setCatAnimShow(actType, function () {
that.hideDialog();
that.setCatAnimShow(0, null);
});
break;
}
}
......@@ -22049,6 +22077,2071 @@ exports.jumaoshumao = {
};
/***/ }),
/***/ "./src/lottieSrc/lottieTs/orengeCat/jumaoshuohua.ts":
/*!**********************************************************!*\
!*** ./src/lottieSrc/lottieTs/orengeCat/jumaoshuohua.ts ***!
\**********************************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.jumaoshuohua = void 0;
exports.jumaoshuohua = {
"v": "5.6.4",
"fr": 12,
"ip": 0,
"op": 52,
"w": 750,
"h": 1624,
"nm": "橘猫说话",
"layers": [
{
"ind": 3,
"ty": 2,
"nm": "鼻头",
"parent": 17,
"refId": "9bdb2301-cb80-4aaf-9b9e-3325b04cf2d6",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
119.5,
110.5,
0
]
},
"a": {
"a": 0,
"k": [
6.5,
4.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 4,
"ty": 2,
"nm": "嘴巴 2",
"parent": 17,
"refId": "0ca5864c-810b-4170-8be9-ec98d20b6297",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
121,
128.25,
0
]
},
"a": {
"a": 0,
"k": [
16.639,
13.522,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 21,
"s": [
100,
100,
100
]
},
{
"t": 26.5,
"s": [
120,
120,
100
]
},
{
"t": 32,
"s": [
100,
100,
100
]
}
],
"x": "var $bm_rt;\n$bm_rt = loopOut('cycle', 0);"
}
},
"ip": 21,
"op": 52
},
{
"ind": 5,
"ty": 2,
"nm": "嘴唇",
"parent": 17,
"refId": "4d485659-ec08-4f18-a96a-0a6c71e589cb",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
120.281,
112.269,
0
]
},
"a": {
"a": 0,
"k": [
22.281,
5.269,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 6,
"ty": 2,
"nm": "眼睛03.png",
"refId": "8d6c0d63-96f8-426c-acaa-15ec5458ff04",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
297,
817,
0
]
},
"a": {
"a": 0,
"k": [
83,
21,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 23,
"op": 52
},
{
"ind": 7,
"ty": 2,
"nm": "眼睛02.png",
"refId": "0d3f7277-19e1-4875-9958-cc9536c1bbde",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
297,
817,
0
]
},
"a": {
"a": 0,
"k": [
83,
24.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 22,
"op": 23
},
{
"ind": 8,
"ty": 2,
"nm": "眼睛01.png",
"refId": "f1dc907a-9102-46bf-8baf-9d305a0b1efc",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
297,
817,
0
]
},
"a": {
"a": 0,
"k": [
83,
29.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 21,
"op": 22
},
{
"ind": 9,
"ty": 2,
"nm": "高光右",
"parent": 10,
"refId": "f75517ef-397c-4708-871d-a9e7c41c1c8e",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
26.5,
6.125,
0
]
},
"a": {
"a": 0,
"k": [
3.5,
4,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 21
},
{
"ind": 10,
"ty": 2,
"nm": "黑眼珠右",
"parent": 11,
"refId": "fb111b5a-5bc0-4c49-bcf7-c6802d1f7677",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
26,
26.5,
0
]
},
{
"t": 2,
"s": [
30.8,
26.5,
0
]
},
{
"t": 10,
"s": [
30.8,
26.5,
0
]
},
{
"t": 12,
"s": [
21.3,
26.5,
0
]
},
{
"t": 18,
"s": [
21.3,
26.5,
0
]
},
{
"t": 22,
"s": [
26,
26.5,
0
]
}
]
},
"a": {
"a": 0,
"k": [
17,
17.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 21
},
{
"ind": 11,
"ty": 2,
"nm": "眼眶右",
"parent": 17,
"refId": "e7dc19f7-8963-4ddd-8d2a-6c92be16db31",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
171.5,
84,
0
]
},
{
"t": 2,
"s": [
173.583,
84,
0
]
},
{
"t": 10,
"s": [
173.583,
84,
0
]
},
{
"t": 12,
"s": [
170.458,
84,
0
]
},
{
"t": 18,
"s": [
170.458,
84,
0
]
}
]
},
"a": {
"a": 0,
"k": [
26,
26.5,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 0,
"s": [
100,
100,
100
]
},
{
"t": 1,
"s": [
100,
70,
100
]
},
{
"t": 2,
"s": [
100,
100,
100
]
},
{
"t": 10,
"s": [
100,
100,
100
]
},
{
"t": 11,
"s": [
100,
70,
100
]
},
{
"t": 12,
"s": [
100,
100,
100
]
},
{
"t": 18,
"s": [
100,
100,
100
]
},
{
"t": 20,
"s": [
100,
85,
100
]
},
{
"t": 22,
"s": [
100,
100,
100
]
}
]
}
},
"hasMask": true,
"masksProperties": [
{
"inv": false,
"mode": "n",
"pt": {
"a": 0,
"k": {
"i": [
[
-14.359,
0
],
[
0,
-14.359
],
[
14.36,
0
],
[
0,
14.359
]
],
"o": [
[
14.36,
0
],
[
0,
14.359
],
[
-14.359,
0
],
[
0,
-14.359
]
],
"v": [
[
26,
0.625
],
[
52,
26.625
],
[
26,
52.625
],
[
0,
26.625
]
],
"c": true
},
"ix": 1
},
"o": {
"a": 0,
"k": 100,
"ix": 3
},
"x": {
"a": 0,
"k": 0,
"ix": 4
},
"nm": "Mask 1"
}
],
"ip": 0,
"op": 21
},
{
"ind": 13,
"ty": 2,
"nm": "高光左",
"parent": 14,
"refId": "f75517ef-397c-4708-871d-a9e7c41c1c8e",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
27.5,
7,
0
]
},
"a": {
"a": 0,
"k": [
3.5,
4,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 21
},
{
"ind": 14,
"ty": 2,
"nm": "黑眼珠左",
"parent": 15,
"refId": "fb111b5a-5bc0-4c49-bcf7-c6802d1f7677",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
26,
26.5,
0
]
},
{
"t": 2,
"s": [
30.9,
26.5,
0
]
},
{
"t": 10,
"s": [
30.9,
26.5,
0
]
},
{
"t": 12,
"s": [
20.8,
26.5,
0
]
},
{
"t": 18,
"s": [
20.8,
26.5,
0
]
},
{
"t": 22,
"s": [
26,
26.5,
0
]
}
]
},
"a": {
"a": 0,
"k": [
17,
17.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 21
},
{
"ind": 15,
"ty": 2,
"nm": "眼眶左",
"parent": 17,
"refId": "edd0fc7c-2984-4323-a7e4-2b512f1ebf2b",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
69,
83.5,
0
]
},
{
"t": 2,
"s": [
71.083,
83.5,
0
]
},
{
"t": 10,
"s": [
71.083,
83.5,
0
]
},
{
"t": 12,
"s": [
69,
83.5,
0
]
},
{
"t": 18,
"s": [
69,
83.5,
0
]
}
]
},
"a": {
"a": 0,
"k": [
26,
26.5,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 0,
"s": [
100,
100,
100
]
},
{
"t": 1,
"s": [
100,
70,
100
]
},
{
"t": 2,
"s": [
100,
100,
100
]
},
{
"t": 10,
"s": [
100,
100,
100
]
},
{
"t": 11,
"s": [
100,
70,
100
]
},
{
"t": 12,
"s": [
100,
100,
100
]
},
{
"t": 18,
"s": [
100,
100,
100
]
},
{
"t": 20,
"s": [
100,
90,
100
]
},
{
"t": 22,
"s": [
100,
100,
100
]
}
]
}
},
"ip": 0,
"op": 21
},
{
"ind": 17,
"ty": 2,
"nm": "头",
"refId": "f0fcbf12-b983-437c-970d-0d9413ff2b44",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
297,
913.5,
0
]
},
{
"t": 2,
"s": [
308.6,
883.5,
0
]
},
{
"t": 10,
"s": [
308.6,
883.5,
0
]
},
{
"t": 12,
"s": [
295.6,
895.5,
0
]
},
{
"t": 18,
"s": [
295.6,
895.5,
0
]
},
{
"t": 22,
"s": [
297,
913.5,
0
]
}
]
},
"a": {
"a": 0,
"k": [
118,
178.5,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 0,
"s": [
100,
100,
100
]
},
{
"t": 2,
"s": [
96,
108,
100
]
},
{
"t": 10,
"s": [
96,
108,
100
]
},
{
"t": 18,
"s": [
96,
108,
100
]
},
{
"t": 22,
"s": [
100,
100,
100
]
}
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 18,
"ty": 2,
"nm": "右耳",
"parent": 17,
"refId": "461d68ac-bb33-48e4-8de9-954497825053",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 2,
"s": [
0
]
},
{
"t": 4,
"s": [
7
]
},
{
"t": 6,
"s": [
-7
]
},
{
"t": 8,
"s": [
6
]
},
{
"t": 10,
"s": [
0
]
},
{
"t": 21,
"s": [
0
]
},
{
"t": 23,
"s": [
5
]
},
{
"t": 25,
"s": [
-5.1
]
},
{
"t": 27,
"s": [
5
]
},
{
"t": 29,
"s": [
0
]
},
{
"t": 38,
"s": [
0
]
},
{
"t": 40,
"s": [
7
]
},
{
"t": 42,
"s": [
-7
]
},
{
"t": 44,
"s": [
6
]
},
{
"t": 46,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
183.958,
35.352,
0
]
},
"a": {
"a": 0,
"k": [
57.5,
46.5,
0
]
},
"s": {
"a": 0,
"k": [
105,
105,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 19,
"ty": 2,
"nm": "左耳",
"parent": 17,
"refId": "2877642e-9288-47fb-a653-99673d8a0192",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 2,
"s": [
0
]
},
{
"t": 4,
"s": [
-5
]
},
{
"t": 6,
"s": [
5
]
},
{
"t": 8,
"s": [
-2.8
]
},
{
"t": 10,
"s": [
0
]
},
{
"t": 38,
"s": [
0
]
},
{
"t": 40,
"s": [
-5
]
},
{
"t": 42,
"s": [
5
]
},
{
"t": 44,
"s": [
-2.8
]
},
{
"t": 46,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
47,
40.5,
0
]
},
"a": {
"a": 0,
"k": [
40.5,
49.5,
0
]
},
"s": {
"a": 0,
"k": [
105.3,
105.3,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 20,
"ty": 2,
"nm": "橘猫02说话_00000.png",
"refId": "eddf3c35-8553-44a3-a827-7c0290699f13",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": -6,
"op": 33
},
{
"ind": 21,
"ty": 2,
"nm": "橘猫02说话_00001.png",
"refId": "b9c1f05f-be35-4bf9-97bf-98af3f2dfc2f",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 33,
"op": 34
},
{
"ind": 22,
"ty": 2,
"nm": "橘猫02说话_00002.png",
"refId": "71294f77-f87f-4133-9dd8-115e4ffdd9b3",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 34,
"op": 35
},
{
"ind": 23,
"ty": 2,
"nm": "橘猫02说话_00003.png",
"refId": "ff7fcb39-d668-4c07-a0cf-8914ae8f245f",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 35,
"op": 36
},
{
"ind": 24,
"ty": 2,
"nm": "橘猫02说话_00004.png",
"refId": "834a7ed2-f7bf-47b8-bdba-884f9a64c6bd",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 36,
"op": 37
},
{
"ind": 25,
"ty": 2,
"nm": "橘猫02说话_00005.png",
"refId": "52b0d2f3-24f5-4b91-9bc3-2a00533c9f07",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 37,
"op": 38
},
{
"ind": 26,
"ty": 2,
"nm": "橘猫02说话_00006.png",
"refId": "834a7ed2-f7bf-47b8-bdba-884f9a64c6bd",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 38,
"op": 39
},
{
"ind": 27,
"ty": 2,
"nm": "橘猫02说话_00007.png",
"refId": "ff7fcb39-d668-4c07-a0cf-8914ae8f245f",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 39,
"op": 40
},
{
"ind": 28,
"ty": 2,
"nm": "橘猫02说话_00008.png",
"refId": "71294f77-f87f-4133-9dd8-115e4ffdd9b3",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 40,
"op": 41
},
{
"ind": 29,
"ty": 2,
"nm": "橘猫02说话_00009.png",
"refId": "b9c1f05f-be35-4bf9-97bf-98af3f2dfc2f",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 41,
"op": 42
},
{
"ind": 30,
"ty": 2,
"nm": "橘猫02说话_00010.png",
"refId": "eddf3c35-8553-44a3-a827-7c0290699f13",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 42,
"op": 61
},
{
"ind": 32,
"ty": 2,
"nm": "左后腿",
"refId": "c63045b6-2025-47cf-ac72-4a1aea1051d8",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
472,
931.5,
0
]
},
"a": {
"a": 0,
"k": [
61,
38.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 33,
"ty": 2,
"nm": "左前爪",
"refId": "ab38b085-976f-44d1-9b10-742189e17c1f",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 0,
"s": [
0
]
},
{
"t": 2,
"s": [
4.2
]
},
{
"t": 10,
"s": [
4.2
]
},
{
"t": 12,
"s": [
1.7
]
},
{
"t": 18,
"s": [
1.7
]
},
{
"t": 22,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
407,
929,
0
]
},
"a": {
"a": 0,
"k": [
141,
13,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 34,
"ty": 2,
"nm": "右前爪",
"refId": "cf28f8a9-f2e6-4f12-bf5e-11847b7aea36",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 0,
"s": [
0
]
},
{
"t": 2,
"s": [
-5
]
},
{
"t": 10,
"s": [
-5
]
},
{
"t": 12,
"s": [
-3
]
},
{
"t": 18,
"s": [
-3
]
},
{
"t": 22,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
197.5,
896,
0
]
},
"a": {
"a": 0,
"k": [
15,
53.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 35,
"ty": 2,
"nm": "身子",
"refId": "bc12c782-83d3-42bc-9ef7-3dd53d9f6c15",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
394,
964.5,
0
]
},
"a": {
"a": 0,
"k": [
197,
193.5,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 0,
"s": [
100,
100,
100
]
},
{
"t": 2,
"s": [
100,
105,
100
]
},
{
"t": 10,
"s": [
100,
105,
100
]
},
{
"t": 12,
"s": [
100,
103,
100
]
},
{
"t": 18,
"s": [
100,
103,
100
]
},
{
"t": 22,
"s": [
100,
100,
100
]
}
]
}
},
"ip": 0,
"op": 52
}
],
"markers": [
{
"tm": 10,
"cm": "",
"dr": 0
},
{
"tm": 12,
"cm": "",
"dr": 0
}
]
};
/***/ }),
/***/ "./src/lottieSrc/lottieTs/orengeCat/jumaowanshua.ts":
......@@ -44432,6 +46525,7 @@ var RulePanel = (function (_super) {
this.y = (Ins_1.Ins.stageH - bg.height) >> 1;
var ruleLabel = Ins_1.Ins.initLabel({ size: 24, text: "规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则" });
var ruleView = new FYGE.ScrollPage(574, 279, ruleLabel.textHeight);
ruleLabel.textWidth = 570;
ruleView.isSpringBack = false;
ruleView.x = 76;
ruleView.y = 167;
......@@ -44787,7 +46881,7 @@ var MainScene = (function (_super) {
};
MainScene.prototype.initCat = function () {
var that = this;
that.cat = new Cat_1.Cat({ type: "xianluo" });
that.cat = new Cat_1.Cat({ type: "orenge" });
that.addChild(that.cat);
if (Ins_1.Ins.catIsOut) {
that.cat.visible = false;
......@@ -44841,7 +46935,7 @@ var MainScene = (function (_super) {
var that = this;
that.energy = Ins_1.Ins.userInfo.energy;
that.energyImg.scaleX = (that.energy / that.maxEnergy);
that.energyDeco.x = that.energyImgW * that.energyImg.scaleX - that.energyDeco.width * 0.5;
that.energyDeco.x = that.energyImgW * that.energyImg.scaleX - that.energyDeco.width * 0.2;
that.energyLabel.text = "精力" + that.energy + "/" + that.maxEnergy;
that.energyLabel.x = (that.energyGroup.width - that.energyLabel.textWidth) / 2;
};
......@@ -45091,8 +47185,7 @@ var MainSceneBtnUi = (function (_super) {
mask.beginFill(6, 1);
mask.drawCircle(0, 0, 24);
mask.endFill();
mask.x = 33;
mask.y = 33;
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) });
project/src/canvas/game/output.js.map
View file @ 6d6bce2f
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 @ 6d6bce2f
......@@ -862,7 +862,6 @@ var Waiting = (function (_super) {
}
Waiting.prototype.show = function (msg) {
if (msg === void 0) { msg = "加载中"; }
this.msg.text = msg;
};
Waiting.prototype.destroy = function () {
_super.prototype.destroy.call(this);
......@@ -1888,6 +1887,12 @@ const resCanvasList = {
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/LetterTexture.78192e79fa3b21a85b245038f23561eeb5141d4d.png',
uuid: '3b12798d-d932-4f5b-a442-6e4877ba5c16'
},
'624e8c63-963f-4b20-9802-b0fb006fbf93': {
name: 'catTalkDialog',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/catTalkDialog.6fa85b0929d7d8e0d42d0d30587cdbdc33059a8f.png',
uuid: '624e8c63-963f-4b20-9802-b0fb006fbf93'
}
};
/* harmony default export */ __webpack_exports__["default"] = (resCanvasList);
......@@ -2461,6 +2466,7 @@ var jumaolumao04_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/orengeCat/jum
var jumao01_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/orengeCat/jumao01 */ "./src/lottieSrc/lottieTs/orengeCat/jumao01.ts");
var jumaomotoumao_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/orengeCat/jumaomotoumao */ "./src/lottieSrc/lottieTs/orengeCat/jumaomotoumao.ts");
var jumaoshumao_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/orengeCat/jumaoshumao */ "./src/lottieSrc/lottieTs/orengeCat/jumaoshumao.ts");
var jumaoshuohua_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/orengeCat/jumaoshuohua */ "./src/lottieSrc/lottieTs/orengeCat/jumaoshuohua.ts");
var jumaowanshua_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/orengeCat/jumaowanshua */ "./src/lottieSrc/lottieTs/orengeCat/jumaowanshua.ts");
var sanhua01shuijiao_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/sanhuaCat/sanhua01shuijiao */ "./src/lottieSrc/lottieTs/sanhuaCat/sanhua01shuijiao.ts");
var sanhua02shuohua_2_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/sanhuaCat/sanhua02shuohua 2 */ "./src/lottieSrc/lottieTs/sanhuaCat/sanhua02shuohua 2.ts");
......@@ -2484,7 +2490,6 @@ var Cat = (function (_super) {
var _this = _super.call(this, data) || this;
_this.catAnimArr = [];
_this.actRunning = false;
_this.curAnim = 0;
_this.catType = data.type;
return _this;
}
......@@ -2492,7 +2497,8 @@ var Cat = (function (_super) {
this.initCatLottieArr();
console.log(this.catLottieArr);
this.initCat();
this.setCatAnimShow(0);
this.initDialog();
this.setCatAnimShow(1);
this.initEvents();
};
Cat.prototype.initCatLottieArr = function () {
......@@ -2507,7 +2513,7 @@ var Cat = (function (_super) {
},
"orenge": {
sleep: jumao01_1.jumao01,
talk: jumaoshumao_1.jumaoshumao,
talk: jumaoshuohua_1.jumaoshuohua,
clear: jumaoshumao_1.jumaoshumao,
rua: jumaolumao04_1.jumaolumao04,
play: jumaowanshua_1.jumaowanshua,
......@@ -2552,6 +2558,25 @@ var Cat = (function (_super) {
that.addChild(that.cat_touch);
that.catAnimArr.push(that.cat_touch);
};
Cat.prototype.initDialog = function () {
var that = this;
that.dialog = Ins_1.Ins.initSprite("624e8c63-963f-4b20-9802-b0fb006fbf93");
that.dialog.position.set(280, 526);
that.addChild(that.dialog);
that.dialogText = Ins_1.Ins.initLabel({ size: 24, x: 30, y: 20 });
that.dialogText.textWidth = 280;
that.dialog.addChild(that.dialogText);
that.dialogText.text = "哈哈哈哈哈哈哈哈哈哈哈\n哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈";
console.log("最大长度为" + that.dialogText.text.length);
that.dialog.visible = false;
};
Cat.prototype.showDialog = function (msg) {
this.dialogText.text = msg;
this.dialog.visible = true;
};
Cat.prototype.hideDialog = function () {
this.dialog.visible = false;
};
Cat.prototype.setCatAnimShow = function (index, callback) {
if (index == 0 || index == 1) {
this.actRunning = false;
......@@ -2585,7 +2610,10 @@ var Cat = (function (_super) {
case Enum_1.CAT_ACTTYPEP.SLEEP:
break;
default:
that.setCatAnimShow(actType, function () { that.setCatAnimShow(0, null); });
that.setCatAnimShow(actType, function () {
that.hideDialog();
that.setCatAnimShow(0, null);
});
break;
}
}
......@@ -22051,6 +22079,2071 @@ exports.jumaoshumao = {
};
/***/ }),
/***/ "./src/lottieSrc/lottieTs/orengeCat/jumaoshuohua.ts":
/*!**********************************************************!*\
!*** ./src/lottieSrc/lottieTs/orengeCat/jumaoshuohua.ts ***!
\**********************************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.jumaoshuohua = void 0;
exports.jumaoshuohua = {
"v": "5.6.4",
"fr": 12,
"ip": 0,
"op": 52,
"w": 750,
"h": 1624,
"nm": "橘猫说话",
"layers": [
{
"ind": 3,
"ty": 2,
"nm": "鼻头",
"parent": 17,
"refId": "9bdb2301-cb80-4aaf-9b9e-3325b04cf2d6",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
119.5,
110.5,
0
]
},
"a": {
"a": 0,
"k": [
6.5,
4.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 4,
"ty": 2,
"nm": "嘴巴 2",
"parent": 17,
"refId": "0ca5864c-810b-4170-8be9-ec98d20b6297",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
121,
128.25,
0
]
},
"a": {
"a": 0,
"k": [
16.639,
13.522,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 21,
"s": [
100,
100,
100
]
},
{
"t": 26.5,
"s": [
120,
120,
100
]
},
{
"t": 32,
"s": [
100,
100,
100
]
}
],
"x": "var $bm_rt;\n$bm_rt = loopOut('cycle', 0);"
}
},
"ip": 21,
"op": 52
},
{
"ind": 5,
"ty": 2,
"nm": "嘴唇",
"parent": 17,
"refId": "4d485659-ec08-4f18-a96a-0a6c71e589cb",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
120.281,
112.269,
0
]
},
"a": {
"a": 0,
"k": [
22.281,
5.269,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 6,
"ty": 2,
"nm": "眼睛03.png",
"refId": "8d6c0d63-96f8-426c-acaa-15ec5458ff04",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
297,
817,
0
]
},
"a": {
"a": 0,
"k": [
83,
21,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 23,
"op": 52
},
{
"ind": 7,
"ty": 2,
"nm": "眼睛02.png",
"refId": "0d3f7277-19e1-4875-9958-cc9536c1bbde",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
297,
817,
0
]
},
"a": {
"a": 0,
"k": [
83,
24.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 22,
"op": 23
},
{
"ind": 8,
"ty": 2,
"nm": "眼睛01.png",
"refId": "f1dc907a-9102-46bf-8baf-9d305a0b1efc",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
297,
817,
0
]
},
"a": {
"a": 0,
"k": [
83,
29.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 21,
"op": 22
},
{
"ind": 9,
"ty": 2,
"nm": "高光右",
"parent": 10,
"refId": "f75517ef-397c-4708-871d-a9e7c41c1c8e",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
26.5,
6.125,
0
]
},
"a": {
"a": 0,
"k": [
3.5,
4,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 21
},
{
"ind": 10,
"ty": 2,
"nm": "黑眼珠右",
"parent": 11,
"refId": "fb111b5a-5bc0-4c49-bcf7-c6802d1f7677",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
26,
26.5,
0
]
},
{
"t": 2,
"s": [
30.8,
26.5,
0
]
},
{
"t": 10,
"s": [
30.8,
26.5,
0
]
},
{
"t": 12,
"s": [
21.3,
26.5,
0
]
},
{
"t": 18,
"s": [
21.3,
26.5,
0
]
},
{
"t": 22,
"s": [
26,
26.5,
0
]
}
]
},
"a": {
"a": 0,
"k": [
17,
17.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 21
},
{
"ind": 11,
"ty": 2,
"nm": "眼眶右",
"parent": 17,
"refId": "e7dc19f7-8963-4ddd-8d2a-6c92be16db31",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
171.5,
84,
0
]
},
{
"t": 2,
"s": [
173.583,
84,
0
]
},
{
"t": 10,
"s": [
173.583,
84,
0
]
},
{
"t": 12,
"s": [
170.458,
84,
0
]
},
{
"t": 18,
"s": [
170.458,
84,
0
]
}
]
},
"a": {
"a": 0,
"k": [
26,
26.5,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 0,
"s": [
100,
100,
100
]
},
{
"t": 1,
"s": [
100,
70,
100
]
},
{
"t": 2,
"s": [
100,
100,
100
]
},
{
"t": 10,
"s": [
100,
100,
100
]
},
{
"t": 11,
"s": [
100,
70,
100
]
},
{
"t": 12,
"s": [
100,
100,
100
]
},
{
"t": 18,
"s": [
100,
100,
100
]
},
{
"t": 20,
"s": [
100,
85,
100
]
},
{
"t": 22,
"s": [
100,
100,
100
]
}
]
}
},
"hasMask": true,
"masksProperties": [
{
"inv": false,
"mode": "n",
"pt": {
"a": 0,
"k": {
"i": [
[
-14.359,
0
],
[
0,
-14.359
],
[
14.36,
0
],
[
0,
14.359
]
],
"o": [
[
14.36,
0
],
[
0,
14.359
],
[
-14.359,
0
],
[
0,
-14.359
]
],
"v": [
[
26,
0.625
],
[
52,
26.625
],
[
26,
52.625
],
[
0,
26.625
]
],
"c": true
},
"ix": 1
},
"o": {
"a": 0,
"k": 100,
"ix": 3
},
"x": {
"a": 0,
"k": 0,
"ix": 4
},
"nm": "Mask 1"
}
],
"ip": 0,
"op": 21
},
{
"ind": 13,
"ty": 2,
"nm": "高光左",
"parent": 14,
"refId": "f75517ef-397c-4708-871d-a9e7c41c1c8e",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
27.5,
7,
0
]
},
"a": {
"a": 0,
"k": [
3.5,
4,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 21
},
{
"ind": 14,
"ty": 2,
"nm": "黑眼珠左",
"parent": 15,
"refId": "fb111b5a-5bc0-4c49-bcf7-c6802d1f7677",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
26,
26.5,
0
]
},
{
"t": 2,
"s": [
30.9,
26.5,
0
]
},
{
"t": 10,
"s": [
30.9,
26.5,
0
]
},
{
"t": 12,
"s": [
20.8,
26.5,
0
]
},
{
"t": 18,
"s": [
20.8,
26.5,
0
]
},
{
"t": 22,
"s": [
26,
26.5,
0
]
}
]
},
"a": {
"a": 0,
"k": [
17,
17.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 21
},
{
"ind": 15,
"ty": 2,
"nm": "眼眶左",
"parent": 17,
"refId": "edd0fc7c-2984-4323-a7e4-2b512f1ebf2b",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
69,
83.5,
0
]
},
{
"t": 2,
"s": [
71.083,
83.5,
0
]
},
{
"t": 10,
"s": [
71.083,
83.5,
0
]
},
{
"t": 12,
"s": [
69,
83.5,
0
]
},
{
"t": 18,
"s": [
69,
83.5,
0
]
}
]
},
"a": {
"a": 0,
"k": [
26,
26.5,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 0,
"s": [
100,
100,
100
]
},
{
"t": 1,
"s": [
100,
70,
100
]
},
{
"t": 2,
"s": [
100,
100,
100
]
},
{
"t": 10,
"s": [
100,
100,
100
]
},
{
"t": 11,
"s": [
100,
70,
100
]
},
{
"t": 12,
"s": [
100,
100,
100
]
},
{
"t": 18,
"s": [
100,
100,
100
]
},
{
"t": 20,
"s": [
100,
90,
100
]
},
{
"t": 22,
"s": [
100,
100,
100
]
}
]
}
},
"ip": 0,
"op": 21
},
{
"ind": 17,
"ty": 2,
"nm": "头",
"refId": "f0fcbf12-b983-437c-970d-0d9413ff2b44",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
297,
913.5,
0
]
},
{
"t": 2,
"s": [
308.6,
883.5,
0
]
},
{
"t": 10,
"s": [
308.6,
883.5,
0
]
},
{
"t": 12,
"s": [
295.6,
895.5,
0
]
},
{
"t": 18,
"s": [
295.6,
895.5,
0
]
},
{
"t": 22,
"s": [
297,
913.5,
0
]
}
]
},
"a": {
"a": 0,
"k": [
118,
178.5,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 0,
"s": [
100,
100,
100
]
},
{
"t": 2,
"s": [
96,
108,
100
]
},
{
"t": 10,
"s": [
96,
108,
100
]
},
{
"t": 18,
"s": [
96,
108,
100
]
},
{
"t": 22,
"s": [
100,
100,
100
]
}
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 18,
"ty": 2,
"nm": "右耳",
"parent": 17,
"refId": "461d68ac-bb33-48e4-8de9-954497825053",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 2,
"s": [
0
]
},
{
"t": 4,
"s": [
7
]
},
{
"t": 6,
"s": [
-7
]
},
{
"t": 8,
"s": [
6
]
},
{
"t": 10,
"s": [
0
]
},
{
"t": 21,
"s": [
0
]
},
{
"t": 23,
"s": [
5
]
},
{
"t": 25,
"s": [
-5.1
]
},
{
"t": 27,
"s": [
5
]
},
{
"t": 29,
"s": [
0
]
},
{
"t": 38,
"s": [
0
]
},
{
"t": 40,
"s": [
7
]
},
{
"t": 42,
"s": [
-7
]
},
{
"t": 44,
"s": [
6
]
},
{
"t": 46,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
183.958,
35.352,
0
]
},
"a": {
"a": 0,
"k": [
57.5,
46.5,
0
]
},
"s": {
"a": 0,
"k": [
105,
105,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 19,
"ty": 2,
"nm": "左耳",
"parent": 17,
"refId": "2877642e-9288-47fb-a653-99673d8a0192",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 2,
"s": [
0
]
},
{
"t": 4,
"s": [
-5
]
},
{
"t": 6,
"s": [
5
]
},
{
"t": 8,
"s": [
-2.8
]
},
{
"t": 10,
"s": [
0
]
},
{
"t": 38,
"s": [
0
]
},
{
"t": 40,
"s": [
-5
]
},
{
"t": 42,
"s": [
5
]
},
{
"t": 44,
"s": [
-2.8
]
},
{
"t": 46,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
47,
40.5,
0
]
},
"a": {
"a": 0,
"k": [
40.5,
49.5,
0
]
},
"s": {
"a": 0,
"k": [
105.3,
105.3,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 20,
"ty": 2,
"nm": "橘猫02说话_00000.png",
"refId": "eddf3c35-8553-44a3-a827-7c0290699f13",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": -6,
"op": 33
},
{
"ind": 21,
"ty": 2,
"nm": "橘猫02说话_00001.png",
"refId": "b9c1f05f-be35-4bf9-97bf-98af3f2dfc2f",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 33,
"op": 34
},
{
"ind": 22,
"ty": 2,
"nm": "橘猫02说话_00002.png",
"refId": "71294f77-f87f-4133-9dd8-115e4ffdd9b3",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 34,
"op": 35
},
{
"ind": 23,
"ty": 2,
"nm": "橘猫02说话_00003.png",
"refId": "ff7fcb39-d668-4c07-a0cf-8914ae8f245f",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 35,
"op": 36
},
{
"ind": 24,
"ty": 2,
"nm": "橘猫02说话_00004.png",
"refId": "834a7ed2-f7bf-47b8-bdba-884f9a64c6bd",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 36,
"op": 37
},
{
"ind": 25,
"ty": 2,
"nm": "橘猫02说话_00005.png",
"refId": "52b0d2f3-24f5-4b91-9bc3-2a00533c9f07",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 37,
"op": 38
},
{
"ind": 26,
"ty": 2,
"nm": "橘猫02说话_00006.png",
"refId": "834a7ed2-f7bf-47b8-bdba-884f9a64c6bd",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 38,
"op": 39
},
{
"ind": 27,
"ty": 2,
"nm": "橘猫02说话_00007.png",
"refId": "ff7fcb39-d668-4c07-a0cf-8914ae8f245f",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 39,
"op": 40
},
{
"ind": 28,
"ty": 2,
"nm": "橘猫02说话_00008.png",
"refId": "71294f77-f87f-4133-9dd8-115e4ffdd9b3",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 40,
"op": 41
},
{
"ind": 29,
"ty": 2,
"nm": "橘猫02说话_00009.png",
"refId": "b9c1f05f-be35-4bf9-97bf-98af3f2dfc2f",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 41,
"op": 42
},
{
"ind": 30,
"ty": 2,
"nm": "橘猫02说话_00010.png",
"refId": "eddf3c35-8553-44a3-a827-7c0290699f13",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 42,
"op": 61
},
{
"ind": 32,
"ty": 2,
"nm": "左后腿",
"refId": "c63045b6-2025-47cf-ac72-4a1aea1051d8",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
472,
931.5,
0
]
},
"a": {
"a": 0,
"k": [
61,
38.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 33,
"ty": 2,
"nm": "左前爪",
"refId": "ab38b085-976f-44d1-9b10-742189e17c1f",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 0,
"s": [
0
]
},
{
"t": 2,
"s": [
4.2
]
},
{
"t": 10,
"s": [
4.2
]
},
{
"t": 12,
"s": [
1.7
]
},
{
"t": 18,
"s": [
1.7
]
},
{
"t": 22,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
407,
929,
0
]
},
"a": {
"a": 0,
"k": [
141,
13,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 34,
"ty": 2,
"nm": "右前爪",
"refId": "cf28f8a9-f2e6-4f12-bf5e-11847b7aea36",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 0,
"s": [
0
]
},
{
"t": 2,
"s": [
-5
]
},
{
"t": 10,
"s": [
-5
]
},
{
"t": 12,
"s": [
-3
]
},
{
"t": 18,
"s": [
-3
]
},
{
"t": 22,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
197.5,
896,
0
]
},
"a": {
"a": 0,
"k": [
15,
53.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 35,
"ty": 2,
"nm": "身子",
"refId": "bc12c782-83d3-42bc-9ef7-3dd53d9f6c15",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
394,
964.5,
0
]
},
"a": {
"a": 0,
"k": [
197,
193.5,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 0,
"s": [
100,
100,
100
]
},
{
"t": 2,
"s": [
100,
105,
100
]
},
{
"t": 10,
"s": [
100,
105,
100
]
},
{
"t": 12,
"s": [
100,
103,
100
]
},
{
"t": 18,
"s": [
100,
103,
100
]
},
{
"t": 22,
"s": [
100,
100,
100
]
}
]
}
},
"ip": 0,
"op": 52
}
],
"markers": [
{
"tm": 10,
"cm": "",
"dr": 0
},
{
"tm": 12,
"cm": "",
"dr": 0
}
]
};
/***/ }),
/***/ "./src/lottieSrc/lottieTs/orengeCat/jumaowanshua.ts":
......@@ -44434,6 +46527,7 @@ var RulePanel = (function (_super) {
this.y = (Ins_1.Ins.stageH - bg.height) >> 1;
var ruleLabel = Ins_1.Ins.initLabel({ size: 24, text: "规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则" });
var ruleView = new FYGE.ScrollPage(574, 279, ruleLabel.textHeight);
ruleLabel.textWidth = 570;
ruleView.isSpringBack = false;
ruleView.x = 76;
ruleView.y = 167;
......@@ -44789,7 +46883,7 @@ var MainScene = (function (_super) {
};
MainScene.prototype.initCat = function () {
var that = this;
that.cat = new Cat_1.Cat({ type: "xianluo" });
that.cat = new Cat_1.Cat({ type: "orenge" });
that.addChild(that.cat);
if (Ins_1.Ins.catIsOut) {
that.cat.visible = false;
......@@ -44843,7 +46937,7 @@ var MainScene = (function (_super) {
var that = this;
that.energy = Ins_1.Ins.userInfo.energy;
that.energyImg.scaleX = (that.energy / that.maxEnergy);
that.energyDeco.x = that.energyImgW * that.energyImg.scaleX - that.energyDeco.width * 0.5;
that.energyDeco.x = that.energyImgW * that.energyImg.scaleX - that.energyDeco.width * 0.2;
that.energyLabel.text = "精力" + that.energy + "/" + that.maxEnergy;
that.energyLabel.x = (that.energyGroup.width - that.energyLabel.textWidth) / 2;
};
......@@ -45093,8 +47187,7 @@ var MainSceneBtnUi = (function (_super) {
mask.beginFill(6, 1);
mask.drawCircle(0, 0, 24);
mask.endFill();
mask.x = 33;
mask.y = 33;
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) });
project/src/canvas/game/src/Main.ts
View file @ 6d6bce2f
......@@ -114,12 +114,12 @@ export class Main {
// sendTbNet(TbNetName.getActivityBaseInfoById, {}, (s, res) => {
// console.log('getActivityBaseInfoById success,res',s,res)
// })
console.log('准备打开弹窗')
setTimeout(() => {
sendTbNet(TbNetName.showModal, {name:'messageModal',data:{catName:'喵喵'}}, (s, res) => {
console.log('showModal messageModal, success,res',s,res)
})
}, 3000);
// console.log('准备打开弹窗')
// setTimeout(() => {
// sendTbNet(TbNetName.showModal, {name:'messageModal',data:{catName:'喵喵'}}, (s, res) => {
// console.log('showModal messageModal, success,res',s,res)
// })
// }, 3000);
// console.log('准备切换到兑换页面')
// setTimeout(() => {
// sendTbNet(TbNetName.navigateToPage, {name:'pageshop'}, (s, res) => {
......
taobao_mini/client/app.js
View file @ 6d6bce2f
......@@ -8,7 +8,8 @@ cloud.init({
App({
requestType: 'cloud', // yapi，cloud: 云函数
requestType: 'yapi', // yapi，cloud: 云函数
cloudName: 'tmallCat', // 主云函数项目名 base clientTemplate2C
cloudName: 'tmallCat', // 主云函数项目名 tmallCat
// cloudName: 'bubbleSurviva', // 主云函数项目名 tmallCat
cloud,
tbcc,
onLaunch(options) {
......
taobao_mini/client/pages/pagecanvas/output.js
View file @ 6d6bce2f
......@@ -862,7 +862,6 @@ var Waiting = (function (_super) {
}
Waiting.prototype.show = function (msg) {
if (msg === void 0) { msg = "加载中"; }
this.msg.text = msg;
};
Waiting.prototype.destroy = function () {
_super.prototype.destroy.call(this);
......@@ -1888,6 +1887,12 @@ const resCanvasList = {
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/LetterTexture.78192e79fa3b21a85b245038f23561eeb5141d4d.png',
uuid: '3b12798d-d932-4f5b-a442-6e4877ba5c16'
},
'624e8c63-963f-4b20-9802-b0fb006fbf93': {
name: 'catTalkDialog',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/catTalkDialog.6fa85b0929d7d8e0d42d0d30587cdbdc33059a8f.png',
uuid: '624e8c63-963f-4b20-9802-b0fb006fbf93'
}
};
/* harmony default export */ __webpack_exports__["default"] = (resCanvasList);
......@@ -2461,6 +2466,7 @@ var jumaolumao04_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/orengeCat/jum
var jumao01_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/orengeCat/jumao01 */ "./src/lottieSrc/lottieTs/orengeCat/jumao01.ts");
var jumaomotoumao_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/orengeCat/jumaomotoumao */ "./src/lottieSrc/lottieTs/orengeCat/jumaomotoumao.ts");
var jumaoshumao_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/orengeCat/jumaoshumao */ "./src/lottieSrc/lottieTs/orengeCat/jumaoshumao.ts");
var jumaoshuohua_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/orengeCat/jumaoshuohua */ "./src/lottieSrc/lottieTs/orengeCat/jumaoshuohua.ts");
var jumaowanshua_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/orengeCat/jumaowanshua */ "./src/lottieSrc/lottieTs/orengeCat/jumaowanshua.ts");
var sanhua01shuijiao_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/sanhuaCat/sanhua01shuijiao */ "./src/lottieSrc/lottieTs/sanhuaCat/sanhua01shuijiao.ts");
var sanhua02shuohua_2_1 = __webpack_require__(/*! ../lottieSrc/lottieTs/sanhuaCat/sanhua02shuohua 2 */ "./src/lottieSrc/lottieTs/sanhuaCat/sanhua02shuohua 2.ts");
......@@ -2484,7 +2490,6 @@ var Cat = (function (_super) {
var _this = _super.call(this, data) || this;
_this.catAnimArr = [];
_this.actRunning = false;
_this.curAnim = 0;
_this.catType = data.type;
return _this;
}
......@@ -2492,7 +2497,8 @@ var Cat = (function (_super) {
this.initCatLottieArr();
console.log(this.catLottieArr);
this.initCat();
this.setCatAnimShow(0);
this.initDialog();
this.setCatAnimShow(1);
this.initEvents();
};
Cat.prototype.initCatLottieArr = function () {
......@@ -2507,7 +2513,7 @@ var Cat = (function (_super) {
},
"orenge": {
sleep: jumao01_1.jumao01,
talk: jumaoshumao_1.jumaoshumao,
talk: jumaoshuohua_1.jumaoshuohua,
clear: jumaoshumao_1.jumaoshumao,
rua: jumaolumao04_1.jumaolumao04,
play: jumaowanshua_1.jumaowanshua,
......@@ -2552,6 +2558,25 @@ var Cat = (function (_super) {
that.addChild(that.cat_touch);
that.catAnimArr.push(that.cat_touch);
};
Cat.prototype.initDialog = function () {
var that = this;
that.dialog = Ins_1.Ins.initSprite("624e8c63-963f-4b20-9802-b0fb006fbf93");
that.dialog.position.set(280, 526);
that.addChild(that.dialog);
that.dialogText = Ins_1.Ins.initLabel({ size: 24, x: 30, y: 20 });
that.dialogText.textWidth = 280;
that.dialog.addChild(that.dialogText);
that.dialogText.text = "哈哈哈哈哈哈哈哈哈哈哈\n哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈";
console.log("最大长度为" + that.dialogText.text.length);
that.dialog.visible = false;
};
Cat.prototype.showDialog = function (msg) {
this.dialogText.text = msg;
this.dialog.visible = true;
};
Cat.prototype.hideDialog = function () {
this.dialog.visible = false;
};
Cat.prototype.setCatAnimShow = function (index, callback) {
if (index == 0 || index == 1) {
this.actRunning = false;
......@@ -2585,7 +2610,10 @@ var Cat = (function (_super) {
case Enum_1.CAT_ACTTYPEP.SLEEP:
break;
default:
that.setCatAnimShow(actType, function () { that.setCatAnimShow(0, null); });
that.setCatAnimShow(actType, function () {
that.hideDialog();
that.setCatAnimShow(0, null);
});
break;
}
}
......@@ -22051,6 +22079,2071 @@ exports.jumaoshumao = {
};
/***/ }),
/***/ "./src/lottieSrc/lottieTs/orengeCat/jumaoshuohua.ts":
/*!**********************************************************!*\
!*** ./src/lottieSrc/lottieTs/orengeCat/jumaoshuohua.ts ***!
\**********************************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.jumaoshuohua = void 0;
exports.jumaoshuohua = {
"v": "5.6.4",
"fr": 12,
"ip": 0,
"op": 52,
"w": 750,
"h": 1624,
"nm": "橘猫说话",
"layers": [
{
"ind": 3,
"ty": 2,
"nm": "鼻头",
"parent": 17,
"refId": "9bdb2301-cb80-4aaf-9b9e-3325b04cf2d6",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
119.5,
110.5,
0
]
},
"a": {
"a": 0,
"k": [
6.5,
4.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 4,
"ty": 2,
"nm": "嘴巴 2",
"parent": 17,
"refId": "0ca5864c-810b-4170-8be9-ec98d20b6297",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
121,
128.25,
0
]
},
"a": {
"a": 0,
"k": [
16.639,
13.522,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 21,
"s": [
100,
100,
100
]
},
{
"t": 26.5,
"s": [
120,
120,
100
]
},
{
"t": 32,
"s": [
100,
100,
100
]
}
],
"x": "var $bm_rt;\n$bm_rt = loopOut('cycle', 0);"
}
},
"ip": 21,
"op": 52
},
{
"ind": 5,
"ty": 2,
"nm": "嘴唇",
"parent": 17,
"refId": "4d485659-ec08-4f18-a96a-0a6c71e589cb",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
120.281,
112.269,
0
]
},
"a": {
"a": 0,
"k": [
22.281,
5.269,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 6,
"ty": 2,
"nm": "眼睛03.png",
"refId": "8d6c0d63-96f8-426c-acaa-15ec5458ff04",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
297,
817,
0
]
},
"a": {
"a": 0,
"k": [
83,
21,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 23,
"op": 52
},
{
"ind": 7,
"ty": 2,
"nm": "眼睛02.png",
"refId": "0d3f7277-19e1-4875-9958-cc9536c1bbde",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
297,
817,
0
]
},
"a": {
"a": 0,
"k": [
83,
24.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 22,
"op": 23
},
{
"ind": 8,
"ty": 2,
"nm": "眼睛01.png",
"refId": "f1dc907a-9102-46bf-8baf-9d305a0b1efc",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
297,
817,
0
]
},
"a": {
"a": 0,
"k": [
83,
29.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 21,
"op": 22
},
{
"ind": 9,
"ty": 2,
"nm": "高光右",
"parent": 10,
"refId": "f75517ef-397c-4708-871d-a9e7c41c1c8e",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
26.5,
6.125,
0
]
},
"a": {
"a": 0,
"k": [
3.5,
4,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 21
},
{
"ind": 10,
"ty": 2,
"nm": "黑眼珠右",
"parent": 11,
"refId": "fb111b5a-5bc0-4c49-bcf7-c6802d1f7677",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
26,
26.5,
0
]
},
{
"t": 2,
"s": [
30.8,
26.5,
0
]
},
{
"t": 10,
"s": [
30.8,
26.5,
0
]
},
{
"t": 12,
"s": [
21.3,
26.5,
0
]
},
{
"t": 18,
"s": [
21.3,
26.5,
0
]
},
{
"t": 22,
"s": [
26,
26.5,
0
]
}
]
},
"a": {
"a": 0,
"k": [
17,
17.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 21
},
{
"ind": 11,
"ty": 2,
"nm": "眼眶右",
"parent": 17,
"refId": "e7dc19f7-8963-4ddd-8d2a-6c92be16db31",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
171.5,
84,
0
]
},
{
"t": 2,
"s": [
173.583,
84,
0
]
},
{
"t": 10,
"s": [
173.583,
84,
0
]
},
{
"t": 12,
"s": [
170.458,
84,
0
]
},
{
"t": 18,
"s": [
170.458,
84,
0
]
}
]
},
"a": {
"a": 0,
"k": [
26,
26.5,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 0,
"s": [
100,
100,
100
]
},
{
"t": 1,
"s": [
100,
70,
100
]
},
{
"t": 2,
"s": [
100,
100,
100
]
},
{
"t": 10,
"s": [
100,
100,
100
]
},
{
"t": 11,
"s": [
100,
70,
100
]
},
{
"t": 12,
"s": [
100,
100,
100
]
},
{
"t": 18,
"s": [
100,
100,
100
]
},
{
"t": 20,
"s": [
100,
85,
100
]
},
{
"t": 22,
"s": [
100,
100,
100
]
}
]
}
},
"hasMask": true,
"masksProperties": [
{
"inv": false,
"mode": "n",
"pt": {
"a": 0,
"k": {
"i": [
[
-14.359,
0
],
[
0,
-14.359
],
[
14.36,
0
],
[
0,
14.359
]
],
"o": [
[
14.36,
0
],
[
0,
14.359
],
[
-14.359,
0
],
[
0,
-14.359
]
],
"v": [
[
26,
0.625
],
[
52,
26.625
],
[
26,
52.625
],
[
0,
26.625
]
],
"c": true
},
"ix": 1
},
"o": {
"a": 0,
"k": 100,
"ix": 3
},
"x": {
"a": 0,
"k": 0,
"ix": 4
},
"nm": "Mask 1"
}
],
"ip": 0,
"op": 21
},
{
"ind": 13,
"ty": 2,
"nm": "高光左",
"parent": 14,
"refId": "f75517ef-397c-4708-871d-a9e7c41c1c8e",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
27.5,
7,
0
]
},
"a": {
"a": 0,
"k": [
3.5,
4,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 21
},
{
"ind": 14,
"ty": 2,
"nm": "黑眼珠左",
"parent": 15,
"refId": "fb111b5a-5bc0-4c49-bcf7-c6802d1f7677",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
26,
26.5,
0
]
},
{
"t": 2,
"s": [
30.9,
26.5,
0
]
},
{
"t": 10,
"s": [
30.9,
26.5,
0
]
},
{
"t": 12,
"s": [
20.8,
26.5,
0
]
},
{
"t": 18,
"s": [
20.8,
26.5,
0
]
},
{
"t": 22,
"s": [
26,
26.5,
0
]
}
]
},
"a": {
"a": 0,
"k": [
17,
17.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 21
},
{
"ind": 15,
"ty": 2,
"nm": "眼眶左",
"parent": 17,
"refId": "edd0fc7c-2984-4323-a7e4-2b512f1ebf2b",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
69,
83.5,
0
]
},
{
"t": 2,
"s": [
71.083,
83.5,
0
]
},
{
"t": 10,
"s": [
71.083,
83.5,
0
]
},
{
"t": 12,
"s": [
69,
83.5,
0
]
},
{
"t": 18,
"s": [
69,
83.5,
0
]
}
]
},
"a": {
"a": 0,
"k": [
26,
26.5,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 0,
"s": [
100,
100,
100
]
},
{
"t": 1,
"s": [
100,
70,
100
]
},
{
"t": 2,
"s": [
100,
100,
100
]
},
{
"t": 10,
"s": [
100,
100,
100
]
},
{
"t": 11,
"s": [
100,
70,
100
]
},
{
"t": 12,
"s": [
100,
100,
100
]
},
{
"t": 18,
"s": [
100,
100,
100
]
},
{
"t": 20,
"s": [
100,
90,
100
]
},
{
"t": 22,
"s": [
100,
100,
100
]
}
]
}
},
"ip": 0,
"op": 21
},
{
"ind": 17,
"ty": 2,
"nm": "头",
"refId": "f0fcbf12-b983-437c-970d-0d9413ff2b44",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
297,
913.5,
0
]
},
{
"t": 2,
"s": [
308.6,
883.5,
0
]
},
{
"t": 10,
"s": [
308.6,
883.5,
0
]
},
{
"t": 12,
"s": [
295.6,
895.5,
0
]
},
{
"t": 18,
"s": [
295.6,
895.5,
0
]
},
{
"t": 22,
"s": [
297,
913.5,
0
]
}
]
},
"a": {
"a": 0,
"k": [
118,
178.5,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 0,
"s": [
100,
100,
100
]
},
{
"t": 2,
"s": [
96,
108,
100
]
},
{
"t": 10,
"s": [
96,
108,
100
]
},
{
"t": 18,
"s": [
96,
108,
100
]
},
{
"t": 22,
"s": [
100,
100,
100
]
}
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 18,
"ty": 2,
"nm": "右耳",
"parent": 17,
"refId": "461d68ac-bb33-48e4-8de9-954497825053",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 2,
"s": [
0
]
},
{
"t": 4,
"s": [
7
]
},
{
"t": 6,
"s": [
-7
]
},
{
"t": 8,
"s": [
6
]
},
{
"t": 10,
"s": [
0
]
},
{
"t": 21,
"s": [
0
]
},
{
"t": 23,
"s": [
5
]
},
{
"t": 25,
"s": [
-5.1
]
},
{
"t": 27,
"s": [
5
]
},
{
"t": 29,
"s": [
0
]
},
{
"t": 38,
"s": [
0
]
},
{
"t": 40,
"s": [
7
]
},
{
"t": 42,
"s": [
-7
]
},
{
"t": 44,
"s": [
6
]
},
{
"t": 46,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
183.958,
35.352,
0
]
},
"a": {
"a": 0,
"k": [
57.5,
46.5,
0
]
},
"s": {
"a": 0,
"k": [
105,
105,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 19,
"ty": 2,
"nm": "左耳",
"parent": 17,
"refId": "2877642e-9288-47fb-a653-99673d8a0192",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 2,
"s": [
0
]
},
{
"t": 4,
"s": [
-5
]
},
{
"t": 6,
"s": [
5
]
},
{
"t": 8,
"s": [
-2.8
]
},
{
"t": 10,
"s": [
0
]
},
{
"t": 38,
"s": [
0
]
},
{
"t": 40,
"s": [
-5
]
},
{
"t": 42,
"s": [
5
]
},
{
"t": 44,
"s": [
-2.8
]
},
{
"t": 46,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
47,
40.5,
0
]
},
"a": {
"a": 0,
"k": [
40.5,
49.5,
0
]
},
"s": {
"a": 0,
"k": [
105.3,
105.3,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 20,
"ty": 2,
"nm": "橘猫02说话_00000.png",
"refId": "eddf3c35-8553-44a3-a827-7c0290699f13",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": -6,
"op": 33
},
{
"ind": 21,
"ty": 2,
"nm": "橘猫02说话_00001.png",
"refId": "b9c1f05f-be35-4bf9-97bf-98af3f2dfc2f",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 33,
"op": 34
},
{
"ind": 22,
"ty": 2,
"nm": "橘猫02说话_00002.png",
"refId": "71294f77-f87f-4133-9dd8-115e4ffdd9b3",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 34,
"op": 35
},
{
"ind": 23,
"ty": 2,
"nm": "橘猫02说话_00003.png",
"refId": "ff7fcb39-d668-4c07-a0cf-8914ae8f245f",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 35,
"op": 36
},
{
"ind": 24,
"ty": 2,
"nm": "橘猫02说话_00004.png",
"refId": "834a7ed2-f7bf-47b8-bdba-884f9a64c6bd",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 36,
"op": 37
},
{
"ind": 25,
"ty": 2,
"nm": "橘猫02说话_00005.png",
"refId": "52b0d2f3-24f5-4b91-9bc3-2a00533c9f07",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 37,
"op": 38
},
{
"ind": 26,
"ty": 2,
"nm": "橘猫02说话_00006.png",
"refId": "834a7ed2-f7bf-47b8-bdba-884f9a64c6bd",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 38,
"op": 39
},
{
"ind": 27,
"ty": 2,
"nm": "橘猫02说话_00007.png",
"refId": "ff7fcb39-d668-4c07-a0cf-8914ae8f245f",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 39,
"op": 40
},
{
"ind": 28,
"ty": 2,
"nm": "橘猫02说话_00008.png",
"refId": "71294f77-f87f-4133-9dd8-115e4ffdd9b3",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 40,
"op": 41
},
{
"ind": 29,
"ty": 2,
"nm": "橘猫02说话_00009.png",
"refId": "b9c1f05f-be35-4bf9-97bf-98af3f2dfc2f",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 41,
"op": 42
},
{
"ind": 30,
"ty": 2,
"nm": "橘猫02说话_00010.png",
"refId": "eddf3c35-8553-44a3-a827-7c0290699f13",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
500,
916,
0
]
},
"a": {
"a": 0,
"k": [
91.5,
65,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 42,
"op": 61
},
{
"ind": 32,
"ty": 2,
"nm": "左后腿",
"refId": "c63045b6-2025-47cf-ac72-4a1aea1051d8",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
472,
931.5,
0
]
},
"a": {
"a": 0,
"k": [
61,
38.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 33,
"ty": 2,
"nm": "左前爪",
"refId": "ab38b085-976f-44d1-9b10-742189e17c1f",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 0,
"s": [
0
]
},
{
"t": 2,
"s": [
4.2
]
},
{
"t": 10,
"s": [
4.2
]
},
{
"t": 12,
"s": [
1.7
]
},
{
"t": 18,
"s": [
1.7
]
},
{
"t": 22,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
407,
929,
0
]
},
"a": {
"a": 0,
"k": [
141,
13,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 34,
"ty": 2,
"nm": "右前爪",
"refId": "cf28f8a9-f2e6-4f12-bf5e-11847b7aea36",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 0,
"s": [
0
]
},
{
"t": 2,
"s": [
-5
]
},
{
"t": 10,
"s": [
-5
]
},
{
"t": 12,
"s": [
-3
]
},
{
"t": 18,
"s": [
-3
]
},
{
"t": 22,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
197.5,
896,
0
]
},
"a": {
"a": 0,
"k": [
15,
53.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 52
},
{
"ind": 35,
"ty": 2,
"nm": "身子",
"refId": "bc12c782-83d3-42bc-9ef7-3dd53d9f6c15",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
394,
964.5,
0
]
},
"a": {
"a": 0,
"k": [
197,
193.5,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 0,
"s": [
100,
100,
100
]
},
{
"t": 2,
"s": [
100,
105,
100
]
},
{
"t": 10,
"s": [
100,
105,
100
]
},
{
"t": 12,
"s": [
100,
103,
100
]
},
{
"t": 18,
"s": [
100,
103,
100
]
},
{
"t": 22,
"s": [
100,
100,
100
]
}
]
}
},
"ip": 0,
"op": 52
}
],
"markers": [
{
"tm": 10,
"cm": "",
"dr": 0
},
{
"tm": 12,
"cm": "",
"dr": 0
}
]
};
/***/ }),
/***/ "./src/lottieSrc/lottieTs/orengeCat/jumaowanshua.ts":
......@@ -44434,6 +46527,7 @@ var RulePanel = (function (_super) {
this.y = (Ins_1.Ins.stageH - bg.height) >> 1;
var ruleLabel = Ins_1.Ins.initLabel({ size: 24, text: "规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则规则" });
var ruleView = new FYGE.ScrollPage(574, 279, ruleLabel.textHeight);
ruleLabel.textWidth = 570;
ruleView.isSpringBack = false;
ruleView.x = 76;
ruleView.y = 167;
......@@ -44789,7 +46883,7 @@ var MainScene = (function (_super) {
};
MainScene.prototype.initCat = function () {
var that = this;
that.cat = new Cat_1.Cat({ type: "xianluo" });
that.cat = new Cat_1.Cat({ type: "orenge" });
that.addChild(that.cat);
if (Ins_1.Ins.catIsOut) {
that.cat.visible = false;
......@@ -44843,7 +46937,7 @@ var MainScene = (function (_super) {
var that = this;
that.energy = Ins_1.Ins.userInfo.energy;
that.energyImg.scaleX = (that.energy / that.maxEnergy);
that.energyDeco.x = that.energyImgW * that.energyImg.scaleX - that.energyDeco.width * 0.5;
that.energyDeco.x = that.energyImgW * that.energyImg.scaleX - that.energyDeco.width * 0.2;
that.energyLabel.text = "精力" + that.energy + "/" + that.maxEnergy;
that.energyLabel.x = (that.energyGroup.width - that.energyLabel.textWidth) / 2;
};
......@@ -45093,8 +47187,7 @@ var MainSceneBtnUi = (function (_super) {
mask.beginFill(6, 1);
mask.drawCircle(0, 0, 24);
mask.endFill();
mask.x = 33;
mask.y = 33;
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) });
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