Skip to content

N
new_taobao
Commit b048b50a authored by AU-Pro-mac's avatar AU-Pro-mac
Browse files
Options

add new code

parent e53dc426
Expand all Show whitespace changes
Inline Side-by-side
Showing with 655 additions and 1330 deletions
project/src/canvas/game/output.js
View file @ b048b50a
This diff is collapsed.
project/src/canvas/game/output.js.map
View file @ b048b50a
This diff is collapsed.
project/src/canvas/game/released/output.js
View file @ b048b50a
This diff is collapsed.
project/src/canvas/game/resCanvasListCsd.js
View file @ b048b50a
......@@ -164,9 +164,8 @@ const resCanvasListCsd = {
'b006e393-b6a4-4757-8b56-9762ff9a3319': {
name: 'lottie_new_new',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/lottie_new_newb.a684e7c3ffed151626dc9e00d0eb09c9ead79e80.png',
// url: 'https://yun.duiba.com.cn/spark/assets/lottie_new_new.dd99c4444eb07f98afae2a6e05bbcae19f5d132b.png',
// url: 'https://yun.duiba.com.cn/spark/assets/openTexture.4558fad0aadb7003efd6b71716816a93ad181283.png',
// url: 'https://yun.duiba.com.cn/spark/assets/lottie_new_newb.a684e7c3ffed151626dc9e00d0eb09c9ead79e80.png',
url: 'https://yun.duiba.com.cn/spark/assets/lottie_new_new_d.2287acd1b507a8fec9a4bb4d30ffabeaed791379.png',
uuid: 'b006e393-b6a4-4757-8b56-9762ff9a3319'
}
};
......
project/src/canvas/game/src/openAnimation/outputTs/open.ts
View file @ b048b50a
......@@ -2,7 +2,7 @@ export const open = {
"v": "5.6.10",
"fr": 24,
"ip": 0,
"op": 120,
"op": 144,
"w": 750,
"h": 1624,
"nm": "导出lottie",
......@@ -8870,7 +8870,7 @@ export const open = {
"ty": 2,
"nm": "侧光/开门-动效.psd",
"parent": 211,
"refId": "ece8d585-6d05-423f-9202-4860976f56ed",
"refId": "c4b96b2a-8b07-4cf1-abb7-a43c18b09a5a",
"ks": {
"o": {
"a": 1,
......@@ -8890,7 +8890,7 @@ export const open = {
{
"t": 85,
"s": [
100
0
]
},
{
......@@ -8925,13 +8925,21 @@ export const open = {
"a": 1,
"k": [
{
"t": 45,
"t": 25,
"s": [
0,
-100,
100
]
},
{
"t": 60,
"s": [
28,
-100,
100
]
},
{
"t": 85,
"s": [
......@@ -8951,7 +8959,7 @@ export const open = {
"ty": 2,
"nm": "侧光/开门-动效.psd",
"parent": 211,
"refId": "ece8d585-6d05-423f-9202-4860976f56ed",
"refId": "c4b96b2a-8b07-4cf1-abb7-a43c18b09a5a",
"ks": {
"o": {
"a": 1,
......@@ -8973,12 +8981,6 @@ export const open = {
"s": [
100
]
},
{
"t": 102,
"s": [
0
]
}
]
},
......@@ -9015,35 +9017,22 @@ export const open = {
"op": 720
},
{
"ind": 209,
"ind": 211,
"ty": 2,
"nm": "侧光/开门-动效.psd",
"parent": 211,
"refId": "ece8d585-6d05-423f-9202-4860976f56ed",
"nm": "图层 0 拷贝/开门-动效.psd",
"refId": "ae81211a-ab1d-4f86-a033-8bdef05b4a97",
"ks": {
"o": {
"a": 1,
"k": [
{
"t": 24,
"s": [
20
]
},
{
"t": 73,
"s": [
60
]
},
{
"t": 85,
"t": 97,
"s": [
100
]
},
{
"t": 102,
"t": 108,
"s": [
0
]
......@@ -9055,94 +9044,50 @@ export const open = {
"k": 0
},
"p": {
"a": 0,
"k": [
375.07,
813.298,
0
]
},
"a": {
"a": 0,
"k": [
375,
812,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 45,
"s": [
0,
100,
100
]
},
{
"t": 85,
"t": 8,
"s": [
100,
100,
100
]
}
375,
812,
0
]
}
},
"ip": 0,
"op": 720
},
{
"ind": 210,
"ty": 2,
"nm": "侧光/开门-动效.psd",
"parent": 211,
"refId": "ece8d585-6d05-423f-9202-4860976f56ed",
"ks": {
"o": {
"a": 1,
"k": [
{
"t": 24,
"t": 35,
"s": [
374.984,
809.365,
0
]
},
{
"t": 73,
"t": 60,
"s": [
100
374.912,
796.557,
0
]
},
{
"t": 85,
"t": 97,
"s": [
100
374.491,
714.788,
0
]
},
{
"t": 102,
"t": 114,
"s": [
373.825,
493.618,
0
]
}
]
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
375,
812,
0
]
},
"a": {
"a": 0,
"k": [
......@@ -9152,81 +9097,53 @@ export const open = {
]
},
"s": {
"a": 0,
"a": 1,
"k": [
{
"t": 8,
"s": [
100,
100,
100
]
}
},
"ip": 0,
"op": 720
},
{
"ind": 211,
"ty": 2,
"nm": "图层 0 拷贝/开门-动效.psd",
"refId": "83bef15f-be0a-4119-a9fa-8fd4aed9217c",
"ks": {
"o": {
"a": 1,
"k": [
{
"t": 97,
"t": 35,
"s": [
102.176,
102.176,
100
]
},
{
"t": 108,
"t": 60,
"s": [
0
]
}
112.084,
112.084,
100
]
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 8,
"t": 73,
"s": [
375,
812,
0
123.792,
123.792,
100
]
},
{
"t": 114,
"t": 85,
"s": [
373.825,
617.618,
0
]
}
]
},
"a": {
"a": 0,
"k": [
375,
812,
0
142.282,
142.282,
100
]
},
"s": {
"a": 1,
"k": [
{
"t": 8,
"t": 92,
"s": [
100,
100,
158.625,
158.625,
100
]
},
......@@ -9238,11 +9155,27 @@ export const open = {
100
]
},
{
"t": 104,
"s": [
264.911,
264.911,
100
]
},
{
"t": 110,
"s": [
469.236,
469.236,
100
]
},
{
"t": 114,
"s": [
480,
480,
560,
560,
100
]
}
......@@ -9253,21 +9186,28 @@ export const open = {
"op": 720
},
{
"ind": 212,
"ty": 4,
"nm": "形状图层 1",
"ind": 213,
"ty": 2,
"nm": "open",
"refId": "4a2656a4-8da2-4d3d-b307-60cce413c190",
"ks": {
"o": {
"a": 1,
"k": [
{
"t": 99,
"t": 108,
"s": [
100
]
},
{
"t": 108,
"t": 118,
"s": [
80
]
},
{
"t": 144,
"s": [
0
]
......@@ -9289,133 +9229,20 @@ export const open = {
"a": {
"a": 0,
"k": [
0,
0,
187.5,
406,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
200,
200,
100
]
}
},
"shapes": [
{
"ty": "gr",
"it": [
{
"ty": "rc",
"d": 1,
"s": {
"a": 0,
"k": [
804.906,
1682.547
],
"ix": 2
},
"p": {
"a": 0,
"k": [
0,
0
],
"ix": 3
},
"r": {
"a": 0,
"k": 0,
"ix": 4
},
"nm": "矩形路径 1",
"mn": "ADBE Vector Shape - Rect",
"hd": false
},
{
"ty": "fl",
"c": {
"a": 0,
"k": [
1,
1,
1,
1
],
"ix": 4
},
"o": {
"a": 0,
"k": 100,
"ix": 5
},
"r": 1,
"bm": 0,
"nm": "填充 1",
"mn": "ADBE Vector Graphic - Fill",
"hd": false
},
{
"ty": "tr",
"p": {
"a": 0,
"k": [
-0.547,
1.273
],
"ix": 2
},
"a": {
"a": 0,
"k": [
0,
0
],
"ix": 1
},
"s": {
"a": 0,
"k": [
100,
100
],
"ix": 3
},
"r": {
"a": 0,
"k": 0,
"ix": 6
},
"o": {
"a": 0,
"k": 100,
"ix": 7
},
"sk": {
"a": 0,
"k": 0,
"ix": 4
},
"sa": {
"a": 0,
"k": 0,
"ix": 5
},
"nm": "变换"
}
],
"nm": "矩形 1",
"np": 3,
"cix": 2,
"bm": 0,
"ix": 1,
"mn": "ADBE Vector Group",
"hd": false
}
],
"ip": 0,
"op": 720
}
......
taobao_mini/client/pages/homePage/homePage.axml
View file @ b048b50a
<!-- 业务页面部分 -->
<view class="homepage_wrapper {{ gameShow ? 'block_opciaty0' : '' }}" hidden="{{ gameShow_timeout }}">
<view class="homepage_wrapper {{ gameShow ? 'block_opciaty0' : '' }}" hidden="{{ gameShow_timeout }}" style="z-index: {{gameZindex}}">
<!-- 主页 -->
<view class="homepage_mian">
<view class="homepage_back">
......
taobao_mini/client/pages/homePage/homePage.js
View file @ b048b50a
......@@ -84,6 +84,7 @@ Page({
rewardsModalVisible: false,
prizesModalVisible: false,
missionModalVisible: false,
gameZindex: -1,
ticketNum: 0,
drawNum: 0,
......@@ -117,7 +118,7 @@ Page({
// 页面加载
// 开场动画
this.setData({ gameShow: true, gameType: 3, gameShow_timeout: true })
this.setData({ gameType: 3, gameZindex: -1 })
// 开场动画 => 业务页面 监听
// cover: getAuth login init checkDohelp
......@@ -136,22 +137,25 @@ Page({
clearTimeout(this.openAnimationTimeout)
this.openAnimationTimeout = setTimeout(() => {
this.setData({ gameShow_timeout: false, gameType: 0 })
setTimeout(() => { this.setData({ gameShow: false }) }, 350)
// setTimeout(() => { this.setData({ gameShow: false }) }, 350)
this.setData({ gameZindex: 2 })
// 主要的 授权 => 登陆 => 获取基本信息 开始
this.getAuth()
}, 4500)
}, 5000)
} else if (!this.openAnimationTimeout) {
console.log('%conAnimationLoadOver timeout run', 'color:red;font-weight:bold;font-size:16px;padding: 4px 20px;')
this.openAnimationTimeout = setTimeout(() => {
this.setData({ gameShow_timeout: false, gameType: 0 })
setTimeout(() => { this.setData({ gameShow: false }) }, 350)
// setTimeout(() => { this.setData({ gameShow: false }) }, 350)
this.setData({ gameZindex: 2 })
this.onAnimationLoadFlag = true
// 主要的 授权 => 登陆 => 获取基本信息 开始
this.getAuth()
}, 5550)
}, 8000)
}
},
......
taobao_mini/client/pages/pagecanvas/pagecanvas.acss
View file @ b048b50a
.canvas {
width:100%;
height:100%;
background: transparent;
}
.page-game-cover {
......@@ -12,7 +13,7 @@
width:100%;
height:100%;
z-index: 1;
background: pink;
background: transparent;
}
.page-game {
......@@ -28,5 +29,6 @@
flex: 1;
display: flex;
flex-direction: column;
background: transparent;
}
taobao_mini/client/pages/pagecanvas/pagecanvas.axml
View file @ b048b50a
<view disable-scroll="true" class="page-game">
<view disable-scroll="true" class="page-game" style="background: {{back ? 'transparent' : '#fff'}}">
<view a:if="{{gameType === 0}}" class="page-game-cover"></view>
<canvas disable-scroll="true" id="canvas" type="2d" class="canvas" onTouchStart="onMouseEvent" onTouchMove="onMouseEvent" onTouchEnd="onMouseEvent" onReady="onCanvasReady">
</canvas>
......
taobao_mini/client/pages/pagecanvas/pagecanvas.js
View file @ b048b50a
......@@ -23,6 +23,7 @@ Component({
// 消息弹窗
messageMadalData: {},
messageMadalVisble: false,
back: false
},
isWin: false,
gamePrize: null,
......@@ -83,6 +84,9 @@ Component({
onCanvasReady() {
console.log('onCanvasReady')
this.init()
setTimeout(() => {
this.setData({back: true})
}, 1200);
// this.changeGameSence(this.props.gameType)
},
......
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