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

client_Zxw

2018-09-28 ca7eddd6120f7c60e8b9a8b93d54413b36d4762f

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

 Fight/BossFakeLineUtility.cs

@@ -15,8 +15,18 @@

    bool m_ShowFakeLine = false;
    public bool showFakeLine {
        get { return m_ShowFakeLine; }
        set { m_ShowFakeLine = value; }
        get {
            if (TimeUtility.OpenDay < GeneralConfig.Instance.bossShuntDays
                && GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID))
            {
                return true;
            }

            return m_ShowFakeLine;
        }
        set {
            m_ShowFakeLine = value;
        }
    }

    public BossFakeLineUtility()
@@ -70,6 +80,15 @@

    public void RecordSawStone(int npcId, int lineId)
    {
        var bossInfo = BossInfoConfig.GetBossInfoByStoneId(npcId);
        if (bossInfo != null)
        {
            if (HasSawLineBossRecently(bossInfo.NPCID, lineId))
            {
                bossSawRecorder.Clear();
            }
        }

        stoneSawRecorder.Record(npcId, lineId, Time.realtimeSinceStartup);
    }

@@ -93,6 +112,11 @@

    public void RecordSawBoss(int bossId, int lineId)
    {
        if (HasSawLineStoneRecently(bossId, lineId))
        {
            stoneSawRecorder.Clear();
        }

        bossSawRecorder.Record(bossId, lineId, Time.realtimeSinceStartup);
    }


 Fight/PreFightMission.cs

@@ -1395,7 +1395,11 @@


        m_FabaoEffect = SFXPlayUtility.Instance.PlayWithEulerAngle(1051, new Vector3(129.98f, 51.548f, 33.13f), new Vector3(0, -90.81f, 0));



        PlayerDatas.Instance.hero.MoveToPosition(m_SecondTransferStartPos);

        if (PlayerDatas.Instance.hero!=null)

        {

            PlayerDatas.Instance.hero.MoveToPosition(m_SecondTransferStartPos);

        }



        DebugEx.Log("第四个对话结束...");

    }




 System/Role/RoleRenameWin.cs

@@ -120,7 +120,7 @@
              {

                  if (isOk)

                  {

                      LanguageVerify.Instance.VerifyPlayerName(renameInput.text, 0,

                      LanguageVerify.Instance.VerifyPlayerName(renameInput.text, (int)PlayerDatas.Instance.baseData.PlayerID,

                        UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.PlayerName), PlayerDatas.Instance.baseData.LV,

                         PlayerDatas.Instance.baseData.VIPLv, (bool ok, string name) =>

                         {


 System/RolePromote/RolePromoteWin.cs

@@ -79,8 +79,11 @@
                case PlayerDataRefresh.LV:

                case PlayerDataRefresh.LV2:

                case PlayerDataRefresh.LVEx:

                    UpdateGrade();

                    break;

                case PlayerDataRefresh.FightPower:

                    UpdateGrade();

                    DisplayFightPower();

                    break;

            }

        }

@@ -133,7 +136,7 @@
                }

            }

            scrollerController.Restart();

            m_FightPowerTxt.text = Language.Get("RolePromoteFightPower", PlayerDatas.Instance.baseData.FightPoint);

            DisplayFightPower();

        }



        void InitResourceData()

@@ -147,6 +150,11 @@
            scrollerController.Restart();

        }



        private void DisplayFightPower()

        {

            m_FightPowerTxt.text = Language.Get("RolePromoteFightPower", PlayerDatas.Instance.baseData.FightPoint);

        }



        private void UpdateGrade()

        {

            var _playerLvCfg = Config.Instance.Get<PlayerLVConfig>(PlayerDatas.Instance.baseData.LV);


 System/TreasureFindHost/TreasureFindHostModel.cs

@@ -145,7 +145,7 @@
                ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptEquip,condi[3]);

                if(itemModel != null)

                {

                    if(specEquipIds != null && specEquipIds.Contains(condi[3]))

                    if(specEquipIds != null && specEquipIds.Contains(itemModel.itemId))

                    {

                        progress += 1;

                        return true;