fix: GetCityInfo에서 출력됨

.gitignore

@@ -69,5 +69,3 @@ gateway/js/*
 gateway/css/*
 
 *.db-journal
-
-d_log/cachegrind.*

.phan/config.php

@@ -15,8 +15,9 @@ return [
     // Note that the **only** effect of choosing `'5.6'` is to infer
     // that functions removed in php 7.0 exist.
     // (See `backward_compatibility_checks` for additional options)
-    "target_php_version" => '8.2',
+    "target_php_version" => '8.1',
-    "minimum_target_php_version" => '8.2',
+    "minimum_target_php_version" => '8.1',
+    'backward_compatibility_checks ' => true,
     'minimum_severity' => \Phan\Issue::SEVERITY_NORMAL,
 
     'file_list' => [
@@ -28,6 +29,8 @@ return [
         'hwe/_admin1_submit.php',
         'hwe/_admin2.php',
         'hwe/_admin2_submit.php',
+        'hwe/_admin4.php',
+        'hwe/_admin4_submit.php',
         'hwe/_admin5.php',
         'hwe/_admin5_submit.php',
         'hwe/_admin7.php',

.vscode/settings.json

@@ -29,5 +29,5 @@
         "josa",
         "sammo"
     ],
-    "editor.tabSize": 4
+    "editor.tabSize": 2
 }

composer.json

@@ -8,12 +8,12 @@
     ],
     "config": {
         "platform": {
-            "php": "8.3"
+            "php": "8.2"
         }
     },
     "require": {
         "brandonwamboldt/utilphp": "^1.1",
-        "sergeytsalkov/meekrodb": "^2.5",
+        "sergeytsalkov/meekrodb": "^2.3",
         "league/plates": "^3.5",
         "vlucas/valitron": "^1.4",
         "php-extended/php-tail": "^5.0",
@@ -22,10 +22,10 @@
         "xemlock/htmlpurifier-html5": "^0.1.7",
         "catfan/medoo": "^2.1",
         "phan/phan": "^5.4",
-        "nette/caching": "^3.3",
+        "nette/caching": "^3.2",
         "illuminate/database": "^10.0",
         "illuminate/events": "^10.0",
-        "php-ds/php-ds": "^1.5",
+        "php-ds/php-ds": "^1.4",
         "hided62/ldto": "^1.0",
         "league/uri": "^6.8"
     },

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "deed9afdc95bc42f84784df67d295223",
+    "content-hash": "e878a776667c3f0cbef0a48b3504d965",
     "packages": [
         {
             "name": "brandonwamboldt/utilphp",
@@ -58,25 +58,25 @@
         },
         {
             "name": "brick/math",
-            "version": "0.12.1",
+            "version": "0.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/brick/math.git",
-                "reference": "f510c0a40911935b77b86859eb5223d58d660df1"
+                "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1",
+                "url": "https://api.github.com/repos/brick/math/zipball/0ad82ce168c82ba30d1c01ec86116ab52f589478",
-                "reference": "f510c0a40911935b77b86859eb5223d58d660df1",
+                "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.1"
+                "php": "^8.0"
             },
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.2",
-                "phpunit/phpunit": "^10.1",
+                "phpunit/phpunit": "^9.0",
-                "vimeo/psalm": "5.16.0"
+                "vimeo/psalm": "5.0.0"
             },
             "type": "library",
             "autoload": {
@@ -96,17 +96,12 @@
                 "arithmetic",
                 "bigdecimal",
                 "bignum",
-                "bignumber",
                 "brick",
-                "decimal",
+                "math"
-                "integer",
-                "math",
-                "mathematics",
-                "rational"
             ],
             "support": {
                 "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.12.1"
+                "source": "https://github.com/brick/math/tree/0.11.0"
             },
             "funding": [
                 {
@@ -114,89 +109,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-29T23:19:16+00:00"
+            "time": "2023-01-15T23:15:59+00:00"
-        },
-        {
-            "name": "carbonphp/carbon-doctrine-types",
-            "version": "2.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git",
-                "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/99f76ffa36cce3b70a4a6abce41dba15ca2e84cb",
-                "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.4 || ^8.0"
-            },
-            "conflict": {
-                "doctrine/dbal": "<3.7.0 || >=4.0.0"
-            },
-            "require-dev": {
-                "doctrine/dbal": "^3.7.0",
-                "nesbot/carbon": "^2.71.0 || ^3.0.0",
-                "phpunit/phpunit": "^10.3"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Carbon\\Doctrine\\": "src/Carbon/Doctrine/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "KyleKatarn",
-                    "email": "kylekatarnls@gmail.com"
-                }
-            ],
-            "description": "Types to use Carbon in Doctrine",
-            "keywords": [
-                "carbon",
-                "date",
-                "datetime",
-                "doctrine",
-                "time"
-            ],
-            "support": {
-                "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues",
-                "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/2.1.0"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/kylekatarnls",
-                    "type": "github"
-                },
-                {
-                    "url": "https://opencollective.com/Carbon",
-                    "type": "open_collective"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-12-11T17:09:12+00:00"
         },
         {
             "name": "catfan/medoo",
-            "version": "v2.1.12",
+            "version": "v2.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/catfan/Medoo.git",
-                "reference": "d1ff4e0e873a3e032e3d8804031dd6be4e013b22"
+                "reference": "b49a620cf1ad0d2e90ebd9f85b82aa11271df5f4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/catfan/Medoo/zipball/d1ff4e0e873a3e032e3d8804031dd6be4e013b22",
+                "url": "https://api.github.com/repos/catfan/Medoo/zipball/b49a620cf1ad0d2e90ebd9f85b82aa11271df5f4",
-                "reference": "d1ff4e0e873a3e032e3d8804031dd6be4e013b22",
+                "reference": "b49a620cf1ad0d2e90ebd9f85b82aa11271df5f4",
                 "shasum": ""
             },
             "require": {
@@ -259,20 +185,20 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-02-03T11:28:59+00:00"
+            "time": "2023-01-20T09:30:24+00:00"
         },
         {
             "name": "composer/pcre",
-            "version": "3.1.3",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8"
+                "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
-                "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
+                "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
                 "shasum": ""
             },
             "require": {
@@ -314,7 +240,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.1.3"
+                "source": "https://github.com/composer/pcre/tree/3.1.0"
             },
             "funding": [
                 {
@@ -330,20 +256,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-19T10:26:25+00:00"
+            "time": "2022-11-17T09:50:14+00:00"
         },
         {
             "name": "composer/semver",
-            "version": "3.4.0",
+            "version": "3.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32"
+                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32",
+                "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9",
-                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32",
+                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9",
                 "shasum": ""
             },
             "require": {
@@ -393,9 +319,9 @@
                 "versioning"
             ],
             "support": {
-                "irc": "ircs://irc.libera.chat:6697/composer",
+                "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.4.0"
+                "source": "https://github.com/composer/semver/tree/3.3.2"
             },
             "funding": [
                 {
@@ -411,20 +337,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-08-31T09:50:34+00:00"
+            "time": "2022-04-01T19:23:25+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "3.0.5",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef"
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
-                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef",
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
                 "shasum": ""
             },
             "require": {
@@ -435,7 +361,7 @@
             "require-dev": {
                 "phpstan/phpstan": "^1.0",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
+                "symfony/phpunit-bridge": "^6.0"
             },
             "type": "library",
             "autoload": {
@@ -459,9 +385,9 @@
                 "performance"
             ],
             "support": {
-                "irc": "ircs://irc.libera.chat:6697/composer",
+                "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/3.0.5"
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
             },
             "funding": [
                 {
@@ -477,79 +403,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-06T16:37:16+00:00"
+            "time": "2022-02-25T21:32:43+00:00"
-        },
-        {
-            "name": "doctrine/deprecations",
-            "version": "1.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
-                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1 || ^8.0"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^9",
-                "phpstan/phpstan": "1.4.10 || 1.10.15",
-                "phpstan/phpstan-phpunit": "^1.0",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "psalm/plugin-phpunit": "0.18.4",
-                "psr/log": "^1 || ^2 || ^3",
-                "vimeo/psalm": "4.30.0 || 5.12.0"
-            },
-            "suggest": {
-                "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
-            "homepage": "https://www.doctrine-project.org/",
-            "support": {
-                "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/1.1.3"
-            },
-            "time": "2024-01-30T19:34:25+00:00"
         },
         {
             "name": "doctrine/inflector",
-            "version": "2.0.10",
+            "version": "2.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
-                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc"
+                "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
-                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc",
+                "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^11.0",
+                "doctrine/coding-standard": "^10",
                 "phpstan/phpstan": "^1.8",
                 "phpstan/phpstan-phpunit": "^1.1",
                 "phpstan/phpstan-strict-rules": "^1.3",
                 "phpunit/phpunit": "^8.5 || ^9.5",
-                "vimeo/psalm": "^4.25 || ^5.4"
+                "vimeo/psalm": "^4.25"
             },
             "type": "library",
             "autoload": {
@@ -599,7 +478,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/inflector/issues",
-                "source": "https://github.com/doctrine/inflector/tree/2.0.10"
+                "source": "https://github.com/doctrine/inflector/tree/2.0.6"
             },
             "funding": [
                 {
@@ -615,24 +494,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-18T20:23:39+00:00"
+            "time": "2022-10-20T09:10:12+00:00"
         },
         {
             "name": "ezyang/htmlpurifier",
-            "version": "v4.17.0",
+            "version": "v4.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c"
+                "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/bbc513d79acf6691fa9cf10f192c90dd2957f18c",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8",
-                "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c",
+                "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8",
                 "shasum": ""
             },
             "require": {
-                "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
+                "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0"
             },
             "require-dev": {
                 "cerdic/css-tidy": "^1.7 || ^2.0",
@@ -674,9 +553,9 @@
             ],
             "support": {
                 "issues": "https://github.com/ezyang/htmlpurifier/issues",
-                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.17.0"
+                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0"
             },
-            "time": "2023-11-17T15:01:25+00:00"
+            "time": "2022-09-18T07:06:19+00:00"
         },
         {
             "name": "felixfbecker/advanced-json-rpc",
@@ -725,16 +604,16 @@
         },
         {
             "name": "hided62/ldto",
-            "version": "v1.0.1",
+            "version": "v1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hided62/ldto.git",
-                "reference": "7f0cc568e35120868fe1178e96265c4fa0624820"
+                "reference": "4c05401406f8afc1636a90763c13884f8fff0d14"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hided62/ldto/zipball/7f0cc568e35120868fe1178e96265c4fa0624820",
+                "url": "https://api.github.com/repos/hided62/ldto/zipball/4c05401406f8afc1636a90763c13884f8fff0d14",
-                "reference": "7f0cc568e35120868fe1178e96265c4fa0624820",
+                "reference": "4c05401406f8afc1636a90763c13884f8fff0d14",
                 "shasum": ""
             },
             "require": {
@@ -773,22 +652,22 @@
             ],
             "support": {
                 "issues": "https://github.com/hided62/ldto/issues",
-                "source": "https://github.com/hided62/ldto/tree/v1.0.1"
+                "source": "https://github.com/hided62/ldto/tree/v1.0.0"
             },
-            "time": "2023-03-04T07:51:45+00:00"
+            "time": "2022-08-05T14:30:13+00:00"
         },
         {
             "name": "illuminate/bus",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/bus.git",
-                "reference": "33993b8f54e91b03fb5000e55693e146e7370763"
+                "reference": "139999f560611623c7da494faa3d8a92f8e22e68"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/bus/zipball/33993b8f54e91b03fb5000e55693e146e7370763",
+                "url": "https://api.github.com/repos/illuminate/bus/zipball/139999f560611623c7da494faa3d8a92f8e22e68",
-                "reference": "33993b8f54e91b03fb5000e55693e146e7370763",
+                "reference": "139999f560611623c7da494faa3d8a92f8e22e68",
                 "shasum": ""
             },
             "require": {
@@ -828,20 +707,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-02-23T15:38:25+00:00"
+            "time": "2022-11-30T17:23:35+00:00"
         },
         {
             "name": "illuminate/collections",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/collections.git",
-                "reference": "f9589f1063a449111dcaa1d68285b507d9483a95"
+                "reference": "f48e6e52860edc9f261f414a85ed2b9b295a324c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/collections/zipball/f9589f1063a449111dcaa1d68285b507d9483a95",
+                "url": "https://api.github.com/repos/illuminate/collections/zipball/f48e6e52860edc9f261f414a85ed2b9b295a324c",
-                "reference": "f9589f1063a449111dcaa1d68285b507d9483a95",
+                "reference": "f48e6e52860edc9f261f414a85ed2b9b295a324c",
                 "shasum": ""
             },
             "require": {
@@ -883,11 +762,11 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-03-20T20:09:13+00:00"
+            "time": "2023-02-22T14:38:35+00:00"
         },
         {
             "name": "illuminate/conditionable",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/conditionable.git",
@@ -933,16 +812,16 @@
         },
         {
             "name": "illuminate/container",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/container.git",
-                "reference": "ddc26273085fad3c471b2602ad820e0097ff7939"
+                "reference": "fed3ee8f7389ad431833935d9ed665bc02ac2cca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/container/zipball/ddc26273085fad3c471b2602ad820e0097ff7939",
+                "url": "https://api.github.com/repos/illuminate/container/zipball/fed3ee8f7389ad431833935d9ed665bc02ac2cca",
-                "reference": "ddc26273085fad3c471b2602ad820e0097ff7939",
+                "reference": "fed3ee8f7389ad431833935d9ed665bc02ac2cca",
                 "shasum": ""
             },
             "require": {
@@ -980,20 +859,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2023-06-18T09:12:03+00:00"
+            "time": "2023-01-25T18:11:51+00:00"
         },
         {
             "name": "illuminate/contracts",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/contracts.git",
-                "reference": "8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac"
+                "reference": "84f1da424ab9596a422ce118abd05667b0069624"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/contracts/zipball/8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac",
+                "url": "https://api.github.com/repos/illuminate/contracts/zipball/84f1da424ab9596a422ce118abd05667b0069624",
-                "reference": "8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac",
+                "reference": "84f1da424ab9596a422ce118abd05667b0069624",
                 "shasum": ""
             },
             "require": {
@@ -1028,24 +907,24 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-01-15T18:52:32+00:00"
+            "time": "2023-02-14T15:00:37+00:00"
         },
         {
             "name": "illuminate/database",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/database.git",
-                "reference": "eb8edf206d3a6eea8894bc6e21f53469e27dd5c9"
+                "reference": "782940a3092e86c8d022d6d8d168b64fb97933a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/database/zipball/eb8edf206d3a6eea8894bc6e21f53469e27dd5c9",
+                "url": "https://api.github.com/repos/illuminate/database/zipball/782940a3092e86c8d022d6d8d168b64fb97933a5",
-                "reference": "eb8edf206d3a6eea8894bc6e21f53469e27dd5c9",
+                "reference": "782940a3092e86c8d022d6d8d168b64fb97933a5",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.9.3|^0.10.2|^0.11|^0.12",
+                "brick/math": "^0.9.3|^0.10.2|^0.11",
                 "ext-pdo": "*",
                 "illuminate/collections": "^10.0",
                 "illuminate/container": "^10.0",
@@ -1054,10 +933,6 @@
                 "illuminate/support": "^10.0",
                 "php": "^8.1"
             },
-            "conflict": {
-                "carbonphp/carbon-doctrine-types": ">=3.0",
-                "doctrine/dbal": ">=4.0"
-            },
             "suggest": {
                 "doctrine/dbal": "Required to rename columns and drop SQLite columns (^3.5.1).",
                 "ext-filter": "Required to use the Postgres database driver.",
@@ -1101,20 +976,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-04-29T13:23:17+00:00"
+            "time": "2023-02-23T18:43:10+00:00"
         },
         {
             "name": "illuminate/events",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/events.git",
-                "reference": "a931bfa88edc6ac52c9abbfd7b769343d321d3eb"
+                "reference": "c68138ea57360c19a145e5912fb474cfd1845366"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/events/zipball/a931bfa88edc6ac52c9abbfd7b769343d321d3eb",
+                "url": "https://api.github.com/repos/illuminate/events/zipball/c68138ea57360c19a145e5912fb474cfd1845366",
-                "reference": "a931bfa88edc6ac52c9abbfd7b769343d321d3eb",
+                "reference": "c68138ea57360c19a145e5912fb474cfd1845366",
                 "shasum": ""
             },
             "require": {
@@ -1156,20 +1031,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-03-04T14:41:04+00:00"
+            "time": "2023-02-16T15:35:09+00:00"
         },
         {
             "name": "illuminate/macroable",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/macroable.git",
-                "reference": "dff667a46ac37b634dcf68909d9d41e94dc97c27"
+                "reference": "7686fe9dba1e236e6f695a148b551264b9fd479e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/macroable/zipball/dff667a46ac37b634dcf68909d9d41e94dc97c27",
+                "url": "https://api.github.com/repos/illuminate/macroable/zipball/7686fe9dba1e236e6f695a148b551264b9fd479e",
-                "reference": "dff667a46ac37b634dcf68909d9d41e94dc97c27",
+                "reference": "7686fe9dba1e236e6f695a148b551264b9fd479e",
                 "shasum": ""
             },
             "require": {
@@ -1202,20 +1077,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2023-06-05T12:46:42+00:00"
+            "time": "2023-01-30T23:18:36+00:00"
         },
         {
             "name": "illuminate/pipeline",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/pipeline.git",
-                "reference": "f802187e917a171332cc90f8c1a102939c57405d"
+                "reference": "549fc7f9b2e6fef0436ca0f68714e1a0e4de8aad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/pipeline/zipball/f802187e917a171332cc90f8c1a102939c57405d",
+                "url": "https://api.github.com/repos/illuminate/pipeline/zipball/549fc7f9b2e6fef0436ca0f68714e1a0e4de8aad",
-                "reference": "f802187e917a171332cc90f8c1a102939c57405d",
+                "reference": "549fc7f9b2e6fef0436ca0f68714e1a0e4de8aad",
                 "shasum": ""
             },
             "require": {
@@ -1250,20 +1125,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2023-12-19T14:47:26+00:00"
+            "time": "2022-06-10T06:51:19+00:00"
         },
         {
             "name": "illuminate/support",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/support.git",
-                "reference": "ee3a1aaed36d916654ce0ae09dfbd38644a4f582"
+                "reference": "0311d96fb673e9694e1df838abb12f4e4019cdc4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/ee3a1aaed36d916654ce0ae09dfbd38644a4f582",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/0311d96fb673e9694e1df838abb12f4e4019cdc4",
-                "reference": "ee3a1aaed36d916654ce0ae09dfbd38644a4f582",
+                "reference": "0311d96fb673e9694e1df838abb12f4e4019cdc4",
                 "shasum": ""
             },
             "require": {
@@ -1275,7 +1150,7 @@
                 "illuminate/conditionable": "^10.0",
                 "illuminate/contracts": "^10.0",
                 "illuminate/macroable": "^10.0",
-                "nesbot/carbon": "^2.67",
+                "nesbot/carbon": "^2.62.1",
                 "php": "^8.1",
                 "voku/portable-ascii": "^2.0"
             },
@@ -1321,7 +1196,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-04-07T17:47:33+00:00"
+            "time": "2023-02-23T07:42:03+00:00"
         },
         {
             "name": "league/plates",
@@ -1560,16 +1435,16 @@
         },
         {
             "name": "microsoft/tolerant-php-parser",
-            "version": "v0.1.2",
+            "version": "v0.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/microsoft/tolerant-php-parser.git",
-                "reference": "3eccfd273323aaf69513e2f1c888393f5947804b"
+                "reference": "6a965617cf484355048ac6d2d3de7b6ec93abb16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/microsoft/tolerant-php-parser/zipball/3eccfd273323aaf69513e2f1c888393f5947804b",
+                "url": "https://api.github.com/repos/microsoft/tolerant-php-parser/zipball/6a965617cf484355048ac6d2d3de7b6ec93abb16",
-                "reference": "3eccfd273323aaf69513e2f1c888393f5947804b",
+                "reference": "6a965617cf484355048ac6d2d3de7b6ec93abb16",
                 "shasum": ""
             },
             "require": {
@@ -1599,39 +1474,34 @@
             "description": "Tolerant PHP-to-AST parser designed for IDE usage scenarios",
             "support": {
                 "issues": "https://github.com/microsoft/tolerant-php-parser/issues",
-                "source": "https://github.com/microsoft/tolerant-php-parser/tree/v0.1.2"
+                "source": "https://github.com/microsoft/tolerant-php-parser/tree/v0.1.1"
             },
-            "time": "2022-10-05T17:30:19+00:00"
+            "time": "2021-07-16T21:28:12+00:00"
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.72.3",
+            "version": "2.66.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83"
+                "reference": "496712849902241f04902033b0441b269effe001"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/0c6fd108360c562f6e4fd1dedb8233b423e91c83",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/496712849902241f04902033b0441b269effe001",
-                "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83",
+                "reference": "496712849902241f04902033b0441b269effe001",
                 "shasum": ""
             },
             "require": {
-                "carbonphp/carbon-doctrine-types": "*",
                 "ext-json": "*",
                 "php": "^7.1.8 || ^8.0",
-                "psr/clock": "^1.0",
                 "symfony/polyfill-mbstring": "^1.0",
                 "symfony/polyfill-php80": "^1.16",
                 "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0"
             },
-            "provide": {
-                "psr/clock-implementation": "1.0"
-            },
             "require-dev": {
-                "doctrine/dbal": "^2.0 || ^3.1.4 || ^4.0",
+                "doctrine/dbal": "^2.0 || ^3.1.4",
-                "doctrine/orm": "^2.7 || ^3.0",
+                "doctrine/orm": "^2.7",
                 "friendsofphp/php-cs-fixer": "^3.0",
                 "kylekatarnls/multi-tester": "^2.0",
                 "ondrejmirtes/better-reflection": "*",
@@ -1708,20 +1578,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-25T10:35:09+00:00"
+            "time": "2023-01-29T18:53:47+00:00"
         },
         {
             "name": "netresearch/jsonmapper",
-            "version": "v4.4.1",
+            "version": "v4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cweiske/jsonmapper.git",
-                "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0"
+                "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/132c75c7dd83e45353ebb9c6c9f591952995bbf0",
+                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/cfa81ea1d35294d64adb9c68aa4cb9e92400e53f",
-                "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0",
+                "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f",
                 "shasum": ""
             },
             "require": {
@@ -1732,7 +1602,7 @@
                 "php": ">=7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0 || ~10.0",
+                "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0",
                 "squizlabs/php_codesniffer": "~3.5"
             },
             "type": "library",
@@ -1757,33 +1627,31 @@
             "support": {
                 "email": "cweiske@cweiske.de",
                 "issues": "https://github.com/cweiske/jsonmapper/issues",
-                "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.1"
+                "source": "https://github.com/cweiske/jsonmapper/tree/v4.1.0"
             },
-            "time": "2024-01-31T06:18:54+00:00"
+            "time": "2022-12-08T20:46:14+00:00"
         },
         {
             "name": "nette/caching",
-            "version": "v3.3.0",
+            "version": "v3.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/caching.git",
-                "reference": "3053707a892e100e81efb53dc8c294dca5e076d0"
+                "reference": "ceb814d7f0a2bb4eb5afbe908467801001187745"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/caching/zipball/3053707a892e100e81efb53dc8c294dca5e076d0",
+                "url": "https://api.github.com/repos/nette/caching/zipball/ceb814d7f0a2bb4eb5afbe908467801001187745",
-                "reference": "3053707a892e100e81efb53dc8c294dca5e076d0",
+                "reference": "ceb814d7f0a2bb4eb5afbe908467801001187745",
                 "shasum": ""
             },
             "require": {
-                "nette/utils": "^4.0",
+                "nette/finder": "^2.4 || ^3.0",
-                "php": "8.0 - 8.3"
+                "nette/utils": "^3.2 || ~4.0.0",
-            },
+                "php": ">=8.0 <8.3"
-            "conflict": {
-                "latte/latte": ">=3.0.0 <3.0.12"
             },
             "require-dev": {
-                "latte/latte": "^2.11 || ^3.0.12",
+                "latte/latte": "^2.11 || ^3.0",
                 "nette/di": "^3.1 || ^4.0",
                 "nette/tester": "^2.4",
                 "phpstan/phpstan": "^1.0",
@@ -1795,7 +1663,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -1830,26 +1698,79 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/caching/issues",
-                "source": "https://github.com/nette/caching/tree/v3.3.0"
+                "source": "https://github.com/nette/caching/tree/v3.2.2"
             },
-            "time": "2024-03-10T22:07:25+00:00"
+            "time": "2023-02-04T13:52:33+00:00"
         },
         {
-            "name": "nette/utils",
+            "name": "nette/finder",
-            "version": "v4.0.4",
+            "version": "v3.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/nette/utils.git",
+                "url": "https://github.com/nette/finder.git",
-                "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218"
+                "reference": "027395c638637de95c8e9fad49a7c51249404ed2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
+                "url": "https://api.github.com/repos/nette/finder/zipball/027395c638637de95c8e9fad49a7c51249404ed2",
-                "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
+                "reference": "027395c638637de95c8e9fad49a7c51249404ed2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0 <8.4"
+                "nette/utils": "^4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause",
+                "GPL-2.0-only",
+                "GPL-3.0-only"
+            ],
+            "authors": [
+                {
+                    "name": "David Grudl",
+                    "homepage": "https://davidgrudl.com"
+                },
+                {
+                    "name": "Nette Community",
+                    "homepage": "https://nette.org/contributors"
+                }
+            ],
+            "description": "🔍 Nette Finder: find files and directories with an intuitive API.",
+            "homepage": "https://nette.org",
+            "keywords": [
+                "filesystem",
+                "glob",
+                "iterator",
+                "nette"
+            ],
+            "support": {
+                "issues": "https://github.com/nette/finder/issues",
+                "source": "https://github.com/nette/finder/tree/v3.0.0"
+            },
+            "time": "2022-12-14T17:05:54+00:00"
+        },
+        {
+            "name": "nette/utils",
+            "version": "v4.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nette/utils.git",
+                "reference": "cacdbf5a91a657ede665c541eda28941d4b09c1e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nette/utils/zipball/cacdbf5a91a657ede665c541eda28941d4b09c1e",
+                "reference": "cacdbf5a91a657ede665c541eda28941d4b09c1e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0 <8.3"
             },
             "conflict": {
                 "nette/finder": "<3",
@@ -1857,7 +1778,7 @@
             },
             "require-dev": {
                 "jetbrains/phpstorm-attributes": "dev-master",
-                "nette/tester": "^2.5",
+                "nette/tester": "^2.4",
                 "phpstan/phpstan": "^1.0",
                 "tracy/tracy": "^2.9"
             },
@@ -1867,7 +1788,8 @@
                 "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()",
                 "ext-json": "to use Nette\\Utils\\Json",
                 "ext-mbstring": "to use Strings::lower() etc...",
-                "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()"
+                "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()",
+                "ext-xml": "to use Strings::length() etc. when mbstring is not available"
             },
             "type": "library",
             "extra": {
@@ -1916,22 +1838,22 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.0.4"
+                "source": "https://github.com/nette/utils/tree/v4.0.0"
             },
-            "time": "2024-01-17T16:50:36+00:00"
+            "time": "2023-02-02T10:41:53+00:00"
         },
         {
             "name": "phan/phan",
-            "version": "5.4.3",
+            "version": "5.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phan/phan.git",
-                "reference": "86a7acd99c1239b8867b49feca2398851212e7fe"
+                "reference": "fef40178a952bcfcc3f69b76989dd613c3d5c759"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phan/phan/zipball/86a7acd99c1239b8867b49feca2398851212e7fe",
+                "url": "https://api.github.com/repos/phan/phan/zipball/fef40178a952bcfcc3f69b76989dd613c3d5c759",
-                "reference": "86a7acd99c1239b8867b49feca2398851212e7fe",
+                "reference": "fef40178a952bcfcc3f69b76989dd613c3d5c759",
                 "shasum": ""
             },
             "require": {
@@ -1941,11 +1863,11 @@
                 "ext-json": "*",
                 "ext-tokenizer": "*",
                 "felixfbecker/advanced-json-rpc": "^3.0.4",
-                "microsoft/tolerant-php-parser": "0.1.2",
+                "microsoft/tolerant-php-parser": "0.1.1",
                 "netresearch/jsonmapper": "^1.6.0|^2.0|^3.0|^4.0",
                 "php": "^7.2.0|^8.0.0",
                 "sabre/event": "^5.1.3",
-                "symfony/console": "^3.2|^4.0|^5.0|^6.0|^7.0",
+                "symfony/console": "^3.2|^4.0|^5.0|^6.0",
                 "symfony/polyfill-mbstring": "^1.11.0",
                 "symfony/polyfill-php80": "^1.20.0",
                 "tysonandre/var_representation_polyfill": "^0.0.2|^0.1.0"
@@ -1991,27 +1913,26 @@
             "keywords": [
                 "analyzer",
                 "php",
-                "static",
+                "static"
-                "static analysis"
             ],
             "support": {
                 "issues": "https://github.com/phan/phan/issues",
-                "source": "https://github.com/phan/phan/tree/5.4.3"
+                "source": "https://github.com/phan/phan/tree/5.4.1"
             },
-            "time": "2023-12-26T17:57:35+00:00"
+            "time": "2022-08-26T00:49:07+00:00"
         },
         {
             "name": "php-ds/php-ds",
-            "version": "v1.5.0",
+            "version": "v1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-ds/polyfill.git",
-                "reference": "7b2c5f1843466d50769a0682ce6fa9ddaaa99cb4"
+                "reference": "43d2df301a9e2017f67b8c11d94a5222f9c00fd1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-ds/polyfill/zipball/7b2c5f1843466d50769a0682ce6fa9ddaaa99cb4",
+                "url": "https://api.github.com/repos/php-ds/polyfill/zipball/43d2df301a9e2017f67b8c11d94a5222f9c00fd1",
-                "reference": "7b2c5f1843466d50769a0682ce6fa9ddaaa99cb4",
+                "reference": "43d2df301a9e2017f67b8c11d94a5222f9c00fd1",
                 "shasum": ""
             },
             "require": {
@@ -2019,10 +1940,10 @@
                 "php": ">=7.0"
             },
             "provide": {
-                "ext-ds": "1.5.0"
+                "ext-ds": "1.3.0"
             },
             "require-dev": {
-                "php-ds/tests": "^1.5"
+                "php-ds/tests": "^1.3"
             },
             "suggest": {
                 "ext-ds": "to improve performance and reduce memory usage"
@@ -2051,22 +1972,22 @@
             ],
             "support": {
                 "issues": "https://github.com/php-ds/polyfill/issues",
-                "source": "https://github.com/php-ds/polyfill/tree/v1.5.0"
+                "source": "https://github.com/php-ds/polyfill/tree/v1.4.1"
             },
-            "time": "2023-12-19T16:52:21+00:00"
+            "time": "2022-03-09T20:39:30+00:00"
         },
         {
             "name": "php-extended/php-system",
-            "version": "5.0.1",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
                 "url": "git@gitlab.com:php-extended/php-system.git",
-                "reference": "a80365cc08f43e740f3d1b77505d3242d954555a"
+                "reference": "c269fbf3d358679b229b922b6c5be5dac9bbd1ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fphp-system/repository/archive.zip?sha=a80365cc08f43e740f3d1b77505d3242d954555a",
+                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fphp-system/repository/archive.zip?sha=c269fbf3d358679b229b922b6c5be5dac9bbd1ab",
-                "reference": "a80365cc08f43e740f3d1b77505d3242d954555a",
+                "reference": "c269fbf3d358679b229b922b6c5be5dac9bbd1ab",
                 "shasum": ""
             },
             "require": {
@@ -2104,20 +2025,20 @@
                 "issues": "https://gitlab.com/php-extended/php-system/issues",
                 "source": "https://gitlab.com/php-extended/php-system"
             },
-            "time": "2023-06-26T19:35:14+00:00"
+            "time": "2022-12-12T07:20:57+00:00"
         },
         {
             "name": "php-extended/php-tail",
-            "version": "5.0.1",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
                 "url": "git@gitlab.com:php-extended/php-tail.git",
-                "reference": "4a76745626d8e0359fee3bf87614e2478b3f80c5"
+                "reference": "d932ed124887b0e0691751a4bb197b759707e1d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fphp-tail/repository/archive.zip?sha=4a76745626d8e0359fee3bf87614e2478b3f80c5",
+                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fphp-tail/repository/archive.zip?sha=d932ed124887b0e0691751a4bb197b759707e1d8",
-                "reference": "4a76745626d8e0359fee3bf87614e2478b3f80c5",
+                "reference": "d932ed124887b0e0691751a4bb197b759707e1d8",
                 "shasum": ""
             },
             "require": {
@@ -2157,20 +2078,20 @@
                 "issues": "https://gitlab.com/php-extended/php-tail/issues",
                 "source": "https://gitlab.com/php-extended/php-tail"
             },
-            "time": "2023-06-26T19:35:24+00:00"
+            "time": "2022-12-18T11:15:32+00:00"
         },
         {
             "name": "php-extended/polyfill-php80-stringable",
-            "version": "1.2.12",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
-                "url": "https://gitlab.com/php-extended/polyfill-php80-stringable.git",
+                "url": "git@gitlab.com:php-extended/polyfill-php80-stringable.git",
-                "reference": "ea728554a1d83c75ebb7eec69689fdb6c067b5e4"
+                "reference": "a6199e7ea09ddafaae9c22d6bd297aa4704b6608"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fpolyfill-php80-stringable/repository/archive.zip?sha=ea728554a1d83c75ebb7eec69689fdb6c067b5e4",
+                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fpolyfill-php80-stringable/repository/archive.zip?sha=a6199e7ea09ddafaae9c22d6bd297aa4704b6608",
-                "reference": "ea728554a1d83c75ebb7eec69689fdb6c067b5e4",
+                "reference": "a6199e7ea09ddafaae9c22d6bd297aa4704b6608",
                 "shasum": ""
             },
             "require": {
@@ -2205,7 +2126,7 @@
                 "issues": "https://gitlab.com/php-extended/polyfill-php80-stringable/issues",
                 "source": "https://gitlab.com/php-extended/polyfill-php80-stringable"
             },
-            "time": "2024-03-31T13:21:37+00:00"
+            "time": "2022-12-07T22:15:21+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -2262,35 +2183,28 @@
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "5.4.0",
+            "version": "5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "298d2febfe79d03fe714eb871d5538da55205b1a"
+                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/298d2febfe79d03fe714eb871d5538da55205b1a",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
-                "reference": "298d2febfe79d03fe714eb871d5538da55205b1a",
+                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
                 "shasum": ""
             },
             "require": {
-                "doctrine/deprecations": "^1.1",
                 "ext-filter": "*",
-                "php": "^7.4 || ^8.0",
+                "php": "^7.2 || ^8.0",
                 "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.7",
+                "phpdocumentor/type-resolver": "^1.3",
-                "phpstan/phpdoc-parser": "^1.7",
                 "webmozart/assert": "^1.9.1"
             },
             "require-dev": {
-                "mockery/mockery": "~1.3.5",
+                "mockery/mockery": "~1.3.2",
-                "phpstan/extension-installer": "^1.1",
+                "psalm/phar": "^4.8"
-                "phpstan/phpstan": "^1.8",
-                "phpstan/phpstan-mockery": "^1.1",
-                "phpstan/phpstan-webmozart-assert": "^1.2",
-                "phpunit/phpunit": "^9.5",
-                "vimeo/psalm": "^5.13"
             },
             "type": "library",
             "extra": {
@@ -2314,39 +2228,36 @@
                 },
                 {
                     "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
+                    "email": "account@ijaap.nl"
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
             "support": {
                 "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.0"
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
             },
-            "time": "2024-04-09T21:13:58+00:00"
+            "time": "2021-10-19T17:43:47+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.8.2",
+            "version": "1.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "153ae662783729388a584b4361f2545e4d841e3c"
+                "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d",
-                "reference": "153ae662783729388a584b4361f2545e4d841e3c",
+                "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d",
                 "shasum": ""
             },
             "require": {
-                "doctrine/deprecations": "^1.0",
+                "php": "^7.4 || ^8.0",
-                "php": "^7.3 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.0"
-                "phpdocumentor/reflection-common": "^2.0",
-                "phpstan/phpdoc-parser": "^1.13"
             },
             "require-dev": {
                 "ext-tokenizer": "*",
-                "phpbench/phpbench": "^1.2",
                 "phpstan/extension-installer": "^1.1",
                 "phpstan/phpstan": "^1.8",
                 "phpstan/phpstan-phpunit": "^1.1",
@@ -2378,104 +2289,9 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2"
             },
-            "time": "2024-02-23T11:10:43+00:00"
+            "time": "2022-10-14T12:47:21+00:00"
-        },
-        {
-            "name": "phpstan/phpdoc-parser",
-            "version": "1.29.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/536889f2b340489d328f5ffb7b02bb6b183ddedc",
-                "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0"
-            },
-            "require-dev": {
-                "doctrine/annotations": "^2.0",
-                "nikic/php-parser": "^4.15",
-                "php-parallel-lint/php-parallel-lint": "^1.2",
-                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^1.5",
-                "phpstan/phpstan-phpunit": "^1.1",
-                "phpstan/phpstan-strict-rules": "^1.0",
-                "phpunit/phpunit": "^9.5",
-                "symfony/process": "^5.2"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "PHPStan\\PhpDocParser\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "PHPDoc parser with support for nullable, intersection and generic types",
-            "support": {
-                "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.0"
-            },
-            "time": "2024-05-06T12:04:23+00:00"
-        },
-        {
-            "name": "psr/clock",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/clock.git",
-                "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d",
-                "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0 || ^8.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Clock\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for reading the clock.",
-            "homepage": "https://github.com/php-fig/clock",
-            "keywords": [
-                "clock",
-                "now",
-                "psr",
-                "psr-20",
-                "time"
-            ],
-            "support": {
-                "issues": "https://github.com/php-fig/clock/issues",
-                "source": "https://github.com/php-fig/clock/tree/1.0.0"
-            },
-            "time": "2022-11-25T14:36:26+00:00"
         },
         {
             "name": "psr/container",
@@ -2532,25 +2348,25 @@
         },
         {
             "name": "psr/http-message",
-            "version": "1.1",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-message.git",
-                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "php": ">=5.3.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
@@ -2579,9 +2395,9 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-message/tree/1.1"
+                "source": "https://github.com/php-fig/http-message/tree/master"
             },
-            "time": "2023-04-04T09:50:52+00:00"
+            "time": "2016-08-06T14:39:51+00:00"
         },
         {
             "name": "psr/log",
@@ -2752,16 +2568,16 @@
         },
         {
             "name": "sergeytsalkov/meekrodb",
-            "version": "v2.5.1",
+            "version": "v2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/SergeyTsalkov/meekrodb.git",
-                "reference": "08b683a274365983aaf033cf9c589dcbe5190028"
+                "reference": "e30c240d54bc81f58c58507a9ed768032eb494a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SergeyTsalkov/meekrodb/zipball/08b683a274365983aaf033cf9c589dcbe5190028",
+                "url": "https://api.github.com/repos/SergeyTsalkov/meekrodb/zipball/e30c240d54bc81f58c58507a9ed768032eb494a5",
-                "reference": "08b683a274365983aaf033cf9c589dcbe5190028",
+                "reference": "e30c240d54bc81f58c58507a9ed768032eb494a5",
                 "shasum": ""
             },
             "require": {
@@ -2794,52 +2610,55 @@
             "support": {
                 "email": "support@meekro.com",
                 "issues": "https://github.com/SergeyTsalkov/meekrodb/issues",
-                "source": "https://github.com/SergeyTsalkov/meekrodb/tree/v2.5.1"
+                "source": "https://github.com/SergeyTsalkov/meekrodb/tree/v2.4"
             },
-            "time": "2023-10-10T00:28:49+00:00"
+            "time": "2021-06-29T04:31:23+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v7.0.7",
+            "version": "v6.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "c981e0e9380ce9f146416bde3150c79197ce9986"
+                "reference": "cbad09eb8925b6ad4fb721c7a179344dc4a19d45"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/c981e0e9380ce9f146416bde3150c79197ce9986",
+                "url": "https://api.github.com/repos/symfony/console/zipball/cbad09eb8925b6ad4fb721c7a179344dc4a19d45",
-                "reference": "c981e0e9380ce9f146416bde3150c79197ce9986",
+                "reference": "cbad09eb8925b6ad4fb721c7a179344dc4a19d45",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2",
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.1|^3",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/service-contracts": "^2.5|^3",
+                "symfony/service-contracts": "^1.1|^2|^3",
-                "symfony/string": "^6.4|^7.0"
+                "symfony/string": "^5.4|^6.0"
             },
             "conflict": {
-                "symfony/dependency-injection": "<6.4",
+                "symfony/dependency-injection": "<5.4",
-                "symfony/dotenv": "<6.4",
+                "symfony/dotenv": "<5.4",
-                "symfony/event-dispatcher": "<6.4",
+                "symfony/event-dispatcher": "<5.4",
-                "symfony/lock": "<6.4",
+                "symfony/lock": "<5.4",
-                "symfony/process": "<6.4"
+                "symfony/process": "<5.4"
             },
             "provide": {
                 "psr/log-implementation": "1.0|2.0|3.0"
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^6.4|^7.0",
+                "symfony/config": "^5.4|^6.0",
-                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/event-dispatcher": "^5.4|^6.0",
-                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/lock": "^5.4|^6.0",
-                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/process": "^5.4|^6.0",
-                "symfony/lock": "^6.4|^7.0",
+                "symfony/var-dumper": "^5.4|^6.0"
-                "symfony/messenger": "^6.4|^7.0",
+            },
-                "symfony/process": "^6.4|^7.0",
+            "suggest": {
-                "symfony/stopwatch": "^6.4|^7.0",
+                "psr/log": "For using the console logger",
-                "symfony/var-dumper": "^6.4|^7.0"
+                "symfony/event-dispatcher": "",
+                "symfony/lock": "",
+                "symfony/process": ""
             },
             "type": "library",
             "autoload": {
@@ -2868,12 +2687,12 @@
             "homepage": "https://symfony.com",
             "keywords": [
                 "cli",
-                "command-line",
+                "command line",
                 "console",
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.0.7"
+                "source": "https://github.com/symfony/console/tree/v6.2.7"
             },
             "funding": [
                 {
@@ -2889,20 +2708,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:29:19+00:00"
+            "time": "2023-02-25T17:00:03+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.5.0",
+            "version": "v3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
+                "reference": "0121954c80fd17c18cf050fe73360e63bb43d4fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0121954c80fd17c18cf050fe73360e63bb43d4fb",
-                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+                "reference": "0121954c80fd17c18cf050fe73360e63bb43d4fb",
                 "shasum": ""
             },
             "require": {
@@ -2911,7 +2730,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.3-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -2940,7 +2759,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.1"
             },
             "funding": [
                 {
@@ -2956,34 +2775,33 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2023-02-02T07:48:03+00:00"
         },
         {
             "name": "symfony/lock",
-            "version": "v6.4.7",
+            "version": "v6.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/lock.git",
-                "reference": "c6b3959c418a7c1115c060fab77927ca4bd2546a"
+                "reference": "febdeed9473e568ff34bf4350c04760f5357dfe2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/lock/zipball/c6b3959c418a7c1115c060fab77927ca4bd2546a",
+                "url": "https://api.github.com/repos/symfony/lock/zipball/febdeed9473e568ff34bf4350c04760f5357dfe2",
-                "reference": "c6b3959c418a7c1115c060fab77927ca4bd2546a",
+                "reference": "febdeed9473e568ff34bf4350c04760f5357dfe2",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "psr/log": "^1|^2|^3",
+                "psr/log": "^1|^2|^3"
-                "symfony/deprecation-contracts": "^2.5|^3"
             },
             "conflict": {
                 "doctrine/dbal": "<2.13",
                 "symfony/cache": "<6.2"
             },
             "require-dev": {
-                "doctrine/dbal": "^2.13|^3|^4",
+                "doctrine/dbal": "^2.13|^3.0",
-                "predis/predis": "^1.1|^2.0"
+                "predis/predis": "~1.0"
             },
             "type": "library",
             "autoload": {
@@ -3019,7 +2837,7 @@
                 "semaphore"
             ],
             "support": {
-                "source": "https://github.com/symfony/lock/tree/v6.4.7"
+                "source": "https://github.com/symfony/lock/tree/v6.2.7"
             },
             "funding": [
                 {
@@ -3035,20 +2853,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2023-02-24T10:42:00+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.29.0",
+            "version": "v1.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
-                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
                 "shasum": ""
             },
             "require": {
@@ -3062,6 +2880,9 @@
             },
             "type": "library",
             "extra": {
+                "branch-alias": {
+                    "dev-main": "1.27-dev"
+                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -3098,7 +2919,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
             },
             "funding": [
                 {
@@ -3114,20 +2935,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.29.0",
+            "version": "v1.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
+                "reference": "511a08c03c1960e08a883f4cffcacd219b758354"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354",
-                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+                "reference": "511a08c03c1960e08a883f4cffcacd219b758354",
                 "shasum": ""
             },
             "require": {
@@ -3138,6 +2959,9 @@
             },
             "type": "library",
             "extra": {
+                "branch-alias": {
+                    "dev-main": "1.27-dev"
+                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -3176,7 +3000,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0"
             },
             "funding": [
                 {
@@ -3192,20 +3016,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.29.0",
+            "version": "v1.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
+                "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6",
-                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
+                "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6",
                 "shasum": ""
             },
             "require": {
@@ -3216,6 +3040,9 @@
             },
             "type": "library",
             "extra": {
+                "branch-alias": {
+                    "dev-main": "1.27-dev"
+                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -3257,7 +3084,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0"
             },
             "funding": [
                 {
@@ -3273,20 +3100,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.29.0",
+            "version": "v1.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
+                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
-                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
                 "shasum": ""
             },
             "require": {
@@ -3300,6 +3127,9 @@
             },
             "type": "library",
             "extra": {
+                "branch-alias": {
+                    "dev-main": "1.27-dev"
+                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -3337,7 +3167,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
             },
             "funding": [
                 {
@@ -3353,20 +3183,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.29.0",
+            "version": "v1.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
+                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
-                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
                 "shasum": ""
             },
             "require": {
@@ -3374,6 +3204,9 @@
             },
             "type": "library",
             "extra": {
+                "branch-alias": {
+                    "dev-main": "1.27-dev"
+                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -3417,7 +3250,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0"
             },
             "funding": [
                 {
@@ -3433,34 +3266,36 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.5.0",
+            "version": "v3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
+                "reference": "aee5f59db63978f7785290b94d2f12286b1b590a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/aee5f59db63978f7785290b94d2f12286b1b590a",
-                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+                "reference": "aee5f59db63978f7785290b94d2f12286b1b590a",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "psr/container": "^1.1|^2.0",
+                "psr/container": "^2.0"
-                "symfony/deprecation-contracts": "^2.5|^3"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
             },
+            "suggest": {
+                "symfony/service-implementation": ""
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.3-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -3500,7 +3335,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.2.1"
             },
             "funding": [
                 {
@@ -3516,38 +3351,38 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2023-02-16T12:50:33+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v7.0.7",
+            "version": "v6.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "e405b5424dc2528e02e31ba26b83a79fd4eb8f63"
+                "reference": "67b8c1eec78296b85dc1c7d9743830160218993d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/e405b5424dc2528e02e31ba26b83a79fd4eb8f63",
+                "url": "https://api.github.com/repos/symfony/string/zipball/67b8c1eec78296b85dc1c7d9743830160218993d",
-                "reference": "e405b5424dc2528e02e31ba26b83a79fd4eb8f63",
+                "reference": "67b8c1eec78296b85dc1c7d9743830160218993d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.2",
+                "php": ">=8.1",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-intl-grapheme": "~1.0",
                 "symfony/polyfill-intl-normalizer": "~1.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/translation-contracts": "<2.5"
+                "symfony/translation-contracts": "<2.0"
             },
             "require-dev": {
-                "symfony/error-handler": "^6.4|^7.0",
+                "symfony/error-handler": "^5.4|^6.0",
-                "symfony/http-client": "^6.4|^7.0",
+                "symfony/http-client": "^5.4|^6.0",
-                "symfony/intl": "^6.4|^7.0",
+                "symfony/intl": "^6.2",
-                "symfony/translation-contracts": "^2.5|^3.0",
+                "symfony/translation-contracts": "^2.0|^3.0",
-                "symfony/var-exporter": "^6.4|^7.0"
+                "symfony/var-exporter": "^5.4|^6.0"
             },
             "type": "library",
             "autoload": {
@@ -3586,7 +3421,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.0.7"
+                "source": "https://github.com/symfony/string/tree/v6.2.7"
             },
             "funding": [
                 {
@@ -3602,35 +3437,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:29:19+00:00"
+            "time": "2023-02-24T10:42:00+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v6.4.7",
+            "version": "v6.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "7495687c58bfd88b7883823747b0656d90679123"
+                "reference": "90db1c6138c90527917671cd9ffa9e8b359e3a73"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/7495687c58bfd88b7883823747b0656d90679123",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/90db1c6138c90527917671cd9ffa9e8b359e3a73",
-                "reference": "7495687c58bfd88b7883823747b0656d90679123",
+                "reference": "90db1c6138c90527917671cd9ffa9e8b359e3a73",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/translation-contracts": "^2.5|^3.0"
+                "symfony/translation-contracts": "^2.3|^3.0"
             },
             "conflict": {
                 "symfony/config": "<5.4",
                 "symfony/console": "<5.4",
                 "symfony/dependency-injection": "<5.4",
-                "symfony/http-client-contracts": "<2.5",
                 "symfony/http-kernel": "<5.4",
-                "symfony/service-contracts": "<2.5",
                 "symfony/twig-bundle": "<5.4",
                 "symfony/yaml": "<5.4"
             },
@@ -3638,19 +3470,25 @@
                 "symfony/translation-implementation": "2.3|3.0"
             },
             "require-dev": {
-                "nikic/php-parser": "^4.18|^5.0",
+                "nikic/php-parser": "^4.13",
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/config": "^5.4|^6.0",
-                "symfony/console": "^5.4|^6.0|^7.0",
+                "symfony/console": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/finder": "^5.4|^6.0|^7.0",
+                "symfony/finder": "^5.4|^6.0",
-                "symfony/http-client-contracts": "^2.5|^3.0",
+                "symfony/http-client-contracts": "^1.1|^2.0|^3.0",
-                "symfony/http-kernel": "^5.4|^6.0|^7.0",
+                "symfony/http-kernel": "^5.4|^6.0",
-                "symfony/intl": "^5.4|^6.0|^7.0",
+                "symfony/intl": "^5.4|^6.0",
                 "symfony/polyfill-intl-icu": "^1.21",
-                "symfony/routing": "^5.4|^6.0|^7.0",
+                "symfony/routing": "^5.4|^6.0",
-                "symfony/service-contracts": "^2.5|^3",
+                "symfony/service-contracts": "^1.1.2|^2|^3",
-                "symfony/yaml": "^5.4|^6.0|^7.0"
+                "symfony/yaml": "^5.4|^6.0"
+            },
+            "suggest": {
+                "nikic/php-parser": "To use PhpAstExtractor",
+                "psr/log-implementation": "To use logging capability in translator",
+                "symfony/config": "",
+                "symfony/yaml": ""
             },
             "type": "library",
             "autoload": {
@@ -3681,7 +3519,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v6.4.7"
+                "source": "https://github.com/symfony/translation/tree/v6.2.7"
             },
             "funding": [
                 {
@@ -3697,29 +3535,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2023-02-24T10:42:00+00:00"
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.5.0",
+            "version": "v3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a"
+                "reference": "1f40e77fbb12a16d841688f42fecefd8ceb43ed6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/1f40e77fbb12a16d841688f42fecefd8ceb43ed6",
-                "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
+                "reference": "1f40e77fbb12a16d841688f42fecefd8ceb43ed6",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1"
             },
+            "suggest": {
+                "symfony/translation-implementation": ""
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.3-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -3759,7 +3600,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.2.1"
             },
             "funding": [
                 {
@@ -3775,7 +3616,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2023-02-16T12:50:33+00:00"
         },
         {
             "name": "tysonandre/var_representation_polyfill",
@@ -4089,16 +3930,16 @@
     "packages-dev": [
         {
             "name": "myclabs/deep-copy",
-            "version": "1.11.1",
+            "version": "1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
                 "shasum": ""
             },
             "require": {
@@ -4136,7 +3977,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
             },
             "funding": [
                 {
@@ -4144,31 +3985,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-08T13:26:56+00:00"
+            "time": "2022-03-03T13:19:32+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.0.2",
+            "version": "v4.15.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13"
+                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039",
-                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13",
+                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039",
                 "shasum": ""
             },
             "require": {
-                "ext-ctype": "*",
-                "ext-json": "*",
                 "ext-tokenizer": "*",
-                "php": ">=7.4"
+                "php": ">=7.0"
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -4176,7 +4015,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "4.9-dev"
                 }
             },
             "autoload": {
@@ -4200,27 +4039,26 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3"
             },
-            "time": "2024-03-05T20:51:40+00:00"
+            "time": "2023-01-16T22:05:37+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "2.0.4",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "54750ef60c58e43759730615a392c31c80e23176"
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
-                "reference": "54750ef60c58e43759730615a392c31c80e23176",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
-                "ext-libxml": "*",
                 "ext-phar": "*",
                 "ext-xmlwriter": "*",
                 "phar-io/version": "^3.0.1",
@@ -4261,15 +4099,9 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/2.0.4"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
             },
-            "funding": [
+            "time": "2021-07-20T11:28:43+00:00"
-                {
-                    "url": "https://github.com/theseer",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-03-03T12:33:53+00:00"
         },
         {
             "name": "phar-io/version",
@@ -4324,23 +4156,23 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "10.1.14",
+            "version": "10.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b"
+                "reference": "b9c21a93dd8c8eed79879374884ee733259475cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b9c21a93dd8c8eed79879374884ee733259475cc",
-                "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
+                "reference": "b9c21a93dd8c8eed79879374884ee733259475cc",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.18 || ^5.0",
+                "nikic/php-parser": "^4.15",
                 "php": ">=8.1",
                 "phpunit/php-file-iterator": "^4.0",
                 "phpunit/php-text-template": "^3.0",
@@ -4352,16 +4184,16 @@
                 "theseer/tokenizer": "^1.2.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.1"
+                "phpunit/phpunit": "^10.0"
             },
             "suggest": {
-                "ext-pcov": "PHP extension that provides line coverage",
+                "ext-pcov": "*",
-                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
+                "ext-xdebug": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "10.1-dev"
+                    "dev-main": "10.0-dev"
                 }
             },
             "autoload": {
@@ -4389,8 +4221,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.0.1"
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.14"
             },
             "funding": [
                 {
@@ -4398,20 +4229,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-12T15:33:41+00:00"
+            "time": "2023-02-25T05:35:03+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "4.1.0",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c"
+                "reference": "fd9329ab3368f59fe1fe808a189c51086bd4b6bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/fd9329ab3368f59fe1fe808a189c51086bd4b6bd",
-                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c",
+                "reference": "fd9329ab3368f59fe1fe808a189c51086bd4b6bd",
                 "shasum": ""
             },
             "require": {
@@ -4450,8 +4281,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.0.1"
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0"
             },
             "funding": [
                 {
@@ -4459,7 +4289,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-31T06:24:48+00:00"
+            "time": "2023-02-10T16:53:14+00:00"
         },
         {
             "name": "phpunit/php-invoker",
@@ -4526,16 +4356,16 @@
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "3.0.1",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748"
+                "reference": "9f3d3709577a527025f55bcf0f7ab8052c8bb37d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/9f3d3709577a527025f55bcf0f7ab8052c8bb37d",
-                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748",
+                "reference": "9f3d3709577a527025f55bcf0f7ab8052c8bb37d",
                 "shasum": ""
             },
             "require": {
@@ -4573,8 +4403,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.0"
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1"
             },
             "funding": [
                 {
@@ -4582,7 +4411,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-31T14:07:24+00:00"
+            "time": "2023-02-03T06:56:46+00:00"
         },
         {
             "name": "phpunit/php-timer",
@@ -4645,16 +4474,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.20",
+            "version": "10.0.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3"
+                "reference": "c37a88d7a905266eab6498817a1bf1170043313f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c37a88d7a905266eab6498817a1bf1170043313f",
-                "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3",
+                "reference": "c37a88d7a905266eab6498817a1bf1170043313f",
                 "shasum": ""
             },
             "require": {
@@ -4668,7 +4497,7 @@
                 "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
                 "php": ">=8.1",
-                "phpunit/php-code-coverage": "^10.1.5",
+                "phpunit/php-code-coverage": "^10.0",
                 "phpunit/php-file-iterator": "^4.0",
                 "phpunit/php-invoker": "^4.0",
                 "phpunit/php-text-template": "^3.0",
@@ -4678,15 +4507,15 @@
                 "sebastian/comparator": "^5.0",
                 "sebastian/diff": "^5.0",
                 "sebastian/environment": "^6.0",
-                "sebastian/exporter": "^5.1",
+                "sebastian/exporter": "^5.0",
-                "sebastian/global-state": "^6.0.1",
+                "sebastian/global-state": "^6.0",
                 "sebastian/object-enumerator": "^5.0",
                 "sebastian/recursion-context": "^5.0",
                 "sebastian/type": "^4.0",
                 "sebastian/version": "^4.0"
             },
             "suggest": {
-                "ext-soap": "To be able to generate mocks based on WSDL files"
+                "ext-soap": "*"
             },
             "bin": [
                 "phpunit"
@@ -4694,7 +4523,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "10.5-dev"
+                    "dev-main": "10.0-dev"
                 }
             },
             "autoload": {
@@ -4725,8 +4554,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.0.13"
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.20"
             },
             "funding": [
                 {
@@ -4742,20 +4570,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-24T06:32:35+00:00"
+            "time": "2023-02-27T13:07:57+00:00"
         },
         {
             "name": "sebastian/cli-parser",
-            "version": "2.0.1",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084"
+                "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/efdc130dbbbb8ef0b545a994fd811725c5282cae",
-                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084",
+                "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae",
                 "shasum": ""
             },
             "require": {
@@ -4790,8 +4618,7 @@
             "homepage": "https://github.com/sebastianbergmann/cli-parser",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
-                "security": "https://github.com/sebastianbergmann/cli-parser/security/policy",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.0"
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.1"
             },
             "funding": [
                 {
@@ -4799,7 +4626,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T07:12:49+00:00"
+            "time": "2023-02-03T06:58:15+00:00"
         },
         {
             "name": "sebastian/code-unit",
@@ -4914,16 +4741,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "5.0.1",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "2db5010a484d53ebf536087a70b4a5423c102372"
+                "reference": "72f01e6586e0caf6af81297897bd112eb7e9627c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/72f01e6586e0caf6af81297897bd112eb7e9627c",
-                "reference": "2db5010a484d53ebf536087a70b4a5423c102372",
+                "reference": "72f01e6586e0caf6af81297897bd112eb7e9627c",
                 "shasum": ""
             },
             "require": {
@@ -4934,7 +4761,7 @@
                 "sebastian/exporter": "^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.3"
+                "phpunit/phpunit": "^10.0"
             },
             "type": "library",
             "extra": {
@@ -4978,8 +4805,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "security": "https://github.com/sebastianbergmann/comparator/security/policy",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.0"
-                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1"
             },
             "funding": [
                 {
@@ -4987,24 +4813,24 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-14T13:18:12+00:00"
+            "time": "2023-02-03T07:07:16+00:00"
         },
         {
             "name": "sebastian/complexity",
-            "version": "3.2.0",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "68ff824baeae169ec9f2137158ee529584553799"
+                "reference": "e67d240970c9dc7ea7b2123a6d520e334dd61dc6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/e67d240970c9dc7ea7b2123a6d520e334dd61dc6",
-                "reference": "68ff824baeae169ec9f2137158ee529584553799",
+                "reference": "e67d240970c9dc7ea7b2123a6d520e334dd61dc6",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.18 || ^5.0",
+                "nikic/php-parser": "^4.10",
                 "php": ">=8.1"
             },
             "require-dev": {
@@ -5013,7 +4839,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.2-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -5036,8 +4862,7 @@
             "homepage": "https://github.com/sebastianbergmann/complexity",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/complexity/issues",
-                "security": "https://github.com/sebastianbergmann/complexity/security/policy",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/3.0.0"
-                "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0"
             },
             "funding": [
                 {
@@ -5045,20 +4870,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-12-21T08:37:17+00:00"
+            "time": "2023-02-03T06:59:47+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "5.1.1",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e"
+                "reference": "70dd1b20bc198da394ad542e988381b44e64e39f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/70dd1b20bc198da394ad542e988381b44e64e39f",
-                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e",
+                "reference": "70dd1b20bc198da394ad542e988381b44e64e39f",
                 "shasum": ""
             },
             "require": {
@@ -5066,12 +4891,12 @@
             },
             "require-dev": {
                 "phpunit/phpunit": "^10.0",
-                "symfony/process": "^6.4"
+                "symfony/process": "^4.2 || ^5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.1-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -5103,8 +4928,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "security": "https://github.com/sebastianbergmann/diff/security/policy",
+                "source": "https://github.com/sebastianbergmann/diff/tree/5.0.0"
-                "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1"
             },
             "funding": [
                 {
@@ -5112,20 +4936,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T07:15:17+00:00"
+            "time": "2023-02-03T07:00:31+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "6.1.0",
+            "version": "6.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984"
+                "reference": "b6f3694c6386c7959915a0037652e0c40f6f69cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/b6f3694c6386c7959915a0037652e0c40f6f69cc",
-                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984",
+                "reference": "b6f3694c6386c7959915a0037652e0c40f6f69cc",
                 "shasum": ""
             },
             "require": {
@@ -5140,7 +4964,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "6.1-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -5167,8 +4991,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "security": "https://github.com/sebastianbergmann/environment/security/policy",
+                "source": "https://github.com/sebastianbergmann/environment/tree/6.0.0"
-                "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0"
             },
             "funding": [
                 {
@@ -5176,20 +4999,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-23T08:47:14+00:00"
+            "time": "2023-02-03T07:03:04+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "5.1.2",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "955288482d97c19a372d3f31006ab3f37da47adf"
+                "reference": "f3ec4bf931c0b31e5b413f5b4fc970a7d03338c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/f3ec4bf931c0b31e5b413f5b4fc970a7d03338c0",
-                "reference": "955288482d97c19a372d3f31006ab3f37da47adf",
+                "reference": "f3ec4bf931c0b31e5b413f5b4fc970a7d03338c0",
                 "shasum": ""
             },
             "require": {
@@ -5203,7 +5026,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.1-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -5245,8 +5068,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "security": "https://github.com/sebastianbergmann/exporter/security/policy",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/5.0.0"
-                "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.2"
             },
             "funding": [
                 {
@@ -5254,20 +5076,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T07:17:12+00:00"
+            "time": "2023-02-03T07:06:49+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "6.0.2",
+            "version": "6.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9"
+                "reference": "aab257c712de87b90194febd52e4d184551c2d44"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/aab257c712de87b90194febd52e4d184551c2d44",
-                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
+                "reference": "aab257c712de87b90194febd52e4d184551c2d44",
                 "shasum": ""
             },
             "require": {
@@ -5301,14 +5123,13 @@
                 }
             ],
             "description": "Snapshotting of global state",
-            "homepage": "https://www.github.com/sebastianbergmann/global-state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
             "keywords": [
                 "global state"
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "security": "https://github.com/sebastianbergmann/global-state/security/policy",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.0"
-                "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.2"
             },
             "funding": [
                 {
@@ -5316,24 +5137,24 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T07:19:19+00:00"
+            "time": "2023-02-03T07:07:38+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
-            "version": "2.0.2",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0"
+                "reference": "17c4d940ecafb3d15d2cf916f4108f664e28b130"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/17c4d940ecafb3d15d2cf916f4108f664e28b130",
-                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0",
+                "reference": "17c4d940ecafb3d15d2cf916f4108f664e28b130",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.18 || ^5.0",
+                "nikic/php-parser": "^4.10",
                 "php": ">=8.1"
             },
             "require-dev": {
@@ -5365,8 +5186,7 @@
             "homepage": "https://github.com/sebastianbergmann/lines-of-code",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
-                "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.0"
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2"
             },
             "funding": [
                 {
@@ -5374,7 +5194,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-12-21T08:38:20+00:00"
+            "time": "2023-02-03T07:08:02+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
@@ -5662,16 +5482,16 @@
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.3",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
-                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
                 "shasum": ""
             },
             "require": {
@@ -5700,7 +5520,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
             },
             "funding": [
                 {
@@ -5708,7 +5528,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-03T12:36:25+00:00"
+            "time": "2021-07-28T10:34:58+00:00"
         }
     ],
     "aliases": [],
@@ -5719,7 +5539,7 @@
     "platform": [],
     "platform-dev": [],
     "platform-overrides": {
-        "php": "8.3"
+        "php": "8.2"
     },
     "plugin-api-version": "2.3.0"
 }

f_install/install.php

@@ -30,10 +30,10 @@ require(__DIR__ . '/../vendor/autoload.php');
 
 <body>
     <div class="container">
-        <h1 class="row justify-content-lg-center">삼국지 모의전투 HiDCHe 설치</h1>
+        <h1 class="row justify-content-md-center">삼국지 모의전투 HiDCHe 설치</h1>
-        <div class="row justify-content-lg-center">
+        <div class="row justify-content-md-center">
 
-            <div class="col col-12 col-lg-10 col-lg-7">
+            <div class="col col-12 col-md-10 col-lg-7">
                 <div class="card" id="db_form_card" style="display:none">
                     <h3 class="card-header">
                         설치(DB 설정)

f_install/j_install_status.php

@@ -17,11 +17,18 @@ if (!class_exists('\\sammo\\RootDB')) {
 
 $rootDB = RootDB::db();
 
-$rootDB->addHook('run_failed', function ($params) {
+$rootDB->throw_exception_on_nonsql_error = false;
+$rootDB->nonsql_error_handler = function ($params) {
+    Json::die([
+        'step' => 'conn_fail'
+    ]);
+};
+
+$rootDB->error_handler = function ($params) {
     Json::die([
         'step' => 'sql_fail'
     ]);
-});
+};
 
 $memberCnt = $rootDB->queryFirstField('SELECT count(`NO`) from member');
 if ($memberCnt == 0) {

f_install/j_setup_db.php

@@ -150,12 +150,20 @@ if (!file_exists(ROOT . '/d_setting/.htaccess')) {
 $rootDB = new \MeekroDB($host, $username, $password, $dbName, $port, 'utf8mb4');
 $rootDB->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
 
-$rootDB->addHook('run_failed', function ($args) {
+$rootDB->throw_exception_on_nonsql_error = false;
+$rootDB->nonsql_error_handler = function ($params) {
     Json::die([
         'result' => false,
-        'reason' => '에러.'. $args['error']
+        'reason' => 'DB 접속에 실패했습니다.'
     ]);
-});
+};
+
+$rootDB->error_handler = function ($params) {
+    Json::die([
+        'result' => false,
+        'reason' => 'SQL을 제대로 실행하지 못했습니다. DB상태를 확인해 주세요.'
+    ]);
+};
 
 $mysqli_obj = $rootDB->get(); //로그인에 실패할 경우 자동으로 dbConnFail()이 실행됨.
 

hwe/_admin1_submit.php

@@ -74,7 +74,28 @@ switch ($btn) {
         case "120분턴": $turnterm = 120; break;
         default: throw new \Exception("알 수 없는 턴 기간");
         }
-        ServerTool::changeServerTerm($turnterm);
+        $oldunit = $admin['turnterm'] * 60;
+        $unit = $turnterm * 60;
+
+        $unitDiff = $unit / $oldunit;
+
+        $servTurnTime = new \DateTimeImmutable($admin['turntime']);
+        foreach ($db->query('SELECT no,turntime FROM general') as $gen) {
+            $genTurnTime = new \DateTimeImmutable($gen['turntime']);
+            $timeDiff = TimeUtil::DateIntervalToSeconds($genTurnTime->diff($servTurnTime));
+            $timeDiff *= $unitDiff;
+            $newGenTurnTime = $servTurnTime->add(TimeUtil::secondsToDateInterval($timeDiff));
+
+            $db->update('general', [
+                'turntime'=>$newGenTurnTime->format('Y-m-d H:i:s.u')
+            ], 'no=%i', $gen['no']);
+        }
+        $turn = ($admin['year'] - $admin['startyear']) * 12 + $admin['month'] - 1;
+        $starttime = $servTurnTime->sub(TimeUtil::secondsToDateInterval($turn * $unit))->format('Y-m-d H:i:s');
+        $starttime = cutTurn($starttime, $turnterm, false);
+        $gameStor->turnterm = $turnterm;
+        $gameStor->starttime = $starttime;
+        pushGlobalHistoryLog(["<R>★</>턴시간이 <C>$btn</>으로 변경됩니다."]);
         break;
 }
 

hwe/_admin2_submit.php

@@ -33,18 +33,18 @@ $src = MessageTarget::buildQuick($session->generalID);
 $genObjList = [];
 $env = [];
 if ($genlist) {
-    $genObjList = General::createObjListFromDB($genlist);
+    $genObjList = General::createGeneralObjListFromDB($genlist);
     $env = $gameStor->cacheAll();
 }
 switch ($btn) {
     case "전체 접속허용":
-        $db->update('general_access_log', [
+        $db->update('general', [
-            'refresh_score' => 0
+            'con' => 0
         ], true);
         break;
     case "전체 접속제한":
-        $db->update('general_access_log', [
+        $db->update('general', [
-            'refresh_score' => 1000
+            'con' => 1000
         ], true);
         break;
     case "블럭 해제":
@@ -186,14 +186,14 @@ switch ($btn) {
         ], '`no` IN %li', $genlist);
         break;
     case "접속 허용":
-        $db->update('general_access_log', [
+        $db->update('general', [
-            'refresh_score' => 0
+            'con' => 0
-        ], '`general_id` IN %li', $genlist);
+        ], '`no` IN %li', $genlist);
         break;
     case "접속 제한":
-        $db->update('general_access_log', [
+        $db->update('general', [
-            'refresh_score' => 1000
+            'con' => 1000
-        ], '`general_id` IN %li', $genlist);
+        ], '`no` IN %li', $genlist);
         break;
     case "메세지 전달":
         $text = $msg ?? '';

hwe/_admin4.php

@@ -0,0 +1,133 @@
+<?php
+
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+
+if ($session->userGrade < 5) {
+    die(requireAdminPermissionHTML());
+}
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+$conlimit = $gameStor->conlimit;
+
+$ipGroupList = Util::arrayGroupBy(
+    $db->query(
+        'SELECT name,ip,lastconnect,owner,block,substring_index(ip,".",3) as ip_c from general WHERE ip!="" and npc<2'
+    ),
+    'ip_c'
+);
+
+function colorBlockedName($general)
+{
+    if (!$general['blocked']) {
+        return $general['name'];
+    }
+    return "<span style='color:magenta;'>{$general['name']}</span>";
+}
+
+?>
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>멀티관리</title>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+</head>
+
+<body>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>멀 티 관 리<br><?= backButton() ?></td>
+        </tr>
+    </table>
+    <form name=form1 method=post action=_admin4_submit.php>
+        <table align=center width=1000 class='tb_layout bg0'>
+            <tr>
+                <td width=80 align=center rowspan=3>회원선택<br><br>
+                    <font color=cyan>NPC</font><br>
+                    <font color=skyblue>NPC유저</font><br>
+                    <font color=red>접속제한</font><br><b style=background-color:red;>블럭회원</b>
+                </td>
+                <td width=105 rowspan=3>
+                    <?php
+
+                    echo "
+            <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:14px'>";
+
+                    foreach ($db->query('SELECT no,name,npc,block,con from general where ip!=\'\' order by npc,ip') as $general) {
+                        $style = "style=;";
+                        if ($general['block']         > 0) {
+                            $style .= "background-color:red;";
+                        }
+
+                        $npcColor = getNPCColor($general['npc']);
+                        if($npcColor !== null){
+                            $style .= "color:{$npcColor};";
+                        }
+
+                        echo "
+                <option value={$general['no']} $style>{$general['name']}</option>";
+                    }
+
+                    echo "
+            </select>";
+                    ?>
+                </td>
+                <td width=100 align=center>블럭</td>
+                <td width=504>
+                    <input type=submit name=btn value='블럭 해제'><input type=submit name=btn value='1단계 블럭'><input type=submit name=btn value='2단계 블럭'><input type=submit name=btn value='3단계 블럭'><input type=submit name=btn value='무한삭턴'><br>
+                    1단계:발언권, 2단계:턴블럭
+                </td>
+            </tr>
+            <tr>
+                <td align=center>강제 사망</td>
+                <td><input type=submit name=btn value='강제 사망'></td>
+            </tr>
+            <tr>
+                <td align=center>메세지 전달</td>
+                <td><input type=textarea size=60 maxlength=255 name=msg style=background-color:black;color:white;><input type=submit name=btn value='메세지 전달'></td>
+            </tr>
+        </table>
+        <table align=center width=1000 class='tb_layout bg0'>
+            <tr>
+                <td align=center width=100>장수명</td>
+                <td align=center width=180>최근로그인</td>
+                <td align=center width=129>IP</td>
+                <td align=center width=100>ID</td>
+            </tr>
+            <?php foreach ($ipGroupList as $ipGroupC => $users) : ?>
+                <tr>
+                    <td><?= join('<br>', array_map('\sammo\colorBlockedName', $users)) ?></td>
+                    <td><?= join('<br>', array_column($users, 'lastconnect')) ?></td>
+                    <td><?= join('<br>', array_column($users, 'ip')) ?></td>
+                    <td><?= join('<br>', array_column($users, 'owner')) ?></td>
+                </tr>
+            <?php endforeach; ?>
+        </table>
+        <?php
+        //NOTE: password의 md5 해시가 같은지 확인하는 방식으로는 앞으로 잡아낼 수 없다. 폐기
+        ?>
+    </form>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= backButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
+    </table>
+</body>
+
+</html>

hwe/_admin4_submit.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace sammo;
+
+use sammo\Enums\MessageType;
+
+include "lib.php";
+include "func.php";
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+
+if ($session->userGrade < 5) {
+    header('location:_admin4.php');
+    die();
+}
+
+$btn = Util::getPost('btn');
+$genlist = Util::getPost('genlist', 'array_int');
+$msg = Util::getPost('msg', 'string', '메시지');
+
+$db = DB::db();
+
+//NOTE: 왜 기능이 admin2와 admin4가 같이 있는가?
+//NOTE: 왜 블럭 시 admin4에선 금쌀을 없애지 않는가?
+switch ($btn) {
+    case "블럭 해제":
+        DB::db()->query('update general set block=0 where no IN %li', $genlist);
+        break;
+    case "1단계 블럭":
+        $date = TimeUtil::now();
+        $db = DB::db();
+        $db->query('update general set block=1,killturn=24 where no IN %li', $genlist);
+        //FIXME: subquery로 하는게 더 빠를 듯.
+        $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
+        RootDB::db()->query('update member set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
+        break;
+    case "2단계 블럭":
+        $date = TimeUtil::now();
+        $db = DB::db();
+        $db->query('update general set block=2,killturn=24 where no IN %li', $genlist);
+        $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
+        RootDB::db()->query('update member set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
+        break;
+    case "3단계 블럭":
+        $date = TimeUtil::now();
+        $db = DB::db();
+        $db->query('update general set block=3,killturn=24 where no IN %li', $genlist);
+        $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
+        RootDB::db()->query('update member set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
+        break;
+    case "무한삭턴":
+        DB::db()->query('update general set killturn=8000 where no IN %li', $genlist);
+        break;
+    case "강제 사망":
+        $date = TimeUtil::now(true);
+        $db->update('general', [
+            'killturn' => 0,
+            'turntime' => $date,
+        ], '`no` IN %li', $genlist);
+        $db->update('general_turn', [
+            'action' => '휴식',
+            'arg' => '{}',
+            'brief' => '휴식'
+        ], 'general_id IN %li AND turn_idx = 0', $genlist);
+        break;
+    case "메세지 전달":
+        $date = TimeUtil::now();
+        $src = MessageTarget::buildQuick($session->generalID);
+        foreach($genlist as $generalID){
+            $msgObj = new Message(
+                MessageType::private,
+                $src,
+                MessageTarget::buildQuick($generalID),
+                $msg,
+                new \DateTime(),
+                new \DateTime('9999-12-31'),
+                []
+            );
+            if ($msgObj) {
+                $msgObj->send(true);
+            }
+        }
+        break;
+}
+
+header('location:_admin4.php');

hwe/_admin5.php

@@ -66,6 +66,8 @@ $sel2[$type2] = "selected";
                         <option <?= $sel[8] ?? '' ?> value=8>평무</option>
                         <option <?= $sel[9] ?? '' ?> value=9>평지</option>
                         <option <?= $sel[10] ?? '' ?> value=10>평Lv</option>
+                        <option <?= $sel[11] ?? '' ?> value=11>접속률</option>
+                        <option <?= $sel[12] ?? '' ?> value=12>단기접</option>
                         <option <?= $sel[13] ?? '' ?> value=13>보숙</option>
                         <option <?= $sel[14] ?? '' ?> value=14>궁숙</option>
                         <option <?= $sel[15] ?? '' ?> value=15>기숙</option>
@@ -103,6 +105,8 @@ $sel2[$type2] = "selected";
     <table align=center width=1600 class="tb_layout bg0">
         <tr class='bg1'>
             <td align=center>국명</td>
+            <td align=center>접률</td>
+            <td align=center>단접</td>
             <td align=center>국력</td>
             <td align=center>장수</td>
             <td align=center>속령</td>
@@ -143,6 +147,8 @@ SELECT
     A.gold,
     A.rice,
     COUNT(B.nation) AS gennum,
+    ROUND(AVG(B.connect), 1) AS connect,
+    ROUND(AVG(B.con), 1) AS con,
     ROUND(AVG(B.dex1)) AS dex1,
     ROUND(AVG(B.dex2)) AS dex2,
     ROUND(AVG(B.dex3)) AS dex3,
@@ -187,6 +193,12 @@ GROUP BY B.nation
             case 10:
                 $query .= " order by avg(B.explevel) desc";
                 break;
+            case 11:
+                $query .= " order by avg(B.connect) desc";
+                break;
+            case 12:
+                $query .= " order by avg(B.con) desc";
+                break;
             case 13:
                 $query .= " order by avg(B.dex1) desc";
                 break;
@@ -228,6 +240,8 @@ from city where nation=%i', $nation['nation']);
             echo "
     <tr>
         <td align=center style=background-color:{$nation['color']};color:" . newColor($nation['color']) . ";>{$nation['name']}</td>
+        <td align=center>&nbsp;{$nation['connect']}&nbsp;</td>
+        <td align=center>&nbsp;{$nation['con']}&nbsp;</td>
         <td align=center>&nbsp;{$nation['power']}&nbsp;</td>
         <td align=center>&nbsp;{$gen['cnt']}&nbsp;</td>
         <td align=center>&nbsp;{$city['cnt']}&nbsp;</td>

hwe/_admin7.php

@@ -2,8 +2,6 @@
 
 namespace sammo;
 
-use sammo\Enums\GeneralQueryMode;
-
 include "lib.php";
 include "func.php";
 
@@ -76,7 +74,7 @@ if (!$gen) {
     $gen = $generalBasicList[0]['no'];
 }
 
-$generalObj = General::createObjFromDB($gen, null, GeneralQueryMode::FullWithAccessLog);
+$generalObj = General::createGeneralObjFromDB($gen);
 
 ?>
 <!DOCTYPE html>

hwe/_admin_force_rehall.php

@@ -26,7 +26,7 @@ foreach ($db->queryFirstColumn(
 }
 
 $inheritPointManager = InheritancePointManager::getInstance();
-foreach(General::createObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc = 0')) as $genObj){
+foreach(General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc = 0')) as $genObj){
     $inheritPointManager->mergeTotalInheritancePoint($genObj);
     $inheritPointManager->applyInheritanceUser($genObj->getVar('owner'));
 }

hwe/a_genList.php

@@ -16,13 +16,10 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 
 increaseRefresh("장수일람", 2);
 
-$me = $db->queryFirstRow(
+$me = $db->queryFirstRow('SELECT con,turntime FROM general WHERE owner = %i', $userID);
-    'SELECT refresh_score,turntime FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner = %i', $userID
-);
 
-$limitState = checkLimit($me['refresh_score']);
+$con = checkLimit($me['con']);
-if ($limitState >= 2) {
+if ($con >= 2) {
     printLimitMsg($me['turntime']);
     exit();
 }
@@ -32,8 +29,10 @@ if ($type <= 0 || $type > 15) {
 }
 
 $ownerNameList = [];
-foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) {
+if ($gameStor->isunited) {
-    $ownerNameList[$ownerID] = $ownerName;
+    foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) {
+        $ownerNameList[$ownerID] = $ownerName;
+    }
 }
 
 ?>
@@ -52,15 +51,6 @@ foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID
     <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', 'common') ?>
 
-    <style>
-        .hidden {
-            display: none;
-        }
-
-        .generalName:hover > .hidden {
-            display: block;
-        }
-    </style>
 </head>
 
 <body>
@@ -112,7 +102,7 @@ foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID
         6 => ['dedication', true],
         7 => ['officer_level', true],
         8 => ['killturn', false],
-        9 => ['refresh_score_total', true],
+        9 => ['connect', true],
         10 => ['experience', true],
         11 => ['personal', true],
         12 => ['special', true],
@@ -121,12 +111,7 @@ foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID
         15 => ['npc', true],
     ][$type];
 
-    $generalList = $db->query(
+    $generalList = $db->query('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,connect from general order by %b %l', $orderKey, $orderDesc ? 'desc' : '');
-        'SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,refresh_score_total
-        FROM `general` LEFT JOIN `general_access_log` ON general.no = general_access_log.general_id order by %b %l',
-        $orderKey,
-        $orderDesc ? 'desc' : ''
-    );
 
     echo "
 <table align=center width=1000 class='tb_layout bg0'>
@@ -175,14 +160,10 @@ foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID
         $name = formatName($general['name'], $general['npc']);
 
         if (key_exists($general['owner'], $ownerNameList)) {
-            if ($gameStor->isunited) {
+            $name = $name . '<br><small>(' . $ownerNameList[$general['owner']] . ')</small>';
-                $name = $name . '<br><small class=\'userName\'>(' . $ownerNameList[$general['owner']] . ')</small>';
-            } else {
-                $name = $name . '<br><small class=\'userName hidden\'>(' . $ownerNameList[$general['owner']] . ')</small>';
-            }
         }
 
-        $general['refresh_score_total'] = Util::round($general['refresh_score_total'], -1);
+        $general['connect'] = Util::round($general['connect'], -1);
 
         $imageTemp = GetImageURL($general['imgsvr']);
         echo "
@@ -196,7 +177,7 @@ foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID
         data-npc-type='{$general['npc']}'
     >
         <td align=center><img class='generalIcon' width='64' height='64' src='{$imageTemp}/{$general['picture']}'></img></td>
-        <td align=center class='generalName' onclick=''>$name</td>
+        <td align=center>$name</td>
         <td align=center>{$general['age']}세</td>
         <td align=center>" . displayCharInfo($general['personal']) . "</td>
         <td align=center>" . displaySpecialDomesticInfo($general['special']) . " / " . displaySpecialWarInfo($general['special2']) . "</td>
@@ -211,8 +192,8 @@ foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID
         <td align=center>$strength</td>
         <td align=center>$intel</td>
         <td align=center>{$general['killturn']}</td>
-        <td align=center>" . $general['refresh_score_total'] ?? 0;
+        <td align=center>{$general['connect']}";
-        echo "<br>【" . getRefreshScoreText($general['refresh_score_total'] ?? 0) . "】</td>
+        echo "<br>【" . getConnect($general['connect']) . "】</td>
     </tr>";
     }
     echo "

hwe/a_kingdomList.php

@@ -13,13 +13,10 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 $gameStor->cacheValues(['killturn', 'autorun_user', 'turnterm']);
 increaseRefresh("세력일람", 2);
 
-$me = $db->queryFirstRow(
+$me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner=%i', $userID);
-    'SELECT refresh_score, turntime FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
 
-$limitState = checkLimit($me['refresh_score']);
+$con = checkLimit($me['con']);
-if ($limitState >= 2) {
+if ($con >= 2) {
     printLimitMsg($me['turntime']);
     exit();
 }

hwe/a_traffic.php

@@ -2,8 +2,6 @@
 
 namespace sammo;
 
-use sammo\Enums\GeneralAccessLogColumn;
-
 include "lib.php";
 include "func.php";
 
@@ -12,19 +10,34 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 
 increaseRefresh("갱신정보", 1);
 
-$admin = $gameStor->getValues(['year', 'month', 'refresh', 'maxrefresh', 'maxonline', 'recentTraffic']);
+$admin = $gameStor->getValues(['year', 'month', 'refresh', 'maxrefresh', 'maxonline']);
 
-$recentTraffic = $admin['recentTraffic'] ?? [];
+$log = getRawFileLogRecent(__DIR__ . '/logs/' . UniqueConst::$serverID . '/_traffic.txt', 11, 100);
+
+$date = [];
+$year = [];
+$month = [];
+$refresh = [];
+$online = [];
 
 $curonline = getOnlineNum();
-
+foreach ($log as $i => $value) {
-$recentTraffic[] = [
+    $parse = Json::decode($value);
-    'year'    => $admin['year'],
+    if(is_array($parse) === false){
-    'month'   => $admin['month'],
+        continue;
-    'refresh' => $admin['refresh'],
+    }
-    'online'  => $curonline,
+    if(count($parse) < 5){
-    'date' => TimeUtil::now()
+        continue;
-];
+    }
+    $date[$i]    = $parse[0];
+    $year[$i]    = $parse[1];
+    $month[$i]   = $parse[2];
+    $refresh[$i] = $parse[3];
+    $online[$i]  = $parse[4];
+}
+$year[] = $admin['year'];
+$month[] = $admin['month'];
+$date[] = TimeUtil::now();
 
 if ($admin['maxrefresh'] == 0) {
     $admin['maxrefresh'] = 1;
@@ -98,13 +111,13 @@ if ($admin['maxonline'] < $curonline) {
                         </td>
                     </tr>
                     <?php
-                    foreach ($recentTraffic as $trafficItem) {
+                    $refresh[] = $admin['refresh'];
-                        $value = $trafficItem['refresh'];
+                    foreach ($refresh as $i => $value) {
                         $w = round($value / $admin['maxrefresh'] * 100, 1);
                         $color = getTrafficColor($w);
-                        $dt = substr($trafficItem['date'], 11, 5); ?>
+                        $dt = substr($date[$i], 11, 5); ?>
                         <tr height=30>
-                            <td width=100 align=center><?= $trafficItem['year'] ?>년 <?= $trafficItem['month'] ?>월</td>
+                            <td width=100 align=center><?= $year[$i] ?>년 <?= $month[$i] ?>월</td>
                             <td width=60 align=center class='bg2'><?= $dt ?></td>
                             <td width=2 align=center class='bg1'></td>
                             <td width=320>
@@ -139,13 +152,13 @@ if ($admin['maxonline'] < $curonline) {
                         </td>
                     </tr>
                     <?php
-                    foreach ($recentTraffic as $trafficItem) {
+                    $online[] = $curonline;
-                        $value = $trafficItem['online'];
+                    foreach ($online as $i => $value) {
                         $w = round($value / $admin['maxonline'] * 100, 1);
                         $color = getTrafficColor($w);
-                        $dt = substr($trafficItem['date'], 11, 5); ?>
+                        $dt = substr($date[$i], 11, 5); ?>
                         <tr height=30>
-                            <td width=100 align=center><?= $trafficItem['year'] ?>년 <?= $trafficItem['month'] ?>월</td>
+                            <td width=100 align=center><?= $year[$i] ?>년 <?= $month[$i] ?>월</td>
                             <td width=60 align=center class='bg2'><?= $dt ?></td>
                             <td width=2 align=center class='bg1'></td>
                             <td width=320>
@@ -180,24 +193,19 @@ if ($admin['maxonline'] < $curonline) {
             </td>
         </tr>
         <?php
-        $totalRefresh = [
+        $max_refresh = $db->queryFirstRow('SELECT sum(refresh) as refresh, sum(`connect`) as `connect` from general');
-            ...$db->queryFirstRow('SELECT sum(`refresh`) as `refresh`, sum(`refresh_score_total`) as `refresh_score_total` from general_access_log'),
+        $max_refresh['name'] = '접속자 총합';
-            'name' => '접속자 총합'
-        ];
 
-        $top5Refresh = $db->query(
+        $refresh_result = array_merge([$max_refresh], $db->query('SELECT `name`,refresh,`connect` FROM general ORDER BY refresh DESC LIMIT 5'));
-            'SELECT `name`, `log`.`refresh`, `refresh_score_total` FROM `general_access_log` AS `log`
-            INNER JOIN `general` ON `log`.`general_id` = `general`.`no` ORDER BY `log`.`refresh` DESC LIMIT 5'
-        );
 
-        foreach (array_merge([$totalRefresh], $top5Refresh) as $i => $user) {
+        foreach ($refresh_result as $i => $user) {
-            $w = round($user['refresh'] / max(1, $totalRefresh['refresh']) * 100, 1);
+            $w = round($user['refresh'] / max(1, $max_refresh['refresh']) * 100, 1);
             $w2 = round(100 - $w, 1);
             $color = getTrafficColor($w);
         ?>
             <tr>
                 <td width=98 align=center><?= $user['name'] ?></td>
-                <td width=98 align=center><?= $user['refresh_score_total'] ?>(<?= $user['refresh'] ?>)</td>
+                <td width=98 align=center><?= $user['connect'] ?>(<?= $user['refresh'] ?>)</td>
                 <td width=798>
                     <?php if ($w == 0) : ?>
                     <?php elseif ($w < 10) : ?>

hwe/b_betting.php

@@ -2,8 +2,6 @@
 
 namespace sammo;
 
-use sammo\Enums\GeneralLiteQueryMode;
-use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\RankColumn;
 
 include "lib.php";
@@ -23,15 +21,12 @@ $generalID = $session->generalID;
 
 
 
-$me = $db->queryFirstRow(
+$me = $db->queryFirstRow('SELECT no,tournament,con,turntime from general where owner=%i', $userID);
-    'SELECT no,tournament,refresh_score,turntime FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id where owner=%i', $userID
-);
 
 $admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'turnterm', 'develcost']);
 $turnTerm = $admin['turnterm'];
-$limitState = checkLimit($me['refresh_score']);
+$con = checkLimit($me['con']);
-if ($limitState >= 2) {
+if ($con >= 2) {
     printLimitMsg($me['turntime']);
     exit();
 }
@@ -112,7 +107,7 @@ if ($str3) {
 ?>
 <!DOCTYPE html>
 <html>
-<?php if ($limitState == 1) {
+<?php if ($con == 1) {
     MessageBox("접속제한이 얼마 남지 않았습니다!");
 } ?>
 
@@ -507,28 +502,28 @@ if ($str3) {
             $tournamentType = [
                 '전 력 전' => [
                     '종합',
-                    function (GeneralLite $general) {
+                    function (General $general) {
                         return $general->getVar('leadership') + $general->getVar('strength') + $general->getVar('intel');
                     },
                     'tt',
                 ],
                 '통 솔 전' => [
                     '통솔',
-                    function (GeneralLite $general) {
+                    function (General $general) {
                         return $general->getVar('leadership');
                     },
                     'tl',
                 ],
                 '일 기 토' => [
                     '무력',
-                    function (GeneralLite $general) {
+                    function (General $general) {
                         return $general->getVar('strength');
                     },
                     'ts',
                 ],
                 '설 전' => [
                     '지력',
-                    function (GeneralLite $general) {
+                    function (General $general) {
                         return $general->getVar('intel');
                     },
                     'ti',
@@ -565,12 +560,12 @@ if ($str3) {
                         $winColumn = RankColumn::from("{$rankColumn}w");
                         $drawColumn = RankColumn::from("{$rankColumn}d");
                         $loseColumn = RankColumn::from("{$rankColumn}l");
-                        $tournamentRankerList = GeneralLite::createObjListFromDB(
+                        $tournamentRankerList = General::createGeneralObjListFromDB(
                             $db->queryFirstColumn('SELECT general_id FROM rank_data WHERE `type`= %s ORDER BY value DESC LIMIT 40', $gameColumn->value),
                             [$prizeColumn->value, $gameColumn->value, $winColumn->value, $drawColumn->value, $loseColumn->value, 'leadership', 'strength', 'intel', 'no', 'npc', 'name'],
-                            GeneralLiteQueryMode::Core
+                            0
                         );
-                        usort($tournamentRankerList, function (GeneralLite $lhs, GeneralLite $rhs) use ($gameColumn, $winColumn, $drawColumn, $loseColumn) {
+                        usort($tournamentRankerList, function (General $lhs, General $rhs) use ($gameColumn, $winColumn, $drawColumn, $loseColumn) {
                             $result = - ($lhs->getRankVar($gameColumn) <=> $rhs->getRankVar($gameColumn));
                             if ($result !== 0) return $result;
                             $result = - (

hwe/b_currentCity.php

@@ -211,7 +211,7 @@ $templates = new \League\Plates\Engine('templates');
                                 $city['trade'] = "- ";
                             }
 
-                            $dbColumns = General::mergeQueryColumn(['npc', 'defence_train', 'no', 'picture', 'imgsvr', 'name', 'injury', 'leadership', 'strength', 'intel', 'officer_level', 'nation', 'crewtype', 'crew', 'train', 'atmos'])[0];
+                            $dbColumns = General::mergeQueryColumn(['npc', 'defence_train', 'no', 'picture', 'imgsvr', 'name', 'injury', 'leadership', 'strength', 'intel', 'officer_level', 'nation', 'crewtype', 'crew', 'train', 'atmos'], 2)[0];
                             if ($showDetailedInfo) {
                                 $generals = $db->query(
                                     'SELECT %l from general where city=%i order by turntime',
@@ -327,7 +327,8 @@ $templates = new \League\Plates\Engine('templates');
 
                                 if ($ourGeneral && !$isNPC) {
                                     $turnText = [];
-                                    foreach ($generalTurnList[$general['no']] as $turnRawIdx => $turn) {
+                                    $generalObj = new General($general, null, null, null, null, null, false);
+                                    foreach ($generalTurnList[$generalObj->getID()] as $turnRawIdx => $turn) {
                                         $turnIdx = $turnRawIdx + 1;
                                         $turnText[] = "{$turnIdx} : $turn";
                                     }

hwe/b_genList.php

@@ -19,15 +19,12 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 
 increaseRefresh("암행부", 1);
 
-$me = $db->queryFirstRow(
+$me = $db->queryFirstRow('SELECT no,nation,officer_level,con,turntime,belong,permission,penalty from general where owner=%i', $userID);
-    'SELECT no,nation,officer_level,refresh_score,turntime,belong,permission,penalty FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
 
 $nationLevel = $db->queryFirstField('SELECT level FROM nation WHERE nation=%i', $me['nation']);
 
-$limitState = checkLimit($me['refresh_score']);
+$con = checkLimit($me['con']);
-if ($limitState >= 2) {
+if ($con >= 2) {
     printLimitMsg($me['turntime']);
     exit();
 }
@@ -48,7 +45,7 @@ $templates = new \League\Plates\Engine('templates');
 ?>
 <!DOCTYPE html>
 <html>
-<?php if ($limitState == 1) {
+<?php if ($con == 1) {
     MessageBox("접속제한이 얼마 남지 않았습니다!");
 } ?>
 

hwe/b_myGenInfo.php

@@ -97,7 +97,7 @@ if ($gameStor->isunited) {
         7 => ['gold', true],
         8 => ['rice', true],
         9 => ['crew', true],
-        10 => ['refresh_score_total', true],
+        10 => ['connect', true],
         11 => ['personal', true],
         12 => ['special', true],
         13 => ['special2', true],
@@ -105,9 +105,7 @@ if ($gameStor->isunited) {
         15 => ['npc', true],
     ][$type];
 
-    $generalList = $db->query(
+    $generalList = $db->query('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,connect,gold,rice,crew,belong from general where nation = %i order by %b %l', $me['nation'], $orderKey, $orderDesc ? 'desc' : '');
-        'SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,refresh_score_total,gold,rice,crew,belong
-        FROM `general` LEFT JOIN `general_access_log` ON general.no = general_access_log.general_id where nation = %i order by %b %l', $me['nation'], $orderKey, $orderDesc ? 'desc' : '');
 
     echo "
 <table align=center class='tb_layout bg0'>
@@ -175,8 +173,8 @@ if ($gameStor->isunited) {
         <td align=center>" . displayCharInfo($general['personal']) . "</td>
         <td align=center>" . displaySpecialDomesticInfo($general['special']) . " / " . displaySpecialWarInfo($general['special2']) . "</td>
         <td align=center>{$general['belong']}</td>
-        <td align=center>". $general['refresh_score_total'] ?? 0;
+        <td align=center>{$general['connect']}";
-        echo "<br>(" . getRefreshScoreText($general['refresh_score_total'] ?? 0) . ")</td>
+        echo "<br>(" . getConnect($general['connect']) . ")</td>
     </tr>";
     }
     echo "

hwe/b_myPage.php

@@ -2,10 +2,6 @@
 
 namespace sammo;
 
-use sammo\Enums\GeneralAccessLogColumn;
-use sammo\Enums\GeneralQueryMode;
-use sammo\Enums\TableName;
-
 include "lib.php";
 include "func.php";
 
@@ -24,7 +20,7 @@ $gameStor->cacheValues(['turntime', 'opentime', 'autorun_user', 'npcmode']);
 
 increaseRefresh("내정보", 1);
 
-$me = General::createObjFromDB($generalID, null, GeneralQueryMode::FullWithAccessLog);
+$me = General::createGeneralObjFromDB($generalID);
 
 $myset = $me->getVar('myset');
 if ($myset > 0) {
@@ -33,15 +29,7 @@ if ($myset > 0) {
     $submit = 'hidden';
 }
 
-$lastRefresh = $db->queryFirstField(
+$targetTime = addTurn($me->getVar('lastrefresh'), $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
-    'SELECT %b FROM %b WHERE %b = %i',
-    GeneralAccessLogColumn::lastRefresh->value,
-    TableName::generalAccessLog->value,
-    GeneralAccessLogColumn::generalID->value,
-    $generalID
-);
-
-$targetTime = addTurn($lastRefresh, $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
 if ($gameStor->turntime <= $gameStor->opentime) {
     //서버 가오픈시 할 수 있는 행동
     if ($me->getNPCType() == 0 && $me->getNationID() == 0) {
@@ -51,19 +39,13 @@ if ($gameStor->turntime <= $gameStor->opentime) {
         }
     }
 
-    if ($me->getNationID() == 0) {
+    if($me->getNationID() == 0){
         $showBuildNationCandidateBtn = true;
     }
 }
 
 $use_treatment = $me->getAuxVar('use_treatment') ?? 10;
 $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
-
-$changeDefence999Train = -3;
-$changeDefence999Atmos = -6;
-$changeDefence999Train = $me->onCalcDomestic('changeDefenceTrain', "train999", $changeDefence999Train);
-$changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $changeDefence999Atmos);
-
 ?>
 <!DOCTYPE html>
 <html>
@@ -99,13 +81,13 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
             <div class="col">내 정 보<br><?= backButton() ?></div>
         </div>
         <div class="row gx-0">
-            <div class="col col-12 col-lg-6">
+            <div class="col col-12 col-md-6">
                 <div class="row">
                     <div class="col"><?php generalInfo($me); ?><?php generalInfo2($me); ?></div>
                 </div>
             </div>
 
-            <div class="col col-12 col-lg-6">
+            <div class="col col-12 col-md-6">
                 <div class="row mx-0 gx-0">
                     <div class="col" style='padding-left:2ch;'>
                         토너먼트 【
@@ -135,10 +117,7 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
                             <?php foreach ([90, 80, 60, 40] as $targetDefenceTrain) : ?>
                                 <option value='<?= $targetDefenceTrain ?>' <?= $me->getVar('defence_train') == $targetDefenceTrain ? "selected" : ""; ?>><?= formatDefenceTrain($targetDefenceTrain) ?>(훈사<?= $targetDefenceTrain ?>)</option>
                             <?php endforeach; ?>
-                            <option value=999 <?= $me->getVar('defence_train') == 999 ? "selected" : ""; ?>><?= formatDefenceTrain(999) ?>
+                            <option value=999 <?= $me->getVar('defence_train') == 999 ? "selected" : ""; ?>><?= formatDefenceTrain(999) ?>[훈련 -3, 사기 -6]</option>
-                            <?php if($changeDefence999Train != 0 || $changeDefence999Train != 0):
-                            ?>[<?=$changeDefence999Train!=0?"훈련 {$changeDefence999Train},":''?><?=$changeDefence999Atmos!=0?"사기 {$changeDefence999Atmos}":''
-                            ?>]<?php endif?></option>
                         </select>
                         】<br><br>
                         <input type=<?= $submit ?> id='set_my_setting' name=btn style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px; value=설정저장><br>
@@ -160,11 +139,6 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
                             <button type="button" id='buildNationCandidate' style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>사전 거병</button><br><br>
                         <?php endif; ?>
 
-                        <?php if (GameConst::$availableInstantAction['instantRetreat'] ?? false) : ?>
-                            거리 3칸 이내 아국 도시로 즉시 이동<br>
-                            <button type="button" id='instantRetreat' style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>접경 귀환</button><br><br>
-                        <?php endif; ?>
-
                         <?php if ($gameStor->npcmode == 2 && $me->getNPCType() == 0) : ?>
                             다른 장수 선택 (<?= substr($me->getAuxVar('next_change') ?? TimeUtil::now(), 0, 19) ?> 부터)<br>
                             <a href="select_general_from_pool.php" id='select_general_from_pool'><button type="button" style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>다른 장수 선택</button></a><br><br>
@@ -193,7 +167,7 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
                         <div class="row mx-1">
                             <div class="btn-group" role="group">
                                 <?php foreach ($me->getItems() as $itemKey => $item) : ?>
-                                    <button type="button" data-item-type='<?= $itemKey ?>' class="drop-item-btn btn btn-primary <?= $item->getName() == '-' ? 'disabled' : '' ?>"><?= $item->getName() ?></button>
+                                    <button type="button" data-item-type='<?=$itemKey?>' class="drop-item-btn btn btn-primary <?= $item->getName() == '-' ? 'disabled' : '' ?>"><?= $item->getName() ?></button>
                                 <?php endforeach; ?>
                             </div>
                         </div>
@@ -204,7 +178,7 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
                     </div>
                 </div>
             </div>
-            <div class="col col-12 col-lg-6">
+            <div class="col col-12 col-md-6">
                 <div class="row gx-0">
                     <div class="col bg1 text-center">
                         <h4 style='color:skyblue'>개인 기록</h4>
@@ -217,7 +191,7 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
                     <button type="button" class="load_old_log btn btn-secondary" data-log_type="generalAction">이전 로그 불러오기</button>
                 </div>
             </div>
-            <div class="col col-12 col-lg-6">
+            <div class="col col-12 col-md-6">
                 <div class="row gx-0">
                     <div class="col bg1 text-center">
                         <h4 style='color:orange'>전투 기록</h4>
@@ -231,7 +205,7 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
                 </div>
             </div>
 
-            <div class="col col-12 col-lg-6">
+            <div class="col col-12 col-md-6">
                 <div class="row gx-0">
                     <div class="col bg1 text-center">
                         <h4 style='color:skyblue'>장수 열전</h4>
@@ -241,7 +215,7 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
                     <?= formatHistoryToHTML(getGeneralHistoryLogAll($generalID)) ?>
                 </div>
             </div>
-            <div class="col col-12 col-lg-6">
+            <div class="col col-12 col-md-6">
                 <div class="row gx-0">
                     <div class="col bg1 text-center">
                         <h4 style='color:orange'>전투 결과</h4>

hwe/b_tournament.php

@@ -14,16 +14,14 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 increaseRefresh("토너먼트", 1);
 TurnExecutionHelper::executeAllCommand();
 
-$me = $db->queryFirstRow(
+$me = $db->queryFirstRow('select no,tournament,con,turntime from general where owner=%i', $userID);
-    'SELECT no,tournament,refresh_score,turntime from `general`
+$generalID = $session->generalID;
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id where owner=%i', $userID
+
-);
-$generalID = $me['no'];
 $admin = $gameStor->getValues(['tournament', 'phase', 'turnterm', 'tnmt_msg', 'tnmt_type', 'develcost', 'tnmt_trig']);
 $turnTerm = $admin['turnterm'];
 
-$limitState = checkLimit($me['refresh_score']);
+$con = checkLimit($me['con']);
-if ($limitState >= 2) {
+if ($con >= 2) {
     printLimitMsg($me['turntime']);
     exit();
 }
@@ -102,7 +100,7 @@ $globalBetTotal = array_sum($globalBet);
 ?>
 <!DOCTYPE html>
 <html>
-<?php if ($limitState == 1) {
+<?php if ($con == 1) {
     MessageBox("접속제한이 얼마 남지 않았습니다! 제한량이 모자라다면 참여를 해보세요^^");
 } ?>
 

hwe/d_setting/ServerEnv.orig.php

@@ -1,6 +0,0 @@
-<?php
-namespace sammo;
-
-class ServerEnv extends ServerDefaultEnv {
-    //ServerEnv 기본값을 변경하고 싶다면 orig를 제거한 복사본을 만들고 수정
-}

hwe/func.php

@@ -5,9 +5,6 @@ namespace sammo;
 use DateTime;
 use Ds\Set;
 use sammo\Enums\AuctionType;
-use sammo\Enums\GeneralAccessLogColumn;
-use sammo\Enums\GeneralColumn;
-use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\InheritanceKey;
 use sammo\Enums\RankColumn;
 
@@ -106,9 +103,10 @@ function GetImageURL($imgsvr, $filepath = '')
 }
 
 /**
- * @param null|int $refreshScore 장수의 벌점
+ * @param null|int $con 장수의 벌점
+ * @param null|int $conlimit 최대 벌점
  */
