甘艺伟 hai 1 semana
pai
achega
ee9c456ae2

+ 37 - 0
assets/bundle/dialogView.meta

@@ -0,0 +1,37 @@
+{
+  "ver": "1.1.3",
+  "uuid": "8b89afe3-97a6-4791-82b5-d4bee26da39a",
+  "importer": "folder",
+  "isBundle": true,
+  "bundleName": "",
+  "priority": 3,
+  "compressionType": {
+    "wechatgame": "default",
+    "taobao-minigame": "default",
+    "quickgame": "default",
+    "qgame": "default",
+    "xiaomi": "default"
+  },
+  "optimizeHotUpdate": {
+    "wechatgame": false,
+    "taobao-minigame": false,
+    "quickgame": false,
+    "qgame": false,
+    "xiaomi": false
+  },
+  "inlineSpriteFrames": {
+    "wechatgame": false,
+    "taobao-minigame": false,
+    "quickgame": false,
+    "qgame": false,
+    "xiaomi": false
+  },
+  "isRemoteBundle": {
+    "wechatgame": true,
+    "taobao-minigame": true,
+    "quickgame": true,
+    "qgame": true,
+    "xiaomi": true
+  },
+  "subMetas": {}
+}

+ 1489 - 0
assets/bundle/dialogView/dialogView.prefab

