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

client_linchunjie

2018-11-26 3de994e05492d56b42999bff2bac800a4b4d30d1

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

 System/Dungeon/AssistPlayerCell.cs

@@ -60,6 +60,7 @@
            jobNameText.text = OccupationNameConfig.GetOccupationName(playerInfo.Job,1);

            goldHelpText.text = assistModel.goldAssistPlayer.ToString();

            UpdateAssistReward();

            UpdateRelation();

            int nirvanaLv = playerInfo.LV - friendsModel.OpenGreatLV;

            lvIcon.gameObject.SetActive(nirvanaLv > 0);

            if (nirvanaLv > 0)

@@ -119,6 +120,22 @@
            }

        }



        public void UpdateRelation()

        {

            if (playerInfo == null) return;



            relationImg.gameObject.SetActive(playerInfo.relatedToPlayer != DungeonAssistModel.RelatedToPlayer.None);

            switch (playerInfo.relatedToPlayer)

            {

                case DungeonAssistModel.RelatedToPlayer.Friend:

                    relationImg.SetSprite("XT_FBZZ_04");

                    break;

                case DungeonAssistModel.RelatedToPlayer.Ally:

                    relationImg.SetSprite("XT_FBZZ_05");

                    break;

            }

        }



        private void ClickHelp()

        {

            if (playerInfo == null) return;


 System/Dungeon/DungeonAssistModel.cs

@@ -38,6 +38,7 @@
            int playerId = (int)PlayerDatas.Instance.baseData.PlayerID;

            helpInfoLocalSave = StringUtility.Contact("HelpInfoLocalSave", playerId);

            GetLocalSaveData();

            UpdateRedpoint();

        }



        public override void UnInit()

@@ -88,6 +89,27 @@
                {

                    var ratio = (float)addRatio / 100;

                    addRatioStr = StringUtility.Contact(ratio, "%");

                    return true;

                }

            }

            return false;

        }



        public bool TryGetCurVipAddCoins(out int addCoins)

        {

            addCoins = 0;

            int vipLv = PlayerDatas.Instance.baseData.VIPLv;

            var vipDict = VipPrivilegeConfig.GetVipPrivilegeDic(VipPrivilegeType.AssistXianYuanCoinsAdd);

            if (vipDict == null || vipLv < 1) return false;

            List<int> vipLvlist = vipDict.Keys.ToList();

            vipLvlist.Sort();

            for (int i = vipLvlist.Count - 1; i > -1; i--)

            {

                var lv = vipLvlist[i];

                var coins = vipDict[lv];

                if (vipLv >= lv && coins > 0)

                {

                    addCoins = coins;

                    return true;

                }

            }

@@ -331,12 +353,20 @@
        public void UpdateAssistList(HB207_tagMCHelpBattleList battleList)

        {

            assistPlayerDict.Clear();

            List<AssistPlayerInfo> playerInfos = new List<AssistPlayerInfo>();

            assistRefreshNum = battleList.RefreshCount;

            for(int i = 0; i < battleList.HelpCount; i++)

            {

                var info = battleList.HelpPlayerList[i];

                AssistPlayerInfo playerInfo = new AssistPlayerInfo(info);

                assistPlayerDict.Add(playerInfo.PlayerID,playerInfo);

                playerInfos.Add(playerInfo);

             
            }

            playerInfos.Sort(CompareByFightPower);

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

            {

                var playerInfo = playerInfos[i];

                assistPlayerDict.Add(playerInfo.PlayerID, playerInfo);

            }



            if(UpdataAssistPlayerListEvent != null)

@@ -348,6 +378,14 @@
            {

                WindowCenter.Instance.Open<DungeonAssistPlayerWin>();

            }

        }



        public int CompareByFightPower(AssistPlayerInfo start,AssistPlayerInfo end)

        {

            int x = start.FightPower;

            int y = end.FightPower;

            if (x.CompareTo(y) != 0) return -x.CompareTo(y);

            return 0;

        }



        public event Action<int> UpdataAssistPlayerEvent;

@@ -436,6 +474,7 @@
            {

                UpdateCheckInResultEvent();

            }

            UpdateRedpoint();

        }

        private List<AssistResult> assistResults = new List<AssistResult>();

        public void UpdateAssistResultNotify(HB211_tagMCHelpBattleRecordList recordList)

@@ -486,6 +525,24 @@


        #endregion



        #region 红点

        public const int AssistCheckInRedPoint = 7800001;

        public Redpoint checkInRedpoint = new Redpoint(AssistCheckInRedPoint);

        public void UpdateRedpoint()

        {

            if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.DayDaily)) return;



            if(IsCheckInOk)

            {

                checkInRedpoint.state = RedPointState.None;

            }

            else

            {

                checkInRedpoint.state = RedPointState.Simple;

            }

        }

        #endregion



        public class AssistResult

        {

            public int assistType; // 1 真实的自己 2 自己的镜像


 System/Dungeon/DungeonAssistWin.cs

@@ -92,7 +92,10 @@


        private void UpdateXianYuanCoins()

        {

            dayScoreText.text = StringUtility.Contact(PlayerDatas.Instance.baseData.ExAttr11,"/",assistModel.maxXianYuanCoins);

            int addCoins = 0;

            assistModel.TryGetCurVipAddCoins(out addCoins);

            int limitCoins = assistModel.maxXianYuanCoins + addCoins;

            dayScoreText.text = StringUtility.Contact(PlayerDatas.Instance.baseData.ExAttr11,"/",limitCoins);

        }



        private void UpdateVipAddCoins()