Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2019-04-16 fc714208ff3a320c3bb52bddd5ea3d91f647a206

 System/HazyRegion/HazyDemonKingVictoryWin.cs

@@ -19,6 +19,8 @@
        [SerializeField] ScrollRect m_RewardsScroll;

        [SerializeField] Text m_ExitTimer;

        [SerializeField] HorizontalLayoutGroup m_RewardLayout;

        [SerializeField] Transform m_ContainerFirst;

        [SerializeField] Transform m_ContainerOther;

        [SerializeField] ButtonEx m_Exit;



        List<DemonJarRewardBehaviour> m_Items = new List<DemonJarRewardBehaviour>();

@@ -101,6 +103,11 @@
            timer = 0f;

            m_ExitTimer.text = Language.Get("DungeonVictoryWin_Btn_Exit_1", Mathf.Clamp((int)seconds, 0, int.MaxValue));

            m_ExitTimer.gameObject.SetActive(true);



            bool isFirst = model.dungeonResult.ownerID == PlayerDatas.Instance.PlayerId;

            m_ContainerFirst.gameObject.SetActive(isFirst);

            m_ContainerOther.gameObject.SetActive(!isFirst);



            m_ContainerPoivt.gameObject.SetActive(true);



            DisplayRewards();