Merge branch 'master' of http://git.mokasz.com/zouyong/mk_framework

mk_framework/assets/resources/data/openfun_data.json

@@ -1,90 +1,14 @@
 {
 	"1": {
 		"id": 1,
-		"name": "统帅台",
-		"openmission": 5,
-		"btn_src": "btn_marshalstage",
-		"uiID": 1,
-		"ui_src": "MarshalStageUI"
+		"name": "存钱罐",
+		"btn_src": "btn1",
+		"ui_src": "PigBank"
 	},
 	"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
+		"btn_src": "btn2",
+		"ui_src": "Turnable"
 	}
 }

mk_framework/assets/resources/game/prefab/game.prefab

@@ -28,9 +28,13 @@
       }
     ],
     "_active": true,
-    "_components": [],
+    "_components": [
+      {
+        "__id__": 26
+      }
+    ],
     "_prefab": {
-      "__id__": 10
+      "__id__": 27
     },
     "_opacity": 255,
     "_color": {
@@ -264,15 +268,28 @@
     "_parent": {
       "__id__": 1
     },
-    "_children": [],
+    "_children": [
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 18
+      },
+      {
+        "__id__": 21
+      }
+    ],
     "_active": true,
     "_components": [
       {
-        "__id__": 8
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 25
     },
     "_opacity": 255,
     "_color": {
@@ -322,13 +339,507 @@
     "_id": ""
   },
   {
-    "__type__": "46939WkYTVBy5tYd9w+8wUB",
+    "__type__": "cc.Node",
+    "_name": "btn1",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 7
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 10
+      }
+    ],
+    "_prefab": {
+      "__id__": 12
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 80,
+      "height": 79
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        294.11,
+        23.634,
+        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__": 8
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "938bb313-6506-4378-92b3-c0cba3f80153"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "b8d2cnq+GZLFK30xbLDqr/m",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "panel_name": "pigBank",
+    "open_type": 0,
+    "panel_type": 2,
+    "onComplete": {
+      "__id__": 11
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": null,
+    "component": "",
+    "_componentId": "",
+    "handler": "",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
+    },
+    "fileId": "26f7oDYUlAwJGa8O5zPqy7",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btn2",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 7
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 15
+      }
+    ],
+    "_prefab": {
+      "__id__": 17
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 80,
+      "height": 79
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        294.11,
+        -81.406,
+        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__": 13
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "c18d4ba7-f7e7-41a3-845f-cc1f3cbe6ebf"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "b8d2cnq+GZLFK30xbLDqr/m",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 13
+    },
+    "_enabled": true,
+    "panel_name": "turnable",
+    "open_type": 0,
+    "panel_type": 2,
+    "onComplete": {
+      "__id__": 16
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": null,
+    "component": "",
+    "_componentId": "",
+    "handler": "",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
+    },
+    "fileId": "6ai1KK3EZOOo3tsgUc/hIs",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btn3",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 7
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 19
+      }
+    ],
+    "_prefab": {
+      "__id__": 20
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 80,
+      "height": 79
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        286.232,
+        -199.575,
+        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__": 18
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "742e9fc6-2059-4fae-a8ce-d1c8dcefa78e"
+    },
+    "_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__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
+    },
+    "fileId": "dc8E3b0UlJ7IEISy/txUOM",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btn4",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 7
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 22
+      }
+    ],
+    "_prefab": {
+      "__id__": 23
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 80,
+      "height": 79
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        288.858,
+        -309.866,
+        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__": 21
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "c53d92da-02b7-4ea1-9d09-e0c26277ea0a"
+    },
+    "_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__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
+    },
+    "fileId": "a1mRWcJ/NBGLazviqsh0vO",
+    "sync": false
+  },
+  {
+    "__type__": "3bf10Wxox5IQLcQoa17hGCb",
     "_name": "",
     "_objFlags": 0,
     "node": {
       "__id__": 7
     },
     "_enabled": true,
+    "btn1": {
+      "__id__": 8
+    },
+    "btn2": {
+      "__id__": 13
+    },
+    "btn3": {
+      "__id__": 18
+    },
+    "btn4": {
+      "__id__": 21
+    },
     "_id": ""
   },
   {
@@ -343,6 +854,22 @@
     "sync": false
   },
   {
+    "__type__": "8760dQYasROwLaLe1idTS07",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "node_game": {
+      "__id__": 5
+    },
+    "node_btn": {
+      "__id__": 7
+    },
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

mk_framework/assets/resources/game/texture/btn.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "904a1b27-a3e6-44a0-a74f-fbf1f2ee4e88",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

mk_framework/assets/resources/game/texture/icon_circle.png.meta → mk_framework/assets/resources/game/texture/btn/btn1.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.5",
-  "uuid": "a502b798-831b-406b-95af-04a460add5dc",
+  "uuid": "76bc7ed8-3dfe-4c89-8878-a829444f3364",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -11,10 +11,10 @@
   "height": 84,
   "platformSettings": {},
   "subMetas": {
-    "icon_circle": {
+    "btn1": {
       "ver": "1.0.4",
-      "uuid": "30d93536-d53e-4466-94c1-d2056cca405c",
-      "rawTextureUuid": "a502b798-831b-406b-95af-04a460add5dc",
+      "uuid": "938bb313-6506-4378-92b3-c0cba3f80153",
+      "rawTextureUuid": "76bc7ed8-3dfe-4c89-8878-a829444f3364",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

mk_framework/assets/resources/game/texture/btn/btn2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "807d6ca5-7698-430d-916d-b214abe06d7a",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 84,
+  "height": 84,
+  "platformSettings": {},
+  "subMetas": {
+    "btn2": {
+      "ver": "1.0.4",
+      "uuid": "c18d4ba7-f7e7-41a3-845f-cc1f3cbe6ebf",
+      "rawTextureUuid": "807d6ca5-7698-430d-916d-b214abe06d7a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -0.5,
+      "trimX": 2,
+      "trimY": 3,
+      "width": 80,
+      "height": 79,
+      "rawWidth": 84,
+      "rawHeight": 84,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

mk_framework/assets/resources/game/texture/btn/btn3.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "b25e7d8c-8bfc-4a86-a3a0-ef743241a5e0",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 84,
+  "height": 84,
+  "platformSettings": {},
+  "subMetas": {
+    "btn3": {
+      "ver": "1.0.4",
+      "uuid": "742e9fc6-2059-4fae-a8ce-d1c8dcefa78e",
+      "rawTextureUuid": "b25e7d8c-8bfc-4a86-a3a0-ef743241a5e0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -0.5,
+      "trimX": 2,
+      "trimY": 3,
+      "width": 80,
+      "height": 79,
+      "rawWidth": 84,
+      "rawHeight": 84,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

mk_framework/assets/resources/game/texture/btn/btn4.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "3b77b18c-e483-4000-b398-5f4692d17efa",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 84,
+  "height": 84,
+  "platformSettings": {},
+  "subMetas": {
+    "btn4": {
+      "ver": "1.0.4",
+      "uuid": "c53d92da-02b7-4ea1-9d09-e0c26277ea0a",
+      "rawTextureUuid": "3b77b18c-e483-4000-b398-5f4692d17efa",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -0.5,
+      "trimX": 2,
+      "trimY": 3,
+      "width": 80,
+      "height": 79,
+      "rawWidth": 84,
+      "rawHeight": 84,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

mk_framework/assets/resources/module/login/login.prefab

@@ -22,7 +22,11 @@
       }
     ],
     "_active": true,
-    "_components": [],
+    "_components": [
+      {
+        "__id__": 5
+      }
+    ],
     "_prefab": {
       "__id__": 6
     },
@@ -85,13 +89,10 @@
     "_components": [
       {
         "__id__": 3
-      },
-      {
-        "__id__": 4
       }
     ],
     "_prefab": {
-      "__id__": 5
+      "__id__": 4
     },
     "_opacity": 255,
     "_color": {
@@ -173,16 +174,6 @@
     "_id": ""
   },
   {
-    "__type__": "6dba2tWf41JpYkegatfLoGC",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "_id": ""
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -194,6 +185,16 @@
     "sync": false
   },
   {
+    "__type__": "6dba2tWf41JpYkegatfLoGC",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

mk_framework/assets/resources/module/login/texture.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "c085df70-1a99-4b68-bf6c-2d9c9594d759",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

mk_framework/assets/resources/module/login/texture/logo.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "b6108cc0-6beb-4706-97dc-4756a95bf0d7",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 533,
+  "height": 355,
+  "platformSettings": {},
+  "subMetas": {
+    "logo": {
+      "ver": "1.0.4",
+      "uuid": "08cd98e8-cbd9-44c8-8cb6-09609780aa3c",
+      "rawTextureUuid": "b6108cc0-6beb-4706-97dc-4756a95bf0d7",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 533,
+      "height": 355,
+      "rawWidth": 533,
+      "rawHeight": 355,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

mk_framework/assets/resources/module/login/texture/progress-1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "458dfeda-5c40-4041-892f-33847e29c2e3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 467,
+  "height": 28,
+  "platformSettings": {},
+  "subMetas": {
+    "progress-1": {
+      "ver": "1.0.4",
+      "uuid": "c435fac0-5c67-4e5f-8047-0310835faec9",
+      "rawTextureUuid": "458dfeda-5c40-4041-892f-33847e29c2e3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 467,
+      "height": 28,
+      "rawWidth": 467,
+      "rawHeight": 28,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

mk_framework/assets/resources/module/turnable.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "aae12169-c350-4524-9c55-1ce8e82862f4",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

mk_framework/assets/resources/module/turnable/texture.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "f8fd8bf9-c002-48a5-ba5c-289a3a9aaff0",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

mk_framework/assets/resources/module/turnable/texture/button_cj.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "ca3c65ee-1120-4571-95fb-e55e7b4c0d3b",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 254,
+  "height": 215,
+  "platformSettings": {},
+  "subMetas": {
+    "button_cj": {
+      "ver": "1.0.4",
+      "uuid": "d6519290-a9f6-43a2-b014-c5abd08e288b",
+      "rawTextureUuid": "ca3c65ee-1120-4571-95fb-e55e7b4c0d3b",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 254,
+      "height": 215,
+      "rawWidth": 254,
+      "rawHeight": 215,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

mk_framework/assets/resources/module/turnable/texture/button_cj2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "1012d5c4-f1f7-4750-b712-9f619f8086ac",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 254,
+  "height": 180,
+  "platformSettings": {},
+  "subMetas": {
+    "button_cj2": {
+      "ver": "1.0.4",
+      "uuid": "dfaf8a03-105e-41b3-a8fe-daacc83a784c",
+      "rawTextureUuid": "1012d5c4-f1f7-4750-b712-9f619f8086ac",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 254,
+      "height": 180,
+      "rawWidth": 254,
+      "rawHeight": 180,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

mk_framework/assets/resources/module/turnable/texture/button_gz.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "b6c76d94-c510-41df-8605-03738ce46ed1",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 72,
+  "height": 52,
+  "platformSettings": {},
+  "subMetas": {
+    "button_gz": {
+      "ver": "1.0.4",
+      "uuid": "3b256ab4-47de-4a50-ae70-f9a52085127a",
+      "rawTextureUuid": "b6c76d94-c510-41df-8605-03738ce46ed1",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 72,
+      "height": 52,
+      "rawWidth": 72,
+      "rawHeight": 52,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

mk_framework/assets/resources/module/turnable/texture/hb.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "d1138ae1-71d5-4878-9026-8eb8c586d8f4",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 94,
+  "platformSettings": {},
+  "subMetas": {
+    "hb": {
+      "ver": "1.0.4",
+      "uuid": "90285806-551f-49ec-af5b-d8aea2c938b4",
+      "rawTextureUuid": "d1138ae1-71d5-4878-9026-8eb8c586d8f4",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 128,
+      "height": 94,
+      "rawWidth": 128,
+      "rawHeight": 94,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

mk_framework/assets/resources/module/turnable/texture/hb1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "c3a47565-5bb0-4ff0-a441-653ab3d58c83",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 74,
+  "height": 94,
+  "platformSettings": {},
+  "subMetas": {
+    "hb1": {
+      "ver": "1.0.4",
+      "uuid": "62ea210d-7b98-4731-8cc9-607c79a69ff9",
+      "rawTextureUuid": "c3a47565-5bb0-4ff0-a441-653ab3d58c83",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 74,
+      "height": 94,
+      "rawWidth": 74,
+      "rawHeight": 94,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

mk_framework/assets/resources/module/turnable/texture/hb2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "65373e44-58b4-41c2-ba91-9532134b3f44",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 94,
+  "height": 101,
+  "platformSettings": {},
+  "subMetas": {
+    "hb2": {
+      "ver": "1.0.4",
+      "uuid": "539468e0-0f49-438b-962a-c9481e83e6e1",
+      "rawTextureUuid": "65373e44-58b4-41c2-ba91-9532134b3f44",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 94,
+      "height": 101,
+      "rawWidth": 94,
+      "rawHeight": 101,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

mk_framework/assets/resources/module/turnable/texture/icon_tv.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "b107e03a-05a0-45c8-ba87-524d0da0cd0b",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 36,
+  "height": 42,
+  "platformSettings": {},
+  "subMetas": {
+    "icon_tv": {
+      "ver": "1.0.4",
+      "uuid": "aa715f51-3a3a-4456-b969-1635e34f0e94",
+      "rawTextureUuid": "b107e03a-05a0-45c8-ba87-524d0da0cd0b",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 36,
+      "height": 42,
+      "rawWidth": 36,
+      "rawHeight": 42,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

mk_framework/assets/resources/module/turnable/texture/panda.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "69fc51a4-3fc8-4ad1-a009-2c33804a472b",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 208,
+  "height": 236,
+  "platformSettings": {},
+  "subMetas": {
+    "panda": {
+      "ver": "1.0.4",
+      "uuid": "1c8ef3af-2e94-4009-a6b1-bf652db240ba",
+      "rawTextureUuid": "69fc51a4-3fc8-4ad1-a009-2c33804a472b",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 208,
+      "height": 236,
+      "rawWidth": 208,
+      "rawHeight": 236,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

mk_framework/assets/resources/module/turnable/texture/title.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "5fa7498c-5e55-429a-8394-a52e54bf4f46",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 429,
+  "height": 115,
+  "platformSettings": {},
+  "subMetas": {
+    "title": {
+      "ver": "1.0.4",
+      "uuid": "f93f33cd-972d-4726-8699-aad4ef6e1c12",
+      "rawTextureUuid": "5fa7498c-5e55-429a-8394-a52e54bf4f46",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 429,
+      "height": 115,
+      "rawWidth": 429,
+      "rawHeight": 115,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

mk_framework/assets/resources/module/turnable/texture/zhizheng.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "50a1979e-8057-4ed7-bc97-66d79b9bca8f",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 84,
+  "height": 117,
+  "platformSettings": {},
+  "subMetas": {
+    "zhizheng": {
+      "ver": "1.0.4",
+      "uuid": "f2afc57a-70f3-44e1-9270-d0333cf80520",
+      "rawTextureUuid": "50a1979e-8057-4ed7-bc97-66d79b9bca8f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 84,
+      "height": 117,
+      "rawWidth": 84,
+      "rawHeight": 117,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

mk_framework/assets/resources/module/turnable/texture/zhuanpan.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "ffa3f763-91d1-4ea0-9aeb-10178b664ac5",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 672,
+  "height": 672,
+  "platformSettings": {},
+  "subMetas": {
+    "zhuanpan": {
+      "ver": "1.0.4",
+      "uuid": "c4364493-c192-4215-9712-91bf892de334",
+      "rawTextureUuid": "ffa3f763-91d1-4ea0-9aeb-10178b664ac5",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 672,
+      "height": 672,
+      "rawWidth": 672,
+      "rawHeight": 672,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

mk_framework/assets/resources/module/turnable/turnable.prefab

@@ -0,0 +1,207 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "login",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_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.Node",
+    "_name": "背景",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      }
+    ],
+    "_prefab": {
+      "__id__": 5
+    },
+    "_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__": 2
+    },
+    "_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__": "6dba2tWf41JpYkegatfLoGC",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
+    },
+    "fileId": "bdEW6BsetPLqcZkJCdiJgS",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

mk_framework/assets/resources/module/turnable/turnable.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "18e0b7f8-059f-4a52-9e57-690fe778a31a",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

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

@@ -4,15 +4,24 @@
  */
 export class GameData {
 
+
     public dataFinish: boolean = false;
 
+    
+    public configs:any = {};
+
 
+    /**
+     * 初始化游戏数据：网络配置信息，用户信息
+     * @returns 
+     */
     public async init() {
         let data: any = { "versionCode": g.appData.version };
         let response = await mk.http.sendData('getAllConfigInfo', data);
         if (response.errcode != 0) {
             return;
         }
+        this.configs = response.data;
 
         data = {};
         response = await mk.http.sendData('getInfoCrypt', data);
@@ -23,4 +32,18 @@ export class GameData {
         
         this.dataFinish = true;
     }
+
+    /**
+     * 保存数据
+     */
+    public async saveProps(){
+
+    }
+}
+
+/**
+ * 核心玩法游戏数据
+ */
+export enum GameProp{
+    
 }

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

@@ -25,13 +25,8 @@ export class HttpData {
 
 
 export enum ServerUrl {
-    test = 'https://tafang-test.duiweize.com/',
-    formal = '',
-    liyang = 'http://172.16.15.231:9092/',
-    hanguo = 'http://172.16.15.167:9092/',
-}
-
-/** 向服务器发送数据类型 */
-export enum API {
-    connect = '/connectTest',
+    test = 'https://tafang-test.duiweize.com/', //测试服地址
+    formal = '',    //正式服地址
+    liyang = 'http://172.16.15.231:9092/',  //李杨服地址
+    hanguo = 'http://172.16.15.167:9092/',  //悍国服地址
 }

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

@@ -6,6 +6,8 @@ import { StorageKey } from "./StorageData";
  */
 export class LoginData {
 
+    public loadResCompelete:boolean = false;
+
     /** 是否登录 */
     public isLogin: boolean = false;
 
@@ -29,6 +31,15 @@ export class LoginData {
 
 
     /**
+     * 初始化本地配置
+     * @returns 
+     */
+     public loadLocalRes(){
+        
+        this.loadResCompelete = true;
+    }
+
+    /**
      * 登录流程 initApp-->initAd-->connect-->wxLogin-->checkLogin-->getAccountInfo
      */
     public async login() {

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

@@ -8,7 +8,9 @@ export class StorageData {
     public storageKey: string = 'wewishyouamerrychristmaswithout996';
 }
 
-
+/**
+ * 常用的 本地缓存
+ */
 export enum StorageKey{
     loginTicket = 'loginTicket',
     isFirstIn = 'isFirstIn',

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

@@ -1,3 +1,4 @@
+import { Data } from "../../mk/data/Data";
 import { AdData } from "./AdData";
 import { AppData } from "./AppData";
 import { GameData } from "./GameData";
@@ -24,6 +25,8 @@ class g {
     public adData:AdData;
     public storageData:StorageData;
 
+    private moduleDataMap:Map<string,Data>;
+
     init() {
         this.appData = new AppData();
         this.loginData = new LoginData();
@@ -32,7 +35,17 @@ class g {
         this.httpData = new HttpData();
         this.adData = new AdData();
         this.storageData = new StorageData();
-    }      
+    } 
+
+    public initModuleData(data){
+        this.moduleDataMap = new Map<string,Data>();
+        
+        for
+    }
+    
+    getModuleData(key:string){
+
+    }
 }
 
 declare global {

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

@@ -0,0 +1,32 @@
+import BtnOpenPanel from "../../component/BtnOpenPanel";
+
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class FunBtns extends cc.Component {
+    @property({ type: cc.Node, displayName: "存钱罐" })
+    btn1: cc.Node = null;
+    @property({ type: cc.Node, displayName: "转盘" })
+    btn2: cc.Node = null;
+    @property({ type: cc.Node, displayName: "签到" })
+    btn3: cc.Node = null;
+    @property({ type: cc.Node, displayName: "提现" })
+    btn4: cc.Node = null;
+
+    onLoad() {
+
+    }
+
+    start() {
+
+
+    }
+
+    init() {
+        let data = [1, 1, 0, 1];
+        for (let i = 0; i < data.length; i++) {
+            this['btn' + (i + 1)].active = data[i] == 1;
+        }
+    }
+}
+

mk_framework/assets/script/game/module/game/OpenFun.ts.meta → mk_framework/assets/script/game/module/game/FunBtns.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.8",
-  "uuid": "469395a4-6135-41cb-9b58-77dc3ef30501",
+  "uuid": "3bf105b1-a31e-4840-b710-a1ad7b84609b",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

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

@@ -1,15 +1,33 @@
+import FunBtns from "./FunBtns";
+
 const { ccclass, property } = cc._decorator;
 
 @ccclass
 export default class Game extends cc.Component {
+    @property({ type: cc.Node, displayName: "游戏核心" })
+    node_game: cc.Node = null;
+    @property({ type: cc.Node, displayName: "功能按钮" })
+    node_btn: cc.Node = null;
 
-    onLoad(){
-        
+    onLoad() {
+        mk.ui.closePanel("login");
     }
 
     start() {
-        
-        
+
+        this.initBtns();
+    }
+
+    /**
+     * 根据配置，添加开启的功能按钮
+     */
+    private initBtns() {
+        let sc = this.node_btn.getComponent(FunBtns) as FunBtns;
+        sc.init();
+    }
+
+    update() {
+
     }
 }
 

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

@@ -1,15 +0,0 @@
-const { ccclass, property } = cc._decorator;
-
-@ccclass
-export default class OpenFun extends cc.Component {
-
-    onLoad(){
-        
-    }
-
-    start() {
-        
-        
-    }
-}
-

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

@@ -1,3 +1,5 @@
+import { PanelType } from "../../../../mk/system/UISystem";
+
 const { ccclass, property } = cc._decorator;
 
 @ccclass
@@ -15,12 +17,16 @@ export default class Login extends cc.Component {
 
 
     update() {
+        if(!g.loginData.loadResCompelete){
+            g.loginData.loadLocalRes();
+            return;
+        }
         if (!g.loginData.isLogin) {
             g.loginData.login();
+            return;
         }
         if(g.gameData.dataFinish){//登录流程完毕
-            console.log('isLoginSuccess...');
-            this.destroy();
+            mk.ui.openPanel("game",PanelType.game);
         }
     }
 }

mk_framework/assets/script/game/module/module/turntable/Turnable.ts

@@ -0,0 +1,20 @@
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class Turnable extends cc.Component {
+
+    onLoad() {
+        
+    }
+
+    start() {
+
+
+    }
+
+
+
+    update() {
+        
+    }
+}