Merge pull request #181 from clean-master/nachster

加入进度条

config.inc.php

@@ -64,13 +64,13 @@
 // [EN] !ATTENTION! Preservation or debugging for developing
 // [CH] 切勿修改以下变量,仅供程序开发调试用!
 
-	$database = 'pdo';			// 'mysql' for MySQL version and 'pgsql' for PostgreSQL version
+	$database = 'mysqli';			// 'mysql' for MySQL version and 'pgsql' for PostgreSQL version
 						// MySQL 版本请设?'mysql', PgSQL 版本请设?'pgsql'
 
 	$charset = 'utf-8';			// default character set, 'gbk', 'big5', 'utf-8' are available
 						// 游戏默认字符? 可?'gbk', 'big5', 'utf-8'
 
-	$dbcharset = 'utf8';			// default database character set, 'gbk', 'big5', 'utf8', 'latin1' and blank are available
+	$dbcharset = 'utf8mb4';			// default database character set, 'gbk', 'big5', 'utf8', 'latin1' and blank are available
 						// MySQL 字符? 可?'gbk', 'big5', 'utf8', 'latin1', 留空为按照游戏字符集设定
 
 	$attackevasive = 0;			// protect against attacks via common request, 0=off, 1=cookie refresh limitation, 2=deny proxy request, 3=both
@@ -93,7 +93,7 @@
 
 	$errorinfo = 0;				//是否开启错误信息提示，1为开启，0为关闭。开启会泄漏游戏安装路径
 // 以下为salt，请勿修改。
-	$salt = '3012becebcc626720409336f6375bcdd';
+	$salt = 'a29d8868b409591398e6ccca95f968ef';
 
 // ============================================================================
 

include/game/special.func.php

@@ -644,7 +644,6 @@ function  item_add_trait($choice1, $choice2)
     $itmec2 = &${'itme' . $choice2};
     $itmsc2 = &${'itms' . $choice2};
     $itmskc2 = &${'itmsk' . $choice2};
-    var_dump($itmc1, $itmc2);
     //检查itmk1是否为🥚,itmk2是否为D或W开头或者是否为🥚
     if ($itmkc1 != '🥚' || (strpos($itmkc2, 'D') !== 0 && strpos($itmkc2, 'W') !== 0 && ($itmkc2 !== '🥚'))) {
         $log .= '该物品无法合并。<br>';
@@ -674,10 +673,10 @@ function  item_add_trait($choice1, $choice2)
         $itmec2 = (int)$itmec1 + (int)$itmec2;
         //当任意一个itms为∞
         if ($itmsc1 == '∞' || $itmsc2 == '∞') {
-            $itms2 = '∞';
+            $itmsc2 = '∞';
         }
         else {
-            $itms2 = (int)$itmsc1 + (int)$itmsc2 - 1;
+            $itmsc2 = (int)$itmsc1 + (int)$itmsc2 - 1;
         }
         $itmskc2 = $itmskc1 . $itmskc2;
         $itmkc2 = '🥚';

include/game20130526.js

@@ -625,9 +625,21 @@ function showPage(pageContent, currentPageIndex) {
         hiddenModelElement.remove();
     }
 
-
-
-
+    var progressBar = document.createElement('div');
+    progressBar.className = 'progress-bar';
+    progressBar.style.width = ((currentPageIndex + 1) / pageContent.length) * 100 + '%';
+    
+    var progressBar = document.createElement('input');
+    progressBar.type = 'range';
+    progressBar.min = 0;
+    progressBar.max = pageContent.length - 1;
+    progressBar.value = currentPageIndex;
+    progressBar.oninput = function () {
+        currentPageIndex = parseInt(progressBar.value);
+        showPage(pageContent, currentPageIndex);
+    };
+    
+    recordedDataDiv.insertBefore(progressBar, recordedDataDiv.firstChild);
     recordedDataDiv.insertBefore(nextPageButton, recordedDataDiv.firstChild);
     recordedDataDiv.insertBefore(previousPageButton, recordedDataDiv.firstChild);
 }