cgserver 7.10.2113 → 7.11.2113

package/src/Framework/AI/TriggerMgr.ts

@@ -1,280 +0,0 @@
-import { Point } from './Point';
-import { Entity } from './Entity';
-import { AiObject } from './AiObject';
-import { GLog } from './../Logic/Log';
-import { core } from "../Core/Core";
-import { Rect } from './Astar';
-
-export enum ETriggerType{
-    Region=0,
-    Condition
-}
-export enum EConditionType{
-    Die=0,
-    Hit,
-    HP,
-    MP,
-}
-export class Trigger
-{
-    region:Rect=null
-}
-let _GTriggerCode = 0
-
-export let GTriggerMgr:TriggerManager = null
-class TriggerManager
-{
-    protected _regionTriggers:{ triggerInfos: Array<{trigger:Trigger}>, objInfos: Array<{obj:Entity,prePos:Point}>, aiObj: AiObject }=null
-    protected _conditionTriggers={}
-    //触发器的单个个体必须包含x,y,width,height,其他参数为各自需要添加
-    init()
-    {
-        this.clearAll();
-    }
-    clearAll()
-    {
-        this.clearRegionTrigger();
-        this.clearConditionTrigger();
-    }
-    clear(triggertype)
-    {
-        if (triggertype===undefined)
-        {
-            this.clearAll();
-        }
-        else if (triggertype == ETriggerType.Region)
-        {
-            this.clearRegionTrigger();
-        }
-        else
-        {
-            this.clearConditionTrigger();
-        }
-    }
-
-
-
-
-    ////////////////////////////////////////////区域触发器//////////////////////////////////////////////////////
-    //objs 需要检查的对象，regions触发起区域，callBackObj回调的对象
-    initRegionTrigger(objs, triggers, callBackObj?:AiObject)
-    {
-        this.clearRegionTrigger();
-        if (!triggers || triggers.length <= 0)
-        {
-            return;
-        }
-        for (let i = 0, length = triggers.length; i < length; ++i)
-        {
-            this._regionTriggers.triggerInfos[i] = { trigger: triggers[i] };
-        }
-        if (core.isArray(objs))
-        {
-            for (let i = 0, length = objs.length; i < length; ++i)
-            {
-                this._regionTriggers.objInfos[i] = { obj: objs[i],prePos:null };
-            }
-        }
-        else
-        {
-            this._regionTriggers.objInfos[0] = { obj: objs,prePos:null };
-        }
-        if (typeof callBackObj !== "undefined")
-        {
-            this._regionTriggers.aiObj = callBackObj;
-        }
-        this._checkRegion();//初始化check
-    }
-    clearRegionTrigger()
-    {
-        this._regionTriggers = { triggerInfos: [], objInfos: [], aiObj: null };
-    }
-
-    addObjToRegionTrigger(obj)
-    {
-        this._regionTriggers.objInfos[this._regionTriggers.objInfos.length] = { obj: obj,prePos:null };
-    }
-
-    removeObjInRegionTrigger(obj)
-    {
-        for (let i = 0; i < this._regionTriggers.objInfos.length; ++i)
-        {
-            let o = this._regionTriggers.objInfos[i].obj;
-            if (o === obj)
-            {
-                this._regionTriggers.objInfos=this._regionTriggers.objInfos.splice(i,1);
-                return;
-            }
-        }
-    }
-
-    //是否在触发器内
-    protected _isInTrigger(pos, region)
-    {
-        if (!pos || typeof region === "undefined")
-        {
-            return false;
-        }
-        GLog.info("pos.x" + pos.x + "  pos.y=" + pos.y);
-        GLog.info("region.x" + region.x + "  region.y=" + region.y);
-        if (pos.x < (region.x - region.width / 2))
-        {
-            return false;
-        }
-        if (pos.x > (region.x + region.width / 2))
-        {
-            return false;
-        }
-        if (pos.y < (region.y - region.height / 2))
-        {
-            return false;
-        }
-        if (pos.y > (region.y + region.height / 2))
-        {
-            return false;
-        }
-        return true;
-    }
-    //外部需要调用改接口
-    check()
-    {
-        this._checkRegion();
-    }
-    _checkRegion()
-    {
-        for (let i = 0, length = this._regionTriggers.objInfos.length; i < length; ++i)
-        {
-            let info = this._regionTriggers.objInfos[i];
-            if (!info)
-            {
-                continue;
-            }
-            let obj = info.obj;
-            if (!obj)
-            {
-                this.removeObjInRegionTrigger(obj);//改对象已经无效
-                continue;
-            }
-            let pos = obj.cellPos;
-
-            if (!info.prePos)
-            {
-                info.prePos = pos;
-                for (let i = 0, length = this._regionTriggers.triggerInfos.length; i < length; ++i)
-                {
-                    let triggerInfo = this._regionTriggers.triggerInfos[i];
-                    if (this._isInTrigger(pos, triggerInfo.trigger.region))
-                    {
-                        //原本在外面或首次检测，触发进入事件
-                        if (triggerInfo[obj.id] && triggerInfo[obj.id] == -1)
-                        {
-                            this._triggerIn(obj, triggerInfo.trigger);
-                            triggerInfo[obj.id] = 1;
-                        }
-                    }
-                    else
-                    {
-                        //原本在里面或者首次检测，现在不在了，触发走出触发器事件
-                        if (triggerInfo[obj.id] && triggerInfo[obj.id] == 1)
-                        {
-                            this._triggerOut(obj, triggerInfo.trigger);
-                        }
-                        triggerInfo[obj.id] = -1;
-                    }
-                }
-            }
-        }
-    }
-
-
-    //从外面进入时触发
-    _triggerIn(obj, trigger)
-    {
-        if (!this._regionTriggers.aiObj || !this._regionTriggers.aiObj.onTriggerIn)
-        {
-            return
-        }
-        GLog.info("some one triggered in")
-        this._regionTriggers.aiObj.onTriggerIn(obj, trigger)
-    }
-
-    //从里面走出去的时候触发
-    _triggerOut(obj, trigger)
-    {
-        if (!this._regionTriggers.aiObj || !this._regionTriggers.aiObj.onTriggerOut)
-        {
-            return
-        }
-        GLog.info("some one triggered out")
-        this._regionTriggers.aiObj.onTriggerOut(obj, trigger)
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    //////////////////////////////////////条件触发器//////////////////////////////////////////////////
-    initConditionTrigger()
-    {
-        this._conditionTriggers = {}
-        for (let conditiontype in EConditionType)
-        {
-            this._conditionTriggers[conditiontype] = {}
-        }
-    }
-    clearConditionTrigger()
-    {
-        this._conditionTriggers = []
-        for (let conditiontype in EConditionType)
-        {
-            this._conditionTriggers[EConditionType[conditiontype]] = {}
-        }
-    }
-    triggerCondition(conditiontype, params, conditions)
-    {
-        params = params || {};
-        conditions = conditions || {};
-        for (let code in this._conditionTriggers[conditiontype])
-        {
-            let info = this._conditionTriggers[conditiontype][code]
-            for (let key in info.conditions)
-            {
-                if (info.conditions[key] !== conditions[key])
-                {
-                    return false
-                }
-            }
-            info.callback(params)
-        }
-        return true
-    }
-    addConditionTriggerEvent(conditiontype, callback, conditions)
-    {
-        conditions = conditions || {}
-        _GTriggerCode += 1
-        this._conditionTriggers[conditiontype][_GTriggerCode] = { callback: callback, conditions: conditions }
-        return { type: conditiontype, code: _GTriggerCode }
-    }
-    removeConditionTriggerEvent(conditiontype, code)
-    {
-        if (code === undefined)
-        {
-            this._conditionTriggers[conditiontype] = {}
-        }
-        else
-        {
-            delete this._conditionTriggers[conditiontype][code]
-        }
-
-    }
-}
-GTriggerMgr=new TriggerManager()

package/src/Framework/Config/Config.ts

@@ -1,61 +0,0 @@
-import * as fs from "fs";
-import { jsonc } from "jsonc";
-
-export class Config
-{
-    protected _suffix:string=""
-    protected _is_init:boolean=false
-    protected _file_name=""
-    /**
-     * 是否是debug调试模式，主要区别于读取数据档，debug默认读取file_d文件，release默认读取file_r文件，如果不存在都会读取file文件
-     */
-    static debug=false
-    static rootDataDir="data/"
-    constructor(filename)
-    {
-        this._file_name = filename
-    }
-    init()
-    {
-        if(this._is_init)
-        {
-            return false
-        }
-        let suffix2="_r"
-        if(Config.debug)
-        {
-            suffix2="_d"
-        }
-        let path = Config.rootDataDir+this._file_name+"_"+this._suffix+suffix2+".json"
-        path=path.toLowerCase()
-        if(!fs.existsSync(path))
-        {
-            path = Config.rootDataDir+this._file_name+"_"+this._suffix+".json"
-            path=path.toLowerCase()
-            if(!fs.existsSync(path))
-            {
-                path = Config.rootDataDir+this._file_name+suffix2+".json"
-                path=path.toLowerCase()
-                if(!fs.existsSync(path))
-                {
-                    path = Config.rootDataDir+this._file_name+".json"
-                    path=path.toLowerCase()
-                    if(!fs.existsSync(path))
-                    {
-                        console.error(path+" not exist!")
-                        return true
-                    }
-                }
-            }
-        }
-        
-        let content = fs.readFileSync(path).toString()
-        let jsonData = jsonc.parse(content)
-        for(let key in jsonData)
-        {
-            this[key] = jsonData[key]
-        }
-        console.log("loaded cfg="+path)
-        return true
-    }
-}

package/src/Framework/Config/FrameworkConfig.ts

@@ -1,286 +0,0 @@
-import { MongoConfig } from "../Database/MongoManager";
-import { GLog } from "../Logic/Log";
-import { RpcConfig } from "../ThirdParty/Rpc";
-import { Config } from "./Config";
-export enum ESessionType
-{
-    Cache,
-    Redis,
-    Mongo
-}
-export class WebServerConfig
-{
-    cache={}
-    session_type=ESessionType.Cache
-    debug=false
-    web_name="web"
-    port=0
-    cookie=
-    {
-        prefix:"tiny_cookie_",
-        expires:
-        {
-            account_remember: 7 * 24 * 60 * 60,
-            account: 10 * 60
-        }
-    }
-    routs=
-    {
-        /**
-         * 如果设置了这一项，那网址里面就不用带模块名称，是不回解析的
-         */
-        onlyModule:"Web",
-        defaults: { module:"Web",controller : "Index", action : "Index"}
-    }
-    ssl:
-    {
-        key:string,
-        crt:string
-    }=null
-    //默认不跨域
-    cors:
-    {
-        origin:string|string[],  //指定接收的地址，将localhost改成前端IP地址
-        methods:string|string[],  //指定接收的请求类型
-        allowedHeaders:string|string[],
-        credentials:boolean
-    }=null
-}
-export class FrameworkConfig extends Config
-{
-    /*
-    *-1不输出到console，0，仅错误信息输出到console，1，都输出到console
-    */
-    console_level=0
-    log=
-    {
-        appenders:  
-        {
-            console:
-            {
-                "type":"console",
-                "category":"console"
-            },
-            log_file:
-            {  
-                category:"log_file",  
-                type: "file",  
-                filename: "./logs/log_file/file.log",  
-                maxLogSize: 10*1024*1024,
-                backups: 100,
-            },  
-            log_date:
-            {  
-                category:"log_date",  
-                type: "dateFile",  
-                filename: "./logs/log_date/date",  
-                alwaysIncludePattern: true,  
-                pattern: "yyyy-MM-dd-hh.log",
-            },
-            client_log_file:
-            {  
-                category:"log_file",  
-                type: "file",  
-                filename: "./logs/client_log_file/file.log",  
-                maxLogSize: 10*1024*1024,
-                backups: 100,
-            },  
-            client_log_date:
-            {  
-                category:"log_date",  
-                type: "dateFile",  
-                filename: "./logs/client_log_date/date",  
-                alwaysIncludePattern: true,  
-                pattern: "yyyy-MM-dd.log"  
-            },
-            error_log_file:
-            {  
-                category:"error_log_file",  
-                type: "file",  
-                filename: "./logs/error_log_file/file.log",  
-                maxLogSize: 5*1024*1024,
-                backups: 100,
-            }
-        },
-        categories: 
-        { 
-            default: 
-            { 
-                appenders: ['log_date'],
-                level:'ALL'
-            },
-            console: 
-            { 
-                appenders: ['console'],
-                level:'ALL'
-            },
-            log_file: 
-            { 
-                appenders: ['log_file'],
-                level:'ALL'
-            },
-            log_date: 
-            { 
-                appenders: ['log_date'],
-                level:'ALL'
-            },
-            client_log_file: 
-            { 
-                appenders: ['client_log_file'],
-                level:'ALL'
-            },
-            client_log_date: 
-            { 
-                appenders: ['client_log_date'],
-                level:'ALL'
-            },
-            error_log_file: 
-            { 
-                appenders: ['error_log_file'],
-                level:'ALL'
-            },
-        }
-    }
-    /**
-     * 控制网络消息的
-     */
-    debug_msg=false
-    local_host="127.0.0.1"
-    internet_host="127.0.0.1"
-    db=
-    {
-        redis:
-        {
-            open:false,
-            host:"127.0.0.1",
-            port:6379,
-            database:0,
-            password:null
-        },
-        mongo:
-        <MongoConfig>{
-            open:false,
-            host:"www.eryinet.com",
-            port:27017,
-            options:null,
-            database : 'achat'
-        },
-        mysql:
-        {
-            open     : false,
-            auto     : false,
-            host     : '127.0.0.1',
-            port     : 3306,
-            user     : 'root',
-            password : 'root',
-            database : 'gameall',
-            charset  : 'utf8mb4'
-        },
-        mssql:
-        {
-            open     : false,
-            auto     : false,
-            domain     : '127.0.0.1',
-            port     : 3306,
-            user     : 'root',
-            password : 'root',
-            database : 'gameall',
-            charset  : 'utf8mb4'
-        }
-    }
-    third_cfg=
-    {
-        open_social:
-        {
-            app_id:"appid_42313131",
-            app_secret:"apps_FDS4342J34JL432",
-            auth_url:"http://47.99.195.103:6666/auth/account/",
-            user_url:"http://47.99.195.103:6666/auth/userinfo/",
-            update_pwd_url:"http://47.99.195.103:6666/auth/updatepwd/"
-        },
-        aliSms:
-        {
-            signName:"而已网络",
-            accessKeyId:"LTAIeqjiZ5OCev0B",
-            secretAccessKey:"0w1fmDEORshI94QqtampBaAPQDqUAj",
-            templateCode:"SMS_154589473"
-        },
-        qiniu:
-        {
-            host      : "p0bj0dycx.bkt.clouddn.com",
-            bucket    : "eryiniuniu",
-            accessKey : "OETxflxP9V5ZzPcjE30asCv-YxWBvDpmMPJegtI4",
-            secretKey : "kZWsom120P0-cfQt_9_1-wR_X8RwuLeMXKbU_uc4"
-        },
-        email:
-        {
-            host: "smtp.live.com",
-            port: 587,
-            secure: false, // true for 465, false for other ports
-            auth: 
-            {
-                user: "chengang01@live.com", // generated ethereal user
-                pass: "cg123!@#" // generated ethereal password
-            },
-            from:"OpenSocial <chengang01@live.com>"
-        },
-        qq:
-        {
-            app_id:"101775753",
-            app_key:"753d0f02f3c4093062e7b2f56c7fcb0c",
-            redirect_uri:"http://www.eryinet.com/qq/callback"
-        },
-        wechat:
-        {
-            app_id:"wx80f0f10fe1304e9d",
-            app_key:"a76fc337c49b309886a6538d31c344e2",
-            redirect_uri:"http://www.eryinet.com/wechat/callback"
-        },
-        alipay:
-        {
-            open:false,
-            dev:false,
-            app_id: "",
-            app_key:"",
-            gateway:"",
-            //RSA1 RSA2
-            signType: <'RSA2'|'RSA'>'RSA2',
-            /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
-            keyType: <'PKCS1'|'PKCS8'>'PKCS1',
-            alipay_root_cert_sn:"",
-            alipay_cert_sn:"",
-            app_cert_sn:"",
-            notify_url:"",
-
-            app_id_dev: "",
-            app_key_dev:"",
-            gateway_dev:"",
-            //RSA1 RSA2
-            signType_dev: <'RSA2'|'RSA'>'RSA2',
-            /** 指定private key类型, 默认： PKCS1, PKCS8: PRIVATE KEY, PKCS1: RSA PRIVATE KEY */
-            keyType_dev: <'PKCS1'|'PKCS8'>'PKCS1',
-            alipay_root_cert_sn_dev:"",
-            alipay_cert_sn_dev:"",
-            app_cert_sn_dev:"",
-            notify_url_dev:""
-        },
-        apple:
-        {
-            keyIds:{}
-        },
-        cgmq:<RpcConfig>null
-    }
-    //key是ip，value是domain
-    ip_to_domain={}
-    root_path=process.cwd()
-    constructor()
-    {
-        super("FrameworkConfig")
-    }
-    init()
-    {
-        let ret = super.init()
-        GLog.init(this.log,this.console_level||0)
-        return ret
-    }
-}

package/src/Framework/Config/IServerConfig.ts

@@ -1,28 +0,0 @@
-import { FrameworkConfig } from './FrameworkConfig';
-
-export let GServerCfg:IServerConfig=null
-export class IServerConfig extends FrameworkConfig
-{
-    port=-1
-    protected _server_name=""
-    get serverName()
-    {
-        return this._server_name
-    }
-    constructor(server_name:string)
-    {
-        super()
-        this._suffix=server_name
-        this._server_name = server_name
-    }
-    init()
-    {
-        let ret = super.init()
-        if(!ret)
-        {
-            return ret
-        }
-        GServerCfg=this
-        return ret
-    }
-}

package/src/Framework/Config/_error_.ts

@@ -1,32 +0,0 @@
-export let EErrorCode:FrameworkErrorCode =null
-/**
- * 1-100
- */
-export class FrameworkErrorCode
-{
-    Wrong_Params= { id: 1, des: "参数错误" }
-    Verify_failed= { id: 2, des: "验证失败" }
-    Account_Create_Failed = {id:3,des:"账号创建失败"}
-    User_Create_Failed = {id:4,des:"角色创建失败"}
-    Server_Error = {id:5,des:"服务器内部错误"}
-    No_Account = {id:6,des:"账户不存在"}
-    Mysql_Error = {id:7,des:"数据库异常"}
-    No_Mysql = {id:8,des:"未开通Mysql数据库"}
-    No_Mssql = {id:8,des:"未开通Mssql数据库"}
-    No_User = {id:9,des:"用户不存在"}
-    Account_Phone_Exist = {id:10,des:"电话已存在"}
-    Account_Email_Exist = {id:11,des:"邮箱已存在"}
-    Account_Name_Exist = {id:12,des:"账户名已存在"}
-    Account_Type_Error = {id:13,des:"账户类型错误"}
-    Email_Send_Failed = {id:14,des:"邮件发送失败"}
-    Login_Failed = {id:15,des:"登陆验证失败"}
-    Password_Too_Short = {id:16,des:"密码太短"}
-    Wrong_Phone = {id:17,des:"电话号码不正确"}
-    PhoneCode_Too_Quick = {id:18,des:"验证码获取过快，请稍后再试"}
-    PhoneCode_GetFailed = {id:19,des:"验证码获取失败"}
-    Wrong_Phone_Code = {id:20,des:"验证码不正确"}
-    No_Mongo = {id:21,des:"未开通Mongo数据库"}
-    Mongo_Error = {id:22,des:"Mongo数据库异常"}
-    constructor(){}
-}
-EErrorCode=new FrameworkErrorCode()