diff --git a/f_install/install.php b/f_install/install.php
index e88f62da..4db52539 100644
--- a/f_install/install.php
+++ b/f_install/install.php
@@ -15,6 +15,7 @@ require(__dir__.'/../vendor/autoload.php');
+
diff --git a/hwe/a_bestGeneral.php b/hwe/a_bestGeneral.php
index 7c192b85..47941618 100644
--- a/hwe/a_bestGeneral.php
+++ b/hwe/a_bestGeneral.php
@@ -33,6 +33,7 @@ increaseRefresh("명장일람", 1);
+
diff --git a/hwe/a_genList.php b/hwe/a_genList.php
index f9ac86dd..810c7958 100644
--- a/hwe/a_genList.php
+++ b/hwe/a_genList.php
@@ -47,6 +47,7 @@ if ($type <= 0 || $type > 15) {
+
@@ -170,7 +171,7 @@ for ($j=0; $j < $gencount; $j++) {
| $name |
{$general['age']}세 |
".getGenChar($general['personal'])." |
- ".getGenSpecial($general['special'])." / ".getGenSpecial($general['special2'])." |
+ ".displaySpecialInfo($general['special'])." / ".displaySpecialInfo($general['special2'])." |
Lv ".getExpLevel($general['experience'])." |
{$nation} |
".getHonor($general['experience'])." |
diff --git a/hwe/a_hallOfFame.php b/hwe/a_hallOfFame.php
index d41a2f38..3a94afd0 100644
--- a/hwe/a_hallOfFame.php
+++ b/hwe/a_hallOfFame.php
@@ -44,6 +44,7 @@ else{
+
diff --git a/hwe/a_npcList.php b/hwe/a_npcList.php
index a56f606f..9544d96c 100644
--- a/hwe/a_npcList.php
+++ b/hwe/a_npcList.php
@@ -29,9 +29,14 @@ $sel[$type] = "selected";
<?=UniqueConst::$serverName?>: 빙의일람
+
+
+
+
+
@@ -107,7 +112,7 @@ for ($j=0; $j < $gencount; $j++) {
Lv {$general['explevel']} |
{$nation} |
".getGenChar($general['personal'])." |
- ".getGenSpecial($general['special'])." / ".getGenSpecial($general['special2'])." |
+ ".displaySpecialInfo($general['special'])." / ".displaySpecialInfo($general['special2'])." |
{$general['sum']} |
{$general['leader']} |
{$general['power']} |
diff --git a/hwe/b_genList.php b/hwe/b_genList.php
index 9704c5fb..7250156e 100644
--- a/hwe/b_genList.php
+++ b/hwe/b_genList.php
@@ -59,6 +59,7 @@ $sel[$type] = "selected";
+
diff --git a/hwe/b_myGenInfo.php b/hwe/b_myGenInfo.php
index e9075182..6b54c914 100644
--- a/hwe/b_myGenInfo.php
+++ b/hwe/b_myGenInfo.php
@@ -45,6 +45,7 @@ $sel = [$type => "selected"];
+
@@ -185,7 +186,7 @@ for($j=0; $j < $gencount; $j++) {
{$general['gold']} |
{$general['rice']} |
".getGenChar($general['personal'])." |
- ".getGenSpecial($general['special'])." / ".getGenSpecial($general['special2'])." |
+ ".displaySpecialInfo($general['special'])." / ".displaySpecialInfo($general['special2'])." |
{$general['belong']} |
{$general['connect']}"; echo "
(".getConnect($general['connect']).") |
";
diff --git a/hwe/func_converter.php b/hwe/func_converter.php
index 3886a0c6..b4a9678f 100644
--- a/hwe/func_converter.php
+++ b/hwe/func_converter.php
@@ -214,7 +214,7 @@ function getSpecialInfo(?int $type):?string{
60 => ['돌격', '[전투] 상대 회피 불가, 공격 시 전투 페이즈 +1, 공격 시 대미지 +10%'],
61 => ['무쌍', '[전투] 대미지 +10%, 공격 시 필살 확률 +10%p'],
- 62 => ['견고', '[전투] 수비 시 아군 피해 -10%, 공격 시 대미지 +10%'],
+ 62 => ['견고', '[전투] 수비 시 대미지 +10%, 공격 시 아군 피해 -10%'],
63 => ['위압', '[전투] 훈련/사기≥90, 병력≥1,000 일 때 첫 페이즈 위압 발동(적 공격 불가)'],
70 => ['저격', '[전투] 전투 개시 시 1/3 확률로 저격 발동'],
diff --git a/hwe/js/common.js b/hwe/js/common.js
index 0ac528d6..7ee16d19 100644
--- a/hwe/js/common.js
+++ b/hwe/js/common.js
@@ -128,4 +128,13 @@ function getIconPath(imgsvr, picture){
else{
return pathConfig.root+'/d_pic/'+picture;
}
-}
\ No newline at end of file
+}
+
+jQuery(function($){
+ $('.obj_tooltip').tooltip({
+ title:function(){
+ return $(this).find('.tooltiptext').html();
+ },
+ html:true
+ });
+});
diff --git a/hwe/js/hallOfFame.js b/hwe/js/hallOfFame.js
index 672d401e..ad475cfd 100644
--- a/hwe/js/hallOfFame.js
+++ b/hwe/js/hallOfFame.js
@@ -4,11 +4,4 @@ jQuery(function($){
$.redirect('a_hallOfFame.php', {scenarioIdx:scenarioIdx}, 'get');
})
//$.redirect("processing.php",{ commandtype: commandtype, turn: turn}, 'post');
-
- $('.obj_tooltip').tooltip({
- title:function(){
- return $(this).find('.tooltiptext').html();
- },
- html:true
- })
});
\ No newline at end of file
diff --git a/hwe/js/main.js b/hwe/js/main.js
index 2d984267..ed502349 100644
--- a/hwe/js/main.js
+++ b/hwe/js/main.js
@@ -82,11 +82,4 @@ jQuery(function($){
$('#mainBtnSubmit').click(function(){
});
-
- $('.obj_tooltip').tooltip({
- title:function(){
- return $(this).find('.tooltiptext').html();
- },
- html:true
- })
});
\ No newline at end of file
diff --git a/hwe/templates/tooltip.php b/hwe/templates/tooltip.php
index 9120421f..6ecbc2ed 100644
--- a/hwe/templates/tooltip.php
+++ b/hwe/templates/tooltip.php
@@ -2,4 +2,4 @@
-
\ No newline at end of file
+
\ No newline at end of file