Update 2 files

- /_layouts/default.html
- /_data/proxylist.yml

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,10 @@
+<!-- 欢迎提交PR！如果是修复 BUG 或 typo ，可直接删除此模板。若是添加友链，请确认满足以下条件（将 [ ] 替换为 [x] 打勾）： -->
+
+- [ ] 这个 PR 是关于添加Links的
+- [ ] 我在申请之前加上了[贵站](https://mabbs.github.io)友链
+- [ ] 我的网站 **全站启用 HTTPS**
+- [ ] 我的博客满足： **原创文章比例>80%，数量>10** 的要求
+- [ ] 我的网站满足 **站点稳定，不弃坑** 的要求
+- [ ] 我的链接列表不需要客户端渲染 <!-- 如有请在下方列出合理原因 -->
+
+我的网站是： <!-- 例如：https://example.com -->

.gitlab-ci.yml

@@ -6,14 +6,14 @@
 
 # Template project: https://gitlab.com/pages/jekyll
 # Docs: https://docs.gitlab.com/ee/pages/
-image: ruby:2.6
+image: ruby:2.7
 
 variables:
   JEKYLL_ENV: production
   LC_ALL: C.UTF-8
 
 before_script:
-  - gem install bundler
+  - gem install bundler -v 2.4.22
   - bundle install
 
 pages:

404.md

@@ -2,5 +2,13 @@
 layout: default
 title: 404 - 找不到页面
 ---
+
 # 找不到页面
   你访问的资源 <code><script>document.write(window.location.pathname)</script></code> 不存在或者可能已经被永久移除。
+
+  或者看看近期的其他文章？
+
+  {% for post in site.posts limit:10 %}
+  - {{ post.date | date: "%Y/%m/%d" }} - [{{ post.title }}{% if post.layout == "encrypt" %} [加密] {% endif %}]({{ post.url }})    
+
+  {% endfor %}

5b60338bca964816af2f0b76965a1b84.txt

@@ -0,0 +1 @@
+5b60338bca964816af2f0b76965a1b84

BingSiteAuth.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<users>
-	<user>0ADFCE64B3557DC4DC5F2DC224C5FDDD</user>
-</users>

BlogCard.svg

@@ -105,31 +105,31 @@
     <g class="stagger" style="animation-delay: 450ms" transform="translate(25, 0)">
       <line x1="12" y1="6.25" x2="19" y2="6.25"
 style="stroke:rgb(255,255,255);stroke-width:2"/>
-      <text class="stat bold" x="25" y="12.5">{{ site.posts[0].title }}</text>
+      <text class="stat bold" x="25" y="12.5">{{ site.posts[0].title | truncate: 18 }}</text>
     </g>
   </g><g transform="translate(0, 25)">
     <g class="stagger" style="animation-delay: 600ms" transform="translate(25, 0)">
       <line x1="12" y1="6.25" x2="19" y2="6.25"
 style="stroke:rgb(255,255,255);stroke-width:2"/>
-      <text class="stat bold" x="25" y="12.5">{{ site.posts[1].title }}</text>
+      <text class="stat bold" x="25" y="12.5">{{ site.posts[1].title | truncate: 18 }}</text>
     </g>
   </g><g transform="translate(0, 50)">
     <g class="stagger" style="animation-delay: 750ms" transform="translate(25, 0)">
       <line x1="12" y1="6.25" x2="19" y2="6.25"
 style="stroke:rgb(255,255,255);stroke-width:2"/>
-      <text class="stat bold" x="25" y="12.5">{{ site.posts[2].title }}</text>
+      <text class="stat bold" x="25" y="12.5">{{ site.posts[2].title | truncate: 18 }}</text>
     </g>
   </g><g transform="translate(0, 75)">
     <g class="stagger" style="animation-delay: 900ms" transform="translate(25, 0)">
       <line x1="12" y1="6.25" x2="19" y2="6.25"
 style="stroke:rgb(255,255,255);stroke-width:2"/>
-      <text class="stat bold" x="25" y="12.5">{{ site.posts[3].title }}</text>
+      <text class="stat bold" x="25" y="12.5">{{ site.posts[3].title | truncate: 18 }}</text>
     </g>
   </g><g transform="translate(0, 100)">
     <g class="stagger" style="animation-delay: 1050ms" transform="translate(25, 0)">
       <line x1="12" y1="6.25" x2="19" y2="6.25"
 style="stroke:rgb(255,255,255);stroke-width:2"/>
-      <text class="stat bold" x="25" y="12.5">{{ site.posts[4].title }}</text>
+      <text class="stat bold" x="25" y="12.5">{{ site.posts[4].title | truncate: 18 }}</text>
     </g>
   </g>
     </svg> 

Gemfile

@@ -1,11 +1,17 @@
 source "https://rubygems.org"
-gem "jekyll", "~> 4.1.0"
+gem "jekyll", "~> 3.9.3"
 group :jekyll_plugins do
-  gem "jekyll-gist"
+  gem "jekyll-gist", "~> 1.5.0"
-  gem "jekyll-coffeescript"
+  gem "jekyll-coffeescript", "~> 1.1.1"
-  gem "jekyll-assets"
+  gem "jekyll-assets", "~> 1.0.0"
-  gem "jekyll-sitemap"
+  gem "jekyll-sitemap", "~> 1.4.0"
-  gem "jekyll-feed"
+  gem "jekyll-feed", "~> 0.15.1"
+  gem "jekyll-include-cache", "~> 0.2.1"
+  gem "jekyll-readme-index", "~> 0.3.0"
+  gem "jekyll-default-layout", "~> 0.1.5"
+  gem "jekyll-titles-from-headings", "~> 0.5.3"
   gem "jekyll-theme-minimal"
-  gem "jekyll-paginate"
+  gem "jekyll-paginate", "~> 1.1.0"
+  gem "kramdown-parser-gfm", "~> 1.1.0"
+  gem "kramdown", "~> 2.3.2"
 end

Live2dHistoire/README.md

@@ -1,4 +1,5 @@
 # Live2d的看板娘——伊斯特瓦尔(Histoire) 
+[Original Repo](https://github.com/eeg1412/Live2dHistoire)
 #### 可用于网页端显示Live2D版的伊斯特瓦尔(Histoire) emlog插件版可以看这里：[传送门](https://www.wikimoe.com/?post=75)
 #### 基于[《给博客添加能动的看板娘(Live2D)-将其添加到网页上吧》](https://imjad.cn/archives/lab/add-dynamic-poster-girl-with-live2d-to-your-blog-02)上的源码进行修改。
 #### 在原先的基础上加上了如下功能：
@@ -93,9 +94,6 @@ var talkAPI = "";//如果有类似图灵机器人的聊天接口请填写接口
 注意路径别弄错了噢 ~  
 PHP 程序推荐使用主题函数获取绝对路径。
 
-### 效果预览
-![](https://t1.aixinxi.net/o_1c3mofql9osmpeb1hfvsbv1hqua.gif-j.jpg)  
-
 	
 ### 模型说明
 本插件仅供学习和交流使用，禁止用于商业用途。

Live2dHistoire/demo.html

@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-	<title>Live2D！</title>
-    <link rel="stylesheet" href="live2d/css/live2d.css" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-</head>
-<body>
-<div id="landlord" style="left:5px;bottom:0px;">
-    <div class="message" style="opacity:0"></div>
-    <canvas id="live2d" width="500" height="560" class="live2d"></canvas>
-    <div class="live_talk_input_body">
-    	<div class="live_talk_input_name_body">
-        	<input name="name" type="text" class="live_talk_name white_input" id="AIuserName" autocomplete="off" placeholder="你的名字" />
-        </div>
-        <div class="live_talk_input_text_body">
-        	<input name="talk" type="text" class="live_talk_talk white_input" id="AIuserText" autocomplete="off" placeholder="要和我聊什么呀？"/>
-            <button type="button" class="live_talk_send_btn" id="talk_send">发送</button>
-        </div>
-    </div>
-    <input name="live_talk" id="live_talk" value="1" type="hidden" />
-    <div class="live_ico_box">
-    	<div class="live_ico_item type_info" id="showInfoBtn"></div>
-    	<div class="live_ico_item type_talk" id="showTalkBtn"></div>
-        <div class="live_ico_item type_music" id="musicButton"></div>
-        <div class="live_ico_item type_youdu" id="youduButton"></div>
-        <div class="live_ico_item type_quit" id="hideButton"></div>
-        <input name="live_statu_val" id="live_statu_val" value="0" type="hidden" />
-        <audio src="" style="display:none;" id="live2d_bgm" data-bgm="0" preload="none"></audio>
-        <input name="live2dBGM" value="https://t1.aixinxi.net/o_1c52p4qbp15idv6bl55h381moha.mp3" type="hidden">
-        <input name="live2dBGM" value="https://t1.aixinxi.net/o_1c52p8frrlmf1aled1e14m56una.mp3" type="hidden">
-        <input id="duType" value="douqilai,l2d_caihong" type="hidden">
-    </div>
-</div>
-<div id="open_live2d">召唤伊斯特瓦尔</div>
-<script type="text/javascript" src="https://apps.bdimg.com/libs/jquery/1.7.1/jquery.min.js"></script>
-<script>
-var message_Path = '/histoire/live2d/';//资源目录，如果目录不对请更改
-var talkAPI = "";//如果有类似图灵机器人的聊天接口请填写接口路径
-</script>
-<script type="text/javascript" src="live2d/js/live2d.js"></script>
-<script type="text/javascript" src="live2d/js/message.js"></script>
-</body>
-</html>

Live2dHistoire/live2d/css/live2d.css

@@ -79,7 +79,7 @@
     background-color: rgba(74, 59, 114,0.9);
 }
 .live_talk_input_name_body{
-	width:70px;
+	width:100px;
 	box-sizing:border-box;
 	height:24px;
 	border: 2px solid rgb(223, 179, 241);

Live2dHistoire/live2d/js/message.js

@@ -1,35 +1,33 @@
-var home_Path = document.location.protocol +'//' + window.document.location.hostname +'/';
-
 var userAgent = window.navigator.userAgent.toLowerCase();
 console.log(userAgent);
-var norunAI = [ "android", "iphone", "ipod", "ipad", "windows phone"];
+var norunAI = ["android", "iphone", "ipod", "ipad", "windows phone"];
 var norunFlag = false;
 
 
-for(var i=0;i<norunAI.length;i++){
+for (var i = 0; i < norunAI.length; i++) {
-	if(userAgent.indexOf(norunAI[i]) > -1){
+	if (userAgent.indexOf(norunAI[i]) > -1) {
 		norunFlag = true;
 		break;
 	}
 }
 
-if(!window.WebGLRenderingContext){
+if (!window.WebGLRenderingContext) {
 	norunFlag = true;
 }
 
-if(!norunFlag){
+if (!norunFlag) {
 	var hitFlag = false;
 	var AIFadeFlag = false;
 	var liveTlakTimer = null;
 	var sleepTimer_ = null;
 	var AITalkFlag = false;
 	var talkNum = 0;
-	(function (){
+	(function () {
 		function renderTip(template, context) {
 			var tokenReg = /(\\)?\{([^\{\}\\]+)(\\)?\}/g;
 			return template.replace(tokenReg, function (word, slash1, token, slash2) {
 				if (slash1 || slash2) {
-					return word.replace('\\', '');
+					return word.replace(/\\/g, '');
 				}
 				var variables = token.replace(/\s/g, '').split('.');
 				var currentObject = context;
@@ -48,60 +46,61 @@ if(!norunFlag){
 		};
 
 		var re = /x/;
-		re.toString = function() {
+		console.log(re);
+		re.toString = function () {
 			showMessage('哈哈，你打开了控制台，是想要看看我的秘密吗？', 5000);
 			return '';
 		};
 
-		$(document).on('copy', function (){
+		$(document).on('copy', function () {
 			showMessage('你都复制了些什么呀，转载要记得加上出处哦~~', 5000);
 		});
 
-		function initTips(){
+		function initTips() {
 			$.ajax({
 				cache: true,
-				url: message_Path+'message.json',
+				url: message_Path + 'message.json',
 				dataType: "json",
-				success: function (result){
+				success: function (result) {
-					$.each(result.mouseover, function (index, tips){
+					$.each(result.mouseover, function (index, tips) {
-						$(tips.selector).mouseover(function (){
+						$(tips.selector).mouseover(function () {
 							var text = tips.text;
-							if(Array.isArray(tips.text)) text = tips.text[Math.floor(Math.random() * tips.text.length + 1)-1];
+							if (Array.isArray(tips.text)) text = tips.text[Math.floor(Math.random() * tips.text.length + 1) - 1];
-							text = text.renderTip({text: $(this).text()});
+							text = text.renderTip({ text: $(this).text() });
 							showMessage(text, 3000);
 							talkValTimer();
 							clearInterval(liveTlakTimer);
 							liveTlakTimer = null;
 						});
-						$(tips.selector).mouseout(function (){
+						$(tips.selector).mouseout(function () {
 							showHitokoto();
-							if(liveTlakTimer == null){
+							if (liveTlakTimer == null) {
-								liveTlakTimer = window.setInterval(function(){
+								liveTlakTimer = window.setInterval(function () {
 									showHitokoto();
-								},15000);
+								}, 15000);
 							};
 						});
 					});
-					$.each(result.click, function (index, tips){
+					$.each(result.click, function (index, tips) {
-						$(tips.selector).click(function (){
+						$(tips.selector).click(function () {
-							if(hitFlag){
+							if (hitFlag) {
 								return false
 							}
 							hitFlag = true;
-							setTimeout(function(){
+							setTimeout(function () {
 								hitFlag = false;
-							},8000);
+							}, 8000);
 							var text = tips.text;
-							if(Array.isArray(tips.text)) text = tips.text[Math.floor(Math.random() * tips.text.length + 1)-1];
+							if (Array.isArray(tips.text)) text = tips.text[Math.floor(Math.random() * tips.text.length + 1) - 1];
-							text = text.renderTip({text: $(this).text()});
+							text = text.renderTip({ text: $(this).text() });
 							showMessage(text, 3000);
 						});
 						clearInterval(liveTlakTimer);
 						liveTlakTimer = null;
-						if(liveTlakTimer == null){
+						if (liveTlakTimer == null) {
-							liveTlakTimer = window.setInterval(function(){
+							liveTlakTimer = window.setInterval(function () {
 								showHitokoto();
-							},15000);
+							}, 15000);
 						};
 					});
 				}
@@ -110,20 +109,20 @@ if(!norunFlag){
 		initTips();
 
 		var text;
-		if(document.referrer !== '' && document.referrer.split('/')[2] !== window.location.host ){
+		if (document.referrer !== '' && document.referrer.split('/')[2] !== window.location.host) {
 			var referrer = document.createElement('a');
 			referrer.href = document.referrer;
 			text = '嗨！来自 <span style="color:#0099cc;">' + referrer.hostname + '</span> 的朋友！';
 			var domain = referrer.hostname.split('.')[1];
 			if (domain == 'baidu') {
 				text = '嗨！ 来自 百度搜索 的朋友！<br>欢迎访问<span style="color:#0099cc;">「 ' + document.title.split(' | ')[0] + ' 」</span>';
-			}else if (domain == 'so') {
+			} else if (domain == 'so') {
 				text = '嗨！ 来自 360搜索 的朋友！<br>欢迎访问<span style="color:#0099cc;">「 ' + document.title.split(' | ')[0] + ' 」</span>';
-			}else if (domain == 'google') {
+			} else if (domain == 'google') {
 				text = '嗨！ 来自 谷歌搜索 的朋友！<br>欢迎访问<span style="color:#0099cc;">「 ' + document.title.split(' | ')[0] + ' 」</span>';
 			}
-		}else {
+		} else {
-			if (window.location.href == home_Path) { //主页URL判断，需要斜杠结尾
+			if (window.location.pathname == "/") { //主页URL判断，需要斜杠结尾
 				var now = (new Date()).getHours();
 				if (now > 23 || now <= 5) {
 					text = '你是夜猫子呀？这么晚还不睡觉，明天起的来嘛？';
@@ -144,114 +143,139 @@ if(!norunFlag){
 				} else {
 					text = '嗨~ 快来逗我玩吧！';
 				}
-			}else {
+			} else {
 				text = '欢迎阅读<span style="color:#0099cc;">「 ' + document.title.split(' | ')[0] + ' 」</span>';
 			}
 		}
 		showMessage(text, 12000);
 	})();
 
-	liveTlakTimer = setInterval(function(){
+	liveTlakTimer = setInterval(function () {
 		showHitokoto();
-	},15000);
+	}, 15000);
 
-	function showHitokoto(){
+	function showHitokoto() {
-		if(sessionStorage.getItem("Sleepy")!=="1"){
+		if (sessionStorage.getItem("Sleepy") !== "1") {
-			if(!AITalkFlag){
+			if (!AITalkFlag) {
-				$.getJSON('https://v1.hitokoto.cn/',function(result){
+				$.getJSON('https://hitokoto.mayx.eu.org/', function (result) {
 					talkValTimer();
 					showMessage(result.hitokoto, 0);
 				});
 			}
-		}else{
+		} else {
 			hideMessage(0);
-			if(sleepTimer_==null){
+			if (sleepTimer_ == null) {
-				sleepTimer_ = setInterval(function(){
+				sleepTimer_ = setInterval(function () {
 					checkSleep();
-				},200);
+				}, 200);
 			}
 			console.log(sleepTimer_);
 		}
 	}
 
-	function checkSleep(){
+	function checkSleep() {
 		var sleepStatu = sessionStorage.getItem("Sleepy");
-		if(sleepStatu!=='1'){
+		if (sleepStatu !== '1') {
 			talkValTimer();
 			showMessage('你回来啦~', 0);
 			clearInterval(sleepTimer_);
-			sleepTimer_= null;
+			sleepTimer_ = null;
 		}
 	}
 
-	function showMessage(text, timeout){
+	function showMessage(text, timeout) {
-		if(Array.isArray(text)) text = text[Math.floor(Math.random() * text.length + 1)-1];
+		if (Array.isArray(text)) text = text[Math.floor(Math.random() * text.length + 1) - 1];
 		//console.log('showMessage', text);
 		$('.message').stop();
-		$('.message').html(text);
+		if (typeof EventSource !== 'undefined' && text instanceof EventSource) {
+			var outputContainer = $('.message')[0];
+			var eventFlag = false;
+			text.onmessage = function (event) {
+				if (event.data == "[DONE]") {
+					text.close();
+					return;
+				} else {
+					if (!eventFlag) {
+						talkValTimer();
+						outputContainer.textContent = "";
+						eventFlag = true;
+					}
+					var data = JSON.parse(event.data);
+					outputContainer.textContent += data.response;
+				}
+			}
+		} else {
+			$('.message').html(text);
+		}
 		$('.message').fadeTo(200, 1);
 		//if (timeout === null) timeout = 5000;
 		//hideMessage(timeout);
 	}
-	function talkValTimer(){
+	function talkValTimer() {
 		$('#live_talk').val('1');
 	}
 
-	function hideMessage(timeout){
+	function hideMessage(timeout) {
 		//$('.message').stop().css('opacity',1);
 		if (timeout === null) timeout = 5000;
 		$('.message').delay(timeout).fadeTo(200, 0);
 	}
 
-	function initLive2d (){
+	function initLive2d() {
-		$('#hideButton').on('click', function(){
+		$("#landlord").mouseenter(function () {
-			if(AIFadeFlag){
+			$(".live_ico_box").fadeIn();
+		});
+		$("#landlord").mouseleave(function () {
+			$(".live_ico_box").fadeOut();
+		});
+		$('#hideButton').on('click', function () {
+			if (AIFadeFlag) {
 				return false;
-			}else{
+			} else {
 				AIFadeFlag = true;
 				localStorage.setItem("live2dhidden", "0");
 				$('#landlord').fadeOut(200);
 				$('#open_live2d').delay(200).fadeIn(200);
-				setTimeout(function(){
+				setTimeout(function () {
 					AIFadeFlag = false;
-				},300);
+				}, 300);
 			}
 		});
-		$('#open_live2d').on('click', function(){
+		$('#open_live2d').on('click', function () {
-			if(AIFadeFlag){
+			if (AIFadeFlag) {
 				return false;
-			}else{
+			} else {
 				AIFadeFlag = true;
 				localStorage.setItem("live2dhidden", "1");
 				$('#open_live2d').fadeOut(200);
 				$('#landlord').delay(200).fadeIn(200);
-				setTimeout(function(){
+				setTimeout(function () {
 					AIFadeFlag = false;
-				},300);
+				}, 300);
 			}
 		});
-		$('#youduButton').on('click',function(){
+		$('#youduButton').on('click', function () {
-			if($('#youduButton').hasClass('doudong')){
+			if ($('#youduButton').hasClass('doudong')) {
 				var typeIs = $('#youduButton').attr('data-type');
 				$('#youduButton').removeClass('doudong');
 				$('body').removeClass(typeIs);
-				$('#youduButton').attr('data-type','');
+				$('#youduButton').attr('data-type', '');
-			}else{
+			} else {
 				var duType = $('#duType').val();
 				var duArr = duType.split(",");
 				var dataType = duArr[Math.floor(Math.random() * duArr.length)];
 
 				$('#youduButton').addClass('doudong');
-				$('#youduButton').attr('data-type',dataType);
+				$('#youduButton').attr('data-type', dataType);
 				$('body').addClass(dataType);
 			}
 		});
-		if(talkAPI!==""){
+		if (talkAPI !== "" && typeof EventSource !== 'undefined') {
-			$('#showInfoBtn').on('click',function(){
+			$('#showInfoBtn').on('click', function () {
 				var live_statu = $('#live_statu_val').val();
-				if(live_statu=="0"){
+				if (live_statu == "0") {
 					return
-				}else{
+				} else {
 					$('#live_statu_val').val("0");
 					$('.live_talk_input_body').fadeOut(500);
 					AITalkFlag = false;
@@ -260,11 +284,11 @@ if(!norunFlag){
 					$('#showInfoBtn').hide();
 				}
 			});
-			$('#showTalkBtn').on('click',function(){
+			$('#showTalkBtn').on('click', function () {
 				var live_statu = $('#live_statu_val').val();
-				if(live_statu=="1"){
+				if (live_statu == "1") {
 					return
-				}else{
+				} else {
 					$('#live_statu_val').val("1");
 					$('.live_talk_input_body').fadeIn(500);
 					AITalkFlag = true;
@@ -273,126 +297,40 @@ if(!norunFlag){
 
 				}
 			});
-			$('#talk_send').on('click',function(){
+			$('#live_talk_input_form').on('submit', function (e) {
+				e.preventDefault();
 				var info_ = $('#AIuserText').val();
-				var userid_ = $('#AIuserName').val();
+				// var userid_ = $('#AIuserName').val();
-				if(info_ == "" ){
+				let add_id = "";
-					showMessage('写点什么吧！',0);
+				if ($('#load_this').prop("checked")) {
-					return;
+					add_id = "&id=" + encodeURIComponent($('#post_id').val());
 				}
-				if(userid_ == ""){
+				if (info_ == "") {
-					showMessage('聊之前请告诉我你的名字吧！',0);
+					showMessage('写点什么吧！', 0);
 					return;
 				}
 				showMessage('思考中~', 0);
-				$.ajax({
+				showMessage(new EventSource(talkAPI + "?info=" + encodeURIComponent(info_) + add_id));
-					type: 'POST',
-					url: talkAPI,
-					data: {
-						"info":info_,
-						"userid":userid_
-					},
-					success: function(res) {
-						if(res.code !== 100000){
-							talkValTimer();
-							showMessage('似乎有什么错误，请和站长联系！',0);
-						}else{
-							talkValTimer();
-							showMessage(res.text,0);
-						}
-						console.log(res);
-						$('#AIuserText').val("");
-						sessionStorage.setItem("live2duser", userid_);
-					}
-				});
 			});
-		}else{
+		} else {
 			$('#showInfoBtn').hide();
 			$('#showTalkBtn').hide();
 
 		}
-		//获取音乐信息初始化
+		// //获取用户名
-		var bgmListInfo = $('input[name=live2dBGM]');
+		// var live2dUser = sessionStorage.getItem("live2duser");
-		if(bgmListInfo.length == 0){
+		// if(live2dUser !== null){
-			$('#musicButton').hide();
+		// 	$('#AIuserName').val(live2dUser);
-		}else{
+		// }
-			var bgmPlayNow = parseInt($('#live2d_bgm').attr('data-bgm'));
-			var bgmPlayTime = 0;
-			var live2dBGM_Num = sessionStorage.getItem("live2dBGM_Num");
-			var live2dBGM_PlayTime = sessionStorage.getItem("live2dBGM_PlayTime");
-			if(live2dBGM_Num){
-				if(live2dBGM_Num<=$('input[name=live2dBGM]').length-1){
-					bgmPlayNow = parseInt(live2dBGM_Num);
-				}
-			}
-			if(live2dBGM_PlayTime){
-				bgmPlayTime = parseInt(live2dBGM_PlayTime);
-			}
-			var live2dBGMSrc = bgmListInfo.eq(bgmPlayNow).val();
-			$('#live2d_bgm').attr('data-bgm',bgmPlayNow);
-			$('#live2d_bgm').attr('src',live2dBGMSrc);
-			$('#live2d_bgm')[0].currentTime = bgmPlayTime;
-			$('#live2d_bgm')[0].volume = 0.5;
-			var live2dBGM_IsPlay = sessionStorage.getItem("live2dBGM_IsPlay");
-			var live2dBGM_WindowClose = sessionStorage.getItem("live2dBGM_WindowClose");
-			if(live2dBGM_IsPlay == '0' && live2dBGM_WindowClose == '0'){
-				$('#live2d_bgm')[0].play();
-				$('#musicButton').addClass('play');
-			}
-			sessionStorage.setItem("live2dBGM_WindowClose" , '1');
-			$('#musicButton').on('click',function(){
-				if($('#musicButton').hasClass('play')){
-					$('#live2d_bgm')[0].pause();
-					$('#musicButton').removeClass('play');
-					sessionStorage.setItem("live2dBGM_IsPlay",'1');
-				}else{
-					$('#live2d_bgm')[0].play();
-					$('#musicButton').addClass('play');
-					sessionStorage.setItem("live2dBGM_IsPlay",'0');
-				}
-			});
-			window.onbeforeunload = function(){ 
-			 	sessionStorage.setItem("live2dBGM_WindowClose" , '0');
-				if($('#musicButton').hasClass('play')){
-					sessionStorage.setItem("live2dBGM_IsPlay",'0');
-				}
-			} 
-			document.getElementById('live2d_bgm').addEventListener("timeupdate", function(){
-				var live2dBgmPlayTimeNow = document.getElementById('live2d_bgm').currentTime;
-				sessionStorage.setItem("live2dBGM_PlayTime" , live2dBgmPlayTimeNow );
-			});
-			document.getElementById('live2d_bgm').addEventListener("ended", function(){
-				var listNow = parseInt($('#live2d_bgm').attr('data-bgm'));
-				listNow ++ ;
-				if(listNow > $('input[name=live2dBGM]').length-1){
-					listNow = 0;
-				}
-				var listNewSrc = $('input[name=live2dBGM]').eq(listNow).val();
-				sessionStorage.setItem("live2dBGM_Num",listNow);
-				$('#live2d_bgm').attr('src',listNewSrc);
-				$('#live2d_bgm')[0].play();
-				$('#live2d_bgm').attr('data-bgm',listNow);
-			});
-			document.getElementById('live2d_bgm').addEventListener("error", function(){
-				$('#live2d_bgm')[0].pause();
-				$('#musicButton').removeClass('play');
-				showMessage('音乐似乎加载不出来了呢！',0);
-			});
-		}
-		//获取用户名
-		var live2dUser = sessionStorage.getItem("live2duser");
-		if(live2dUser !== null){
-			$('#AIuserName').val(live2dUser);
-		}
 		//获取位置
 		var landL = sessionStorage.getItem("historywidth");
 		var landB = sessionStorage.getItem("historyheight");
-		if(landL == null || landB ==null){
+		if (landL == null || landB == null) {
 			landL = '5px'
 			landB = '0px'
 		}
-		$('#landlord').css('left',landL+'px');
+		$('#landlord').css('left', landL + 'px');
-		$('#landlord').css('bottom',landB + 'px');
+		$('#landlord').css('bottom', landB + 'px');
 		//移动
 		function getEvent() {
 			return window.event || arguments.callee.caller.arguments[0];
@@ -405,7 +343,7 @@ if(!norunFlag){
 		var moveable = false;
 		var docMouseMoveEvent = document.onmousemove;
 		var docMouseUpEvent = document.onmouseup;
-		smcc.onmousedown = function(){
+		smcc.onmousedown = function () {
 			var ent = getEvent();
 			moveable = true;
 			moveX = ent.clientX;
@@ -413,20 +351,20 @@ if(!norunFlag){
 			var obj = smcc;
 			moveBottom = parseInt(obj.style.bottom);
 			moveLeft = parseInt(obj.style.left);
-			if(isFirefox=navigator.userAgent.indexOf("Firefox")>0){
+			if (isFirefox = navigator.userAgent.indexOf("Firefox") > 0) {
 				window.getSelection().removeAllRanges();
 			}
-			document.onmousemove = function(){
+			document.onmousemove = function () {
-				if(moveable){
+				if (moveable) {
 					var ent = getEvent();
 					var x = moveLeft + ent.clientX - moveX;
-					var y = moveBottom +  (moveY - ent.clientY);
+					var y = moveBottom + (moveY - ent.clientY);
 					obj.style.left = x + "px";
 					obj.style.bottom = y + "px";
 				}
 			};
-			document.onmouseup = function(){
+			document.onmouseup = function () {
-				if(moveable){
+				if (moveable) {
 					var historywidth = obj.style.left;
 					var historyheight = obj.style.bottom;
 					historywidth = historywidth.replace('px', '');
@@ -443,37 +381,105 @@ if(!norunFlag){
 				}
 			};
 		};
+		//获取音乐信息初始化
+		var bgmListInfo = $('input[name=live2dBGM]');
+		if (bgmListInfo.length == 0) {
+			$('#musicButton').hide();
+		} else {
+			var bgmPlayNow = parseInt($('#live2d_bgm').attr('data-bgm'));
+			var bgmPlayTime = 0;
+			var live2dBGM_Num = sessionStorage.getItem("live2dBGM_Num");
+			var live2dBGM_PlayTime = sessionStorage.getItem("live2dBGM_PlayTime");
+			if (live2dBGM_Num) {
+				if (live2dBGM_Num <= $('input[name=live2dBGM]').length - 1) {
+					bgmPlayNow = parseInt(live2dBGM_Num);
+				}
+			}
+			if (live2dBGM_PlayTime) {
+				bgmPlayTime = parseInt(live2dBGM_PlayTime);
+			}
+			var live2dBGMSrc = bgmListInfo.eq(bgmPlayNow).val();
+			$('#live2d_bgm').attr('data-bgm', bgmPlayNow);
+			$('#live2d_bgm').attr('src', live2dBGMSrc);
+			$('#live2d_bgm')[0].currentTime = bgmPlayTime;
+			$('#live2d_bgm')[0].volume = 0.5;
+			var live2dBGM_IsPlay = sessionStorage.getItem("live2dBGM_IsPlay");
+			var live2dBGM_WindowClose = sessionStorage.getItem("live2dBGM_WindowClose");
+			if (live2dBGM_IsPlay == '0' && live2dBGM_WindowClose == '0') {
+				$('#live2d_bgm')[0].play();
+				$('#musicButton').addClass('play');
+			}
+			sessionStorage.setItem("live2dBGM_WindowClose", '1');
+			$('#musicButton').on('click', function () {
+				if ($('#musicButton').hasClass('play')) {
+					$('#live2d_bgm')[0].pause();
+					$('#musicButton').removeClass('play');
+					sessionStorage.setItem("live2dBGM_IsPlay", '1');
+				} else {
+					$('#live2d_bgm')[0].play();
+					$('#musicButton').addClass('play');
+					sessionStorage.setItem("live2dBGM_IsPlay", '0');
+				}
+			});
+			window.onbeforeunload = function () {
+				sessionStorage.setItem("live2dBGM_WindowClose", '0');
+				if ($('#musicButton').hasClass('play')) {
+					sessionStorage.setItem("live2dBGM_IsPlay", '0');
+				}
+			}
+			document.getElementById('live2d_bgm').addEventListener("timeupdate", function () {
+				var live2dBgmPlayTimeNow = document.getElementById('live2d_bgm').currentTime;
+				sessionStorage.setItem("live2dBGM_PlayTime", live2dBgmPlayTimeNow);
+			});
+			document.getElementById('live2d_bgm').addEventListener("ended", function () {
+				var listNow = parseInt($('#live2d_bgm').attr('data-bgm'));
+				listNow++;
+				if (listNow > $('input[name=live2dBGM]').length - 1) {
+					listNow = 0;
+				}
+				var listNewSrc = $('input[name=live2dBGM]').eq(listNow).val();
+				sessionStorage.setItem("live2dBGM_Num", listNow);
+				$('#live2d_bgm').attr('src', listNewSrc);
+				$('#live2d_bgm')[0].play();
+				$('#live2d_bgm').attr('data-bgm', listNow);
+			});
+			document.getElementById('live2d_bgm').addEventListener("error", function () {
+				$('#live2d_bgm')[0].pause();
+				$('#musicButton').removeClass('play');
+				showMessage('音乐似乎加载不出来了呢！', 0);
+			});
+		}
 	}
-	$(document).ready(function() {
+	$(document).ready(function () {
 		var AIimgSrc = [
-			home_Path + message_Path + "model/histoire/histoire.1024/texture_00.png",
+			message_Path + "model/histoire/histoire.1024/texture_00.png",
-			home_Path + message_Path + "model/histoire/histoire.1024/texture_01.png",
+			message_Path + "model/histoire/histoire.1024/texture_01.png",
-			home_Path + message_Path + "model/histoire/histoire.1024/texture_02.png",
+			message_Path + "model/histoire/histoire.1024/texture_02.png",
-			home_Path + message_Path + "model/histoire/histoire.1024/texture_03.png"
+			message_Path + "model/histoire/histoire.1024/texture_03.png"
 		]
 		var images = [];
 		var imgLength = AIimgSrc.length;
 		var loadingNum = 0;
-		for(var i=0;i<imgLength;i++){
+		for (var i = 0; i < imgLength; i++) {
 			images[i] = new Image();
 			images[i].src = AIimgSrc[i];
-			images[i].onload = function(){
+			images[i].onload = function () {
 				loadingNum++;
-				if(loadingNum===imgLength){
+				if (loadingNum === imgLength) {
 					var live2dhidden = localStorage.getItem("live2dhidden");
-					if(live2dhidden==="0"){
+					if (live2dhidden === "0") {
-						setTimeout(function(){
+						setTimeout(function () {
 							$('#open_live2d').fadeIn(200);
-						},1300);
+						}, 1300);
-					}else{
+					} else {
-						setTimeout(function(){
+						setTimeout(function () {
 							$('#landlord').fadeIn(200);
-						},1300);
+						}, 1300);
 					}
-					setTimeout(function(){
+					setTimeout(function () {
-						loadlive2d("live2d", message_Path+"model/histoire/model.json");
+						loadlive2d("live2d", message_Path + "model/histoire/model.json");
-					},1000);
+					}, 1000);
-					initLive2d ();
+					initLive2d();
 					images = null;
 				}
 			}

Live2dHistoire/live2d/model/nep/model.json

@@ -1,58 +0,0 @@
-{
-    "version":"1.0.0",
-    "model":"model.moc",
-    "textures":[
-        "histoire.1024/0.png",
-		"histoire.1024/1.png",
-		"histoire.1024/normal_2.png"
-    ],
-    "layout":{
-        "center_x":0.0,
-        "center_y":-0.05,
-        "width":2.0
-    },
-    "hit_areas_custom":{
-        "head_x":[-1, 1],
-        "head_y":[1, -1],
-        "body_x":[-1, -1],
-        "body_y":[1, -1]
-    },
-    "motions":{
-        "idle":[
-            {"file":"motions/idle/idle_00.mtn"},
-			{"file":"motions/idle/idle_01.mtn"},
-			{"file":"motions/idle/idle_02.mtn"}
-        ],
-        "sleepy":[
-			{"file":"motions/tap/shake.mtn"}
-        ],
-        "flick_head":[
-			{"file":"motions/tap/refuse.mtn"},
-			{"file":"motions/tap/nep_slide_head_2.mtn"},
-			{"file":"motions/tap/nep_touch_belly_2.mtn"},
-			{"file":"motions/tap/nep_touch_boobs_1.mtn"}
-        ],
-        "tap_body":[
-			{"file":"motions/tap/smile.mtn"}
-
-        ],
-        "talk":[
-			{"file":"motions/tap/nep_touch_belly_1.mtn"},
-			{"file":"motions/tap/nep_slide_head_2.mtn"},
-			{"file":"motions/tap/nep_touch_head_1.mtn"}
-
-        ],
-		"rest":[
-			{"file":"motions/tap/tilt_head.mtn"},
-			{"file":"motions/idle/idle_00.mtn"},
-			{"file":"motions/idle/idle_01.mtn"},
-			{"file":"motions/idle/idle_02.mtn"}
-        ],
-		"":[
-			{"file":"motions/tap/nep_touch_belly_1.mtn"},
-			{"file":"motions/tap/nep_slide_head_2.mtn"},
-			{"file":"motions/tap/nep_touch_head_1.mtn"},
-			{"file":"motions/tap/nep_touch_boobs_1.mtn"}
-		]
-    }
-}