HttpSystem

mk_framework/assets/resources/module/load/load.prefab

@@ -13,18 +13,21 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "New Sprite(Splash)",
+    "_name": "load",
     "_objFlags": 0,
     "_parent": null,
-    "_children": [],
-    "_active": true,
-    "_components": [
+    "_children": [
       {
         "__id__": 2
+      },
+      {
+        "__id__": 5
       }
     ],
+    "_active": true,
+    "_components": [],
     "_prefab": {
-      "__id__": 3
+      "__id__": 7
     },
     "_opacity": 255,
     "_color": {
@@ -36,8 +39,72 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 750,
+      "height": 1334
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "背景",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_prefab": {
+      "__id__": 4
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 69,
+      "g": 170,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -78,7 +145,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 1
+      "__id__": 2
     },
     "_enabled": true,
     "_materials": [
@@ -111,7 +178,89 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "62252503-89e0-44ba-aeab-bf0baac4f65a"
+    },
+    "fileId": "ceUXPj1chIxJ4EuDVb0+hr",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "逻辑",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 6
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "62252503-89e0-44ba-aeab-bf0baac4f65a"
+    },
+    "fileId": "efQVwyTkhMY4jCVAZsECCA",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "62252503-89e0-44ba-aeab-bf0baac4f65a"
     },
     "fileId": "",
     "sync": false

mk_framework/assets/script/Main.ts

@@ -8,6 +8,7 @@ export default class main extends cc.Component {
     mainfestUrl: cc.Asset = null;
 
     start() {
+        console.log("init");
         
     }
 }

mk_framework/assets/script/game/data.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "19c3e2cc-636b-4d5c-a9af-651eb6283ab9",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

mk_framework/assets/script/game/data/AppData.ts

@@ -0,0 +1,19 @@
+/**
+ * @description 应用数据
+ * @author 邹勇
+ */
+export class AppData{
+
+    public appVersion:string = '';
+
+    /** 投放渠道号 */
+    public tfChannel:string = '';
+
+    /** api版本 */
+    public version:string = '1.0.0';
+
+    public appId:string = 'wx17e502b5f230fd9a';
+
+    public mac:string = 'c9:65:e2:1c:b0:23,f6:60:e4:1a:b7:27';
+    
+}

mk_framework/assets/script/game/module/game/GameUI.ts.meta → mk_framework/assets/script/game/data/AppData.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.8",
-  "uuid": "587105f5-634e-4457-8278-79815eeae4ac",
+  "uuid": "e27c7fcd-3e58-41c0-ac3f-c6c133648344",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

mk_framework/assets/script/game/data/GameData.ts

@@ -0,0 +1,8 @@
+/**
+ * @description 游戏数据
+ * @author 邹勇
+ */
+export class GameData{
+
+
+}

mk_framework/assets/script/game/module/load/LoadingUI.ts.meta → mk_framework/assets/script/game/data/GameData.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.8",
-  "uuid": "4c5c2129-1f75-46cd-8fe6-196785af6eb5",
+  "uuid": "0d160565-f39b-457e-9790-b088b825d75b",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

mk_framework/assets/script/game/data/HttpData.ts

@@ -0,0 +1,22 @@
+/**
+ * @description 服务器相关数据
+ * @author 邹勇
+ */
+export class HttpData{
+
+    ranKey:string = '';
+
+}
+
+
+export enum ServerUrl{
+    test = '',
+    formal = '',
+    liyang = '',
+    hanguo = '',
+}
+
+/** 向服务器发送数据类型 */
+export enum API {
+    connect = '/connectTest',
+}

mk_framework/assets/script/game/module/game/Test.ts.meta → mk_framework/assets/script/game/data/HttpData.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.8",
-  "uuid": "b0941a02-c4d4-470e-91a5-4f40ca0ca442",
+  "uuid": "f46875c8-1c4d-4f5e-93f9-e8086b5ed327",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

mk_framework/assets/script/game/data/LoginData.ts

@@ -0,0 +1,10 @@
+/**
+ * @description 登录数据
+ * @author 邹勇
+ */
+export class LoginData{
+
+    public sessionKey:string = '';
+
+    public uin:string = '';
+}

mk_framework/assets/script/game/data/LoginData.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "c0582901-3448-4092-a2dc-ffebce11ed33",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

mk_framework/assets/script/game/data/WechatData.ts

@@ -0,0 +1,11 @@
+/**
+ * @description 微信授权数据
+ * @author 邹勇
+ */
+export class WechatData {
+    public code: string;
+    public unionid: string;
+    public nickName: string;
+    public avatar: string;
+    public shareSuccess = false;
+}

mk_framework/assets/script/game/data/WechatData.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "0aab3550-96b6-4c8e-b819-04da7046b32e",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

mk_framework/assets/script/game/data/g.ts

