From 599c98f135b1f20658061a30d1bd4a2cfed56b7c Mon Sep 17 00:00:00 2001
From: xlj <543978819@qq.com>
Date: Fri, 15 Aug 2025 15:24:31 +0800
Subject: [PATCH] =?UTF-8?q?ConfigManager=E6=94=B9=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E5=8D=95=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataTables/Datas/global_config.xlsx           | Bin 9691 -> 9580 bytes
 DataTables/output/tbglobalconfig.json         |   3 +-
 assets/Scenes/MainScene.scene                 |  80 +--
 assets/Scripts/Main/Common/Utils.ts           | 613 +++++++++---------
 assets/Scripts/Sub/UI/PreloadUI.ts            |   5 +
 .../Scripts/chat18x/manager/ConfigManager.ts  |  20 +-
 .../Scripts/chat18x/ui/panels/ThemePanel.ts   |   6 +-
 assets/Scripts/schema/schema.ts               |  10 +
 assets/bundles/DataTable/tbglobalconfig.bin   | Bin 68 -> 79 bytes
 9 files changed, 361 insertions(+), 376 deletions(-)

diff --git a/DataTables/Datas/global_config.xlsx b/DataTables/Datas/global_config.xlsx
index f43d33c0565fec6b4f7171772e5e7597d7abdf44..d5d40106358c9a84cc6f5a472da878fe6bd5aa0b 100644
GIT binary patch
literal 9580
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
L1<}1GedhZ=lpvm_

literal 9691
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
a|IK^KU<@QZ{&*t<2hfU4kLYxNeEWZfk6yR{

diff --git a/DataTables/output/tbglobalconfig.json b/DataTables/output/tbglobalconfig.json
index 4a819c72..66b99a10 100644
--- a/DataTables/output/tbglobalconfig.json
+++ b/DataTables/output/tbglobalconfig.json
@@ -5,6 +5,7 @@
     "Temperature": 0.7,
     "MaxTokens": 2048,
     "Timeout": 30000,
-    "FreeChatTimes": 20
+    "FreeChatTimes": 20,
+    "GameName": "AIGirlChat"
   }
 ]
\ No newline at end of file
diff --git a/assets/Scenes/MainScene.scene b/assets/Scenes/MainScene.scene
index a66d6ca7..381575da 100644
--- a/assets/Scenes/MainScene.scene
+++ b/assets/Scenes/MainScene.scene
@@ -18,15 +18,12 @@
     "_children": [
       {
         "__id__": 2
-      },
-      {
-        "__id__": 32
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 34
+      "__id__": 32
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -57,7 +54,7 @@
     },
     "autoReleaseAssets": false,
     "_globals": {
-      "__id__": 35
+      "__id__": 33
     },
     "_id": "1a23cd3e-e487-4fd1-a415-346c2087464d"
   },
@@ -1018,63 +1015,6 @@
     },
     "_id": "98EWBIubZPlZT+LFQb4IYI"
   },
