Skip to content

金学艇 / ChildEdu

Go to a project
Toggle navigation
Toggle navigation pinning
Commit bc0cd5df bc0cd5dfefb71e24d3ba4535d352a874b228cc99 by jinwawa
Options

complete sceneHistory

1 parent c3eb0620
Expand all
Inline Side-by-side
Showing 16 changed files with 157 additions and 102 deletions
......@@ -2887,8 +2887,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 784,
"height": 448
"width": 1164,
"height": 523
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2897,8 +2897,8 @@
},
"_position": {
"__type__": "cc.Vec3",
"x": 110,
"y": 0,
"x": 0,
"y": -42.512,
"z": 0
},
"_scale": {
......@@ -2929,10 +2929,16 @@
"__id__": 66
},
"_enabled": true,
"_materials": [],
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": null,
"_spriteFrame": {
"__uuid__": "1c7a33d8-7cec-4bbc-8e8c-90b17a6de4f9"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
......
{
"ver": "1.0.5",
"uuid": "2d3cc4e7-dfc9-48e9-bfdf-2912b6a42eed",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
"loadPluginInEditor": false,
"subMetas": {}
}
\ No newline at end of file
......@@ -683,7 +683,8 @@ cc.Class({
this._aFocusTargets[0]['btn_collect'] = cc.find('IntroductionArea/BtnPicCollect', this.node);
let fiHomeBtn = cc.find('HomeBtn', this.node).addComponent(FocusInfo); //
fiHomeBtn.init('', true, null, null, 1.0);
// fiHomeBtn.init('', true, null, null, 1.0);
fiHomeBtn.init('{"click": [{"action": "ChangeScene","parameters": {"sceneName":"sceneRecommend"}}]}', true);
this._aFocusTargets[0]['btn_home'] = cc.find('HomeBtn', this.node);
var nodeInitFocus = cc.find('PlayBg/VideoView', this.node);
......@@ -795,10 +796,11 @@ cc.Class({
} else if (this._bScore && 0 == this._fiCurrentFocus.node.name.indexOf('Score')) { //已经是加入课堂了
// this.submitScore();
return;
}else if(0 == this._fiCurrentFocus.node.name.indexOf('HomeBtn')){
cc.log("返回首页");
return;
}
// else if(0 == this._fiCurrentFocus.node.name.indexOf('HomeBtn')){
// cc.log("返回首页");
// return;
// }
this.doCurrentFocusTVLinkAction(Common.TV_LINK_ACTION_CLICK);
break;
case cc.macro.KEY.backspace:
......
......@@ -281,7 +281,8 @@ cc.Class({
);
if (currentNode.getComponent(FocusInfo)) {
let fiBlock = currentNode.getComponent(FocusInfo); //弄tvlink
fiBlock.setTVLink(currentRemote.tvlink);
// fiBlock.setTVLink(currentRemote.tvlink);
fiBlock.setTVLink('{"click":[{"action":"ChangeScene","parameters":{"sceneName":"sceneCategory"}}]}');
}
} else if (currentNode.name == "hasChildFrame" && currentNode.childrenCount > 0) { //渲染自动布局的节点
for (let k = 0; k < currentNode.childrenCount; k++) {
......@@ -295,7 +296,8 @@ cc.Class({
);
if (sonCurrentNode.getComponent(FocusInfo)) {
let fiBlock = sonCurrentNode.getComponent(FocusInfo); //弄tvlink
fiBlock.setTVLink(currentRemote.tvlink);
// fiBlock.setTVLink(currentRemote.tvlink);
fiBlock.setTVLink('{"click":[{"action":"ChangeScene","parameters":{"sceneName":"sceneCategory"}}]}');
}
}
}
......
......@@ -76,12 +76,12 @@ cc.Class({
"name": "Addition",//模块名称
"resultSet": [
{
"name": "我的",
"name": "收藏",
"left": 822,
"top": 19,
"width": 137,
"height": 65,
"tvlink": '{"click": [{"action": "changeUI","parameters": {"uiName": "collection"}}]}',
"tvlink": '{"click":[{"action":"ChangeScene","parameters":{"sceneName":"sceneDiary"}}]}',
"type" : "promotion_item",
"imageURL": "image/addition/my.png"
},
......@@ -91,7 +91,7 @@ cc.Class({
"top": 19,
"width": 137,
"height": 65,
"tvlink": '{"click": [{"action": "changeUI","parameters": {"uiName": "history"}}]}',
"tvlink": '{"click":[{"action":"ChangeScene","parameters":{"sceneName":"sceneHistory"}}]}',
"type" : "promotion_item",
"imageURL": "image/addition/history.png"
},
......@@ -101,7 +101,7 @@ cc.Class({
"top": 19,
"width": 137,
"height": 65,
"tvlink": '{"click": [{"action": "changeUI","parameters": {"uiName": "search"}}]}',
"tvlink": '{"click":[{"action":"ChangeScene","parameters":{"sceneName":"sceneSearch"}}]}',
"type" : "promotion_item",
"imageURL": "image/addition/search.png"
}
......
......@@ -55,7 +55,9 @@ cc.Class({
);
}
this.node.getComponent(FocusInfo).setTVLink(oData.tvlink);
// this.node.getComponent(FocusInfo).setTVLink(oData.tvlink);
this.node.getComponent(FocusInfo)
.setTVLink('{"click": [{"action": "ChangeScene","parameters": {"sceneName":"sceneProgram","id":"' + oData.id + '"}}]}');
},
enableFocusInfo: function () {
......
......@@ -59,7 +59,8 @@ cc.Class({
);
}
this.node.getComponent(FocusInfo).setTVLink(oData.tvlink);
// this.node.getComponent(FocusInfo).setTVLink(oData.tvlink);
this.node.getComponent(FocusInfo).setTVLink('{"click": [{"action": "ChangeScene","parameters": {"sceneName":"sceneProgram","id":"' + oData.id + '"}}]}');
},
enableFocusInfo: function () {
......
{
"ver": "2.3.1",
"uuid": "45eb9209-7e5f-4879-928c-d322d78d8c0d",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"platformSettings": {},
"subMetas": {
"collection404": {
"ver": "1.0.4",
"uuid": "1c7a33d8-7cec-4bbc-8e8c-90b17a6de4f9",
"rawTextureUuid": "45eb9209-7e5f-4879-928c-d322d78d8c0d",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": -57.5,
"trimX": 58,
"trimY": 156,
"width": 1164,
"height": 523,
"rawWidth": 1280,
"rawHeight": 720,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"android-instant": {
"REMOTE_SERVER_ROOT": "",
"host": "",
"pathPattern": "",
"recordPath": "",
"scheme": "https",
"skipRecord": false
},
"appBundle": false,
"baidugame": {
"REMOTE_SERVER_ROOT": "",
"appid": "testappid",
"orientation": "portrait",
"subContext": ""
},
"encryptJs": true,
"excludeScenes": [],
"fb-instant-games": {},
"includeSDKBox": false,
"inlineSpriteFrames": true,
"inlineSpriteFrames_native": true,
"md5Cache": false,
"mergeStartScene": false,
"optimizeHotUpdate": false,
"orientation": {
"landscapeLeft": true,
"landscapeRight": true,
......@@ -7,7 +30,21 @@
"upsideDown": false
},
"packageName": "org.cocos2d.helloworld",
"qqplay": {
"REMOTE_SERVER_ROOT": "",
"orientation": "portrait",
"zip": false
},
"startScene": "2d2f792f-a40c-49bb-a189-ed176a246e49",
"title": "hello_world",
"webOrientation": "auto"
"title": "fuse_apk",
"webOrientation": "auto",
"wechatgame": {
"REMOTE_SERVER_ROOT": "",
"appid": "wx6ac3f5090a6b99c5",
"orientation": "portrait",
"separate_engine": false,
"subContext": ""
},
"xxteaKey": "0b7cbd8b-f258-42",
"zipCompressJs": true
}
\ No newline at end of file
......
{
"assets-sort-type": "name",
"collision-matrix": [
[
true
]
],
"excluded-modules": [],
"group-list": [
"default"
],
"start-scene": "current",
"design-resolution-width": 960,
"design-resolution-height": 640,
"fit-width": false,
"fit-height": true,
"use-project-simulator-setting": false,
"simulator-orientation": false,
"use-customize-simulator": false,
"simulator-resolution": {
"width": 960,
"height": 640
},
"last-module-event-record-time": 0,
"assets-sort-type": "name",
"design-resolution-width": 960,
"excluded-modules": [],
"facebook": {
"enable": false,
"appID": "",
"live": {
"audience": {
"enable": false
},
"audience": {
"enable": false,
"live": {
"enable": false
}
}
},
"fit-height": true,
"fit-width": false,
"group-list": [
"default"
],
"last-module-event-record-time": 1567662056700,
"simulator-orientation": false,
"simulator-resolution": {
"height": 640,
"width": 960
},
"start-scene": "current",
"use-customize-simulator": false,
"use-project-simulator-setting": false
}
\ No newline at end of file
......
......@@ -16,45 +16,30 @@
"iOS",
"HTML5"
],
"package_download_url": "http://download.cocos.com/CocosServices/plugins/service-analytics/1.2.0_2.1.0.zip",
"package_version_desc": "1、优化SDK，修复H5-SDK 与多个小游戏平台适配问题，删除和优化init事件无用接口<br>2、 如有相关问题咨询或者需求， 可以联系我们技术支持邮箱 <a href=' '>support-cocos@cocos.com</a>",
"package_download_url": "https://download.cocos.com/CocosServices/plugins/service-analytics/1.2.0_2.1.0.zip",
"package_version_desc": "<b>更新日期：</b>2019/6/10<br>\n<br><b>更新说明：</b><br>\n1、优化SDK，修复H5-SDK 与多个小游戏平台适配问题，删除和优化init事件无用接口<br>\n2、如有相关问题咨询或者需求， 可以联系我们技术支持邮箱 <a href=' '>support-cocos@cocos.com</a>",
"service_component_name": "service-analytics",
"package_versions": [
"1.0.0_1.0.5",
"1.1.2_2.0.0",
"1.1.3_2.0.1",
"1.1.4_2.0.1",
"1.1.5_2.0.1",
"1.1.6_2.0.1_2.0.2",
"1.2.1_2.1.0",
"1.2.0_2.1.0",
"1.1.7_2.0.3",
"1.1.8_2.0.4",
"1.1.9_2.1.0",
"1.2.0_2.1.0"
],
"build_platform": [
"web-mobile",
"web-desktop",
"wechatgame",
"android",
"ios",
"fb-instant-games",
"android-instant",
"baidugame",
"quickgame",
"qgame",
"qqplay",
"huawei"
"1.1.6_2.0.1_2.0.2",
"1.1.5_2.0.1",
"1.1.4_2.0.1",
"1.1.3_2.0.1",
"1.1.2_2.0.0",
"1.0.0_1.0.5"
],
"build_platform": [],
"require_verify": 0,
"service_price": "",
"packpage_version_desc": "",
"service_protocol": "游戏首次开启该服务时，Cocos会后台通知服务方为游戏开通服务并初始化参数，服务方根据需要可能会获取您的Cocos账户信息，包括账户基本资料、游戏基本资料、账户余额等，点击确认开通按钮即视为您同意该服务访问您的账户信息，详见<a href='http://auth.cocos.com/CocosServiceAgreement.html'>《Cocos用户服务协议》</a>和<a href='http://auth.cocos.com/PrivacyPolicy.html'>《Cocos隐私政策》</a>"
},
{
"service_id": "241",
"service_name": "Matchvs",
"service_icon": "https://account.cocos.com/client/14406719a07eb3d714d36e5edc6e06fa.png",
"service_desc": "通过SDK接入快速实现联网功能、帧同步、国内外多节点、服务器独立部署、gameServer自定义游戏服务端逻辑。\n技术支持群QQ群：822523258",
"service_desc": "通过SDK接入快速实现联网功能、帧同步、国内外多节点、服务器独立部署、gameServer自定义游戏服务端逻辑。",
"service_title": "专业成熟的移动游戏联网与服务端解决方案",
"service_guide_url": "http://doc.matchvs.com/QuickStart/QuickStart-CocosCreator",
"service_sample_url": "http://www.matchvs.com/serviceCourse",
......@@ -66,41 +51,26 @@
"iOS",
"HTML5"
],
"package_download_url": "http://download.cocos.com/CocosServices/plugins/service-matchvs/1.0.9_3.7.9.9.zip",
"package_version_desc": "更新日期：2019-07-18<br>更新内容：<br>1、修复多节点登录返回值错误<br>2、修复FaceBook平台受限安全策略的问题",
"package_download_url": "https://download.cocos.com/CocosServices/plugins/service-matchvs/1.0.9_3.7.9.9.zip",
"package_version_desc": "<p><strong>更新日期：</strong> 2019/07/18\n<strong>更新内容：</strong>\n1、修复多节点登录返回值错误\n2、修复FaceBook平台受限安全策略的问题</p>",
"service_component_name": "service-matchvs",
"package_versions": [
"1.0.3_3.7.6.4",
"1.0.5_3.7.7.3",
"1.0.6_3.7.9.2",
"1.0.9_3.7.9.9",
"1.0.7_3.7.9.6",
"1.0.9_3.7.9.9"
],
"build_platform": [
"web-mobile",
"web-desktop",
"fb-instant-games",
"wechatgame",
"wechatgame-subcontext",
"qqplay",
"android",
"android-instant",
"ios",
"mac",
"quickgame",
"qgame",
"huawei"
"1.0.6_3.7.9.2",
"1.0.5_3.7.7.3",
"1.0.3_3.7.6.4"
],
"build_platform": [],
"require_verify": 0,
"service_price": "该服务按使用量计费，<a href='https://www.matchvs.com/price'><font color='#dddddd'>计费规则</font></a>，所产生的费用将由第三方从您的 <a href='https://account.cocos.com/#/finance/finance_list'><font color='#dddddd'>Cocos 账户余额</font></a> 中扣除。",
"packpage_version_desc": "",
"service_protocol": "游戏首次开启该服务时，Cocos会后台通知服务方为游戏开通服务并初始化参数，服务方根据需要可能会获取您的Cocos账户信息，包括账户基本资料、游戏基本资料、账户余额等，点击确认开通按钮即视为您同意该服务访问您的账户信息，详见<a href='http://auth.cocos.com/CocosServiceAgreement.html'>《Cocos用户服务协议》</a>和<a href='http://auth.cocos.com/PrivacyPolicy.html'>《Cocos隐私政策》</a>"
},
{
"service_id": "242",
"service_name": "Agora Voice",
"service_icon": "https://account.cocos.com/uploads/client_icon/2019-07-16/273952d155b4cdb72d2b1bc61de91ade.png",
"service_desc": "稳定、低耗、76ms超低延时、全球200+数据中心覆盖；变声器、超高音质、听声辩位等丰富玩法极速接入；全平台支持：Android、iOS、Web。\n技术支持群QQ群：799099183\n",
"service_desc": "稳定、低耗、76ms超低延时、全球200+数据中心覆盖；变声器、超高音质、听声辩位等丰富玩法极速接入；全平台支持：Android、iOS、Web。",
"service_title": "游戏内置实时语音",
"service_guide_url": "https://docs.agora.io/cn/Interactive Gaming/game_c?platform=Cocos Creator",
"service_sample_url": "https://github.com/AgoraIO/Voice-Call-for-Mobile-Gaming/tree/master/Basic-Voice-Call-for-Gaming/Hello-CocosCreator-Voice-Agora",
......@@ -112,22 +82,16 @@
"iOS",
"HTML5"
],
"package_download_url": "http://download.cocos.com/CocosServices/plugins/service-agora/1.0.2_2.2.3.20_2.5.2.zip",
"package_version_desc": "解决Bug：onAudioVolumeIndication 回调收不到.",
"package_download_url": "https://download.cocos.com/CocosServices/plugins/service-agora/1.0.2_2.2.3.20_2.5.2.zip",
"package_version_desc": "<b>更新日期：<b>2019/06/27<br>\n<br><b>更新内容：</b><br>\n1、修复部分BUG<br>\n2、代码优化",
"service_component_name": "service-agora",
"package_versions": [
"1.0.1_2.2.3.20_2.5.2",
"1.0.2_2.2.3.20_2.5.2"
],
"build_platform": [
"web-mobile",
"web-desktop",
"android",
"ios"
"1.0.2_2.2.3.20_2.5.2",
"1.0.1_2.2.3.20_2.5.2"
],
"build_platform": [],
"require_verify": 1,
"service_price": "该服务按使用量计费，<a href='https://docs.agora.io/cn/Agora Platform/billing_faq?platform=All Platforms'><font color='#dddddd'>计费规则</font></a>，所产生的费用将由第三方从您的 <a href='https://account.cocos.com/#/finance/finance_list'><font color='#dddddd'>Cocos 账户余额</font></a> 中扣除。",
"packpage_version_desc": "",
"service_protocol": "游戏首次开启该服务时，Cocos会后台通知服务方为游戏开通服务并初始化参数，服务方根据需要可能会获取您的Cocos账户信息，包括账户基本资料、游戏基本资料、账户余额等，点击确认开通按钮即视为您同意该服务访问您的账户信息，详见<a href='http://auth.cocos.com/CocosServiceAgreement.html'>《Cocos用户服务协议》</a>和<a href='http://auth.cocos.com/PrivacyPolicy.html'>《Cocos隐私政策》</a>"
}
],
......