少年修仙传客户端代码仓库
Client_PangDeRong
2018-12-27 0e756182a450f308c69284c601b7bad1973ad8e4
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
5个文件已修改
95 ■■■■ 已修改文件
Fight/GameActor/GA_NpcFightNorm.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerRewardModel.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/FightingPKWin.cs 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/SeasonRewardCell.cs 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/SegmentRewardCell.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GA_NpcFightNorm.cs
@@ -108,7 +108,10 @@
            }
        }
        RequestLifeBar();
        if (PlayerDatas.Instance.baseData.MapID == 31340)
        {
            RequestLifeBar();
        }
    }
    public override void RequestShadow()
System/CrossServerOneVsOne/CrossServerRewardModel.cs
@@ -70,7 +70,7 @@
    private int SeasonAwardState; // 赛季结算奖励是否已领取
    public int ZoneID = 0;//赛区ID
    public int SeasonID = 0;//赛季ID
    public int MyRank = 0;//我的排名
    public int MyRank = -1;//我的排名
    public override void Init()
    {
        GetSeasonAward();
System/CrossServerOneVsOne/FightingPKWin.cs
@@ -123,7 +123,7 @@
        {
            if (PlayerDatas.Instance.hero.aiHandler.IsAuto())
            {
                m_AutoImg.SetActive(false);
                m_AutoImg.SetActive(true);
            }
            else
            {
@@ -230,17 +230,17 @@
        }
        private void OnHeroHandupAIStopPassive()
        {
            if (!m_AutoImg.activeSelf)
            {
                m_AutoImg.SetActive(true);
            }
            //if (!m_AutoImg.activeSelf)
            //{
            //    m_AutoImg.SetActive(true);
            //}
        }
        void OnHeroHandupAIStarted()
        {
            if (m_AutoImg.activeSelf)
            {
                m_AutoImg.SetActive(false);
            }
            //if (m_AutoImg.activeSelf)
            //{
            //    m_AutoImg.SetActive(false);
            //}
        }
        private void AutoButton()
        {
System/CrossServerOneVsOne/SeasonRewardCell.cs
@@ -89,7 +89,16 @@
            }
            else
            {
                if (IsOnTheList())
                {
                }
                else
                {
                    m_IsReachImage.SetActive(true);
                    m_ReceiveBtn.gameObject.SetActive(false);
                    m_IsDrawImage.SetActive(false);
                }
            }
            ReceiveItemH(id);
        }
@@ -145,7 +154,41 @@
            }
            else
            {
                if (!IsOnTheList())
                {
                    if (CrossServerOneVsOnePlayerInfo.Instance.DanLV == Id)
                    {
                        bool isbool = crossServerRewardModel.IsAwardState(CrossRealmPKAwardStateEnum.SeasonAwardState, -1);
                        if (isbool)
                        {
                            m_IsReachImage.SetActive(false);
                            m_ReceiveBtn.gameObject.SetActive(false);
                            m_IsDrawImage.SetActive(true);
                        }
                        else
                        {
                            m_ReceiveBtn.gameObject.SetActive(true);
                            m_IsReachImage.SetActive(false);
                            m_IsDrawImage.SetActive(false);
                            m_ReceiveBtn.SetListener(()=>
                            {
                                crossServerRewardModel.CrossRealmPKGetAward(CrossRealmPKAwardStateEnum.SeasonAwardState,0);
                            });
                        }
                    }
                    else
                    {
                        m_IsReachImage.SetActive(true);
                        m_ReceiveBtn.gameObject.SetActive(false);
                        m_IsDrawImage.SetActive(false);
                    }
                }
                else
                {
                    m_IsReachImage.SetActive(true);
                    m_ReceiveBtn.gameObject.SetActive(false);
                    m_IsDrawImage.SetActive(false);
                }
            }
            ReceiveItemN(Id);
        }
@@ -173,6 +216,29 @@
                    ObjChild.SetActive(false);
                }
            }
        }
        private bool IsOnTheList()
        {
            bool Isbool = false;
            if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < 100)
            {
                Isbool = true;
            }
            return Isbool;
        }
        private int ListIndex(int myRank)
        {
            int type = 0;
            var keyList = crossServerRewardModel.SeasonRewardDic.AwardDic.Keys.ToList();
            for (int i = 0; i < keyList.Count; i++)
            {
                if (myRank <= keyList[i])
                {
                    type= i;
                }
            }
            return type;
        }
    }
System/CrossServerOneVsOne/SegmentRewardCell.cs
@@ -107,6 +107,8 @@
        }
    }
}