Merge branch 'china/local' into china/test

Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua

@@ -36,6 +36,12 @@ function PackageManager.GetPackageID()
         return this.StreamConfig.PackID
     end
 end
+-- 获取子渠道包公告配置
+function PackageManager.GetSubNoticeID()
+    if this.StreamConfig then 
+        return this.StreamConfig.SubNoticeID
+    end
+end
 -- 获取包名
 function PackageManager.GetPackageName()
     return this.PackageName

Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua

@@ -277,9 +277,9 @@ function this.ShowNotice()
     RequestPanel.Show(Language[11137])
     --LogError("LoginRoot_NoticeChannel=="..LoginRoot_NoticeChannel)
     -- 如果有渠道包配置的id则加上
-    local packId = PackageManager.GetPackageID()
-    if packId then
-        LoginRoot_NoticeChannel = LoginRoot_NoticeChannel.. packId
+    local subNoticeID = PackageManager.GetSubNoticeID()
+    if subNoticeID then
+        LoginRoot_NoticeChannel = LoginRoot_NoticeChannel.. subNoticeID
     end
     networkMgr:SendGetHttp(LoginRoot_Url .. "jl_loginserver/getNotice?timestamp="..timeStamp.."&sign=".. timeSign.."&packageName="..LoginRoot_NoticeChannel,function (str)
         UIManager.OpenPanel(UIName.NoticePopup,str)

Assets/ManagedResources/~Lua/View/PlayerTitle.lua

@@ -91,7 +91,7 @@ function PlayerTitle:SetEffectScale(effectScale)
         -- 处理喜扑老包称号显示异常的问题，喜扑第一个版本的包在底层删除了缩放节点，这里要处理下针对此包不再进行缩放还原
         if AppConst.isSDK then
             local vc = AndroidDeviceInfo.Instance:GetVersionCode()
-            if settingValue and vc == Androidtonumber(settingValue) then
+            if settingValue and vc == tonumber(settingValue) then
                 isScaleActive = false
             end
         end