Commit 12218b03 12218b035268d47522eda63b16161ca92896ebe5 by 金学艇

1.修改了下游戏分类页的小问题和视频详情页的界面

1 parent f7f54032
...@@ -974,7 +974,7 @@ cc.Topdraw.TVCanvas = ...@@ -974,7 +974,7 @@ cc.Topdraw.TVCanvas =
974 this._fiBeforeDetainBox = this._fiCurrentFocus; 974 this._fiBeforeDetainBox = this._fiCurrentFocus;
975 this._fiBackend = fiBackend; 975 this._fiBackend = fiBackend;
976 this._iSceneStatus = 1; 976 this._iSceneStatus = 1;
977 this._cFocus.flyFocus(this._fiCurrentFocus, this._aFocusTargets[1]['system_confirm_btn'].getComponent(FocusInfo), Common.MOVE_DIRECTION_UP, this._fFocusScaleFactor, null); 977 this._cFocus.flyFocus(this._fiCurrentFocus, this._aFocusTargets[1]['system_cancel_btn'].getComponent(FocusInfo), Common.MOVE_DIRECTION_UP, this._fFocusScaleFactor, null);
978 this._bIsLoadingPfbSystemPrompt = false; 978 this._bIsLoadingPfbSystemPrompt = false;
979 } catch (error) { 979 } catch (error) {
980 cc.log("Business Exception:Get showDetainBox..." + error); 980 cc.log("Business Exception:Get showDetainBox..." + error);
......
...@@ -301,12 +301,12 @@ ...@@ -301,12 +301,12 @@
301 "_prefab": { 301 "_prefab": {
302 "__id__": 8 302 "__id__": 8
303 }, 303 },
304 "_opacity": 100, 304 "_opacity": 30,
305 "_color": { 305 "_color": {
306 "__type__": "cc.Color", 306 "__type__": "cc.Color",
307 "r": 0, 307 "r": 255,
308 "g": 0, 308 "g": 255,
309 "b": 0, 309 "b": 255,
310 "a": 255 310 "a": 255
311 }, 311 },
312 "_contentSize": { 312 "_contentSize": {
......
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
105 "_prefab": { 105 "_prefab": {
106 "__id__": 4 106 "__id__": 4
107 }, 107 },
108 "_opacity": 255, 108 "_opacity": 30,
109 "_color": { 109 "_color": {
110 "__type__": "cc.Color", 110 "__type__": "cc.Color",
111 "r": 255, 111 "r": 255,
...@@ -172,10 +172,16 @@ ...@@ -172,10 +172,16 @@
172 "__id__": 2 172 "__id__": 2
173 }, 173 },
174 "_enabled": true, 174 "_enabled": true,
175 "_materials": [], 175 "_materials": [
176 {
177 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
178 }
179 ],
176 "_srcBlendFactor": 770, 180 "_srcBlendFactor": 770,
177 "_dstBlendFactor": 771, 181 "_dstBlendFactor": 771,
178 "_spriteFrame": null, 182 "_spriteFrame": {
183 "__uuid__": "0422cbf9-d228-4b63-9983-4cf68191ccf1"
184 },
179 "_type": 0, 185 "_type": 0,
180 "_sizeMode": 0, 186 "_sizeMode": 0,
181 "_fillType": 0, 187 "_fillType": 0,
......
...@@ -379,25 +379,29 @@ ...@@ -379,25 +379,29 @@
379 { 379 {
380 "name": "Subject1", 380 "name": "Subject1",
381 "imageURL": "upload/image/main/block7_1.png", 381 "imageURL": "upload/image/main/block7_1.png",
382 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneVideoDetail\"}}]}", 382 "tvlink2": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneVideoDetail\"}}]}",
383 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameCategory\",\"currentIndex\":\"0\"}}]}",
383 "code": "promotionItem_e432ac2d-c1f3-4d44-a42b-7000971affa1" 384 "code": "promotionItem_e432ac2d-c1f3-4d44-a42b-7000971affa1"
384 }, 385 },
385 { 386 {
386 "name": "Subject2", 387 "name": "Subject2",
387 "imageURL": "upload/image/main/block7_2.png", 388 "imageURL": "upload/image/main/block7_2.png",
388 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneVideoPlayer\",\"name\":\"TED\",\"url\":\"http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4\"}}]}", 389 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameCategory\",\"currentIndex\":\"1\"}}]}",
390 "tvlink2": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneVideoPlayer\",\"name\":\"TED\",\"url\":\"http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4\"}}]}",
389 "code": "promotionItem_f90b7ff3-1f36-4019-9e77-cef871902343" 391 "code": "promotionItem_f90b7ff3-1f36-4019-9e77-cef871902343"
390 }, 392 },
391 { 393 {
392 "name": "Subject3", 394 "name": "Subject3",
393 "imageURL": "upload/image/main/block7_3.png", 395 "imageURL": "upload/image/main/block7_3.png",
394 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneVideoPlayer\",\"name\":\"TED\",\"url\":\"http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4\"}}]}", 396 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameCategory\",\"currentIndex\":\"2\"}}]}",
397 "tvlink2": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneVideoPlayer\",\"name\":\"TED\",\"url\":\"http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4\"}}]}",
395 "code": "promotionItem_e29b33e4-8954-4ef9-a6fc-0d844c909c67" 398 "code": "promotionItem_e29b33e4-8954-4ef9-a6fc-0d844c909c67"
396 }, 399 },
397 { 400 {
398 "name": "Subject4", 401 "name": "Subject4",
399 "imageURL": "upload/image/main/block7_4.png", 402 "imageURL": "upload/image/main/block7_4.png",
400 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneVideoPlayer\",\"name\":\"TED\",\"url\":\"http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4\"}}]}", 403 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameCategory\",\"currentIndex\":\"3\"}}]}",
404 "tvlink2": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneVideoPlayer\",\"name\":\"TED\",\"url\":\"http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4\"}}]}",
401 "code": "promotionItem_57aea4b3-7716-4FGRACWGVRTee32" 405 "code": "promotionItem_57aea4b3-7716-4FGRACWGVRTee32"
402 } 406 }
403 ] 407 ]
......
...@@ -25,7 +25,7 @@ public class MelodyApplication extends TopdrawApplication { ...@@ -25,7 +25,7 @@ public class MelodyApplication extends TopdrawApplication {
25 public static boolean authResult = false; 25 public static boolean authResult = false;
26 private static MelodyApplication app; 26 private static MelodyApplication app;
27 public static String TOPDRAW_API_PATH = "http://demo.cloud.api.findfun.topdraw.cn:38081/findfun"; 27 public static String TOPDRAW_API_PATH = "http://demo.cloud.api.findfun.topdraw.cn:38081/findfun";
28 ;; 28
29 private Handler mHandler = new Handler(); 29 private Handler mHandler = new Handler();
30 30
31 @Override 31 @Override
......