Skip to content

Commit a1e4c76

Browse files
xxxBWxxxBW
committed
feat: update skyline & xr-frame
1 parent 0e7f0b5 commit a1e4c76

File tree

531 files changed

+34885
-4971
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

531 files changed

+34885
-4971
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ npm-debug.log*
99
yarn-debug.log*
1010
yarn-error.log*
1111
node_modules
12+
miniprogram_npm
13+

‎miniprogram/app.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
const config = require('./config')
2+
23
const themeListeners = []
34
global.isDemo = true
45
App({
@@ -45,9 +46,10 @@ App({
4546
})
4647
}
4748
// skyline
48-
var systemInfo = wx.getSystemInfoSync();
49+
const systemInfo = wx.getSystemInfoSync()
4950
console.log('@@@ systemInfo ', systemInfo)
50-
Object.assign(this.globalData, systemInfo);
51+
Object.assign(this.globalData, systemInfo)
52+
// eslint-disable-next-line promise/always-return
5153
require.async('./packageSkyline/common/custom-route/index.js').then(utils => {
5254
console.log('--------begin installRouteBuilder')
5355
utils.installRouteBuilder() // 'common'

‎miniprogram/app.json

+68-11
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"page/component/index",
44
"page/API/index",
55
"page/cloud/index",
6-
"page/extend/index"
6+
"page/extend/index",
7+
"page/animation/index"
78
],
89
"usingComponents": {
910
"mp-navigation-bar": "/component/navigation-bar/navigation-bar"
@@ -67,9 +68,21 @@
6768
"pages/api/soter-authentication/soter-authentication",
6869
"pages/api/setting/setting",
6970
"pages/ar/visionkit-basic/visionkit-basic",
71+
"pages/ar/visionkit-basic-v2/visionkit-basic-v2",
7072
"pages/ar/plane-ar/plane-ar",
73+
"pages/ar/plane-ar-v2/plane-ar-v2",
74+
"pages/ar/plane-ar-3dof/plane-ar-3dof",
7175
"pages/ar/2dmarker-ar/2dmarker-ar",
76+
"pages/ar/3dmarker-ar/3dmarker-ar",
7277
"pages/ar/osd-ar/osd-ar",
78+
"pages/ar/face-detect/face-detect",
79+
"pages/ar/body-detect/body-detect",
80+
"pages/ar/hand-detect/hand-detect",
81+
"pages/ar/ocr-detect/ocr-detect",
82+
"pages/ar/photo-ocr-detect/photo-ocr-detect",
83+
"pages/ar/photo-hand-detect/photo-hand-detect",
84+
"pages/ar/photo-body-detect/photo-body-detect",
85+
"pages/ar/photo-face-detect/photo-face-detect",
7386
"pages/page/set-navigation-bar-title/set-navigation-bar-title",
7487
"pages/page/navigation-bar-loading/navigation-bar-loading",
7588
"pages/page/navigator/navigator",
@@ -127,7 +140,9 @@
127140
"pages/framework/wxs/movable",
128141
"pages/framework/wxs/sidebar",
129142
"pages/framework/wxs/stick-top",
130-
"pages/framework/wxs/nearby"
143+
"pages/framework/wxs/nearby",
144+
"pages/ai/mobilenet/index",
145+
"pages/ai/style-trans/index"
131146
]
132147
},
133148
{
@@ -205,8 +220,55 @@
205220
"pages/worklet/bottom-sheet/index",
206221
"pages/share-element/list/index",
207222
"pages/share-element/card/index",
208-
"pages/flutter/scale-page/index",
209-
"pages/flutter/half-page/index"
223+
"pages/half-page/scale-page/index",
224+
"pages/half-page/half-page/index",
225+
"pages/address-book/index",
226+
"pages/half-screen/index",
227+
"pages/tabs/index",
228+
"pages/album/index",
229+
"pages/preview/index",
230+
"pages/custom-route/index",
231+
"pages/custom-route/detail",
232+
"pages/scroll-view/index"
233+
]
234+
},
235+
{
236+
"root": "packageXRFrame",
237+
"pages": [
238+
"pages/index/index",
239+
"pages/scene-basic/index",
240+
"pages/scene-basic-light/index",
241+
"pages/scene-basic-animation/index",
242+
"pages/scene-basic-particle/index",
243+
"pages/scene-basic-touch/index",
244+
"pages/scene-basic-visible-layer/index",
245+
"pages/scene-basic-shadow/index",
246+
"pages/scene-basic-video/index",
247+
"pages/scene-basic-render-texture/index",
248+
"pages/scene-basic-postprocessing/index",
249+
"pages/scene-gltf-damageHelmet/index",
250+
"pages/scene-gltf-unlit/index",
251+
"pages/scene-gltf-animation/index",
252+
"pages/scene-gltf-morph/index",
253+
"pages/scene-gltf-light-loading/index",
254+
"pages/scene-ar-basic/index",
255+
"pages/scene-ar-2dmarker/index",
256+
"pages/scene-ar-osdmarker/index",
257+
"pages/scene-ar-camera/index",
258+
"pages/scene-ar-face/index",
259+
"pages/scene-ar-hand/index",
260+
"pages/scene-ar-body/index",
261+
"pages/scene-custom-logic/index",
262+
"pages/scene-custom-render/index",
263+
"pages/scene-scan-render/index",
264+
"pages/scene-scan-team/index",
265+
"pages/scene-classic-wxball/index",
266+
"pages/scene-classic-video/index",
267+
"pages/scene-classic-perspect/index",
268+
"pages/scene-classic-portal/index",
269+
"pages/scene-classic-osd/index",
270+
"pages/scene-classic-face/index",
271+
"pages/scene-last-record/index"
210272
]
211273
}
212274
],
@@ -255,10 +317,10 @@
255317
"text": "组件"
256318
},
257319
{
258-
"pagePath": "page/extend/index",
320+
"pagePath": "page/animation/index",
259321
"iconPath": "@iconPathComponent",
260322
"selectedIconPath": "@selectedIconPathComponent",
261-
"text": "扩展能力"
323+
"text": "交互动画"
262324
},
263325
{
264326
"pagePath": "page/API/index",
@@ -288,11 +350,6 @@
288350
"desc": "你的位置信息将用于小程序位置接口的效果展示"
289351
}
290352
},
291-
"requiredPrivateInfos": [
292-
"chooseAddress",
293-
"chooseLocation",
294-
"getLocation"
295-
],
296353
"cloud": true,
297354
"sitemapLocation": "sitemap.json",
298355
"themeLocation": "demo.theme.json",

