Merge branch 'devel' of ssh://storage.hided.net:2525/devsam/core into devel

.gitignore

@@ -17,10 +17,7 @@ sess_*
 */logs/*/*.txt
 */logs/preserved
 err.txt
-che/.htaccess
-kwe/.htaccess
-pwe/.htaccess
-twe/.htaccess
+
 hwe/.htaccess
 
 d_shared
@@ -57,6 +54,8 @@ test.*
 /pya
 /twe
 
+/hwe/data
+
 /vendor
 phpinfo.php
 *.sqlite3

hwe/sammo/GameUnitConstBase.php

@@ -313,7 +313,7 @@ class GameUnitConstBase{
             1500, self::T_SIEGE, '정란',
             100, 100, 6,  0, 0,  14,  5,
             0, null,     null,     3,
-            [self::T_FOOTMAN=>1.25, self::T_ARCHER=>1.25, self::T_CAVALRY=>1.25, self::T_WIZARD=>1.25, self::T_CASTLE=>1.8],
+            [self::T_FOOTMAN=>1.25, self::T_ARCHER=>1.25, self::T_CAVALRY=>1.25, self::T_WIZARD=>1.25, self::T_CASTLE=>1.8, 1106=>1.112],
             [self::T_FOOTMAN=>1.2, self::T_ARCHER=>1.2, self::T_CAVALRY=>1.2, self::T_WIZARD=>1.2],
             ['높은 구조물 위에서 공격합니다.'],
             ['che_성벽부상무효'], null
@@ -331,8 +331,8 @@ class GameUnitConstBase{
             1502, self::T_SIEGE, '벽력거',
             200, 100, 6,  10, 0,  18,  5,
             3000, ['업'],   null,     0,
-            [self::T_FOOTMAN=>1.25, self::T_ARCHER=>1.25, self::T_CAVALRY=>1.25, self::T_WIZARD=>1.25, self::T_CASTLE=>1.8],
-            [self::T_FOOTMAN=>0.833, self::T_ARCHER=>0.833, self::T_CAVALRY=>0.833, self::T_WIZARD=>0.833],
+            [self::T_FOOTMAN=>1.25, self::T_ARCHER=>1.25, self::T_CAVALRY=>1.25, self::T_WIZARD=>1.25, self::T_CASTLE=>1.8, 1106=>1.112],
+            [self::T_FOOTMAN=>0.833, self::T_ARCHER=>0.833, self::T_CAVALRY=>0.833, self::T_WIZARD=>0.833, 1106=>0.909],
             ['상대에게 돌덩이를 날립니다.'],
             ['che_성벽부상무효'], null
         ],