cgserver 9.2.7 → 10.0.0

package/README.md

@@ -1,3 +1,13 @@
+10.0.0
+1、老项目切忌不要轻易升级
+2、老项目切忌不要轻易升级
+3、老项目切忌不要轻易升级
+
+1、修改引入方式
+2、修改mongo的where和property顺序
+
+9.2.7
+1、主要针对配置政策修改
 9.2.1
 1、增强提示
 9.2.0

package/dist/lib/Framework/AI/BehaviorAI.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BehaviorAI = void 0;
-const Log_1 = require("./../Logic/Log");
 const Core_1 = require("../Core/Core");
 const _ = require("underscore");
 const TriggerMgr_1 = require("./TriggerMgr");
+const global_1 = require("../global");
 class BehaviorAI {
     _obj;
     _targetObjs;
@@ -27,13 +27,13 @@ class BehaviorAI {
             this._targetObjs = [];
         }
         this._triggers = [];
-        let code = TriggerMgr_1.GTriggerMgr.addConditionTriggerEvent(TriggerMgr_1.EConditionType.Die, this.onTriggerDie.bind(this), { code: this._obj.getCode() });
+        let code = global_1.global.gTriggerMgr.addConditionTriggerEvent(TriggerMgr_1.EConditionType.Die, this.onTriggerDie.bind(this), { code: this._obj.getCode() });
         this._triggers.push({ type: TriggerMgr_1.EConditionType.Die, code: code });
     }
     //启动行为树AI
     start() {
         if (!this._behavior_data) {
-            Log_1.GLog.info("------------error------------this._behavior_data  can not be null!");
+            global_1.global.gLog.info("------------error------------this._behavior_data  can not be null!");
             return;
         }
         this.goto(this._behavior_data.start);
@@ -41,7 +41,7 @@ class BehaviorAI {
     //结束行为树AI
     end() {
         for (let i = 0, length = this._triggers.length; i < length; ++i) {
-            TriggerMgr_1.GTriggerMgr.removeConditionTriggerEvent(this._triggers[i].type, this._triggers[i].code);
+            global_1.global.gTriggerMgr.removeConditionTriggerEvent(this._triggers[i].type, this._triggers[i].code);
         }
         this._triggers = [];
     }
@@ -145,7 +145,7 @@ class BehaviorAI {
             }
         }
         else {
-            Log_1.GLog.info("---------warning--------_goto->behavior_name=" + behavior_name + ".animaiton not exist!");
+            global_1.global.gLog.info("---------warning--------_goto->behavior_name=" + behavior_name + ".animaiton not exist!");
         }
     }
     //检查有没有已经达到的条件,又的话就执行他的相关事件
@@ -177,7 +177,7 @@ class BehaviorAI {
                         let targetInfo = this._getNearestTarget();
                         if (targetInfo) {
                             if (this._behavior_data.name == "sm")
-                                Log_1.GLog.info("distance" + targetInfo.distance);
+                                global_1.global.gLog.info("distance" + targetInfo.distance);
                             this._targetObj = targetInfo.target;
                         }
                     }

package/dist/lib/Framework/AI/TriggerMgr.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GTriggerMgr = exports.Trigger = exports.EConditionType = exports.ETriggerType = void 0;
-const Log_1 = require("./../Logic/Log");
+exports.TriggerManager = exports.Trigger = exports.EConditionType = exports.ETriggerType = void 0;
 const Core_1 = require("../Core/Core");
