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

client_Hale

2019-01-17 dd0226eaba20075e7187da68dbfc147cd0520c2f

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

 Core/NetworkPackage/DTCFile/ServerPack/HA2_Package/DTCA202_tagMCAttackMode.cs

@@ -6,7 +6,15 @@
    {
        C030A_tagCChangeAttackMode _proto = new C030A_tagCChangeAttackMode();
        _proto.Mode = (byte)attackMode;
        GameNetSystem.Instance.SendInfo(_proto);
        if (CrossServerUtility.IsCrossServerBoss())

        {

            GameNetSystem.Instance.SendToCrossServer(_proto);

        }

        else

        {

            GameNetSystem.Instance.SendInfo(_proto);

        }
      
    }

    public override void Done(GameNetPackBasic vNetPack)

 System/FindPrecious/DemonJarModel.cs

@@ -202,7 +202,7 @@
        {

            if (FuncOpen.Instance.IsFuncOpen(76))

            {

                var latestBossId = 0;

                var latestBossId = sortedBossIds[0];

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

                {

                    var bossId = sortedBossIds[i];

@@ -217,7 +217,7 @@
            }

            else

            {

                return 0;

                return sortedBossIds[0];

            }

        }




 System/FindPrecious/FindPreciousModel.cs

@@ -468,6 +468,10 @@
            {

                return FindPreciousType.DogzDungeon;

            }

            else if (Config.Instance.ContainKey<CrossServerBossConfig>(_bossId))

            {

                return FindPreciousType.CrossServerBoss;

            }



            return FindPreciousType.None;

        }


 System/FindPrecious/FindPreciousSubscribeHintWin.cs

@@ -35,6 +35,10 @@
            {
                m_HintContent.text = Language.Get("FightTreasure_Focus");
            }
            else if (WindowCenter.Instance.IsOpen<CrossServerBossWin>())
            {
                m_HintContent.text = Language.Get("FightTreasure_Focus");
            }
            else if (WindowCenter.Instance.IsOpen<LootPreciousFrameWin>())
            {
                m_HintContent.text = Language.Get("DemonJar_Focus");

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -251,7 +251,7 @@
            ChatTip.OnChatUpEvent += RefreshAdaptiveChat;

            GlobalTimeEvent.Instance.secondEvent += secondEvent;

            IsCrossServerOneVsOne();

            SetAtkType();

         
        }



        private void CompletionOfTaskEvent(int obj)

@@ -443,6 +443,7 @@


        private void secondEvent()

        {

            SetAtkType();

            if (IsUpdateBool)

            {

                StartCoroutine(featureNoticeModel.WhetherToPlayTheBox());//功能预告


 System/OpenServerActivity/OpenServiceAchievementModel.cs

@@ -557,7 +557,8 @@
            }



        }

        if (timeNow > timeEnd && isOpenNow)

        bool istimeBool = (timeNow < timeStar && !IsPreviewTime()) || (timeNow > timeEnd);

        if (istimeBool && isOpenNow)

        {

            isOpenNow = false;

            _IsOpen = false;