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

client_Hale

2019-01-28 89093f0115c2e165a41ad657bd490cf0299f8960

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

 Core/GameEngine/Login/Launch.cs

@@ -133,6 +133,9 @@


    void Start()

    {

        WindowCenter.Instance.DestoryWinsByStage(WindowCenter.WindowStage.Launch);

        AssetBundleUtility.Instance.UnloadAssetBundle("builtin/prefabs", true, false);



        Application.backgroundLoadingPriority = ThreadPriority.High;

        SoundPlayer.Instance.PlayLoginMusic();

        Config.Instance.PreLoadConfigs();

@@ -140,7 +143,6 @@
        Config.Instance.RegisterGlobalEvent();

        PackageRegedit.Init();

        DebugUtility.Instance.CreateDebugRoot();



        WindowCenter.Instance.OpenFromLocal<LaunchWin>();



        var sdkInitedTask = new SDKInitedTask();


 Core/ResModule/AssetBundle/AssetBundleUtility.cs

@@ -48,7 +48,8 @@
    public void ReInitBuiltInAsset()

    {

        WindowConfig.Release();

        UnloadAssetBundle("builtin/scriptableobjects",true,false);

        UnloadAssetBundle("builtin/scriptableobjects", true, false);



        var path = AssetVersionUtility.GetBuiltInAssetFilePath("builtin_assetbundle");

        var assetBundle = AssetBundle.LoadFromFile(path);

        if (assetBundle == null)


 System/FindPrecious/DemonJarModel.cs

@@ -342,8 +342,11 @@
            switch (_type)

            {

                case PlayerDataRefresh.LV:

                    var bossId = GetLatestUnLockBoss();

                    AutoSubscribeLastUnLockBoss(bossId);

                    if (FuncOpen.Instance.IsFuncOpen(76))

                    {

                        var bossId = GetLatestUnLockBoss();

                        AutoSubscribeLastUnLockBoss(bossId);

                    }



                    if (PlayerDatas.Instance.baseData.LV == GeneralDefine.demonJarRedPoint)

                    {


 System/FindPrecious/FindPreciousModel.cs

@@ -18,7 +18,8 @@
        Redpoint lootPreciousRedpoint = new Redpoint(LOOTPRECIOUs_REDPOINTID);



        int m_ViewKillRecordsBoss = 0;

        public int ViewKillRecordsBoss {

        public int ViewKillRecordsBoss

        {

            get { return this.m_ViewKillRecordsBoss; }

            set { this.m_ViewKillRecordsBoss = value; }

        }

@@ -27,9 +28,11 @@
        public List<BossNotify> bossNotifies = new List<BossNotify>();



        BossNotify m_CurrentBossNotify = default(BossNotify);

        public BossNotify currentBossNotify {

        public BossNotify currentBossNotify

        {

            get { return m_CurrentBossNotify; }

            private set {

            private set

            {

                if (m_CurrentBossNotify != value)

                {

                    m_CurrentBossNotify = value;

@@ -530,7 +533,7 @@
                var bossId = boss.bossId;

                if (Config.Instance.ContainKey<DemonJarConfig>(bossId))

                {

                    if (IsBossAlive(bossId))

                    if (FuncOpen.Instance.IsFuncOpen(76) && IsBossAlive(bossId))

                    {

                        var config = Config.Instance.Get<DemonJarConfig>(bossId);

                        var grade = dungeonModel.GetGrade(new Dungeon(DemonJarModel.DEMONJAR_MAPID, config.LineID));


 System/FriendSystem/MailPanel.cs

@@ -340,7 +340,7 @@
                        itemCell.gameObject.SetActive(true);

                        MailItemModel itemModel = info.Items[giftCount];

                        ItemCellModel cellModel = new ItemCellModel((int)itemModel.ItemID, false, (ulong)itemModel.Count,

                            itemModel.IsBind,"",PackType.rptDeleted, false, ConfigParse.Analysis(itemModel.UserData));

                            itemModel.IsBind, "", PackType.rptDeleted, false, ConfigParse.Analysis(itemModel.UserData));

                        itemCell.Init(cellModel);

                        itemCell.cellBtn.onClick.RemoveAllListeners();

                        itemCell.cellBtn.onClick.AddListener(() =>

@@ -603,10 +603,10 @@
            {

                if (preReceiveIndex != _nextReceiveIndex)

                {

                    if(_chooseMailList != null && _chooseMailList.Count > _nextReceiveIndex)

                    if (_chooseMailList != null && _chooseMailList.Count > _nextReceiveIndex)

                    {

                        ReceiveAllChooseMail(_nextReceiveIndex, _chooseMailList[_nextReceiveIndex]);

                    }  
                    }

                }

            }



@@ -696,11 +696,24 @@


        foreach (var key in GetPackItemDcit.Keys)

        {

            int remainCount = playerPack.GetReaminGridCount(key);

            int getCount = GetPackItemDcit[key];

            if(remainCount < getCount)

            int remainCount = 0;

            switch (key)

            {

                SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_676165",key);

                case PackType.rptGatherSoul:

                    remainCount = virtualPackModel.GetPackRemainCount(key);

                    break;

                case PackType.rptRunePack:

                    remainCount = runeModel.SurplusRunePackCnt;

                    break;

                default:

                    remainCount = playerPack.GetReaminGridCount(key);

                    break;

            }



            int getCount = GetPackItemDcit[key];

            if (remainCount < getCount)

            {

                SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_676165", key);

                return;

            }

        }


 System/JadeDynastyKnapSack/JadeDynastySuitAttrBeh.cs

@@ -183,15 +183,16 @@
                int equipPlace = equipPlaces[0];

                List<int> activeEquips = null;

                bool isActive = equipModel.TryGetIsActiveSuit(equipPlace,suitAttrData.suitLv,out activeEquips);

                activeObj.SetActive(!isActive);

                if(!isActive)

                bool isShowActiveObj = !isActive || type == PackType.rptJadeDynastyItem;

                activeObj.SetActive(isShowActiveObj);

                if(isShowActiveObj)

                {

                    string equipsName = string.Empty;

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

                    {

                        var place = equipPlaces[i];

                        string equipName = Language.Get(((RoleEquipType)place).ToString());

                        if (activeEquips.Contains(place))

                        if (activeEquips.Contains(place) && type == PackType.rptJadeDynastyEquip)

                        {

                            equipName = UIHelper.AppendStringColor(TextColType.Green,equipName);

                        }

@@ -218,15 +219,7 @@
                        var attrText = attrTextlist[i];

                        var attrConfig = Config.Instance.Get<PlayerPropertyConfig>(attrId);

                        string attrSB = string.Empty;

                        string attrValueSB = string.Empty;

                        if (isActive)

                        {

                          attrValueSB = UIHelper.AppendStringColor(TextColType.Green, tipsModel.GetProValueTypeStr(attrConfig, attrValue));

                        }

                        else

                        {

                            attrValueSB = UIHelper.AppendStringColor(TextColType.Gray, tipsModel.GetProValueTypeStr(attrConfig, attrValue));

                        }

                        string attrValueSB = tipsModel.GetProValueTypeStr(attrConfig, attrValue); ;

                        if (attrConfig.Name.Contains("%s"))

                        {

                            attrSB = attrConfig.Name.Replace("%s", attrValueSB);


 System/Launch/LaunchWin.cs

@@ -64,7 +64,11 @@
        {

            backGroundTimer = 0f;

            backGroundIndex = 0;

            m_TotalProgressSlider.ResetValue(0f);

            if (m_TotalProgressSlider != null)

            {

                m_TotalProgressSlider.ResetValue(0f);

            }



            m_AlphaTween.SetStartState();



            m_Version.text = StringUtility.Contact(VersionConfig.Get().version, "_", VersionConfig.Get().buildIndex);

@@ -101,7 +105,18 @@


        protected override void OnAfterClose()

        {



        }



        protected override void OnActived()

        {

            base.OnActived();

            if (m_TotalProgressSlider == null)

            {

                m_TotalProgressSlider = this.GetComponentInChildren<SmoothSlider>(true);

            }

        }



        #endregion



        public void FadeOut()

@@ -170,30 +185,37 @@


                if (progressInfo.stage == Launch.LaunchStage.DownLoad)

                {

                    if (m_PartProgressSlider.gameObject.activeInHierarchy)

                    if (m_PartProgressSlider != null && m_PartProgressSlider.gameObject.activeInHierarchy)

                    {

                        m_PartProgressSlider.gameObject.SetActive(false);

                    }



                    if (m_TotalProgressSlider.gameObject.activeInHierarchy)

                    if (m_TotalProgressSlider != null && m_TotalProgressSlider.gameObject.activeInHierarchy)

                    {

                        m_TotalProgressSlider.gameObject.SetActive(false);

                    }

                }

                else

                {

                    if (!m_PartProgressSlider.gameObject.activeInHierarchy)

                    if (m_PartProgressSlider != null && !m_PartProgressSlider.gameObject.activeInHierarchy)

                    {

                        m_PartProgressSlider.gameObject.SetActive(true);

                    }



                    if (!m_TotalProgressSlider.gameObject.activeInHierarchy)

                    if (m_TotalProgressSlider != null && !m_TotalProgressSlider.gameObject.activeInHierarchy)

                    {

                        m_TotalProgressSlider.gameObject.SetActive(true);

                    }



                    m_TotalProgressSlider.value = progressInfo.totalProgress;

                    m_PartProgressSlider.value = progressInfo.partProgress;

                    if (m_TotalProgressSlider != null)

                    {

                        m_TotalProgressSlider.value = progressInfo.totalProgress;

                    }



                    if (m_PartProgressSlider != null)

                    {

                        m_PartProgressSlider.value = progressInfo.partProgress;

                    }

                }



                DisplayStageDescription(progressInfo.stage, progressInfo.step);

@@ -214,7 +236,10 @@
            {

                showStage = stage;

                showStep = step;

                m_StageDescription.text = GetLaunchStageDescription(stage, step);

                if (m_StageDescription != null)

                {

                    m_StageDescription.text = GetLaunchStageDescription(stage, step);

                }

            }

        }