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 315 additions and 552 deletions
...@@ -90,19 +90,19 @@ ...@@ -90,19 +90,19 @@
90 "__id__": 81 90 "__id__": 81
91 }, 91 },
92 { 92 {
93 "__id__": 123 93 "__id__": 118
94 } 94 }
95 ], 95 ],
96 "_active": true, 96 "_active": true,
97 "_components": [ 97 "_components": [
98 { 98 {
99 "__id__": 126 99 "__id__": 121
100 }, 100 },
101 { 101 {
102 "__id__": 127 102 "__id__": 122
103 }, 103 },
104 { 104 {
105 "__id__": 130 105 "__id__": 125
106 } 106 }
107 ], 107 ],
108 "_prefab": null, 108 "_prefab": null,
...@@ -3915,7 +3915,7 @@ ...@@ -3915,7 +3915,7 @@
3915 "_srcBlendFactor": 770, 3915 "_srcBlendFactor": 770,
3916 "_dstBlendFactor": 771, 3916 "_dstBlendFactor": 771,
3917 "_spriteFrame": { 3917 "_spriteFrame": {
3918 "__uuid__": "34c62a97-f3cc-40e5-9f0c-4f2302291c14" 3918 "__uuid__": "a66022bd-b80b-4cc3-b128-72e532329459"
3919 }, 3919 },
3920 "_type": 1, 3920 "_type": 1,
3921 "_sizeMode": 0, 3921 "_sizeMode": 0,
...@@ -3970,43 +3970,108 @@ ...@@ -3970,43 +3970,108 @@
3970 "__id__": 86 3970 "__id__": 86
3971 }, 3971 },
3972 { 3972 {
3973 "__id__": 88 3973 "__id__": 89
3974 }, 3974 },
3975 { 3975 {
3976 "__id__": 90 3976 "__id__": 91
3977 }, 3977 },
3978 { 3978 {
3979 "__id__": 92 3979 "__id__": 94
3980 }, 3980 },
3981 { 3981 {
3982 "__id__": 97 3982 "__id__": 96
3983 }, 3983 },
3984 { 3984 {
3985 "__id__": 99 3985 "__id__": 101
3986 }, 3986 },
3987 { 3987 {
3988 "__id__": 101 3988 "__id__": 103
3989 },
3990 {
3991 "__id__": 105
3989 }, 3992 },
3990 { 3993 {
3991 "__id__": 108 3994 "__id__": 108
3992 }, 3995 },
3993 { 3996 {
3994 "__id__": 113 3997 "__id__": 111
3995 }, 3998 },
3996 { 3999 {
4000 "__id__": 114
4001 }
4002 ],
4003 "_active": true,
4004 "_components": [
4005 {
3997 "__id__": 116 4006 "__id__": 116
3998 }, 4007 },
3999 { 4008 {
4000 "__id__": 119 4009 "__id__": 117
4001 } 4010 }
4002 ], 4011 ],
4012 "_prefab": null,
4013 "_opacity": 255,
4014 "_color": {
4015 "__type__": "cc.Color",
4016 "r": 255,
4017 "g": 255,
4018 "b": 255,
4019 "a": 255
4020 },
4021 "_contentSize": {
4022 "__type__": "cc.Size",
4023 "width": 500,
4024 "height": 378
4025 },
4026 "_anchorPoint": {
4027 "__type__": "cc.Vec2",
4028 "x": 0.5,
4029 "y": 0.5
4030 },
4031 "_trs": {
4032 "__type__": "TypedArray",
4033 "ctor": "Float32Array",
4034 "array": [
4035 0,
4036 -42,
4037 0,
4038 0,
4039 0,
4040 0,
4041 1,
4042 1,
4043 1,
4044 1
4045 ]
4046 },
4047 "_eulerAngles": {
4048 "__type__": "cc.Vec3",
4049 "x": 0,
4050 "y": 0,
4051 "z": 0
4052 },
4053 "_skewX": 0,
4054 "_skewY": 0,
4055 "_is3DNode": false,
4056 "_groupIndex": 0,
4057 "groupIndex": 0,
4058 "_id": "ecOJDfdh9Nh4nDoxGp6MwV"
4059 },
4060 {
4061 "__type__": "cc.Node",
4062 "_name": "New Sprite",
4063 "_objFlags": 0,
4064 "_parent": {
4065 "__id__": 85
4066 },
4067 "_children": [],
4003 "_active": true, 4068 "_active": true,
4004 "_components": [ 4069 "_components": [
4005 { 4070 {
4006 "__id__": 121 4071 "__id__": 87
4007 }, 4072 },
4008 { 4073 {
4009 "__id__": 122 4074 "__id__": 88
4010 } 4075 }
4011 ], 4076 ],
4012 "_prefab": null, 4077 "_prefab": null,
...@@ -4020,8 +4085,8 @@ ...@@ -4020,8 +4085,8 @@
4020 }, 4085 },
4021 "_contentSize": { 4086 "_contentSize": {
4022 "__type__": "cc.Size", 4087 "__type__": "cc.Size",
4023 "width": 800, 4088 "width": 227,
4024 "height": 600 4089 "height": 180
4025 }, 4090 },
4026 "_anchorPoint": { 4091 "_anchorPoint": {
4027 "__type__": "cc.Vec2", 4092 "__type__": "cc.Vec2",
...@@ -4033,7 +4098,7 @@ ...@@ -4033,7 +4098,7 @@
4033 "ctor": "Float32Array", 4098 "ctor": "Float32Array",
4034 "array": [ 4099 "array": [
4035 0, 4100 0,
4036 0, 4101 183,
4037 0, 4102 0,
4038 0, 4103 0,
4039 0, 4104 0,
...@@ -4055,7 +4120,68 @@ ...@@ -4055,7 +4120,68 @@
4055 "_is3DNode": false, 4120 "_is3DNode": false,
4056 "_groupIndex": 0, 4121 "_groupIndex": 0,
4057 "groupIndex": 0, 4122 "groupIndex": 0,
4058 "_id": "ecOJDfdh9Nh4nDoxGp6MwV" 4123 "_id": "5bZRoUdp5NiYYOuomF4aaO"
4124 },
4125 {
4126 "__type__": "cc.Sprite",
4127 "_name": "",
4128 "_objFlags": 0,
4129 "node": {
4130 "__id__": 86
4131 },
4132 "_enabled": true,
4133 "_materials": [
4134 {
4135 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
4136 }
4137 ],
4138 "_srcBlendFactor": 770,
4139 "_dstBlendFactor": 771,
4140 "_spriteFrame": {
4141 "__uuid__": "bcd8b799-299c-4445-8cc0-9650271df12e"
4142 },
4143 "_type": 0,
4144 "_sizeMode": 1,
4145 "_fillType": 0,
4146 "_fillCenter": {
4147 "__type__": "cc.Vec2",
4148 "x": 0,
4149 "y": 0
4150 },
4151 "_fillStart": 0,
4152 "_fillRange": 0,
4153 "_isTrimmedMode": true,
4154 "_atlas": null,
4155 "_id": "2a4owIW7lPXpmn2/dl4pcV"
4156 },
4157 {
4158 "__type__": "cc.Widget",
4159 "_name": "",
4160 "_objFlags": 0,
4161 "node": {
4162 "__id__": 86
4163 },
4164 "_enabled": true,
4165 "alignMode": 1,
4166 "_target": {
4167 "__id__": 2
4168 },
4169 "_alignFlags": 1,
4170 "_left": 0,
4171 "_right": 0,
4172 "_top": 129,
4173 "_bottom": 0,
4174 "_verticalCenter": 0,
4175 "_horizontalCenter": 0,
4176 "_isAbsLeft": true,
4177 "_isAbsRight": true,
4178 "_isAbsTop": true,
4179 "_isAbsBottom": true,
4180 "_isAbsHorizontalCenter": true,
4181 "_isAbsVerticalCenter": true,
4182 "_originalWidth": 0,
4183 "_originalHeight": 0,
4184 "_id": "ffkMoo4ZRMuaYcPIqvNzzN"
4059 }, 4185 },
4060 { 4186 {
4061 "__type__": "cc.Node", 4187 "__type__": "cc.Node",
...@@ -4068,7 +4194,7 @@ ...@@ -4068,7 +4194,7 @@
4068 "_active": true, 4194 "_active": true,
4069 "_components": [ 4195 "_components": [
4070 { 4196 {
4071 "__id__": 87 4197 "__id__": 90
4072 } 4198 }
4073 ], 4199 ],
4074 "_prefab": null, 4200 "_prefab": null,
...@@ -4124,7 +4250,7 @@ ...@@ -4124,7 +4250,7 @@
4124 "_name": "", 4250 "_name": "",
4125 "_objFlags": 0, 4251 "_objFlags": 0,
4126 "node": { 4252 "node": {
4127 "__id__": 86 4253 "__id__": 89
4128 }, 4254 },
4129 "_enabled": true, 4255 "_enabled": true,
4130 "_materials": [], 4256 "_materials": [],
...@@ -4156,21 +4282,24 @@ ...@@ -4156,21 +4282,24 @@
4156 "_active": true, 4282 "_active": true,
4157 "_components": [ 4283 "_components": [
4158 { 4284 {
4159 "__id__": 89 4285 "__id__": 92
4286 },
4287 {
4288 "__id__": 93
4160 } 4289 }
4161 ], 4290 ],
4162 "_prefab": null, 4291 "_prefab": null,
4163 "_opacity": 255, 4292 "_opacity": 255,
4164 "_color": { 4293 "_color": {
4165 "__type__": "cc.Color", 4294 "__type__": "cc.Color",
4166 "r": 255, 4295 "r": 11,
4167 "g": 255, 4296 "g": 16,
4168 "b": 255, 4297 "b": 38,
4169 "a": 255 4298 "a": 255
4170 }, 4299 },
4171 "_contentSize": { 4300 "_contentSize": {
4172 "__type__": "cc.Size", 4301 "__type__": "cc.Size",
4173 "width": 160, 4302 "width": 234.92,
4174 "height": 50.4 4303 "height": 50.4
4175 }, 4304 },
4176 "_anchorPoint": { 4305 "_anchorPoint": {
...@@ -4183,7 +4312,7 @@ ...@@ -4183,7 +4312,7 @@
4183 "ctor": "Float32Array", 4312 "ctor": "Float32Array",
4184 "array": [ 4313 "array": [
4185 0, 4314 0,
4186 267, 4315 67.80000305175781,
4187 0, 4316 0,
4188 0, 4317 0,
4189 0, 4318 0,
...@@ -4212,7 +4341,7 @@ ...@@ -4212,7 +4341,7 @@
4212 "_name": "", 4341 "_name": "",
4213 "_objFlags": 0, 4342 "_objFlags": 0,
4214 "node": { 4343 "node": {
4215 "__id__": 88 4344 "__id__": 91
4216 }, 4345 },
4217 "_enabled": true, 4346 "_enabled": true,
4218 "_materials": [ 4347 "_materials": [
...@@ -4221,9 +4350,9 @@ ...@@ -4221,9 +4350,9 @@
4221 } 4350 }
4222 ], 4351 ],
4223 "_useOriginalSize": false, 4352 "_useOriginalSize": false,
4224 "_string": "更新版本", 4353 "_string": "发现新版本(v1.0.0)",
4225 "_N$string": "更新版本", 4354 "_N$string": "发现新版本(v1.0.0)",
4226 "_fontSize": 40, 4355 "_fontSize": 28,
4227 "_lineHeight": 40, 4356 "_lineHeight": 40,
4228 "_enableWrapText": true, 4357 "_enableWrapText": true,
4229 "_N$file": null, 4358 "_N$file": null,
...@@ -4238,6 +4367,33 @@ ...@@ -4238,6 +4367,33 @@
4238 "_id": "cborM8/J5NNZD1raltNkJ9" 4367 "_id": "cborM8/J5NNZD1raltNkJ9"
4239 }, 4368 },
4240 { 4369 {
4370 "__type__": "cc.Widget",
4371 "_name": "",
4372 "_objFlags": 0,
4373 "node": {
4374 "__id__": 91
4375 },
4376 "_enabled": true,
4377 "alignMode": 1,
4378 "_target": null,
4379 "_alignFlags": 1,
4380 "_left": 0,
4381 "_right": 0,
4382 "_top": 96,
4383 "_bottom": 0,
4384 "_verticalCenter": 0,
4385 "_horizontalCenter": 0,
4386 "_isAbsLeft": true,
4387 "_isAbsRight": true,
4388 "_isAbsTop": true,
4389 "_isAbsBottom": true,
4390 "_isAbsHorizontalCenter": true,
4391 "_isAbsVerticalCenter": true,
4392 "_originalWidth": 0,
4393 "_originalHeight": 0,
4394 "_id": "c48MZP1dpLmqlZF31tPWKb"
4395 },
4396 {
4241 "__type__": "cc.Node", 4397 "__type__": "cc.Node",
4242 "_name": "ProgressLabel", 4398 "_name": "ProgressLabel",
4243 "_objFlags": 0, 4399 "_objFlags": 0,
...@@ -4248,7 +4404,7 @@ ...@@ -4248,7 +4404,7 @@
4248 "_active": false, 4404 "_active": false,
4249 "_components": [ 4405 "_components": [
4250 { 4406 {
4251 "__id__": 91 4407 "__id__": 95
4252 } 4408 }
4253 ], 4409 ],
4254 "_prefab": null, 4410 "_prefab": null,
...@@ -4263,7 +4419,7 @@ ...@@ -4263,7 +4419,7 @@
4263 "_contentSize": { 4419 "_contentSize": {
4264 "__type__": "cc.Size", 4420 "__type__": "cc.Size",
4265 "width": 160, 4421 "width": 160,
4266 "height": 40 4422 "height": 50.4
4267 }, 4423 },
4268 "_anchorPoint": { 4424 "_anchorPoint": {
4269 "__type__": "cc.Vec2", 4425 "__type__": "cc.Vec2",
...@@ -4304,10 +4460,14 @@ ...@@ -4304,10 +4460,14 @@
4304 "_name": "", 4460 "_name": "",
4305 "_objFlags": 0, 4461 "_objFlags": 0,
4306 "node": { 4462 "node": {
4307 "__id__": 90 4463 "__id__": 94
4308 }, 4464 },
4309 "_enabled": true, 4465 "_enabled": true,
4310 "_materials": [], 4466 "_materials": [
4467 {
4468 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
4469 }
4470 ],
4311 "_useOriginalSize": false, 4471 "_useOriginalSize": false,
4312 "_string": "更新进度", 4472 "_string": "更新进度",
4313 "_N$string": "更新进度", 4473 "_N$string": "更新进度",
...@@ -4334,16 +4494,16 @@ ...@@ -4334,16 +4494,16 @@
4334 }, 4494 },
4335 "_children": [ 4495 "_children": [
4336 { 4496 {
4337 "__id__": 93 4497 "__id__": 97
4338 } 4498 }
4339 ], 4499 ],
4340 "_active": false, 4500 "_active": false,
4341 "_components": [ 4501 "_components": [
4342 { 4502 {
4343 "__id__": 95 4503 "__id__": 99
4344 }, 4504 },
4345 { 4505 {
4346 "__id__": 96 4506 "__id__": 100
4347 } 4507 }
4348 ], 4508 ],
4349 "_prefab": null, 4509 "_prefab": null,
...@@ -4399,13 +4559,13 @@ ...@@ -4399,13 +4559,13 @@
4399 "_name": "bar", 4559 "_name": "bar",
4400 "_objFlags": 0, 4560 "_objFlags": 0,
4401 "_parent": { 4561 "_parent": {
4402 "__id__": 92 4562 "__id__": 96
4403 }, 4563 },
4404 "_children": [], 4564 "_children": [],
4405 "_active": true, 4565 "_active": true,
4406 "_components": [ 4566 "_components": [
4407 { 4567 {
4408 "__id__": 94 4568 "__id__": 98
4409 } 4569 }
4410 ], 4570 ],
4411 "_prefab": null, 4571 "_prefab": null,
...@@ -4461,7 +4621,7 @@ ...@@ -4461,7 +4621,7 @@
4461 "_name": "", 4621 "_name": "",
4462 "_objFlags": 0, 4622 "_objFlags": 0,
4463 "node": { 4623 "node": {
4464 "__id__": 93 4624 "__id__": 97
4465 }, 4625 },
4466 "_enabled": true, 4626 "_enabled": true,
4467 "_materials": [ 4627 "_materials": [
...@@ -4493,7 +4653,7 @@ ...@@ -4493,7 +4653,7 @@
4493 "_name": "", 4653 "_name": "",
4494 "_objFlags": 0, 4654 "_objFlags": 0,
4495 "node": { 4655 "node": {
4496 "__id__": 92 4656 "__id__": 96
4497 }, 4657 },
4498 "_enabled": true, 4658 "_enabled": true,
4499 "_materials": [ 4659 "_materials": [
...@@ -4525,12 +4685,12 @@ ...@@ -4525,12 +4685,12 @@
4525 "_name": "", 4685 "_name": "",
4526 "_objFlags": 0, 4686 "_objFlags": 0,
4527 "node": { 4687 "node": {
4528 "__id__": 92 4688 "__id__": 96
4529 }, 4689 },
4530 "_enabled": true, 4690 "_enabled": true,
4531 "_N$totalLength": 500, 4691 "_N$totalLength": 500,
4532 "_N$barSprite": { 4692 "_N$barSprite": {
4533 "__id__": 94 4693 "__id__": 98
4534 }, 4694 },
4535 "_N$mode": 0, 4695 "_N$mode": 0,
4536 "_N$progress": 0.5, 4696 "_N$progress": 0.5,
...@@ -4548,7 +4708,7 @@ ...@@ -4548,7 +4708,7 @@
4548 "_active": false, 4708 "_active": false,
4549 "_components": [ 4709 "_components": [
4550 { 4710 {
4551 "__id__": 98 4711 "__id__": 102
4552 } 4712 }
4553 ], 4713 ],
4554 "_prefab": null, 4714 "_prefab": null,
...@@ -4604,7 +4764,7 @@ ...@@ -4604,7 +4764,7 @@
4604 "_name": "", 4764 "_name": "",
4605 "_objFlags": 0, 4765 "_objFlags": 0,
4606 "node": { 4766 "node": {
4607 "__id__": 97 4767 "__id__": 101
4608 }, 4768 },
4609 "_enabled": true, 4769 "_enabled": true,
4610 "_materials": [], 4770 "_materials": [],
...@@ -4636,7 +4796,7 @@ ...@@ -4636,7 +4796,7 @@
4636 "_active": false, 4796 "_active": false,
4637 "_components": [ 4797 "_components": [
4638 { 4798 {
4639 "__id__": 100 4799 "__id__": 104
4640 } 4800 }
4641 ], 4801 ],
4642 "_prefab": null, 4802 "_prefab": null,
...@@ -4692,7 +4852,7 @@ ...@@ -4692,7 +4852,7 @@
4692 "_name": "", 4852 "_name": "",
4693 "_objFlags": 0, 4853 "_objFlags": 0,
4694 "node": { 4854 "node": {
4695 "__id__": 99 4855 "__id__": 103
4696 }, 4856 },
4697 "_enabled": true, 4857 "_enabled": true,
4698 "_materials": [], 4858 "_materials": [],
...@@ -4720,17 +4880,10 @@ ...@@ -4720,17 +4880,10 @@
4720 "_parent": { 4880 "_parent": {
4721 "__id__": 85 4881 "__id__": 85
4722 }, 4882 },
4723 "_children": [ 4883 "_children": [],
4724 {
4725 "__id__": 102
4726 }
4727 ],
4728 "_active": true, 4884 "_active": true,
4729 "_components": [ 4885 "_components": [
4730 { 4886 {
4731 "__id__": 104
4732 },
4733 {
4734 "__id__": 106 4887 "__id__": 106
4735 }, 4888 },
4736 { 4889 {
...@@ -4748,8 +4901,8 @@ ...@@ -4748,8 +4901,8 @@
4748 }, 4901 },
4749 "_contentSize": { 4902 "_contentSize": {
4750 "__type__": "cc.Size", 4903 "__type__": "cc.Size",
4751 "width": 240, 4904 "width": 208,
4752 "height": 95 4905 "height": 100
4753 }, 4906 },
4754 "_anchorPoint": { 4907 "_anchorPoint": {
4755 "__type__": "cc.Vec2", 4908 "__type__": "cc.Vec2",
...@@ -4760,8 +4913,8 @@ ...@@ -4760,8 +4913,8 @@
4760 "__type__": "TypedArray", 4913 "__type__": "TypedArray",
4761 "ctor": "Float32Array", 4914 "ctor": "Float32Array",
4762 "array": [ 4915 "array": [
4763 -180, 4916 -106,
4764 -212.5, 4917 -129,
4765 0, 4918 0,
4766 0, 4919 0,
4767 0, 4920 0,
...@@ -4786,197 +4939,25 @@ ...@@ -4786,197 +4939,25 @@
4786 "_id": "53RJLbC4JOlIcR3TFWPoSA" 4939 "_id": "53RJLbC4JOlIcR3TFWPoSA"
4787 }, 4940 },
4788 { 4941 {
4789 "__type__": "cc.Node", 4942 "__type__": "cc.Sprite",
4790 "_name": "Label", 4943 "_name": "",
4791 "_objFlags": 0, 4944 "_objFlags": 0,
4792 "_parent": { 4945 "node": {
4793 "__id__": 101 4946 "__id__": 105
4794 }, 4947 },
4795 "_children": [], 4948 "_enabled": true,
4796 "_active": true, 4949 "_materials": [
4797 "_components": [
4798 { 4950 {
4799 "__id__": 103 4951 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
4800 } 4952 }
4801 ], 4953 ],
4802 "_prefab": null, 4954 "_srcBlendFactor": 770,
4803 "_opacity": 255, 4955 "_dstBlendFactor": 771,
4804 "_color": { 4956 "_spriteFrame": {
4805 "__type__": "cc.Color", 4957 "__uuid__": "e3b523b5-058c-4cf3-b348-a5e5eb0e531f"
4806 "r": 0,
4807 "g": 0,
4808 "b": 0,
4809 "a": 255
4810 },
4811 "_contentSize": {
4812 "__type__": "cc.Size",
4813 "width": 120,
4814 "height": 50.4
4815 },
4816 "_anchorPoint": {
4817 "__type__": "cc.Vec2",
4818 "x": 0.5,
4819 "y": 0.5
4820 },
4821 "_trs": {
4822 "__type__": "TypedArray",
4823 "ctor": "Float32Array",
4824 "array": [
4825 0,
4826 11,
4827 0,
4828 0,
4829 0,
4830 0,
4831 1,
4832 1,
4833 1,
4834 1
4835 ]
4836 },
4837 "_eulerAngles": {
4838 "__type__": "cc.Vec3",
4839 "x": 0,
4840 "y": 0,
4841 "z": 0
4842 },
4843 "_skewX": 0,
4844 "_skewY": 0,
4845 "_is3DNode": false,
4846 "_groupIndex": 0,
4847 "groupIndex": 0,
4848 "_id": "5epXIl6N9CRKzFEpiC0bSC"
4849 },
4850 {
4851 "__type__": "cc.Label",
4852 "_name": "",
4853 "_objFlags": 0,
4854 "node": {
4855 "__id__": 102
4856 },
4857 "_enabled": true,
4858 "_materials": [
4859 {
4860 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
4861 }
4862 ],
4863 "_useOriginalSize": false,
4864 "_string": "立即更新",
4865 "_N$string": "立即更新",
4866 "_fontSize": 30,
4867 "_lineHeight": 40,
4868 "_enableWrapText": false,
4869 "_N$file": null,
4870 "_isSystemFontUsed": true,
4871 "_spacingX": 0,
4872 "_batchAsBitmap": false,
4873 "_N$horizontalAlign": 1,
4874 "_N$verticalAlign": 1,
4875 "_N$fontFamily": "Arial",
4876 "_N$overflow": 0,
4877 "_N$cacheMode": 0,
4878 "_id": "bcnnLolHZDipowZVEPozhR"
4879 },
4880 {
4881 "__type__": "cc.Button",
4882 "_name": "",
4883 "_objFlags": 0,
4884 "node": {
4885 "__id__": 101
4886 },
4887 "_enabled": true,
4888 "duration": 0.1,
4889 "zoomScale": 1.2,
4890 "clickEvents": [
4891 {
4892 "__id__": 105
4893 }
4894 ],
4895 "_N$interactable": true,
4896 "_N$enableAutoGrayEffect": false,
4897 "_N$transition": 0,
4898 "transition": 0,
4899 "_N$normalColor": {
4900 "__type__": "cc.Color",
4901 "r": 230,
4902 "g": 230,
4903 "b": 230,
4904 "a": 255
4905 },
4906 "_N$pressedColor": {
4907 "__type__": "cc.Color",
4908 "r": 200,
4909 "g": 200,
4910 "b": 200,
4911 "a": 255
4912 },
4913 "pressedColor": {
4914 "__type__": "cc.Color",
4915 "r": 200,
4916 "g": 200,
4917 "b": 200,
4918 "a": 255
4919 },
4920 "_N$hoverColor": {
4921 "__type__": "cc.Color",
4922 "r": 255,
4923 "g": 255,
4924 "b": 255,
4925 "a": 255
4926 },
4927 "hoverColor": {
4928 "__type__": "cc.Color",
4929 "r": 255,
4930 "g": 255,
4931 "b": 255,
4932 "a": 255
4933 },
4934 "_N$disabledColor": {
4935 "__type__": "cc.Color",
4936 "r": 120,
4937 "g": 120,
4938 "b": 120,
4939 "a": 200
4940 },
4941 "_N$normalSprite": null,
4942 "_N$pressedSprite": null,
4943 "pressedSprite": null,
4944 "_N$hoverSprite": null,
4945 "hoverSprite": null,
4946 "_N$disabledSprite": null,
4947 "_N$target": {
4948 "__id__": 101
4949 },
4950 "_id": "ce1EAvmLhIPLBqKTv6jOy7"
4951 },
4952 {
4953 "__type__": "cc.ClickEvent",
4954 "target": null,
4955 "component": "",
4956 "_componentId": "280c3rsZJJKnZ9RqbALVwtK",
4957 "handler": "hotUpdate",
4958 "customEventData": ""
4959 },
4960 {
4961 "__type__": "cc.Sprite",
4962 "_name": "",
4963 "_objFlags": 0,
4964 "node": {
4965 "__id__": 101
4966 },
4967 "_enabled": true,
4968 "_materials": [
4969 {
4970 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
4971 }
4972 ],
4973 "_srcBlendFactor": 770,
4974 "_dstBlendFactor": 771,
4975 "_spriteFrame": {
4976 "__uuid__": "7a512432-eedc-4f9e-9ad7-092a537d7394"
4977 }, 4958 },
4978 "_type": 0, 4959 "_type": 0,
4979 "_sizeMode": 1, 4960 "_sizeMode": 0,
4980 "_fillType": 0, 4961 "_fillType": 0,
4981 "_fillCenter": { 4962 "_fillCenter": {
4982 "__type__": "cc.Vec2", 4963 "__type__": "cc.Vec2",
...@@ -4994,16 +4975,16 @@ ...@@ -4994,16 +4975,16 @@
4994 "_name": "", 4975 "_name": "",
4995 "_objFlags": 0, 4976 "_objFlags": 0,
4996 "node": { 4977 "node": {
4997 "__id__": 101 4978 "__id__": 105
4998 }, 4979 },
4999 "_enabled": true, 4980 "_enabled": true,
5000 "alignMode": 1, 4981 "alignMode": 1,
5001 "_target": null, 4982 "_target": null,
5002 "_alignFlags": 12, 4983 "_alignFlags": 12,
5003 "_left": 100, 4984 "_left": 40,
5004 "_right": 0, 4985 "_right": 0,
5005 "_top": 0, 4986 "_top": 0,
5006 "_bottom": 40, 4987 "_bottom": 10,
5007 "_verticalCenter": 0, 4988 "_verticalCenter": 0,
5008 "_horizontalCenter": 0, 4989 "_horizontalCenter": 0,
5009 "_isAbsLeft": true, 4990 "_isAbsLeft": true,
...@@ -5023,18 +5004,14 @@ ...@@ -5023,18 +5004,14 @@
5023 "_parent": { 5004 "_parent": {
5024 "__id__": 85 5005 "__id__": 85
5025 }, 5006 },
5026 "_children": [ 5007 "_children": [],
5027 {
5028 "__id__": 109
5029 }
5030 ],
5031 "_active": true, 5008 "_active": true,
5032 "_components": [ 5009 "_components": [
5033 { 5010 {
5034 "__id__": 111 5011 "__id__": 109
5035 }, 5012 },
5036 { 5013 {
5037 "__id__": 112 5014 "__id__": 110
5038 } 5015 }
5039 ], 5016 ],
5040 "_prefab": null, 5017 "_prefab": null,
...@@ -5048,8 +5025,8 @@ ...@@ -5048,8 +5025,8 @@
5048 }, 5025 },
5049 "_contentSize": { 5026 "_contentSize": {
5050 "__type__": "cc.Size", 5027 "__type__": "cc.Size",
5051 "width": 240, 5028 "width": 208,
5052 "height": 95 5029 "height": 100
5053 }, 5030 },
5054 "_anchorPoint": { 5031 "_anchorPoint": {
5055 "__type__": "cc.Vec2", 5032 "__type__": "cc.Vec2",
...@@ -5060,8 +5037,8 @@ ...@@ -5060,8 +5037,8 @@
5060 "__type__": "TypedArray", 5037 "__type__": "TypedArray",
5061 "ctor": "Float32Array", 5038 "ctor": "Float32Array",
5062 "array": [ 5039 "array": [
5063 180, 5040 106,
5064 -212.5, 5041 -129,
5065 0, 5042 0,
5066 0, 5043 0,
5067 0, 5044 0,
...@@ -5086,98 +5063,6 @@ ...@@ -5086,98 +5063,6 @@
5086 "_id": "21M89ECGlJ+blnbr3yDzpR" 5063 "_id": "21M89ECGlJ+blnbr3yDzpR"
5087 }, 5064 },
5088 { 5065 {
5089 "__type__": "cc.Node",
5090 "_name": "New Label",
5091 "_objFlags": 0,
5092 "_parent": {
5093 "__id__": 108
5094 },
5095 "_children": [],
5096 "_active": true,
5097 "_components": [
5098 {
5099 "__id__": 110
5100 }
5101 ],
5102 "_prefab": null,
5103 "_opacity": 255,
5104 "_color": {
5105 "__type__": "cc.Color",
5106 "r": 0,
5107 "g": 0,
5108 "b": 0,
5109 "a": 255
5110 },
5111 "_contentSize": {
5112 "__type__": "cc.Size",
5113 "width": 120,
5114 "height": 50.4
5115 },
5116 "_anchorPoint": {
5117 "__type__": "cc.Vec2",
5118 "x": 0.5,
5119 "y": 0.5
5120 },
5121 "_trs": {
5122 "__type__": "TypedArray",
5123 "ctor": "Float32Array",
5124 "array": [
5125 0,
5126 6,
5127 0,
5128 0,
5129 0,
5130 0,
5131 1,
5132 1,
5133 1,
5134 1
5135 ]
5136 },
5137 "_eulerAngles": {
5138 "__type__": "cc.Vec3",
5139 "x": 0,
5140 "y": 0,
5141 "z": 0
5142 },
5143 "_skewX": 0,
5144 "_skewY": 0,
5145 "_is3DNode": false,
5146 "_groupIndex": 0,
5147 "groupIndex": 0,
5148 "_id": "b712AOunZNhKR5iQEhOjeO"
5149 },
5150 {
5151 "__type__": "cc.Label",
5152 "_name": "",
5153 "_objFlags": 0,
5154 "node": {
5155 "__id__": 109
5156 },
5157 "_enabled": true,
5158 "_materials": [
5159 {
5160 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
5161 }
5162 ],
5163 "_useOriginalSize": false,
5164 "_string": "下次再说",
5165 "_N$string": "下次再说",
5166 "_fontSize": 30,
5167 "_lineHeight": 40,
5168 "_enableWrapText": true,
5169 "_N$file": null,
5170 "_isSystemFontUsed": true,
5171 "_spacingX": 0,
5172 "_batchAsBitmap": false,
5173 "_N$horizontalAlign": 1,
5174 "_N$verticalAlign": 1,
5175 "_N$fontFamily": "Arial",
5176 "_N$overflow": 0,
5177 "_N$cacheMode": 0,
5178 "_id": "37dMk/YgpL9b0174Ao98Ii"
5179 },
5180 {
5181 "__type__": "cc.Sprite", 5066 "__type__": "cc.Sprite",
5182 "_name": "", 5067 "_name": "",
5183 "_objFlags": 0, 5068 "_objFlags": 0,
...@@ -5193,10 +5078,10 @@ ...@@ -5193,10 +5078,10 @@
5193 "_srcBlendFactor": 770, 5078 "_srcBlendFactor": 770,
5194 "_dstBlendFactor": 771, 5079 "_dstBlendFactor": 771,
5195 "_spriteFrame": { 5080 "_spriteFrame": {
5196 "__uuid__": "7a512432-eedc-4f9e-9ad7-092a537d7394" 5081 "__uuid__": "46f6201b-d816-4cf7-ba50-338fc29158be"
5197 }, 5082 },
5198 "_type": 0, 5083 "_type": 0,
5199 "_sizeMode": 1, 5084 "_sizeMode": 0,
5200 "_fillType": 0, 5085 "_fillType": 0,
5201 "_fillCenter": { 5086 "_fillCenter": {
5202 "__type__": "cc.Vec2", 5087 "__type__": "cc.Vec2",
...@@ -5221,9 +5106,9 @@ ...@@ -5221,9 +5106,9 @@
5221 "_target": null, 5106 "_target": null,
5222 "_alignFlags": 36, 5107 "_alignFlags": 36,
5223 "_left": 0, 5108 "_left": 0,
5224 "_right": 100, 5109 "_right": 40,
5225 "_top": 0, 5110 "_top": 0,
5226 "_bottom": 40, 5111 "_bottom": 10,
5227 "_verticalCenter": 0, 5112 "_verticalCenter": 0,
5228 "_horizontalCenter": 0, 5113 "_horizontalCenter": 0,
5229 "_isAbsLeft": true, 5114 "_isAbsLeft": true,
...@@ -5238,128 +5123,6 @@ ...@@ -5238,128 +5123,6 @@
5238 }, 5123 },
5239 { 5124 {
5240 "__type__": "cc.Node", 5125 "__type__": "cc.Node",
5241 "_name": "versionLabel",
5242 "_objFlags": 0,
5243 "_parent": {
5244 "__id__": 85
5245 },
5246 "_children": [],
5247 "_active": true,
5248 "_components": [
5249 {
5250 "__id__": 114
5251 },
5252 {
5253 "__id__": 115
5254 }
5255 ],
5256 "_prefab": null,
5257 "_opacity": 255,
5258 "_color": {
5259 "__type__": "cc.Color",
5260 "r": 255,
5261 "g": 255,
5262 "b": 255,
5263 "a": 255
5264 },
5265 "_contentSize": {
5266 "__type__": "cc.Size",
5267 "width": 500,
5268 "height": 50.4
5269 },
5270 "_anchorPoint": {
5271 "__type__": "cc.Vec2",
5272 "x": 0.5,
5273 "y": 0.5
5274 },
5275 "_trs": {
5276 "__type__": "TypedArray",
5277 "ctor": "Float32Array",
5278 "array": [
5279 -100,
5280 180,
5281 0,
5282 0,
5283 0,
5284 0,
5285 1,
5286 1,
5287 1,
5288 1
5289 ]
5290 },
5291 "_eulerAngles": {
5292 "__type__": "cc.Vec3",
5293 "x": 0,
5294 "y": 0,
5295 "z": 0
5296 },
5297 "_skewX": 0,
5298 "_skewY": 0,
5299 "_is3DNode": false,
5300 "_groupIndex": 0,
5301 "groupIndex": 0,
5302 "_id": "b0T5QU/wdELIGYcaEKvtRn"
5303 },
5304 {
5305 "__type__": "cc.Label",
5306 "_name": "",
5307 "_objFlags": 0,
5308 "node": {
5309 "__id__": 113
5310 },
5311 "_enabled": true,
5312 "_materials": [
5313 {
5314 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
5315 }
5316 ],
5317 "_useOriginalSize": false,
5318 "_string": "淘好玩v1.0.2_20200227_debug",
5319 "_N$string": "淘好玩v1.0.2_20200227_debug",
5320 "_fontSize": 30,
5321 "_lineHeight": 40,
5322 "_enableWrapText": true,
5323 "_N$file": null,
5324 "_isSystemFontUsed": true,
5325 "_spacingX": 0,
5326 "_batchAsBitmap": false,
5327 "_N$horizontalAlign": 0,
5328 "_N$verticalAlign": 1,
5329 "_N$fontFamily": "Arial",
5330 "_N$overflow": 2,
5331 "_N$cacheMode": 0,
5332 "_id": "f5lX71lctJXItd+iJxkklO"
5333 },
5334 {
5335 "__type__": "cc.Widget",
5336 "_name": "",
5337 "_objFlags": 0,
5338 "node": {
5339 "__id__": 113
5340 },
5341 "_enabled": true,
5342 "alignMode": 1,
5343 "_target": null,
5344 "_alignFlags": 8,
5345 "_left": 50,
5346 "_right": 0,
5347 "_top": 0,
5348 "_bottom": 0,
5349 "_verticalCenter": 0,
5350 "_horizontalCenter": 0,
5351 "_isAbsLeft": true,
5352 "_isAbsRight": true,
5353 "_isAbsTop": true,
5354 "_isAbsBottom": true,
5355 "_isAbsHorizontalCenter": true,
5356 "_isAbsVerticalCenter": true,
5357 "_originalWidth": 0,
5358 "_originalHeight": 0,
5359 "_id": "f8X/iJ2iZLj46pVQgARIpZ"
5360 },
5361 {
5362 "__type__": "cc.Node",
5363 "_name": "NewLabel", 5126 "_name": "NewLabel",
5364 "_objFlags": 0, 5127 "_objFlags": 0,
5365 "_parent": { 5128 "_parent": {
...@@ -5369,10 +5132,10 @@ ...@@ -5369,10 +5132,10 @@
5369 "_active": true, 5132 "_active": true,
5370 "_components": [ 5133 "_components": [
5371 { 5134 {
5372 "__id__": 117 5135 "__id__": 112
5373 }, 5136 },
5374 { 5137 {
5375 "__id__": 118 5138 "__id__": 113
5376 } 5139 }
5377 ], 5140 ],
5378 "_prefab": null, 5141 "_prefab": null,
...@@ -5398,7 +5161,7 @@ ...@@ -5398,7 +5161,7 @@
5398 "__type__": "TypedArray", 5161 "__type__": "TypedArray",
5399 "ctor": "Float32Array", 5162 "ctor": "Float32Array",
5400 "array": [ 5163 "array": [
5401 -290, 5164 -140,
5402 104.01899719238281, 5165 104.01899719238281,
5403 0, 5166 0,
5404 0, 5167 0,
...@@ -5428,7 +5191,7 @@ ...@@ -5428,7 +5191,7 @@
5428 "_name": "", 5191 "_name": "",
5429 "_objFlags": 0, 5192 "_objFlags": 0,
5430 "node": { 5193 "node": {
5431 "__id__": 116 5194 "__id__": 111
5432 }, 5195 },
5433 "_enabled": true, 5196 "_enabled": true,
5434 "_materials": [ 5197 "_materials": [
...@@ -5458,7 +5221,7 @@ ...@@ -5458,7 +5221,7 @@
5458 "_name": "", 5221 "_name": "",
5459 "_objFlags": 0, 5222 "_objFlags": 0,
5460 "node": { 5223 "node": {
5461 "__id__": 116 5224 "__id__": 111
5462 }, 5225 },
5463 "_enabled": true, 5226 "_enabled": true,
5464 "alignMode": 1, 5227 "alignMode": 1,
...@@ -5491,22 +5254,22 @@ ...@@ -5491,22 +5254,22 @@
5491 "_active": true, 5254 "_active": true,
5492 "_components": [ 5255 "_components": [
5493 { 5256 {
5494 "__id__": 120 5257 "__id__": 115
5495 } 5258 }
5496 ], 5259 ],
5497 "_prefab": null, 5260 "_prefab": null,
5498 "_opacity": 255, 5261 "_opacity": 255,
5499 "_color": { 5262 "_color": {
5500 "__type__": "cc.Color", 5263 "__type__": "cc.Color",
5501 "r": 255, 5264 "r": 133,
5502 "g": 255, 5265 "g": 140,
5503 "b": 255, 5266 "b": 150,
5504 "a": 255 5267 "a": 255
5505 }, 5268 },
5506 "_contentSize": { 5269 "_contentSize": {
5507 "__type__": "cc.Size", 5270 "__type__": "cc.Size",
5508 "width": 700, 5271 "width": 360,
5509 "height": 250 5272 "height": 96
5510 }, 5273 },
5511 "_anchorPoint": { 5274 "_anchorPoint": {
5512 "__type__": "cc.Vec2", 5275 "__type__": "cc.Vec2",
...@@ -5518,7 +5281,7 @@ ...@@ -5518,7 +5281,7 @@
5518 "ctor": "Float32Array", 5281 "ctor": "Float32Array",
5519 "array": [ 5282 "array": [
5520 0, 5283 0,
5521 -50, 5284 -7,
5522 0, 5285 0,
5523 0, 5286 0,
5524 0, 5287 0,
...@@ -5547,7 +5310,7 @@ ...@@ -5547,7 +5310,7 @@
5547 "_name": "", 5310 "_name": "",
5548 "_objFlags": 0, 5311 "_objFlags": 0,
5549 "node": { 5312 "node": {
5550 "__id__": 119 5313 "__id__": 114
5551 }, 5314 },
5552 "_enabled": true, 5315 "_enabled": true,
5553 "_materials": [ 5316 "_materials": [
...@@ -5558,8 +5321,8 @@ ...@@ -5558,8 +5321,8 @@
5558 "_useOriginalSize": false, 5321 "_useOriginalSize": false,
5559 "_string": "1.新增游戏大厅场景\n2.游戏大厅可以启动小游戏\n3.修复已知问题", 5322 "_string": "1.新增游戏大厅场景\n2.游戏大厅可以启动小游戏\n3.修复已知问题",
5560 "_N$string": "1.新增游戏大厅场景\n2.游戏大厅可以启动小游戏\n3.修复已知问题", 5323 "_N$string": "1.新增游戏大厅场景\n2.游戏大厅可以启动小游戏\n3.修复已知问题",
5561 "_fontSize": 30, 5324 "_fontSize": 20,
5562 "_lineHeight": 40, 5325 "_lineHeight": 32,
5563 "_enableWrapText": true, 5326 "_enableWrapText": true,
5564 "_N$file": null, 5327 "_N$file": null,
5565 "_isSystemFontUsed": true, 5328 "_isSystemFontUsed": true,
...@@ -5588,7 +5351,7 @@ ...@@ -5588,7 +5351,7 @@
5588 "_srcBlendFactor": 770, 5351 "_srcBlendFactor": 770,
5589 "_dstBlendFactor": 771, 5352 "_dstBlendFactor": 771,
5590 "_spriteFrame": { 5353 "_spriteFrame": {
5591 "__uuid__": "fdbdcb24-3de9-43af-8c16-3858b1d2dbb9" 5354 "__uuid__": "0422cbf9-d228-4b63-9983-4cf68191ccf1"
5592 }, 5355 },
5593 "_type": 1, 5356 "_type": 1,
5594 "_sizeMode": 0, 5357 "_sizeMode": 0,
...@@ -5613,19 +5376,19 @@ ...@@ -5613,19 +5376,19 @@
5613 }, 5376 },
5614 "_enabled": true, 5377 "_enabled": true,
5615 "info": { 5378 "info": {
5616 "__id__": 100 5379 "__id__": 104
5617 }, 5380 },
5618 "fileProgress": { 5381 "fileProgress": {
5619 "__id__": 96 5382 "__id__": 100
5620 }, 5383 },
5621 "fileLabel": { 5384 "fileLabel": {
5622 "__id__": 98 5385 "__id__": 102
5623 }, 5386 },
5624 "close": { 5387 "close": {
5625 "__id__": 86 5388 "__id__": 89
5626 }, 5389 },
5627 "updateBtn": { 5390 "updateBtn": {
5628 "__id__": 101 5391 "__id__": 105
5629 }, 5392 },
5630 "_id": "8aIWz8zZxCP4axcGUrklyB" 5393 "_id": "8aIWz8zZxCP4axcGUrklyB"
5631 }, 5394 },
...@@ -5640,10 +5403,10 @@ ...@@ -5640,10 +5403,10 @@
5640 "_active": true, 5403 "_active": true,
5641 "_components": [ 5404 "_components": [
5642 { 5405 {
5643 "__id__": 124 5406 "__id__": 119
5644 }, 5407 },
5645 { 5408 {
5646 "__id__": 125 5409 "__id__": 120
5647 } 5410 }
5648 ], 5411 ],
5649 "_prefab": null, 5412 "_prefab": null,
...@@ -5699,7 +5462,7 @@ ...@@ -5699,7 +5462,7 @@
5699 "_name": "", 5462 "_name": "",
5700 "_objFlags": 0, 5463 "_objFlags": 0,
5701 "node": { 5464 "node": {
5702 "__id__": 123 5465 "__id__": 118
5703 }, 5466 },
5704 "_enabled": true, 5467 "_enabled": true,
5705 "_materials": [ 5468 "_materials": [
...@@ -5729,7 +5492,7 @@ ...@@ -5729,7 +5492,7 @@
5729 "_name": "", 5492 "_name": "",
5730 "_objFlags": 0, 5493 "_objFlags": 0,
5731 "node": { 5494 "node": {
5732 "__id__": 123 5495 "__id__": 118
5733 }, 5496 },
5734 "_enabled": true, 5497 "_enabled": true,
5735 "alignMode": 2, 5498 "alignMode": 2,
...@@ -5808,14 +5571,14 @@ ...@@ -5808,14 +5571,14 @@
5808 }, 5571 },
5809 "targetAry": [ 5572 "targetAry": [
5810 { 5573 {
5811 "__id__": 128 5574 "__id__": 123
5812 }, 5575 },
5813 { 5576 {
5814 "__id__": 129 5577 "__id__": 124
5815 } 5578 }
5816 ], 5579 ],
5817 "panel": { 5580 "panel": {
5818 "__id__": 122 5581 "__id__": 117
5819 }, 5582 },
5820 "manifestUrl": { 5583 "manifestUrl": {
5821 "__uuid__": "3182b77f-c5b1-435d-983a-41eab7118e39" 5584 "__uuid__": "3182b77f-c5b1-435d-983a-41eab7118e39"
......
...@@ -80,6 +80,8 @@ cc.Class({ ...@@ -80,6 +80,8 @@ cc.Class({
80 this._oSceneContext._iViewPagerIndex = 0; 80 this._oSceneContext._iViewPagerIndex = 0;
81 let oSceneParameter = this._cApplication.getTopSceneParameter(); 81 let oSceneParameter = this._cApplication.getTopSceneParameter();
82 let aSceneParameter = this._cApplication.getSceneParameter(); 82 let aSceneParameter = this._cApplication.getSceneParameter();
83 cc.find("update/update_panel/update_btn", this.node).getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, 208, 100));
84 cc.find("update/update_panel/close_btn", this.node).getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, 208, 100));
83 cc.log("main->aSceneParameter..." + aSceneParameter); 85 cc.log("main->aSceneParameter..." + aSceneParameter);
84 cc.log("main->oSceneParameter..." + oSceneParameter); 86 cc.log("main->oSceneParameter..." + oSceneParameter);
85 //首页无参数 87 //首页无参数
...@@ -109,7 +111,7 @@ cc.Class({ ...@@ -109,7 +111,7 @@ cc.Class({
109 //搞通知框 111 //搞通知框
110 this.initNotifyBox(); 112 this.initNotifyBox();
111 //升级相关 113 //升级相关
112 // this.getUpdateDesc(); 114 this.getUpdateDesc();
113 this.getMainLayoutJsonRequest(); 115 this.getMainLayoutJsonRequest();
114 }, 116 },
115 117
...@@ -143,11 +145,11 @@ cc.Class({ ...@@ -143,11 +145,11 @@ cc.Class({
143 this._aFocusTargets[0]["view_pager_label" + i] = nodeNav; 145 this._aFocusTargets[0]["view_pager_label" + i] = nodeNav;
144 } 146 }
145 } catch (error) { 147 } catch (error) {
146 cc.log("Business Exception:Get getUpdateDesc..." + error); 148 cc.log("Business Exception:Get initViewPager..." + error);
147 } 149 }
148 }, 150 },
149 function (strResponse) { 151 function (strResponse) {
150 cc.log("Business Error:Get getUpdateDesc..." + strResponse); 152 cc.log("Business Error:Get initViewPager..." + strResponse);
151 }, this, "uuid"); 153 }, this, "uuid");
152 }, 154 },
153 155
...@@ -166,17 +168,15 @@ cc.Class({ ...@@ -166,17 +168,15 @@ cc.Class({
166 168
167 //升级框内容 169 //升级框内容
168 getUpdateDesc: function () { 170 getUpdateDesc: function () {
171 let updateTitle = cc.find("update/update_panel/update_title", this.node);
172 let updateInfo = cc.find("update/update_panel/update_info", this.node);
169 Network.ajax("GET", Common.TOPDRAW_API_SERVER + "updateDesc.json", null, null, 173 Network.ajax("GET", Common.TOPDRAW_API_SERVER + "updateDesc.json", null, null,
170 function (strResponse) { 174 function (strResponse) {
171 try { 175 try {
172 cc.log("获取升级内容。。。" + strResponse); 176 // cc.log("获取升级内容。。。" + strResponse);
173 var oJSONResult = JSON.parse(strResponse); 177 var oJSONResult = JSON.parse(strResponse);
174 var self = this; 178 updateTitle.getComponent(cc.Label).string = "发现新版本(" + oJSONResult.versionCode + ")";
175 if (oJSONResult.businessCode == 'success') { 179 updateInfo.getComponent(cc.Label).string = oJSONResult.desc;
176
177 } else {
178 cc.log("Business Error:Get getUpdateDesc..." + oJSONResult.description);
179 }
180 } catch (error) { 180 } catch (error) {
181 cc.log("Business Exception:Get getUpdateDesc..." + error); 181 cc.log("Business Exception:Get getUpdateDesc..." + error);
182 } 182 }
...@@ -1230,6 +1230,17 @@ cc.Class({ ...@@ -1230,6 +1230,17 @@ cc.Class({
1230 fiFrom.node.getChildByName("Name").active = false; 1230 fiFrom.node.getChildByName("Name").active = false;
1231 fiFrom.node.getComponent(ListCell).setUIWithoutFocus(); 1231 fiFrom.node.getComponent(ListCell).setUIWithoutFocus();
1232 } 1232 }
1233
1234 if (0 == fiFrom.node.getName().indexOf('update_btn')) {
1235 cc.loader.loadRes("Hot_update/btn_update", cc.Texture2D, function (err, texture) {
1236 fiFrom.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 0, fiFrom.node.width, fiFrom.node.height));
1237 });
1238 }
1239 if (0 == fiFrom.node.getName().indexOf('close_btn')) {
1240 cc.loader.loadRes("Hot_update/btn_cancel", cc.Texture2D, function (err, texture) {
1241 fiFrom.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 0, fiFrom.node.width, fiFrom.node.height));
1242 });
1243 }
1233 }, 1244 },
1234 1245
1235 onAfterFocusChange: function (event) { 1246 onAfterFocusChange: function (event) {
...@@ -1340,12 +1351,24 @@ cc.Class({ ...@@ -1340,12 +1351,24 @@ cc.Class({
1340 //这里想统一处理焦点框显示隐藏问题 1351 //这里想统一处理焦点框显示隐藏问题
1341 // cc.log("节点名称：" + fiTo.node.getName()); 1352 // cc.log("节点名称：" + fiTo.node.getName());
1342 if (0 == fiTo.node.getName().indexOf('view_pager_label') || 0 == fiTo.node.getName().indexOf('topNavi') 1353 if (0 == fiTo.node.getName().indexOf('view_pager_label') || 0 == fiTo.node.getName().indexOf('topNavi')
1343 || 0 == fiTo.node.getName().indexOf('topCell') || 0 == fiTo.node.getName().indexOf('backToTop')) { 1354 || 0 == fiTo.node.getName().indexOf('topCell') || 0 == fiTo.node.getName().indexOf('backToTop')
1355 || 0 == fiTo.node.getName().indexOf('update_btn') || 0 == fiTo.node.getName().indexOf('close_btn')) {
1344 this._cFocus.hide(); 1356 this._cFocus.hide();
1345 } else { 1357 } else {
1346 if (!this._bIsScrollViewMoving) 1358 if (!this._bIsScrollViewMoving)
1347 this._cFocus.show(); 1359 this._cFocus.show();
1348 } 1360 }
1361
1362 if (0 == fiTo.node.getName().indexOf('update_btn')) {
1363 cc.loader.loadRes("Hot_update/btn_update", cc.Texture2D, function (err, texture) {
1364 fiTo.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, fiTo.node.height, fiTo.node.width, fiTo.node.height));
1365 });
1366 }
1367 if (0 == fiTo.node.getName().indexOf('close_btn')) {
1368 cc.loader.loadRes("Hot_update/btn_cancel", cc.Texture2D, function (err, texture) {
1369 fiTo.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, fiTo.node.height, fiTo.node.width, fiTo.node.height));
1370 });
1371 }
1349 }, 1372 },
1350 1373
1351 doCurrentFocusTVLinkAction: function (strAction) { 1374 doCurrentFocusTVLinkAction: function (strAction) {
...@@ -1361,29 +1384,6 @@ cc.Class({ ...@@ -1361,29 +1384,6 @@ cc.Class({
1361 for (let i = 0; i < aOperationList.length; i++) { 1384 for (let i = 0; i < aOperationList.length; i++) {
1362 switch (aOperationList[i].action) { 1385 switch (aOperationList[i].action) {
1363 case "changeLayout": 1386 case "changeLayout":
1364 // let model = aOperationList[i].parameters.layoutPath; //获取要加载的框架
1365 // if (-1 != model.indexOf("waterfall_recommend")) {
1366 // this.getRightRecommendRequest(waterfall_recommend); //渲染右侧推荐框架
1367 // } else if (-1 != model.indexOf("waterfall_parent")) {
1368 // this.getRightRecommendRequest(waterfall_parent);
1369 // } else if (-1 != model.indexOf("waterfall_course")) {
1370 // this.getRightRecommendRequest(waterfall_course);
1371 // } else if (-1 != model.indexOf("waterfall_primarySchool")) {
1372 // this.getRightRecommendRequest(waterfall_primarySchool);
1373 // } else if (-1 != model.indexOf("waterfall_three2six")) {
1374 // this.getRightRecommendRequest(waterfall_three2six);
1375 // }
1376 // break;
1377 // case "changeUI": //放在TVCanvas中全局管理
1378 // let parameter = aOperationList[i].parameters.uiName; //更换界面的名称
1379 // if (parameter=="collection") { //收藏
1380 // this.getRightRecommendRequest(waterfall_recommend);
1381 // } else if (parameter=="history") { //历史
1382 // this.getRightRecommendRequest(waterfall_parent);
1383 // } else if (parameter=="search") { //搜索
1384 // this.getRightRecommendRequest(waterfall_course);
1385 // }
1386 // break;
1387 default: 1387 default:
1388 this.doTVLinkAction(aOperationList[i]); 1388 this.doTVLinkAction(aOperationList[i]);
1389 break; 1389 break;
...@@ -1528,11 +1528,11 @@ cc.Class({ ...@@ -1528,11 +1528,11 @@ cc.Class({
1528 // this.panel.byteProgress.progress = 0; 1528 // this.panel.byteProgress.progress = 0;
1529 1529
1530 this._bAbleHotUpdate = true; 1530 this._bAbleHotUpdate = true;
1531 // this._iSceneStatus = 1; //焦点框跳转层级 1531 this._iSceneStatus = 1; //焦点框跳转层级
1532 // cc.find("update", this.node).active = true; //显示出来更新面板 1532 cc.find("update", this.node).active = true; //显示出来更新面板
1533 // this._cFocus.show(); 1533 // this._cFocus.hide();
1534 // let fiHotUpdateBtn = cc.find('update/update_panel/update_btn', this.node).getComponent(FocusInfo); //热更新按钮 1534 let fiHotUpdateBtn = cc.find('update/update_panel/update_btn', this.node).getComponent(FocusInfo); //热更新按钮
1535 // this._cFocus.flyFocus(this._fiCurrentFocus, fiHotUpdateBtn, Common.MOVE_DIRECTION_RIGHT, null, null); 1535 this._cFocus.flyFocus(this._fiCurrentFocus, fiHotUpdateBtn, Common.MOVE_DIRECTION_RIGHT, null, null);
1536 1536
1537 break; 1537 break;
1538 default: 1538 default:
...@@ -1543,20 +1543,20 @@ cc.Class({ ...@@ -1543,20 +1543,20 @@ cc.Class({
1543 this._checkListener = null; 1543 this._checkListener = null;
1544 this._updating = false; 1544 this._updating = false;
1545 1545
1546 if (this._bAbleHotUpdate) { 1546 // if (this._bAbleHotUpdate) {
1547 this.hotUpdate(); //放在这里可以静默升级 1547 // this.hotUpdate(); //放在这里可以静默升级
1548 } 1548 // }
1549 }, 1549 },
1550 1550
1551 hotUpdate: function () { 1551 hotUpdate: function () {
1552 cc.log("hotUpdate start..."); 1552 cc.log("hotUpdate start...");
1553 //隐藏更新说明，显示更新进度条 1553 //隐藏更新说明，显示更新进度条
1554 cc.find("update/update_panel/NewLabel", this.node).active = false; 1554 // cc.find("update/update_panel/NewLabel", this.node).active = false;//因为新的更新界面没有进度条，先不要显示更新进度
1555 cc.find("update/update_panel/versionLabel", this.node).active = false; 1555 // cc.find("update/update_panel/versionLabel", this.node).active = false;
1556 cc.find("update/update_panel/update_info", this.node).active = false; 1556 // cc.find("update/update_panel/update_info", this.node).active = false;
1557 cc.find("update/update_panel/ProgressLabel", this.node).active = true; 1557 // cc.find("update/update_panel/ProgressLabel", this.node).active = true;
1558 cc.find("update/update_panel/fileProgress", this.node).active = true; 1558 // cc.find("update/update_panel/fileProgress", this.node).active = true;
1559 cc.find("update/update_panel/filep", this.node).active = true; 1559 // cc.find("update/update_panel/filep", this.node).active = true;
1560 1560
1561 if (this._am && !this._updating) { 1561 if (this._am && !this._updating) {
1562 this._am.setEventCallback(this.updateCb.bind(this)); 1562 this._am.setEventCallback(this.updateCb.bind(this));
......