Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBChapterView.cs

@@ -98,7 +98,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.target.touchable = false;
+            GRoot.inst.touchable = false;
             SuitFosterProxy.SendGetSuitInfos().Coroutine();
             MusicManager.Instance.PlayCroutine(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
             if ((this.viewData as object[]) != null)
@@ -146,7 +146,7 @@ namespace GFGGame
                 _ui.m_ZCJBTimeText.text = "剩余时间：" + (timeActivity > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(timeActivity) : TimeUtil.FormattingTimeTo_HHmmss(timeActivity));
                 Timers.inst.Add(60.0f, 0, UpdateActivityTime);
             //
-            _ui.m_t0.SetHook("canHit", () => { _ui.target.touchable = true; });
+            _ui.m_t0.SetHook("canHit", () => { GRoot.inst.touchable = true; });
             _ui.m_t0.Play();