v0.10.1까지 merge

2019-04-07 23:35:54 +09:00
parent 44df85f2bd a7784d7870
commit 9e6d33cc1a
46 changed files with 482 additions and 228 deletions
@@ -70,7 +70,7 @@ class CityConstBase{
        [11, '수춘', '대', 5143, 99, 96, 80, 99, 95, '중원', 395, 270, ['서주', '여남', '초', '합비']], 
        [12, '서주', '대', 4853,101, 98, 80,102, 97, '중원', 440, 250, ['수춘', '하비', '초', '패']], 
        [13, '강릉', '대', 4850,105, 96, 80, 95, 96,   '초', 245, 335, ['장사', '무릉', '이릉', '장판']], 
-        [14, '장사', '대', 4710, 97, 99, 80,100,105,   '초', 255, 375, ['강릉', '시상', '계양', '무릉', '영릉']], 
+        [14, '장사', '대', 4710, 97, 99, 80,100,105,   '초', 255, 375, ['강릉', '시상', '계양', '무릉']], 
        [15, '시상', '대', 5252, 98,100,100, 99, 96, '오월', 360, 360, ['장사', '여강', '고창', '적벽', '파양']], 
        [16, '위례', '대', 4926,100, 93, 80, 98,103, '동이', 620, 145, ['평양', '사비', '계림', '안평', '동황']], 
        [17,   '계', '중', 3885, 75, 80, 60, 78, 81, '하북', 365,  35, ['진양', '역경']], 
@@ -110,7 +110,7 @@ class CityConstBase{
        [51, '신야', '소', 2786, 60, 62, 40, 58, 55,   '초', 250, 260, ['양양', '완', '상용']], 
        [52, '강하', '소', 3074, 55, 56, 40, 57, 60,   '초', 315, 295, ['장판', '적벽']], 
        [53, '무릉', '소', 3196, 58, 63, 40, 63, 58,   '초', 195, 355, ['강릉', '장사', '영릉']], 
-        [54, '영릉', '소', 2849, 62, 58, 40, 62, 62,   '초', 190, 395, ['장사', '계양', '남영', '무릉']], 
+        [54, '영릉', '소', 2849, 62, 58, 40, 62, 62,   '초', 190, 395, ['계양', '남영', '무릉']], 
        [55, '상동', '소', 2767, 58, 59, 40, 62, 58,   '초', 210, 435, ['남해', '계양', '고창']], 
        [56, '여강', '소', 2905, 56, 58, 40, 60, 55, '오월', 380, 315, ['시상', '합비', '적벽', '파양']], 
        [57, '회계', '소', 3005, 64, 59, 40, 62, 64, '오월', 480, 395, ['오', '산월']], 
@@ -67,7 +67,7 @@ class DiplomaticMessage extends Message{
        $permission = checkSecretPermission($general, false);

        if(!$general || $permission < 4){
-            return [self::INVALID, '해당 국가의 외교권자 아닙니다.'];
+            return [self::INVALID, '해당 국가의 외교권자가 아닙니다.'];
        }

        return [self::ACCEPTED, ''];
@@ -273,7 +273,7 @@ class DiplomaticMessage extends Message{
        $gameStor = KVStorage::getStorage($db, 'game_env');

        $general = $db->queryFirstRow(
-            'SELECT `name`, nation, `level`, `permission`, `penalty` FROM general WHERE `no`=%i AND nation=%i', 
+            'SELECT `name`, nation, `level`, `permission`, `penalty`,belong FROM general WHERE `no`=%i AND nation=%i', 
            $receiverID, 
            $this->dest->nationID
        );
@@ -378,7 +378,7 @@ class DiplomaticMessage extends Message{

        $db = DB::db();
        $general = $db->queryFirstRow(
-            'SELECT `name`, `level` FROM general WHERE `no`=%i AND nation=%i', 
+            'SELECT `name`, nation, `level`, `permission`, `penalty`,belong  FROM general WHERE `no`=%i AND nation=%i', 
            $receiverID, 
            $this->dest->nationID
        );
@@ -242,4 +242,5 @@ class GameConstBase
            //'che_국기변경'
        ]
    ];
+    public static $retirementYear = 80;
 }
@@ -165,6 +165,8 @@ class ResetHelper{
            'locktime'=>TimeUtil::now(true)
        ]);

+        $prevWinner = $db->queryFirstField('SELECT l12name FROM emperior ORDER BY `no` DESC LIMIT 1');
+
        CityConst::build();
        $cityPositions = [];
        foreach(CityConst::all() as $city){
@@ -235,7 +237,8 @@ class ResetHelper{
            'npcmode'=>$npcmode,
            'extended_general'=>$extend,
            'fiction'=>$fiction,
-            'tnmt_trig'=>$tournament_trig
+            'tnmt_trig'=>$tournament_trig,
+            'prev_winner'=>$prevWinner
        ];

        foreach(RootDB::db()->query('SELECT `no`, `name`, `picture`, `imgsvr` FROM member WHERE grade >= 5') as $admin){
@@ -271,6 +271,7 @@ WHERE turntime < %s ORDER BY turntime ASC, `no` ASC',
            pullGeneralCommand($general->getID());

            $currentTurn = $general->getVar('turntime');
+            $general->increaseVarWithLimit('myset', 1, null, 3);

            $turnObj->updateTurnTime();
            $turnObj->applyDB();