diff --git a/index.html b/index.html index 6338fcd..5511258 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ - Metavatar-PC-Admin + Metavatar-PC diff --git a/src/views/createVideo/index.vue b/src/views/createVideo/index.vue index 99a6def..b3f0b73 100644 --- a/src/views/createVideo/index.vue +++ b/src/views/createVideo/index.vue @@ -2095,28 +2095,28 @@ const rotationStartAngle = ref(0); //旋转中间件 const SubtitlesAngle = ref(20); //旋转度数 const imgWitdt=ref(0); //图片宽度 const imgHeight=ref(0); //图片高度 -const SubtitlesColor = ref('#ff0000'); // 字幕字色 +const SubtitlesColor = ref('#FFFFFF'); // 字幕字色 // const SubtitlesColorBGRA = ref(rgbaToBgra(SubtitlesColor.value)); // 字幕字色 const SubtitlesBgc = ref('rgba(0,0,0,0)'); // 字幕背景色 // const SubtitlesBgcBGRA = ref(rgbaToBgra(SubtitlesBgc.value)); // 字幕背景色 // 调色板 const colorList = [ '#FFFFFF', - '#8080FF', + '#FF8080', '#000000', - '#80FFFF', - '#0000FF', - '#FF8000', - '#00FFFF', - '#80FF00', + '#FF80FF', '#FF0000', - '#00FF00', - '#008000', + '#00FF80', '#FF00FF', '#0080FF', - '#8000FF', + '#00FF00', + '#0000FF', + '#000080', + '#FFFF00', '#FF0080', - '#FFFF00' + '#FF8000', + '#80FF00', + '#00FFFF' ]; const fontFamilyList = [ {label:"仿宋",value:"仿宋"}, @@ -2159,16 +2159,16 @@ function rgbaToBgra(hexColor) { const green = hexColor.substring(2, 4); const blue = hexColor.substring(4, 6); // 组合为新的颜色字符串 - const convertedColor = `&H${red}${green}${blue}`; + const convertedColor = `&H${blue}${green}${red}`; return convertedColor; } function BgraToRgba(hexColor) { // 去除颜色前缀 hexColor = hexColor.replace("&H", ""); // 分割颜色分量 - const red = hexColor.substring(0, 2); + const blue = hexColor.substring(0, 2); const green = hexColor.substring(2, 4); - const blue = hexColor.substring(4, 6); + const red = hexColor.substring(4, 6); // 组合为新的颜色字符串 const convertedColor = `#${red}${green}${blue}`; return convertedColor;