From c26641207d78fd193d12f693647186e4cf3186a6 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 13 Dec 2021 14:36:02 +0800
Subject: [PATCH] 1

---
 webapp/controller/SeasonController.class.php |  1 +
 webapp/models/DynData.php                    | 32 ++++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/webapp/controller/SeasonController.class.php b/webapp/controller/SeasonController.class.php
index 8cca0f6..9214a2a 100644
--- a/webapp/controller/SeasonController.class.php
+++ b/webapp/controller/SeasonController.class.php
@@ -64,6 +64,7 @@ class SeasonController extends BaseAuthedController {
             'info' => array(
                 'season_id' => $this->currSeasonMeta['id'],
                 'rank' => $this->userInfo['rank'],
+                'score' => $this->userInfo['score'],
                 'max_score' => $rankMeta ? $rankMeta['max_score'] : 0,
                 'noshow_score_bar' => $rankMeta ? $rankMeta['noshow_score_bar'] : 1,
                 'mission' => $this->getMissionInfo()
diff --git a/webapp/models/DynData.php b/webapp/models/DynData.php
index 286e066..401593d 100644
--- a/webapp/models/DynData.php
+++ b/webapp/models/DynData.php
@@ -20,7 +20,10 @@ class DynData extends BaseModel {
             );
             foreach ($rows as $row) {
                 $key = self::calcKey($row['x'], $row['y']);
-                self::$dynData[$key] = $row['val'];
+                self::$dynData[$key] = array(
+                    'val' => $row['val'],
+                    'modifytime' => $row['modifytime'],
+                );
             }
         }
     }
@@ -29,7 +32,11 @@ class DynData extends BaseModel {
     {
         $key = self::calcKey($x, $y);
         if (self::$dynData) {
-            return getXVal(self::$dynData, $key, $defVal);
+            if (isset($dynData[$key])) {
+                return getXVal(self::$dynData[$key], 'val', $defVal);
+            } else {
+                return $defVal;
+            }
         } else {
             ++self::$hitCount;
             if (self::$hitCount > 5 && is_null(self::$dynData)) {
@@ -50,6 +57,22 @@ class DynData extends BaseModel {
         }
     }
 
+    public static function getDailyV($x, $y, $defVal = 0)
+    {
+    }
+
+    public function _setDailyV($x, $y, $val)
+    {
+    }
+
+    public function _incDailyV($x, $y, $incVal)
+    {
+    }
+
+    public function _decDailyV($x, $y, $decVal)
+    {
+    }
+
     public static function setV($x, $y, $defVal)
     {
         $key = self::calcKey($x, $y);
@@ -113,7 +136,10 @@ class DynData extends BaseModel {
              )
             );
         if (self::$dynData) {
-            self::$dynData[$key] = $val;
+            self::$dynData[$key] = array(
+                'val' => $val,
+                'modifytime' => myself()->_getNowTime(),
+            );
         }
     }