@@ -0,0 +1,37 @@
+import { AppData } from "./AppData";
+import { GameData } from "./GameData";
+import { HttpData } from "./HttpData";
+import { LoginData } from "./LoginData";
+import { WechatData } from "./WechatData";
+
+/**
+ * 数据集合全局类
+ * @description 所有数据都通过这个类创建，修改，删除
+ * @author 邹勇
+ */
+class g {
+    constructor() {
+        this.init();
+    }
+
+    public loginData:LoginData;
+    public appData:AppData;
+    public gameData:GameData;
+    public wechatData:WechatData;
+    public httpData:HttpData;
+
+    init() {
+        this.appData = new AppData();
+        this.loginData = new LoginData();
+        this.gameData = new GameData();
+        this.wechatData = new WechatData();
+        this.httpData = new HttpData();
+
+    }      
+}
+
+declare global {
+    const g: g;
+}
+window['g'] = new g();
+

mk_framework/assets/script/game/data/g.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "ecf8b557-7327-4c26-9f0c-a0ab356c57a9",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

mk_framework/assets/script/game/module/cash.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "42cbe10f-5b94-498a-af86-aa0e72204c7f",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

mk_framework/assets/script/game/module/common.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "311415a3-5342-4e32-abb5-b35907067914",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

mk_framework/assets/script/game/module/load.meta → mk_framework/assets/script/game/module/common/load.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.2",
-  "uuid": "ef019065-4f0e-45f4-9376-e888af8f6b34",
+  "uuid": "e1966dc0-8718-4f4d-aca0-37453fcb2788",
   "isBundle": false,
   "bundleName": "",
   "priority": 1,

mk_framework/assets/script/game/module/common/login.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "002a9026-a6cd-44a1-ab0f-153350b5d5cb",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

mk_framework/assets/script/game/module/common/login/Login.ts

@@ -0,0 +1,36 @@
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class Login extends cc.Component {
+
+    onLoad() {
+        g.wechatData.code = "";
+    }
+
+    start() {
+
+
+    }
+
+
+
+    update() {
+        if (g.wechatData.code) {
+            this.doLogin();
+            g.wechatData.code = null;
+        }
+    }
+
+    private async doLogin(account: string = null, nickName: string = '', avator: string = '') {
+        g.httpData.ranKey = mk.encrypt.randomString();
+        let data = {
+            "mac": g.appData.mac,
+            "psk": g.httpData.ranKey,
+            "appId": g.appData.appId
+        }
+
+        let result = await mk.http.sendRequest( 'POST', JSON.stringify(data));
+        console.log(result);
+    }
+
+}

mk_framework/assets/script/game/module/common/login/Login.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "ca57e3b0-1fb2-48bb-b1d8-072a0adf119f",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

mk_framework/assets/script/game/module/game/GameUI.ts → mk_framework/assets/script/game/module/game/Game.ts

@@ -1,7 +1,7 @@
 const { ccclass, property } = cc._decorator;
 
 @ccclass
