Procházet zdrojové kódy

打开授权界面

kaka před 4 roky
rodič
revize
2edc81d6a0
28 změnil soubory, kde provedl 1149 přidání a 35 odebrání
  1. 15 0
      assets/resources/data/guide_data.json
  2. 12 0
      assets/resources/module/authUI.meta
  3. 904 0
      assets/resources/module/authUI/authUI.prefab
  4. 8 0
      assets/resources/module/authUI/authUI.prefab.meta
  5. 12 0
      assets/resources/module/authUI/texture.meta
  6. binární
      assets/resources/module/authUI/texture/bg5.png
  7. 36 0
      assets/resources/module/authUI/texture/bg5.png.meta
  8. binární
      assets/resources/module/authUI/texture/close.png
  9. 36 0
      assets/resources/module/authUI/texture/close.png.meta
  10. binární
      assets/resources/module/authUI/texture/wechatButton.png
  11. 36 0
      assets/resources/module/authUI/texture/wechatButton.png.meta
  12. 2 1
      assets/script/game/component/BtnOpenPanel.ts
  13. 1 1
      assets/script/game/data/HttpData.ts
  14. 3 2
      assets/script/game/game/Game.ts
  15. 12 0
      assets/script/game/module/authUI.meta
  16. 17 0
      assets/script/game/module/authUI/AuthUI.ts
  17. 9 0
      assets/script/game/module/authUI/AuthUI.ts.meta
  18. 2 1
      assets/script/game/module/blessingBag/BlessingBag.ts
  19. 2 1
      assets/script/game/module/gradeReward/GradeReward.ts
  20. 2 1
      assets/script/game/module/gradeReward/GradeRewardItem.ts
  21. 7 2
      assets/script/game/module/guide/Guide.ts
  22. 13 9
      assets/script/game/module/login/Login.ts
  23. 2 1
      assets/script/game/module/redBagTask/RedBagTask.ts
  24. 4 2
      assets/script/game/module/setting/Setting.ts
  25. 12 13
      assets/script/game/module/sign/Sign.ts
  26. 1 0
      assets/script/mk/system/JsbSystem.ts
  27. binární
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser
  28. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/aliRisk/AliRiskManager.java

+ 15 - 0
assets/resources/data/guide_data.json

