login

mk_framework/assets/script/game/module/common/login.meta → mk_framework/assets/resources/data.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.2",
-  "uuid": "002a9026-a6cd-44a1-ab0f-153350b5d5cb",
+  "uuid": "5c55b0b0-69ed-4e69-8e4a-02b516bf2421",
   "isBundle": false,
   "bundleName": "",
   "priority": 1,

mk_framework/assets/resources/data/openfun_data.json

@@ -0,0 +1,90 @@
+{
+	"1": {
+		"id": 1,
+		"name": "统帅台",
+		"openmission": 5,
+		"btn_src": "btn_marshalstage",
+		"uiID": 1,
+		"ui_src": "MarshalStageUI"
+	},
+	"2": {
+		"id": 2,
+		"name": "兵营",
+		"openmission": 1,
+		"btn_src": "btn_barracks",
+		"uiID": 2,
+		"ui_src": "barracksUI"
+	},
+	"3": {
+		"id": 3,
+		"name": "武将",
+		"openmission": 2,
+		"btn_src": "btn_general",
+		"uiID": 3,
+		"ui_src": "GeneralUI"
+	},
+	"4": {
+		"id": 4,
+		"name": "日常任务",
+		"openmission": 3,
+		"btn_src": "btn_task",
+		"uiID": 4,
+		"ui_src": "TaskUI"
+	},
+	"5": {
+		"id": 5,
+		"name": "点将台",
+		"openmission": 4,
+		"btn_src": "btn_getgeneral",
+		"uiID": 5,
+		"ui_src": "DrawRecruitUI"
+	},
+	"6": {
+		"id": 6,
+		"name": "转盘",
+		"openmission": 1,
+		"btn_src": "btn_turntable",
+		"uiID": 6,
+		"ui_src": "turntableUI"
+	},
+	"7": {
+		"id": 7,
+		"name": "投资",
+		"openmission": 1,
+		"uiID": 7
+	},
+	"8": {
+		"id": 8,
+		"name": "存钱罐",
+		"openmission": 1,
+		"btn_src": "btn_piggyback",
+		"uiID": 8,
+		"ui_src": "PiggyBankUI"
+	},
+	"9": {
+		"id": 9,
+		"name": "通关红包",
+		"openmission": 1,
+		"btn_src": "btn_chPo_RedBag",
+		"uiID": 9
+	},
+	"10": {
+		"id": 10,
+		"name": "训练",
+		"openmission": 1,
+		"btn_src": "btn3",
+		"uiID": 10
+	},
+	"11": {
+		"id": 11,
+		"name": "观看视频广告",
+		"openmission": 1,
+		"uiID": 11
+	},
+	"12": {
+		"id": 12,
+		"name": "使用统帅技能",
+		"openmission": 41,
+		"uiID": 12
+	}
+}

mk_framework/assets/resources/data/openfun_data.json.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.0",
+  "uuid": "fae2187c-ba57-47ff-9339-5bfff0a55168",
+  "subMetas": {}
+}

mk_framework/assets/resources/prefab.meta → mk_framework/assets/resources/game.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.2",
-  "uuid": "4d9a253f-13d7-44fd-80fb-6f94c42c2657",
+  "uuid": "c873fa74-25f1-4900-ba54-7971a0652801",
   "isBundle": false,
   "bundleName": "",
   "priority": 1,

mk_framework/assets/resources/prefab/uiPanel/login.prefab → mk_framework/assets/resources/game/uiPanel/login.prefab

@@ -22,16 +22,19 @@
       },
       {
         "__id__": 5
+      },
+      {
+        "__id__": 8
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 7
+        "__id__": 10
       }
     ],
     "_prefab": {
-      "__id__": 8
+      "__id__": 11
     },
     "_opacity": 255,
     "_color": {
@@ -189,6 +192,113 @@
   },
   {
     "__type__": "cc.Node",
+    "_name": "bg_main",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 6
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "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.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 5
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "0b9148fc-0951-469d-8696-57c6d27ed5b9"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "62252503-89e0-44ba-aeab-bf0baac4f65a"
+    },
+    "fileId": "aetMW6X7JPv4Z6HIRvK41I",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
     "_name": "逻辑",
     "_objFlags": 0,
     "_parent": {
@@ -198,7 +308,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 6
+      "__id__": 9
     },
     "_opacity": 255,
     "_color": {
@@ -259,7 +369,7 @@
     "sync": false
   },
   {
-    "__type__": "ca57eOwH7JIu7HYByoK3xGf",
+    "__type__": "b20adIDCBNOS6FUUweuIhc+",
     "_name": "",
     "_objFlags": 0,
     "node": {

mk_framework/assets/resources/module/login/1.txt.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.0.0",
-  "uuid": "9690d210-3d7e-46e8-ad88-db732c94868d",
-  "subMetas": {}
-}

mk_framework/assets/resources/module/login/bg_main.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "544b79bc-5c87-4e03-9ba2-15212381ea36",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 750,
+  "height": 1334,
+  "platformSettings": {},
+  "subMetas": {
+    "bg_main": {
+      "ver": "1.0.4",
+      "uuid": "0b9148fc-0951-469d-8696-57c6d27ed5b9",
+      "rawTextureUuid": "544b79bc-5c87-4e03-9ba2-15212381ea36",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 750,
+      "height": 1334,
+      "rawWidth": 750,
+      "rawHeight": 1334,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

mk_framework/assets/scene/MainScene.fire

@@ -17,7 +17,7 @@
         "__id__": 2
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [],
     "_prefab": null,
     "_opacity": 255,

mk_framework/assets/script/Main.ts

@@ -11,6 +11,6 @@ export default class Main extends cc.Component {
 
     start() {
         console.log("init");
-        mk.ui.openPanel("login");
+        // mk.ui.openPanel("login");
     }
 }

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

@@ -4,6 +4,9 @@
  */
 export class AppData{
 
+    /** 错误日志游戏名标志,尽量短 */
+    public appNameBugly:string = '3xiao';
+
     public appVersion:string = '';
 
     /** 投放渠道号 */

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

@@ -4,14 +4,23 @@
  */
 export class GameData {
 
-    public dataFinish:boolean = false;
+    public dataFinish: boolean = false;
 
 
     public async init() {
-        let data = { "versionCode": g.appData.version };
-        let response = await mk.http.sendData('getAllConfigInfo', JSON.stringify(data));
+        let data: any = { "versionCode": g.appData.version };
+        let response = await mk.http.sendData('getAllConfigInfo', data);
         if (response.errcode != 0) {
             return;
         }
+
+        data = {};
+        response = await mk.http.sendData('getInfoCrypt', data);
+        if (response.errcode != 0) {
+            return;
+        }
+
+        
+        this.dataFinish = true;
     }
 }

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

@@ -1,195 +0,0 @@
-import { StorageKey } from "./StorageData";
-
-/**
- * @description 登录数据
- * @author 邹勇
- */
-export class LoginData {
-
-    /** 是否登录 */
-    public isLogin: boolean = false;
-
-    public sessionKey: string = '';
-
-    /** 玩家唯一id */
-    public uin: string = '';
-
-    /** 玩家临时id */
-    public tempUin: string = '';
-
-    public loginTicket: string = '';
-
-    public isFirstIn: boolean;
-
-    public isNew: boolean;
-
-    /** 是否授权 */
-    public isAuth: boolean;
-
-
-
-    /**
-     * 登录流程 initApp-->initAd-->connect-->wxLogin-->checkLogin-->getAccountInfo
-     */
-    public async login() {
-        this.isLogin = true;
-        g.appData.init();
-        g.adData.init();
-
-        //有登录记录直接跳转到登录流程最后一步
-        if (this.sessionKey != '' && this.uin != '') {
-            this.getAccountInfo();
-            return;
-        }
-
-        let ranKey = mk.encrypt.randomString();
-        let data: any = {
-            "mac": g.appData.mac,
-            "psk": ranKey,
-            "appId": g.appData.appId
-        }
-
-        //connect
-        let response = await mk.http.sendRequest('connectTest', 'POST', JSON.stringify(data));
-        if (response.errcode != 0) {
-            return;
-        }
-        data = mk.encrypt.decrypt(response.encrypt, ranKey, g.appData.appId);
-        this.tempUin = JSON.parse(data).tmp_uin;
-
-        //wxLogin
-        let encode;
-        if (g.wechatData.code != null) {//微信登录
-            encode = mk.encrypt.encrypt(JSON.stringify({ "code": g.wechatData.code }), this.sessionKey, g.appData.appId);
-            data = {
-                "uin": this.uin,
-                "encrypt": encode
-            };
-        }
-        else {//游客登录
-            encode = mk.encrypt.encrypt(JSON.stringify({ "code": g.wechatData.code }), ranKey, g.appData.appId);
-            data = {
-                "uin": this.tempUin,
-                "encrypt": encode
-            };
-        }
-        response = await mk.http.sendRequest('wxlogin', 'POST', JSON.stringify(data), false, false);
-        if (response.errcode != 0) {
-            return;
-        }
-        if (g.wechatData.code != null) {
-            data = mk.encrypt.decrypt(response.encrypt, this.sessionKey, g.appData.appId);
-        }
-        else {
-            data = mk.encrypt.decrypt(response.encrypt, ranKey, g.appData.appId);
-        }
-        data = JSON.parse(data);
-        this.loginTicket = data.login_ticket;
-        mk.storage.setStorage(StorageKey.loginTicket, this.loginTicket);
-
-        let isFirstIn = mk.storage.getStorage('isFirstIn');
-        if (isFirstIn == null) {
-            this.isFirstIn = true;
-            mk.storage.setStorage(StorageKey.isFirstIn, 1);
-        }
-
-        if (this.uin != data.uin) {
-            this.uin = data.uin;
-            this.isNew = false;
-        }
-        else {
-            this.isNew = true;
-        }
-        mk.storage.setStorage('uin', this.uin);
-
-        //checkLogin
-        let tmp_key = '';
-        if (g.wechatData.code != null) {
-            tmp_key = this.sessionKey;
-        }
-        else {
-            tmp_key = mk.encrypt.randomString();
-        }
-
-        data = {
-            "tmp_key": tmp_key,
-            "uin": this.uin,
-            "login_ticket": this.loginTicket,
-            "appId": g.appData.appId
-        }
-        response = await mk.http.sendRequest('checklogin', 'POST', JSON.stringify(data));
-        if (response.errcode != 0) {
-            return;
-        }
-        if (g.wechatData.code != null) {
-            data = mk.encrypt.decrypt(response.encrypt, this.sessionKey, g.appData.appId);
-        }
-        else {
-            data = mk.encrypt.decrypt(response.encrypt, tmp_key, g.appData.appId);
-        }
-
-        data = JSON.parse(data);
-        this.sessionKey = data.session_key;
-
-        mk.storage.setStorage('sessionKey', this.sessionKey);
-
-        if (g.wechatData.code != null) {
-            if (this.isNew) {//玩过此游戏并且本地数据是本机的
-                this.getAccountInfo();
-            }
-            else {//玩过此游戏 但 本地数据不是本账户的 清空数据 重新登录游戏
-                this.isNew = false;
-                g.wechatData.code = null;
-                this.reload();
-            }
-        }
-        else {
-            this.getAccountInfo();
-        }
-    }
-
-    private async getAccountInfo() {
-        let nickname = mk.storage.getStorage(StorageKey.nickname);
-        if (nickname) {
-            g.wechatData.nickName = nickname;
-        }
-        else {
-            let aa = {
-                "uin": this.uin,
-                "login_ticket": this.loginTicket
-            };
-
-            let data: any = {
-                "uin": this.uin,
-                "encrypt": mk.encrypt.encrypt(JSON.stringify(aa), this.sessionKey, g.appData.appId)
-            };
-
-            let response = await mk.http.sendRequest('user', 'POST', JSON.stringify(data), false, false);
-            if (response.errcode != 0) {
-                return;
-            }
-            response = mk.http.checkData(response, true);
-            data = response.data;
-            this.isAuth = data.is_auth;
-            if (this.isAuth) {
-                g.wechatData.nickName = data.nickname;
-                g.wechatData.avatar = data.headimgurl;
-                mk.storage.setStorage(StorageKey.isAuth, 1);
-                mk.storage.setStorage(StorageKey.nickname, g.wechatData.nickName, false);
-                mk.storage.setStorage(StorageKey.avatar, g.wechatData.avatar, false);
-            }
-        }
-
-        //获取游戏数据
-        g.gameData.init();
-    }
-
-
-
-    /**
-     * 本地数据不是本账户的 清空数据 重新登录游戏
-     */
-    private reload() {
-
-    }
-}

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

@@ -2,7 +2,7 @@ import { AdData } from "./AdData";
 import { AppData } from "./AppData";
 import { GameData } from "./GameData";
 import { HttpData } from "./HttpData";
-import { LoginData } from "./LoginData";
+import { LoginData } from "../../../resources/module/login/LoginData";
 import { StorageData } from "./StorageData";
 import { WechatData } from "./WechatData";
 

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

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "97685370-d376-41eb-99f8-5775644bb3c7",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

mk_framework/assets/script/game/data/module/SignData.ts

@@ -0,0 +1,8 @@
+/**
+ * @description 签到数据
+ * @author 邹勇
+ */
+ export class SignData{
+
+    
+}

mk_framework/assets/script/game/data/LoginData.ts.meta → mk_framework/assets/script/game/data/module/SignData.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.8",
-  "uuid": "c0582901-3448-4092-a2dc-ffebce11ed33",
+  "uuid": "b2ee5f01-8891-4652-89b7-10928dba9552",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

mk_framework/assets/script/game/data/module/TurnableData.ts

@@ -0,0 +1,8 @@
+/**
+ * @description 转盘数据
+ * @author 邹勇
+ */
+ export class TurnableData{
+
+    
+}

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

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.8",
-  "uuid": "ca57e3b0-1fb2-48bb-b1d8-072a0adf119f",
+  "uuid": "43e37562-ad10-4cd6-9dfd-2d4123613487",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

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

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "78c79a46-c440-4e5b-b8e4-f1a8aabb3092",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

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

@@ -1,26 +0,0 @@
-const { ccclass, property } = cc._decorator;
-
-@ccclass
-export default class Login extends cc.Component {
-
-    onLoad() {
-        
-    }
-
-    start() {
-
-
-    }
-
-
-
-    update() {
-        if (!g.loginData.isLogin) {
-            g.loginData.login();
-        }
-        if(g.gameData.dataFinish){//登录流程完毕
-            console.log('isLoginSuccess...');
-            this.destroy();
-        }
-    }
-}

mk_framework/assets/script/mk/sdk/BuglySDK.ts

@@ -92,13 +92,11 @@ export default class BuglySDK {
         }
 
         // 拼接服务类型（0测试服 1测试服）和 玩家uin 
-        let uin = ''
-        // 项目标签，尽量短
-        let gamename = 'tower';
+        let uin = g.httpData.serverType + ":" + g.loginData.uin;
 
         let senddata = {
             "level": "error",
-            "game": gamename + ":" + uin,
+            "game": g.appData.appNameBugly + ":" + uin,
             "message": d
         };