Skip to content

Commit

Permalink
Merge pull request #2 from VisActor/feat/scene7-scene8
Browse files Browse the repository at this point in the history 
feat: scene7-scene8
  • Loading branch information
@xiaoluoHe
xiaoluoHe authored Jun 7, 2024
2 parents ffd31e7 + 0615513 commit c092526
Show file tree
Hide file tree
Showing 22 changed files with 1,012 additions and 77 deletions.
Binary file added packages/vstory/demo/src/assets/scene7/bg-decoration.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/vstory/demo/src/assets/scene7/chart.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/vstory/demo/src/assets/scene7/pie.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/vstory/demo/src/assets/scene7/text-en.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/vstory/demo/src/assets/scene7/text-zh.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/vstory/demo/src/assets/scene7/title.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/vstory/demo/src/assets/scene8/bg-decoration.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/vstory/demo/src/assets/scene8/chart.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/vstory/demo/src/assets/scene8/image1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/vstory/demo/src/assets/scene8/image2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/vstory/demo/src/assets/scene8/text.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/vstory/demo/src/assets/scene8/title.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 10 additions & 4 deletions packages/vstory/demo/src/demos/VChartSite/VChartSite.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import { scene2, scene2Characters } from './scene2';
import { scene3, scene3Characters } from './scene3';
import { scene4, scene4Characters } from './scene4';
import { scene5, scene5Characters } from './scene5';
import { scene7, scene7Characters } from './scene7';
import { scene8, scene8Characters } from './scene8';