-export default class GameUI extends cc.Component {
+export default class Game extends cc.Component {
 
     onLoad(){
         

mk_framework/assets/script/game/module/game/Game.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "8760d418-6ac4-4ec0-b68b-7b589d4d2d3b",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

mk_framework/assets/script/game/module/game/Test.ts

@@ -1,12 +0,0 @@
-
-export default class Test  {
-    constructor(){
-        this.init();
-    }
-    
-    init(){
-        
-        
-    }
-}
-

mk_framework/assets/script/mk/data.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "6b945f70-fbe7-4939-a9c2-5e6135f3f0fc",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

mk_framework/assets/script/mk/data/Data.ts

@@ -0,0 +1,7 @@
+/**
+ * @description 所有数据的基类
+ * @author 邹勇
+ */
+export class Data {
+    
+}

mk_framework/assets/script/mk/data/Data.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "d713e574-86bb-4038-b611-15adf887545f",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

mk_framework/assets/script/mk/system/DataSystem.ts

@@ -7,4 +7,5 @@ export default class DataSystem {
         
     }
 
+    
 }

mk_framework/assets/script/mk/system/HttpSystem.ts

@@ -4,7 +4,116 @@
  */
 export default class HttpSystem {
     constructor() {
-        
     }
 
-}
+    /**
+     * 游戏接口，通用
+     * @param url 接口完整地址
+     * @param data 加密前数据
+     * @param errorPop 请求失败是否弹窗
+     * @param async 是否异步请求（后端要求防阻塞）
+     */
+    public async sendData(url, data: any, errorPop = true, async = true) {
+        let encode = '';
+        let dataN = null;
+        data.timestamp = Math.floor(new Date().getTime() / 1000);
+        data.appVersion = g.appData.appVersion;
+        data.tfChannel = g.appData.tfChannel;
+        data.versioncfg = g.appData.version;
+        encode = mk.encrypt.encrypt(JSON.stringify(data), g.loginData.sessionKey, g.appData.appId);
+        dataN = {
+            "uin": g.loginData.uin,
+            "encrypt": encode
+        }
+        mk.log.log('httpRequest', url, data, dataN);
+        let result = await this.sendRequest(url, 'POST', JSON.stringify(dataN), false, errorPop, async);
+        return this.checkData(result);
+    }
+
+    /**
+     * http请求 登录用
+     * @param url 请求头
+     * @param method 'GET' || 'POST' 
+     * @param data 数据
+     * @param isRsa 是否加密
+     * @param errorPop 请求失败时是否弹窗
+     * @param async 是否异步请求
+     */
+    public sendRequest(url, method: string = 'POST', data: string = null, isRsa: boolean = true, errorPop = true, async = true) {
+        return new Promise<any>((resolve: (data: any) => void, reject) => {
+            let requesttimes = 0;
+            let httpRequest = new XMLHttpRequest();
+            let send = () => {
+                httpRequest.open(method, url, async);
+                httpRequest.setRequestHeader("Content-Type", 'application/json;charset=UTF-8');
+                if (isRsa && data != null) {
+                    data = mk.encrypt.rsaEncrypt(data);
+                }
+                httpRequest.send(data);
+            };
+
+            // httpRequest.timeout = 30000;
+            httpRequest.onreadystatechange = function () {
+                if (httpRequest.readyState === 4) {
+                    if (httpRequest.status === 200) {
+                        var responseStr = httpRequest.responseText;
+                        let response = JSON.parse(responseStr);
+                        response.errorcode = response.errcode;
+                        mk.log.log('httpResponse', url, response);
+                        if (response.errcode == -10003) {
+                            reject(10003);
+                        }
+                        else {
+                            if (response.errcode != 0) {
+                                resolve(response);
+                            }
+                        }
+                    }
+                    else {
+                        mk.log.log("httpRequest.status", httpRequest.status);
+                        reject(httpRequest.status);
+                    }
+                }
+            }
+
+            httpRequest.ontimeout = function (e) {
+                requesttimes++;
+                if (requesttimes >= 3) {
+                    mk.log.log("http.ontimeout", url);
+                    reject("timeout");
+                }
+                else {
+                    send();
+                }
+            };
+            httpRequest.onerror = function (e) {
+                mk.log.log("http.onerror", url);
+                reject("onerror");
+            };
+            send();
+        });
+    }
+
+    /** 
+     * 检测用明文还是密文
+     * @param response 返回消息
+     * @param forceData true 明文  false 有密文优先密文，没密文情况下用明文
+     */
+    checkData(response, forceData = false) {
+        let data = null
+        if (forceData) {
+            data = response.data;
+        }
+        else {
+            if (response.encrypt) {
+                data = mk.encrypt.decrypt(response.encrypt, g.loginData.sessionKey, g.appData.appId);
+                data = JSON.parse(data);
+            }
+            else if (response.data) {
+                data = response.data;
+            }
+        }
+        response.data = data;
+        return response;
+    }
+}

mk_framework/assets/script/mk/system/MKSystem.ts

@@ -5,29 +5,34 @@ import AudioSystem from "./AudioSystem";
 import DataSystem from "./DataSystem";
 import HttpSystem from "./HttpSystem";
 import LoadResUtil from "../utils/LoadResUtil";
+import LogUtil from "../utils/LogUtil";
 import { EncryptUtil } from "../utils/EncryptUtil";
 
-
+/**
+ * @description mk系统
+ * @author 邹勇，冯聪，薛鸿潇，kaka
+ */
 class MKSystem {
     constructor() {
         this.init();
     }
 
     /** 工具 */
-    time: TimeUtil;
-    file: FileUtil;
-    loadRes:LoadResUtil;
-    encrypt:EncryptUtil;
+    public time: TimeUtil;
+    public file: FileUtil;
+    public loadRes: LoadResUtil;
+    public encrypt: EncryptUtil;
+    public log: LogUtil;
 
     /** SDK */
-    bugly:BuglySDK;
-    
+    public bugly: BuglySDK;
+
 
     /** 系统管理 */
-    loader: LoadResUtil;
-    data:DataSystem;
-    http:HttpSystem;
-    audio:AudioSystem;
+    public loader: LoadResUtil;
+    public data: DataSystem;
+    public http: HttpSystem;
+    public audio: AudioSystem;
 
     init() {
         //工具
@@ -35,6 +40,7 @@ class MKSystem {
         this.file = new FileUtil();
         this.loader = new LoadResUtil();
         this.encrypt = new EncryptUtil();
+        this.log = new LogUtil();
 
         //sdk
         this.bugly = new BuglySDK();

mk_framework/assets/script/mk/utils/EncryptUtil.ts

@@ -3,7 +3,7 @@ import * as CryptoJS from "./encrypt/aes.js"
 
 /**
  * 加密解密工具类
- * @author zy
+ * @author 邹勇
  */
 export class EncryptUtil {
 

mk_framework/assets/script/mk/utils/FileUtil.ts

@@ -1,7 +1,7 @@
 
-/**s
+/**
  * 文件操作工具类
- * @author xhx
+ * @author 薛鸿潇
  */
 export default class FileUtil {