buri/live2d
1
0
Fork 0
mirror of https://github.com/Buriburizaem0n/live2d.git synced 2025-12-15 07:31:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow 2 load method at same time

Browse Source
This commit is contained in:
Buriburi
2024-09-20 10:03:54 +02:00
parent a876a6226e
commit 100a523c77
4 changed files with 74 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
live2d/<!-- 宠物播放器 -->
View File

@@ -1,67 +0,0 @@
<!-- 宠物播放器 -->
<script src="https://cdn.jsdelivr.net/npm/live2dcubismcore@1.0.2/live2dcubismcore.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/pixi-live2d-display/dist/index.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/pixi.js@7.x/dist/pixi.min.js"></script>
<script>
const live2d_path = "https://www.luoyangdonghui.de/wp-content/uploads/live2d_test16/live2d/";
</script>
<meting-js server="netease" type="playlist" id="2142063878" theme="#339981" fixed="true" preload="none" autoplay="false" loop="all" volume="0.3" order="random" mutex="true"></meting-js>;
<script>
// 封装异步加载资源的方法
function loadExternalResource(url, type, scriptType = null) {
return new Promise((resolve, reject) => {
let tag;
if (type === "css") {
tag = document.createElement("link");
tag.rel = "stylesheet";
tag.href = url;
tag.type = "text/css"; // 添加 CSS 类型
} else if (type === "js") {
tag = document.createElement("script");
tag.src = url;
// 如果 scriptType 存在，则为 <script> 添加 type 属性
if (scriptType) {
tag.type = scriptType; // 如 "module" 或 "text/javascript"
}
}
tag.onload = () => resolve(url);
tag.onerror = () => reject(new Error(`Failed to load resource: ${url}`));
// 将标签追加到 <head> 中
document.head.appendChild(tag);
});
}
// 手机和电脑都加载的音乐播放器相关资源
Promise.all([
loadExternalResource("https://cdn.jsdelivr.net/npm/aplayer/dist/APlayer.min.css", "css"),
loadExternalResource("https://cdn.jsdelivr.net/npm/aplayer/dist/APlayer.min.js", "js"),
]).then(() => {
loadExternalResource("https://cdn.jsdelivr.net/npm/meting@2.0.1/dist/Meting.min.js", "js");
});
ap = null;
Object.defineProperty(document.querySelector('meting-js'), "aplayer", {
set: function(aplayer) {
ap = aplayer;
ap_init();
initWidget();
}
});
// 只有电脑加载Live2D模块
if (screen.width >= 768) {
Promise.all([
loadExternalResource(live2d_path + "waifu.css", "css"),
loadExternalResource(live2d_path + "live2d.min.js", "js"),
loadExternalResource(live2d_path + "waifu-tips.js", "js", "module")
]);
}
</script>

65
live2d/<!--宠物播放器-->
View File

