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

client_Wu Xijin

2019-01-23 2d1b5035f55c24fdb764ee493db1c0168205f5e9

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

 Fight/Stage/Dungeon/DungeonStage.cs

@@ -231,6 +231,7 @@
                break;

            case DemonJarModel.DEMONJAR_MAPID:

            case 31140:

            case JadeDynastyBossModel.JADEDYNASTY_MAP:

                WindowCenter.Instance.Open<DungeonPickUpItemCoolDownWin>();

                break;

            case FairyLeagueModel.FAIRY_LEAGUE_DUNGEON:

@@ -249,7 +250,8 @@
        // 等待处理开启自动战斗

        DungeonModel _dungeonModel = ModelCenter.Instance.GetModel<DungeonModel>();

        if (PlayerDatas.Instance.baseData.MapID == 52020

         || PlayerDatas.Instance.baseData.MapID == 52010)

         || PlayerDatas.Instance.baseData.MapID == 52010

         || PlayerDatas.Instance.baseData.MapID == JadeDynastyBossModel.JADEDYNASTY_MAP)

        {

            _dungeonModel.updateMissionEvent += HandleAutoFight;

        }


 System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs

@@ -8,6 +8,10 @@
    {

        [SerializeField] Text fightPowerText;

        [SerializeField] Button decomposeBtn;

        [SerializeField] Button sortBtn;

        [SerializeField] Text sortText;

        [SerializeField] Image sortImage;



        [Header("诛仙装备位")]

        [SerializeField] Button stoneAttrBtn;

        [SerializeField] Button suitAttrBtn;

@@ -18,6 +22,7 @@


        PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }

        RoleParticularModel particularModel { get { return ModelCenter.Instance.GetModel<RoleParticularModel>(); } }

        PackModelInterface modelInterface { get { return ModelCenter.Instance.GetModel<PackModelInterface>(); } }

        #region Built-in

        protected override void BindController()

        {

@@ -28,6 +33,7 @@
            decomposeBtn.AddListener(ClickDecompose);

            stoneAttrBtn.AddListener(ClickStoneAttr);

            suitAttrBtn.AddListener(ClickSuitAttr);

            sortBtn.AddListener(OnClickSort);

        }



        protected override void OnPreOpen()

@@ -60,6 +66,20 @@
            CreateItemLine();

            UpdatePlayerUI3DModel();

            UpdateFightPower();

            TimeDownMgr.CoolTimeData data;

            if (TimeDownMgr.Instance.Get(TimeDownMgr.CoolTimeType.BagSort, out data))

            {

                data.func = RefreshTime;

                sortImage.SetSprite("BlackBtn");

                sortText.text = Language.Get("BagWin_SortCDbtn_Text_1", Mathf.CeilToInt(data.duration - data.time));

                sortBtn.enabled = false;

            }

            else

            {

                sortImage.SetSprite("SecondBtn1");

                sortText.text = Language.Get("BagWin_Sortbtn_Text_1");

                sortBtn.enabled = true;

            }

        }



        private void CreateItemLine()

@@ -113,6 +133,31 @@


        }



        public void OnClickSort()

        {

            modelInterface.SendPackResetQuest(PackType.rptJadeDynastyItem);

            TimeDownMgr.Instance.Begin(TimeDownMgr.CoolTimeType.BagSort, 5.0f, RefreshTime);

            sortText.text = Language.Get("BagWin_SortCDbtn_Text_1", 5);

            sortImage.SetSprite("BlackBtn");

            sortBtn.enabled = false;

        }



        private void RefreshTime(float time)

        {

            if (time <= 0)

            {

                sortImage.SetSprite("SecondBtn1");

                sortText.text = Language.Get("BagWin_Sortbtn_Text_1");

                sortBtn.enabled = true;

            }

            else

            {

                sortText.text = Language.Get("BagWin_SortCDbtn_Text_1", time);

                sortBtn.enabled = false;

            }



        }



        private void ClickDecompose()

        {

            WindowCenter.Instance.Open<JadeDynastyDecomposeWin>();


 System/OpenServerActivity/OpenServiceAchievementModel.cs

@@ -433,10 +433,7 @@
    }

    private void SetRedPointId()//设置红点ID

    {

        if (RedPointDic.Count > 0)

        {

            return;

        }

        RedPointDic.Clear();

        foreach (var key in WeekPartyDayInfoDic.Keys)

        {

            int RedPoint = Redpoint_key1 * 10 + key;