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

client_Zxw

2018-09-13 32904b581d75a9605209eb0af61b3682122c9bd2

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

 System/FairyAu/FairyGrabBossHintWin.cs

@@ -19,6 +19,8 @@
        [SerializeField] RectTransform m_ContainerKilling;

        [SerializeField] RectTransform m_ContainerKilled;

        [SerializeField] FairyGrabBossRankBehaviour[] m_RankBehaviours;

        [SerializeField] Text m_FairyRank;

        [SerializeField] Text m_FairyPercent;

        [SerializeField] Text m_Progress;

        [SerializeField] Text m_SurplusTime;



@@ -163,6 +165,11 @@
                        index++;

                    }

                }

                DisplayFairyHurt(fairyGrabBossInfo.hurtInfos);

            }

            else

            {

                DisplayFairyHurt(null);

            }

            if (currentHp <= 0)

            {

@@ -174,6 +181,26 @@
            }

        }



        void DisplayFairyHurt(List<FairyGrabBossModel.BossHurtInfo> list)

        {

            var rank = 0;

            var percent = 0;

            if (list != null)

            {

                for (int i = 0; i < list.Count; i++)

                {

                    if (list[i].FamilyID == PlayerDatas.Instance.baseData.Family)

                    {

                        rank = i + 1;

                        percent = (int)(((float)list[i].totalHurt / totalHp) * 100);

                        break;

                    }

                }

            }

            m_FairyRank.text = rank == 0 ? Language.Get("Market_Text_33") : Language.Get("GuardSkyRank", rank);

            m_FairyPercent.text = StringUtility.Contact(percent, "%");

        }



        private void DisplayTimer()

        {

            var seconds = model.surplusSeconds;