Skip to content

apk_product / ForFun

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 537a48d1 537a48d130bb6e164526bbda7cfb109d097fa85c by 金学艇
Options

1.修改首页升级弹窗样式，并且可以网络加载升级内容和版本号

1 parent 72776ef7
Inline Side-by-side
Showing 9 changed files with 312 additions and 549 deletions
......@@ -90,19 +90,19 @@
"__id__": 81
},
{
"__id__": 123
"__id__": 118
}
],
"_active": true,
"_components": [
{
"__id__": 126
"__id__": 121
},
{
"__id__": 127
"__id__": 122
},
{
"__id__": 130
"__id__": 125
}
],
"_prefab": null,
......@@ -3915,7 +3915,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "34c62a97-f3cc-40e5-9f0c-4f2302291c14"
"__uuid__": "a66022bd-b80b-4cc3-b128-72e532329459"
},
"_type": 1,
"_sizeMode": 0,
......@@ -3970,43 +3970,108 @@
"__id__": 86
},
{
"__id__": 88
"__id__": 89
},
{
"__id__": 90
"__id__": 91
},
{
"__id__": 92
"__id__": 94
},
{
"__id__": 97
"__id__": 96
},
{
"__id__": 99
"__id__": 101
},
{
"__id__": 101
"__id__": 103
},
{
"__id__": 105
},
{
"__id__": 108
},
{
"__id__": 113
"__id__": 111
},
{
"__id__": 114
}
],
"_active": true,
"_components": [
{
"__id__": 116
},
{
"__id__": 119
"__id__": 117
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 500,
"height": 378
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float32Array",
"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": "ecOJDfdh9Nh4nDoxGp6MwV"
},
{
"__type__": "cc.Node",
"_name": "New Sprite",
"_objFlags": 0,
"_parent": {
"__id__": 85
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 121
"__id__": 87
},
{
"__id__": 122
"__id__": 88
}
],
"_prefab": null,
......@@ -4020,8 +4085,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 800,
"height": 600
"width": 227,
"height": 180
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -4033,7 +4098,7 @@
"ctor": "Float32Array",
"array": [
0,
0,
183,
0,
0,
0,
......@@ -4055,7 +4120,68 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "ecOJDfdh9Nh4nDoxGp6MwV"
"_id": "5bZRoUdp5NiYYOuomF4aaO"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "bcd8b799-299c-4445-8cc0-9650271df12e"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "2a4owIW7lPXpmn2/dl4pcV"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
},
"_enabled": true,
"alignMode": 1,
"_target": {
"__id__": 2
},
"_alignFlags": 1,
"_left": 0,
"_right": 0,
"_top": 129,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "ffkMoo4ZRMuaYcPIqvNzzN"
},
{
"__type__": "cc.Node",
......@@ -4068,7 +4194,7 @@
"_active": true,
"_components": [
{
"__id__": 87
"__id__": 90
}
],
"_prefab": null,
......@@ -4124,7 +4250,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 89
},
"_enabled": true,
"_materials": [],
......@@ -4156,21 +4282,24 @@
"_active": true,
"_components": [
{
"__id__": 89
"__id__": 92
},
{
"__id__": 93
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"r": 11,
"g": 16,
"b": 38,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 160,
"width": 234.92,
"height": 50.4
},
"_anchorPoint": {
......@@ -4183,7 +4312,7 @@
"ctor": "Float32Array",
"array": [
0,
267,
67.80000305175781,
0,
0,
0,
......@@ -4212,7 +4341,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 88
"__id__": 91
},
"_enabled": true,
"_materials": [
......@@ -4221,9 +4350,9 @@
}
],
"_useOriginalSize": false,
"_string": "更新版本",
"_N$string": "更新版本",
"_fontSize": 40,
"_string": "发现新版本(v1.0.0)",
"_N$string": "发现新版本(v1.0.0)",
"_fontSize": 28,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
......@@ -4238,6 +4367,33 @@
"_id": "cborM8/J5NNZD1raltNkJ9"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 91
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 1,
"_left": 0,
"_right": 0,
"_top": 96,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "c48MZP1dpLmqlZF31tPWKb"
},
{
"__type__": "cc.Node",
"_name": "ProgressLabel",
"_objFlags": 0,
......@@ -4248,7 +4404,7 @@
"_active": false,
"_components": [
{
"__id__": 91
"__id__": 95
}
],
"_prefab": null,
......@@ -4263,7 +4419,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 160,
"height": 40
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -4304,10 +4460,14 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 94
},
"_enabled": true,
"_materials": [],
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_useOriginalSize": false,
"_string": "更新进度",
"_N$string": "更新进度",
......@@ -4334,16 +4494,16 @@
},
"_children": [
{
"__id__": 93
"__id__": 97
}
],
"_active": false,
"_components": [
{
"__id__": 95
"__id__": 99
},
{
"__id__": 96
"__id__": 100
}
],
"_prefab": null,
......@@ -4399,13 +4559,13 @@
"_name": "bar",
"_objFlags": 0,
"_parent": {
"__id__": 92
"__id__": 96
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 98
}
],
"_prefab": null,
......@@ -4461,7 +4621,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 97
},
"_enabled": true,
"_materials": [
......@@ -4493,7 +4653,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 96
},
"_enabled": true,
"_materials": [
......@@ -4525,12 +4685,12 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 96
},
"_enabled": true,
"_N$totalLength": 500,
"_N$barSprite": {
"__id__": 94
"__id__": 98
},
"_N$mode": 0,
"_N$progress": 0.5,
......@@ -4548,7 +4708,7 @@
"_active": false,
"_components": [
{
"__id__": 98
"__id__": 102
}
],
"_prefab": null,
......@@ -4604,7 +4764,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 101
},
"_enabled": true,
"_materials": [],
......@@ -4636,7 +4796,7 @@
"_active": false,
"_components": [
{
"__id__": 100
"__id__": 104
}
],
"_prefab": null,
......@@ -4692,7 +4852,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
"__id__": 103
},
"_enabled": true,
"_materials": [],
......@@ -4720,17 +4880,10 @@
"_parent": {
"__id__": 85
},
"_children": [
{
"__id__": 102
}
],
"_children": [],
"_active": true,
"_components": [
{
"__id__": 104
},
{
"__id__": 106
},
{
......@@ -4748,8 +4901,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 240,
"height": 95
"width": 208,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -4760,8 +4913,8 @@
"__type__": "TypedArray",
"ctor": "Float32Array",
"array": [
-180,
-212.5,
-106,
-129,
0,
0,
0,
......@@ -4786,197 +4939,25 @@
"_id": "53RJLbC4JOlIcR3TFWPoSA"
},
{
"__type__": "cc.Node",
"_name": "Label",
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"_parent": {
"__id__": 101
"node": {
"__id__": 105
},
"_children": [],
"_active": true,
"_components": [
"_enabled": true,
"_materials": [
{
"__id__": 103
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 120,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float32Array",
"array": [
0,
11,
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": "5epXIl6N9CRKzFEpiC0bSC"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 102
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_useOriginalSize": false,
"_string": "立即更新",
"_N$string": "立即更新",
"_fontSize": 30,
"_lineHeight": 40,
"_enableWrapText": false,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "bcnnLolHZDipowZVEPozhR"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
},
"_enabled": true,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 105
}
],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 0,
"transition": 0,
"_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": null,
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 101
},
"_id": "ce1EAvmLhIPLBqKTv6jOy7"
},
{
"__type__": "cc.ClickEvent",
"target": null,
"component": "",
"_componentId": "280c3rsZJJKnZ9RqbALVwtK",
"handler": "hotUpdate",
"customEventData": ""
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "7a512432-eedc-4f9e-9ad7-092a537d7394"
"__uuid__": "e3b523b5-058c-4cf3-b348-a5e5eb0e531f"
},
"_type": 0,
"_sizeMode": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -4994,16 +4975,16 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
"__id__": 105
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 12,
"_left": 100,
"_left": 40,
"_right": 0,
"_top": 0,
"_bottom": 40,
"_bottom": 10,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
......@@ -5023,18 +5004,14 @@
"_parent": {
"__id__": 85
},
"_children": [
{
"__id__": 109
}
],
"_children": [],
"_active": true,
"_components": [
{
"__id__": 111
"__id__": 109
},
{
"__id__": 112
"__id__": 110
}
],
"_prefab": null,
......@@ -5048,8 +5025,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 240,
"height": 95
"width": 208,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -5060,8 +5037,8 @@
"__type__": "TypedArray",
"ctor": "Float32Array",
"array": [
180,
-212.5,
106,
-129,
0,
0,
0,
......@@ -5086,98 +5063,6 @@
"_id": "21M89ECGlJ+blnbr3yDzpR"
},
{
"__type__": "cc.Node",
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 108
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 110
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 120,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float32Array",
"array": [
0,
6,
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": "b712AOunZNhKR5iQEhOjeO"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 109
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_useOriginalSize": false,
"_string": "下次再说",
"_N$string": "下次再说",
"_fontSize": 30,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "37dMk/YgpL9b0174Ao98Ii"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
......@@ -5193,10 +5078,10 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "7a512432-eedc-4f9e-9ad7-092a537d7394"
"__uuid__": "46f6201b-d816-4cf7-ba50-338fc29158be"
},
"_type": 0,
"_sizeMode": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -5221,9 +5106,9 @@
"_target": null,
"_alignFlags": 36,
"_left": 0,
"_right": 100,
"_right": 40,
"_top": 0,
"_bottom": 40,
"_bottom": 10,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
......@@ -5238,128 +5123,6 @@
},
{
"__type__": "cc.Node",
"_name": "versionLabel",
"_objFlags": 0,
"_parent": {
"__id__": 85
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 114
},
{
"__id__": 115
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 500,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float32Array",
"array": [
-100,
180,
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": "b0T5QU/wdELIGYcaEKvtRn"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 113
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_useOriginalSize": false,
"_string": "淘好玩v1.0.2_20200227_debug",
"_N$string": "淘好玩v1.0.2_20200227_debug",
"_fontSize": 30,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_N$horizontalAlign": 0,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 2,
"_N$cacheMode": 0,
"_id": "f5lX71lctJXItd+iJxkklO"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 113
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 8,
"_left": 50,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "f8X/iJ2iZLj46pVQgARIpZ"
},
{
"__type__": "cc.Node",
"_name": "NewLabel",
"_objFlags": 0,
"_parent": {
......@@ -5369,10 +5132,10 @@
"_active": true,
"_components": [
{
"__id__": 117
"__id__": 112
},
{
"__id__": 118
"__id__": 113
}
],
"_prefab": null,
......@@ -5398,7 +5161,7 @@
"__type__": "TypedArray",
"ctor": "Float32Array",
"array": [
-290,
-140,
104.01899719238281,
0,
0,
......@@ -5428,7 +5191,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 116
"__id__": 111
},
"_enabled": true,
"_materials": [
......@@ -5458,7 +5221,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 116
"__id__": 111
},
"_enabled": true,
"alignMode": 1,
......@@ -5491,22 +5254,22 @@
"_active": true,
"_components": [
{
"__id__": 120
"__id__": 115
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"r": 133,
"g": 140,
"b": 150,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 700,
"height": 250
"width": 360,
"height": 96
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -5518,7 +5281,7 @@
"ctor": "Float32Array",
"array": [
0,
-50,
-7,
0,
0,
0,
......@@ -5547,7 +5310,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 119
"__id__": 114
},
"_enabled": true,
"_materials": [
......@@ -5558,8 +5321,8 @@
"_useOriginalSize": false,
"_string": "1.新增游戏大厅场景\n2.游戏大厅可以启动小游戏\n3.修复已知问题",
"_N$string": "1.新增游戏大厅场景\n2.游戏大厅可以启动小游戏\n3.修复已知问题",
"_fontSize": 30,
"_lineHeight": 40,
"_fontSize": 20,
"_lineHeight": 32,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
......@@ -5588,7 +5351,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "fdbdcb24-3de9-43af-8c16-3858b1d2dbb9"
"__uuid__": "0422cbf9-d228-4b63-9983-4cf68191ccf1"
},
"_type": 1,
"_sizeMode": 0,
......@@ -5613,19 +5376,19 @@
},
"_enabled": true,
"info": {
"__id__": 100
"__id__": 104
},
"fileProgress": {
"__id__": 96
"__id__": 100
},
"fileLabel": {
"__id__": 98
"__id__": 102
},
"close": {
"__id__": 86
"__id__": 89
},
"updateBtn": {
"__id__": 101
"__id__": 105
},
"_id": "8aIWz8zZxCP4axcGUrklyB"
},
......@@ -5640,10 +5403,10 @@
"_active": true,
"_components": [
{
"__id__": 124
"__id__": 119
},
{
"__id__": 125
"__id__": 120
}
],
"_prefab": null,
......@@ -5699,7 +5462,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 123
"__id__": 118
},
"_enabled": true,
"_materials": [
......@@ -5729,7 +5492,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 123
"__id__": 118
},
"_enabled": true,
"alignMode": 2,
......@@ -5808,14 +5571,14 @@
},
"targetAry": [
{
"__id__": 128
"__id__": 123
},
{
"__id__": 129
"__id__": 124
}
],
"panel": {
"__id__": 122
"__id__": 117
},
"manifestUrl": {
"__uuid__": "3182b77f-c5b1-435d-983a-41eab7118e39"
......
......@@ -80,6 +80,8 @@ cc.Class({
this._oSceneContext._iViewPagerIndex = 0;
let oSceneParameter = this._cApplication.getTopSceneParameter();
let aSceneParameter = this._cApplication.getSceneParameter();
cc.find("update/update_panel/update_btn", this.node).getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, 208, 100));
cc.find("update/update_panel/close_btn", this.node).getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, 208, 100));
cc.log("main->aSceneParameter..." + aSceneParameter);
cc.log("main->oSceneParameter..." + oSceneParameter);
//首页无参数
......@@ -109,7 +111,7 @@ cc.Class({
//搞通知框
this.initNotifyBox();
//升级相关
// this.getUpdateDesc();
this.getUpdateDesc();
this.getMainLayoutJsonRequest();
},
......@@ -143,11 +145,11 @@ cc.Class({
this._aFocusTargets[0]["view_pager_label" + i] = nodeNav;
}
} catch (error) {
cc.log("Business Exception:Get getUpdateDesc..." + error);
cc.log("Business Exception:Get initViewPager..." + error);
}
},
function (strResponse) {
cc.log("Business Error:Get getUpdateDesc..." + strResponse);
cc.log("Business Error:Get initViewPager..." + strResponse);
}, this, "uuid");
},
......@@ -166,17 +168,15 @@ cc.Class({
//升级框内容
getUpdateDesc: function () {
let updateTitle = cc.find("update/update_panel/update_title", this.node);
let updateInfo = cc.find("update/update_panel/update_info", this.node);
Network.ajax("GET", Common.TOPDRAW_API_SERVER + "updateDesc.json", null, null,
function (strResponse) {
try {
cc.log("获取升级内容。。。" + strResponse);
// cc.log("获取升级内容。。。" + strResponse);
var oJSONResult = JSON.parse(strResponse);
var self = this;
if (oJSONResult.businessCode == 'success') {
} else {
cc.log("Business Error:Get getUpdateDesc..." + oJSONResult.description);
}
updateTitle.getComponent(cc.Label).string = "发现新版本(" + oJSONResult.versionCode + ")";
updateInfo.getComponent(cc.Label).string = oJSONResult.desc;
} catch (error) {
cc.log("Business Exception:Get getUpdateDesc..." + error);
}
......@@ -1230,6 +1230,17 @@ cc.Class({
fiFrom.node.getChildByName("Name").active = false;
fiFrom.node.getComponent(ListCell).setUIWithoutFocus();
}
if (0 == fiFrom.node.getName().indexOf('update_btn')) {
cc.loader.loadRes("Hot_update/btn_update", cc.Texture2D, function (err, texture) {
fiFrom.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 0, fiFrom.node.width, fiFrom.node.height));
});
}
if (0 == fiFrom.node.getName().indexOf('close_btn')) {
cc.loader.loadRes("Hot_update/btn_cancel", cc.Texture2D, function (err, texture) {
fiFrom.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 0, fiFrom.node.width, fiFrom.node.height));
});
}
},
onAfterFocusChange: function (event) {
......@@ -1340,12 +1351,24 @@ cc.Class({
//这里想统一处理焦点框显示隐藏问题
// cc.log("节点名称：" + fiTo.node.getName());
if (0 == fiTo.node.getName().indexOf('view_pager_label') || 0 == fiTo.node.getName().indexOf('topNavi')
|| 0 == fiTo.node.getName().indexOf('topCell') || 0 == fiTo.node.getName().indexOf('backToTop')) {
|| 0 == fiTo.node.getName().indexOf('topCell') || 0 == fiTo.node.getName().indexOf('backToTop')
|| 0 == fiTo.node.getName().indexOf('update_btn') || 0 == fiTo.node.getName().indexOf('close_btn')) {
this._cFocus.hide();
} else {
if (!this._bIsScrollViewMoving)
this._cFocus.show();
}
if (0 == fiTo.node.getName().indexOf('update_btn')) {
cc.loader.loadRes("Hot_update/btn_update", cc.Texture2D, function (err, texture) {
fiTo.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, fiTo.node.height, fiTo.node.width, fiTo.node.height));
});
}
if (0 == fiTo.node.getName().indexOf('close_btn')) {
cc.loader.loadRes("Hot_update/btn_cancel", cc.Texture2D, function (err, texture) {
fiTo.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, fiTo.node.height, fiTo.node.width, fiTo.node.height));
});
}
},
doCurrentFocusTVLinkAction: function (strAction) {
......@@ -1361,29 +1384,6 @@ cc.Class({
for (let i = 0; i < aOperationList.length; i++) {
switch (aOperationList[i].action) {
case "changeLayout":
// let model = aOperationList[i].parameters.layoutPath; //获取要加载的框架
// if (-1 != model.indexOf("waterfall_recommend")) {
// this.getRightRecommendRequest(waterfall_recommend); //渲染右侧推荐框架
// } else if (-1 != model.indexOf("waterfall_parent")) {
// this.getRightRecommendRequest(waterfall_parent);
// } else if (-1 != model.indexOf("waterfall_course")) {
// this.getRightRecommendRequest(waterfall_course);
// } else if (-1 != model.indexOf("waterfall_primarySchool")) {
// this.getRightRecommendRequest(waterfall_primarySchool);
// } else if (-1 != model.indexOf("waterfall_three2six")) {
// this.getRightRecommendRequest(waterfall_three2six);
// }
// break;
// case "changeUI": //放在TVCanvas中全局管理
// let parameter = aOperationList[i].parameters.uiName; //更换界面的名称
// if (parameter=="collection") { //收藏
// this.getRightRecommendRequest(waterfall_recommend);
// } else if (parameter=="history") { //历史
// this.getRightRecommendRequest(waterfall_parent);
// } else if (parameter=="search") { //搜索
// this.getRightRecommendRequest(waterfall_course);
// }
// break;
default:
this.doTVLinkAction(aOperationList[i]);
break;
......@@ -1528,11 +1528,11 @@ cc.Class({
// this.panel.byteProgress.progress = 0;
this._bAbleHotUpdate = true;
// this._iSceneStatus = 1; //焦点框跳转层级
// cc.find("update", this.node).active = true; //显示出来更新面板
// this._cFocus.show();
// let fiHotUpdateBtn = cc.find('update/update_panel/update_btn', this.node).getComponent(FocusInfo); //热更新按钮
// this._cFocus.flyFocus(this._fiCurrentFocus, fiHotUpdateBtn, Common.MOVE_DIRECTION_RIGHT, null, null);
this._iSceneStatus = 1; //焦点框跳转层级
cc.find("update", this.node).active = true; //显示出来更新面板
// this._cFocus.hide();
let fiHotUpdateBtn = cc.find('update/update_panel/update_btn', this.node).getComponent(FocusInfo); //热更新按钮
this._cFocus.flyFocus(this._fiCurrentFocus, fiHotUpdateBtn, Common.MOVE_DIRECTION_RIGHT, null, null);
break;
default:
......@@ -1543,20 +1543,20 @@ cc.Class({
this._checkListener = null;
this._updating = false;
if (this._bAbleHotUpdate) {
this.hotUpdate(); //放在这里可以静默升级
}
// if (this._bAbleHotUpdate) {
// this.hotUpdate(); //放在这里可以静默升级
// }
},
hotUpdate: function () {
cc.log("hotUpdate start...");
//隐藏更新说明，显示更新进度条
cc.find("update/update_panel/NewLabel", this.node).active = false;
cc.find("update/update_panel/versionLabel", this.node).active = false;
cc.find("update/update_panel/update_info", this.node).active = false;
cc.find("update/update_panel/ProgressLabel", this.node).active = true;
cc.find("update/update_panel/fileProgress", this.node).active = true;
cc.find("update/update_panel/filep", this.node).active = true;
// cc.find("update/update_panel/NewLabel", this.node).active = false;//因为新的更新界面没有进度条，先不要显示更新进度
// cc.find("update/update_panel/versionLabel", this.node).active = false;
// cc.find("update/update_panel/update_info", this.node).active = false;
// cc.find("update/update_panel/ProgressLabel", this.node).active = true;
// cc.find("update/update_panel/fileProgress", this.node).active = true;
// cc.find("update/update_panel/filep", this.node).active = true;
if (this._am && !this._updating) {
this._am.setEventCallback(this.updateCb.bind(this));
......