@vvfx/artis 0.0.1-alpha.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +22 -0
- package/dist/artis/artis.d.ts +44 -0
- package/dist/artis/base-artis.d.ts +520 -0
- package/dist/artis/canvas-layer-order.d.ts +19 -0
- package/dist/artis/create-info-to-schema.d.ts +21 -0
- package/dist/artis/index.d.ts +15 -0
- package/dist/artis/operations/index.d.ts +3 -0
- package/dist/artis/operations/operations.d.ts +362 -0
- package/dist/artis/operations/scene-operations.d.ts +26 -0
- package/dist/artis/operations/types.d.ts +39 -0
- package/dist/artis/scene-artis.d.ts +386 -0
- package/dist/artis/screenshot-service.d.ts +83 -0
- package/dist/artis/types.d.ts +130 -0
- package/dist/artis/wiring/index.d.ts +17 -0
- package/dist/artis/wiring/register-commands.d.ts +44 -0
- package/dist/artis/wiring/setup-commands.d.ts +5 -0
- package/dist/artis/wiring/setup-event-bindings.d.ts +16 -0
- package/dist/artis/wiring/setup-keybindings.d.ts +38 -0
- package/dist/artis/wiring/setup-plugins.d.ts +5 -0
- package/dist/artis/wiring/wiring-context.d.ts +34 -0
- package/dist/artis-sdk/artis-sdk.d.ts +1117 -0
- package/dist/artis-sdk/index.d.ts +1 -0
- package/dist/core/asset/asset-manager.d.ts +288 -0
- package/dist/core/asset/index.d.ts +3 -0
- package/dist/core/command/command-service.d.ts +315 -0
- package/dist/core/command/commands/composite-command.d.ts +45 -0
- package/dist/core/command/commands/frame-layout-command.d.ts +81 -0
- package/dist/core/command/commands/frame-layout-mode-command.d.ts +55 -0
- package/dist/core/command/commands/frame-move-in-command.d.ts +54 -0
- package/dist/core/command/commands/frame-move-out-command.d.ts +54 -0
- package/dist/core/command/commands/group-children-detach-command.d.ts +28 -0
- package/dist/core/command/commands/index.d.ts +98 -0
- package/dist/core/command/commands/item-align-command.d.ts +52 -0
- package/dist/core/command/commands/item-create-command.d.ts +66 -0
- package/dist/core/command/commands/item-delete-command.d.ts +40 -0
- package/dist/core/command/commands/item-distribute-command.d.ts +53 -0
- package/dist/core/command/commands/item-group-command.d.ts +41 -0
- package/dist/core/command/commands/item-reorder-command.d.ts +41 -0
- package/dist/core/command/commands/item-replace-source-command.d.ts +48 -0
- package/dist/core/command/commands/item-set-font-family-command.d.ts +46 -0
- package/dist/core/command/commands/item-set-generator-resource-command.d.ts +40 -0
- package/dist/core/command/commands/item-transform-command.d.ts +51 -0
- package/dist/core/command/commands/item-ungroup-command.d.ts +34 -0
- package/dist/core/command/commands/item-update-property-by-create-info-command.d.ts +41 -0
- package/dist/core/command/commands/item-update-property-command.d.ts +82 -0
- package/dist/core/command/commands/mask-commit-command.d.ts +53 -0
- package/dist/core/command/commands/page-auto-layout-command.d.ts +53 -0
- package/dist/core/command/commands/picture-cut-commit-command.d.ts +43 -0
- package/dist/core/command/commands/picture-expand-commit-command.d.ts +35 -0
- package/dist/core/command/commands/scene-switch-command.d.ts +35 -0
- package/dist/core/command/commands/selection-set-command.d.ts +38 -0
- package/dist/core/command/commands/sprite-image-command.d.ts +36 -0
- package/dist/core/command/commands/sprite-text-edit-commit-command.d.ts +43 -0
- package/dist/core/command/commands/state-hand-command.d.ts +14 -0
- package/dist/core/command/commands/state-image-cut-command.d.ts +14 -0
- package/dist/core/command/commands/state-image-expand-command.d.ts +14 -0
- package/dist/core/command/commands/state-image-mask-command.d.ts +15 -0
- package/dist/core/command/commands/state-image-text-edit-command.d.ts +14 -0
- package/dist/core/command/commands/state-item-create-command.d.ts +34 -0
- package/dist/core/command/commands/state-move-command.d.ts +14 -0
- package/dist/core/command/commands/state-switch-command-base.d.ts +41 -0
- package/dist/core/command/commands/text-move-command.d.ts +47 -0
- package/dist/core/command/commands/text-rotate-command.d.ts +52 -0
- package/dist/core/command/commands/text-scale-command.d.ts +56 -0
- package/dist/core/command/commands/text-update-content-command.d.ts +51 -0
- package/dist/core/command/commands/transform-move-command.d.ts +56 -0
- package/dist/core/command/commands/transform-move-with-frame-change-command.d.ts +80 -0
- package/dist/core/command/commands/transform-move-with-layout-command.d.ts +56 -0
- package/dist/core/command/commands/transform-rotate-command.d.ts +51 -0
- package/dist/core/command/commands/transform-scale-command.d.ts +54 -0
- package/dist/core/command/commands/video-play-command.d.ts +28 -0
- package/dist/core/command/commands/video-source-command.d.ts +39 -0
- package/dist/core/command/commands/viewport-fit-to-box-command.d.ts +37 -0
- package/dist/core/command/commands/viewport-fit-to-items-command.d.ts +43 -0
- package/dist/core/command/commands/viewport-move-command.d.ts +34 -0
- package/dist/core/command/commands/viewport-zoom-command.d.ts +35 -0
- package/dist/core/command/index.d.ts +5 -0
- package/dist/core/command/registry.d.ts +246 -0
- package/dist/core/command/types.d.ts +124 -0
- package/dist/core/element-registry/element-facade.d.ts +35 -0
- package/dist/core/element-registry/element-identity-strategy.d.ts +75 -0
- package/dist/core/element-registry/element-registry.d.ts +72 -0
- package/dist/core/element-registry/index.d.ts +5 -0
- package/dist/core/element-registry/types.d.ts +15 -0
- package/dist/core/gizmo/gizmo-bootstrap.d.ts +70 -0
- package/dist/core/gizmo/gizmo-command-binder.d.ts +55 -0
- package/dist/core/gizmo/gizmo-config-override.d.ts +24 -0
- package/dist/core/gizmo/gizmo-registry.d.ts +39 -0
- package/dist/core/gizmo/index.d.ts +19 -0
- package/dist/core/gizmo/register-gizmo-command-bindings.d.ts +20 -0
- package/dist/core/gizmo/state-gizmo-controller.d.ts +20 -0
- package/dist/core/history/history-manager.d.ts +174 -0
- package/dist/core/history/index.d.ts +1 -0
- package/dist/core/index.d.ts +25 -0
- package/dist/core/item/base-item.d.ts +154 -0
- package/dist/core/item/card-item.d.ts +91 -0
- package/dist/core/item/default-item-schema.d.ts +20 -0
- package/dist/core/item/effects-item.d.ts +99 -0
- package/dist/core/item/frame-item.d.ts +153 -0
- package/dist/core/item/generator-item.d.ts +114 -0
- package/dist/core/item/group-item.d.ts +51 -0
- package/dist/core/item/index.d.ts +25 -0
- package/dist/core/item/sprite-item.d.ts +80 -0
- package/dist/core/item/text-item.d.ts +171 -0
- package/dist/core/item/types.d.ts +158 -0
- package/dist/core/item/video-item.d.ts +120 -0
- package/dist/core/keybinding/index.d.ts +11 -0
- package/dist/core/keybinding/key-binding-controller.d.ts +44 -0
- package/dist/core/keybinding/key-binding-registry.d.ts +92 -0
- package/dist/core/keybinding/key-binding-store.d.ts +29 -0
- package/dist/core/keybinding/key-matcher.d.ts +24 -0
- package/dist/core/keybinding/types.d.ts +84 -0
- package/dist/core/plugin/index.d.ts +3 -0
- package/dist/core/plugin/io-plugin.d.ts +167 -0
- package/dist/core/plugin/plugin-system.d.ts +77 -0
- package/dist/core/predict/align-predict.d.ts +20 -0
- package/dist/core/predict/base/box-ops.d.ts +40 -0
- package/dist/core/predict/base/index.d.ts +14 -0
- package/dist/core/predict/base/parent-coord.d.ts +29 -0
- package/dist/core/predict/base/schema-box.d.ts +21 -0
- package/dist/core/predict/distribute-predict.d.ts +19 -0
- package/dist/core/predict/frame-layout-predict.d.ts +24 -0
- package/dist/core/predict/index.d.ts +12 -0
- package/dist/core/preferences/index.d.ts +2 -0
- package/dist/core/preferences/user-preferences-manager.d.ts +130 -0
- package/dist/core/quality/error-monitor/error-monitor-facade.d.ts +73 -0
- package/dist/core/quality/error-monitor/error-monitor.d.ts +106 -0
- package/dist/core/quality/error-monitor/index.d.ts +4 -0
- package/dist/core/quality/error-monitor/types.d.ts +198 -0
- package/dist/core/quality/index.d.ts +3 -0
- package/dist/core/quality/perf-monitor/index.d.ts +5 -0
- package/dist/core/quality/perf-monitor/perf-monitor-facade.d.ts +45 -0
- package/dist/core/quality/perf-monitor/perf-monitor.d.ts +60 -0
- package/dist/core/quality/perf-monitor/types.d.ts +66 -0
- package/dist/core/quality/stability-monitor/index.d.ts +5 -0
- package/dist/core/quality/stability-monitor/stability-monitor-facade.d.ts +50 -0
- package/dist/core/quality/stability-monitor/stability-monitor.d.ts +61 -0
- package/dist/core/quality/stability-monitor/types.d.ts +69 -0
- package/dist/core/renderer/background-controller.d.ts +56 -0
- package/dist/core/renderer/index.d.ts +5 -0
- package/dist/core/renderer/player-adapter.d.ts +129 -0
- package/dist/core/renderer/renderer.d.ts +134 -0
- package/dist/core/service/frame-service.d.ts +116 -0
- package/dist/core/service/index.d.ts +9 -0
- package/dist/core/service/interaction-providers.d.ts +20 -0
- package/dist/core/service/interaction-service.d.ts +211 -0
- package/dist/core/service/item-asset-service.d.ts +120 -0
- package/dist/core/service/item-creator-service.d.ts +211 -0
- package/dist/core/service/item-service.d.ts +641 -0
- package/dist/core/service/item-sync-service.d.ts +66 -0
- package/dist/core/service/json-scene-sync-service.d.ts +140 -0
- package/dist/core/service/refresh-animation-base-service.d.ts +1 -0
- package/dist/core/service/scene-data-assembler.d.ts +166 -0
- package/dist/core/service/view-service.d.ts +202 -0
- package/dist/core/state/base-state.d.ts +28 -0
- package/dist/core/state/index.d.ts +6 -0
- package/dist/core/state/presets.d.ts +25 -0
- package/dist/core/state/state-manager.d.ts +50 -0
- package/dist/core/state/types.d.ts +52 -0
- package/dist/core/store/index.d.ts +3 -0
- package/dist/core/store/scene-store.d.ts +194 -0
- package/dist/core/store/store.d.ts +36 -0
- package/dist/core/types/artis-config.d.ts +186 -0
- package/dist/core/types/artis-events.d.ts +101 -0
- package/dist/core/types/frame.d.ts +3 -0
- package/dist/core/types/generator.d.ts +28 -0
- package/dist/core/types/index.d.ts +15 -0
- package/dist/core/types/item-create-info.d.ts +205 -0
- package/dist/core/types/item-property.d.ts +149 -0
- package/dist/core/types/item-reorder.d.ts +12 -0
- package/dist/core/types/item-schema.d.ts +263 -0
- package/dist/core/types/item-set-property.d.ts +48 -0
- package/dist/core/types/page.d.ts +40 -0
- package/dist/core/types/sdk.d.ts +28 -0
- package/dist/core/types/view.d.ts +39 -0
- package/dist/helper/exporter/config.d.ts +18 -0
- package/dist/helper/exporter/const.d.ts +71 -0
- package/dist/helper/exporter/export-media.d.ts +189 -0
- package/dist/helper/exporter/exporter.d.ts +58 -0
- package/dist/helper/exporter/index.d.ts +2 -0
- package/dist/helper/exporter/types.d.ts +194 -0
- package/dist/helper/exporter/utils.d.ts +71 -0
- package/dist/helper/exporter/wav-audio.d.ts +35 -0
- package/dist/helper/html-overlay/anchor-navigation-runtime.d.ts +1 -0
- package/dist/helper/html-overlay/auto-height-layout.d.ts +16 -0
- package/dist/helper/html-overlay/auto-height-runtime.d.ts +40 -0
- package/dist/helper/html-overlay/document-runtime.d.ts +18 -0
- package/dist/helper/html-overlay/document-transform.d.ts +46 -0
- package/dist/helper/html-overlay/dom-order.d.ts +5 -0
- package/dist/helper/html-overlay/host-message-runtime.d.ts +15 -0
- package/dist/helper/html-overlay/html-capture-runtime.d.ts +12 -0
- package/dist/helper/html-overlay/html-card-service.d.ts +287 -0
- package/dist/helper/html-overlay/html-viewport-style.d.ts +6 -0
- package/dist/helper/html-overlay/index.d.ts +1 -0
- package/dist/helper/html-overlay/inline-script-json.d.ts +1 -0
- package/dist/helper/html-overlay/mime-utils.d.ts +13 -0
- package/dist/helper/html-overlay/overlay-transform.d.ts +30 -0
- package/dist/helper/html-overlay/path-utils.d.ts +34 -0
- package/dist/helper/html-overlay/runtime-context.d.ts +2 -0
- package/dist/helper/html-overlay/shell-runtime.d.ts +13 -0
- package/dist/helper/index.d.ts +5 -0
- package/dist/helper/scene-builder.d.ts +111 -0
- package/dist/helper/screen-shot.d.ts +51 -0
- package/dist/helper/size-adapt.d.ts +88 -0
- package/dist/index.cjs +69350 -0
- package/dist/index.cjs.map +1 -0
- package/dist/index.d.ts +19 -0
- package/dist/index.mjs +68963 -0
- package/dist/index.mjs.map +1 -0
- package/dist/shared/index.d.ts +1 -0
- package/dist/shared/player.d.ts +9 -0
- package/dist/utils/background-manager.d.ts +76 -0
- package/dist/utils/common-utils.d.ts +39 -0
- package/dist/utils/container-size.d.ts +7 -0
- package/dist/utils/find-player-item.d.ts +9 -0
- package/dist/utils/index.d.ts +11 -0
- package/dist/utils/json-data-utils.d.ts +198 -0
- package/dist/utils/layout-utils.d.ts +144 -0
- package/dist/utils/pixel-box-utils.d.ts +26 -0
- package/dist/utils/player-data-utils.d.ts +9 -0
- package/dist/utils/player-utils.d.ts +42 -0
- package/dist/utils/replay-utils.d.ts +22 -0
- package/dist/utils/types.d.ts +130 -0
- package/package.json +66 -0
|
@@ -0,0 +1,130 @@
|
|
|
1
|
+
import type { Matrix4, Vector2, Vector3 } from '@vvfx/gizmo';
|
|
2
|
+
import { spec } from '@galacean/effects';
|
|
3
|
+
/**
|
|
4
|
+
* 交互状态视图信息
|
|
5
|
+
*/
|
|
6
|
+
export type ViewInteractionParam = {
|
|
7
|
+
/**
|
|
8
|
+
* 视口宽度 - 红框区域像素大小
|
|
9
|
+
*/
|
|
10
|
+
width: number;
|
|
11
|
+
/**
|
|
12
|
+
* 视口高度 - 红框区域像素大小
|
|
13
|
+
*/
|
|
14
|
+
height: number;
|
|
15
|
+
/**
|
|
16
|
+
* 视口缩放比例(用户 zoom)
|
|
17
|
+
*/
|
|
18
|
+
scale: number;
|
|
19
|
+
/**
|
|
20
|
+
* 容器缩放 视口比例 补偿比(补偿 resize 时 aspect 变化对元素大小的影响)
|
|
21
|
+
*/
|
|
22
|
+
contentRatio: number;
|
|
23
|
+
/**
|
|
24
|
+
* 容器缩放 宽 补偿比(补偿 resize 时 width 变化对元素大小的影响)
|
|
25
|
+
*/
|
|
26
|
+
widthRatio: number;
|
|
27
|
+
/**
|
|
28
|
+
* 容器缩放 宽 补偿比(补偿 resize 时 height 变化对元素大小的影响)
|
|
29
|
+
*/
|
|
30
|
+
heightRatio: number;
|
|
31
|
+
/**
|
|
32
|
+
* 视图像素与真实像素比例
|
|
33
|
+
*/
|
|
34
|
+
pixelRatio: number;
|
|
35
|
+
/**
|
|
36
|
+
* 视口位移信息
|
|
37
|
+
*/
|
|
38
|
+
translation: Vector2;
|
|
39
|
+
/**
|
|
40
|
+
* 标尺宽度
|
|
41
|
+
*/
|
|
42
|
+
rulerWidth: number;
|
|
43
|
+
};
|
|
44
|
+
/**
|
|
45
|
+
* 交互状态相机信息
|
|
46
|
+
*/
|
|
47
|
+
export type CameraInteractionParam = {
|
|
48
|
+
/**
|
|
49
|
+
* 位置
|
|
50
|
+
*/
|
|
51
|
+
position: Vector3;
|
|
52
|
+
/**
|
|
53
|
+
* 旋转角度
|
|
54
|
+
*/
|
|
55
|
+
rotation: Vector3;
|
|
56
|
+
/**
|
|
57
|
+
* 视野初始中心
|
|
58
|
+
*/
|
|
59
|
+
focusPosition: Vector3;
|
|
60
|
+
/**
|
|
61
|
+
* 视野初始角度
|
|
62
|
+
*/
|
|
63
|
+
focusRotation: Vector3;
|
|
64
|
+
/**
|
|
65
|
+
* 投影矩阵
|
|
66
|
+
*/
|
|
67
|
+
viewProjectionMatrix: Matrix4;
|
|
68
|
+
/**
|
|
69
|
+
* 逆投影矩阵
|
|
70
|
+
*/
|
|
71
|
+
inverseViewProjectionMatrix: Matrix4;
|
|
72
|
+
};
|
|
73
|
+
export declare const SafeConstraint: {
|
|
74
|
+
topAdsorption: string;
|
|
75
|
+
leftAdsorption: string;
|
|
76
|
+
rightAdsorption: string;
|
|
77
|
+
bottomAdsorption: string;
|
|
78
|
+
centerAdsorption: string;
|
|
79
|
+
bottomCenterAdsorption: string;
|
|
80
|
+
};
|
|
81
|
+
export type ItemJSONInfo = {
|
|
82
|
+
item: spec.VFXItemData;
|
|
83
|
+
components: spec.ComponentData[];
|
|
84
|
+
tracks: any[];
|
|
85
|
+
playableAssets: any[];
|
|
86
|
+
};
|
|
87
|
+
export type AlignType = 'left' | 'right' | 'horizontal-center' | 'top' | 'bottom' | 'vertical-center';
|
|
88
|
+
export type DistributeType = 'vertical-spacing' | 'horizontal-spacing';
|
|
89
|
+
/**
|
|
90
|
+
* 背景类型预设配置
|
|
91
|
+
*/
|
|
92
|
+
export type BackgroundPreset = {
|
|
93
|
+
/**
|
|
94
|
+
* 背景颜色
|
|
95
|
+
*/
|
|
96
|
+
color?: string;
|
|
97
|
+
/**
|
|
98
|
+
* 背景图片/渐变
|
|
99
|
+
*/
|
|
100
|
+
image?: string;
|
|
101
|
+
/**
|
|
102
|
+
* 背景重复方式
|
|
103
|
+
*/
|
|
104
|
+
repeat?: string;
|
|
105
|
+
/**
|
|
106
|
+
* 背景位置
|
|
107
|
+
*/
|
|
108
|
+
position?: string;
|
|
109
|
+
/**
|
|
110
|
+
* 背景大小
|
|
111
|
+
*/
|
|
112
|
+
size?: string;
|
|
113
|
+
};
|
|
114
|
+
/**
|
|
115
|
+
* 背景网格配置
|
|
116
|
+
*/
|
|
117
|
+
export type BackgroundGridConfig = {
|
|
118
|
+
/**
|
|
119
|
+
* 基础网格大小(像素)
|
|
120
|
+
*/
|
|
121
|
+
baseSize: number;
|
|
122
|
+
/**
|
|
123
|
+
* 缩放循环阈值(默认 2,即 2x 时重置)
|
|
124
|
+
*/
|
|
125
|
+
zoomCycle: number;
|
|
126
|
+
/**
|
|
127
|
+
* 最小网格大小限制
|
|
128
|
+
*/
|
|
129
|
+
minSize: number;
|
|
130
|
+
};
|
package/package.json
ADDED
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@vvfx/artis",
|
|
3
|
+
"description": "智能画布",
|
|
4
|
+
"version": "0.0.1-alpha.0",
|
|
5
|
+
"main": "./dist/index.cjs",
|
|
6
|
+
"module": "./dist/index.mjs",
|
|
7
|
+
"types": "./dist/index.d.ts",
|
|
8
|
+
"files": [
|
|
9
|
+
"dist"
|
|
10
|
+
],
|
|
11
|
+
"exports": {
|
|
12
|
+
".": {
|
|
13
|
+
"types": "./dist/index.d.ts",
|
|
14
|
+
"import": "./dist/index.mjs",
|
|
15
|
+
"require": "./dist/index.cjs"
|
|
16
|
+
}
|
|
17
|
+
},
|
|
18
|
+
"dependencies": {
|
|
19
|
+
"@ffmpeg/ffmpeg": "0.12.15",
|
|
20
|
+
"@ffmpeg/util": "0.12.2",
|
|
21
|
+
"@galacean/effects": "2.10.0-alpha.4",
|
|
22
|
+
"@galacean/effects-plugin-ffd": "2.10.0-alpha.4",
|
|
23
|
+
"@galacean/effects-plugin-model": "2.10.0-alpha.4",
|
|
24
|
+
"@galacean/effects-plugin-multimedia": "2.10.0-alpha.4",
|
|
25
|
+
"@galacean/effects-plugin-rich-text": "2.10.0-alpha.4",
|
|
26
|
+
"@galacean/effects-plugin-spine": "2.10.0-alpha.4",
|
|
27
|
+
"@progress/jszip-esm": "^1.0.4",
|
|
28
|
+
"@vvfx/gizmo": "0.0.1-alpha.0",
|
|
29
|
+
"@zumer/snapdom": "^2.12.0"
|
|
30
|
+
},
|
|
31
|
+
"contributors": [
|
|
32
|
+
{
|
|
33
|
+
"name": "赤芍"
|
|
34
|
+
},
|
|
35
|
+
{
|
|
36
|
+
"name": "何即"
|
|
37
|
+
},
|
|
38
|
+
{
|
|
39
|
+
"name": "不择"
|
|
40
|
+
},
|
|
41
|
+
{
|
|
42
|
+
"name": "意绮"
|
|
43
|
+
}
|
|
44
|
+
],
|
|
45
|
+
"author": "Ant Group CO., Ltd.",
|
|
46
|
+
"license": "MIT",
|
|
47
|
+
"publishConfig": {
|
|
48
|
+
"access": "public",
|
|
49
|
+
"registry": "https://registry.npmjs.org"
|
|
50
|
+
},
|
|
51
|
+
"devDependencies": {
|
|
52
|
+
"jsdom": "^29.1.1"
|
|
53
|
+
},
|
|
54
|
+
"scripts": {
|
|
55
|
+
"prebuild": "pnpm clean",
|
|
56
|
+
"build": "pnpm build:declaration && pnpm build:module",
|
|
57
|
+
"build:module": "rollup -c --bundleConfigAsCjs",
|
|
58
|
+
"build:declaration": "tsc -p tsconfig.external.json",
|
|
59
|
+
"clean": "rimraf --glob dist *.tsbuildinfo",
|
|
60
|
+
"test": "vitest run",
|
|
61
|
+
"test:release": "vitest run --config vitest.release.config.ts",
|
|
62
|
+
"test:ui": "node tests/ui/test-server.mjs",
|
|
63
|
+
"verify:gizmo-package": "node scripts/verify-gizmo-package.mjs",
|
|
64
|
+
"verify:publish": "pnpm verify:gizmo-package && pnpm test && pnpm test:release && pnpm build"
|
|
65
|
+
}
|
|
66
|
+
}
|