export const VChartSiteDemo = () => {
const id = 'storyBar';
Expand All @@ -16,19 +18,23 @@ export const VChartSiteDemo = () => {
characters: [
// ...scene1Characters, //
// ...scene2Characters,
// ...scene3Characters,
// ...scene3Characters
// ...scene4Characters,
...scene5Characters
// ...scene5Characters,
...scene7Characters,
...scene8Characters
],
acts: [
{
id: 'default-chapter',
scenes: [
// scene1, //
// scene2,
// scene3,
// scene3
// scene4,
scene5
// scene5,
scene7,
scene8
]
}
]
Expand Down
79 changes: 43 additions & 36 deletions packages/vstory/demo/src/demos/VChartSite/scene3.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import Scene3ChartImage2 from '../../assets/scene3/chart-2.png';
import Scene3ChartImage3 from '../../assets/scene3/chart-3.png';
import Scene3ChartImage4 from '../../assets/scene3/chart-4.png';
import Scene3ChartImage5 from '../../assets/scene3/chart-5.png';

import { easeInOutQuad } from './util';
// @ts-ignore
export const scene3Characters: ICharacterSpec[] = [
{
Expand Down Expand Up @@ -439,7 +441,7 @@ export const scene3: ISceneSpec = {
payload: {
animation: {
duration: 700,
easing: 'easeInOutQuad',
easing: easeInOutQuad,
move: {
from: 'right'
}
Expand All @@ -458,7 +460,7 @@ export const scene3: ISceneSpec = {
payload: {
animation: {
duration: 700,
easing: 'easeInOutQuad',
easing: easeInOutQuad,
move: {
from: 'right'
}
Expand All @@ -477,7 +479,7 @@ export const scene3: ISceneSpec = {
payload: {
animation: {
duration: 700,
easing: 'easeInOutQuad',
easing: easeInOutQuad,
move: {
from: 'right'
}
Expand All @@ -491,14 +493,15 @@ export const scene3: ISceneSpec = {
characterActions: [
{
startTime: 1,
duration: 700,
duration: 3000,
action: 'appear',
payload: {
animation: {
duration: 700,
easing: 'easeInOutQuad',
duration: 3000,
easing: easeInOutQuad,
move: {
from: 'right'
from: 'right',
isVariableSpeed: false
}
}
}
Expand All @@ -510,14 +513,15 @@ export const scene3: ISceneSpec = {
characterActions: [
{
startTime: 1,
duration: 700,
duration: 3000,
action: 'appear',
payload: {
animation: {
duration: 700,
easing: 'easeInOutQuad',
duration: 3000,
easing: easeInOutQuad,
move: {
from: 'right'
from: 'right',
isVariableSpeed: false
}
}
}
Expand All @@ -529,14 +533,15 @@ export const scene3: ISceneSpec = {
characterActions: [
{
startTime: 1,
duration: 700,
duration: 3000,
action: 'appear',
payload: {
animation: {
duration: 700,
easing: 'easeInOutQuad',
duration: 3000,
easing: easeInOutQuad,
move: {
from: 'right'
from: 'right',
isVariableSpeed: false
}
}
}
Expand All @@ -548,14 +553,15 @@ export const scene3: ISceneSpec = {
characterActions: [
{
startTime: 1,
duration: 700,
duration: 3000,
action: 'appear',
payload: {
animation: {
duration: 700,
easing: 'easeInOutQuad',
duration: 3000,
easing: easeInOutQuad,
move: {
from: 'right'
from: 'right',
isVariableSpeed: false
}
}
}
Expand All @@ -567,14 +573,15 @@ export const scene3: ISceneSpec = {
characterActions: [
{
startTime: 1,
duration: 700,
duration: 3000,
action: 'appear',
payload: {
animation: {
duration: 700,
easing: 'easeInOutQuad',
duration: 3000,
easing: easeInOutQuad,
move: {
from: 'right'
from: 'right',
isVariableSpeed: false
}
}
}
Expand All @@ -591,7 +598,7 @@ export const scene3: ISceneSpec = {
payload: {
animation: {
duration: 500,
easing: 'easeInOutQuad',
easing: easeInOutQuad,
move: {
from: 'bottom'
}
Expand All @@ -610,7 +617,7 @@ export const scene3: ISceneSpec = {
payload: {
animation: {
duration: 500,
easing: 'easeInOutQuad',
easing: easeInOutQuad,
move: {
from: 'bottom'
}
Expand All @@ -627,7 +634,7 @@ export const scene3: ISceneSpec = {
},
animation: {
duration: 1000,
easing: 'easeInOutQuad'
easing: easeInOutQuad
}
}
}
Expand All @@ -643,7 +650,7 @@ export const scene3: ISceneSpec = {
payload: {
animation: {
duration: 500,
easing: 'easeInOutQuad',
easing: easeInOutQuad,
move: {
from: 'bottom'
}
Expand All @@ -661,7 +668,7 @@ export const scene3: ISceneSpec = {
},
animation: {
duration: 1000,
easing: 'easeInOutQuad'
easing: easeInOutQuad
}
}
}
Expand All @@ -677,7 +684,7 @@ export const scene3: ISceneSpec = {
payload: {
animation: {
duration: 500,
easing: 'easeInOutQuad',
easing: easeInOutQuad,
move: {
from: 'bottom'
}
Expand All @@ -694,7 +701,7 @@ export const scene3: ISceneSpec = {
},
animation: {
duration: 1000,
easing: 'easeInOutQuad'
easing: easeInOutQuad
}
}
}
Expand All @@ -710,7 +717,7 @@ export const scene3: ISceneSpec = {
payload: {
animation: {
duration: 500,
easing: 'easeInOutQuad',
easing: easeInOutQuad,
move: {
from: 'bottom'
}
Expand All @@ -728,7 +735,7 @@ export const scene3: ISceneSpec = {
},
animation: {
duration: 1000,
easing: 'easeInOutQuad'
easing: easeInOutQuad
}
}
}
Expand All @@ -744,7 +751,7 @@ export const scene3: ISceneSpec = {
payload: {
animation: {
duration: 500,
easing: 'easeInOutQuad',
easing: easeInOutQuad,
move: {
from: 'bottom'
}
Expand All @@ -762,7 +769,7 @@ export const scene3: ISceneSpec = {
},
animation: {
duration: 1000,
easing: 'easeInOutQuad'
easing: easeInOutQuad
}
}
},
Expand All @@ -789,7 +796,7 @@ export const scene3: ISceneSpec = {
payload: {
animation: {
duration: 500,
easing: 'easeInOutQuad',
easing: easeInOutQuad,
move: {
from: 'bottom'
}
Expand Down Expand Up @@ -1230,7 +1237,7 @@ export const scene3: ISceneSpec = {
payload: {
animation: {
duration: 700,
easing: 'easeInOutQuad'
easing: easeInOutQuad
}
}
}
Expand Down
Loading

0 comments on commit c092526

Please sign in to comment.