‎miniprogram/app.wxss

+11-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ button {
5151
display: flex;
5252
justify-content: center;
5353
align-items: center;
54-
height: 60px;
5554
font-size: 16px;
5655
line-height: 1.2;
5756
}
@@ -324,3 +323,14 @@ input {
324323
[data-weui-theme=dark] .weui-cell_before {
325324
border-top-color: hsla(0, 0%, 100%, .1);
326325
}
326+
327+
.center {
328+
align-items: center;
329+
justify-content: center;
330+
}
331+
332+
grid-tile {
333+
align-items: center;
334+
justify-content: center;
335+
overflow: hidden;
336+
}

‎miniprogram/assets/animation/basic-animation.json

+112
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
{
2+
"keyframe": {
3+
"cube": {
4+
"0": {
5+
"position": [-3, 0, 2]
6+
},
7+
"50": {
8+
"rotation": [0, 0, 0],
9+
"scale": [1, 1, 1]
10+
},
11+
"100": {
12+
"position": [3, 0, 2],
13+
"rotation": [0, 3.14, 0],
14+
"scale": [1.4, 1.4, 1.4]
15+
}
16+
},
17+
"sphere": {
18+
"0": {
19+
"position": [-3, 0, 0],
20+
"scale": [0.8, 0.8, 0.8]
21+
},
22+
"50": {
23+
"position": [0, 0.2, 0],
24+
"scale": [1, 1, 1]
25+
},
26+
"100": {
27+
"position": [3, 0, 0],
28+
"scale": [0.8, 0.8, 0.8]
29+
}
30+
},
31+
"cylinder": {
32+
"0": {
33+
"position": [-3, 0, -2],
34+
"rotation": [0, 0, 0]
35+
},
36+
"50": {
37+
"rotation": [0, 0, -3.14]
38+
},
39+
"100": {
40+
"position": [3, 0, -2],
41+
"rotation": [0, 0, 3.14]
42+
}
43+
},
44+
"plane": {
45+
"0": {
46+
"material.u_baseColorFactor": [0.48, 0.78, 0.64, 1]
47+
},
48+
"50": {
49+
"material.u_baseColorFactor": [0.368, 0.937, 0.176, 1]
50+
},
51+
"100": {
52+
"material.u_baseColorFactor": [0.176, 0.368, 0.937, 1]
53+
}
54+
},
55+
"spotLight": {
56+
"0": {
57+
"position": [-4, 1, -4]
58+
},
59+
"25": {
60+
"position": [-4.3, 0.5, -2]
61+
},
62+
"75": {
63+
"position": [-3, 1.5, 2]
64+
},
65+
"100": {
66+
"position": [-4, 1, 4]
67+
}
68+
}
69+
},
70+
"animation": {
71+
"default": {
72+
"keyframe": "cube",
73+
"duration": 1,
74+
"ease": "ease-in-out",
75+
"loop": 400000,
76+
"delay": 1,
77+
"direction": "both"
78+
},
79+
"sphere": {
80+
"keyframe": "sphere",
81+
"duration": 1,
82+
"ease": "ease-out",
83+
"loop": 400000,
84+
"delay": 1,
85+
"direction": "both"
86+
},
87+
"cylinder": {
88+
"keyframe": "cylinder",
89+
"duration": 1,
90+
"ease": "ease-in",
91+
"loop": 400000,
92+
"delay": 1,
93+
"direction": "both"
94+
},
95+
"plane": {
96+
"keyframe": "plane",
97+
"duration": 4,
98+
"ease": "linear",
99+
"loop": 400000,
100+
"delay": 1,
101+
"direction": "both"
102+
},
103+
"spotLight": {
104+
"keyframe": "spotLight",
105+
"duration": 2,
106+
"ease": "ease-in-out",
107+
"loop": 400000,
108+
"delay": 1,
109+
"direction": "both"
110+
}
111+
}
112+
}

‎miniprogram/assets/animation/gltf-animation.json

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{
2+
"keyframe": {
3+
"directionalLight": {
4+
"0": {
5+
"rotation": [40, 170, 0]
6+
},
7+
"50": {
8+
"rotation": [30, 140, 0]
9+
},
10+
"100": {
11+
"rotation": [40, 170, 0]
12+
}
13+
},
14+
"pointLight": {
15+
"0": {
16+
"position": [10, 0, 0]
17+
},
18+
"100": {
19+
"position": [-10, 0, 0]
20+
}
21+
},
22+
"spotLight": {
23+
"0": {
24+
"rotation": [0,90,0]
25+
},
26+
"100": {
27+
"rotation": [0, 270, 4]
28+
}
29+
}
30+
},
31+
"animation": {
32+
"default": {
33+
"keyframe": "directionalLight",
34+
"duration": 60,
35+
"ease": "linear",
36+
"loop": 400000,
37+
"delay": 1,
38+
"direction": "both"
39+
},
40+
"pointLight": {
41+
"keyframe": "pointLight",
42+
"duration": 6,
43+
"ease": "linear",
44+
"loop": 400000,
45+
"delay": 1,
46+
"direction": "both"
47+
},
48+
"spotLight": {
49+
"keyframe": "spotLight",
50+
"duration": 200,
51+
"ease": "linear",
52+
"loop": 400000,
53+
"delay": 1,
54+
"direction": "both"
55+
}
56+
}
57+
}

‎miniprogram/assets/animation/miku-kawaii-animation.json

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"keyframe": {
3+
"parent": {
4+
"0": {
5+
"rotation": [0, 0, 0]
6+
},
7+
"100": {
8+
"rotation": [0, 6.28, 0]
9+
}
10+
},
11+
"child": {
12+
"0": {
13+
"position.y": -0.5
14+
},
15+
"100": {
16+
"position.y": 1.5
17+
}
18+
}
19+
},
20+
"animation": {
21+
"parent": {
22+
"keyframe": "parent",
23+
"duration": 8,
24+
"ease": "linear",
25+
"loop": -1
26+
},
27+
"child": {
28+
"keyframe": "child",
29+
"duration": 4,
30+
"ease": "ease-in-out",
31+
"direction": "both",
32+
"loop": -1
33+
}
34+
}
35+
}

‎miniprogram/assets/waifu.png

66.8 KB
Loading

‎miniprogram/common/common-skyline.wxss

+1
Original file line numberDiff line numberDiff line change
@@ -169,3 +169,4 @@ image {
169169
[data-weui-theme=dark] .page__desc {
170170
color: hsla(0, 0%, 100%, .5);
171171
}
172+

0 commit comments

Comments
 (0)