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

client_Hale

2018-09-21 06bac38d743f3f99a294f20e5b02af6d53676b0b

 System/MainInterfacePanel/FeatureNoticeWin.cs

@@ -97,9 +97,9 @@
        }

        protected override void OnPreClose()
        {

            UI3DModelExhibition.Instance.StopShowNPC();
            UI3DModelExhibition.Instance.StopShowHourse();

            UI3DModelExhibition.Instance.StopShowWing();
            UI3DModelExhibition.Instance.StopShow();
            UI3DModelExhibition.Instance.StopShow();

            UI3DModelExhibition.Instance.StopShow();
            UI3DTreasureExhibition.Instance.StopShow();
        }

        protected override void OnAfterClose()
@@ -296,9 +296,9 @@
            m_RawImage3.gameObject.SetActive(false);

            m_RawImage4.gameObject.SetActive(false);

            m_FeaturesImage.gameObject.SetActive(false);

            UI3DModelExhibition.Instance.StopShowNPC();

            UI3DModelExhibition.Instance.StopShowHourse();

            UI3DModelExhibition.Instance.StopShowWing();

            UI3DModelExhibition.Instance.StopShow();

            UI3DModelExhibition.Instance.StopShow();

            UI3DModelExhibition.Instance.StopShow();

            UI3DTreasureExhibition.Instance.StopShow();

            var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(ClickFuncID);

            bool Type = false;

@@ -321,12 +321,12 @@
                case (int)FeatureNoticeEnum.Pet:

                    m_RawImage1.gameObject.SetActive(true);

                    var npcConfig = Config.Instance.Get<NPCConfig>(50106001);

                    UI3DModelExhibition.Instance.BeginShowNPC(50106001, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImage1);

                    UI3DModelExhibition.Instance.ShowNPC(50106001, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImage1);

                    break;

                case (int)FeatureNoticeEnum.Horse:

                    m_RawImage2.gameObject.SetActive(true);

                    HorseConfig _model = Config.Instance.Get<HorseConfig>(100);

                    UI3DModelExhibition.Instance.BeginShowHourse(_model.Model, m_RawImage2);

                    UI3DModelExhibition.Instance.ShowHourse(_model.Model, m_RawImage2);

                    break;

                case (int)FeatureNoticeEnum.Wing:

                    m_RawImage3.gameObject.SetActive(true);

@@ -336,13 +336,13 @@
                    {

                        var config = Config.Instance.Get<WingRefineExpConfig>(3711);

                        int _modelID = config.Model;

                        UI3DModelExhibition.Instance.BeginShowWing(_modelID, vec3, m_RawImage3);

                        UI3DModelExhibition.Instance.ShowWing(_modelID, vec3, m_RawImage3);

                    }

                    else if (job == 2)

                    {

                        var config = Config.Instance.Get<WingRefineExpConfig>(3721);

                        int _modelID = config.Model;

                        UI3DModelExhibition.Instance.BeginShowWing(_modelID, vec3, m_RawImage3);

                        UI3DModelExhibition.Instance.ShowWing(_modelID, vec3, m_RawImage3);

                    }

                    break;

                case (int)FeatureNoticeEnum.GossipFurnace: