From 4be9f0359eac3a225db96a0d43dc4769e4fcf669 Mon Sep 17 00:00:00 2001
From: dgflash <dgflash@qq.com>
Date: Tue, 30 Aug 2022 14:44:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AC=E5=9C=B0=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E5=AF=B9=E8=B1=A1=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=97=B6=E6=AD=A3=E7=A1=AE=E8=BF=94=E5=9B=9E=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC=E4=B8=8E=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=95=B0=E6=8D=AE=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/core/common/storage/StorageManager.ts | 38 +++++++++-----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/assets/core/common/storage/StorageManager.ts b/assets/core/common/storage/StorageManager.ts
index c54863e..67612cf 100644
--- a/assets/core/common/storage/StorageManager.ts
+++ b/assets/core/common/storage/StorageManager.ts
@@ -82,10 +82,10 @@ export module storage {
      * @param defaultValue 获取的默认值
      * @returns 
      */
-    export function get(key: string, defaultValue?: any) {
+    export function get(key: string, defaultValue?: any): string {
         if (null == key) {
             console.error("存储的key不能为空");
-            return;
+            return null!;
         }
 
         key = `${key}_${_id}`;
@@ -103,31 +103,27 @@ export module storage {
             }
         }
 
-        if (null == defaultValue || typeof defaultValue === 'string') {
-            return str;
-        }
         if (null === str) {
             return defaultValue;
         }
-        if (typeof defaultValue === 'number') {
-            return Number(str) || 0;
-        }
-        if (typeof defaultValue === 'boolean') {
-            return "true" == str; // 不要使用Boolean("false");
-        }
-        if (typeof defaultValue === 'object') {
-            try {
-                return JSON.parse(str);
-            }
-            catch (e) {
-                console.error("解析数据失败,str=" + str);
-                return defaultValue;
-            }
-
-        }
         return str;
     }
 
+    export function getNumber(key: string, defaultValue: number = 0): number {
+        var r = get(key);
+        return Number(r) || defaultValue;
+    }
+
+    export function getBoolean(key: string): boolean {
+        var r = get(key);
+        return Boolean(r) || false;
+    }
+
+    export function getJson(key: string, defaultValue?: any): any {
+        var r = get(key);
+        return (r && JSON.parse(r)) || defaultValue;
+    }
+
     /**
      * 删除指定关键字的数据
      * @param key 需要移除的关键字