From 76176a5c6ab780b346eb859ce422acdc2007c47a Mon Sep 17 00:00:00 2001 From: "ws.s" Date: Fri, 19 Jul 2019 21:20:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20VMLabel=E4=BD=BF=E7=94=A8T?= =?UTF-8?q?emplate=20Mode=EF=BC=8C=20'match'=20of=20null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/Script/modelView/VMLabel.ts | 17 +---------------- settings/services.json | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/assets/Script/modelView/VMLabel.ts b/assets/Script/modelView/VMLabel.ts index 5b989f1..77584ca 100644 --- a/assets/Script/modelView/VMLabel.ts +++ b/assets/Script/modelView/VMLabel.ts @@ -80,22 +80,6 @@ export default class VMLabel extends VMBase { this.onValueInit(); } - - // //多路径监听方式 - // protected setMultPathEvent(enabled: boolean = true) { - // if (CC_EDITOR) return; - // let arr = this.watchPathArr; - // for (let i = 0; i < arr.length; i++) { - // const path = arr[i]; - // if (enabled) { - // this.VM.bindPath(path, this.onValueChanged, this); - // } else { - // this.VM.unbindPath(path, this.onValueChanged, this); - // } - // } - - // } - //解析模板 获取初始格式化字符串格式 的信息 parseTemplate() { let regexAll = /\{\{(.+?)\}\}/g; //匹配： 所有的{{value}} @@ -119,6 +103,7 @@ export default class VMLabel extends VMBase { /**获取解析字符串模板后得到的值 */ getReplaceText() { + if(!this.originText)return ""; let regexAll = /\{\{(.+?)\}\}/g; //匹配： 所有的{{value}} let regex = /\{\{(.+?)\}\}/;//匹配： {{value}} 中的 value let res = this.originText.match(regexAll);//匹配结果数组 [{{value}}，{{value}}，{{value}}] diff --git a/settings/services.json b/settings/services.json index 2e267eb..0ab6468 100644 --- a/settings/services.json +++ b/settings/services.json @@ -66,14 +66,15 @@ "iOS", "HTML5" ], - "package_download_url": "http://download.cocos.com/CocosServices/plugins/service-matchvs/1.0.7_3.7.9.6.zip", - "package_version_desc": "更新日期：2019-05-15
更新内容：
1、调整getRoomListEx接口，获取系统创建房间
2、增加appkey等的校验
3、新增以下平台支持:
  • VIVO 小游戏
  • OPPO 小游戏
  • HUAWEI 快游戏
  • 百度小游戏（默认不支持，需修改代码强制开启WSS选项）", + "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
    更新内容：
    1、修复多节点登录返回值错误
    2、修复FaceBook平台受限安全策略的问题", "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.7_3.7.9.6" + "1.0.7_3.7.9.6", + "1.0.9_3.7.9.9" ], "build_platform": [ "web-mobile", @@ -98,11 +99,11 @@ { "service_id": "242", "service_name": "Agora Voice", - "service_icon": "https://account.cocos.com/uploads/client_icon/date(\"Y-m-d\")/50fe52b789c2fc1e1fff9eec161c1bb3.png", + "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_title": "游戏内置实时语音", - "service_guide_url": "https://docs.agora.io/cn/Interactive Gaming/game_c", - "service_sample_url": "https://github.com/AgoraIO/Voice-Call-for-Mobile-Gaming/tree/master/Basic-Voice-Call-for-Gaming/Hello-Cocos-Creator-Voice-Agora", + "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", "service_dev_url": "https://sso.agora.io/api/oauth/cocos/login", "service_type": "3", "service_type_zh": "公司和个人游戏", @@ -111,11 +112,12 @@ "iOS", "HTML5" ], - "package_download_url": "http://download.cocos.com/CocosServices/plugins/service-agora/1.0.1_2.2.3.20_2.5.2.zip", - "package_version_desc": "first release.", + "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 回调收不到.", "service_component_name": "service-agora", "package_versions": [ - "1.0.1_2.2.3.20_2.5.2" + "1.0.1_2.2.3.20_2.5.2", + "1.0.2_2.2.3.20_2.5.2" ], "build_platform": [ "web-mobile",