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

client_Wu Xijin

2018-09-03 99ade926b1eddfa6da7a3ed085e2bab1acd09723

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

 Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA16_tagMCSuperGiftInfo.cs

@@ -5,7 +5,7 @@



public class HAA16_tagMCSuperGiftInfo : GameNetPackBasic {


    public uint GiftID;    //商品ID


    public byte RemainDay;    //剩余天数

    public string EndtDate;    // 结束日期 y-m-d




    public HAA16_tagMCSuperGiftInfo () {


        _cmd = (ushort)0xAA16;


@@ -13,7 +13,7 @@



    public override void ReadFromBytes (byte[] vBytes) {


        TransBytes (out GiftID, vBytes, NetDataType.DWORD);


        TransBytes (out RemainDay, vBytes, NetDataType.BYTE);

        TransBytes (out EndtDate, vBytes, NetDataType.Chars, 10);

    }





}



 System/Dungeon/DungeonTargetBehaviour.cs

@@ -100,7 +100,8 @@
                        m_TargetNums[_index].text=StringUtility.Contact(UIHelper.ReplaceLargeNum((ulong)model.mission.totalExp), "/", UIHelper.ReplaceLargeNum((ulong)_targetValue));
                        break;
                    }
                    m_TargetNums[_index].text = UIHelper.ReplaceLargeNum((ulong)model.mission.totalExp);
                    m_TargetNums[_index].text = StringUtility.Contact(UIHelper.ReplaceLargeNum((ulong)model.mission.totalExp),
                        model.mission.isFullExp == 1 ? StringUtility.Contact("  ", Language.Get("FullExp")) : string.Empty);
                    break;
                case DungeonTargetType.Score:
                    if (_targetValue > 0) {

 System/Dungeon/TrialExchangeBehaviour.cs

@@ -9,11 +9,13 @@
{

    public class TrialExchangeBehaviour : MonoBehaviour

    {

        [SerializeField] RectTransform m_ContainerSpecial;

        [SerializeField] RectTransform m_ContainerNormal;

        [SerializeField] Image m_Bottom;

        [SerializeField] ItemCell m_Item;

        [SerializeField] Text m_Description;

        [SerializeField] ItemBehaviour m_Token;

        [SerializeField] Button m_Exchange;

        [SerializeField] LongPressButton m_Exchange;

        [SerializeField] Image m_Redpoint;

        [SerializeField] Image m_Up;

        [SerializeField] Image m_Down;

@@ -25,7 +27,8 @@
        int trialExchangeId = 0;

        private void Awake()

        {

            m_Exchange.AddListener(Exchange);

            m_Exchange.onClick.AddListener(Exchange);

            m_Exchange.onPress.AddListener(LongPress);

        }



        private void Exchange()

@@ -47,9 +50,29 @@
            }

        }



        private void LongPress()

        {

            if (trialExchangeId != 0)

            {

                var config = Config.Instance.Get<TrialExchangeConfig>(trialExchangeId);

                if (config != null)

                {

                    var itemConfig = Config.Instance.Get<ItemConfig>(model.GetExchangeItemByJob(config));

                    if (itemConfig.EquipPlace == 0)

                    {

                        return;

                    }

                    ItemAttrData itemAttrData = new ItemAttrData(itemConfig.ID, true, (ulong)config.exchangeItemCount, -1, config.exchangeItemIsBind, true);

                    ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemAttrData);

                }

            }

        }



        public void Display(int id, bool equipBetter = true, bool first = false)

        {

            m_Bottom.SetSprite(first ? "SpecialExchangeBottom" : "Title_PopupWindow");

            m_ContainerSpecial.gameObject.SetActive(first);

            m_ContainerNormal.gameObject.SetActive(!first);

            trialExchangeId = id;

            var config = Config.Instance.Get<TrialExchangeConfig>(id);

            if (config == null)

@@ -69,7 +92,8 @@
            m_Description.text = config.description;

            m_Token.SetItem(config.tokenId, config.tokenCount);

            var count = model.GetTrialTokenCount(config.tokenId);

            m_Token.count.color = UIHelper.GetUIColor(count >= config.tokenCount ? TextColType.Green : TextColType.NavyBrown, true);

            m_Token.count.text = StringUtility.Contact(count >= config.tokenCount ? "<color=#35e112>" : string.Empty, count,

                count >= config.tokenCount ? "</color>" : string.Empty, "/", config.tokenCount);

            var equipCompare = model.EquipCompare(model.GetExchangeItemByJob(config));

            m_Up.gameObject.SetActive(equipCompare == 1);

            m_Down.gameObject.SetActive(equipCompare == -1);


 System/Dungeon/TrialExchangeWin.cs

@@ -18,8 +18,8 @@
        [SerializeField] Text m_SelectClass;

        [SerializeField] Button m_SelectClassUp;

        [SerializeField] TrialSelectClassBehaviour m_SelectClassBehaviour;

        [SerializeField] ItemBehaviour[] m_Tokens;

        [SerializeField] Text[] m_TokenCounts;

        //[SerializeField] ItemBehaviour[] m_Tokens;

        //[SerializeField] Text[] m_TokenCounts;

        [SerializeField] Button m_Close;



        TrialDungeonModel model { get { return ModelCenter.Instance.GetModel<TrialDungeonModel>(); } }

@@ -189,23 +189,23 @@


        void DisplayTokens()

        {

            var list = model.trialClassTokens.ContainsKey(model.selectEquipClass) ? model.trialClassTokens[model.selectEquipClass] : null;

            for (int i = 0; i < m_Tokens.Length; i++)

            {

                if (list != null && i < list.Count)

                {

                    m_Tokens[i].gameObject.SetActive(model.selectEquipClass != 1);

                    if (model.selectEquipClass != 1)

                    {

                        m_Tokens[i].SetItem(list[i], 0);

                        m_TokenCounts[i].text = model.GetTrialTokenCount(list[i]).ToString();

                    }

                }

                else

                {

                    m_Tokens[i].gameObject.SetActive(false);

                }

            }

            //var list = model.trialClassTokens.ContainsKey(model.selectEquipClass) ? model.trialClassTokens[model.selectEquipClass] : null;

            //for (int i = 0; i < m_Tokens.Length; i++)

            //{

            //    if (list != null && i < list.Count)

            //    {

            //        m_Tokens[i].gameObject.SetActive(model.selectEquipClass != 1);

            //        if (model.selectEquipClass != 1)

            //        {

            //            m_Tokens[i].SetItem(list[i], 0);

            //            m_TokenCounts[i].text = model.GetTrialTokenCount(list[i]).ToString();

            //        }

            //    }

            //    else

            //    {

            //        m_Tokens[i].gameObject.SetActive(false);

            //    }

            //}

        }



        private void SelectEquipClassEvent()


 System/FairyAu/HallTipsWin.cs

@@ -80,6 +80,14 @@
        {

            if (PlayerDatas.Instance.fairyData.fairy == null) return;

            _FamilyPosition = (int)PlayerDatas.Instance.fairyData.mine.FamilyLV;

            if (_FamilyPosition >= 2)

            {

                _UpdateBtn.gameObject.SetActive(true);

            }

            else

            {

                _UpdateBtn.gameObject.SetActive(false);

            }

            AssignValueToRefresh();//属性赋值和刷新

        }




 System/FairyAu/MethodToWin.cs

@@ -330,7 +330,7 @@
                    CA607_tagCMFamilyTechLVUP tag_CA607 = new CA607_tagCMFamilyTechLVUP();

                    tag_CA607.TechID = (uint)indexID;

                    GameNetSystem.Instance.SendInfo(tag_CA607);



                    DebugEx.LogError("输出心法科技需要提升的技能IndexID"+ indexID);

                }

                else

                {


 System/FairyAu/PlayerFairyAuTreasureData.cs

@@ -243,7 +243,7 @@
    private void IsShowRedPoint()

    {

        int GetDayOfYear = DateTime.Now.DayOfYear;

        string strKey= "Treasure"+ PlayerDatas.Instance.baseData.LV;

        string strKey= "Treasure"+ PlayerDatas.Instance.baseData.PlayerID;

        int day = LocalSave.GetInt(strKey);

        if (day != GetDayOfYear && IsEquipmentComparison())

        {


 System/FairyAu/PlayerMethodData.cs

@@ -5,7 +5,7 @@
using UnityEngine;

using System;

//心法科技

public  class SkillsInformation

public class SkillsInformation

{

    public int id;//单位数id

    public int SkillID;//技能ID

@@ -14,7 +14,7 @@


public class PlayerMethodData : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

{

  public  Dictionary<int, SkillsInformation> _DicSkill = new Dictionary<int, SkillsInformation>();//存储心法

    public Dictionary<int, SkillsInformation> _DicSkill = new Dictionary<int, SkillsInformation>();//存储心法



    public Dictionary<int, Redpoint> MethodRedPointDic = new Dictionary<int, Redpoint>();//心法列表红点

    public Dictionary<int, Redpoint> MethodRedPointBtnDic = new Dictionary<int, Redpoint>();//心法按钮红点

@@ -32,18 +32,18 @@
    {

        string str = Config.Instance.Get<FuncConfigConfig>("FamilyTechNeedLV").Numerical1;

        MethodDataNeedLVDic = ConfigParse.GetDic<int, int>(str);

       
      




    }



    public override void UnInit()

    {

      


    }



    public void OnBeforePlayerDataInitialize()

    {

      


        _ContributionNumber = 0;

    }



@@ -74,14 +74,14 @@
            }

        }

    }

    private const int RedPoint_key1= 1070101;//心法红点

    private const int RedPoint_key1 = 1070101;//心法红点

    private Redpoint redPointStre1 = new Redpoint(MainRedDot.FAIRY_REDPOINT_KEY2, RedPoint_key1);

    public Redpoint fairyHeartRedpoint { get { return redPointStre1; } }

    private const int RedPoint_key2 = 1070104;//仙盟大厅红点

    private Redpoint redPointStre2 = new Redpoint(MainRedDot.FAIRY_REDPOINT_KEY2, RedPoint_key2);

    private void FairyAuMethodDic()//仙盟心法列表红点

    {

        if ( MethodRedPointDic.Count!=0)

        if (MethodRedPointDic.Count != 0)

        {

            return;

        }

@@ -98,9 +98,9 @@
            }

        }

    }

    private void  FairyAuMethodRedPoint()//仙盟心法红点

    private void FairyAuMethodRedPoint()//仙盟心法红点

    {

        if (!fairyModel.fairyMethodToOpen || MethodRedPointBtnDic.Count == 0)

        if (MethodRedPointBtnDic.Count == 0)

        {

            return;

        }

@@ -108,7 +108,10 @@
        {

            MethodRedPointBtnDic[key].state = RedPointState.None;

        }



        if (!fairyModel.fairyMethodToOpen)

        {

            return;

        }

        foreach (var key in _DicSkill.Keys)

        {

            if (MethodDataNeedLVDic.ContainsKey(_DicSkill[key].id) && PlayerDatas.Instance.baseData.LV >= MethodDataNeedLVDic[_DicSkill[key].id])

@@ -116,7 +119,7 @@
                var familyTechConfig = Config.Instance.Get<FamilyTechConfig>(_DicSkill[key].SkillID + 1);

                if (_DicSkill[key].SkillLV > 0)

                {

                  


                    if (familyTechConfig == null)

                    {

                        continue;

@@ -162,16 +165,16 @@
    {

        for (int i = 0; i < info.TechCnt; i++)

        {

           


            if (!_DicSkill.ContainsKey(info.TechInfoList[i].TechID))

            {

                


                SkillsInformation _skill = new SkillsInformation();

                _skill.id = info.TechInfoList[i].TechID;

                _skill.SkillID = Skill_ID(info.TechInfoList[i].TechID, info.TechInfoList[i].TechLV);

                _skill.SkillLV = info.TechInfoList[i].TechLV;

                _DicSkill.Add(info.TechInfoList[i].TechID, _skill);

              


            }

            else

            {

@@ -181,10 +184,10 @@
                _DicSkill[info.TechInfoList[i].TechID].SkillLV = info.TechInfoList[i].TechLV;

                if (EventHA504 != null)

                    EventHA504();

               


            }

        }

      


        FairyAuMethodRedPoint();

        FairyAuMethodDic();

    }

@@ -217,5 +220,5 @@
            Event_CepaContribution();

    }



 


}


 System/MainInterfacePanel/TaskListTip.cs

@@ -37,7 +37,6 @@
        PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } }

        PlayerMainDate m_MainModel;

        PlayerMainDate mainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } }

        List<int> RenzhuTaskIDList = new List<int>();//法宝任务数组ID

        List<int> ListSort = new List<int>();//用于排列顺序(未卡级)

        List<int> ListSort1 = new List<int>();//用于排序（卡级）

        private void Start()

