Commit f62290f6 authored by 范雪寒's avatar 范雪寒

feat: 更新弹窗

parent da6369ab
...@@ -295,25 +295,25 @@ ...@@ -295,25 +295,25 @@
"__id__": 20 "__id__": 20
}, },
{ {
"__id__": 144 "__id__": 151
}, },
{ {
"__id__": 179 "__id__": 186
}, },
{ {
"__id__": 183 "__id__": 190
}, },
{ {
"__id__": 185 "__id__": 192
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 196 "__id__": 203
}, },
{ {
"__id__": 197 "__id__": 204
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1013,6 +1013,9 @@ ...@@ -1013,6 +1013,9 @@
}, },
{ {
"__id__": 137 "__id__": 137
},
{
"__id__": 144
} }
], ],
"_active": true, "_active": true,
...@@ -7154,6 +7157,377 @@ ...@@ -7154,6 +7157,377 @@
}, },
"_id": "0eZv6h/9VDnJV+eK8tiFMk" "_id": "0eZv6h/9VDnJV+eK8tiFMk"
}, },
{
"__type__": "cc.Node",
"_name": "BtnNeedUpdate",
"_objFlags": 0,
"_parent": {
"__id__": 20
},
"_children": [
{
"__id__": 145
}
],
"_active": true,
"_components": [
{
"__id__": 150
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 40
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
492.574,
-35.844,
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": "8dehFs1K1AboeSZnZ8pGpA"
},
{
"__type__": "cc.Node",
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 144
},
"_children": [
{
"__id__": 146
}
],
"_active": true,
"_components": [
{
"__id__": 148
},
{
"__id__": 149
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 40
},
"_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": "1drCS4EY5IYbqWveSne3g6"
},
{
"__type__": "cc.Node",
"_name": "Label",
"_objFlags": 512,
"_parent": {
"__id__": 145
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 147
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 40
},
"_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": "66Esa44dxELYC8d6W/MGvk"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 146
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "更新",
"_N$string": "更新",
"_fontSize": 20,
"_lineHeight": 40,
"_enableWrapText": false,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 1,
"_N$cacheMode": 1,
"_id": "f3Xa9yAQZM55jvBlOPHHz3"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 145
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
},
"_type": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "a0iDYJNL1F9LRHf+6bnGD1"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 145
},
"_enabled": true,
"alignMode": 0,
"_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": 100,
"_originalHeight": 40,
"_id": "280IGsdGJCmapTamNqSwGS"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 2,
"transition": 2,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 230,
"g": 230,
"b": 230,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 200,
"g": 200,
"b": 200,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 200,
"g": 200,
"b": 200,
"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": 120,
"g": 120,
"b": 120,
"a": 200
},
"_N$normalSprite": {
"__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
},
"_N$pressedSprite": {
"__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
},
"pressedSprite": {
"__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
},
"_N$hoverSprite": {
"__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
},
"hoverSprite": {
"__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
},
"_N$disabledSprite": {
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 145
},
"_id": "69EHz9G8hF+6MUT3Mzb4vv"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "ConsoleNode", "_name": "ConsoleNode",
...@@ -7163,25 +7537,25 @@ ...@@ -7163,25 +7537,25 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 145 "__id__": 152
}, },
{ {
"__id__": 151 "__id__": 158
}, },
{ {
"__id__": 154 "__id__": 161
}, },
{ {
"__id__": 162 "__id__": 169
}, },
{ {
"__id__": 170 "__id__": 177
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 178 "__id__": 185
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7237,20 +7611,20 @@ ...@@ -7237,20 +7611,20 @@
"_name": "content", "_name": "content",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 144 "__id__": 151
}, },
"_children": [ "_children": [
{ {
"__id__": 146 "__id__": 153
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 149 "__id__": 156
}, },
{ {
"__id__": 150 "__id__": 157
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7306,16 +7680,16 @@ ...@@ -7306,16 +7680,16 @@
"_name": "label", "_name": "label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 145 "__id__": 152
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 147 "__id__": 154
}, },
{ {
"__id__": 148 "__id__": 155
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7371,7 +7745,7 @@ ...@@ -7371,7 +7745,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 146 "__id__": 153
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7404,7 +7778,7 @@ ...@@ -7404,7 +7778,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 146 "__id__": 153
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -7431,7 +7805,7 @@ ...@@ -7431,7 +7805,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 145 "__id__": 152
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -7463,7 +7837,7 @@ ...@@ -7463,7 +7837,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 145 "__id__": 152
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -7490,16 +7864,16 @@ ...@@ -7490,16 +7864,16 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 144 "__id__": 151
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 152 "__id__": 159
}, },
{ {
"__id__": 153 "__id__": 160
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7555,7 +7929,7 @@ ...@@ -7555,7 +7929,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 151 "__id__": 158
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7587,7 +7961,7 @@ ...@@ -7587,7 +7961,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 151 "__id__": 158
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -7614,26 +7988,26 @@ ...@@ -7614,26 +7988,26 @@
"_name": "Console", "_name": "Console",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 144 "__id__": 151
}, },
"_children": [ "_children": [
{ {
"__id__": 155 "__id__": 162
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 158 "__id__": 165
}, },
{ {
"__id__": 159 "__id__": 166
}, },
{ {
"__id__": 160 "__id__": 167
}, },
{ {
"__id__": 161 "__id__": 168
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7689,16 +8063,16 @@ ...@@ -7689,16 +8063,16 @@
"_name": "content", "_name": "content",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 154 "__id__": 161
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 156 "__id__": 163
}, },
{ {
"__id__": 157 "__id__": 164
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7754,7 +8128,7 @@ ...@@ -7754,7 +8128,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 155 "__id__": 162
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -7786,7 +8160,7 @@ ...@@ -7786,7 +8160,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 155 "__id__": 162
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -7813,7 +8187,7 @@ ...@@ -7813,7 +8187,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 154 "__id__": 161
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -7840,7 +8214,7 @@ ...@@ -7840,7 +8214,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 154 "__id__": 161
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7860,7 +8234,7 @@ ...@@ -7860,7 +8234,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 154 "__id__": 161
}, },
"_enabled": true, "_enabled": true,
"horizontal": false, "horizontal": false,
...@@ -7872,10 +8246,10 @@ ...@@ -7872,10 +8246,10 @@
"scrollEvents": [], "scrollEvents": [],
"cancelInnerEvents": true, "cancelInnerEvents": true,
"_N$content": { "_N$content": {
"__id__": 155 "__id__": 162
}, },
"content": { "content": {
"__id__": 155 "__id__": 162
}, },
"_id": "43wBGhGBpFP7OYyNM+j0Ho" "_id": "43wBGhGBpFP7OYyNM+j0Ho"
}, },
...@@ -7884,7 +8258,7 @@ ...@@ -7884,7 +8258,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 154 "__id__": 161
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -7916,20 +8290,20 @@ ...@@ -7916,20 +8290,20 @@
"_name": "BtnClose", "_name": "BtnClose",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 144 "__id__": 151
}, },
"_children": [ "_children": [
{ {
"__id__": 163 "__id__": 170
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 168 "__id__": 175
}, },
{ {
"__id__": 169 "__id__": 176
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7985,20 +8359,20 @@ ...@@ -7985,20 +8359,20 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 162 "__id__": 169
}, },
"_children": [ "_children": [
{ {
"__id__": 164 "__id__": 171
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 166 "__id__": 173
}, },
{ {
"__id__": 167 "__id__": 174
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8054,13 +8428,13 @@ ...@@ -8054,13 +8428,13 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 163 "__id__": 170
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 165 "__id__": 172
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8116,7 +8490,7 @@ ...@@ -8116,7 +8490,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 164 "__id__": 171
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8149,7 +8523,7 @@ ...@@ -8149,7 +8523,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 163 "__id__": 170
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8181,7 +8555,7 @@ ...@@ -8181,7 +8555,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 163 "__id__": 170
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -8208,7 +8582,7 @@ ...@@ -8208,7 +8582,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 162 "__id__": 169
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -8281,7 +8655,7 @@ ...@@ -8281,7 +8655,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 163 "__id__": 170
}, },
"_id": "54SC9WcmBAZ6cTznyI0o+3" "_id": "54SC9WcmBAZ6cTznyI0o+3"
}, },
...@@ -8290,7 +8664,7 @@ ...@@ -8290,7 +8664,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 162 "__id__": 169
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -8317,20 +8691,20 @@ ...@@ -8317,20 +8691,20 @@
"_name": "BtnOpen", "_name": "BtnOpen",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 144 "__id__": 151
}, },
"_children": [ "_children": [
{ {
"__id__": 171 "__id__": 178
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 176 "__id__": 183
}, },
{ {
"__id__": 177 "__id__": 184
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8386,20 +8760,20 @@ ...@@ -8386,20 +8760,20 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 170 "__id__": 177
}, },
"_children": [ "_children": [
{ {
"__id__": 172 "__id__": 179
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 174 "__id__": 181
}, },
{ {
"__id__": 175 "__id__": 182
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8455,13 +8829,13 @@ ...@@ -8455,13 +8829,13 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 171 "__id__": 178
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 173 "__id__": 180
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8517,7 +8891,7 @@ ...@@ -8517,7 +8891,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 172 "__id__": 179
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8550,7 +8924,7 @@ ...@@ -8550,7 +8924,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 171 "__id__": 178
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8582,7 +8956,7 @@ ...@@ -8582,7 +8956,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 171 "__id__": 178
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -8609,7 +8983,7 @@ ...@@ -8609,7 +8983,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 170 "__id__": 177
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -8682,7 +9056,7 @@ ...@@ -8682,7 +9056,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 171 "__id__": 178
}, },
"_id": "81HoUuRyJOppi+n4Av/u0p" "_id": "81HoUuRyJOppi+n4Av/u0p"
}, },
...@@ -8691,7 +9065,7 @@ ...@@ -8691,7 +9065,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 170 "__id__": 177
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -8718,7 +9092,7 @@ ...@@ -8718,7 +9092,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 144 "__id__": 151
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -8751,13 +9125,13 @@ ...@@ -8751,13 +9125,13 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 180 "__id__": 187
}, },
{ {
"__id__": 181 "__id__": 188
}, },
{ {
"__id__": 182 "__id__": 189
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8813,7 +9187,7 @@ ...@@ -8813,7 +9187,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 179 "__id__": 186
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -8840,7 +9214,7 @@ ...@@ -8840,7 +9214,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 179 "__id__": 186
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -8908,7 +9282,7 @@ ...@@ -8908,7 +9282,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 179 "__id__": 186
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8946,7 +9320,7 @@ ...@@ -8946,7 +9320,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 184 "__id__": 191
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9002,7 +9376,7 @@ ...@@ -9002,7 +9376,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 183 "__id__": 190
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -9038,10 +9412,10 @@ ...@@ -9038,10 +9412,10 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 186 "__id__": 193
}, },
{ {
"__id__": 189 "__id__": 196
} }
], ],
"_active": false, "_active": false,
...@@ -9099,16 +9473,16 @@ ...@@ -9099,16 +9473,16 @@
"_name": "loading", "_name": "loading",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 185 "__id__": 192
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 187 "__id__": 194
}, },
{ {
"__id__": 188 "__id__": 195
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9164,7 +9538,7 @@ ...@@ -9164,7 +9538,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 186 "__id__": 193
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9196,7 +9570,7 @@ ...@@ -9196,7 +9570,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 186 "__id__": 193
}, },
"_enabled": true, "_enabled": true,
"_defaultClip": { "_defaultClip": {
...@@ -9215,24 +9589,24 @@ ...@@ -9215,24 +9589,24 @@
"_name": "progress", "_name": "progress",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 185 "__id__": 192
}, },
"_children": [ "_children": [
{ {
"__id__": 190 "__id__": 197
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 193 "__id__": 200
}, },
{ {
"__id__": 194 "__id__": 201
} }
], ],
"_prefab": { "_prefab": {
"__id__": 195 "__id__": 202
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -9286,17 +9660,17 @@ ...@@ -9286,17 +9660,17 @@
"_name": "bar", "_name": "bar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 189 "__id__": 196
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 191 "__id__": 198
} }
], ],
"_prefab": { "_prefab": {
"__id__": 192 "__id__": 199
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -9350,7 +9724,7 @@ ...@@ -9350,7 +9724,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 190 "__id__": 197
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9380,7 +9754,7 @@ ...@@ -9380,7 +9754,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 189 "__id__": 196
}, },
"asset": { "asset": {
"__uuid__": "3d356c4d-cb23-4239-aa5f-8a913f420fa4" "__uuid__": "3d356c4d-cb23-4239-aa5f-8a913f420fa4"
...@@ -9393,7 +9767,7 @@ ...@@ -9393,7 +9767,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 189 "__id__": 196
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9425,7 +9799,7 @@ ...@@ -9425,7 +9799,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 189 "__id__": 196
}, },
"_enabled": true, "_enabled": true,
"_id": "3eMT/DXoJNGZT/8Z3nuTUH" "_id": "3eMT/DXoJNGZT/8Z3nuTUH"
...@@ -9433,7 +9807,7 @@ ...@@ -9433,7 +9807,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 189 "__id__": 196
}, },
"asset": { "asset": {
"__uuid__": "3d356c4d-cb23-4239-aa5f-8a913f420fa4" "__uuid__": "3d356c4d-cb23-4239-aa5f-8a913f420fa4"
......
...@@ -26,6 +26,7 @@ export function initAir(_this) { ...@@ -26,6 +26,7 @@ export function initAir(_this) {
_this.log(`***成功调用osmoFingerReadCallback***参数==${res}`); _this.log(`***成功调用osmoFingerReadCallback***参数==${res}`);
}, },
startScanCodeCallback: null, startScanCodeCallback: null,
needUpdateCallback: null,
getEngineInfoCallback: null, getEngineInfoCallback: null,
recognitionCameraCallBack: null, recognitionCameraCallBack: null,
testCallBack: null, testCallBack: null,
...@@ -179,6 +180,15 @@ export function initAir(_this) { ...@@ -179,6 +180,15 @@ export function initAir(_this) {
}; };
window.courseware.callOcMethod("getEngineInfo", {}); window.courseware.callOcMethod("getEngineInfo", {});
}, },
needUpdate(label, url, callback) {
_this.log(`===成功调用needUpdate===`);
// 调用原生获取机器信息
window.air.needUpdateCallback = (res) => {
callback && callback(res);
window.air.needUpdateCallback = null;
};
window.courseware.callOcMethod("needUpdate", { label: label, url: url });
},
startScanCode(callback) { startScanCode(callback) {
_this.log(`===成功调用startScanCode===`); _this.log(`===成功调用startScanCode===`);
// 调用原生开始扫码 // 调用原生开始扫码
......
...@@ -547,6 +547,12 @@ cc.Class({ ...@@ -547,6 +547,12 @@ cc.Class({
}); });
}); });
cc.find('middleLayer/ui/BtnNeedUpdate').on('click', () => {
window.courseware.needUpdate('检测到更新:', 'http://www.baidu.com', (res) => {
this.showLog(res);
});
});
cc.find('middleLayer/ui/BtnOpenTest').on('click', () => { cc.find('middleLayer/ui/BtnOpenTest').on('click', () => {
window.courseware.startTest('apple'); window.courseware.startTest('apple');
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment