Skip to content

Commit cfcfc87

Browse files
authored
Merge pull request #22 from doggycoder/master
fix x86 crash
2 parents c5edbc0 + 6ecefe4 commit cfcfc87

File tree

9 files changed

+54
-0
lines changed

9 files changed

+54
-0
lines changed
-2.74 MB
Binary file not shown.

AiyaEffectsSDK/libs/x86/libaftk.so

-2.72 MB
Binary file not shown.
108 KB
Binary file not shown.

AiyaEffectsSDK/libs/x86/libsimd.so

-308 KB
Binary file not shown.
1.88 MB
Binary file not shown.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"format" : "1",
3+
"name":"高空示爱",
4+
"needtrack" : 0,
5+
"resid":"400515",
6+
"nodes" : [
7+
{
8+
"type":"2dAnim",
9+
"dirname" : "gaokongshiai",
10+
"number" : 180,
11+
"width" : 720,
12+
"height" : 1280,
13+
"duration" : 66,
14+
"isloop" : 1,
15+
"Triggertype" : 0,
16+
"untilFinish" : 1,
17+
"position" : "default",
18+
"anchorX" : 101,
19+
"anchorY" : 20,
20+
"ratio" : 1.0,
21+
"fullscreen" : 1,
22+
"keepaspect" : 0,
23+
"PositionSwitch" : 0
24+
}
25+
]
26+
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"format" : "1",
3+
"name":"世外桃源",
4+
"needtrack" : 0,
5+
"resid":"400516",
6+
"nodes" : [
7+
{
8+
"type":"2dAnim",
9+
"dirname" : "shiwaitaoyuan",
10+
"number" : 240,
11+
"width" : 720,
12+
"height" : 1280,
13+
"duration" : 66,
14+
"isloop" : 1,
15+
"Triggertype" : 0,
16+
"untilFinish" : 1,
17+
"position" : "default",
18+
"anchorX" : 101,
19+
"anchorY" : 20,
20+
"ratio" : 1.0,
21+
"fullscreen" : 1,
22+
"keepaspect" : 0,
23+
"PositionSwitch" : 0
24+
}
25+
]
26+
}
Binary file not shown.

demo/src/main/assets/modelsticker/stickers.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
{"name":"","path":"niu/meta.json"},
1515
{"name":"手套","path":"shoutao/meta.json"},
1616
{"name":"兔耳","path":"tuer/meta.json"},
17+
{"name":"高空示爱","path":"gaokongshiai/meta.json"},
18+
{"name":"世外桃源","path":"shiwaitaoyuan/meta.json"},
1719
{"name":"魔镜","path":"mojing/meta.json"},
1820
{"name":"蘑菇林","path":"mogulin/meta.json"},
1921
{"name":"小红帽","path":"xiaohongmao/meta.json"}

0 commit comments

Comments
 (0)