+const global_1 = require("../global");
 var ETriggerType;
 (function (ETriggerType) {
     ETriggerType[ETriggerType["Region"] = 0] = "Region";
@@ -20,7 +20,6 @@ class Trigger {
 }
 exports.Trigger = Trigger;
 let _GTriggerCode = 0;
-exports.GTriggerMgr = null;
 class TriggerManager {
     _regionTriggers = null;
     _conditionTriggers = {};
@@ -86,8 +85,8 @@ class TriggerManager {
         if (!pos || typeof region === "undefined") {
             return false;
         }
-        Log_1.GLog.info("pos.x" + pos.x + "  pos.y=" + pos.y);
-        Log_1.GLog.info("region.x" + region.x + "  region.y=" + region.y);
+        global_1.global.gLog.info("pos.x" + pos.x + "  pos.y=" + pos.y);
+        global_1.global.gLog.info("region.x" + region.x + "  region.y=" + region.y);
         if (pos.x < (region.x - region.width / 2)) {
             return false;
         }
@@ -145,7 +144,7 @@ class TriggerManager {
         if (!this._regionTriggers.aiObj || !this._regionTriggers.aiObj.onTriggerIn) {
             return;
         }
-        Log_1.GLog.info("some one triggered in");
+        global_1.global.gLog.info("some one triggered in");
         this._regionTriggers.aiObj.onTriggerIn(obj, trigger);
     }
     //从里面走出去的时候触发
@@ -153,7 +152,7 @@ class TriggerManager {
         if (!this._regionTriggers.aiObj || !this._regionTriggers.aiObj.onTriggerOut) {
             return;
         }
-        Log_1.GLog.info("some one triggered out");
+        global_1.global.gLog.info("some one triggered out");
         this._regionTriggers.aiObj.onTriggerOut(obj, trigger);
     }
     //////////////////////////////////////条件触发器//////////////////////////////////////////////////
@@ -198,4 +197,4 @@ class TriggerManager {
         }
     }
 }
-exports.GTriggerMgr = new TriggerManager();
+exports.TriggerManager = TriggerManager;

package/dist/lib/Framework/Config/FrameworkConfig.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FrameworkConfig = exports.WebServerConfig = exports.ESessionType = void 0;
-const Log_1 = require("../Logic/Log");
+const global_1 = require("../global");
 const Config_1 = require("./Config");
 const DbConfig_1 = require("./DbConfig");
 var ESessionType;
@@ -186,7 +186,7 @@ class FrameworkConfig extends Config_1.Config {
     }
     init() {
         let ret = super.init();
-        Log_1.GLog.init(this.log, this.console_level || 0);
+        global_1.global.gLog.init(this.log, this.console_level || 0);
         return ret;
     }
 }

package/dist/lib/Framework/Config/IServerConfig.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IServerConfig = exports.GServerCfg = void 0;
+exports.IServerConfig = void 0;
+const global_1 = require("../global");
 const FrameworkConfig_1 = require("./FrameworkConfig");
-exports.GServerCfg = null;
 class IServerConfig extends FrameworkConfig_1.FrameworkConfig {
     port = -1;
     _server_name = "";
@@ -19,7 +19,7 @@ class IServerConfig extends FrameworkConfig_1.FrameworkConfig {
         if (!ret) {
             return ret;
         }
-        exports.GServerCfg = this;
+        global_1.global.gServerCfg = this;
         return ret;
     }
 }

package/dist/lib/Framework/Core/ByteTool.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GByteTool = void 0;
+exports.ByteTool = void 0;
 class ByteTool {
     //构建一个视图，把字节数组写到缓存中，索引从0开始
     getView(bytes) {
@@ -81,4 +81,4 @@ class ByteTool {
         return this.getUint8Array(8, (view) => { view.setFloat64(0, num, littleEndian); });
     }
 }
-exports.GByteTool = new ByteTool();
+exports.ByteTool = ByteTool;

package/dist/lib/Framework/Core/Core.js

@@ -5,10 +5,10 @@ let os = require('os');
 let request = require('request');
 const _ = require("underscore");
 const crypto = require("crypto");
-const Log_1 = require("../Logic/Log");
 const CryptoJS = require("crypto-js");
 const ec_key_1 = require("ec-key");
 const uuid_1 = require("uuid");
+const global_1 = require("../global");
 /**
  * 常用的工具函数类
  */
@@ -598,13 +598,13 @@ class core {
             if (core.isAsyncFunc(func)) {
                 if (thisArg) {
                     rs = await func.call(thisArg, ...params).catch((reason) => {
-                        Log_1.GLog.error(reason);
+                        global_1.global.gLog.error(reason);
                         rs = { errcode: { id: 1008611, des: "failed" } };
                     });
                 }
                 else {
                     rs = await func(...params).catch((reason) => {
-                        Log_1.GLog.error(reason);
+                        global_1.global.gLog.error(reason);
                         rs = { errcode: { id: 1008612, des: "failed" } };
                     });
                 }
@@ -620,7 +620,7 @@ class core {
             return rs;
         }
         catch (e) {
-            Log_1.GLog.error(e.stack);
+            global_1.global.gLog.error(e.stack);
             return { errcode: { id: 1008613, des: "failed" } };
         }
     }

package/dist/lib/Framework/Core/Timer.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Timer = void 0;
-const Log_1 = require("../Logic/Log");
+const global_1 = require("../global");
 class Timer {
     _deadline = -1;
     get deadline() {
@@ -38,10 +38,10 @@ class Timer {
             }
             catch (e) {
                 if (e && e.stack) {
-                    Log_1.GLog.error(e.stack);
+                    global_1.global.gLog.error(e.stack);
                 }
                 else {
-                    Log_1.GLog.error(e);
+                    global_1.global.gLog.error(e);
                 }
             }
         }, timeout, ...args);
@@ -61,10 +61,10 @@ class Timer {
             }
             catch (e) {
                 if (e && e.stack) {
-                    Log_1.GLog.error(e.stack);
+                    global_1.global.gLog.error(e.stack);
                 }
                 else {
-                    Log_1.GLog.error(e);
+                    global_1.global.gLog.error(e);
                 }
             }
         }, timeout, ...args);

package/dist/lib/Framework/Database/Decorator/DBCache.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GDBCache = exports.VersionModel = void 0;
-const Log_1 = require("./../../Logic/Log");
+exports.DBCache = exports.VersionModel = void 0;
 const fs = require("fs");
+const global_1 = require("../../global");
 class VersionModel {
     table = "";
     version = 0;
@@ -16,19 +16,18 @@ class VersionModel {
     update_time = 0;
 }
 exports.VersionModel = VersionModel;
-exports.GDBCache = null;
 class DBCache {
     _versions = {};
     _path = __dirname + "/tmp_table_version.json";
     async init() {
-        Log_1.GLog.warn("mysql auto 功能建议只使用在开发环境中，因为会导致数据丢失，数据表重建");
+        global_1.global.gLog.warn("mysql auto 功能建议只使用在开发环境中，因为会导致数据丢失，数据表重建");
         if (fs.existsSync(this._path)) {
             try {
                 let table = fs.readFileSync(this._path);
                 this._versions = JSON.parse(table.toString());
             }
             catch (e) {
-                Log_1.GLog.info("error:" + this._path);
+                global_1.global.gLog.info("error:" + this._path);
                 process.exit();
             }
         }
@@ -62,4 +61,4 @@ class DBCache {
         return vm.version;
     }
 }
-exports.GDBCache = new DBCache();
+exports.DBCache = DBCache;

package/dist/lib/Framework/Database/MSSqlManager.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GMSSqlMgr = exports.MssqlReturn = exports.MSSqlConfig = void 0;
+exports.MSSqlManager = exports.MssqlReturn = exports.MSSqlConfig = void 0;
 const mssql = require("mssql");
-const DBCache_1 = require("./Decorator/DBCache");
+const global_1 = require("../global");
 class MSSqlConfig {
     open = false;
     auto = false;
@@ -20,7 +20,6 @@ class MssqlReturn {
     list = null;
 }
 exports.MssqlReturn = MssqlReturn;
-exports.GMSSqlMgr = null;
 class MSSqlManager {
     _init_cbs = [];
     _pool = null;
@@ -41,7 +40,7 @@ class MSSqlManager {
         this._pool = await mssql.connect(cfg);
         console.log("mssql config=" + JSON.stringify(cfg));
         //这个的初始化位置不能变，必须位于cbs前，pool后
-        await DBCache_1.GDBCache.init();
+        await global_1.global.gDbCache.init();
         for (let i = 0; i < this._init_cbs.length; ++i) {
             this._init_cbs[i]();
         }
@@ -50,4 +49,4 @@ class MSSqlManager {
         this._init_cbs.push(cb);
     }
 }
-exports.GMSSqlMgr = new MSSqlManager();
+exports.MSSqlManager = MSSqlManager;

package/dist/lib/Framework/Database/Mongo/MongoBaseService.js

@@ -0,0 +1,128 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MongoBaseService = void 0;
+const global_1 = require("../../global");
+class MongoBaseService {
+    _table = "";
+    get table() {
+        return this._table;
+    }
+    _inited = false;
+    get isInited() {
+        return this._inited;
+    }
+    get mongoDb() {
+        return global_1.global.gMongoMgr.getMongo(this._dbname);
+    }
+    _dbname = "";
+    get dbname() {
+        if (!this._dbname) {
+            this._dbname = global_1.global.gMongoMgr.defdbname;
+        }
+        return this._dbname;
+    }
+    _t_type = null;
+    constructor(table, type, dbname = "") {
+        this._t_type = type;
+        this._table = table;
+        this._dbname = dbname;
+    }
+    async getNextId(key = "") {
+        if (!key) {
+            key = this._table;
+        }
+        let id = await this.mongoDb.getAutoIds(this._table);
+        return id;
+    }
+    toObjectId(id) {
+        return this.mongoDb.toObjectId(id);
+    }
+    /**
+     * 没有id(非_id)的表不能使用该函数
+     * @param id
+     */
+    async getById(id) {
+        let rs = await this.mongoDb.findOne(this._table, null, { id: id });
+        return rs.one;
+    }
+    async get(where = null, property = null) {
+        let rs = await this.mongoDb.findOne(this._table, where, property);
+        return rs.one;
+    }
+    async countDocuments(where = null, options) {
+        let rs = await this.mongoDb.countDocuments(this._table, where);
+        return rs.count;
+    }
+    async gets(where = null, property = null, sort = null, skip = 0, limit = 0) {
+        let rs = await this.mongoDb.findMany(this._table, where, property, sort, skip, limit);
+        return rs.list;
+    }
+    async getRandoms(num, where, property = null) {
+        let rs = await this.mongoDb.simpleAggregate(this._table, where, property, null, num);
+        return rs.list;
+    }
+    async updateOne(where, model, upsert = false) {
+        let rs = await this.mongoDb.updateOne(this._table, where, model, upsert);
+        return rs;
+    }
+    async updateMany(where, model = null, upsert = false) {
+        let rs = await this.mongoDb.updateMany(this._table, where, model, upsert);
+        return rs;
+    }
+    async insert(model) {
+        let rs = await this.mongoDb.insertOne(this._table, model);
+        return rs;
+    }
+    async deleteOne(where) {
+        let rs = await this.mongoDb.deleteOne(this._table, where);
+        return rs;
+    }
+    async deleteMany(where) {
+        let rs = await this.mongoDb.deleteMany(this._table, where);
+        return rs;
+    }
+    async createIndex(index, options) {
+        let rs = await this.mongoDb.createIndex(this._table, index, options);
+        return rs;
+    }
+    aggregate(pipeline, options) {
+        let ret = this.mongoDb.aggregate(this._table, pipeline, options);
+        return ret;
+    }
+    /**
+     * 仅仅支持一级
+     * @param array 数据名称 比如 items
+     * @param where 数组内赛选条件 比如 "items.id":1
+     * @param pre_match 数组上一级赛选条件 比如 "user_id":1
+     */
+    async getsInArray(array, where, pre_match) {
+        let agg = this.aggregate();
+        if (pre_match) {
+            agg = agg.match(pre_match);
+        }
+        agg = agg.unwind("$" + array);
+        if (where) {
+            agg = agg.match(where);
+        }
+        let all = await agg.toArray();
+        let items = [];
+        for (let i = 0; i < all.length; ++i) {
+            items.push(all[i][array]);
+        }
+        return items;
+    }
+    /**
+     * 仅仅支持一级
+     * @param array 数据名称 比如 items
+     * @param where 数组内赛选条件 比如 "items.id":1
+     * @param pre_match 数组上一级赛选条件 比如 "user_id":1
+     */
+    async getInArray(array, where, pre_match) {
+        let items = await this.getsInArray(array, where, pre_match);
+        if (items.length <= 0) {
+            return null;
+        }
+        return items[0];
+    }
+}
+exports.MongoBaseService = MongoBaseService;