@@ -105,6 +105,21 @@
 		"lagNext": "0"
 	},
 	{
+		"id": "2_1",
+		"trigger": "1",
+		"trNum": "0",
+		"btnEnable": "1",
+		"trForm": "1",
+		"dialogPos": ":200::::",
+		"dialogPos1": "",
+		"dialogAlignment": "0",
+		"dialog": "<color=8A4312>继续生产,还有<color=ff0000>1次</color>即可\n提现<color=ff0000>!</color></color>",
+		"displayRect": "",
+		"clickRect": "主界面层/game/功能按钮/底部按钮/中间按钮",
+		"finger": "100:20",
+		"lagNext": "0"
+	},
+	{
 		"id": "3_0",
 		"trigger": "1",
 		"trNum": "0",

+ 12 - 0
assets/resources/module/authUI.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "75853bb6-17fb-4e08-aa1f-f4fbb277175c",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

+ 904 - 0
assets/resources/module/authUI/authUI.prefab

@@ -0,0 +1,904 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "authUI",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 22
+      },
+      {
+        "__id__": 23
+      },
+      {
+        "__id__": 24
+      },
+      {
+        "__id__": 25
+      }
+    ],
+    "_prefab": {
+      "__id__": 26
+    },
+    "_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": [
+        375,
+        667,
+        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": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 21
+    },
+    "_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.Node",
+    "_name": "bg",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 15
+      }
+    ],
+    "_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": 640,
+      "height": 440
+    },
+    "_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": "title",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 6
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 148,
+      "g": 82,
+      "b": 37,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 160,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        155,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1.2,
+        1.2,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 4
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "温馨提示",
+    "_N$string": "温馨提示",
+    "_fontSize": 40,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 0,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "3a7bf8d2-c130-45c0-b451-f70ecb4c3c25"
+    },
+    "fileId": "deIpL6YWRHnYefCM861K/1",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 8
+      }
+    ],
+    "_prefab": {
+      "__id__": 9
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 138,
+      "g": 67,
+      "b": 18,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 468,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        28,
+        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.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 7
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "点击登录,即可提现至微信。",
+    "_N$string": "点击登录,即可提现至微信。",
+    "_fontSize": 36,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "3a7bf8d2-c130-45c0-b451-f70ecb4c3c25"
+    },
+    "fileId": "13bO3TzK5FnplZDyblQpFo",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "wechatButton",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 11
+      },
+      {
+        "__id__": 12
+      }
+    ],
+    "_prefab": {
+      "__id__": 14
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 274.4,
+      "height": 102.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -156.855,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        0
+      ]
+    },
+    "_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__": 10
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "48b895bb-eac4-4629-bc25-8cbe415c0538"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 10
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 13
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "6724fHbghlME7ZWpoOsYEgz",
+    "handler": "clickAuth",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "3a7bf8d2-c130-45c0-b451-f70ecb4c3c25"
+    },
+    "fileId": "54An6+m5dLq5iOdi9zuuNG",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "close",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 16
+      },
+      {
+        "__id__": 17
+      }
+    ],
+    "_prefab": {
+      "__id__": 18
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 67,
+      "height": 70
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        301.701,
+        211.879,
+        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__": 15
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "23afec8d-bfa3-44ae-9464-fe1261f9311e"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cdc50kCRVVBa5gcp4XXxVO+",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 15
+    },
+    "_enabled": true,
+    "node_panel": {
+      "__id__": 1
+    },
+    "transition_type": 0,
+    "onComplete": [],
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "3a7bf8d2-c130-45c0-b451-f70ecb4c3c25"
+    },
+    "fileId": "ecdsKjApBFzLxpvZup364n",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "31b9d6f4-396d-4c0b-8d97-61c26fccb8e3"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_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__": "3a7bf8d2-c130-45c0-b451-f70ecb4c3c25"
+    },
+    "fileId": "3aDHUWdXdFsqUq8Pt8TbfW",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "3a7bf8d2-c130-45c0-b451-f70ecb4c3c25"
+    },
+    "fileId": "bfZmc8NhZLmqu8BJnFLEvm",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 750,
+    "_originalHeight": 1334,
+    "_id": ""
+  },
+  {
+    "__type__": "58495/rJOBNGoxELFSp8G2a",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 180
+    },
+    "design_block_node": null,
+    "bClickClose": false,
+    "onComplete": [],
+    "_id": ""
+  },
+  {
+    "__type__": "ac053zwqaRD6IJmTlQWmefZ",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "effect_par": {
+      "__id__": 3
+    },
+    "open_effect": 1,
+    "isOpenCloseEffect": true,
+    "close_effect": 1,
+    "close_toPoint": "",
+    "close_uibg": false,
+    "isDelayOneFrame": true,
+    "_id": ""
+  },
+  {
+    "__type__": "6724fHbghlME7ZWpoOsYEgz",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "3a7bf8d2-c130-45c0-b451-f70ecb4c3c25"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

+ 8 - 0
assets/resources/module/authUI/authUI.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "3a7bf8d2-c130-45c0-b451-f70ecb4c3c25",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

+ 12 - 0
assets/resources/module/authUI/texture.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "a1903054-b71b-44dc-882a-e87af4721a4d",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

binární
assets/resources/module/authUI/texture/bg5.png


+ 36 - 0
assets/resources/module/authUI/texture/bg5.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "03da7a42-fa05-4ce3-8a5c-038039fa915d",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 640,
+  "height": 380,
+  "platformSettings": {},
+  "subMetas": {
+    "bg5": {
+      "ver": "1.0.4",
+      "uuid": "31b9d6f4-396d-4c0b-8d97-61c26fccb8e3",
+      "rawTextureUuid": "03da7a42-fa05-4ce3-8a5c-038039fa915d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 640,
+      "height": 380,
+      "rawWidth": 640,
+      "rawHeight": 380,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

binární
assets/resources/module/authUI/texture/close.png


+ 36 - 0
assets/resources/module/authUI/texture/close.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "51f692d7-7b5f-43c4-b70d-05e2832b0870",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 67,
+  "height": 70,
+  "platformSettings": {},
+  "subMetas": {
+    "close": {
+      "ver": "1.0.4",
+      "uuid": "23afec8d-bfa3-44ae-9464-fe1261f9311e",
+      "rawTextureUuid": "51f692d7-7b5f-43c4-b70d-05e2832b0870",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 67,
+      "height": 70,
+      "rawWidth": 67,
+      "rawHeight": 70,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

binární
assets/resources/module/authUI/texture/wechatButton.png


+ 36 - 0
assets/resources/module/authUI/texture/wechatButton.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "1ba76e16-1471-432a-a7f2-9a536eaa6704",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 343,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "wechatButton": {
+      "ver": "1.0.4",
+      "uuid": "48b895bb-eac4-4629-bc25-8cbe415c0538",
+      "rawTextureUuid": "1ba76e16-1471-432a-a7f2-9a536eaa6704",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 343,
+      "height": 128,
+      "rawWidth": 343,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 2 - 1
assets/script/game/component/BtnOpenPanel.ts

@@ -38,7 +38,8 @@ export default class BtnOpenPanel extends cc.Component {
         mk.audio.playEffect("button");
         if (cc.sys.isNative && this.bool_Auth) {
             if (!gData.loginData.isAuth) {
-                JsbSystem.WxAuth();
+                // JsbSystem.WxAuth();
+                mk.ui.openPanel('module/authUI/authUI');
                 return;
             }
         }

+ 1 - 1
assets/script/game/data/HttpData.ts

@@ -5,7 +5,7 @@
 export class HttpData {
 
     /** 服务器类型 0测试服 1正式服 2李扬服 3悍国服 */
-    public serverType: number = 1;
+    public serverType: number = 0;
 
     public getServerUrl(): string {
         switch (this.serverType) {

+ 3 - 2
assets/script/game/game/Game.ts

@@ -99,7 +99,7 @@ export default class Game extends cc.Component {
         // if(gData.sign.redPoint() && this.autoPopSign)
         // {
         //     let id = gData.gameData.getProp(GameProp.guideID);
-            
+
         //     if(id >= 1)
         //     {
         //         mk.ui.openPanel('module/sign/sign');
@@ -389,7 +389,8 @@ export default class Game extends cc.Component {
     public onClickShare() {
         mk.data.sendDataEvent(DataEventId.button_click, "邀请icon");
         if (!gData.loginData.isAuth) {
-            JsbSystem.WxAuth();
+            // JsbSystem.WxAuth();
+            mk.ui.openPanel('module/authUI/authUI');
             return;
         }
         JsbSystem.shareInviteUrl(gData.gameData.shareUrl, gData.gameData.shareTitle, gData.gameData.shareDes, gData.gameData.shareImgUrl);

+ 12 - 0
assets/script/game/module/authUI.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "465a48a4-442f-4af6-beeb-4944e9aabbe5",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

+ 17 - 0
assets/script/game/module/authUI/AuthUI.ts

@@ -0,0 +1,17 @@
+/**
+ * 微信授权界面
+ * @author kaka
+ */
+
+import JsbSystem from "../../../mk/system/JsbSystem";
+
+const { ccclass } = cc._decorator;
+
+@ccclass
+export default class AuthUI extends cc.Component {
+
+    clickAuth() {
+        mk.audio.playEffect('button');
+        JsbSystem.WxAuth();
+    }
+}

+ 9 - 0
assets/script/game/module/authUI/AuthUI.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "6724f1db-8219-4c13-b656-a683ac604833",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 2 - 1
assets/script/game/module/blessingBag/BlessingBag.ts

@@ -200,7 +200,8 @@ export default class BlessingBag extends cc.Component {
 
         mk.audio.playEffect("button");
         if (cc.sys.isNative && !gData.loginData.isAuth) {
-            JsbSystem.WxAuth();
+            // JsbSystem.WxAuth();
+            mk.ui.openPanel('module/authUI/authUI');
             return;
         }
         if (gData.blessingBag.videoRbData.isVideo == 1) {

+ 2 - 1
assets/script/game/module/gradeReward/GradeReward.ts

@@ -170,7 +170,8 @@ export class GradeReward extends cc.Component {
         mk.audio.playEffect("button");
 
         if (cc.sys.isNative && !gData.loginData.isAuth) {
-            JsbSystem.WxAuth();
+            // JsbSystem.WxAuth();
+            mk.ui.openPanel('module/authUI/authUI');
             return;
         }
         mk.ad.videoAdType = VideoAdType.video_init_1;

+ 2 - 1
assets/script/game/module/gradeReward/GradeRewardItem.ts

@@ -83,7 +83,8 @@ export class GradeRewardItem extends cc.Component{
         mk.audio.playEffect("button");
         
         if (cc.sys.isNative && !gData.loginData.isAuth) {
-            JsbSystem.WxAuth();
+            // JsbSystem.WxAuth();
+            mk.ui.openPanel('module/authUI/authUI');
             return;
         }
 

+ 7 - 2
assets/script/game/module/guide/Guide.ts

@@ -57,6 +57,11 @@ export default class Guide extends cc.Component {
     private nextStep() {
         this.crtStep++;
         this.crtGuide = this.guides[this.crtStep];
+        if (gData.guideData.crtID == 2 && this.crtStep == 1) {
+            let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
+            let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
+            mk.guide.curDes = `<color=8A4312>继续生产,还有<color=ff0000>${count - com}次</color>即可\n提现<color=ff0000>!</color></color>`;
+        }
         mk.data.sendDataEvent(DataEventId.guide, `新手引导第${gData.guideData.crtID}_${this.crtStep}步完成`);
         this.updateGuide();
     }
@@ -303,8 +308,8 @@ export default class Guide extends cc.Component {
 
     private clickSkip() {
         mk.audio.playEffect("button");
-        mk.data.sendXYEvent("guide", `skip_${mk.guide.crtGuideID}`);
-        mk.data.sendDataEvent(DataEventId.guideSkip, `新手引导第${mk.guide.crtGuideID}步跳过`);
+        mk.data.sendXYEvent("guide", `skip_${mk.guide.crtGuideID}_${this.crtStep}`);
+        mk.data.sendDataEvent(DataEventId.guideSkip, `新手引导第${mk.guide.crtGuideID}_${this.crtStep}步跳过`);
         this.close();
     }
 

+ 13 - 9
assets/script/game/module/login/Login.ts

@@ -133,15 +133,19 @@ export default class Login extends cc.Component {
                 this.login();
             }
             else if (gData.gameData.dataFinish) {//登录流程完毕
-                if (gData.loginData.isAuth || CC_DEBUG) {
-                    if (!this.loadSceneState) {
-                        this.loadSceneState = true;
-                        this.loadMain();
-                    }
-                }
-                else {
-                    this.node_loadPart.active = false;
-                    this.node_btnLogin.active = true;
+                // if (gData.loginData.isAuth || CC_DEBUG) {
+                //     if (!this.loadSceneState) {
+                //         this.loadSceneState = true;
+                //         this.loadMain();
+                //     }
+                // }
+                // else {
+                //     this.node_loadPart.active = false;
+                //     this.node_btnLogin.active = true;
+                // }
+                if (!this.loadSceneState) {
+                    this.loadSceneState = true;
+                    this.loadMain();
                 }
 
                 gData.gameData.dataFinish = false;

+ 2 - 1
assets/script/game/module/redBagTask/RedBagTask.ts

@@ -243,7 +243,8 @@ export default class RedBagTask extends cc.Component {
         if (this.isCanCash) {
             if (cc.sys.isNative) {
                 if (!gData.loginData.isAuth) {
-                    JsbSystem.WxAuth();
+                    // JsbSystem.WxAuth();
+                    mk.ui.openPanel('module/authUI/authUI');
                     return;
                 }
             }

+ 4 - 2
assets/script/game/module/setting/Setting.ts

@@ -120,7 +120,8 @@ export default class Setting extends cc.Component {
     onClickWxAuth() {
         if (!gData.loginData.isAuth) {
             // mk.ui.closePanel(this.node.name);
-            JsbSystem.WxAuth();
+            // JsbSystem.WxAuth();
+            mk.ui.openPanel('module/authUI/authUI');
             // this.onClickClose();
         }
     }
@@ -129,7 +130,8 @@ export default class Setting extends cc.Component {
     public onClickShare() {
         mk.data.sendDataEvent(DataEventId.button_click, "邀请icon");
         if (!gData.loginData.isAuth) {
-            JsbSystem.WxAuth();
+            // JsbSystem.WxAuth();
+            mk.ui.openPanel('module/authUI/authUI');
             return;
         }
         JsbSystem.shareInviteUrl(gData.gameData.shareUrl, gData.gameData.shareTitle, gData.gameData.shareDes, gData.gameData.shareImgUrl);

+ 12 - 13
assets/script/game/module/sign/Sign.ts

@@ -46,27 +46,26 @@ export default class Sign extends cc.Component {
         if (index > 0)
             index -= 1;
         //index = 4;
-        this.tableview.contentMoveByIndex(index, 0.01);    
-        cc.tween(this.node).delay(0.1).call(()=>{
+        this.tableview.contentMoveByIndex(index, 0.01);
+        cc.tween(this.node).delay(0.1).call(() => {
             this.scroll_view.vertical = false;
-        }).call(()=>{
+        }).call(() => {
             let allItem = this.tableview.getItemByIndexAndCount(index, 3);
-            allItem && allItem.sort((a, b)=>{
+            allItem && allItem.sort((a, b) => {
 
                 return a.index - b.index;
             })
             let len = allItem.length;
-            for(let i = 0; i != len; ++i)
-            {
+            for (let i = 0; i != len; ++i) {
                 //allItem[i].active = true;
                 let posY = allItem[i].position.y
                 allItem[i].y = posY - 600;
-                cc.tween(allItem[i]).delay(i*0.1).to(0.3, {y: posY}, cc.easeSineOut()).start();
+                cc.tween(allItem[i]).delay(i * 0.1).to(0.3, { y: posY }, cc.easeSineOut()).start();
             }
-        }).delay(0.7).call(()=>{
+        }).delay(0.7).call(() => {
             this.scroll_view.vertical = true;
         }).start();
-        
+
     }
 
 
@@ -95,16 +94,16 @@ export default class Sign extends cc.Component {
 
         //const index_old = gData.sign.getItemIndexByCanSign();
         const index_old = gData.gameData.playerProp.signInDay;
-        if(cc.sys.isNative)
-        {
+        if (cc.sys.isNative) {
             if (gData.sign.c_sign[index_old].rewardType === RewardType.rmb) {
                 if (!gData.loginData.isAuth) {
-                    JsbSystem.WxAuth();
+                    // JsbSystem.WxAuth();
+                    mk.ui.openPanel('module/authUI/authUI');
                     return;
                 }
             }
         }
-        
+
         mk.ad.videoAdType = VideoAdType.video_init_4;
         // 看广告
         mk.ad.watchAd((success: boolean) => {

+ 1 - 0
assets/script/mk/system/JsbSystem.ts

@@ -419,6 +419,7 @@ export default class JsbSystem {
         if (!value) {
             mk.storage.setStorage('loadingAuth', 1);
             mk.data.sendDataEvent(DataEventId.loading, '微信授权登录成功');
+            mk.ui.closePanel('authUI');
         }
     }
 

binární
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser


+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/aliRisk/AliRiskManager.java

@@ -13,7 +13,7 @@ import org.cocos2dx.javascript.AppActivity;
  * 阿里风控管理类
  */
 public class AliRiskManager {
-    private static final String userAppKey = "f3b171d554a9f7b00fad8449ea0a0ec5";
+    private static final String userAppKey = "3ff088911edbad9899357193efe837f7";
 
     //单例模式
     private static AliRiskManager mInstance = null;