@@ -0,0 +1,1489 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "dialogView",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 37
+      },
+      {
+        "__id__": 38
+      }
+    ],
+    "_prefab": {
+      "__id__": 39
+    },
+    "_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": "imgMask",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 34
+      },
+      {
+        "__id__": 35
+      }
+    ],
+    "_prefab": {
+      "__id__": 36
+    },
+    "_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__": 11
+      },
+      {
+        "__id__": 14
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 31
+      },
+      {
+        "__id__": 32
+      }
+    ],
+    "_prefab": {
+      "__id__": 33
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 648,
+      "height": 444
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        42,
+        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": 248,
+      "g": 222,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 92,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -3.164,
+        193.117,
+        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__": 4
+    },
+    "_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": 1,
+    "_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": {
+      "__id__": 0
+    },
+    "fileId": "f6OYbjeDpML74LHiwYqNh6",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btnClose",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "_prefab": {
+      "__id__": 10
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 38,
+      "height": 40
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        290,
+        193,
+        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__": 7
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "927c9d18-c4ae-4ceb-9d47-3212573d03dd"
+    },
+    "_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.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 7
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 0,
+    "transition": 0,
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "15FUmuDilKwZNgL+WwXBp9",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "DescLabel",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 12
+      }
+    ],
+    "_prefab": {
+      "__id__": 13
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 159,
+      "g": 144,
+      "b": 169,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 540,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        54,
+        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.RichText",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 11
+    },
+    "_enabled": true,
+    "_fontFamily": "Arial",
+    "_isSystemFontUsed": true,
+    "_N$string": "",
+    "_N$horizontalAlign": 1,
+    "_N$fontSize": 28,
+    "_N$font": null,
+    "_N$cacheMode": 0,
+    "_N$maxWidth": 540,
+    "_N$lineHeight": 40,
+    "_N$imageAtlas": null,
+    "_N$handleTouchEvent": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "48b0Bu37tAFoy35kqKtiEX",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "layout",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 22
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 29
+      }
+    ],
+    "_prefab": {
+      "__id__": 30
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 582,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -137,
+        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": "btnCancel",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 14
+    },
+    "_children": [
+      {
+        "__id__": 16
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 19
+      },
+      {
+        "__id__": 20
+      }
+    ],
+    "_prefab": {
+      "__id__": 21
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 271,
+      "height": 89
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -155.5,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.8,
+        0.8,
+        0
+      ]
+    },
+    "_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": "txtCancel",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 15
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 17
+      }
+    ],
+    "_prefab": {
+      "__id__": 18
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 198,
+      "b": 172,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 72,
+      "height": 50.4
+    },
+    "_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.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 16
+    },
+    "_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": 1,
+    "_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": {
+      "__id__": 0
+    },
+    "fileId": "5ek2YipVVJALAUaYx7bRCm",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 15
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "c234e32e-568f-4bb2-8e5b-69fe89b72778"
+    },
+    "_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.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 15
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 0.9,
+    "clickEvents": [],
+    "_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": {
+      "__id__": 15
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "17VyvaSRpHKI60hB2/5/Hj",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btnConfirm",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 14
+    },
+    "_children": [
+      {
+        "__id__": 23
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 26
+      },
+      {
+        "__id__": 27
+      }
+    ],
+    "_prefab": {
+      "__id__": 28
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 271,
+      "height": 89
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        155.5,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.8,
+        0.8,
+        0
+      ]
+    },
+    "_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": "txtConfirm",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 22
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 24
+      }
+    ],
+    "_prefab": {
+      "__id__": 25
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 242,
+      "g": 255,
+      "b": 218,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 72,
+      "height": 50.4
+    },
+    "_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.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 23
+    },
+    "_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": 1,
+    "_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": {
+      "__id__": 0
+    },
+    "fileId": "60COVS3RBNX7YPGNhM8QdU",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 22
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "0045eed9-6445-4225-8bc5-99443623276b"
+    },
+    "_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.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 22
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 0.9,
+    "clickEvents": [],
+    "_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": {
+      "__id__": 22
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "14P0TBQYxJtoRhGqUCGeIo",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 14
+    },
+    "_enabled": true,
+    "_layoutSize": {
+      "__type__": "cc.Size",
+      "width": 582,
+      "height": 100
+    },
+    "_resize": 1,
+    "_N$layoutType": 1,
+    "_N$cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_N$startAxis": 0,
+    "_N$paddingLeft": 0,
+    "_N$paddingRight": 0,
+    "_N$paddingTop": 0,
+    "_N$paddingBottom": 0,
+    "_N$spacingX": 40,
+    "_N$spacingY": 0,
+    "_N$verticalDirection": 1,
+    "_N$horizontalDirection": 0,
+    "_N$affectedByScale": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "1fe3Ng/tlHW4vZb9c6hyBq",
+    "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__": "156b4307-0767-4e3b-9e72-2e4d54c143cf"
+    },
+    "_type": 1,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.BlockInputEvents",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "fdhqSXQbhErZOqYWt8RsQk",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "040fc409-2120-4558-a1f6-081ede3bdeec"
+    },
+    "_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.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_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__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "19WTgYnfNAI7iKysgn0VqD",
+    "sync": false
+  },
+  {
+    "__type__": "e26f2X9UxhD5rCAT+WHoKDv",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "debugPanel": {
+      "__uuid__": "613e3761-2f41-4f92-bb2b-7fcc30f23ab8"
+    },
+    "debugBtn": null,
+    "_id": ""
+  },
+  {
+    "__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__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

+ 9 - 0
assets/bundle/dialogView/dialogView.prefab.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.3.2",
+  "uuid": "6bd7f276-ea03-4101-8d25-b7cc01c4b14a",
+  "importer": "prefab",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

+ 13 - 0
assets/bundle/dialogView/texture.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "626d8292-ad51-4b81-9bcc-31a9d2ad9e0c",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

+ 3 - 0
assets/bundle/dialogView/texture/AutoAtlas.pac

@@ -0,0 +1,3 @@
+{
+    "__type__": "cc.SpriteAtlas"
+}

+ 36 - 0
assets/bundle/dialogView/texture/AutoAtlas.pac.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "1.2.5",
+  "uuid": "abd0075d-98cb-44e1-a83c-226797271f49",
+  "importer": "auto-atlas",
+  "maxWidth": 1024,
+  "maxHeight": 1024,
+  "padding": 2,
+  "compressionLevel": 6,
+  "allowRotation": true,
+  "forceSquared": false,
+  "powerOfTwo": false,
+  "algorithm": "MaxRects",
+  "format": "png",
+  "quality": 80,
+  "contourBleed": true,
+  "paddingBleed": true,
+  "filterUnused": false,
+  "packable": false,
+  "premultiplyAlpha": false,
+  "filterMode": "bilinear",
+  "platformSettings": {
+    "web": {
+      "formats": [
+        {
+          "name": "png",
+          "quality": 80
+        },
+        {
+          "name": "webp",
+          "quality": 80
+        }
+      ]
+    }
+  },
+  "subMetas": {}
+}

BIN=BIN
assets/bundle/dialogView/texture/btnGreen.png