-function checkLimit($refreshScore = null)
+function checkLimit($con = null)
 {
     $session = Session::getInstance();
     if ($session->userGrade >= 4) {
@@ -118,15 +116,15 @@ function checkLimit($refreshScore = null)
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
-    if ($refreshScore === null) {
+    if ($con === null) {
-        $refreshScore = $db->queryFirstField('SELECT refresh_score FROM general_access_log WHERE `general_id`=%i', Session::getGeneralID());
+        $con = $db->queryFirstField('SELECT con FROM general WHERE `owner`=%i', Session::getUserID());
     }
-    $refreshLimit = $gameStor->refreshLimit;
+    $conlimit = $gameStor->conlimit;
 
-    if ($refreshScore > $refreshLimit) {
+    if ($con > $conlimit) {
         return 2;
         //접속제한 90%이면 경고문구
-    } elseif ($refreshScore > $refreshLimit * 0.9) {
+    } elseif ($con > $conlimit * 0.9) {
         return 1;
     } else {
         return 0;
@@ -149,7 +147,7 @@ function getRandGenName(RandUtil $rng)
 
 
 
-function cityInfo(GeneralLite $generalObj)
+function cityInfo(General $generalObj)
 {
     $db = DB::db();
 
@@ -408,14 +406,14 @@ function checkSecretPermission(array $me, $checkSecretLimit = true)
     }
 
     $secretMin = 0;
-    $secretMax = checkSecretMaxPermission($penalty);
+    $secretMax = checkSecretMaxPermission($me, $penalty);
 
 
     if ($me['officer_level'] == 12) {
         $secretMin = 4;
-    } else if ($permission == 'ambassador') {
+    } else if ($me['permission'] == 'ambassador') {
         $secretMin = 4;
-    } else if ($permission == 'auditor') {
+    } else if ($me['permission'] == 'auditor') {
         $secretMin = 3;
     } else if ($me['officer_level'] >= 5) {
         $secretMin = 2;
@@ -644,7 +642,7 @@ function generalInfo(General $generalObj)
         $age = "<font color=red>{$age} 세</font>";
     }
 
-    $refreshScoreTotal = round($generalObj->getAccessLogVar(GeneralAccessLogColumn::refreshScoreTotal) ?? 0, -1);
+    $connectCnt = round($generalObj->getVar('connect'), -1);
     $specialDomestic = $generalObj->getVar('special') === GameConst::$defaultSpecialDomestic
         ? "{$generalObj->getVar('specage')}세"
         : "<font color=limegreen>" . displayiActionObjInfo($generalObj->getSpecialDomestic()) . "</font>";
@@ -753,7 +751,7 @@ function generalInfo(General $generalObj)
         <td style='text-align:center;' class='bg1'><b>부대</b></td>
         <td style='text-align:center;' colspan=3>{$troopInfo}</td>
         <td style='text-align:center;' class='bg1'><b>벌점</b></td>
-        <td style='text-align:center;' colspan=5>" . getRefreshScoreText($refreshScoreTotal) . " {$refreshScoreTotal}({$generalObj->getAccessLogVar(GeneralAccessLogColumn::refreshScore)})</td>
+        <td style='text-align:center;' colspan=5>" . getConnect($connectCnt) . " {$connectCnt}({$generalObj->getVar('con')})</td>
     </tr>
 </table>";
 }
@@ -1000,69 +998,52 @@ function increaseRefresh($type = "", $cnt = 1)
     $generalID = $session->generalID;
     $userGrade = $session->userGrade;
 
-    $dateObj = new \DateTimeImmutable();
+    $date = TimeUtil::now();
-    $date = TimeUtil::format($dateObj, false);
 
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $isunited = $gameStor->isunited;
     $opentime = $gameStor->opentime;
 
-    if ($userGrade == 6) {
+    if($userGrade == 6){
         return;
     }
-    if ($isunited == 2) {
+    if($isunited == 2){
         return;
     }
-    if (!$generalID) {
+    if(!$generalID){
         return;
     }
-    if ($opentime > $date) {
+    if($opentime > $date){
         return;
     }
 
     $gameStor->refresh = $gameStor->refresh + $cnt; //TODO: +로 증가하는 값은 별도로 분리
 
-    $db->insertUpdate('general_access_log', [
+    $db->update('general', [
-        GeneralAccessLogColumn::generalID->value => $generalID,
+        'lastrefresh' => $date,
-        GeneralAccessLogColumn::userID->value => $userID,
+        'con' => $db->sqleval('con + %i', $cnt),
-        GeneralAccessLogColumn::lastRefresh->value => $date,
+        'connect' => $db->sqleval('connect + %i', $cnt),
-        GeneralAccessLogColumn::refreshTotal->value => $cnt,
+        'refcnt' => $db->sqleval('refcnt + %i', $cnt),
-        GeneralAccessLogColumn::refresh->value => $cnt,
+        'refresh' => $db->sqleval('refresh + %i', $cnt)
-        GeneralAccessLogColumn::refreshScore->value => $cnt,
+    ], 'owner=%i', $userID);
-        GeneralAccessLogColumn::refreshScoreTotal->value => $cnt,
-    ], [
-        GeneralAccessLogColumn::lastRefresh->value => $date,
-        GeneralAccessLogColumn::refreshTotal->value => $db->sqleval('%b + %i', GeneralAccessLogColumn::refreshTotal->value, $cnt),
-        GeneralAccessLogColumn::refresh->value => $db->sqleval('%b + %i', GeneralAccessLogColumn::refresh->value, $cnt),
-        GeneralAccessLogColumn::refreshScore->value => $db->sqleval('%b + %i', GeneralAccessLogColumn::refreshScore->value, $cnt),
-        GeneralAccessLogColumn::refreshScoreTotal->value => $db->sqleval('%b + %i', GeneralAccessLogColumn::refreshScoreTotal->value, $cnt),
-    ]);
 
-    $serverPath = __DIR__;
+    $date = date('Y_m_d H:i:s');
-
+    $date2 = substr($date, 0, 10);
-    $serverID = UniqueConst::$serverID;
+    $online = getOnlineNum();
-    $logPath = "{$serverPath}/logs/{$serverID}/api_log.db";
+    file_put_contents(
-
+        __DIR__ . "/logs/" . UniqueConst::$serverID . "/_{$date2}_refresh.txt",
-    $logDB = FileDB::db($logPath, $serverPath . '/../f_install/sql/api_log.sql');
+        sprintf(
-
+            "%s, %s, %s, %s, %s, %d\n",
-    $ip = $_SERVER['REMOTE_ADDR'] ?? 'local';
+            $date,
-    $date = date('Y-m-d H:i:s');
+            $session->userName,
-
+            $session->generalName,
-    $logDB->insert('api_log', [
+            $session->ip,
-        'user_id' => $session->userID,
+            $type,
-        'ip' => $ip,
+            $online
-        'date' => $date,
+        ),
-        'path' => "refresh",
+        FILE_APPEND
-        'arg' => Json::encode([
+    );
-            'type' => $type,
-        ]),
-        'aux' => Json::encode([
-            'generalID' => $generalID,
-            'generalName' => $session->generalName,
-            'userName' => $session->userName,
-        ]),
-    ]);
 }
 
 function updateTraffic()
@@ -1070,9 +1051,12 @@ function updateTraffic()
     $online = getOnlineNum();
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    $admin = $gameStor->getValues(['year', 'month', 'refresh', 'maxonline', 'maxrefresh', 'recentTraffic']);
+    $admin = $gameStor->getValues(['year', 'month', 'refresh', 'maxonline', 'maxrefresh']);
     /** @var array{year:int,month:int,refresh:int,maxonline:int,maxrefresh:int} $admin */
 
+    //최다갱신자
+    $user = $db->queryFirstRow('select name,refresh from general order by refresh desc limit 1');
+
     if ($admin['maxrefresh'] < $admin['refresh']) {
         $admin['maxrefresh'] = $admin['refresh'];
     }
@@ -1083,20 +1067,22 @@ function updateTraffic()
     $gameStor->maxrefresh = $admin['maxrefresh'];
     $gameStor->maxonline = $admin['maxonline'];
 
-    $recentTraffic = $admin['recentTraffic'] ?? [];
+    $db->update('general', ['refresh' => 0], true);
-    if(count($recentTraffic) >= 5){
-        array_shift($recentTraffic);
-    }
-    $recentTraffic[] = [
-        'year'=>$admin['year'],
-        'month' => $admin['month'],
-        'refresh' => $admin['refresh'],
-        'online' => $online,
-        'date' => TimeUtil::now(),
-    ];
-    $gameStor->recentTraffic = $recentTraffic;
 
-    $db->update('general_access_log', ['refresh' => 0], true);
+    $date = TimeUtil::now();
+    //일시|년|월|총갱신|접속자|최다갱신자
+    file_put_contents(
+        __DIR__ . "/logs/" . UniqueConst::$serverID . "/_traffic.txt",
+        Json::encode([
+            $date,
+            $admin['year'],
+            $admin['month'],
+            $admin['refresh'],
+            $online,
+            $user['name'] . "(" . $user['refresh'] . ")"
+        ]) . "\n",
+        FILE_APPEND
+    );
 }
 
 function CheckOverhead()
@@ -1104,13 +1090,13 @@ function CheckOverhead()
     //서버정보
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    [$turnterm, $refreshLimit] = $gameStor->getValuesAsArray(['turnterm', 'refreshLimit']);
+    list($turnterm, $conlimit) = $gameStor->getValuesAsArray(['turnterm', 'conlimit']);
 
-    $nextRefreshLimit = Util::round(pow($turnterm, 0.6) * 3) * 10;
+    $con = Util::round(pow($turnterm, 0.6) * 3) * 10;
 
 
-    if ($nextRefreshLimit != $refreshLimit) {
+    if ($con != $conlimit) {
-        $gameStor->refreshLimit = $nextRefreshLimit;
+        $gameStor->conlimit = $con;
     }
 }
 
@@ -1214,16 +1200,7 @@ function updateOnline()
 
     //동접수
     $startTurn = cutTurn($gameStor->turntime, $gameStor->turnterm, false);
-    $onlineUser = $db->query(
+    $onlineUser = $db->query('SELECT no,name,nation FROM general WHERE lastrefresh >= %s AND npc < 2', $startTurn);
-        'SELECT %b, %b, %b FROM `general_access_log` as `log` INNER JOIN `general` ON `log`.%b = `general`.%b WHERE %b >= %s',
-        GeneralColumn::no->value,
-        GeneralColumn::name->value,
-        GeneralColumn::nation->value,
-        GeneralAccessLogColumn::generalID->value,
-        GeneralColumn::no->value,
-        GeneralAccessLogColumn::lastRefresh->value,
-        $startTurn
-    );
     $onlineNum = count($onlineUser);
     $onlineNationUsers = Util::arrayGroupBy($onlineUser, 'nation');
 
@@ -1337,7 +1314,7 @@ function CheckHall($no)
         ["betrate", 'calc'],
     ];
 
-    $generalObj = General::createObjFromDB($no);
+    $generalObj = General::createGeneralObjFromDB($no, null, 2);
 
     $ttw = $generalObj->getRankVar(RankColumn::ttw);
     $ttd = $generalObj->getRankVar(RankColumn::ttd);
@@ -1727,13 +1704,14 @@ function deleteNation(General $lord, bool $applyDB): array
     $logger->pushGlobalHistoryLog("<R><b>【멸망】</b></><D><b>{$nationName}</b></>{$josaUn} <R>멸망</>했습니다.");
 
 
-    $nationGeneralList = General::createObjListFromDB(
+    $nationGeneralList = General::createGeneralObjListFromDB(
         $db->queryFirstColumn(
             'SELECT `no` FROM general WHERE nation=%i AND no != %i',
             $nationID,
             $lordID
         ),
         ['npc', 'owner', 'gold', 'rice', 'experience', 'explevel', 'dedication', 'dedlevel', 'belong', 'aux'],
+        1
     );
     $nationGeneralList[$lordID] = $lord;
 
@@ -1750,7 +1728,7 @@ function deleteNation(General $lord, bool $applyDB): array
 
     // 전 장수 재야로
     foreach ($nationGeneralList as $general) {
-        if ($general->getNPCType() < 2) {
+        if($general->getNPCType() < 2){
             $general->setAuxVar(
                 InheritanceKey::max_belong->value,
                 max(

hwe/func_command.php

@@ -213,7 +213,7 @@ function _setGeneralCommand(GeneralCommand $command, array $turnList):void {
 
     $db->update('general_turn', [
         'action'=>$commandName,
-        'arg'=>Json::encode($arg, Json::EMPTY_ARRAY_IS_DICT),
+        'arg'=>Json::encode($arg, JSON::EMPTY_ARRAY_IS_DICT),
         'brief'=>$brief
     ], 'general_id = %i AND turn_idx IN %li', $generalID, $turnList);
 }
@@ -233,7 +233,7 @@ function _setNationCommand(NationCommand $command, array $turnList):void  {
 
     $db->update('nation_turn', [
         'action'=>$commandName,
-        'arg'=>Json::encode($arg, Json::EMPTY_ARRAY_IS_DICT),
+        'arg'=>Json::encode($arg, JSON::EMPTY_ARRAY_IS_DICT),
         'brief'=>$brief
     ], 'nation_id = %i AND officer_level = %i AND turn_idx IN %li', $nationID, $officerLevel, $turnList);
 }
@@ -350,7 +350,7 @@ function setGeneralCommand(int $generalID, array $rawTurnList, string $command,
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $env = $gameStor->getAll();
-    $general = General::createObjFromDB($generalID);
+    $general = General::createGeneralObjFromDB($generalID);
 
     try{
         $commandObj = buildGeneralCommandClass($command, $general, $env, $arg);
@@ -425,7 +425,7 @@ function setNationCommand(int $generalID, array $turnList, string $command, ?arr
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $env = $gameStor->getAll();
-    $general = General::createObjFromDB($generalID);
+    $general = General::createGeneralObjFromDB($generalID);
 
     if($general->getVar('officer_level') < 5){
         return [

hwe/func_converter.php

@@ -133,19 +133,19 @@ function getNationType(?string $type) {
 }
 
 
-function getRefreshScoreText($score) {
+function getConnect($con) {
-    if($score < 50)        $scoreName = '안함';
+    if($con < 50)        $conname = '안함';
-    elseif($score <   100) $scoreName = '무관심';
+    elseif($con <   100) $conname = '무관심';
-    elseif($score <   200) $scoreName = '가끔';
+    elseif($con <   200) $conname = '가끔';
-    elseif($score <   400) $scoreName = '보통';
+    elseif($con <   400) $conname = '보통';
-    elseif($score <   800) $scoreName = '자주';
+    elseif($con <   800) $conname = '자주';
-    elseif($score <  1600) $scoreName = '열심';
+    elseif($con <  1600) $conname = '열심';
-    elseif($score <  3200) $scoreName = '중독';
+    elseif($con <  3200) $conname = '중독';
-    elseif($score <  6400) $scoreName = '폐인';
+    elseif($con <  6400) $conname = '폐인';
-    elseif($score < 12800) $scoreName = '경고';
+    elseif($con < 12800) $conname = '경고';
-    else $scoreName = '헐...';
+    else $conname = '헐...';
 
-    return $scoreName;
+    return $conname;
 }
 
 function getNationType2(?string $type) {
@@ -256,41 +256,6 @@ function buildItemClass(?string $type):BaseItem{
     return $obj;
 }
 
-function getScenarioEffectClass(?string $type){
-    if($type === null || $type === ''){
-        $type = 'None';
-    }
-
-    static $basePath = __NAMESPACE__.'\\ActionScenarioEffect\\';
-    $classPath = ($basePath.$type);
-
-    if(class_exists($classPath)){
-        return $classPath;
-    }
-
-    $classPath = ($basePath.'che_'.$type);
-    if(class_exists($classPath)){
-        return $classPath;
-    }
-
-    throw new \InvalidArgumentException("{$type}은 시나리오 효과 클래스가 아님");
-}
-
-function buildScenarioEffectClass(?string $type):iAction{
-    static $cache = [];
-    if($type === null){
-        $type = 'None';
-    }
-    if(key_exists($type, $cache)){
-        return $cache[$type];
-    }
-    $class = getScenarioEffectClass($type);
-
-    $obj = new $class();
-    $cache[$type]= $obj;
-    return $obj;
-}
-
 function getGeneralSpecialDomesticClass(?string $type){
     if($type === null || $type === ''){
         $type = GameConst::$defaultSpecialDomestic;
@@ -361,41 +326,6 @@ function buildGeneralSpecialWarClass(?string $type):BaseSpecial{
     return $obj;
 }
 
-function getActionCrewTypeClass(?string $type){
-    if($type === null || $type === ''){
-        $type = 'None';
-    }
-
-    static $basePath = __NAMESPACE__.'\\ActionCrewType\\';
-    $classPath = ($basePath.$type);
-
-    if(class_exists($classPath)){
-        return $classPath;
-    }
-
-    $classPath = ($basePath.'che_'.$type);
-    if(class_exists($classPath)){
-        return $classPath;
-    }
-
-    throw new \InvalidArgumentException("{$type}은 올바른 병종 효과가 아님");
-}
-
-function buildActionCrewTypeClass(?string $type):iAction{
-    static $cache = [];
-    if($type === null){
-        $type = 'None';
-    }
-    if(key_exists($type, $cache)){
-        return $cache[$type];
-    }
-    $class = getActionCrewTypeClass($type);
-
-    $obj = new $class();
-    $cache[$type]= $obj;
-    return $obj;
-}
-
 function getGeneralCommandClass(?string $type){
     if($type === null || $type === ''){
         $type = '휴식';
@@ -612,8 +542,6 @@ function getExpLevel($experience) {
         $level = Util::toInt(sqrt($experience/10));
     }
 
-    $level = Util::clamp($level, 0, GameConst::$maxLevel);
-
     return $level;
 }
 

hwe/func_gamerule.php

@@ -202,10 +202,8 @@ function preUpdateMonthly()
     $admin = $gameStor->getValues(['startyear', 'year', 'month']);
 
     //접률감소, 건국제한-1
-    $db->update('general_access_log', [
-        'refresh_score_total' => $db->sqleval('floor(refresh_score_total*0.99)'),
-    ], true);
     $db->update('general', [
+        'connect' => $db->sqleval('floor(connect*0.99)'),
         'makelimit' => $db->sqleval('greatest(0, makelimit - 1)'),
     ], true);
     //전략제한-1, 외교제한-1, 세율동기화
@@ -303,6 +301,7 @@ function postUpdateMonthly(RandUtil $rng)
                 WHERE g.nation = A.nation)
         +(select round(sum(dex1+dex2+dex3+dex4+dex5)/1000) from general where nation=A.nation)
         +(select round(sum(experience+dedication)/100) from general where nation=A.nation)
+        +(select round(avg(connect)) from general where nation=A.nation)
     )/10)
     as power,
     (select sum(crew) from general where nation=A.nation) as totalCrew
@@ -451,7 +450,7 @@ function checkWander(RandUtil $rng)
 
     $wanderers = $db->queryFirstColumn('SELECT general.`no` FROM general LEFT JOIN nation ON general.nation = nation.nation WHERE nation.`level` = 0 AND general.`officer_level` = 12');
 
-    foreach (General::createObjListFromDB($wanderers) as $wanderer) {
+    foreach (General::createGeneralObjListFromDB($wanderers) as $wanderer) {
         $wanderCmd = buildGeneralCommandClass('che_해산', $wanderer, $admin);
         if ($wanderCmd->hasFullConditionMet()) {
             $logger = $wanderer->getLogger();
@@ -698,7 +697,7 @@ function checkEmperior()
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
-    $admin = $gameStor->getValues(['year', 'month', 'isunited', 'refreshLimit']);
+    $admin = $gameStor->getValues(['year', 'month', 'isunited', 'conlimit']);
     if ($admin['isunited'] != 0) {
         return;
     }
@@ -743,7 +742,7 @@ function checkEmperior()
     }
 
     $inheritPointManager = InheritancePointManager::getInstance();
-    $allUserGenerals = General::createObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc < 2'));
+    $allUserGenerals = General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc < 2'));
     foreach ($allUserGenerals as $genObj) {
         if ($genObj->getNationID() == $nationID) {
             if ($genObj->getVar('officer_level') > 4) {
@@ -760,7 +759,7 @@ function checkEmperior()
     }
 
     $gameStor->isunited = 2;
-    $gameStor->refreshLimit = $gameStor->refreshLimit * 100;
+    $gameStor->conlimit = $gameStor->conlimit * 100;
 
     foreach ($db->queryFirstColumn('SELECT no FROM general WHERE npc<2 AND age>=%i', GameConst::$minPushHallAge) as $hallGeneralNo) {
         CheckHall($hallGeneralNo);
@@ -772,7 +771,7 @@ function checkEmperior()
 
     $chiefs = Util::convertArrayToDict(
         $db->query(
-            'SELECT no,npc,name,picture,belong,officer_level FROM general WHERE nation=%i AND officer_level >= 5',
+            'SELECT no,name,picture,belong,officer_level FROM general WHERE nation=%i AND officer_level >= 5',
             $nationID
         ),
         'officer_level'
@@ -899,7 +898,7 @@ function checkEmperior()
         'tiger' => $tigerstr,
         'eagle' => $eaglestr,
         'gen' => $gen,
-        'history' => Json::encode($nationHistory),
+        'history' => JSON::encode($nationHistory),
         'aux' => $statGeneral['aux']
     ]);
 
@@ -909,34 +908,6 @@ function checkEmperior()
 
     //연감 월결산
     LogHistory();
-
-    $availableInvaderGame = false;
-    foreach(CityConst::all() as $city){
-        if($city->level == 4){
-            $availableInvaderGame = true;
-            break;
-        }
-    }
-    if($availableInvaderGame){
-        $invaderMsgCnt = 2;
-        foreach(range(12, 5, -1) as $chiefLevel){
-            if(!key_exists($chiefLevel, $chiefs)){
-                continue;
-            }
-            $targetChief = $chiefs[$chiefLevel];
-            if($targetChief['npc'] >= 2){
-                continue;
-            }
-            $invaderMsgs = RaiseInvaderMessage::buildRaiseInvaderMessage($targetChief['no']);
-            foreach($invaderMsgs as $invaderMsg){
-                $invaderMsg->send();
-            }
-            $invaderMsgCnt--;
-            if($invaderMsgCnt <= 0){
-                break;
-            }
-        }
-    }
 }
 
 function updateMaxDomesticCritical(General $general, $score)
@@ -951,19 +922,8 @@ function updateMaxDomesticCritical(General $general, $score)
     }
 }
 
-function genGenericUniqueRNG(int $year, int $month, int $generalID, ?string $reason = null): RandUtil
+function genGenericUniqueRNG(int $year, int $month, int $generalID): RandUtil
 {
-    if($reason){
-        return new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
-            UniqueConst::$hiddenSeed,
-            'unique',
-            $year,
-            $month,
-            $generalID,
-            $reason
-        )));
-    }
-
     return new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
         UniqueConst::$hiddenSeed,
         'unique',
@@ -973,7 +933,7 @@ function genGenericUniqueRNG(int $year, int $month, int $generalID, ?string $rea
     )));
 }
 
-function genGenericUniqueRNGFromGeneral(General $general, string $reason): RandUtil
+function genGenericUniqueRNGFromGeneral(General $general): RandUtil
 {
     $logger = $general->getLogger();
     if (!$logger) {
@@ -982,5 +942,5 @@ function genGenericUniqueRNGFromGeneral(General $general, string $reason): RandU
     $year = $logger->getYear();
     $month = $logger->getMonth();
     $generalID = $general->getID();
-    return genGenericUniqueRNG($year, $month, $generalID, $reason);
+    return genGenericUniqueRNG($year, $month, $generalID);
 }

hwe/func_template.php

@@ -148,6 +148,63 @@ function allButton(bool $seizeNPCMode, array $opts = [])
     ], $opts));
 }
 
+
+function commandButton(array $opts = [])
+{
+    $session = Session::getInstance();
+    $userID = Session::getUserID();
+    if (!$session->isGameLoggedIn()) {
+        return '';
+    }
+
+    $db = DB::db();
+    $me = $db->queryFirstRow("select no,nation,officer_level,belong,permission,penalty from general where owner=%i", $userID);
+
+    $nation = $db->queryFirstRow("select nation,level,color,secretlimit from nation where nation=%i", $me['nation']) ?? [
+        'nation' => 0,
+        'level' => 0,
+        'secretlimit' => 99,
+        'color' => '#000000'
+    ];
+
+    $bgColor = $nation['color'] ?? '#000000';
+    $fgColor = newColor($bgColor);
+
+    $templates = new \League\Plates\Engine(__DIR__ . '/templates');
+    $showSecret = false;
+    $permission = checkSecretPermission($me);
+    $btnClassForTournament = $opts['btnClass'];
+    if ($opts['isTournamentApplicationOpen']) {
+        if ($btnClassForTournament != 'dropdown-item') {
+            $btnClassForTournament = 'toolbarButton2';
+        }
+    }
+
+    $btnClassForBetting = $opts['btnClass'];
+    if ($opts['isBettingActive']) {
+        if ($btnClassForTournament != 'dropdown-item') {
+            $btnClassForBetting = 'toolbarButton2';
+        }
+    }
+
+    if ($permission >= 1) {
+        $showSecret = true;
+    } else if ($me['officer_level'] == 0) {
+        $showSecret = false;
+    }
+
+    return $templates->render('commandButton', array_merge([
+        'bgColor' => $bgColor,
+        'fgColor' => $fgColor,
+        'meLevel' => $me['officer_level'],
+        'nationLevel' => $nation['level'],
+        'showSecret' => $showSecret,
+        'permission' => $permission,
+        'btnClassForTournament' => $btnClassForTournament,
+        'btnClassForBetting' => $btnClassForBetting,
+    ], $opts));
+}
+
 function formatWounded(int $value, int $wound): string
 {
     if ($wound == 0) {

hwe/func_time_event.php

@@ -364,14 +364,7 @@ function disaster(RandUtil $rng) {
     $logger->flush();
 
     if (!$isGood) {
-        [$queryColumns,,] = General::mergeQueryColumn();
+        $generalListByCity = Util::arrayGroupBy($db->query('SELECT no, name, nation, city, officer_level, injury, leadership, strength, intel, horse, weapon, book, item, crew, crewtype, atmos, train, special, special2 FROM general WHERE city IN %li', Util::squeezeFromArray($targetCityList, 'city')), 'city');
-        $generalListByCity = Util::arrayGroupBy(
-            $db->query(
-                'SELECT %l FROM general WHERE city IN %li',
-                Util::formatListOfBackticks($queryColumns),
-                Util::squeezeFromArray($targetCityList, 'city')
-            ),
-            'city');
         //NOTE: 쿼리 1번이지만 복잡하기 vs 쿼리 여러번이지만 조금 더 깔끔하기
         foreach ($targetCityList as $city) {
             $affectRatio = Util::valueFit($city['secu'] / $city['secu_max'] / 0.8, 0, 1);
@@ -390,7 +383,7 @@ function disaster(RandUtil $rng) {
 
             $generalList = array_map(
                 function($rawGeneral) use ($city, $year, $month){
-                    return new General($rawGeneral, null, null, $city, null, $year, $month, false);
+                    return new General($rawGeneral, null, $city, null, $year, $month, false);
                 },
                 $generalListByCity[$city['city']]??[]
             );

hwe/func_tournament.php

@@ -882,7 +882,7 @@ function setGift($tnmt_type, $tnmt, $phase)
         //포상 장수 이름, 금액
         $resultHelper[$generalID]['reward'] += $cost;
         $resultHelper[$generalID]['msg'] = "<span class='ev_highlight'>4강 진출</span>";
-        General::createObjFromDB($generalID)->increaseInheritancePoint(InheritanceKey::tournament, 10);
+        General::createGeneralObjFromDB($generalID)->increaseInheritancePoint(InheritanceKey::tournament, 10);
     }
     //결승자 명성 돈
     $cost = $admin['develcost'] * 6;
@@ -946,7 +946,7 @@ function setGift($tnmt_type, $tnmt, $phase)
     $winnerLogger->pushGlobalHistoryLog("<B><b>【대회】</b></><C>{$tp}</> 대회에서 <Y>{$winner['name']}</>{$josaYiWinner} <C>우승</>, <Y>{$runnerUp['name']}</>{$josaYiRunnerUp} <C>준우승</>을 차지하여 천하에 이름을 떨칩니다!", ActionLogger::EVENT_YEAR_MONTH);
     $winnerLogger->pushGlobalHistoryLog("<B><b>【대회】</b></><C>{$tp}</> 대회의 <S>우승자</>에게는 <C>{$winnerRewardText}</>, <S>준우승자</>에겐 <C>{$runnerUpRewardText}</>의 <S>상금</>과 약간의 <S>명성</>이 주어집니다!", ActionLogger::EVENT_YEAR_MONTH);
 
-    $generalObjList = General::createObjListFromDB(array_keys($resultHelper));
+    $generalObjList = General::createGeneralObjListFromDB(array_keys($resultHelper));
 
     foreach ($resultHelper as $generalID => $general) {
         $rewardText = number_format($general['reward']);

hwe/install.php

@@ -39,8 +39,8 @@ if ($session->userGrade < 5 && !$allowReset) {
 
 <body>
     <div class="container">
-        <h1 class="row justify-content-lg-center">삼국지 모의전투 HiDCHe 리셋</h1>
+        <h1 class="row justify-content-md-center">삼국지 모의전투 HiDCHe 리셋</h1>
-        <div class="row justify-content-lg-center">
+        <div class="row justify-content-md-center">
 
             <div class="col col-lg-8">
                 <div class="card" id="game_form_card">

hwe/install_db.php

@@ -32,8 +32,8 @@ if ($session->userGrade == 5) {
 
 <body>
     <div class="container" style="min-width:720px;">
-        <h1 class="row justify-content-lg-center">삼국지 모의전투 HiDCHe 리셋</h1>
+        <h1 class="row justify-content-md-center">삼국지 모의전투 HiDCHe 리셋</h1>
-        <div class="row justify-content-lg-center">
+        <div class="row justify-content-md-center">
 
             <div class="col col-lg-8">
                 <div class="card" id="db_form_card">

hwe/j_board_article_add.php

@@ -17,13 +17,10 @@ $text = Util::getPost('text');
 
 increaseRefresh("회의실", 1);
 
-$me = $db->queryFirstRow(
+$me = $db->queryFirstRow('SELECT no, nation, name, officer_level, permission, con, turntime, belong, penalty, `picture`,`imgsvr` FROM general WHERE owner=%i', $userID);
-    'SELECT no, nation, name, officer_level, permission, refresh_score, turntime, belong, penalty, `picture`,`imgsvr` FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
 
-$limitState = checkLimit($me['refresh_score']);
+$con = checkLimit($me['con']);
-if ($limitState >= 2) {
+if ($con >= 2) {
     Json::die([
         'result'=>false,
         'reason'=>'접속 제한입니다.'
@@ -53,7 +50,7 @@ if($permission < 0){
         'result'=>false,
         'reason'=>'국가에 소속되어있지 않습니다.'
     ]);
-
+    
 }
 else if ($isSecretBoard && $permission < 2) {
     Json::die([

hwe/j_board_comment_add.php

@@ -16,13 +16,10 @@ $text = Util::getPost('text');
 
 increaseRefresh("회의실", 1);
 
-$me = $db->queryFirstRow(
+$me = $db->queryFirstRow('SELECT no, nation, name, officer_level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
-    'SELECT no, nation, name, officer_level, permission, refresh_score, turntime, belong, penalty FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
 
-$limitState = checkLimit($me['refresh_score']);
+$con = checkLimit($me['con']);
-if ($limitState >= 2) {
+if ($con >= 2) {
     Json::die([
         'result'=>false,
         'reason'=>'접속 제한입니다.'
@@ -61,7 +58,7 @@ if($permission < 0){
         'result'=>false,
         'reason'=>'국가에 소속되어있지 않습니다.'
     ]);
-
+    
 }
 else if ($isSecretBoard && $permission < 2) {
     Json::die([

hwe/j_board_get_articles.php

@@ -16,14 +16,11 @@ $isSecretBoard = Util::getPost('isSecret', 'bool', false);
 
 increaseRefresh("회의실", 1);
 
-$me = $db->queryFirstRow(
+$me = $db->queryFirstRow('SELECT no, nation, officer_level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
-    'SELECT no, nation, officer_level, permission, refresh_score, turntime, belong, penalty FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
 
 
-$limitState = checkLimit($me['refresh_score']);
+$con = checkLimit($me['con']);
-if ($limitState >= 2) {
+if ($con >= 2) {
     Json::die([
         'result'=>false,
         'reason'=>'접속 제한입니다.'
@@ -36,7 +33,7 @@ if($permission < 0){
         'result'=>false,
         'reason'=>'국가에 소속되어있지 않습니다.'
     ]);
-
+    
 }
 else if ($isSecretBoard && $permission < 2) {
     Json::die([
@@ -75,3 +72,4 @@ Json::die([
     'articles'=>$articles,
     'reason'=>'success'
 ]);
+

hwe/j_diplomacy_destroy_letter.php

@@ -17,13 +17,10 @@ $letterNo = Util::getPost('letterNo', 'int');
 
 increaseRefresh("외교부", 1);
 
-$me = $db->queryFirstRow(
+$me = $db->queryFirstRow('SELECT no, name, nation, officer_level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
-    'SELECT no, name, nation, officer_level, permission, refresh_score, turntime, belong, penalty, picture, imgsvr FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
 
-$limitState = checkLimit($me['refresh_score']);
+$con = checkLimit($me['con']);
-if ($limitState >= 2) {
+if ($con >= 2) {
     Json::die([
         'result'=>false,
         'reason'=>'접속 제한입니다.'

hwe/j_diplomacy_get_letter.php

@@ -16,14 +16,11 @@ $isSecretBoard = Util::getPost('isSecret', 'bool', false);
 
 increaseRefresh("외교부", 1);
 
-$me = $db->queryFirstRow(
+$me = $db->queryFirstRow('SELECT no, nation, officer_level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
-    'SELECT no, nation, officer_level, permission, refresh_score, turntime, belong, penalty FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
 
 
-$limitState = checkLimit($me['refresh_score']);
+$con = checkLimit($me['con']);
-if ($limitState >= 2) {
+if ($con >= 2) {
     Json::die([
         'result'=>false,
         'reason'=>'접속 제한입니다.'
@@ -36,7 +33,7 @@ if($permission < 0){
         'result'=>false,
         'reason'=>'국가에 소속되어있지 않습니다.'
     ]);
-
+    
 }
 
 $letters = [];
@@ -86,3 +83,4 @@ Json::die([
     'myNationID'=>$me['nation'],
     'reason'=>'success'
 ]);
+

hwe/j_diplomacy_respond_letter.php

@@ -22,13 +22,10 @@ $reason = Util::getPost('reason', 'string', '');
 
 increaseRefresh("외교부", 1);
 
-$me = $db->queryFirstRow(
+$me = $db->queryFirstRow('SELECT no, name, nation, officer_level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
-    'SELECT no, name, nation, officer_level, permission, refresh_score, turntime, belong, penalty, picture, imgsvr FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
 
-$limitState = checkLimit($me['refresh_score']);
+$con = checkLimit($me['con']);
-if ($limitState >= 2) {
+if ($con >= 2) {
     Json::die([
         'result'=>false,
         'reason'=>'접속 제한입니다.'

hwe/j_diplomacy_rollback_letter.php

@@ -17,13 +17,10 @@ $letterNo = Util::getPost('letterNo', 'int');
 
 increaseRefresh("외교부", 1);
 
-$me = $db->queryFirstRow(
+$me = $db->queryFirstRow('SELECT no, name, nation, officer_level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
-    'SELECT no, name, nation, officer_level, permission, refresh_score, turntime, belong, penalty, picture, imgsvr FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
 
-$limitState = checkLimit($me['refresh_score']);
+$con = checkLimit($me['con']);
-if ($limitState >= 2) {
+if ($con >= 2) {
     Json::die([
         'result'=>false,
         'reason'=>'접속 제한입니다.'

hwe/j_diplomacy_send_letter.php

@@ -24,13 +24,10 @@ if($prevNo < 1){
     $prevNo = null;
 }
 
-$me = $db->queryFirstRow(
+$me = $db->queryFirstRow('SELECT no, name, nation, officer_level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
-    'SELECT no, name, nation, officer_level, permission, refresh_score, turntime, belong, penalty, picture, imgsvr FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
 
-$limitState = checkLimit($me['refresh_score']);
+$con = checkLimit($me['con']);
-if ($limitState >= 2) {
+if ($con >= 2) {
     Json::die([
         'result'=>false,
         'reason'=>'접속 제한입니다.'

hwe/j_general_log_old.php

@@ -33,15 +33,12 @@ if($generalID <= 0 || $reqTo <= 0){
 
 $db = DB::db();
 
-$me = $db->queryFirstRow(
+$me = $db->queryFirstRow('SELECT no,nation,officer_level,con,turntime,belong,permission,penalty from general where owner=%i', $userID);
-    'SELECT no,nation,officer_level,refresh_score,turntime,belong,permission,penalty FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
 $nationID = $me['nation'];
 
 
-$limitState = checkLimit($me['refresh_score']);
+$con = checkLimit($me['con']);
-if ($limitState >= 2) {
+if ($con >= 2) {
     Json::die([
         'result'=>false,
         'reason'=>'접속 제한입니다.'
@@ -64,7 +61,7 @@ if($generalID !== $targetID){
             'reason'=>'권한이 부족합니다. 수뇌부가 아니거나 사관년도가 부족합니다.'
         ]);
     }
-
+    
     if($testGeneralNationID !== $nationID){
         Json::die([
             'result'=>false,

hwe/j_install.php

@@ -199,25 +199,17 @@ if($reserve_open){
     ]);
 }
 
-try{
+Json::die(ResetHelper::buildScenario(
-    Json::die(ResetHelper::buildScenario(
+    $turnterm,
-        $turnterm,
+    $sync,
-        $sync,
+    $scenario,
-        $scenario,
+    $fiction,
-        $fiction,
+    $extend,
-        $extend,
+    $block_general_create,
-        $block_general_create,
+    $npcmode,
-        $npcmode,
+    $show_img_level,
-        $show_img_level,
+    !!$tournament_trig,
-        !!$tournament_trig,
+    $join_mode,
-        $join_mode,
+    TimeUtil::now(),
-        TimeUtil::now(),
+    $autorun_user
-        $autorun_user
+));
-    ));
-}
-catch(\Exception $e){
-    Json::die([
-        'result'=>false,
-        'reason'=>$e->getMessage()
-    ]);
-}

hwe/j_install_db.php

@@ -53,17 +53,22 @@ if($fullReset){
     }
 }
 
-$db = new \MeekroDB($host,$username,$password,$dbName,$port,'utf8mb4');
+function dbConnFail($params){
-$db->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
-
-$db->addHook('run_failed', function(){
     Json::die([
         'result'=>false,
         'reason'=>'DB 접속에 실패했습니다.'
     ]);
-});
+}
 
-$mysqli_obj = $db->get();
+
+$db = new \MeekroDB($host,$username,$password,$dbName,$port,'utf8mb4');
+$db->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
+
+$db->throw_exception_on_nonsql_error = false;
+$db->nonsql_error_handler = 'dbConnFail';
+
+
+$mysqli_obj = $db->get(); //로그인에 실패할 경우 자동으로 dbConnFail()이 실행됨.
 
 $prefix = basename(__DIR__);
 
@@ -79,6 +84,8 @@ $result = Util::generateFileUsingSimpleTemplate(
     ], true
 );
 
+
+
 if($result !== true){
     Json::die([
         'result'=>false,
@@ -86,29 +93,7 @@ if($result !== true){
     ]);
 }
 
-//최소한의 테이블 처리를 위해 수동으로 초기화하도록 하자
+ResetHelper::clearDB();
-if($mysqli_obj->multi_query(file_get_contents(__DIR__.'/sql/reset.sql'))){
-    while(true){
-        if (!$mysqli_obj->more_results()) {
-            break;
-        }
-        if(!$mysqli_obj->next_result()){
-            break;
-        }
-    }
-
-}
-
-if($mysqli_obj->multi_query(file_get_contents(__DIR__.'/sql/schema.sql'))){
-    while(true){
-        if (!$mysqli_obj->more_results()) {
-            break;
-        }
-        if(!$mysqli_obj->next_result()){
-            break;
-        }
-    }
-}
 
 ServConfig::getServerList()[$prefix]->closeServer();
 

hwe/j_map_recent.php

@@ -19,15 +19,7 @@ if(!prepareDir('data/file_cache')){
 	]);
 }
 
-$absolutePath = realpath('data/file_cache');
+$storage = new \Nette\Caching\Storages\FileStorage('data/file_cache');
-if(!$absolutePath){
-    Json::die([
-        'result'=>false,
-        'reason'=>'cache 불가'
-    ]);
-}
-
-$storage = new \Nette\Caching\Storages\FileStorage($absolutePath);
 $cache = new Cache($storage);
 $serverID = UniqueConst::$serverID;
 

hwe/j_myBossInfo.php

@@ -1,8 +1,6 @@
 <?php
 namespace sammo;
 
-use sammo\Enums\GeneralLiteQueryMode;
-use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\MessageType;
 
 include "lib.php";
@@ -47,7 +45,12 @@ if($destGeneralID==0){
     $general->setVar('nation', $nationID);
 }
 else{
-    $general = General::createObjFromDB($destGeneralID);
+    $general = General::createGeneralObjFromDB($destGeneralID, [
+        'name', 'leadership', 'strength', 'intel', 'gold','rice',
+        'troop','officer_level','npc','picture','imgsvr',
+        'permission','penalty','belong', 'crewtype',
+        'experience', 'dedication', 'betray', 'dedlevel', 'explevel', 'makelimit', 'aux',
+    ], 1);
 
     if($general instanceof DummyGeneral){
         Json::die([

hwe/j_select_npc.php

@@ -1,8 +1,6 @@
 <?php
 namespace sammo;
 
-use sammo\Enums\GeneralAccessLogColumn;
-
 include "lib.php";
 include "func.php";
 
@@ -27,25 +25,14 @@ $rootDB = RootDB::db();
 $oNow = new \DateTimeImmutable();
 $now = $oNow->format('Y-m-d H:i:s');
 
-$member = $rootDB->queryFirstRow('SELECT `name`, `penalty` FROM member WHERE `NO`=%i', $userID);
+$userNick = RootDB::db()->queryFirstField('SELECT `NAME` FROM member WHERE `NO`=%i',$userID);
-if(!$member){
+if(!$userNick){
     Json::die([
         'result'=>false,
         'reason'=>'멤버 정보를 가져오지 못했습니다.'
     ]);
 }
 
-$userNick = $member['name'];
-$memberPenalty = Json::decode($member['penalty'] ?? '{}');
-$penaltyInfo = array_merge($memberPenalty['any'] ?? [], $memberPenalty[DB::prefix()] ?? []);
-
-$penalty = [];
-foreach($penaltyInfo as $penaltyKey => $penaltyValue){
-    if($penaltyValue['expire'] ?? 0 > TimeUtil::now()){
-        $penalty[$penaltyKey] = $penaltyValue['value'];
-    }
-}
-
 $pickResult = $db->queryFirstField('SELECT pick_result FROM select_npc_token WHERE `owner`=%i AND `valid_until`>=%s', $userID, $now);
 if(!$pickResult){
     Json::die([
@@ -97,14 +84,8 @@ $db->update('general', [
     'defence_train'=>80,
     'permission'=>'normal',
     'owner'=>$userID,
-    'aux'=>Json::encode($genAux),
+    'aux'=>Json::encode($genAux)
-    'penalty'=>Json::encode($penalty),
 ], 'owner <= 0 AND npc = 2 AND no = %i', $pick);
-$db->insertIgnore('general_access_log', [
-    GeneralAccessLogColumn::generalID->value => $pick,
-    GeneralAccessLogColumn::userID->value => $userID,
-    GeneralAccessLogColumn::lastRefresh->value => $now,
-]);
 
 if(!$db->affectedRows()){
     Json::die([

hwe/j_set_my_setting.php

@@ -36,19 +36,15 @@ if($tnmt < 0 || $tnmt > 1){
 }
 
 $db = DB::db();
-$me = General::createObjFromDB($generalID);
+$me = General::createGeneralObjFromDB($generalID);
 
 
 if($defence_train !== $me->getVar('defence_train')){
     if($defence_train == 999){
         $me->increaseVar('myset', -1);
         $me->setVar('defence_train', $defence_train);
-        $affectedTrain = -3;
+        $me->increaseVarWithLimit('train', -3, 20);
-        $affectedAtmos = -6;
+        $me->increaseVarWithLimit('atmos', -6, 20);
-        $affectedTrain = $me->onCalcDomestic('changeDefenceTrain', "train{$defence_train}", $affectedTrain);
-        $affectedAtmos = $me->onCalcDomestic('changeDefenceTrain', "atmos{$defence_train}", $affectedAtmos);
-        $me->increaseVarWithLimit('train', $affectedTrain, 20, GameConst::$maxTrainByWar);
-        $me->increaseVarWithLimit('atmos', $affectedAtmos, 20, GameConst::$maxAtmosByWar);
     }
     else{
         $me->increaseVar('myset', -1);

hwe/j_set_npc_control.php

@@ -39,10 +39,7 @@ if (!$data || !is_array($data)) {
 
 $db = DB::db();
 
-$me = $db->queryFirstRow(
+$me = $db->queryFirstRow('SELECT no, name, npc, nation, city, officer_level, con, turntime, belong, permission, penalty FROM general WHERE owner=%i', $userID);
-    'SELECT no, name, npc, nation, city, officer_level, refresh_score, turntime, belong, permission, penalty FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
 
 
 $nationID = $me['nation'];

hwe/j_simulate_battle.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace sammo;
 
 use Ds\Map;
@@ -16,48 +15,48 @@ $userID = Session::getUserID();
 increaseRefresh("시뮬레이터", 0);
 
 $query = Util::getPost('query');
-if ($query === null) {
+if($query === null){
     Json::die([
-        'result' => false,
+        'result'=>false,
-        'reason' => '입력값이 없습니다.'
+        'reason'=>'입력값이 없습니다.'
     ]);
 }
 
 $action = Util::getPost('action');
-if ($action === null || !in_array($action, ['reorder', 'battle'])) {
+if($action === null || !in_array($action, ['reorder', 'battle'])){
     Json::die([
-        'result' => false,
+        'result'=>false,
-        'reason' => '원하는 동작이 지정되지 않았습니다.'
+        'reason'=>'원하는 동작이 지정되지 않았습니다.'
     ]);
 }
 
 $query = Json::decode($query);
-if ($query === null) {
+if($query === null){
     Json::die([
-        'result' => false,
+        'result'=>false,
-        'reason' => '올바르지 않은 JSON입니다.'
+        'reason'=>'올바르지 않은 JSON입니다.'
     ]);
 }
 
 $defaultCheck = [
-    'required' => [
+    'required'=>[
         'attackerGeneral', 'attackerCity', 'attackerNation',
         'defenderGenerals', 'defenderCity', 'defenderNation',
         'year', 'month', 'repeatCnt'
     ],
-    'integer' => [
+    'integer'=>[
-        'year', 'month', 'repeatCnt'
+        'year','month','repeatCnt'
     ],
-    'between' => [
+    'between'=>[
         ['month', [1, 12]]
     ],
-    'in' => [
+    'in'=>[
         ['repeatCnt', [1, 1000]]
     ],
-    'min' => [
+    'min'=>[
         ['year', 0]
     ],
-    'array' => [
+    'array'=>[
         'attackerGeneral', 'attackerCity', 'attackerNation',
         'defenderGenerals', 'defenderCity', 'defenderNation'
     ],
@@ -65,10 +64,10 @@ $defaultCheck = [
 
 $v = new Validator($query);
 $v->rules($defaultCheck);
-if (!$v->validate()) {
+if(!$v->validate()){
     Json::die([
-        'result' => false,
+        'result'=>false,
-        'reason' => $v->errorStr()
+        'reason'=>$v->errorStr()
     ]);
 }
 
@@ -87,110 +86,20 @@ $rawDefenderNation = $query['defenderNation'];
 
 $warSeed = $query['seed'] ?? '';
 
-$cityCheck = [
-    'required' => [
-        'city', 'nation', 'supply', 'name',
-        'pop', 'agri', 'comm', 'secu', 'def', 'wall',
-        'trust', 'level',
-        'pop_max', 'agri_max', 'comm_max', 'secu_max', 'def_max', 'wall_max',
-        'dead', 'state', 'conflict',
-    ],
-    'numeric' => [
-        'pop', 'agri', 'comm', 'secu', 'def', 'wall', 'trust', 'dead'
-    ],
-    'integer' => [
-        'city', 'nation', 'supply',
-        'pop_max', 'agri_max', 'comm_max', 'secu_max', 'def_max', 'wall_max',
-        'state',
-    ],
-    'min' => [
-        ['def', 0],
-        ['wall', 0],
-        ['trust', 0],
-        ['pop', 0],
-        ['comm', 0],
-        ['secu', 0],
-        ['city', 1],
-        ['nation', 0]
-    ],
-    'in' => [
-        ['level', array_keys(getCityLevelList())]
-    ]
-];
-
-$v = new Validator($rawAttackerCity);
-$v->rules($cityCheck);
-if (!$v->validate()) {
-    Json::die([
-        'result' => false,
-        'reason' => '[출병도시]' . $v->errorStr()
-    ]);
-}
-
-$v = new Validator($rawDefenderCity);
-$v->rules($cityCheck);
-if (!$v->validate()) {
-    Json::die([
-        'result' => false,
-        'reason' => '[수비도시]' . $v->errorStr()
-    ]);
-}
-
-$nationCheck = [
-    'required' => [
-        'type', 'tech', 'level', 'capital',
-        'nation', 'name', 'gold', 'rice', 'gennum'
-    ],
-    'integer' => [
-        'level', 'capital', 'nation', 'gennum',
-    ],
-    'numeric' => [
-        'tech', 'gold', 'rice'
-    ],
-    'min' => [
-        ['tech', 0],
-        ['gold', 0],
-        ['rice', 0],
-        ['gennum', 1],
-    ],
-    'in' => [
-        ['type', GameConst::$availableNationType],
-        ['level', array_keys(getNationLevelList())]
-    ]
-];
-
-$v = new Validator($rawAttackerNation);
-$v->rules($nationCheck);
-if (!$v->validate()) {
-    Json::die([
-        'result' => false,
-        'reason' => '[출병국]' . $v->errorStr()
-    ]);
-}
-
-$v = new Validator($rawDefenderNation);
-$v->rules($nationCheck);
-if (!$v->validate()) {
-    Json::die([
-        'result' => false,
-        'reason' => '[수비국]' . $v->errorStr()
-    ]);
-}
-
 $generalCheck = [
-    'required' => [
+    'required'=>[
         'no', 'name', 'nation', 'turntime', 'personal', 'special2', 'crew', 'crewtype', 'atmos', 'train',
         'intel', 'intel_exp', 'book', 'strength', 'strength_exp', 'weapon', 'injury', 'leadership', 'leadership_exp', 'horse', 'item',
         'explevel', 'experience', 'dedication', 'officer_level', 'officer_city', 'gold', 'rice', 'dex1', 'dex2', 'dex3', 'dex4', 'dex5',
         'recent_war', 'warnum', 'killnum', 'killcrew',
     ],
-    'integer' => [
+    'integer'=>[
         'no', 'nation', 'crew', 'crewtype', 'atmos', 'train',
         'intel', 'intel_exp', 'strength', 'strength_exp',  'injury', 'leadership', 'leadership_exp',
         'explevel', 'experience', 'dedication', 'officer_level', 'officer_city', 'gold', 'rice', 'dex1', 'dex2', 'dex3', 'dex4', 'dex5',
         'warnum', 'killnum', 'killcrew',
     ],
-    'min' => [
+    'min'=>[
         ['no', 1],
         ['nation', 1],
         ['crew', 0],
@@ -209,14 +118,14 @@ $generalCheck = [
         ['killnum', 0],
         ['killcrew', 0],
     ],
-    'between' => [
+    'between'=>[
         ['train', [40, GameConst::$maxTrainByWar]],
         ['atmos', [40, GameConst::$maxAtmosByWar]],
         ['explevel', [0, 300]],
         ['injury', [0, 80]],
         ['officer_level', [1, 12]]
     ],
-    'in' => [
+    'in'=>[
         ['personal', array_merge(GameConst::$availablePersonality, GameConst::$optionalPersonality)],
         ['special2', array_merge(GameConst::$availableSpecialWar, GameConst::$optionalSpecialWar)],
         ['crewtype', array_keys(GameUnitConst::all())],
@@ -225,11 +134,11 @@ $generalCheck = [
         ['book', array_merge(array_keys(GameConst::$allItems['book']), ['None'])],
         ['item', array_merge(array_keys(GameConst::$allItems['item']), ['None'])],
     ],
-    'array' => ['inheritBuff'],
+    'array'=>['inheritBuff'],
 ];
 
 $inheritBuffCheck = [
-    'between' => [
+    'between'=>[
         [TriggerInheritBuff::WAR_AVOID_RATIO, [0, 5]],
         [TriggerInheritBuff::WAR_CRITICAL_RATIO, [0, 5]],
         [TriggerInheritBuff::WAR_MAGIC_TRIAL_PROB, [0, 5]],
@@ -240,67 +149,49 @@ $inheritBuffCheck = [
     ]
 ];
 
-if(!$warSeed){
-    $warSeed = bin2hex(random_bytes(16));
-}
-else {
-    $repeatCnt = 1;
-}
-$tmpRNG = new RandUtil(new LiteHashDRBG($warSeed));
-
 $v = new Validator($rawAttacker);
 $v->rules($generalCheck);
-if (!$v->validate()) {
+if(!$v->validate()){
     Json::die([
-        'result' => false,
+        'result'=>false,
-        'reason' => '[출병자]' . $v->errorStr()
+        'reason'=>'[출병자]'.$v->errorStr()
     ]);
 }
 $rawAttacker['aux'] = [];
-if (key_exists('inheritBuff', $rawAttacker)) {
+if(key_exists('inheritBuff', $rawAttacker)){
     $v = new Validator($rawAttacker['inheritBuff']);
     $v->rules($inheritBuffCheck);
-    if (!$v->validate()) {
+    if(!$v->validate()){
         Json::die([
-            'result' => false,
+            'result'=>false,
-            'reason' => '[출병자]' . $v->errorStr()
+            'reason'=>'[출병자]'.$v->errorStr()
         ]);
     }
     $rawAttacker['aux']['inheritBuff'] = $rawAttacker['inheritBuff'];
 }
 $rawAttacker['aux'] = Json::encode($rawAttacker['aux']);
 $rawAttacker['owner'] = 0;
-$attackerGeneral = new General($rawAttacker, extractRankVar($rawAttacker), null, $rawAttackerCity, $rawAttackerNation, $year, $month);
-$attacker = new WarUnitGeneral(
-    $tmpRNG,
-    $attackerGeneral,
-    $rawAttackerNation,
-    true
-);
 
-
-/** @var WarUnit[] */
 $defenderList = [];
-
+foreach($rawDefenderList as $idx=>$rawDefenderGeneral){
-foreach ($rawDefenderList as $idx => $rawDefenderGeneral) {
     $v = new Validator($rawDefenderGeneral);
     $v->rules($generalCheck);
-    if (!$v->validate()) {
+    if(!$v->validate()){
-        $idx += 1;
+        $idx+=1;
         Json::die([
-            'result' => false,
+            'result'=>false,
-            'reason' => "[수비자{$idx}]" . $v->errorStr()
+            'reason'=>"[수비자{$idx}]".$v->errorStr()
         ]);
     }
     $rawDefenderGeneral['aux'] = [];
-    if (key_exists('inheritBuff', $rawDefenderGeneral)) {
+    if(key_exists('inheritBuff', $rawDefenderGeneral)){
         $v = new Validator($rawDefenderGeneral['inheritBuff']);
         $v->rules($inheritBuffCheck);
-        if (!$v->validate()) {
+        if(!$v->validate()){
-            $idx += 1;
+            $idx+=1;
             Json::die([
-                'result' => false,
+                'result'=>false,
-                'reason' => "[수비자{$idx}]" . $v->errorStr()
+                'reason'=>"[수비자{$idx}]".$v->errorStr()
             ]);
         }
         $rawDefenderGeneral['aux']['inheritBuff'] = $rawDefenderGeneral['inheritBuff'];
@@ -308,54 +199,135 @@ foreach ($rawDefenderList as $idx => $rawDefenderGeneral) {
     $rawDefenderGeneral['aux'] = Json::encode($rawDefenderGeneral['aux']);
     $rawDefenderGeneral['owner'] = 0;
 
-    $defenderGeneral = new General($rawDefenderGeneral, extractRankVar($rawDefenderGeneral), null, $rawDefenderCity, $rawAttackerNation, $year, $month, true);
+    $defenderList[] = new General($rawDefenderGeneral, extractRankVar($rawDefenderGeneral), $rawDefenderCity, $rawAttackerNation, $year, $month, true);
-
-    $defenderList[] = new WarUnitGeneral(
-        $tmpRNG,
-        $defenderGeneral,
-        $rawDefenderNation,
-        false
-    );
 }
 
-if ($action == 'reorder') {
-    $noRng = NoRNG::rngInstance();
 
-    usort($defenderList, function (WarUnit $lhs, WarUnit $rhs) use ($attacker) {
+$cityCheck = [
-        return - (extractBattleOrder($lhs, $attacker) <=> extractBattleOrder($rhs, $attacker));
+    'required'=>[
-    });
+        'city', 'nation', 'supply', 'name',
-
+        'pop', 'agri', 'comm', 'secu', 'def', 'wall',
-    $order = [];
+        'trust', 'level',
-    foreach ($defenderList as $defender) {
+        'pop_max', 'agri_max', 'comm_max', 'secu_max', 'def_max', 'wall_max',
-        $order[] = $defender->getGeneral()->getID();
+        'dead', 'state', 'conflict',
-    }
+    ],
+    'numeric'=>[
+        'pop', 'agri', 'comm', 'secu', 'def', 'wall', 'trust', 'dead'
+    ],
+    'integer'=>[
+        'city', 'nation', 'supply',
+        'pop_max', 'agri_max', 'comm_max', 'secu_max', 'def_max', 'wall_max',
+        'state',
+    ],
+    'min'=>[
+        ['def', 0],
+        ['wall', 0],
+        ['trust', 0],
+        ['pop', 0],
+        ['comm', 0],
+        ['secu', 0],
+        ['city', 1],
+        ['nation', 0]
+    ],
+    'in'=>[
+        ['level', array_keys(getCityLevelList())]
+    ]
+];
 
+$v = new Validator($rawAttackerCity);
+$v->rules($cityCheck);
+if(!$v->validate()){
     Json::die([
-        'result' => true,
+        'result'=>false,
-        'reason' => 'success',
+        'reason'=>'[출병도시]'.$v->errorStr()
-        'order' => $order
     ]);
 }
 
-$rawDefenderList = [];
+$v = new Validator($rawDefenderCity);
-foreach($defenderList as $unit){
+$v->rules($cityCheck);
-    if(extractBattleOrder($unit, $attacker) <= 0){
+if(!$v->validate()){
-        continue;
+    Json::die([
-    }
+        'result'=>false,
-    $rawDefenderList[] = $unit->getRaw();
+        'reason'=>'[수비도시]'.$v->errorStr()
+    ]);
 }
+
+$nationCheck = [
+    'required'=>[
+        'type', 'tech', 'level', 'capital',
+        'nation', 'name', 'gold', 'rice', 'gennum'
+    ],
+    'integer'=>[
+        'level', 'capital', 'nation', 'gennum',
+    ],
+    'numeric'=>[
+        'tech', 'gold', 'rice'
+    ],
+    'min'=>[
+        ['tech', 0],
+        ['gold', 0],
+        ['rice', 0],
+        ['gennum', 1],
+    ],
+    'in'=>[
+        ['type', GameConst::$availableNationType],
+        ['level', array_keys(getNationLevelList())]
+    ]
+];
+
+$v = new Validator($rawAttackerNation);
+$v->rules($nationCheck);
+if(!$v->validate()){
+    Json::die([
+        'result'=>false,
+        'reason'=>'[출병국]'.$v->errorStr()
+    ]);
+}
+
+$v = new Validator($rawDefenderNation);
+$v->rules($nationCheck);
+if(!$v->validate()){
+    Json::die([
+        'result'=>false,
+        'reason'=>'[수비국]'.$v->errorStr()
+    ]);
+}
+
+if($action == 'reorder'){
+    usort($defenderList, function(General $lhs, General $rhs){
+        return -(extractBattleOrder($lhs) <=> extractBattleOrder($rhs));
+    });
+
+    $order = [];
+    foreach($defenderList as $defenderGeneral){
+        $order[] = $defenderGeneral->getID();
+    }
+
+    Json::die([
+        'result'=>true,
+        'reason'=>'success',
+        'order'=>$order
+    ]);
+}
+
+usort($defenderList, function(General $lhs, General $rhs){
+    return -(extractBattleOrder($lhs) <=> extractBattleOrder($rhs));
+});
+
+$rawDefenderList = array_map(function(General $general){
+    return $general->getRaw();
+}, $defenderList);
 unset($defenderList);
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 $startYear = $gameStor->startyear;
 
-function extractRankVar(array $rawVal): Map
+function extractRankVar(array $rawVal):Map{
-{
     $rankVars = new Map;
-    foreach ($rawVal as $rawKey => $rawVal) {
+    foreach($rawVal as $rawKey=>$rawVal){
         $key = RankColumn::tryFrom($rawKey);
-        if ($key === null) {
+        if($key === null){
             continue;
         }
         $rankVars[$key] = $rawVal;
@@ -364,104 +336,80 @@ function extractRankVar(array $rawVal): Map
 }
 
 function simulateBattle(
-    $rawAttacker,
+    $rawAttacker, $rawAttackerCity, $rawAttackerNation,
-    $rawAttackerCity,
+    $rawDefenderList, $rawDefenderCity, $rawDefenderNation,
-    $rawAttackerNation,
+    $startYear, $year, $month, $warSeed
-    $rawDefenderList,
+){
-    $rawDefenderCity,
-    $rawDefenderNation,
-    $startYear,
-    $year,
-    $month,
-    $warSeed
-) {
 
-    if (!$warSeed) {
+    if(!$warSeed){
         $warSeed = bin2hex(random_bytes(16));
     }
 
     $warRng = new RandUtil(new LiteHashDRBG($warSeed));
 
-    $attackerGeneral = new General($rawAttacker, extractRankVar($rawAttacker), null, $rawAttackerCity, $rawAttackerNation, $year, $month);
     $attacker = new WarUnitGeneral(
         $warRng,
-        $attackerGeneral,
+        new General($rawAttacker, extractRankVar($rawAttacker), $rawAttackerCity, $rawAttackerNation, $year, $month),
         $rawAttackerNation,
         true
     );
     $city = new WarUnitCity($warRng, $rawDefenderCity, $rawDefenderNation, $year, $month, $startYear);
 
-    /** @var WarUnit[] */
+    $iterDefender = new \ArrayIterator($rawDefenderList);
-    $defenderList = [];
-
-    foreach ($rawDefenderList as $rawDefenderGeneral) {
-        $defenderGeneral = new General($rawDefenderGeneral, extractRankVar($rawDefenderGeneral), null, $rawDefenderCity, $rawAttackerNation, $year, $month, true);
-
-        $defenderList[] = new WarUnitGeneral(
-            $warRng,
-            $defenderGeneral,
-            $rawDefenderNation,
-            false
-        );
-    }
-
-    if(count($defenderList) && extractBattleOrder($city, $attacker) > 0){
-        $defenderList[] = $city;
-    }
-
-    usort($defenderList, function (WarUnit $lhs, WarUnit $rhs) use ($attacker) {
-        return - (extractBattleOrder($lhs, $attacker) <=> extractBattleOrder($rhs, $attacker));
-    });
-
-    $iterDefender = new \ArrayIterator($defenderList);
     $iterDefender->rewind();
 
     $battleResult = [];
 
-    $attackerRice = $attacker->getGeneral()->getVar('rice');
+    $attackerRice = $rawAttacker['rice'];
     $defenderRice = 0;
 
-    $getNextDefender = function (?WarUnit $prevDefender, bool $reqNext)
+    $getNextDefender = function(?WarUnit $prevDefender, bool $reqNext)
-    use ($iterDefender, &$battleResult, &$defenderRice, $attacker): ?WarUnit {
+        use ($warRng, $iterDefender, $rawDefenderCity, $rawDefenderNation, $year, $month, &$battleResult, &$defenderRice) {
-        if ($prevDefender !== null) {
+        if($prevDefender !== null){
             $prevDefender->getLogger()->rollback();
             $battleResult[] = $prevDefender;
-            if ($prevDefender instanceof WarUnitGeneral) {
+            if($prevDefender instanceof WarUnitGeneral){
                 $defenderRice -= $prevDefender->getVar('rice');
             }
         }
 
-        if (!$reqNext) {
+        if(!$reqNext){
             return null;
         }
 
-        if (!$iterDefender->valid()) {
+        if(!$iterDefender->valid()){
             return null;
         }
 
-        /** @var WarUnit */
+        $defenderObj = new General($iterDefender->current(), extractRankVar($iterDefender->current()), $rawDefenderCity, $rawDefenderNation, $year, $month);
-        $defender = $iterDefender->current();
+        if(extractBattleOrder($defenderObj) <= 0){
-
-        if (extractBattleOrder($defender, $attacker) <= 0) {
             return null;
         }
 
-        if($defender instanceof WarUnitGeneral){
+        $defenderRice += $defenderObj->getVar('rice');
-            $defenderRice += $defender->getVar('rice');
-        }
 
+        $retVal = new WarUnitGeneral(
+            $warRng,
+            $defenderObj,
+            $rawDefenderNation,
+            false
+        );
         $iterDefender->next();
-        return $defender;
+        return $retVal;
     };
 
-    $conquerCity = processWar_NG($warSeed, $attacker, $getNextDefender, $city);
+    $conquerCity = processWar_NG($warSeed, $attacker, $getNextDefender, $city, $year - $startYear);
+
+    $rawDefenderCity = $city->getRaw();
+    $updateAttackerNation = [];
+    $updateDefenderNation = [];
 
     $attackerRice -= $attacker->getVar('rice');
 
-    if ($city->getPhase() > 0) {
+    if($city->getPhase() > 0){
         $rice = $city->getKilled() / 100 * 0.8;
         $rice *= $city->getCrewType()->rice;
-        $rice *= getTechCost($city->getRawNation()['tech']);
+        $rice *= getTechCost($rawDefenderNation['tech']);
         $rice *= $city->getCityTrainAtmos() / 100 - 0.2;
         Util::setRound($rice);
 
@@ -469,8 +417,8 @@ function simulateBattle(
     }
 
     $totalDead = $attacker->getKilled() + $attacker->getDead();
-    //$attackerCityDead = $totalDead * 0.4;
+    $attackerCityDead = $totalDead * 0.4;
-    //$defenderCityDead = $totalDead * 0.6;
+    $defenderCityDead = $totalDead * 0.6;
 
     return [$attacker, $city, $battleResult, $conquerCity, $attackerRice, $defenderRice];
 }
@@ -496,26 +444,18 @@ $avgWar = 0;
 $attackerActivatedSkills = [];
 $defendersActivatedSkills = [];
 
+if($warSeed){
+    $repeatCnt = 1;
+}
 
-foreach (Util::range($repeatCnt) as $repeatIdx) {
+foreach(Util::range($repeatCnt) as $repeatIdx){
-    if($repeatIdx > 0){
-        $warSeed = bin2hex(random_bytes(16));
-    }
-
     /** @var WarUnit $attacker */
     [$attacker, $city, $battleResult, $conquerCity, $attackerRice, $defenderRice] = simulateBattle(
-        $rawAttacker,
+        $rawAttacker, $rawAttackerCity, $rawAttackerNation,
-        $rawAttackerCity,
+        $rawDefenderList, $rawDefenderCity, $rawDefenderNation,
-        $rawAttackerNation,
+        $startYear, $year, $month, $warSeed
-        $rawDefenderList,
-        $rawDefenderCity,
-        $rawDefenderNation,
-        $startYear,
-        $year,
-        $month,
-        $warSeed
     );
-    $lastWarLog = Util::mapWithKey(function ($key, $values) {
+    $lastWarLog = Util::mapWithKey(function($key, $values){
         return ConvertLog(join('<br>', $values));
     }, $attacker->getLogger()->rollback());
 
@@ -538,45 +478,48 @@ foreach (Util::range($repeatCnt) as $repeatIdx) {
 
     $avgWar += count($battleResult) / $repeatCnt;
 
-    foreach ($attacker->getActivatedSkillLog() as $skillName => $skillCnt) {
+    foreach($attacker->getActivatedSkillLog() as $skillName => $skillCnt){
-        if (!key_exists($skillName, $attackerActivatedSkills)) {
+        if(!key_exists($skillName, $attackerActivatedSkills)){
             $attackerActivatedSkills[$skillName] = $skillCnt / $repeatCnt;
-        } else {
+        }
+        else{
             $attackerActivatedSkills[$skillName] += $skillCnt / $repeatCnt;
         }
     }
 
-    foreach ($battleResult as $idx => $defender) {
+    foreach($battleResult as $idx=>$defender){
-        while ($idx >= count($defendersActivatedSkills)) {
+        while($idx >= count($defendersActivatedSkills)){
             $defendersActivatedSkills[] = [];
         }
 
         $activatedSkills = &$defendersActivatedSkills[$idx];
-        foreach ($defender->getActivatedSkillLog() as $skillName => $skillCnt) {
+        foreach($defender->getActivatedSkillLog() as $skillName => $skillCnt){
-            if (!key_exists($skillName, $activatedSkills)) {
+            if(!key_exists($skillName, $activatedSkills)){
                 $activatedSkills[$skillName] = $skillCnt / $repeatCnt;
-            } else {
+            }
+            else{
                 $activatedSkills[$skillName] += $skillCnt / $repeatCnt;
             }
         }
+
     }
 }
 
 Json::die([
-    'result' => true,
+    'result'=>true,
-    'datetime' => $rawAttacker['turntime'],
+    'datetime'=>$rawAttacker['turntime'],
-    'reason' => 'success',
+    'reason'=>'success',
-    'lastWarLog' => $lastWarLog,
+    'lastWarLog'=>$lastWarLog,
-    'avgWar' => $avgWar,
+    'avgWar'=>$avgWar,
-    'phase' => $avgPhase,
+    'phase'=>$avgPhase,
-    'killed' => $attackerKilled,
+    'killed'=>$attackerKilled,
-    'maxKilled' => $attackerMaxKilled,
+    'maxKilled'=>$attackerMaxKilled,
-    'minKilled' => $attackerMinKilled,
+    'minKilled'=>$attackerMinKilled,
-    'dead' => $attackerDead,
+    'dead'=>$attackerDead,
-    'maxDead' => $attackerMaxDead,
+    'maxDead'=>$attackerMaxDead,
-    'minDead' => $attackerMinDead,
+    'minDead'=>$attackerMinDead,
-    'attackerRice' => $attackerAvgRice,
+    'attackerRice'=>$attackerAvgRice,
-    'defenderRice' => $defenderAvgRice,
+    'defenderRice'=>$defenderAvgRice,
-    'attackerSkills' => $attackerActivatedSkills,
+    'attackerSkills'=>$attackerActivatedSkills,
-    'defendersSkills' => $defendersActivatedSkills,
+    'defendersSkills'=>$defendersActivatedSkills,
 ]);

hwe/j_update_picked_general.php

@@ -66,7 +66,7 @@ if(!$ownerInfo){
 $info = Json::decode($info);
 
 
-$generalObj = General::createObjFromDB($generalID);
+$generalObj = General::createGeneralObjFromDB($generalID);
 $oldGeneralName = $generalObj->getName();
 $db->update('select_pool', [
     'general_id'=>-$generalID,

hwe/old_index.php

@@ -3,7 +3,6 @@
 namespace sammo;
 
 use sammo\DTO\VoteInfo;
-use sammo\Enums\GeneralQueryMode;
 
 include "lib.php";
 include "func.php";
@@ -30,8 +29,7 @@ if (!$session->isGameLoggedIn()) {
 }
 
 $me = $db->queryFirstRow(
-    'SELECT no,refresh_score,turntime,newmsg,newvote,`officer_level` FROM `general`
+    'SELECT no,con,turntime,newmsg,newvote,`officer_level` from general where owner = %i',
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner = %i',
     $userID
 );
 
@@ -53,13 +51,13 @@ if ($me['newmsg'] == 1 || $me['newvote'] == 1) {
 
 $plock = boolval($db->queryFirstField('SELECT plock FROM plock WHERE `type`="GAME" LIMIT 1'));
 
-$limitState = checkLimit($me['refresh_score']);
+$con = checkLimit($me['con']);
-if ($limitState >= 2) {
+if ($con >= 2) {
     printLimitMsg($me['turntime']);
     exit();
 }
 
-$generalObj = General::createObjFromDB($me['no'], null, GeneralQueryMode::FullWithAccessLog);
+$generalObj = General::createGeneralObjFromDB($me['no']);
 $generalObj->setRawCity($db->queryFirstRow('SELECT * FROM city WHERE city = %i', $generalObj->getCityID()));
 $scenario = $gameStor->scenario_text;
 
@@ -182,44 +180,44 @@ if ($lastVoteID) {
             </div>
 
             <div class="row center gx-0">
-                <div class="s-border-t col py-2 col-8 col-lg-4" style="color:<?= $color ?>;">
+                <div class="s-border-t col py-2 col-8 col-md-4" style="color:<?= $color ?>;">
                     <?= $scenario ?>
                 </div>
-                <div class="s-border-t col py-2 col-4 col-lg-2" style="color:<?= $color ?>;">
+                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
                     NPC 수, 상성 : <?= $extend ?>,<?= $fiction ?>
                 </div>
-                <div class="s-border-t col py-2 col-4 col-lg-2" style="color:<?= $color ?>;">
+                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
                     NPC선택 : <?= $npcmode ?>
                 </div>
-                <div class="s-border-t col py-2 col-4 col-lg-2" style="color:<?= $color ?>;">
+                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
                     토너먼트 : <?= getTournamentTermText($gameStor->turnterm) ?>
                 </div>
-                <div class="s-border-t col py-2 col-4 col-lg-2" style="color:<?= $color ?>;">
+                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
                     기타 설정: <?= $otherTextInfo ?>
                 </div>
 
-                <div class="s-border-t col py-2 col-8 col-lg-4"><?= info(2) ?></div>
+                <div class="s-border-t col py-2 col-8 col-md-4"><?= info(2) ?></div>
-                <div class="s-border-t col py-2 col-4 col-lg-2">전체 접속자 수 : <?= $gameStor->online_user_cnt ?> 명</div>
+                <div class="s-border-t col py-2 col-4 col-md-2">전체 접속자 수 : <?= $gameStor->online_user_cnt ?> 명</div>
-                <div class="s-border-t col py-2 col-4 col-lg-2">턴당 갱신횟수 : <?= $gameStor->refreshLimit ?>회</div>
+                <div class="s-border-t col py-2 col-4 col-md-2">턴당 갱신횟수 : <?= $gameStor->conlimit ?>회</div>
-                <div class="s-border-t col py-2 col-8 col-lg-4"><?= info(3) ?></div>
+                <div class="s-border-t col py-2 col-8 col-md-4"><?= info(3) ?></div>
-                <div class="s-border-t py-2 col col-6 col-lg-4">
+                <div class="s-border-t py-2 col col-6 col-md-4">
                     <?php if ($isTournamentActive) : ?>
                         ↑<span style='color:cyan'><?= (['전력전', '통솔전', '일기토', '설전',])[$gameStor->tnmt_type] ?? '' ?> <?= getTournament($gameStor->tournament) ?> <?= getTournamentTime() ?></span>↑
                     <?php else : ?>
                         <span style='color:magenta'>현재 토너먼트 경기 없음</span>
                     <?php endif; ?>
                 </div>
-                <div class="s-border-t py-2 col col-6 col-lg-2">
+                <div class="s-border-t py-2 col col-6 col-md-2">
                     <div style="display:inline-block;"><?= $plock ? ("<span style='color:magenta;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") : ("<span style='color:cyan;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") ?></div>
                 </div>
-                <div class="s-border-t py-2 col col-6 col-lg-2">
+                <div class="s-border-t py-2 col col-6 col-md-2">
                     <?php if ($auctionCount > 0) : ?>
                         <span style='color:cyan'><?= $auctionCount ?>건</span> 거래 진행중
                     <?php else : ?>
                         <span style='color:magenta'>진행중 거래 없음</span>
                     <?php endif; ?>
                 </div>
-                <div class="s-border-t py-2 col col-6 col-lg-4 vote-cell">
+                <div class="s-border-t py-2 col col-6 col-md-4 vote-cell">
                     <?php
                     ?>
                     <?php if ($lastVote === null) : ?>
@@ -285,6 +283,19 @@ if ($lastVoteID) {
                 <div id="general-position"><?php generalInfo($generalObj); ?></div>
                 <div id="generalCommandButton" class="row gx-0">
                     <div class="buttonPlate bg2">
+                        <?= commandButton([
+                            'splitBtnBegin' => '<div class="btn-group">',
+                            'splitBtnEnd' => '</div>',
+                            'splitZoneSign' => '<button type="button" class="btn btn-sammo-nation dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false"><span class="visually-hidden">Toggle Dropdown</span></button>',
+                            'splitZoneBegin' => '<ul class="dropdown-menu dropdown-menu-end">',
+                            'splitZoneEnd' => '</ul>',
+                            'splitSubBtnBegin' => '<li>',
+                            'splitSubBtnEnd' => '</li>',
+                            'btnClass' => 'btn btn-sammo-nation',
+                            'btnSplitClass' => 'dropdown-item',
+                            'isTournamentApplicationOpen' => $isTournamentApplicationOpen,
+                            'isBettingActive' => $isBettingActive
+                        ])
                         ?></div>
                 </div>
             </div>
@@ -299,11 +310,11 @@ if ($lastVoteID) {
             </div>
         </div>
         <div class="row gx-0">
-            <div class="col-lg-6" id="general_public_record-position">
+            <div class="col-md-6" id="general_public_record-position">
                 <div class="bg1 center s-border-tb"><b>장수 동향</b></div>
                 <div id="general_public_record" style="text-align:left;"><?= formatHistoryToHTML(getGlobalActionLogRecent(15)) ?></div>
             </div>
-            <div class="col-lg-6" id="general_log-position">
+            <div class="col-md-6" id="general_log-position">
                 <div class="bg1 center s-border-tb"><b>개인 기록</b></div>
                 <div id="general_log" style="text-align:left;"><?= formatHistoryToHTML(getGeneralActionLogRecent($me['no'], 15)) ?></div>
             </div>
@@ -317,34 +328,34 @@ if ($lastVoteID) {
 
             <div id="message_board" class="row gx-0">
                 <div class="message_input_form bg0 gx-0 row">
-                    <div id="mailbox_list-col" class="col-6 col-lg-2 d-grid">
+                    <div id="mailbox_list-col" class="col-6 col-md-2 d-grid">
                         <select id="mailbox_list" size="1" class="form-control bg-dark text-white">
                         </select>
                     </div>
-                    <div id="msg_input-col" class="col-12 col-lg-8 d-grid">
+                    <div id="msg_input-col" class="col-12 col-md-8 d-grid">
                         <input type="text" id="msg_input" maxlength="99" class="form-control">
                     </div>
-                    <div id="msg_submit-col" class="col-6 col-lg-2 d-grid"><button id="msg_submit" class="btn btn-primary">서신전달&amp;갱신</button></div>
+                    <div id="msg_submit-col" class="col-6 col-md-2 d-grid"><button id="msg_submit" class="btn btn-primary">서신전달&amp;갱신</button></div>
                 </div>
-                <div class="col-lg-6 board_side bg0"><a id="public_talk_position"></a>
+                <div class="col-md-6 board_side bg0"><a id="public_talk_position"></a>
                     <div class="board_header bg0">전체 메시지(최고99자)</div>
                     <section class="public_message">
                         <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="public">이전 메시지 불러오기</button></div>
                     </section>
                 </div>
-                <div class="col-lg-6 board_side bg0"><a id="national_talk_position"></a>
+                <div class="col-md-6 board_side bg0"><a id="national_talk_position"></a>
                     <div class="board_header bg0">국가 메시지(최고99자)</div>
                     <section class="national_message">
                         <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="national">이전 메시지 불러오기</button></div>
                     </section>
                 </div>
-                <div class="col-lg-6 board_side bg0"><a id="private_talk_position"></a>
+                <div class="col-md-6 board_side bg0"><a id="private_talk_position"></a>
                     <div class="board_header bg0">개인 메시지(최고99자)</div>
                     <section class="private_message">
                         <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="private">이전 메시지 불러오기</button></div>
                     </section>
                 </div>
-                <div class="col-lg-6 board_side bg0"><a id="diplomacy_talk_position"></a>
+                <div class="col-md-6 board_side bg0"><a id="diplomacy_talk_position"></a>
                     <div class="board_header bg0">외교 메시지(최고99자)</div>
                     <section class="diplomacy_message">
                         <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="diplomacy">이전 메시지 불러오기</button></div>
@@ -356,7 +367,7 @@ if ($lastVoteID) {
             </div>
         </div>
         <?php
-        if ($limitState == 1) {
+        if ($con == 1) {
             MessageBox("접속제한이 얼마 남지 않았습니다!");
         }
         if ($me['newmsg'] == 1) {
@@ -368,7 +379,7 @@ if ($lastVoteID) {
         }
         ?>
     </div>
-    <nav class="navbar navbar-expand fixed-bottom navbar-dark bg-dark d-sm-block d-lg-none p-0" id="navbar500">
+    <nav class="navbar navbar-expand fixed-bottom navbar-dark bg-dark d-sm-block d-md-none p-0" id="navbar500">
         <div class="container-fluid px-0">
             <div class="collapse navbar-collapse">
                 <ul class="navbar-nav me-auto mx-auto">
@@ -385,6 +396,18 @@ if ($lastVoteID) {
                             국가 메뉴
                         </div>
                         <ul class="dropdown-menu" aria-labelledby="navbarNation" id="navbarNationItems">
+                            <?= commandButton([
+                                'btnBegin' => '<li>',
+                                'btnEnd' => '</li>',
+                                'splitMainBegin' => '<div class="d-none">',
+                                'splitMainEnd' => '</div>',
+                                'splitSubBtnBegin' => '<li>',
+                                'splitSubBtnEnd' => '</li>',
+                                'btnClass' => 'dropdown-item',
+                                'btnSplitClass' => 'dropdown-item',
+                                'isTournamentApplicationOpen' => $isTournamentApplicationOpen,
+                                'isBettingActive' => $isBettingActive
+                            ]) ?>
                         </ul>
                     </li>
                     <li class="nav-item dropup">

hwe/process_war.php

@@ -3,7 +3,6 @@
 namespace sammo;
 
 use sammo\Enums\EventTarget;
-use sammo\Enums\GeneralQueryMode;
 
 function processWar(string $warSeed, General $attackerGeneral, array $rawAttackerNation, array $rawDefenderCity)
 {
@@ -37,33 +36,17 @@ function processWar(string $warSeed, General $attackerGeneral, array $rawAttacke
 
     $city = new WarUnitCity($rng, $rawDefenderCity, $rawDefenderNation, $year, $month, $startYear);
 
-    $defenderCityGeneralIDList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND city=%i AND nation!=0', $city->getVar('nation'), $city->getVar('city'));
+    $defenderIDList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND city=%i AND nation!=0 and crew > 0 and rice>(crew/100) and train>=defence_train and atmos>=defence_train', $city->getVar('nation'), $city->getVar('city'));
-    $defenderCityGeneralList = General::createObjListFromDB($defenderCityGeneralIDList, null);
+    $defenderList = General::createGeneralObjListFromDB($defenderIDList, null, 2);
 
-    /** @var WarUnit[] */
+    usort($defenderList, function (General $lhs, General $rhs) {
-    $defenderList = [];
+        return - (extractBattleOrder($lhs) <=> extractBattleOrder($rhs));
-    foreach($defenderCityGeneralList as $defenderGeneral){
-        $defenderGeneral->setRawCity($rawDefenderCity);
-        $defenderCandidate = new WarUnitGeneral($rng, $defenderGeneral, $rawDefenderNation, false);
-        if(extractBattleOrder($defenderCandidate, $attacker) <= 0){
-            continue;
-        }
-
-        $defenderList[] = $defenderCandidate;
-    }
-
-    if(count($defenderList) && extractBattleOrder($city, $attacker) > 0){
-        $defenderList[] = $city;
-    }
-
-    usort($defenderList, function (WarUnit $lhs, WarUnit $rhs) use ($attacker) {
-        return - (extractBattleOrder($lhs, $attacker) <=> extractBattleOrder($rhs, $attacker));
     });
 
     $iterDefender = new \ArrayIterator($defenderList);
     $iterDefender->rewind();
 
-    $getNextDefender = function (?WarUnit $prevDefender, bool $reqNext) use ($iterDefender, $db, $attacker) {
+    $getNextDefender = function (?WarUnit $prevDefender, bool $reqNext) use ($rng, $iterDefender, $rawDefenderNation, $rawDefenderCity, $db) {
         if ($prevDefender !== null) {
             $prevDefender->applyDB($db);
         }
@@ -76,16 +59,24 @@ function processWar(string $warSeed, General $attackerGeneral, array $rawAttacke
             return null;
         }
 
-        /** @var WarUnit */
         $nextDefender = $iterDefender->current();
-        if (extractBattleOrder($nextDefender, $attacker) <= 0) {
+        $nextDefender->setRawCity($rawDefenderCity);
+        if (extractBattleOrder($nextDefender) <= 0) {
             return null;
         }
+
+
+        $retVal = new WarUnitGeneral(
+            $rng,
+            $nextDefender,
+            $rawDefenderNation,
+            false
+        );
         $iterDefender->next();
-        return $nextDefender;
+        return $retVal;
     };
 
-    $conquerCity = processWar_NG($warSeed, $attacker, $getNextDefender, $city);
+    $conquerCity = processWar_NG($warSeed, $attacker, $getNextDefender, $city, $year - $startYear);
 
     $attacker->applyDB($db);
 
@@ -186,20 +177,11 @@ function processWar(string $warSeed, General $attackerGeneral, array $rawAttacke
         'year' => $year,
         'month' => $month,
         'join_mode' => $joinMode,
-    ], $attacker->getGeneral(), $city->getRaw(), $defenderCityGeneralList);
+    ], $attacker->getGeneral(), $city->getRaw());
 }
 
-function extractBattleOrder(WarUnit $defender, WarUnit $attacker)
+function extractBattleOrder(General $general)
 {
-    if($defender instanceof WarUnitCity){
-        if(!($attacker instanceof WarUnitGeneral)){
-            return 0;
-        }
-        $attackerGeneral = $attacker->getGeneral();
-        return $attackerGeneral->onCalcOpposeStat($defender->getGeneral(), 'cityBattleOrder', -1);
-    }
-
-    $general = $defender->getGeneral();
     if ($general->getVar('crew') == 0) {
         return 0;
     }
@@ -230,6 +212,7 @@ function processWar_NG(
     WarUnitGeneral $attacker,
     callable $getNextDefender,
     WarUnitCity $city,
+    int $relYear
 ): bool {
     $templates = new \League\Plates\Engine(__DIR__ . '/templates');
 
@@ -242,7 +225,6 @@ function processWar_NG(
     $attackerNationUpdate = [];
     $defenderNationUpdate = [];
 
-    /** @var WarUnit */
     $defender = ($getNextDefender)(null, true);
     $conquerCity = false;
 
@@ -258,7 +240,6 @@ function processWar_NG(
         $logWritten = false;
         if ($defender === null) {
             $defender = $city;
-            $defender->setSiege();
 
             if ($city->getNationVar('rice') <= 0 && $city->getVar('supply')) {
                 //병량 패퇴
@@ -425,28 +406,21 @@ function processWar_NG(
             $attacker->logBattleResult();
             $defender->logBattleResult();
 
-            if (!($defender instanceof WarUnitCity) || $defender->isSiege()){
+            $attacker->addWin();
-                $attacker->addWin();
+            $defender->addLose();
-                $defender->addLose();
 
-                $attacker->tryWound();
+            $attacker->tryWound();
-                $defender->tryWound();
+            $defender->tryWound();
 
-                if ($defender === $city) {
+            if ($defender === $city) {
-                    $attacker->addLevelExp(1000);
+                $attacker->addLevelExp(1000);
-                    $conquerCity = true;
+                $conquerCity = true;
-                    break;
+                break;
-                }
             }
 
-
             $josaYi = JosaUtil::pick($defender->getCrewTypeName(), '이');
 
-            if ($defender instanceof WarUnitCity && !$defender->isSiege()){
+            if ($noRice) {
-                //실제 공성을 위해 다시 초기화
-                $defender->setOppose(null);
-            }
-            else if ($noRice) {
                 $logger->pushGlobalActionLog("<Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaYi} 패퇴했습니다.");
                 $attacker->getLogger()->pushGeneralActionLog("<Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaYi} 패퇴했습니다.", ActionLogger::PLAIN);
                 $defender->getLogger()->pushGeneralActionLog("군량 부족으로 패퇴합니다.", ActionLogger::PLAIN);
@@ -481,18 +455,12 @@ function processWar_NG(
     $attacker->finishBattle();
     $defender->finishBattle();
 
-    if($city->getDead() || $defender instanceof WarUnitCity){
+    if ($defender instanceof WarUnitCity) {
-        if($city !== $defender){
+        $newConflict = $defender->addConflict();
-            $city->setOppose($attacker);
-            $city->setSiege();
-            $city->finishBattle();
-        }
-
-        $newConflict = $city->addConflict();
         if ($newConflict) {
             $nationName = $attacker->getNationVar('name');
             $josaYi = JosaUtil::pick($nationName, '이');
-            $logger->pushGlobalHistoryLog("<M><b>【분쟁】</b></><D><b>{$nationName}</b></>{$josaYi} <G><b>{$city->getName()}</b></> 공략에 가담하여 분쟁이 발생하고 있습니다.");
+            $logger->pushGlobalHistoryLog("<M><b>【분쟁】</b></><D><b>{$nationName}</b></>{$josaYi} <G><b>{$defender->getName()}</b></> 공략에 가담하여 분쟁이 발생하고 있습니다.");
         }
     }
 
@@ -529,9 +497,8 @@ function getConquerNation($city): int
     return Util::array_first_key($conflict);
 }
 
-function ConquerCity(array $admin, General $general, array $city, array $defenderCityGeneralList)
+function ConquerCity(array $admin, General $general, array $city)
 {
-    /** @var General[] $defenderCityGeneralList */
     $db = DB::db();
 
     $year = $admin['year'];
@@ -586,21 +553,6 @@ function ConquerCity(array $admin, General $general, array $city, array $defende
     if(TurnExecutionHelper::runEventHandler($db, $gameStor, EventTarget::OccupyCity)){
         $gameStor->cacheAll();
     }
-    $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
-        UniqueConst::$hiddenSeed,
-        'ConquerCity',
-        $year,
-        $month,
-        $attackerNationID,
-        $attackerID,
-        $cityID
-    )));
-    foreach($defenderCityGeneralList as $defenderCityGeneral){
-        $defenderCityGeneral->onArbitraryAction($defenderCityGeneral, $rng, 'ConquerCity', null, [
-            'attacker' => $general
-        ]);
-        $defenderCityGeneral->applyDB($db);
-    }
 
 
     // 국가 멸망시
@@ -612,10 +564,10 @@ function ConquerCity(array $admin, General $general, array $city, array $defende
 
         $lord = new General($db->queryFirstRow(
             'SELECT %l FROM general WHERE nation = %i AND officer_level = %i LIMIT 1',
-            Util::formatListOfBackticks(General::mergeQueryColumn()[0]),
+            Util::formatListOfBackticks(General::mergeQueryColumn(['npc', 'gold', 'rice', 'experience', 'explevel', 'belong', 'dedication', 'dedlevel', 'aux'], 1)[0]),
             $defenderNationID,
             12
-        ), null, null, $city, $loseNation, $year, $month);
+        ), null, $city, $loseNation, $year, $month, false);
 
         $josaUl = JosaUtil::pick($defenderNationName, '을');
         $attackerLogger->pushNationalHistoryLog("<D><b>{$defenderNationName}</b></>{$josaUl} 정복");
@@ -712,12 +664,11 @@ function ConquerCity(array $admin, General $general, array $city, array $defende
             $minCity = findNextCapital($cityID, $defenderNationID);
 
             $minCityName = CityConst::byID($minCity)->name;
-            $josaRo = JosaUtil::pick($minCityName, '로');
 
             $josaYi = JosaUtil::pick($defenderNationName, '이');
-            $attackerLogger->pushGlobalHistoryLog("<M><b>【긴급천도】</b></><D><b>{$defenderNationName}</b></>{$josaYi} 수도가 함락되어 <G><b>$minCityName</b></>{$josaRo} 긴급천도하였습니다.");
+            $attackerLogger->pushGlobalHistoryLog("<M><b>【긴급천도】</b></><D><b>{$defenderNationName}</b></>{$josaYi} 수도가 함락되어 <G><b>$minCityName</b></>으로 긴급천도하였습니다.");
 
-            $moveLog = "수도가 함락되어 <G><b>$minCityName</b></>{$josaRo} <M>긴급천도</>합니다.";
+            $moveLog = "수도가 함락되어 <G><b>$minCityName</b></>으로 <M>긴급천도</>합니다.";
             //아국 수뇌부에게 로그 전달
             foreach ($db->queryFirstColumn(
                 'SELECT no FROM general WHERE nation=%i AND officer_level>=5',

hwe/sammo/API/Auction/BidBuyRiceAuction.php

@@ -39,7 +39,7 @@ class BidBuyRiceAuction extends \sammo\BaseAPI
     $amount = $this->args['amount'];
 
     $generalID = $session->generalID;
-    $general = General::createObjFromDB($generalID);
+    $general = General::createGeneralObjFromDB($generalID);
     $auction = new AuctionBuyRice($auctionID, $general);
     $result = $auction->bid($amount, true);
 

hwe/sammo/API/Auction/BidSellRiceAuction.php

@@ -38,7 +38,7 @@ class BidSellRiceAuction extends \sammo\BaseAPI
     $amount = $this->args['amount'];
 
     $generalID = $session->generalID;
-    $general = General::createObjFromDB($generalID);
+    $general = General::createGeneralObjFromDB($generalID);
     $auction = new AuctionSellRice($auctionID, $general);
     $result = $auction->bid($amount, true);
 

hwe/sammo/API/Auction/BidUniqueAuction.php

@@ -41,7 +41,7 @@ class BidUniqueAuction extends \sammo\BaseAPI
     $tryExtendCloseDate = $this->args['extendCloseDate'] ?? false;
 
     $generalID = $session->generalID;
-    $general = General::createObjFromDB($generalID);
+    $general = General::createGeneralObjFromDB($generalID);
     $auction = new AuctionUniqueItem($auctionID, $general);
     $result = $auction->bid($amount, $tryExtendCloseDate);
 

hwe/sammo/API/Auction/GetUniqueItemAuctionDetail.php

@@ -10,7 +10,6 @@ use sammo\DTO\AuctionBidItem;
 use sammo\DTO\AuctionInfo;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\AuctionType;
-use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\InheritanceKey;
 use sammo\InheritancePointManager;
 use sammo\TimeUtil;
@@ -77,7 +76,7 @@ class GetUniqueItemAuctionDetail extends \sammo\BaseAPI
     $inheritMgr = InheritancePointManager::getInstance();
     //preveious라서 column을 최대한 비울 수 있다.
     $remainPoint = $inheritMgr->getInheritancePoint(
-      General::createObjFromDB($generalID),
+      General::createGeneralObjFromDB($generalID, ['owner'], 0),
       InheritanceKey::previous
     );
 

hwe/sammo/API/Auction/OpenBuyRiceAuction.php

@@ -66,7 +66,7 @@ class OpenBuyRiceAuction extends \sammo\BaseAPI
     $finishBidAmount = $this->args['finishBidAmount'];
     $generalID = $session->generalID;
 
-    $general = General::createObjFromDB($generalID);
+    $general = General::createGeneralObjFromDB($generalID);
 
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');

hwe/sammo/API/Auction/OpenSellRiceAuction.php

@@ -66,7 +66,7 @@ class OpenSellRiceAuction extends \sammo\BaseAPI
     $finishBidAmount = $this->args['finishBidAmount'];
     $generalID = $session->generalID;
 
-    $general = General::createObjFromDB($generalID);
+    $general = General::createGeneralObjFromDB($generalID);
 
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');

hwe/sammo/API/Auction/OpenUniqueAuction.php

@@ -57,7 +57,7 @@ class OpenUniqueAuction extends \sammo\BaseAPI
     $generalID = $session->generalID;
 
     $itemObj = buildItemClass($itemID);
-    $general = General::createObjFromDB($generalID);
+    $general = General::createGeneralObjFromDB($generalID);
 
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');

hwe/sammo/API/Betting/GetBettingList.php

@@ -42,12 +42,9 @@ class GetBettingList extends \sammo\BaseAPI
         $bettingStor = KVStorage::getStorage($db, 'betting');
         $userID = $session->userID;
 
-        $me = $db->queryFirstRow(
+        $me = $db->queryFirstRow('SELECT no,nation,officer_level,con,turntime,belong,penalty,permission FROM general WHERE owner=%i', $userID);
-            'SELECT no,nation,officer_level,refresh_score,turntime,belong,penalty,permission FROM `general`
+        $con = checkLimit($me['con']);
-            LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
+        if ($con >= 2) {
-        );
-        $limitState = checkLimit($me['refresh_score']);
-        if ($limitState >= 2) {
             return "접속 제한중입니다.";
         }
 

hwe/sammo/API/City/GetCityInfo.php

@@ -0,0 +1,332 @@
+<?php
+
+namespace sammo\API\City;
+
+use ArrayObject;
+use Ds\Set;
+use sammo\CityConst;
+use sammo\DB;
+use sammo\Enums\APIRecoveryType;
+use sammo\General;
+use sammo\Json;
+use sammo\Session;
+use sammo\Util;
+use sammo\Validator;
+
+use function sammo\calcLeadershipBonus;
+use function sammo\checkLimit;
+use function sammo\checkSecretPermission;
+use function sammo\getAllNationStaticInfo;
+use function sammo\getBillByLevel;
+use function sammo\getDedLevelText;
+use function sammo\getHonor;
+use function sammo\getNationStaticInfo;
+use function sammo\getOfficerLevelText;
+use function sammo\increaseRefresh;
+
+class GetCityInfo extends \sammo\BaseAPI
+{
+  const FAR_CITY = 0;
+  const NEAR_CITY = 1;
+  const ON_CITY = 2;
+  const OUR_NATION = 3;
+
+  static $viewColumns = [
+    'no' => self::NEAR_CITY,
+    'name' => self::NEAR_CITY,
+    'nation' => self::NEAR_CITY,
+    'npc' => self::NEAR_CITY,
+    'injury' => self::NEAR_CITY,
+    'leadership' => self::NEAR_CITY,
+    'strength' => self::NEAR_CITY,
+    'intel' => self::NEAR_CITY,
+
+    'picture' => self::NEAR_CITY,
+    'imgsvr' => self::NEAR_CITY,
+
+    'city' => self::NEAR_CITY,
+
+    'officer_level' => self::NEAR_CITY,
+    'officer_city' => self::NEAR_CITY,
+    'defence_train' => self::OUR_NATION,
+    'crewtype' => self::OUR_NATION,
+    'crew' => self::ON_CITY,
+    'train' => self::OUR_NATION,
+    'atmos' => self::OUR_NATION,
+  ];
+
+  static $columnRemap = [
+    'nation' => 'nationID',
+  ];
+
+  static $customViewColumns = [
+    'officerLevel' => self::NEAR_CITY,
+    'officerLevelText' => self::NEAR_CITY,
+    'lbonus' => self::NEAR_CITY,
+    'reservedCommand' => self::OUR_NATION,
+    'isOurNation' => self::NEAR_CITY,
+  ];
+
+  public function validateArgs(): ?string
+  {
+    $v = new Validator($this->args);
+    $v->rule('int', 'troopID');
+
+    if (!$v->validate()) {
+      return $v->errorStr();
+    }
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+  }
+
+  private function getOfficerLevel($rawGeneral)
+  {
+    $level = $rawGeneral['officer_level'];
+    return $level;
+  }
+
+  private function filterCity(array $rawCity, int $showLevel)
+  {
+    $cityID = $rawCity['city'];
+    $db = DB::db();
+
+    $officerList = $db->query(
+      'SELECT no, npc, name, nation, picture, imgsvr FROM general WHERE city = %i AND 2 <= officer_level AND officer_level <= 4',
+      $cityID
+    );
+
+    $filteredCity = [
+      'city' => $cityID,
+      'name' => $rawCity['name'],
+      'level' => $rawCity['level'],
+      'nation' => $rawCity['nation'],
+      'supply' => $rawCity['supply'],
+      'pop_max' => $rawCity['pop_max'],
+      'agri_max' => $rawCity['agri_max'],
+      'comm_max' => $rawCity['comm_max'],
+      'secu_max' => $rawCity['secu_max'],
+      'trade' => $rawCity['trade'],
+      'def_max' => $rawCity['def_max'],
+      'wall_max' => $rawCity['wall_max'],
+      'region' => $rawCity['region'],
+      'officerList' => $officerList,
+    ];
+
+    if ($showLevel >= self::ON_CITY) {
+      $filteredCity = array_merge($filteredCity, [
+        'pop' => $rawCity['pop'],
+        'agri' => $rawCity['agri'],
+        'comm' => $rawCity['comm'],
+        'secu' => $rawCity['secu'],
+        'def' => $rawCity['def'],
+        'wall' => $rawCity['wall'],
+        'officer_set' => $rawCity['officer_set'],
+      ]);
+    }
+
+    return $filteredCity;
+  }
+
+  private function getGeneralList(int $cityID, int $nationID, int $showLevel)
+  {
+    if ($showLevel == self::FAR_CITY) {
+      return [
+        'column' => [],
+        'list' => []
+      ];
+    }
+    $db = DB::db();
+
+    $nationStaticList = getAllNationStaticInfo();
+
+    $rawGeneralList = Util::convertArrayToDict($db->query('SELECT %l from general WHERE city = %i ORDER BY turntime ASC', Util::formatListOfBackticks(array_keys(static::$viewColumns)), $cityID), 'no');
+    $ourNationGeneralIDList = new Set();
+    foreach ($rawGeneralList as $rawGeneral) {
+      if ($rawGeneral['nation'] == $nationID) {
+        $ourNationGeneralIDList->add($rawGeneral['no']);
+      }
+    }
+
+    $reservedCommand = [];
+    $reservedCommandTargetGeneralIDList = [];
+
+    foreach ($rawGeneralList as $rawGeneral) {
+      if ($rawGeneral['nation'] != $nationID) {
+        continue;
+      }
+      if ($rawGeneral['npc'] < 2) {
+        $reservedCommandTargetGeneralIDList[$rawGeneral['no']] = $rawGeneral['no'];
+      }
+    }
+
+    if ($reservedCommandTargetGeneralIDList) {
+      $rawTurnList = $db->query(
+        'SELECT general_id, turn_idx, action, arg, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id asc, turn_idx asc',
+        array_values($reservedCommandTargetGeneralIDList)
+      );
+
+      foreach ($rawTurnList as $rawTurn) {
+        [
+          'general_id' => $generalID,
+          'action' => $action,
+          'arg' => $arg,
+          'brief' => $brief,
+        ] = $rawTurn;
+        if (!key_exists($generalID, $reservedCommand)) {
+          $reservedCommand[$generalID] = [];
+        }
+        $reservedCommand[$generalID][] = [
+          'action' => $action,
+          'arg' => $arg,
+          'brief' => $brief
+        ];
+      }
+    }
+
+    $specialViewFilter = [
+      'officerLevel' => fn ($rawGeneral) => $this->getOfficerLevel($rawGeneral),
+      'officerLevelText' => fn ($rawGeneral) => getOfficerLevelText($this->getOfficerLevel($rawGeneral), $nationStaticList[$rawGeneral['nation']]['level']),
+      'lbonus' => fn ($rawGeneral) => calcLeadershipBonus($rawGeneral['officer_level'], $nationStaticList[$rawGeneral['nation']]['level']),
+      'reservedCommand' => fn ($rawGeneral) => $reservedCommand[$rawGeneral['no']] ?? null,
+      'isOurNation' => fn ($rawGeneral) => $rawGeneral['nation'] == $nationID,
+    ];
+
+    $showFullColumn = $showLevel == self::OUR_NATION || $ourNationGeneralIDList->count() > 0;
+
+    $resultColumns = [];
+    foreach (static::$viewColumns as $column => $reqShowLevel) {
+      if (!$showFullColumn && $reqShowLevel > $showLevel) {
+        continue;
+      }
+      if (key_exists($column, static::$columnRemap)) {
+        $newColumn = static::$columnRemap[$column];
+        if ($newColumn !== null) {
+          $resultColumns[$newColumn] = $column;
+        }
+      } else {
+        $resultColumns[$column] = $column;
+      }
+    }
+
+    foreach (static::$customViewColumns as $column => $reqShowLevel) {
+      if (!$showFullColumn && $reqShowLevel > $showLevel) {
+        continue;
+      }
+      $resultColumns[$column] = $column;
+    }
+
+    $generalList = [];
+    foreach ($rawGeneralList as $rawGeneral) {
+      $item = [];
+      foreach ($resultColumns as $column) {
+        $reqShowLevel = static::$viewColumns[$column];
+
+        if ($rawGeneral['nation'] != $nationID && $reqShowLevel == self::OUR_NATION) {
+          $item[] = null;
+          continue;
+        }
+
+        if (key_exists($column, $specialViewFilter)) {
+          $value = $specialViewFilter[$column]($rawGeneral);
+        } else {
+          $value = $rawGeneral[$column];
+        }
+        $item[] = $value;
+      }
+
+      $generalList[] = $item;
+    }
+    return [
+      'column' => array_keys($resultColumns),
+      'list' => $generalList,
+    ];
+  }
+
+  private function calcShowLevel(int $cityID, int $currentCityID, int $nationID, Set $cityList, bool $isSpyPresent): int
+  {
+    $db = DB::db();
+    if ($cityList->contains($currentCityID)) {
+      return self::OUR_NATION;
+    }
+    if ($cityID == $currentCityID) {
+      return self::ON_CITY;
+    }
+    if ($isSpyPresent) {
+      return self::ON_CITY;
+    }
+
+    $existsGeneralID = $db->queryFirstField(
+      'SELECT no FROM general WHERE city = %i AND nation = %i LIMIT 1',
+      $cityID,
+      $nationID
+    );
+
+    if ($existsGeneralID) {
+      return self::ON_CITY;
+    }
+
+    $cityConstObj = CityConst::byID($cityID);
+
+    $nearCityIDList = array_keys($cityConstObj->path);
+    foreach ($nearCityIDList as $nearCityID) {
+      if ($cityList->contains($nearCityID)) {
+        return self::NEAR_CITY;
+      }
+    }
+
+    return self::FAR_CITY;
+  }
+
+  public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
+  {
+    increaseRefresh("도시정보", 1);
+
+    $db = DB::db();
+
+    $gameStor = \sammo\KVStorage::getStorage($db, 'game_env');
+    $lastExecuted = $gameStor->getValue('turntime');
+
+    $me = $db->queryFirstRow('SELECT con, turntime, belong, city, nation, officer_level, permission, penalty FROM general WHERE owner=%i', $session->getUserID());
+
+    if (key_exists('cityID', $this->args)) {
+      $cityID = (int)$this->args['cityID'];
+    } else {
+      $cityID = $me['city'];
+    }
+
+    $con = checkLimit($me['con']);
+    if ($con >= 2) {
+      return '접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다.';
+    }
+
+    $nationID = $me['nation'];
+    $currentCityID = $me['city'];
+    //TODO: 조건 조사
+
+    $cityList = new Set($db->queryFirstColumn('SELECT city FROM city WHERE nation=%i', $nationID));
+
+    $spyList = JSON::decode($db->queryFirstField('SELECT spy FROM nation WHERE nation=%i', $nationID));
+    $showLevel = $this->calcShowLevel($cityID, $currentCityID, $nationID, $cityList, key_exists($cityID, $spyList));
+
+    $rawCity = $db->queryFirstRow('SELECT * FROM city WHERE city=%i', $cityID);
+    $filteredCity = $this->filterCity($rawCity, $showLevel);
+
+    $result = [
+      'result' => true,
+      'lastExcuted' => $lastExecuted,
+      'cityInfo' => $filteredCity,
+      'spyList' => $spyList,
+      'nationCityList' => $cityList->toArray(),
+      'myGeneralID' => $session->generalID,
+      'currentCityID' => $currentCityID,
+      'showLevel' => $showLevel,
+      'cityGeneralList' => $this->getGeneralList($cityID, $nationID, $showLevel)
+    ];
+
+    return $result;
+  }
+}

hwe/sammo/API/Command/GetReservedCommand.php

@@ -6,7 +6,6 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
-use sammo\GameConst;
 use sammo\Json;
 use sammo\KVStorage;
 use sammo\TimeUtil;
@@ -33,18 +32,8 @@ class GetReservedCommand extends \sammo\BaseAPI
         $gameStor = KVStorage::getStorage($db, 'game_env');
         $generalID = $session->generalID;
 
-        $invalidTurnList = 0;
-
         $rawTurn = $db->queryAllLists('SELECT turn_idx, action, arg, brief FROM general_turn WHERE general_id = %i ORDER BY turn_idx ASC', $generalID);
         foreach ($rawTurn as [$turn_idx, $action, $arg, $brief]) {
-            if($turn_idx < 0) {
-                $invalidTurnList = -1;
-                $turn_idx += GameConst::$maxTurn;
-            }
-            else if($turn_idx >= GameConst::$maxTurn) {
-                $invalidTurnList = 1;
-                $turn_idx -= GameConst::$maxTurn;
-            }
             $commandList[$turn_idx] = [
                 'action' => $action,
                 'brief' => $brief,
@@ -52,19 +41,6 @@ class GetReservedCommand extends \sammo\BaseAPI
             ];
         }
 
-        if($invalidTurnList != 0){
-            if($invalidTurnList > 0){
-                $db->update('general_turn', [
-                    'turn_idx' => $db->sqleval('turn_idx - %i', GameConst::$maxTurn)
-                ], 'general_id=%i AND turn_idx >= %i', $generalID, GameConst::$maxTurn);
-            }
-            else{
-                $db->update('general_turn', [
-                    'turn_idx' => $db->sqleval('turn_idx + %i', GameConst::$maxTurn)
-                ], 'general_id=%i AND turn_idx < 0', $generalID);
-            }
-        }
-
 
         [$turnTerm, $year, $month, $lastExecute] = $gameStor->getValuesAsArray(['turnterm', 'year', 'month', 'turntime']);
 

hwe/sammo/API/General/BuildNationCandidate.php

@@ -39,7 +39,7 @@ class BuildNationCandidate extends \sammo\BaseAPI
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $gameStor->cacheValues(['opentime', 'turntime']);
 
-    $general = $db->queryFirstRow('SELECT no,name,nation,owner_name,npc FROM general WHERE owner=%i', $userID);
+    $general = $db->queryFirstRow('SELECT no,name,nation,owner_name,npc,lastrefresh FROM general WHERE owner=%i', $userID);
 
     if (!$general) {
       return '장수가 없습니다';
@@ -59,7 +59,7 @@ class BuildNationCandidate extends \sammo\BaseAPI
 
     $env = $gameStor->getAll();
 
-    $generalObj = General::createObjFromDB($general['no']);
+    $generalObj = General::createGeneralObjFromDB($general['no']);
 
     $validCmd = false;
     foreach(GameConst::$availableGeneralCommand as $cmdList){
@@ -90,9 +90,6 @@ class BuildNationCandidate extends \sammo\BaseAPI
       return '거병을 실패했습니다.';
     }
 
-    $generalObj->setVar('killturn', $env['killturn']);
-    $generalObj->applyDB($db);
-
     return null;
   }
 }

hwe/sammo/API/General/DieOnPrestart.php

@@ -5,7 +5,6 @@ namespace sammo\API\General;
 use sammo\DB;
 use sammo\DummyGeneral;
 use sammo\Enums\APIRecoveryType;
-use sammo\Enums\GeneralAccessLogColumn;
 use sammo\GameConst;
 use sammo\Session;
 use sammo\General;
@@ -38,13 +37,7 @@ class DieOnPrestart extends \sammo\BaseAPI
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $gameStor->cacheValues(['turnterm', 'opentime', 'turntime', 'year', 'month']);
 
-    $general = $db->queryFirstRow('SELECT no,name,nation,owner_name,npc FROM general WHERE owner=%i AND npc = 0', $userID);
+    $general = $db->queryFirstRow('SELECT no,name,nation,owner_name,npc,lastrefresh FROM general WHERE owner=%i AND npc = 0', $userID);
-    $lastRefresh = $db->queryFirstField(
-      'SELECT %b FROM general_access_log WHERE %b = %i',
-      GeneralAccessLogColumn::lastRefresh->value,
-      GeneralAccessLogColumn::generalID->value,
-      $general['no']
-    );
 
     if (!$general) {
       return '장수가 없습니다';
@@ -62,13 +55,13 @@ class DieOnPrestart extends \sammo\BaseAPI
     }
 
     //서버 가오픈시 할 수 있는 행동
-    $targetTime = addTurn($lastRefresh, $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
+    $targetTime = addTurn($general['lastrefresh'], $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
     if ($targetTime > TimeUtil::now()) {
       $targetTimeShort = substr($targetTime, 0, 19);
       return "아직 삭제할 수 없습니다. {$targetTimeShort} 부터 가능합니다.";
     }
 
-    $generalObj = General::createObjFromDB($general['no']);
+    $generalObj = General::createGeneralObjFromDB($general['no']);
     if ($generalObj instanceof DummyGeneral) {
       trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING);
     }

hwe/sammo/API/General/DropItem.php

@@ -37,7 +37,7 @@ class DropItem extends \sammo\BaseAPI
   public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
   {
     $generalID = $session->generalID;
-    $me = General::createObjFromDB($generalID);
+    $me = General::createGeneralObjFromDB($generalID);
 
     $itemType = $this->args['itemType'];
     $item = $me->getItem($itemType);

hwe/sammo/API/General/GetCommandTable.php

@@ -21,7 +21,7 @@ class GetCommandTable extends \sammo\BaseAPI{
     public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
     {
         $generalID = $session->generalID;
-        $me = General::createObjFromDB($generalID);
+        $me = General::createGeneralObjFromDB($generalID);
         $commandTable = getCommandTable($me);
 
         return [

hwe/sammo/API/General/GetFrontInfo.php

@@ -9,9 +9,7 @@ use sammo\DB;
 use sammo\DTO\VoteInfo;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\CityColumn;
-use sammo\Enums\GeneralAccessLogColumn;
 use sammo\Enums\GeneralColumn;
-use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\RankColumn;
 use sammo\GameConst;
 use sammo\General;
@@ -175,7 +173,7 @@ class GetFrontInfo extends \sammo\BaseAPI
       'online_nation', 'online_user_cnt',
       'year', 'month', 'startyear',
       'maxgeneral',
-      'refreshLimit',
+      'conlimit',
       'server_cnt',
     ]);
 
@@ -385,8 +383,7 @@ class GetFrontInfo extends \sammo\BaseAPI
       'specialWar' => $general->getVar(GeneralColumn::special2), // GameObjClassKey;
       'personal' => $general->getVar(GeneralColumn::personal), // GameObjClassKey;
       'belong' => $general->getVar(GeneralColumn::belong), // number;
-
+      'connect' => $general->getVar(GeneralColumn::connect), // number;
-      'refreshScoreTotal' => $general->getAccessLogVar(GeneralAccessLogColumn::refreshScoreTotal, 0), // number;
 
       'officerLevel' => $general->getVar(GeneralColumn::officer_level), // number;
       'officerLevelText' => getOfficerLevelText($general->getVar(GeneralColumn::officer_level), $rawNation['level']), // string;
@@ -403,7 +400,7 @@ class GetFrontInfo extends \sammo\BaseAPI
       'troop' => $general->getVar(GeneralColumn::troop), // number;
       //P0 End
 
-      'refreshScore' => $general->getAccessLogVar(GeneralAccessLogColumn::refreshScore, 0), // number;
+      'con' => $general->getVar(GeneralColumn::con), // number;
       'specage' => $general->getVar(GeneralColumn::specage), // number;
       'specage2' => $general->getVar(GeneralColumn::specage2), // number;
       'leadership_exp' => $general->getVar(GeneralColumn::leadership_exp), // number;
@@ -534,12 +531,12 @@ class GetFrontInfo extends \sammo\BaseAPI
   {
     $generalID = $session->generalID;
     //NOTE: 이 경우 staticNation 정보를 조회한다.
-    $general = General::createObjFromDB($generalID, null, GeneralQueryMode::FullWithAccessLog);
+    $general = General::createGeneralObjFromDB($generalID);
     $nationID = $general->getNationID();
     $cityID = $general->getCityID();
 
-    $limitState = checkLimit($general->getAccessLogVar(GeneralAccessLogColumn::refreshScore, 0));
+    $con = checkLimit($general->getVar('con'));
-    if ($limitState >= 2) {
+    if ($con >= 2) {
       return [
         'result' => false,
         'reason' => '접속 제한중입니다.',

hwe/sammo/API/General/InstantRetreat.php

@@ -1,81 +0,0 @@
-<?php
-
-namespace sammo\API\General;
-
-use sammo\DB;
-use sammo\DummyGeneral;
-use sammo\Enums\APIRecoveryType;
-use sammo\Enums\GeneralAccessLogColumn;
-use sammo\GameConst;
-use sammo\Session;
-use sammo\General;
-use sammo\JosaUtil;
-use sammo\KVStorage;
-use sammo\LiteHashDRBG;
-use sammo\RandUtil;
-use sammo\TimeUtil;
-use sammo\UniqueConst;
-use sammo\Util;
-
-use function sammo\addTurn;
-use function sammo\buildGeneralCommandClass;
-use function sammo\increaseRefresh;
-
-class InstantRetreat extends \sammo\BaseAPI
-{
-  public function validateArgs(): ?string
-  {
-    return null;
-  }
-
-  public function getRequiredSessionMode(): int
-  {
-    return static::REQ_GAME_LOGIN;
-  }
-
-  public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
-  {
-
-    if(!(GameConst::$availableInstantAction['instantRetreat'] ?? false)){
-        return '접경귀환을 사용할 수 없는 시나리오입니다.';
-    }
-
-    $db = DB::db();
-    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $gameStor->cacheAll();
-
-    $general = General::createObjFromDB($session->generalID);
-
-    if (!$general) {
-      return '장수가 없습니다';
-    }
-
-    increaseRefresh("접경귀환", 1);
-
-    $commandObj = buildGeneralCommandClass('che_접경귀환', $general, $gameStor->getAll(true));
-    $logger = $general->getLogger();
-
-    if (!$commandObj->hasFullConditionMet()) {
-        $logger->pushGeneralActionLog($commandObj->getFailString());
-        $reason = $commandObj->getFailString();
-        return $reason;
-    }
-
-    $result = $commandObj->run(new RandUtil(
-        new LiteHashDRBG(Util::simpleSerialize(
-            UniqueConst::$hiddenSeed,
-            'InstantRetreat',
-            $general->getID(),
-            $gameStor->year,
-            $gameStor->month,
-            $general->getCityID(),
-        ))
-    ));
-
-    if (!$result) {
-        return '가까운 아국 도시가 없습니다.';
-    }
-
-    return null;
-  }
-}

hwe/sammo/API/General/Join.php

@@ -8,7 +8,6 @@ use sammo\Auction;
 use sammo\CityConst;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
-use sammo\Enums\GeneralAccessLogColumn;
 use sammo\Enums\RankColumn;
 use sammo\GameConst;
 use sammo\GameUnitConst;
@@ -54,7 +53,7 @@ class Join extends \sammo\BaseAPI
                 'leadership',
                 'strength',
                 'intel',
-                'inheritTurntimeZone',
+                'inheritTurntime',
             ])
             ->rule('boolean', [
                 'pic'
@@ -72,8 +71,7 @@ class Join extends \sammo\BaseAPI
             ], GameConst::$defaultStatMax)
             ->rule('in', 'character', array_merge(GameConst::$availablePersonality, ['Random']))
             ->rule('in', 'inheritSpecial', GameConst::$availableSpecialWar)
-            ->rule('min', 'inheritTurntimeZone', 0)
+            ->rule('min', 'inheritTurntime', 0)
-            ->rule('max', 'inheritTurntimeZone', 59)
             ->rule('in', 'inheritCity', array_keys(CityConst::all()))
             ->rule('integerArray', 'inheritBonusStat');
 
@@ -140,28 +138,22 @@ class Join extends \sammo\BaseAPI
         $intel = $this->args['intel'];
 
         $inheritSpecial = $this->args['inheritSpecial'] ?? null;
-        $inheritTurntimeZone = $this->args['inheritTurntimeZone'] ?? null;
+        $inheritTurntime = $this->args['inheritTurntime'] ?? null;
         $inheritCity = $this->args['inheritCity'] ?? null;
         $inheritBonusStat = $this->args['inheritBonusStat'] ?? null;
 
+        if ($inheritTurntime !== null && $inheritCity !== null) {
+            return '턴과 도시를 동시에 지정할 수 없습니다.';
+        }
+
         $rootDB = RootDB::db();
         //회원 테이블에서 정보확인
-        $member = $rootDB->queryFirstRow('SELECT `no`, id, picture, grade, `name`, imgsvr, `penalty` FROM member WHERE no=%i', $userID);
+        $member = $rootDB->queryFirstRow('SELECT `no`, id, picture, grade, `name`, imgsvr FROM member WHERE no=%i', $userID);
 
         if (!$member) {
             return "잘못된 접근입니다!!!";
         }
 
-        $memberPenalty = Json::decode($member['penalty'] ?? "{}");
-        $penaltyInfo = array_merge($memberPenalty['any'] ?? [], $memberPenalty[DB::prefix()] ?? []);
-
-        $penalty = [];
-        foreach($penaltyInfo as $penaltyKey => $penaltyValue){
-            if($penaltyValue['expire'] ?? 0 > TimeUtil::now()){
-                $penalty[$penaltyKey] = $penaltyValue['value'];
-            }
-        }
-
         $db = DB::db();
         $gameStor = KVStorage::getStorage($db, 'game_env');
         $gameStor->cacheValues(['year', 'month', 'maxgeneral', 'scenario', 'show_img_level', 'block_general_create', 'turnterm', 'turntime', 'genius', 'npcmode']);
@@ -239,7 +231,7 @@ class Join extends \sammo\BaseAPI
         if ($inheritSpecial !== null) {
             $inheritRequiredPoint += GameConst::$inheritBornSpecialPoint;
         }
-        if ($inheritTurntimeZone !== null) {
+        if ($inheritTurntime !== null) {
             $inheritRequiredPoint += GameConst::$inheritBornTurntimePoint;
         }
 
@@ -354,14 +346,12 @@ class Join extends \sammo\BaseAPI
             $experience *= 0.8;
         }
 
-        if ($inheritTurntimeZone !== null) {
+        if ($inheritTurntime !== null) {
-            $inheritTurntime = $inheritTurntimeZone * $admin['turnterm'];
+            $inheritTurntime = $inheritTurntime % ($admin['turnterm'] * 60);
-            $inheritTurntime += $rng->nextRangeInt(0, Util::clamp($admin['turnterm'] - 1, 0));
 
             $userLogger->push(sprintf("턴 시간 %02d:%02d 로 지정", intdiv($inheritTurntime, 60), $inheritTurntime % 60), "inheritPoint");
 
             $inheritTurntime += $rng->nextRangeInt(0, 999999) / 1000000;
-
             $turntime = new \DateTimeImmutable(cutTurn($admin['turntime'], $admin['turnterm']));
             $turntime = $turntime->add(TimeUtil::secondsToDateInterval($inheritTurntime));
             $turntime = TimeUtil::format($turntime, true);
@@ -424,6 +414,8 @@ class Join extends \sammo\BaseAPI
             'officer_level' => 0,
             'turntime' => $turntime,
             'killturn' => 6,
+            'lastconnect' => $now,
+            'lastrefresh' => $now,
             'crewtype' => GameUnitConst::DEFAULT_CREWTYPE,
             'makelimit' => 0,
             'betray' => $betray,
@@ -433,15 +425,9 @@ class Join extends \sammo\BaseAPI
             'specage' => $specage,
             'special' => $special,
             'specage2' => $specage2,
-            'special2' => $special2,
+            'special2' => $special2
-            'penalty' => Json::encode($penalty),
         ]);
         $generalID = $db->insertId();
-        $db->insert('general_access_log', [
-            GeneralAccessLogColumn::generalID->value => $generalID,
-            GeneralAccessLogColumn::userID->value => $userID,
-            GeneralAccessLogColumn::lastRefresh->value => $now,
-        ]);
 
         if($blockCustomGeneralName){
             //XXX: 클래스가 이게 맞나?

hwe/sammo/API/Global/GeneralList.php

@@ -42,12 +42,9 @@ class GeneralList extends \sammo\BaseAPI
         $userID = $session->userID;
         if ($session->isGameLoggedIn()) {
             increaseRefresh("장수일람", 2);
-            $me = $db->queryFirstRow(
+            $me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner=%i', $userID);
-                'SELECT refresh_score, turntime FROM `general`
+            $con = checkLimit($me['con']);
-                LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
+            if ($con >= 2) {
-            );
-            $limitState = checkLimit($me['refresh_score']);
-            if ($limitState >= 2) {
                 return '접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다.';
             }
         } else {
@@ -65,8 +62,7 @@ class GeneralList extends \sammo\BaseAPI
         $session->setReadOnly();
 
 
-        $rawGeneralList = $db->queryAllLists(
+        $rawGeneralList = $db->queryAllLists('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,owner_name as ownerName,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,connect from general');
-            'SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,owner_name as ownerName,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,refresh_score_total from `general` LEFT JOIN `general_access_log` ON general.no = general_access_log.general_id');
 
         $ownerNameList = [];
         if ($gameStor->isunited) {
@@ -77,7 +73,7 @@ class GeneralList extends \sammo\BaseAPI
 
         $generalList = [];
         foreach ($rawGeneralList as $rawGeneral) {
-            [$owner, $no, $picture, $imgsvr, $npc, $age, $nation, $special, $special2, $personal, $name, $ownerName, $injury, $leadership, $strength, $intel, $experience, $dedication, $officerLevel, $killturn, $refreshScoreTotal] = $rawGeneral;
+            [$owner, $no, $picture, $imgsvr, $npc, $age, $nation, $special, $special2, $personal, $name, $ownerName, $injury, $leadership, $strength, $intel, $experience, $dedication, $officerLevel, $killturn, $connectCnt] = $rawGeneral;
 
             if (key_exists($owner, $ownerNameList)) {
                 $ownerName = $ownerNameList[$owner];
@@ -108,7 +104,7 @@ class GeneralList extends \sammo\BaseAPI
                 getDed($dedication),
                 getOfficerLevelText($officerLevel, $nationArr['level']),
                 $killturn,
-                $refreshScoreTotal ?: 0,
+                $connectCnt
             ];
         }
 
@@ -133,8 +129,6 @@ class GeneralList extends \sammo\BaseAPI
             'honorText',
             'dedLevelText',
             'officerLevelText',
-            'killturn',
-            'refreshScoreTotal',
         ];
 
         $result = [

hwe/sammo/API/Global/GetCachedMap.php

@@ -55,11 +55,7 @@ class GetCachedMap extends \sammo\BaseAPI
       return 'cache 불가';
     }
 
-    $absolutePath = realpath('data/file_cache');
+    $storage = new \Nette\Caching\Storages\FileStorage('data/file_cache');
-    if (!$absolutePath) {
-      return 'cache 불가';
-    }
-    $storage = new \Nette\Caching\Storages\FileStorage($absolutePath);
     $cache = new Cache($storage);
 
     $now = TimeUtil::nowDateTimeImmutable();

hwe/sammo/API/Global/GetConst.php

@@ -288,10 +288,6 @@ class GetConst extends \sammo\BaseAPI
         if (!prepareDir($cacheDir)) {
             throw new RuntimeException('cache 폴더 없음');
         }
-        $absolutePath = realpath($cacheDir);
-        if (!$absolutePath) {
-            throw new RuntimeException('cache 폴더 없음');
-        }
         $storage = new \Nette\Caching\Storages\FileStorage($cacheDir);
         $cache = new Cache($storage);
 

hwe/sammo/API/Global/GetHistory.php

@@ -148,16 +148,13 @@ class GetHistory extends \sammo\BaseAPI
       }
       increaseRefresh("연감", 1);
 
-      $me = $db->queryFirstRow(
+      $me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner = %i', $session->userID);
-        'SELECT refresh_score, turntime FROM `general`
-        LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner = %i', $session->userID
-      );
       if (!$me) {
         return '장수가 사망했습니다.';
       }
 
-      $limitState = checkLimit($me['refresh_score']);
+      $con = checkLimit($me['con']);
-      if ($limitState >= 2) {
+      if ($con >= 2) {
         return templateLimitMsg($me['turntime']);
       }
     }

hwe/sammo/API/InheritAction/BuyHiddenBuff.php

@@ -49,7 +49,7 @@ class BuyHiddenBuff extends \sammo\BaseAPI
         $type = $this->args['type'];
         $level = $this->args['level'];
 
-        $general = General::createObjFromDB($generalID);
+        $general = General::createGeneralObjFromDB($generalID);
         if ($userID != $general->getVar('owner')) {
             return '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
         }

hwe/sammo/API/InheritAction/BuyRandomUnique.php

@@ -31,7 +31,7 @@ class BuyRandomUnique extends \sammo\BaseAPI
         $userID = $session->userID;
         $generalID = $session->generalID;
 
-        $general = General::createObjFromDB($generalID);
+        $general = General::createGeneralObjFromDB($generalID);
         if($userID != $general->getVar('owner')){
             return '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
         }

hwe/sammo/API/InheritAction/ResetSpecialWar.php

@@ -31,7 +31,7 @@ class ResetSpecialWar extends \sammo\BaseAPI
         $userID = $session->userID;
         $generalID = $session->generalID;
 
-        $general = General::createObjFromDB($generalID);
+        $general = General::createGeneralObjFromDB($generalID);
         if ($userID != $general->getVar('owner')) {
             return '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
         }

hwe/sammo/API/InheritAction/ResetTurnTime.php

@@ -36,7 +36,7 @@ class ResetTurnTime extends \sammo\BaseAPI
         $userID = $session->userID;
         $generalID = $session->generalID;
 
-        $general = General::createObjFromDB($generalID);
+        $general = General::createGeneralObjFromDB($generalID);
         if ($userID != $general->getVar('owner')) {
             return '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
         }
@@ -52,7 +52,7 @@ class ResetTurnTime extends \sammo\BaseAPI
 
         $db = DB::db();
         $gameStor = KVStorage::getStorage($db, 'game_env');
-        if ($gameStor->isunited) {
+        if($gameStor->isunited){
             return '이미 천하가 통일되었습니다.';
         }
         $inheritStor = KVStorage::getStorage($db, "inheritance_{$userID}");
@@ -62,25 +62,36 @@ class ResetTurnTime extends \sammo\BaseAPI
         }
 
         $gameStor = KVStorage::getStorage($db, 'game_env');
-        $turnTerm = $gameStor->getValue('turnterm');
+        [$turnTerm, $serverTurnTime] = $gameStor->getValuesAsArray(['turnterm', 'turntime']);
 
         $currTurnTime = new DateTimeImmutable($general->getTurnTime());
+        $serverTurnTimeObj = new DateTimeImmutable($serverTurnTime);
 
         $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
             UniqueConst::$hiddenSeed,
             'ResetTurnTime',
             $userID,
-            $general->getAuxVar('nextTurnTimeBase') ?? $general->getTurnTime()
+            $general->getTurnTime()
         )));
 
-        $afterTurn = $rng->nextFloat1() * $turnTerm * 60;
+        $afterTurn = $rng->nextRange($turnTerm * -60 / 2, $turnTerm * 60 / 2);
 
         $userLogger = new UserLogger($userID);
-        $userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾸어 다다음 턴부터 %02d:%02d 적용", intdiv(Util::toInt($afterTurn), 60), $afterTurn % 60), "inheritPoint");
+        if($afterTurn >= 0){
+            $userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾼 결과 %02d:%02d 뒤로 밀림", intdiv(Util::toInt($afterTurn), 60), $afterTurn%60), "inheritPoint");
+        }
+        else{
+            $userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾼 결과 %02d:%02d 앞으로 당김", intdiv(Util::toInt(-$afterTurn), 60), (-$afterTurn)%60), "inheritPoint");
+        }
         $userLogger->flush();
 
+        $turnTime = $currTurnTime->add(TimeUtil::secondsToDateInterval($afterTurn));
+        if ($turnTime <= $serverTurnTimeObj && $serverTurnTimeObj <= $currTurnTime) {
+            $turnTime = $turnTime->add(TimeUtil::secondsToDateInterval($turnTerm * 60));
+        }
+
+        $general->setVar('turntime', TimeUtil::format($turnTime, true));
         $general->setAuxVar('inheritResetTurnTime', $nextLevel);
-        $general->setAuxVar('nextTurnTimeBase', $afterTurn);
         $inheritStor->setValue('previous', [$previousPoint - $reqPoint, null]);
         $general->increaseRankVar(RankColumn::inherit_point_spent_dynamic, $reqPoint);
         $general->applyDB($db);

hwe/sammo/API/InheritAction/SetNextSpecialWar.php

@@ -44,7 +44,7 @@ class SetNextSpecialWar extends \sammo\BaseAPI
 
         $type = $this->args['type'];
 
-        $general = General::createObjFromDB($generalID);
+        $general = General::createGeneralObjFromDB($generalID);
         if ($userID != $general->getVar('owner')) {
             return '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
         }

hwe/sammo/API/Message/GetOldMessage.php

@@ -75,7 +75,7 @@ class GetOldMessage extends \sammo\BaseAPI
 
 
     $db = DB::db();
-    $me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);
+    $me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`con`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);
 
     if ($me === null) {
       return '장수가 사망했습니다.';

hwe/sammo/API/Message/GetRecentMessage.php

@@ -73,7 +73,7 @@ class GetRecentMessage extends \sammo\BaseAPI
 
 
     $db = DB::db();
-    $me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);
+    $me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`con`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);
 
     if ($me === null) {
       return '장수가 사망했습니다.';

hwe/sammo/API/Message/SendMessage.php

@@ -7,11 +7,9 @@ use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\MessageType;
-use sammo\Json;
 use sammo\Message;
 use sammo\MessageTarget;
 use sammo\Validator;
-use sammo\Util;
 
 use function sammo\checkLimit;
 use function sammo\checkSecretPermission;
@@ -110,7 +108,7 @@ class SendMessage extends \sammo\BaseAPI
     $unlimited = new \DateTime('9999-12-31');
 
     $db = DB::db();
-    $destUser = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`picture`,`imgsvr`,permission,penalty FROM general WHERE `no`=%i', $destGeneralID);
+    $destUser = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`con`,`picture`,`imgsvr`,permission,penalty FROM general WHERE `no`=%i', $destGeneralID);
 
     if (!$destUser) {
       return '존재하지 않는 유저입니다.';
@@ -162,20 +160,15 @@ class SendMessage extends \sammo\BaseAPI
     }
 
     $db = DB::db();
-    $me = $db->queryFirstRow(
+    $me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`con`,`picture`,`imgsvr`,penalty,permission,belong FROM general WHERE `owner`=%i', $userID);
-      'SELECT `no`,`name`,`nation`,`officer_level`,`refresh_score`,`picture`,`imgsvr`,penalty,permission,belong FROM `general`
-      LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE `owner`=%i', $userID
-    );
 
     if (!$me) {
       $session->logoutGame();
       return '장수가 없습니다.';
     }
 
-    $penalty = Json::decode($me['penalty'] ?? '{}');
+    $con = checkLimit($me['con']);
-
+    if ($con >= 2) {
-    $limitState = checkLimit($me['refresh_score']);
-    if ($limitState >= 2) {
       return '접속 제한입니다.';
     }
 
@@ -230,10 +223,8 @@ class SendMessage extends \sammo\BaseAPI
       $now = new \DateTime();
       $lastMsg = new \DateTime($session->lastMsg ?? '0000-00-00');
       $msg_interval = $now->getTimestamp() - $lastMsg->getTimestamp();
-
+      if ($msg_interval < 2) {
-      $msg_min_interval = $penalty['sendPrivateMsgDelay'] ?? 2;
+        return '개인메세지는 2초당 1건만 보낼 수 있습니다!';
-      if ($msg_interval < $msg_min_interval) {
-        return "개인메세지는 {$msg_min_interval}초당 1건만 보낼 수 있습니다!";
       }
       $session->lastMsg = $now->format('Y-m-d H:i:s');
 

hwe/sammo/API/Nation/GeneralList.php

@@ -5,10 +5,7 @@ namespace sammo\API\Nation;
 use ArrayObject;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
-use sammo\Enums\GeneralLiteQueryMode;
-use sammo\Enums\GeneralQueryMode;
 use sammo\General;
-use sammo\GeneralLite;
 use sammo\Session;
 use sammo\Util;
 
@@ -47,10 +44,12 @@ class GeneralList extends \sammo\BaseAPI
         'special2' => 0,
         'personal' => 0,
         'belong' => 0,
+        'connect' => 0,
 
         'troop' => 0,
         'city' => 0,
 
+        'con' => 1,
         'specage' => 0,
         'specage2' => 0,
         'leadership_exp' => 1,
@@ -84,11 +83,6 @@ class GeneralList extends \sammo\BaseAPI
 
         'owner_name' => 9, //안씀.
 
-
-        //accessLog
-        'refresh_score_total' => 0,
-        'refresh_score' => 1,
-
         //RANK
         'warnum' => 1,
         'killnum' => 1,
@@ -101,8 +95,6 @@ class GeneralList extends \sammo\BaseAPI
     static $columnRemap = [
         'special' => 'specialDomestic',
         'special2' => 'specialWar',
-        'refresh_score_total' => 'refreshScoreTotal',
-        'refresh_score' => 'refreshScore',
         'aux' => null,
     ];
 
@@ -151,12 +143,9 @@ class GeneralList extends \sammo\BaseAPI
         $gameStor = \sammo\KVStorage::getStorage($db, 'game_env');
         $env = $gameStor->getValues(['year', 'month', 'turntime', 'turnterm', 'autorun_user', 'killturn']);
 
-        $me = $db->queryFirstRow(
+        $me = $db->queryFirstRow('SELECT con, turntime, belong, nation, officer_level, permission, penalty FROM general WHERE owner=%i', $session->getUserID());
-            'SELECT refresh_score, turntime, belong, nation, officer_level, permission, penalty FROM `general`
+        $con = checkLimit($me['con']);
-            LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $session->getUserID()
+        if ($con >= 2) {
-        );
-        $limitState = checkLimit($me['refresh_score']);
-        if ($limitState >= 2) {
             return '접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다.';
         }
 
@@ -167,18 +156,9 @@ class GeneralList extends \sammo\BaseAPI
 
 
 
-        [$queryColumns, $rankColumns, $accessLogColumns] = GeneralLite::mergeQueryColumn(array_keys(static::$viewColumns), GeneralLiteQueryMode::Lite);
+        [$queryColumns, $rankColumns] = General::mergeQueryColumn(array_keys(static::$viewColumns), 1);
 
-        $rawGeneralList = Util::convertArrayToDict(
+        $rawGeneralList = Util::convertArrayToDict($db->query('SELECT %l from general WHERE nation = %i ORDER BY turntime ASC', Util::formatListOfBackticks($queryColumns), $nationID), 'no');
-            $db->query(
-                'SELECT %l, %l from `general` LEFT JOIN general_access_log
-                ON `general`.`no` = general_access_log.general_id WHERE nation = %i ORDER BY turntime ASC',
-                Util::formatListOfBackticks($queryColumns),
-                Util::formatListOfBackticks($accessLogColumns),
-                $nationID
-            ),
-            'no'
-        );
 
         /** @var ArrayObject[] */
         $troops = [];
@@ -199,19 +179,19 @@ class GeneralList extends \sammo\BaseAPI
         if ($this->permission >= 1 || count($troops)) {
             $reservedCommandTargetGeneralIDList = [];
 
-            if ($this->permission >= 1) {
+            if($this->permission >= 1){
                 foreach ($rawGeneralList as $rawGeneral) {
                     if ($rawGeneral['npc'] < 2) {
                         $reservedCommandTargetGeneralIDList[$rawGeneral['no']] = $rawGeneral['no'];
                     }
                 }
             }
-            foreach ($troops as $troop) {
+            foreach($troops as $troop){
                 $reservedCommandTargetGeneralIDList[$troop['id']] = $troop['id'];
             }
 
 
-            if ($reservedCommandTargetGeneralIDList) {
+            if($reservedCommandTargetGeneralIDList){
                 $rawTurnList = $db->query(
                     'SELECT general_id, turn_idx, action, arg, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id asc, turn_idx asc',
                     array_values($reservedCommandTargetGeneralIDList)
@@ -298,11 +278,11 @@ class GeneralList extends \sammo\BaseAPI
             $resultColumns[$column] = $column;
         }
 
-        foreach ($troops as $troop) {
+        foreach ($troops as $troop){
             $troopLeaderID = $troop['id'];
-            $troop['reservedCommand'] = array_map(function ($turnObj) {
+            $troop['reservedCommand'] = array_map(function($turnObj){
                 $brief = $turnObj['brief'];
-                if ($brief == '집합') {
+                if($brief == '집합'){
                     return $brief;
                 }
                 return '-';
@@ -313,7 +293,7 @@ class GeneralList extends \sammo\BaseAPI
         foreach ($rawGeneralList as $rawGeneral) {
             //General 생성?
             if (key_exists('aux', $rawGeneral)) {
-                $rawGeneral['aux'] = \sammo\Json::decode($rawGeneral['aux']);
+                $rawGeneral['aux'] = \sammo\JSON::decode($rawGeneral['aux']);
             }
 
             $item = [];

hwe/sammo/API/Nation/GetGeneralLog.php

@@ -109,12 +109,10 @@ class GetGeneralLog extends \sammo\BaseAPI
         $reqTo = $this->args['reqTo'] ?? null;
 
         $db = DB::db();
-        $me = $db->queryFirstRow(
+        $me = $db->queryFirstRow('SELECT no,nation,officer_level,con,turntime,belong,permission,penalty from general where owner=%i', $userID);
-            'SELECT no,nation,officer_level,refresh_score,turntime,belong,permission,penalty FROM `general`
-            LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID);
 
-        $limitState = checkLimit($me['refresh_score']);
+        $con = checkLimit($me['con']);
-        if ($limitState >= 2) {
+        if ($con >= 2) {
             return '접속 제한입니다.';
         }
 

hwe/sammo/API/Nation/GetNationInfo.php

@@ -4,7 +4,6 @@ namespace sammo\API\Nation;
 
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
-use sammo\Enums\GeneralQueryMode;
 use sammo\GameConst;
 use sammo\General;
 use sammo\KVStorage;
@@ -14,6 +13,14 @@ use sammo\Util;
 use sammo\Validator;
 
 use function sammo\buildNationCommandClass;
+use function sammo\checkLimit;
+use function sammo\checkSecretPermission;
+use function sammo\getBattleDetailLogMore;
+use function sammo\getBattleResultMore;
+use function sammo\getBattleResultRecent;
+use function sammo\getGeneralActionLogMore;
+use function sammo\getGeneralActionLogRecent;
+use function sammo\getGeneralHistoryLogAll;
 use function sammo\getNationStaticInfo;
 
 class GetNationInfo extends \sammo\BaseAPI
@@ -58,7 +65,7 @@ class GetNationInfo extends \sammo\BaseAPI
       ];
     }
 
-    $generalObj = General::createObjFromDB($session->generalID);
+    $generalObj = General::createGeneralObjFromDB($session->generalID, null, 1);
 
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $gameEnv = $gameStor->getValues(['year', 'month', 'startyear']);

hwe/sammo/API/NationCommand/GetReservedCommand.php

@@ -6,13 +6,11 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
-use sammo\Enums\GeneralQueryMode;
 use sammo\GameConst;
 use sammo\General;
 use sammo\Json;
 use sammo\KVStorage;
 use sammo\TimeUtil;
-use sammo\Util;
 
 use function sammo\checkLimit;
 use function sammo\checkSecretPermission;
@@ -41,16 +39,12 @@ class GetReservedCommand extends \sammo\BaseAPI
         $gameStor = KVStorage::getStorage($db, 'game_env');
         $userID = $session->userID;
 
-        $me = $db->queryFirstRow(
+        $me = $db->queryFirstRow('SELECT no,nation,officer_level,con,turntime,belong,penalty,permission FROM general WHERE owner=%i', $userID);
-            'SELECT no,nation,officer_level,refresh_score,turntime,belong,penalty,permission FROM `general`
-            LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i',
-            $userID
-        );
 
         $nationLevel = $db->queryFirstField('SELECT level FROM nation WHERE nation = %i', $me['nation']);
         $nationID = $me['nation'];
-        $limitState = checkLimit($me['refresh_score']);
+        $con = checkLimit($me['con']);
-        if ($limitState >= 2) {
+        if ($con >= 2) {
             return "접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다. (다음 갱신 가능 시각 : {$me['turntime']})";
         }
 
@@ -64,20 +58,11 @@ class GetReservedCommand extends \sammo\BaseAPI
         [$turnTerm, $year, $month, $lastExecute] = $gameStor->getValuesAsArray(['turnterm', 'year', 'month', 'turntime']);
 
         $generals = [];
-        foreach ($db->query(
+        foreach ($db->query('SELECT no,name,turntime,npc,city,nation,officer_level FROM general WHERE nation = %i AND officer_level >= 5', $nationID) as $rawGeneral) {
-            'SELECT %l FROM general WHERE nation = %i AND officer_level >= 5',
+            $generals[$rawGeneral['officer_level']] = new General($rawGeneral, null, null, null, $year, $month, false);
-            Util::formatListOfBackticks(General::mergeQueryColumn()[0]),
-            $nationID
-        ) as $rawGeneral) {
-            $generals[$rawGeneral['officer_level']] = new General($rawGeneral, null, null, null, null, $year, $month, false);
         }
 
         $nationTurnList = [];
-
-        //혹시 정규 턴을 벗어난 턴이 있는지 체크
-        $invalidUnderTurnList = [];
-        $invalidOverTurnList = [];
-
         foreach ($db->queryAllLists(
             'SELECT officer_level, turn_idx, action, arg, brief FROM nation_turn WHERE nation_id = %i ORDER BY officer_level DESC, turn_idx ASC',
             $me['nation']
@@ -85,14 +70,6 @@ class GetReservedCommand extends \sammo\BaseAPI
             if (!key_exists($officer_level, $nationTurnList)) {
                 $nationTurnList[$officer_level] = [];
             }
-            if($turn_idx < 0){
-                $invalidUnderTurnList[$officer_level] = $turn_idx;
-                $turn_idx += GameConst::$maxChiefTurn;
-            }
-            else if($turn_idx >= GameConst::$maxChiefTurn){
-                $invalidOverTurnList[$officer_level] = $turn_idx;
-                $turn_idx -= GameConst::$maxChiefTurn;
-            }
             $nationTurnList[$officer_level][$turn_idx] = [
                 'action' => $action,
                 'brief' => $brief,
@@ -100,21 +77,6 @@ class GetReservedCommand extends \sammo\BaseAPI
             ];
         }
 
-        if($invalidUnderTurnList){
-            $db->update(
-                'nation_turn', [
-                    'turn_idx' => $db->sqleval('`turn_idx` + %i', GameConst::$maxChiefTurn)
-                ], 'nation_id = %i AND officer_level IN %li AND turn_idx < 0', $me['nation'], array_keys($invalidUnderTurnList)
-            );
-        }
-        if($invalidOverTurnList){
-            $db->update(
-                'nation_turn', [
-                    'turn_idx' => $db->sqleval('`turn_idx` - %i', GameConst::$maxChiefTurn)
-                ], 'nation_id = %i AND officer_level IN %li AND turn_idx >= %i', $me['nation'], array_keys($invalidOverTurnList), GameConst::$maxChiefTurn
-            );
-        }
-
         $troopList = [];
         foreach ($db->queryAllLists(
             'SELECT troop_leader, `name` FROM troop WHERE `nation` = %i',
@@ -147,7 +109,7 @@ class GetReservedCommand extends \sammo\BaseAPI
             ];
         }
 
-        $generalObj = General::createObjFromDB($session->generalID);
+        $generalObj = General::createGeneralObjFromDB($session->generalID);
 
 
         return [

hwe/sammo/API/Vote/AddComment.php

@@ -6,10 +6,7 @@ use DateTimeInterface;
 use sammo\DB;
 use sammo\DTO\VoteComment;
 use sammo\Enums\APIRecoveryType;
-use sammo\Enums\GeneralLiteQueryMode;
-use sammo\Enums\GeneralQueryMode;
 use sammo\General;
-use sammo\GeneralLite;
 use sammo\Session;
 use sammo\TimeUtil;
 use sammo\Validator;
@@ -43,7 +40,7 @@ class AddComment extends \sammo\BaseAPI
     $text = mb_substr($this->args['text'], 0, 200);
 
     $generalID = $session->generalID;
-    $general = GeneralLite::createObjFromDB($generalID, null, GeneralLiteQueryMode::Core);
+    $general = General::createGeneralObjFromDB($generalID, [], 0);
     $generalName = $general->getName();
     $nationID = $general->getNationID();
     $nationName = $general->getStaticNation()['name'];

hwe/sammo/API/Vote/Vote.php

@@ -6,7 +6,6 @@ use DateTimeInterface;
 use sammo\DB;
 use sammo\DTO\VoteInfo;
 use sammo\Enums\APIRecoveryType;
-use sammo\Enums\GeneralQueryMode;
 use sammo\General;
 use sammo\Json;
 use sammo\KVStorage;
@@ -106,7 +105,7 @@ class Vote extends \sammo\BaseAPI
         $gameStor = KVStorage::getStorage($db, 'game_env');
         $voteReward = $gameStor->getValue('develcost') * 5;
 
-        $general = General::createObjFromDB($generalID, null, GeneralQueryMode::Full);
+        $general = General::createGeneralObjFromDB($generalID, ['gold', 'horse', 'weapon', 'book', 'item', 'npc', 'imgsvr', 'picture', 'aux'], 2);
         $general->increaseVar('gold', $voteReward);
         $uniqueRng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
             UniqueConst::$hiddenSeed,

hwe/sammo/ActionCrewType/None.php

@@ -1,12 +0,0 @@
-<?php
-namespace sammo\ActionCrewType;
-use \sammo\iAction;
-use \sammo\General;
-
-class None implements iAction{
-    use \sammo\DefaultAction;
-
-    protected $id = -1;
-    protected $name = '-';
-    protected $info = '';
-}

hwe/sammo/ActionCrewType/che_성벽선제.php

@@ -1,20 +0,0 @@
-<?php
-namespace sammo\ActionCrewType;
-use \sammo\iAction;
-use \sammo\General;
-
-class che_성벽선제 implements iAction{
-    use \sammo\DefaultAction;
-
-    protected $name = '성벽선제';
-    protected $info = '전투 가능한 성벽이라면 선제공격을 합니다.';
-
-    public function onCalcOpposeStat(General $general, string $statName, $value, $aux = null)
-    {
-        if($statName == 'cityBattleOrder'){
-            // battleOrder는 스탯과 유사한 수치를 가지므로, 아주 충분히 높은값을 설정한다.
-            return 10000;
-        }
-        return $value;
-    }
-}

hwe/sammo/ActionItem/che_무기_02_단궁.php

@@ -21,7 +21,7 @@ class che_무기_02_단궁 extends \sammo\BaseStatItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 102, 0.01, 10, 30),
-            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 102)
+            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
         );
     }
 }

hwe/sammo/ActionItem/che_무기_07_맥궁.php

@@ -20,7 +20,7 @@ class che_무기_07_맥궁 extends \sammo\BaseStatItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 107, 0.2, 20, 40),
-            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 107)
+            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
         );
     }
 }

hwe/sammo/ActionItem/che_무기_09_동호비궁.php

@@ -20,7 +20,7 @@ class che_무기_09_동호비궁 extends \sammo\BaseStatItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 109, 0.2, 20, 40, 20),
-            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 109)
+            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
         );
     }
 }

hwe/sammo/ActionItem/che_무기_11_이광궁.php

@@ -20,7 +20,7 @@ class che_무기_11_이광궁 extends \sammo\BaseStatItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 111, 0.10, 20, 40, 10),
-            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 111)
+            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
         );
     }
 }

hwe/sammo/ActionItem/che_무기_13_양유기궁.php

@@ -20,7 +20,7 @@ class che_무기_13_양유기궁 extends \sammo\BaseStatItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 113, 0.1, 20, 40, 10),
-            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 113)
+            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
         );
     }
 }

hwe/sammo/ActionItem/che_저격_매화수전.php

@@ -21,7 +21,7 @@ class che_저격_매화수전 extends \sammo\BaseItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*304, 0.5, 20, 40),
-            new che_저격발동($unit, che_저격시도::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*304)
+            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
         );
     }
 }

hwe/sammo/ActionItem/che_저격_비도.php

@@ -21,7 +21,7 @@ class che_저격_비도 extends \sammo\BaseItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*305, 0.5, 20, 40),
-            new che_저격발동($unit, che_저격시도::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*305)
+            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
         );
     }
 }

hwe/sammo/ActionItem/che_저격_수극.php

@@ -18,7 +18,7 @@ class che_저격_수극 extends \sammo\BaseItem{
     protected $buyable = true;
     protected $reqSecu = 1000;
 
-    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+    public function getBattleInitSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, BaseWarUnitTrigger::TYPE_CONSUMABLE_ITEM, 1, 20, 40),
             new che_저격발동($unit, BaseWarUnitTrigger::TYPE_CONSUMABLE_ITEM)