diff --git a/themes/common.js b/themes/common.js
index 68f9f2b3..ab39eac7 100644
--- a/themes/common.js
+++ b/themes/common.js
@@ -831,39 +831,44 @@ function limit_scroll_position() {
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
function loadLive2D() {
- try {
- $("").attr({ href: "file=themes/waifu_plugin/waifu.css", rel: "stylesheet", type: "text/css" }).appendTo('head');
- $('body').append('
');
- $.ajax({
- url: "file=themes/waifu_plugin/waifu-tips.js", dataType: "script", cache: true, success: function () {
- $.ajax({
- url: "file=themes/waifu_plugin/live2d.js", dataType: "script", cache: true, success: function () {
- /* 可直接修改部分参数 */
- live2d_settings['hitokotoAPI'] = "hitokoto.cn"; // 一言 API
- live2d_settings['modelId'] = 3; // 默认模型 ID
- live2d_settings['modelTexturesId'] = 44; // 默认材质 ID
- live2d_settings['modelStorage'] = false; // 不储存模型 ID
- live2d_settings['waifuSize'] = '210x187';
- live2d_settings['waifuTipsSize'] = '187x52';
- live2d_settings['canSwitchModel'] = true;
- live2d_settings['canSwitchTextures'] = true;
- live2d_settings['canSwitchHitokoto'] = false;
- live2d_settings['canTakeScreenshot'] = false;
- live2d_settings['canTurnToHomePage'] = false;
- live2d_settings['canTurnToAboutPage'] = false;
- live2d_settings['showHitokoto'] = false; // 显示一言
- live2d_settings['showF12Status'] = false; // 显示加载状态
- live2d_settings['showF12Message'] = false; // 显示看板娘消息
- live2d_settings['showF12OpenMsg'] = false; // 显示控制台打开提示
- live2d_settings['showCopyMessage'] = false; // 显示 复制内容 提示
- live2d_settings['showWelcomeMessage'] = true; // 显示进入面页欢迎词
- /* 在 initModel 前添加 */
- initModel("file=themes/waifu_plugin/waifu-tips.json");
- }
- });
- }
- });
- } catch (err) { console.log("[Error] JQuery is not defined.") }
+ if (document.querySelector(".waifu") )
+ {
+ $('.waifu').show();
+ } else {
+ try {
+ $("").attr({ href: "file=themes/waifu_plugin/waifu.css", rel: "stylesheet", type: "text/css" }).appendTo('head');
+ $('body').append('');
+ $.ajax({
+ url: "file=themes/waifu_plugin/waifu-tips.js", dataType: "script", cache: true, success: function () {
+ $.ajax({
+ url: "file=themes/waifu_plugin/live2d.js", dataType: "script", cache: true, success: function () {
+ /* 可直接修改部分参数 */
+ live2d_settings['hitokotoAPI'] = "hitokoto.cn"; // 一言 API
+ live2d_settings['modelId'] = 3; // 默认模型 ID
+ live2d_settings['modelTexturesId'] = 44; // 默认材质 ID
+ live2d_settings['modelStorage'] = false; // 不储存模型 ID
+ live2d_settings['waifuSize'] = '210x187';
+ live2d_settings['waifuTipsSize'] = '187x52';
+ live2d_settings['canSwitchModel'] = true;
+ live2d_settings['canSwitchTextures'] = true;
+ live2d_settings['canSwitchHitokoto'] = false;
+ live2d_settings['canTakeScreenshot'] = false;
+ live2d_settings['canTurnToHomePage'] = false;
+ live2d_settings['canTurnToAboutPage'] = false;
+ live2d_settings['showHitokoto'] = false; // 显示一言
+ live2d_settings['showF12Status'] = false; // 显示加载状态
+ live2d_settings['showF12Message'] = false; // 显示看板娘消息
+ live2d_settings['showF12OpenMsg'] = false; // 显示控制台打开提示
+ live2d_settings['showCopyMessage'] = false; // 显示 复制内容 提示
+ live2d_settings['showWelcomeMessage'] = true; // 显示进入面页欢迎词
+ /* 在 initModel 前添加 */
+ initModel("file=themes/waifu_plugin/waifu-tips.json");
+ }
+ });
+ }
+ });
+ } catch (err) { console.log("[Error] JQuery is not defined.") }
+ }
}
diff --git a/themes/gui_advanced_plugin_class.py b/themes/gui_advanced_plugin_class.py
index c2ac6e79..65332e10 100644
--- a/themes/gui_advanced_plugin_class.py
+++ b/themes/gui_advanced_plugin_class.py
@@ -41,6 +41,8 @@ def define_gui_advanced_plugin_class(plugins):
arg_confirm.update({arg_name: str(usr_confirmed_arg_dict[arg_name]['user_confirmed_value'])})
plugin_obj = plugins[which_plugin]["Class"]
arguments['plugin_advanced_arg'] = arg_confirm
+ if arg_confirm.get('main_input', None) is not None:
+ arguments['txt'] = arg_confirm['main_input']
yield from ArgsGeneralWrapper(plugin_obj.execute)(request, *arguments.values())
return invisible_callback_btn_for_plugin_exe, route_switchy_bt_with_arg, usr_confirmed_arg
diff --git a/themes/waifu_plugin/waifu-tips.js b/themes/waifu_plugin/waifu-tips.js
index 6e25682c..56431722 100644
--- a/themes/waifu_plugin/waifu-tips.js
+++ b/themes/waifu_plugin/waifu-tips.js
@@ -142,7 +142,13 @@ function initModel(waifuPath, type) {
if (live2d_settings.waifuEdgeSide[0] == 'left') $(".waifu").css("left",live2d_settings.waifuEdgeSide[1]+'px');
else if (live2d_settings.waifuEdgeSide[0] == 'right') $(".waifu").css("right",live2d_settings.waifuEdgeSide[1]+'px');
- window.waifuResize = function() { $(window).width() <= Number(live2d_settings.waifuMinWidth.replace('px','')) ? $(".waifu").hide() : $(".waifu").show(); };
+ window.waifuResize = function() {
+ console.log('resize');
+ if ($('.waifu')[0].style.display === "none" ){
+ } else{
+ $(window).width() <= Number(live2d_settings.waifuMinWidth.replace('px','')) ? $(".waifu").hide() : $(".waifu").show();
+ }
+ };
if (live2d_settings.waifuMinWidth != 'disable') { waifuResize(); $(window).resize(function() {waifuResize()}); }
try {