@@ -1,35 +1,56 @@
<!--宠物播放器-->
<script>const live2d_path = "https://cdn.jsdelivr.net/gh/crowya/live2d/live2d/";</script>
<meting-js server="tencent" type="playlist" id="8559460487" theme="#339981" fixed="true" preload="none" autoplay="false" loop="all" order="random" volume="0.3"></meting-js>
<script>
const live2d_path = "https://www.luoyangdonghui.de/wp-content/uploads/live2d_test18/live2d/";
</script>
<meting-js server="netease" type="playlist" id="2142063878" theme="#339981" fixed="true" preload="none" autoplay="false" loop="all" volume="0.3" order="random" mutex="true"></meting-js>;
<script>
//封装异步加载资源的方法
function loadExternalResource(url, type) {
return new Promise((resolve, reject) => {
let tag;
if (type === "css") {
tag = document.createElement("link");
tag.rel = "stylesheet";
tag.href = url;
}
else if (type === "js") {
tag = document.createElement("script");
tag.src = url;
}
if (tag) {
tag.onload = () => resolve(url);
tag.onerror = () => reject(url);
document.head.appendChild(tag);
}
});
return new Promise((resolve, reject) => {
let tag;
if (type === "css") {
tag = document.createElement("link");
tag.rel = "stylesheet";
tag.href = url;
} else if (type === "js") {
tag = document.createElement("script");
tag.src = url;
tag.async = true; // 确保脚本是异步加载的
}
if (tag) {
tag.onload = () => {
resolve(`Resource loaded: ${url}`);
};
tag.onerror = (error) => {
reject(new Error(`Failed to load resource: ${url} - ${error.message}`));
};
// 确保只在没有相同资源的情况下加载，避免重复加载
if (!document.head.querySelector(`[src="${url}"]`) && !document.head.querySelector(`[href="${url}"]`)) {
document.head.appendChild(tag);
} else {
resolve(`Resource already loaded: ${url}`);
}
} else {
reject(new Error(`Invalid resource type: ${type}`));
}
});
}
if (screen.width >= 768) {
Promise.all([
loadExternalResource("https://cdn.jsdelivr.net/gh/crowya/live2d/live2d/waifu.min.css", "css"),
loadExternalResource("https://cdn.jsdelivr.net/gh/crowya/live2d/live2d/live2d.min.js", "js"),
loadExternalResource("https://cdn.jsdelivr.net/gh/crowya/live2d/live2d/waifu-tips.min.js", "js"),
loadExternalResource(live2d_path + "waifu.css", "css"),
loadExternalResource(live2d_path + "live2d.min.js", "js"),
loadExternalResource(live2d_path + "waifu-tips.js", "js"),
loadExternalResource("https://cdn.jsdelivr.net/npm/aplayer/dist/APlayer.min.css", "css"),
loadExternalResource("https://cdn.jsdelivr.net/npm/aplayer/dist/APlayer.min.js", "js"),
loadExternalResource("https://cdn.jsdelivr.net/npm/live2dcubismcore@1.0.2/live2dcubismcore.min.js", "js"),
loadExternalResource("https://cdnjs.cloudflare.com/ajax/libs/pixi.js/6.5.2/browser/pixi.min.js", "js"),
loadExternalResource("https://cdn.jsdelivr.net/npm/pixi-live2d-display@latest/dist/index.min.js", "js"),
]).then(() => {
loadExternalResource("https://cdn.jsdelivr.net/npm/meting@2.0.1/dist/Meting.min.js", "js");
});

52
live2d/<!--宠物播放器-->.lua
View File

@@ -1,52 +0,0 @@
<!--宠物播放器-->
<script src="https://www.luoyangdonghui.de/wp-content/uploads/live2d_test16/live2d/live2d.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/live2dcubismcore@1.0.2/live2dcubismcore.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/pixi-live2d-display@beta/dist/index.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/pixi.js@7.x/dist/pixi.min.js"></script>
<script>
const live2d_path = "https://www.luoyangdonghui.de/wp-content/uploads/live2d_test16/live2d/";
</script>
<meting-js server="netease" type="playlist" id="2142063878" theme="#339981" fixed="true" preload="none" autoplay="false" loop="all" volume="0.3" order="random" mutex="true"></meting-js>;
<script>
//封装异步加载资源的方法
function loadExternalResource(url, type) {
return new Promise((resolve, reject) => {
let tag;
if (type === "css") {
tag = document.createElement("link");
tag.rel = "stylesheet";
tag.href = url;
}
else if (type === "js") {
tag = document.createElement("script");
tag.src = url;
}
if (tag) {
tag.onload = () => resolve(url);
tag.onerror = () => reject(url);
document.head.appendChild(tag);
}
});
}
if (screen.width >= 768) {
Promise.all([
loadExternalResource(live2d_path + "waifu.css", "css"),
loadExternalResource(live2d_path + "live2d.min.js", "js"),
loadExternalResource(live2d_path + "waifu-tips.js", "js"),
loadExternalResource("https://cdn.jsdelivr.net/npm/aplayer/dist/APlayer.min.css", "css"),
loadExternalResource("https://cdn.jsdelivr.net/npm/aplayer/dist/APlayer.min.js", "js"),
]).then(() => {
loadExternalResource("https://cdn.jsdelivr.net/npm/meting@2.0.1/dist/Meting.min.js", "js");
});
ap = null;
Object.defineProperty(document.querySelector('meting-js'), "aplayer", {
set: function(aplayer) {
ap = aplayer;
ap_init();
initWidget();
}
});
}
</script>

34
live2d/waifu-tips.js
View File

@@ -204,15 +204,43 @@ function loadWidget() {
modelList = result;
}
// async function loadModel(modelId, modelTexturesId, message) {
// localStorage.setItem("modelId", modelId);
// localStorage.setItem("modelTexturesId", modelTexturesId);
// showMessage(message, 4000, 10);
// if (!modelList) await loadModelList();
// let target = modelList.models[modelId];
// // loadlive2d("live2d", `${live2d_path}model/${target}/index.json`);
// loadModelPixi("live2d", `${live2d_path}model/${target}/index.json`);
// console.log(`Live2D 模型 ${modelId}-${target} 加载完成`);
// }
async function loadModel(modelId, modelTexturesId, message) {
localStorage.setItem("modelId", modelId);
localStorage.setItem("modelTexturesId", modelTexturesId);
showMessage(message, 4000, 10);
if (!modelList) await loadModelList();
let target = modelList.models[modelId];
// loadlive2d("live2d", `${live2d_path}model/${target}/index.json`);
loadModelPixi("live2d", `${live2d_path}model/${target}/index.json`);
console.log(`Live2D 模型 ${modelId}-${target} 加载完成`);
// 模型路径
const modelPath = `${live2d_path}model/${target}/index.json`;
const modelPathAlt = `${live2d_path}model/${target}/index3.json`;
// 先尝试使用 loadlive2d 加载
try {
await loadlive2d("live2d", modelPath); // 假设 loadlive2d 返回的是 Promise
console.log(`Live2D 模型 ${modelId}-${target} 的 index.json 文件加载完成`);
} catch (error) {
console.error(`加载 Live2D 模型失败: ${error.message}，尝试使用 Pixi 加载模型`);
try {
// 如果 loadlive2d 失败，尝试使用 loadModelPixi 加载 index3.json
await loadModelPixi("live2d", modelPathAlt);
console.log(`Live2D 模型 ${modelId}-${target} 的 index3.json 文件加载完成 (使用 Pixi)`);
} catch (pixiError) {
console.error(`使用 Pixi 加载模型也失败: ${pixiError.message}`);
}
}
}
async function loadNextModel() {