-  {
-    "__type__": "cc.Node",
-    "_name": "ConfigManager",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 33
-      }
-    ],
-    "_prefab": null,
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 1073741824,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": "67ZXnZeExFXIu59phK6Xjz"
-  },
-  {
-    "__type__": "fbd43WrI4tK6KXuGCPuxhSR",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 32
-    },
-    "_enabled": true,
-    "__prefab": null,
-    "_id": "57vDjH7bVD4JDeqZChrdP3"
-  },
   {
     "__type__": "cc.PrefabInfo",
     "root": null,
@@ -1086,28 +1026,28 @@
   {
     "__type__": "cc.SceneGlobals",
     "ambient": {
-      "__id__": 36
+      "__id__": 34
     },
     "shadows": {
-      "__id__": 37
+      "__id__": 35
     },
     "_skybox": {
-      "__id__": 38
+      "__id__": 36
     },
     "fog": {
-      "__id__": 39
+      "__id__": 37
     },
     "octree": {
-      "__id__": 40
+      "__id__": 38
     },
     "skin": {
-      "__id__": 41
+      "__id__": 39
     },
     "lightProbeInfo": {
-      "__id__": 42
+      "__id__": 40
     },
     "postSettings": {
-      "__id__": 43
+      "__id__": 41
     },
     "bakedWithStationaryMainLight": false,
     "bakedWithHighpLightmap": false
diff --git a/assets/Scripts/Main/Common/Utils.ts b/assets/Scripts/Main/Common/Utils.ts
index 4558129a..ea0d1b03 100644
--- a/assets/Scripts/Main/Common/Utils.ts
+++ b/assets/Scripts/Main/Common/Utils.ts
@@ -1,328 +1,351 @@
-import { _decorator, Color, isValid, Label, Node, RichText, Size, Sprite, UITransform, Vec3, view } from "cc";
+import {
+  _decorator,
+  Color,
+  isValid,
+  Label,
+  Node,
+  RichText,
+  Size,
+  Sprite,
+  UITransform,
+  Vec3,
+  view,
+} from "cc";
 import li_EventManager from "./li_EventManager";
 
 const { ccclass, property } = _decorator;
 
 @ccclass
 export default class Utils {
-    //log日志
-    public static Log(msg: string | any, ...subst: any[]) {
-        let IsLocalCSChanel = true
-        if (IsLocalCSChanel) {
-            console.log(msg, subst)
-        }
+  //log日志
+  public static Log(msg: string | any, ...subst: any[]) {
+    let IsLocalCSChanel = true;
+    if (IsLocalCSChanel) {
+      console.log(msg, subst);
     }
-    //警告日志
-    public static Warning(msg: string | any, ...subst: any[]) {
-        let IsLocalCSChanel = true
-        if (IsLocalCSChanel) {
-            console.warn(msg, subst)
-        }
+  }
+  //警告日志
+  public static Warning(msg: string | any, ...subst: any[]) {
+    let IsLocalCSChanel = true;
+    if (IsLocalCSChanel) {
+      console.warn(msg, subst);
     }
-    //错误日志
-    public static Error(msg: string | any, ...subst: any[]) {
-        let IsLocalCSChanel = true
-        if (IsLocalCSChanel) {
-            console.error(msg, subst)
-        }
+  }
+  //错误日志
+  public static Error(msg: string | any, ...subst: any[]) {
+    let IsLocalCSChanel = true;
+    if (IsLocalCSChanel) {
+      console.error(msg, subst);
     }
+  }
 
+  //解析节点
+  public static parseNode = function (node: Node, oriObj?: any) {
+    if (!node || !node.children) return;
+    oriObj = oriObj || node;
+    let chs = node.children;
+    for (let i = 0; i < chs.length; i++) {
+      let ch = chs[i];
+      let chName = ch.name;
+      if (chName && chName.length > 0) {
+        try {
+          oriObj[chName] = ch;
+        } catch (error) {
+          //hg_utils.hgLog("chName err:", chName);
+        }
+      }
+      Utils.parseNode(ch, oriObj);
+    }
+  };
 
-    //解析节点
-    public static parseNode = function (node: Node, oriObj?: any) {
-        if (!node || !node.children) return;
-        oriObj = oriObj || node;
-        let chs = node.children;
-        for (let i = 0; i < chs.length; i++) {
-            let ch = chs[i];
-            let chName = ch.name;
-            if (chName && chName.length > 0) {
-                try {
-                    oriObj[chName] = ch;
-                } catch (error) {
-                    //hg_utils.hgLog("chName err:", chName);
-                }
-            }
-            Utils.parseNode(ch, oriObj);
-        }
-    }
+  //更换父节点，保留原有的坐标和旋转
+  public static changeNodeParent(node: Node, parentNode: Node) {
+    let world_Q = node.getWorldRotation();
+    let world_pos = node.getWorldPosition(); //原来的世界坐标
+    node.setParent(parentNode);
+    node.setRotation(world_Q);
+    node.setWorldPosition(world_pos);
+  }
 
-    
-    //更换父节点，保留原有的坐标和旋转
-    public static changeNodeParent(node:Node, parentNode:Node) {
-        let world_Q = node.getWorldRotation()
-        let world_pos = node.getWorldPosition()//原来的世界坐标
-        node.setParent(parentNode)
-        node.setRotation(world_Q);
-        node.setWorldPosition(world_pos)
+  /**
+   * 封装setString方法
+   */
+  static setString(node: Node, str: string | number) {
+    if (!isValid(node)) return;
+    let lb: any = node.getComponent(Label);
+    if (!lb) return;
+    if (str == null) {
+      str = "";
     }
+    str += "";
+    lb.string = str;
+  }
 
-    
-    /**
-     * 封装setString方法
-     */
-    static setString(node: Node, str: string | number) {
-        if (!isValid(node)) return;
-        let lb:any = node.getComponent(Label);
-        if (!lb) return;
-        if(str == null) {str = ""}
-        str += ""
-        lb.string = str;
+  /**
+   * 添加富文本
+   * @param node
+   * @param str
+   * @param outLine
+   * @param width
+   * @returns
+   */
+  static addRichText(
+    node: Node,
+    str: string,
+    outLine: string | null = null,
+    width: number | null = 2,
+    max: number = 0
+  ) {
+    if (!node) return;
+    let comp = node.getComponent(RichText);
+    if (!comp) return;
+    str = Utils.replaceAll(str, "</>", "</color>");
+    str = str.replace(/\<\/font\>/g, "</color>");
+    str = Utils.replaceAll(str, "'>", ">");
+    str = Utils.replaceAll(str, "<font", "<");
+    str = Utils.replaceAll(str, "color='", "color=");
+    str = Utils.replaceAll(str, "<br>", "\n");
+    if (outLine) {
+      str = `<outline color=${outLine} width=${width}>${str}</outline>`;
     }
+    comp.string = str;
+    // let csize:UITransform = comp.node.getComponent(UITransform)!
+    // comp.maxWidth = Math.min(csize.width,max) ;
+  }
+  static replaceAll(str: string, ch1: string, ch2: string) {
+    while (str.indexOf(ch1) >= 0) {
+      str = str.replace(ch1, ch2);
+    }
+    return str;
+  }
 
-    
-    /**
-     * 添加富文本
-     * @param node
-     * @param str
-     * @param outLine
-     * @param width
-     * @returns
-     */
-    static addRichText(node: Node, str: string, outLine: string | null = null, width: number | null = 2,max: number = 0) {
-        if (!node) return;
-        let comp = node.getComponent(RichText);
-        if (!comp) return;
-        str = Utils.replaceAll(str, "</>", "</color>");
-        str = str.replace(/\<\/font\>/g, '</color>');
-        str = Utils.replaceAll(str, "'>", ">");
-        str = Utils.replaceAll(str, "<font", "<");
-        str = Utils.replaceAll(str, "color='", "color=");
-        str = Utils.replaceAll(str, "<br>", "\n");
-        if (outLine) {
-            str = `<outline color=${outLine} width=${width}>${str}</outline>`;
-        }
-        comp.string = str;
-        // let csize:UITransform = comp.node.getComponent(UITransform)!
-        // comp.maxWidth = Math.min(csize.width,max) ;
-    }
-    static replaceAll(str: string, ch1: string, ch2: string) {
-        while (str.indexOf(ch1) >= 0) {
-            str = str.replace(ch1, ch2);
-        }
-        return str;
+  /**截取字符串，超过长度的用...代替
+   * @param str 要处理的字符串
+   * @param labelLimit 字符串长度限制
+   * @param repStr 超过长度后代替的字符串
+   */
+  static clampAiAnswer(
+    ansStr: string,
+    labelLimit: number,
+    repStr: string = "..."
+  ) {
+    // let labelLimit = 20 //字符串长度限制
+    let tempStr: string = "";
+    let tempLen: number = 0;
+    for (let i = 0; i < ansStr.length; i++) {
+      tempLen += ansStr.charCodeAt(i) > 255 ? 2 : 1;
+      if (tempLen > labelLimit) {
+        return tempStr + repStr;
+      }
+      tempStr += ansStr.charAt(i);
     }
+    return ansStr;
+  }
 
-    
-    /**截取字符串，超过长度的用...代替
-     * @param str 要处理的字符串
-     * @param labelLimit 字符串长度限制
-     * @param repStr 超过长度后代替的字符串
-    */
-    static clampAiAnswer(ansStr: string, labelLimit:number, repStr:string = "...") {
-        // let labelLimit = 20 //字符串长度限制
-        let tempStr: string = "";
-        let tempLen: number = 0;
-        for (let i = 0; i < ansStr.length; i++) {
-            tempLen += ansStr.charCodeAt(i) > 255 ? 2 : 1;
-            if (tempLen > labelLimit) {
-                return tempStr + repStr;
-            }
-            tempStr += ansStr.charAt(i);
-        }
-        return ansStr;
+  /**设置节点置灰 */
+  static setNodeGray(node: Node, isGray: boolean, extra: any = {}) {
+    if (!isValid(node)) return;
+    //图片
+    let sp: Sprite = node.getComponent(Sprite);
+    if (sp) {
+      sp.grayscale = isGray;
     }
+    // //文字
+    // let lb:Label = node.getComponent(Label);
+    // if (lb) {
+    //     if (isGray) {
+    //         lb.color = extra.labClrGray ? extra.labClrGray : Color.GRAY;
+    //     } else {
+    //         lb.color = extra.labClrWhite ? extra.labClrWhite : Color.WHITE;
+    //     }
+    // }
+    //对子节点执行同样操作
+    let children = node.children;
+    for (let i = 0; i < children.length; i++) {
+      Utils.setNodeGray(children[i], isGray, extra);
+    }
+  }
 
-
-    /**设置节点置灰 */
-    static setNodeGray(node: Node, isGray: boolean, extra: any={}) {
-        if (!isValid(node)) return;
-        //图片
-        let sp:Sprite = node.getComponent(Sprite);
-        if (sp) {
-            sp.grayscale = isGray;
-        }
-        // //文字
-        // let lb:Label = node.getComponent(Label);
-        // if (lb) {
-        //     if (isGray) {
-        //         lb.color = extra.labClrGray ? extra.labClrGray : Color.GRAY;
-        //     } else {
-        //         lb.color = extra.labClrWhite ? extra.labClrWhite : Color.WHITE;
-        //     }
-        // }
-        //对子节点执行同样操作
-        let children = node.children;
-        for (let i = 0; i < children.length; i++) {
-            Utils.setNodeGray(children[i], isGray, extra);
-        }
+  /**适配背景图
+   * @method node 背景图节点
+   * @param mod 适配模式 1=按高度适配 2=按宽度适配
+   */
+  public static adjustBgPixelRatioToSize(
+    windowSize: Size,
+    node: Node,
+    mod: number = 1
+  ) {
+    //let windowSize = view.getVisibleSize();
+    let bgTf = node.getComponent(UITransform);
+    if (bgTf) {
+      if (mod == 1 && bgTf.height <= windowSize.height) {
+        let scale = windowSize.height / bgTf.height;
+        bgTf.height = bgTf.height * scale;
+        bgTf.width = bgTf.width * scale;
+      } else if (mod == 2 && bgTf.width <= windowSize.width) {
+        let scale = windowSize.width / bgTf.width;
+        bgTf.height = bgTf.height * scale;
+        bgTf.width = bgTf.width * scale;
+      }
     }
-
-    /**适配背景图
-     * @method node 背景图节点
-     * @param mod 适配模式 1=按高度适配 2=按宽度适配
-     */
-    public static adjustBgPixelRatioToSize(windowSize:Size,node:Node, mod:number = 1) {
-        //let windowSize = view.getVisibleSize();
-        let bgTf = node.getComponent(UITransform)
-        if (bgTf) {
-            if (mod == 1 && bgTf.height < windowSize.height) {
-                let scale = windowSize.height / bgTf.height
-                bgTf.height = bgTf.height * scale
-                bgTf.width = bgTf.width * scale
-            } else if (mod == 2 && bgTf.width < windowSize.width) {
-                let scale = windowSize.width / bgTf.width
-                bgTf.height = bgTf.height * scale
-                bgTf.width = bgTf.width * scale
-            }
-        }
-    }
-    /**适配背景图
-     * @method node 背景图节点
-     * @param mod 适配模式 1=按高度适配 2=按宽度适配
-     */
-    public static adjustBgPixelRatio(node:Node, mod:number = 1) {
-        let windowSize = view.getVisibleSize();
-        let bgTf = node.getComponent(UITransform)
-        if (bgTf) {
-            if(mod == 3)
-            {
-                if(windowSize.height-bgTf.height < windowSize.width-bgTf.width )
-                {
-                    mod = 1;
-                }else{
-                    mod = 2;
-                }
-            }
-            if (mod == 1 && bgTf.height < windowSize.height) {
-                let scale = windowSize.height / bgTf.height
-                bgTf.height = bgTf.height * scale
-                bgTf.width = bgTf.width * scale
-            } else if (mod == 2 && bgTf.width < windowSize.width) {
-                let scale = windowSize.width / bgTf.width
-                bgTf.height = bgTf.height * scale
-                bgTf.width = bgTf.width * scale
-            }
-        }
-    }
-    /**适配背景图 按比例缩放 屏幕比设计分辨率小时缩小，反之则不缩放
-     * @param node 背景图节点
-     * @param mod 适配模式 1=按高度适配 2=按宽度适配
-     */
-    public static adjustBgScaleRatio(node:Node, mod:number = 1) {
-        let windowSize = view.getVisibleSize();
-        let designSize = view.getDesignResolutionSize();
-        if (mod == 1 && windowSize.height < designSize.height) {
-            let scale = windowSize.height / designSize.height
-            node.scale = new Vec3(scale, scale, 1)
-        } else if (mod == 2 && windowSize.width < designSize.width) {
-            let scale = windowSize.width / designSize.width
-            node.scale = new Vec3(scale, scale, 1)
-        }
-    }
-    /**获取屏幕分辨率和设计分辨率的比例
-     * @method mod 适配模式 1=按高度适配 2=按宽度适配
-     */
-    public static getScaleRatio(mod:number = 1) {
-        let windowSize = view.getVisibleSize();
-        let designSize = view.getDesignResolutionSize();
-        // console.log("游戏分辨率：", windowSize, designSize);
-        if (mod == 1) {
-            return windowSize.height / designSize.height
+  }
+  /**适配背景图
+   * @method node 背景图节点
+   * @param mod 适配模式 1=按高度适配 2=按宽度适配
+   */
+  public static adjustBgPixelRatio(node: Node, mod: number = 1) {
+    let windowSize = view.getVisibleSize();
+    let bgTf = node.getComponent(UITransform);
+    if (bgTf) {
+      if (mod == 3) {
+        if (windowSize.height - bgTf.height < windowSize.width - bgTf.width) {
+          mod = 1;
         } else {
-            return windowSize.width / designSize.width
+          mod = 2;
         }
+      }
+      if (mod == 1 && bgTf.height < windowSize.height) {
+        let scale = windowSize.height / bgTf.height;
+        bgTf.height = bgTf.height * scale;
+        bgTf.width = bgTf.width * scale;
+      } else if (mod == 2 && bgTf.width < windowSize.width) {
+        let scale = windowSize.width / bgTf.width;
+        bgTf.height = bgTf.height * scale;
+        bgTf.width = bgTf.width * scale;
+      }
     }
+  }
+  /**适配背景图 按比例缩放 屏幕比设计分辨率小时缩小，反之则不缩放
+   * @param node 背景图节点
+   * @param mod 适配模式 1=按高度适配 2=按宽度适配
+   */
+  public static adjustBgScaleRatio(node: Node, mod: number = 1) {
+    let windowSize = view.getVisibleSize();
+    let designSize = view.getDesignResolutionSize();
+    if (mod == 1 && windowSize.height < designSize.height) {
+      let scale = windowSize.height / designSize.height;
+      node.scale = new Vec3(scale, scale, 1);
+    } else if (mod == 2 && windowSize.width < designSize.width) {
+      let scale = windowSize.width / designSize.width;
+      node.scale = new Vec3(scale, scale, 1);
+    }
+  }
+  /**获取屏幕分辨率和设计分辨率的比例
+   * @method mod 适配模式 1=按高度适配 2=按宽度适配
+   */
+  public static getScaleRatio(mod: number = 1) {
+    let windowSize = view.getVisibleSize();
+    let designSize = view.getDesignResolutionSize();
+    // console.log("游戏分辨率：", windowSize, designSize);
+    if (mod == 1) {
+      return windowSize.height / designSize.height;
+    } else {
+      return windowSize.width / designSize.width;
+    }
+  }
 
-    
-    /**
-     *  @method 浅复制一个对象
-     * @param source 需要浅复制的对象
-     * 合并对象,如果excludes中没有指明需要排除的字段，target也含有相同的字段，则会被object同名字段值覆盖掉
-     * @param object
-     * @param excludes 需要排除的字段
-     */
-    static applyIf(object: any, target: any = {}, excludes: Array<string> = []): Object {
-        if (!target) target = {};
-        for (let key in object) {
-            if (object.hasOwnProperty(key)) {
-                if (excludes.indexOf(key) < 0) {
-                    target[key] = object[key];
-                }
-            }
+  /**
+   *  @method 浅复制一个对象
+   * @param source 需要浅复制的对象
+   * 合并对象,如果excludes中没有指明需要排除的字段，target也含有相同的字段，则会被object同名字段值覆盖掉
+   * @param object
+   * @param excludes 需要排除的字段
+   */
+  static applyIf(
+    object: any,
+    target: any = {},
+    excludes: Array<string> = []
+  ): Object {
+    if (!target) target = {};
+    for (let key in object) {
+      if (object.hasOwnProperty(key)) {
+        if (excludes.indexOf(key) < 0) {
+          target[key] = object[key];
         }
-        return target;
-    }
-    /**
-    * @method 浅复制一个对象
-    * @param source 需要浅复制的对象
-    * @return 返回一个新的对象
-    * @log 1. vincent,2018-12-18, func、date、reg 和 err 类型不能正常拷贝
-    */
-    static easyCopy(source: Object): Object {
-        const newObject = [];
-        return Utils.applyIf(source);
-    }
-    /**复制一个数据表 */
-    static clone(data:any) {
-        return Utils.easyCopy(data);
+      }
     }
+    return target;
+  }
+  /**
+   * @method 浅复制一个对象
+   * @param source 需要浅复制的对象
+   * @return 返回一个新的对象
+   * @log 1. vincent,2018-12-18, func、date、reg 和 err 类型不能正常拷贝
+   */
+  static easyCopy(source: Object): Object {
+    const newObject = [];
+    return Utils.applyIf(source);
+  }
+  /**复制一个数据表 */
+  static clone(data: any) {
+    return Utils.easyCopy(data);
+  }
 
+  /**发送内部事件 */
+  public static sendInnerMsg(innerId: number, param?: any) {
+    li_EventManager.I.onInnerEL(innerId, param);
+  }
+  /**注册内部事件 */
+  public static addInnerEL(innerId: number, i_target, i_callback: Function) {
+    li_EventManager.I.addInnerEL(innerId, i_callback, i_target);
+  }
+  /**移除内部事件 */
+  public static removeInnerEL(innerId: number, i_target, i_callback: Function) {
+    li_EventManager.I.removeInnerEL(innerId, i_callback, i_target);
+  }
 
-    /**发送内部事件 */
-    public static sendInnerMsg(innerId: number, param?: any) {
-        li_EventManager.I.onInnerEL(innerId, param);
-    }
-    /**注册内部事件 */
-    public static addInnerEL(innerId: number, i_target, i_callback: Function,) {
-        li_EventManager.I.addInnerEL(innerId, i_callback, i_target);
-    }
-    /**移除内部事件 */
-    public static removeInnerEL(innerId: number, i_target, i_callback: Function) {
-        li_EventManager.I.removeInnerEL(innerId, i_callback, i_target)
-    }
+  //获取随机数
+  public static getRandomInt(i_start: number, i_end: number): number {
+    i_start = Math.ceil(i_start);
+    i_end = Math.floor(i_end);
+    return Math.floor(Math.random() * (i_end - i_start + 1)) + i_start;
+  }
+  //数字转字符串，指定位数，位数不足前面补0
+  public static PrefixInt(num, length) {
+    return (Array(length).join("0") + num).slice(-length);
+  }
+  //数字保留几位小数
+  public static DecimalPlaces(num: number, weishu: number) {
+    return num.toFixed(weishu);
+  }
 
+  /**获取屏幕分辨率 */
+  public static GetWinSize(): Size {
+    return view.getVisibleSize();
+  }
 
-    //获取随机数
-    public static getRandomInt(i_start:number, i_end:number) : number {
-        i_start = Math.ceil(i_start);
-        i_end = Math.floor(i_end);
-        return Math.floor(Math.random() * (i_end - i_start + 1)) + i_start;
-    }
-    //数字转字符串，指定位数，位数不足前面补0
-    public static PrefixInt(num, length) {
-        return (Array(length).join('0') + num).slice(-length);
-    }
-    //数字保留几位小数
-    public static DecimalPlaces(num:number, weishu:number) {
-        return num.toFixed(weishu);
+  /**获取当前日期，格式YYYY-MM-DD */
+  public static GetNowFormatDay(
+    nowDate: Date | null = null,
+    char: string = "-"
+  ) {
+    if (nowDate == null) {
+      nowDate = new Date();
     }
+    let day = nowDate.getDate();
+    let month = nowDate.getMonth() + 1; //注意月份需要+1
+    let year = nowDate.getFullYear();
+    //补全0，并拼接
+    return (
+      year + char + Utils.completeDate(month) + char + Utils.completeDate(day)
+    );
+  }
+  //补全0
+  private static completeDate(value: number) {
+    return value < 10 ? "0" + value : value;
+  }
 
-    
-    /**获取屏幕分辨率 */
-    public static GetWinSize():Size {
-        return view.getVisibleSize()
-    }
-
-
-    /**获取当前日期，格式YYYY-MM-DD */
-    public static GetNowFormatDay(nowDate: Date | null = null, char: string = "-") {
-        if (nowDate == null) {
-            nowDate = new Date();
-        }
-        let day = nowDate.getDate();
-        let month = nowDate.getMonth() + 1;//注意月份需要+1
-        let year = nowDate.getFullYear();
-        //补全0，并拼接
-        return year + char + Utils.completeDate(month) + char + Utils.completeDate(day);
-    }
-    //补全0
-    private static completeDate(value: number) {
-        return value < 10 ? "0" + value : value;
-    }
-
-    
-    //打印消耗时间===================================================================================================
-    private static _eplTime = 0;
-    /**记录当前时间 */
-    public static ProfilerTimeRecord() {
-        Utils._eplTime = new Date().getTime();
-    }
-    /**打印消耗时间 */
-    public static ProfilerTimePrint(key:string = "") {
-        let time = new Date().getTime();
-        let timecha = time - Utils._eplTime;
-        console.log(`${key}消耗时间：${timecha}毫秒`);
-        Utils._eplTime = time;
-    }
-}
\ No newline at end of file
+  //打印消耗时间===================================================================================================
+  private static _eplTime = 0;
+  /**记录当前时间 */
+  public static ProfilerTimeRecord() {
+    Utils._eplTime = new Date().getTime();
+  }
+  /**打印消耗时间 */
+  public static ProfilerTimePrint(key: string = "") {
+    let time = new Date().getTime();
+    let timecha = time - Utils._eplTime;
+    console.log(`${key}消耗时间：${timecha}毫秒`);
+    Utils._eplTime = time;
+  }
+}
diff --git a/assets/Scripts/Sub/UI/PreloadUI.ts b/assets/Scripts/Sub/UI/PreloadUI.ts
index 6786b927..e5acd907 100644
--- a/assets/Scripts/Sub/UI/PreloadUI.ts
+++ b/assets/Scripts/Sub/UI/PreloadUI.ts
@@ -26,6 +26,7 @@ import { InnerMsgCode } from "../../Main/Config/InnerMsgCode";
 import { promptItem } from "../Item/promptItem";
 import LanguageUtils, { LanguageType } from "../../Main/Common/LanguageUtils";
 import { DataManager } from "../../chat18x/data/DataManager";
+import ConfigManager from "../../chat18x/manager/ConfigManager";
 const { ccclass, property } = _decorator;
 
 @ccclass("PreloadUI")
@@ -239,6 +240,10 @@ export class PreloadUI extends Component {
     // } else {
     //     //没登录成功，先进主界面，在主界面里进行登录
     // }
+
+    ConfigManager.I.init();
+    //console.log(ConfigManager.tables.TbGlobalConfig.GameName);
+
     ResManager.I.goMainScene(); //进入下一个场景
     // ResManager.I.goCustomScene("Test2DScene"); //进入自定义场景
   }
diff --git a/assets/Scripts/chat18x/manager/ConfigManager.ts b/assets/Scripts/chat18x/manager/ConfigManager.ts
index 4d4a8c47..f06b5f25 100644
--- a/assets/Scripts/chat18x/manager/ConfigManager.ts
+++ b/assets/Scripts/chat18x/manager/ConfigManager.ts
@@ -1,22 +1,28 @@
 import {
-  _decorator,
   resources,
   BufferAsset,
-  Component,
   assetManager,
   AssetManager,
 } from "cc";
 import * as cfg from "../../schema/schema";
 import ByteBuf from "db://assets/Scripts/luban/ByteBuf";
 
-const { ccclass, property } = _decorator;
-@ccclass("ConfigManager")
-export default class ConfigManager extends Component {
+export default class ConfigManager {
+  private static _instance: ConfigManager = null;
+  public static get I(): ConfigManager {
+    if (!this._instance) {
+      this._instance = new ConfigManager();
+    }
+    return this._instance;
+  }
+
   public static tables: cfg.Tables = null;
   private static dataMap = new Map<string, Uint8Array>();
   public static jsonFileNames: string[] = [];
 
-  onLoad() {
+  private constructor() {}
+
+  public init() {
     this.loadAllConfig();
   }
 
@@ -65,7 +71,7 @@ export default class ConfigManager extends Component {
     }
     Promise.all(promises).then((values) => {
       console.log("静态配置加载完成");
-      ConfigManager.tables = new cfg.Tables(this.getFileData);
+      ConfigManager.tables = new cfg.Tables(ConfigManager.I.getFileData);
       for (let item of ConfigManager.tables.TbGirls.getDataList()) {
         console.log(item);
       }
diff --git a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts
index 57c5a9c6..42eeab1d 100644
--- a/assets/Scripts/chat18x/ui/panels/ThemePanel.ts
+++ b/assets/Scripts/chat18x/ui/panels/ThemePanel.ts
@@ -71,14 +71,14 @@ export class ThemePanel extends li_BaseView {
       this.cache.push(item);
       this.content.addChild(newNode);
     }
-    const rectInfo = cfgs[0];
+    const rectInfo = ConfigManager.tables.TbGirls.get(10001);
     this.recId = rectInfo.id;
-    this.rectNameKey = rectInfo.key;
+    this.rectNameKey = rectInfo.nameKey;
 
     //this.recName.string = LanguageUtils.getText(this.rectNameKey);
     ResManager.I.changeBundleSpriteFrame(
       this.recSprite,
-      rectInfo.path,
+      rectInfo.avatarPath,
       "Chat18x",
       () => {
         let sizeTran = this.recSprite.node.parent.getComponent(UITransform);
diff --git a/assets/Scripts/schema/schema.ts b/assets/Scripts/schema/schema.ts
index 30b4bf45..dfafa04c 100644
--- a/assets/Scripts/schema/schema.ts
+++ b/assets/Scripts/schema/schema.ts
@@ -194,6 +194,7 @@ export class GlobalConfig {
         this.MaxTokens = _buf_.readInt()
         this.Timeout = _buf_.readInt()
         this.FreeChatTimes = _buf_.readInt()
+        this.GameName = _buf_.readString()
     }
 
     /**
@@ -217,6 +218,10 @@ export class GlobalConfig {
      * 单个角色免费聊天次数
      */
     readonly FreeChatTimes: number
+    /**
+     * 游戏名
+     */
+    readonly GameName: string
 
     resolve(tables:Tables) {
         
@@ -225,6 +230,7 @@ export class GlobalConfig {
         
         
         
+        
     }
 }
 
@@ -630,6 +636,10 @@ export class TbGlobalConfig {
      * 单个角色免费聊天次数
      */
     get  FreeChatTimes(): number { return this._data.FreeChatTimes; }
+    /**
+     * 游戏名
+     */
+    get  GameName(): string { return this._data.GameName; }
 
     resolve(tables:Tables) {
         this._data.resolve(tables)
diff --git a/assets/bundles/DataTable/tbglobalconfig.bin b/assets/bundles/DataTable/tbglobalconfig.bin
index fdf68ae7aa7c761356fe69361c2a3d4da1a70054..74a319e7ade1f5bc21cf542d23b464b6fd3909f4 100644
GIT binary patch
delta 16
XcmZ?qpWwpH<>=|2S(M|Pkyru%C#wY&

delta 4
LcmeZwncxBd18@Oo