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

client_Zxw

2018-09-21 9b0bc3bddda6c82ea6f466bd04bf858d324af25b

 System/MainInterfacePanel/FeatureNoticeWin.cs

@@ -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: