Skip to content

Z
zeroing-editor
Commit 6bf68338 authored by rockyl's avatar rockyl
Browse files
Options

放假前提交一波

parent aa38e101
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 10 deletions
public/index.html
View file @ 6bf68338
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<title>烽火台</title> <title>烽火台</title>
<script src="//yun.duiba.com.cn/js-libs/psd.js/3.2.0/psd.min.js"></script> <script src="//yun.duiba.com.cn/js-libs/psd.js/3.2.0/psd.min.js"></script>
<!-- <script src="http://0.0.0.0:4002/debug/engine.js"></script>--> <!--<script src="http://0.0.0.0:4002/debug/engine.js"></script>-->
<script src="//yun.duiba.com.cn/editor/zeroing/libs/engine.cfb1f45ea0206b8e50e55213f624e81d67432f81.js"></script> <script src="//yun.duiba.com.cn/editor/zeroing/libs/engine.da36f120e2f6937ed9812bb9538770e4505478d9.js"></script>
<script src="//yun.duiba.com.cn/editor/zeroing/libs/svga.469e6ae1d98c9017953cf9375559c2575b293b59.js"></script> <script src="//yun.duiba.com.cn/editor/zeroing/libs/svga.469e6ae1d98c9017953cf9375559c2575b293b59.js"></script>
</head> </head>
<body> <body>
......
src/components/inputs/NumberInput.vue
View file @ 6bf68338
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
} else { } else {
this.isPercent = typeof v === 'string'; this.isPercent = typeof v === 'string';
if (typeof v === 'string') { if (typeof v === 'string') {
v = parseInt(v); v = parseFloat(v);
} }
this.editValue = v; this.editValue = v;
} }
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
value = v + '%'; value = v + '%';
} }
} else { } else {
value = parseInt(v); value = parseFloat(v);
} }
this.$emit('input', value, this.container, this.propertyName, this.value); this.$emit('input', value, this.container, this.propertyName, this.value);
//} //}
......
src/store/modules/project.js
View file @ 6bf68338
...@@ -938,7 +938,7 @@ export const projectStore = { ...@@ -938,7 +938,7 @@ export const projectStore = {
if (action === 1 || action === 2) { //普通视图 if (action === 1 || action === 2) { //普通视图
result = await zipViewFile(file); result = await zipViewFile(file);
} else { //psd } else { //psd
result = await toZeroing(file, {mode}); result = await toZeroing(file, {mode, singleView: action === 3});
} }
let viewFile = new File([result], 'view.json'); let viewFile = new File([result], 'view.json');
await dispatch('uploadView', {originFile: file, viewFile, action}) await dispatch('uploadView', {originFile: file, viewFile, action})
......
src/views/Editor/Inspector/PropsTab.vue
View file @ 6bf68338
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
</el-collapse-item> </el-collapse-item>
<el-collapse-item :title="$t('Function cmd') + `(${customCmdKeys.length})`" name="cmd"> <el-collapse-item :title="$t('Function cmd') + `(${customCmdKeys.length})`" name="cmd">
<el-form-item v-for="key in customCmdKeys" :label="customCmdNames[key]" :key="key" label-width="50px"> <el-form-item v-for="key in customCmdKeys" :label="customCmdNames[key]" :key="key" label-width="50px">
<el-input class="cmd-input" v-model="activeComponent.properties[key]" @change="makeProjectDirty"/>
<el-popconfirm :title="$t('Are you sure to delete this cmd?')" @onConfirm="deleteCmd(key)"> <el-popconfirm :title="$t('Are you sure to delete this cmd?')" @onConfirm="deleteCmd(key)">
<el-button slot="reference" plain icon="el-icon-delete"/> <el-button slot="reference" plain icon="el-icon-delete"/>
</el-popconfirm> </el-popconfirm>
......
src/views/Editor/components/RuntimeLayer.vue
View file @ 6bf68338
...@@ -52,7 +52,8 @@ ...@@ -52,7 +52,8 @@
entrySceneView: 'entry', entrySceneView: 'entry',
editorMode: true, editorMode: true,
assetResolver: this.assetResolver, assetResolver: this.assetResolver,
frameRate: 30, frameRate: 15,
rendererType: 'canvas',
}, },
}, null, () => { }, null, () => {
this.onLaunched(); this.onLaunched();
......
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