+ 38 - 0
assets/bundle/dialogView/texture/btnGreen.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "5fbe3f81-31c7-461a-866e-13c7c965b5d3",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 271,
+  "height": 89,
+  "platformSettings": {},
+  "subMetas": {
+    "btnGreen": {
+      "ver": "1.0.6",
+      "uuid": "0045eed9-6445-4225-8bc5-99443623276b",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "5fbe3f81-31c7-461a-866e-13c7c965b5d3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 271,
+      "height": 89,
+      "rawWidth": 271,
+      "rawHeight": 89,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN=BIN
assets/bundle/dialogView/texture/btnRed.png


+ 38 - 0
assets/bundle/dialogView/texture/btnRed.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "65b6900e-3c67-49d5-986a-8e38cfd050ed",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 271,
+  "height": 89,
+  "platformSettings": {},
+  "subMetas": {
+    "btnRed": {
+      "ver": "1.0.6",
+      "uuid": "c234e32e-568f-4bb2-8e5b-69fe89b72778",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "65b6900e-3c67-49d5-986a-8e38cfd050ed",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 271,
+      "height": 89,
+      "rawWidth": 271,
+      "rawHeight": 89,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN=BIN
assets/bundle/dialogView/texture/img3JiBg.png


+ 38 - 0
assets/bundle/dialogView/texture/img3JiBg.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "7bf96eed-1542-4a57-83ed-fedb773a5eda",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 648,
+  "height": 211,
+  "platformSettings": {},
+  "subMetas": {
+    "img3JiBg": {
+      "ver": "1.0.6",
+      "uuid": "156b4307-0767-4e3b-9e72-2e4d54c143cf",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "7bf96eed-1542-4a57-83ed-fedb773a5eda",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 648,
+      "height": 211,
+      "rawWidth": 648,
+      "rawHeight": 211,
+      "borderTop": 79,
+      "borderBottom": 24,
+      "borderLeft": 49,
+      "borderRight": 35,
+      "subMetas": {}
+    }
+  }
+}

BIN=BIN
assets/bundle/dialogView/texture/imgClose2.png


+ 38 - 0
assets/bundle/dialogView/texture/imgClose2.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "6f53c381-7f58-40bd-96b3-98655a37b8f4",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 38,
+  "height": 40,
+  "platformSettings": {},
+  "subMetas": {
+    "imgClose2": {
+      "ver": "1.0.6",
+      "uuid": "927c9d18-c4ae-4ceb-9d47-3212573d03dd",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "6f53c381-7f58-40bd-96b3-98655a37b8f4",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 38,
+      "height": 40,
+      "rawWidth": 38,
+      "rawHeight": 40,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 2 - 2
assets/script/common/xlsConfig.ts

@@ -25,13 +25,13 @@ export type xlsPackageInfo = {id:string,group:string,plat:string,wayhttp:string,
 
 export class XlsConfig {
     xlsAudioInfo: xlsAudioInfo[]
-    xlsGuideInfo: xlsGuideInfo[]
     xlsPackageInfo: xlsPackageInfo[]
     xlsLanguageSeverHouduan: xlsLanguageSeverHouduan[]
+    xlsGuideInfo: xlsGuideInfo[]
     xlsMathInfo: xlsMathInfo[]
-    xlsLanguageClientText: xlsLanguageClientText[]
     xlsItemKind: xlsItemKind[]
     xlsItemMoney: xlsItemMoney[]
+    xlsLanguageClientText: xlsLanguageClientText[]
     xlsLanguageLang: xlsLanguageLang[]
 
     constructor(bundleName:string, callback: Function, progressCallback?: Function) {

+ 3 - 0
assets/script/data/GameDataCenter.ts

@@ -1,6 +1,7 @@
 import { SevBack } from "../common/Xys";
 import { GameServerModel } from "../server/GameServerModel";
 import AccountModel from "./model/Account/AccountModel";
+import DialogModel from "./model/DialogModel";
 import GuideModel from "./model/GuideModel";
 import IDataModel from "./model/IDataModel";
 import LoadingModel from "./model/LoadingModel";
@@ -35,6 +36,7 @@ class GameDataCenter {
     user: UserModel;
     guide: GuideModel;
     task: TaskModel;
+    dialog: DialogModel;
     gameServer: GameServerModel;
     constructor() {
         if (CC_PREVIEW) window["gdc"] = this;
@@ -72,6 +74,7 @@ class GameDataCenter {
         this.system = this.newModel(SystemModel)
         this.task = this.newModel(TaskModel)
         this.guide = this.newModel(GuideModel)
+        this.dialog = this.newModel(DialogModel)
         this.gameServer = this.newModel(GameServerModel);
         // 红点注册必须在其他model之后
         this.reddot = this.newModel(RedDotModel);

+ 3 - 0
assets/script/data/const/ViewZOrder.ts

@@ -41,6 +41,9 @@ export enum ViewZOrder {
     /** 遮罩层 */
     MASK = 1000,
 
+    /** 系统弹框 */
+    POP_SYSTEM = 1500,
+
     /** 点击特效层 */
     ClickEft = 2000,
 }

+ 1 - 2
assets/script/logic/fgui/Home/Home/HomeCtrl.ts

@@ -19,8 +19,7 @@ export class HomeCtrl extends FguiViewCtrl<HomeVM> {
         this.AddListeners();
         GameDataCenter.gameServer.Init();
         await GameDataCenter.gameServer.Connect();
-
-        let ret = await GameDataCenter.gameServer.callApi("player/Info", { content: '测试一下' });
+        let ret = await GameDataCenter.gameServer.ReqApi("player/Info", { content: '测试一下' });
         if (ret.isSucc) {
             console.log('成功');
         } else {

+ 9 - 8
assets/script/logic/ui/UIHelp.ts

@@ -13,6 +13,7 @@ import { uiCommon } from "../../utils/UICommon";
 import { eg } from "../../frameWork/eg";
 import AssetsBundleMgr from "../../utils/AssetsBundleMgr";
 import { ViewZOrder } from "../../data/const/ViewZOrder";
+import { DialogViewView } from "../fgui/Common/DialogView/DialogViewView";
 
 /**确定框界面参数 */
 export interface DialogParams {
@@ -125,14 +126,14 @@ export default class UIHelp {
      * @returns 
      */
     public static ShowDialog(data: DialogParams, zIndex?: number) {
-        // if (FguiMgr.Instance.isShowing(DialogViewView)) {
-        //     return
-        // }
-        // if (data.dayTipsKey && GameDataCenter.dialog.checkSetToday(data.dayTipsKey) && data.cbConfirm) {
-        //     data.cbConfirm()
-        //     return
-        // }
-        // FguiMgr.Instance.openUI(DialogViewView, zIndex ? zIndex : ViewZorder.DIALOG, null, data);
+        if (FguiMgr.Instance.isShowing(DialogViewView)) {
+            return
+        }
+        if (data.dayTipsKey && GameDataCenter.dialog.checkSetToday(data.dayTipsKey) && data.cbConfirm) {
+            data.cbConfirm()
+            return
+        }
+        FguiMgr.Instance.openUI(DialogViewView, zIndex ? zIndex : ViewZOrder.Dialog, null, data);
     }
     // 系统文字弹窗
     public static ShowSystemDialog(data: DialogParams) {

+ 13 - 0
assets/script/logic/ui/dialogView.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "919cc1ad-6cdd-4f3a-b045-f98e94ab5c86",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

+ 96 - 0
assets/script/logic/ui/dialogView/UIDialogView.ts

@@ -0,0 +1,96 @@
+import { gameMethod } from "../../../common/gameMethod";
+import auto_dialogView from "../../../data/autoui/dialogView/auto_dialogView";
+import { WindowEvent } from "../../../data/const/EventConst";
+import { ViewZOrder } from "../../../data/const/ViewZOrder";
+import EventMng from "../../../manager/EventMng";
+import AssetMgr from "../../../utils/AssetMgr";
+import { I18n } from "../../../utils/I18nUtil";
+import { uiCommon } from "../../../utils/UICommon";
+import UIBase, { BASE_POP } from "../UIBase";
+import UIHelp, { DialogParams } from "../UIHelp";
+
+const { ccclass, menu, property } = cc._decorator;
+
+@ccclass
+@menu("UI/dialogView/UIDialogView")
+export default class UIDialogView extends UIBase {
+	ui: auto_dialogView = null;
+	dialogParams: DialogParams;// 外部传入的参数
+
+	protected static prefabUrl = "dialogView/dialogView";
+	protected static className = "UIDialogView";
+
+	protected static pop = BASE_POP.UI;
+	onUILoad() {
+		this.ui = this.node.addComponent(auto_dialogView);
+	}
+
+	onShow() {
+		this.node.zIndex = ViewZOrder.POP_SYSTEM;
+		EventMng.on(WindowEvent.SHOW_SYS_DIALOG, this.showDialog, this);
+		uiCommon.onRegisterEvent(this.ui.imgMask, this.OnClickMask, this);
+		uiCommon.onRegisterEvent(this.ui.btnClose, this.OnClickMask, this);
+		uiCommon.onRegisterEvent(this.ui.btnConfirm, this.OnClickConfirmBtn, this);
+		uiCommon.onRegisterEvent(this.ui.btnCancel, this.OnClickCancelBtn, this);
+	}
+
+
+	onHide() {
+		EventMng.off(WindowEvent.SHOW_SYS_DIALOG, this.showDialog, this);
+		uiCommon.unRegisterEvent(this.ui.imgMask);
+		uiCommon.unRegisterEvent(this.ui.btnClose);
+		uiCommon.unRegisterEvent(this.ui.btnConfirm);
+		uiCommon.unRegisterEvent(this.ui.btnCancel);
+	}
+
+	onStart() {
+
+	}
+
+	showDialog(data: DialogParams) {
+		if (gameMethod.isEmpty(data)) return;
+		this.dialogParams = data;
+		this.ui.imgMask.active = true;
+		uiCommon.setLabel(this.ui.title, this.dialogParams.title || I18n?.getI18nText("common_dialogtitle_1"));
+		uiCommon.setLabel(this.ui.DescLabel, this.dialogParams.content || I18n?.getI18nText("common_dialogtitle_1"));
+		// 确定、取消
+		uiCommon.setLabel(this.ui.txtConfirm, this.dialogParams.txtConfirm || I18n?.getI18nText("common_confirm_11"));
+		if (this.dialogParams.onlyConfirm) {
+			this.ui.btnCancel.active = false;
+		} else {
+			this.ui.btnCancel.active = true;
+			uiCommon.setLabel(this.ui.txtCancel, this.dialogParams.txtCancel || I18n?.getI18nText("common_cancel_1"));
+		}
+	}
+
+	// 确定
+	OnClickConfirmBtn(): void {
+		if (this.dialogParams?.cbConfirm != null) {
+			this.dialogParams?.cbConfirm();
+		}
+		this.closeDialog();
+	}
+
+	// 取消
+	OnClickCancelBtn(): void {
+		if (this.dialogParams?.cbCancel != null) {
+			this.dialogParams?.cbCancel();
+		}
+		this.closeDialog();
+	}
+
+	OnClickMask() {
+		if (this.dialogParams.onlyConfirm && this.dialogParams?.cbConfirm != null) {
+			this.dialogParams?.cbConfirm();
+		}
+		this.closeDialog();
+	}
+
+	closeDialog() {
+		this.ui.imgMask.active = false;
+	}
+
+	onClose() {
+	}
+
+}

+ 10 - 0
assets/script/logic/ui/dialogView/UIDialogView.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "e26f25fd-5318-43e6-b080-4fe587a0a0ef",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 2 - 1
assets/script/network/GameServerConfig.ts

@@ -20,6 +20,7 @@ export class GameServerConfig {
     public static syncVersion: number = 1;
     /** 客户端版本号 */
     public static appVersion: number = 220;
-
+    /** 重连上限 */
+    public static reconnectMax: number = 3;
 
 }

+ 51 - 19
assets/script/server/GameServerModel.ts

@@ -5,17 +5,23 @@ import { HttpClient as HttpClient_Browser, WsClient as WsClient_Browser } from '
 import { HttpClient as HttpClient_Miniapp, WsClient as WsClient_Miniapp } from 'tsrpc-miniapp';
 import { serviceProto as ServiceProtoRoom, ServiceType, ServiceType as ServiceTypeRoom } from "../shared/serviceProto";
 import IDataModel from "../data/model/IDataModel";
+import UIHelp, { DialogParams } from "../logic/ui/UIHelp";
+import GameController from "../GameController";
+import { I18n } from "../utils/I18nUtil";
+import EventMng from "../manager/EventMng";
 
 
 /** 游戏服 */
 export class GameServerModel extends IDataModel {
     /** 连接房间服务器 Websocket 客户端 */
     wscRoom: WsClient_Browser<ServiceTypeRoom> = null!;
-
+    /** 重连次数 */
+    reconnectCnt: number = 0;
     async Init() {
         this.wscRoom = eg.tspcNet.createWscRoom(GameServerConfig.GAME_SERVER);
     }
 
+    /** 连接游戏服 */
     async Connect() {
         let resConnect = await this.wscRoom.connect();
         if (!resConnect.isSucc) {
@@ -23,46 +29,72 @@ export class GameServerModel extends IDataModel {
             return;
         }
         console.error('连接游戏服成功');
-        this.postDisconnectFlow();
+        this.PostDisconnectFlow();
+    }
+
+    /** 重连游戏服 */
+    async ReConnect() {
+        this.reconnectCnt++;
+        let resConnect = await this.wscRoom.connect();
+        if (!resConnect.isSucc) {
+            console.log('连接游戏服失败', resConnect.errMsg);
+            if (this.reconnectCnt >= GameServerConfig.reconnectMax) {
+                CC_PREVIEW && console.error("重连服务器超过上限");
+                let dialogParam: DialogParams = {
+                    content: I18n.getI18nText("http_overtime"),
+                    cbConfirm: () => {
+                        this.reconnectCnt = 0;
+                        GameController.clear();
+                        cc.game.restart();
+                    },
+                    txtConfirm: I18n.getI18nText("http_overtime_confirm_1"),
+                    onlyConfirm: true
+                }
+                UIHelp.ShowSystemDialog(dialogParam)
+                return;
+            }
+            setTimeout(() => {
+                this.ReConnect();
+            }, 2000);
+            return;
+        }
+        CC_PREVIEW && console.log("重连服务器成功");
     }
 
     /** 客户端与服务器断开事件 */
-    private postDisconnectFlow() {
+    private PostDisconnectFlow() {
         this.wscRoom.flows.postDisconnectFlow.push(v => {
             // 非客户端手动断开时处理(例:网络错误、服务器关闭)
             if (!v.isManual) {
-                console.log("wss断线");
-                // // 等待 2 秒后自动重连
-                // // setTimeout(async () => {
-                // // smc.room.reconnectRoom();
-                // // }, 2000)
-                // if (smc.room.roomMode == RoomMode.Friend && (!smc.room.mRoom || !smc.room.mRoom.isInit)) {
-                //     setTimeout(async () => {
-                //         smc.room.reconnectRoom();
-                //     }, 2000)
-                //     return;
-                // }
+                CC_PREVIEW && console.log("wss断线", v.reason);
+                this.reconnectCnt = 0;
+                // 等待 2 秒后自动重连
+                this.ReConnect();
             }
             return v;
         });
     }
 
-
-    /** http请求api */
-    public async callApi<T extends string & keyof ServiceType['api']>(apiName: T, req: ServiceType['api'][T]['req']) {
+    /** 请求api */
+    public async ReqApi<T extends string & keyof ServiceType['api']>(apiName: T, req: ServiceType['api'][T]['req']) {
         let ret = await this.wscRoom.callApi(apiName, req);
+        if (!ret.isSucc) {
+            console.error(ret.err);
+            UIHelp.ShowTips(ret.err.message);
+        }
         return ret;
     }
 
 
+
     /** ws发送消息 */
-    public sendMsg<T extends string & keyof ServiceType['msg']>(msgName: T, msg: ServiceType['msg'][T]) {
+    public SendMsg<T extends string & keyof ServiceType['msg']>(msgName: T, msg: ServiceType['msg'][T]) {
         this.wscRoom.sendMsg(msgName, msg);
     }
 
 
     /** 监听消息 */
-    public listenMsg<T extends keyof ServiceType['msg']>(msgName: T | RegExp, callback: Function) {
+    public ListenMsg<T extends keyof ServiceType['msg']>(msgName: T | RegExp, callback: Function) {
         this.wscRoom.listenMsg(msgName, v => {
             callback(v);
         });

+ 1 - 1
assets/script/shared/serviceProto.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "2358e15a-1cb7-4ee8-9bee-8d6cc5217751",
+  "uuid": "c828a69e-8f7e-472d-90d9-6f629e17eafe",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,