@@ -95,15 +94,6 @@
                    ListSort1.Add(TaskSortType2[i]);

                }

            }

            if (RenzhuTaskIDList.Count <= 0)

            {

                int[] RenzhuTaskID1 = ConfigParse.GetMultipleStr<int>(RenzhuTaskID.Numerical1);

                for (int i = 0; i < RenzhuTaskID1.Length; i++)

                {

                    RenzhuTaskIDList.Add(RenzhuTaskID1[i]);

                }

            }



            PlayerTaskDatas.Event_TaskToAdd += TaskToAdd;//任务的添加

            PlayerTaskDatas.Event_TaskRefreshes += TaskRefreshes;//任务的刷新

            PlayerTaskDatas.Event_TaskToDelete += OnTaskToDelete;//任务的删除

@@ -211,7 +201,7 @@
            TaskScheduling();

            bool IsDefault = true;

            var State = taskmodel.GetTaskStatus(_id);

            if (State == PlayerTaskDatas.TaskStatus.CardLevel || (State == PlayerTaskDatas.TaskStatus.TreasureCardLevel && !RenzhuTaskIDList.Contains(_id)))

            if (State == PlayerTaskDatas.TaskStatus.CardLevel)

            {

                IsDefault = false;

            }

@@ -399,7 +389,7 @@
            foreach (var key in taskmodel.MainTaskDic.Keys)

            {

                var State = taskmodel.GetTaskStatus(key);

                if (State == PlayerTaskDatas.TaskStatus.CardLevel || (State == PlayerTaskDatas.TaskStatus.TreasureCardLevel && !RenzhuTaskIDList.Contains(key)))

                if (State == PlayerTaskDatas.TaskStatus.CardLevel)

                {

                    IsDefault = false;

                }


 System/OpenServerActivity/OSGiftModel.cs

@@ -77,13 +77,10 @@


        public int timeOverdueGiftId { get; private set; }

        public DateTime overDueTime = DateTime.Now;

        public bool allOverdue { get; private set; }

        public void UpdateTime(HAA16_tagMCSuperGiftInfo package)

        {

            timeOverdueGiftId = (int)package.GiftID;

            var _time = new DateTime(TimeUtility.Year, TimeUtility.Month, TimeUtility.Day, 0, 0, 0);

            overDueTime = _time.AddDays(package.RemainDay);

            allOverdue = package.RemainDay == 0;

            overDueTime = ParseOverdueTime(package.EndtDate);

            bool _activate = CheckActivate();

            if (activate != _activate)

            {

@@ -98,6 +95,16 @@
                timeLimitUpdate();

            }

            UpdateRedpoint();

        }



        DateTime ParseOverdueTime(string _date)

        {

            var array = _date.Split('-');

            var year = int.Parse(array[0]);

            var month = int.Parse(array[1]);

            var day = int.Parse(array[2]);

            var time = new DateTime(year, month, day, 0, 0, 0);

            return time.AddDays(1);

        }



        private void FirstChargeRewardEvent()

@@ -121,10 +128,6 @@
            {

                return false;

            }

            if (allOverdue)

            {

                return false;

            }

            List<StoreConfig> _list = null;

            StoreConfig.TryGetStoreConfigs((int)StoreFunc.OSGift,out _list);

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

@@ -144,15 +147,11 @@


        public bool IsGiftOverdue(int _id)

        {

            if (allOverdue || _id < timeOverdueGiftId)

            {

                return true;

            }

            if (_id == timeOverdueGiftId)

            {

                return TimeUtility.ServerNow >= overDueTime;

            }

            return false;

            return true;

        }



        public bool IsGiftBuy(int _id)

@@ -182,7 +181,6 @@


        public void OnBeforePlayerDataInitialize()

        {

            allOverdue = false;

            timeOverdueGiftId = 0;

        }




 System/OpenServerActivity/OpenServerGiftWin.cs

@@ -117,7 +117,7 @@
        void DisplayTimer()

        {

            var seconds = (int)(giftModel.overDueTime - TimeUtility.ServerNow).TotalSeconds;

            if (giftModel.allOverdue || giftModel.IsGiftOverdue(currentSelectId) || seconds <= 0)

            if (giftModel.IsGiftOverdue(currentSelectId) || seconds <= 0)

            {

                m_ContainerTime.gameObject.SetActive(false);

                m_Overdue.gameObject.SetActive(true);


 System/Treasure/TreasureAnimation.cs

@@ -98,6 +98,7 @@
                    if (value == TreasureShowStep.UnLock)

                    {

                        m_ProgressPosTween.SetEndState();

                        m_PotentialSclTween.SetEndState();

                        UI3DTreasureSelectStage.Instance.SetEndState();

                    }

                    return;

@@ -643,6 +644,7 @@
            OnEnterPotential();

            m_ProgressPosTween.SetEndState();

            m_AchievementPosTween.SetEndState();

            m_PotentialSclTween.SetEndState();





            UI3DTreasureSelectStage.Instance.Tween(() =>


 System/Vip/FairyJadeInvestmentModel.cs

@@ -345,7 +345,7 @@
    private void IsShowRedPointSimple()

    {

        int GetDayOfYear = DateTime.Now.DayOfYear;

        string strKey = "IsOpenFiaryJadeRedPoint" + PlayerDatas.Instance.baseData.LV;

        string strKey = "IsOpenFiaryJadeRedPoint" + PlayerDatas.Instance.baseData.PlayerID;

        int day = LocalSave.GetInt(strKey);

        if (day != GetDayOfYear)

        {


 System/Vip/VipInvest/VipInvestModel.cs

@@ -467,7 +467,7 @@
        private void IsShowRedPointSimple()

        {

            int GetDayOfYear = DateTime.Now.DayOfYear;

            string strKey = "IsOpenVipRedPoint" + PlayerDatas.Instance.baseData.LV;

            string strKey = "IsOpenVipRedPoint" + PlayerDatas.Instance.baseData.PlayerID;

            int day = LocalSave.GetInt(strKey);

            if (day != GetDayOfYear)

            {