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

client_Wu Xijin

2019-06-28 f6e51c1fab521601fa7cc38a30151f73e63eb484

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

 Fight/Stage/Dungeon/ClientDungeonStageUtility.cs

@@ -38,6 +38,11 @@
            lineId = lineId,

        };



        if (ClientSceneManager.Instance.IsClientFightMode)

        {

            ClientSceneManager.Instance.ExitClientFightMode();

        }



        var pak = new CA231_tagCMClientStartCustomScene();

        pak.MapID = (uint)mapId;

        pak.FuncLineID = (ushort)lineId;


 Fight/Stage/MapEditor/Game/ClientSceneManager.cs

@@ -213,11 +213,6 @@

    public void UnInit()
    {
        if (IsClientFightMode)
        {
            ClientSceneManager.Instance.ExitClientFightMode();
        }

        foreach (var _t in m_TransferGroupList)
        {
            _t.UnInit();

 System/ItemTip/PeerlessChestTipWin.cs

@@ -90,6 +90,9 @@
                var data = ItemTipUtility.mainTipData;

                m_BaseInfoWidget.Display(data.baseInfo);

                m_DescriptionWidget.Display(data.baseInfo.itemId);

                var count = ModelCenter.Instance.GetModel<PackModel>().GetItemUsedTimesToday(data.itemId);

                var config = ItemConfig.Get(data.itemId);

                m_DescriptionWidget.DisplayUseState(count, config.MaxSkillCnt);

            }

        }