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

client_Zxw

2019-03-16 6c082f4ce9709581b667d308efa7b5a75fd854d9

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

 Lua/Gen/SnxxzUIUI3DModelExhibitionWrap.cs

@@ -339,14 +339,6 @@
            
                
                {
                    int __modelId = LuaAPI.xlua_tointeger(L, 2);
                    UnityEngine.Vector3 __localEulerAngles;translator.Get(L, 3, out __localEulerAngles);
                    UnityEngine.UI.RawImage __rawImage = (UnityEngine.UI.RawImage)translator.GetObject(L, 4, typeof(UnityEngine.UI.RawImage));
                    
                    gen_to_be_invoked.ShowWing( __modelId, __localEulerAngles, __rawImage );
                    
                    
                    
                    return 0;
                }
                

 System/MainInterfacePanel/FeatureNoticeWin.cs

@@ -336,19 +336,18 @@
                    break;

                case (int)FeatureNoticeEnum.Wing:

                    m_RawImage3.gameObject.SetActive(true);

                    var vec3 = new Vector3(0, 90, -90);

                    int job = PlayerDatas.Instance.baseData.Job;

                    if (job == 1)

                    {

                        var config = WingRefineExpConfig.Get(3711);

                        int _modelID = config.Model;

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

                        UI3DModelExhibition.Instance.ShowWing(_modelID,  m_RawImage3);

                    }

                    else if (job == 2)

                    {

                        var config = WingRefineExpConfig.Get(3721);

                        int _modelID = config.Model;

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

                        UI3DModelExhibition.Instance.ShowWing(_modelID,  m_RawImage3);

                    }

                    break;

                case (int)FeatureNoticeEnum.GossipFurnace:


 System/Strengthening/WingsRefined.cs

@@ -33,7 +33,6 @@
    [SerializeField] Text _PmgressText;//精炼数值

    [SerializeField] UIEffect m_UIEffect1;//翅膀特效1

    [SerializeField] UIEffect m_UIEffect2;//翅膀特效2

    public Vector3 Vec = new Vector3(0f, 90f, -60f);

    private Dictionary<int, int> _wingItemDic = new Dictionary<int, int>();//获取翅膀字典

    private Dictionary<int, bool> _DevourDIc = new Dictionary<int, bool>();//需要吞噬的物品

    private Dictionary<int, ItemModel> WingDic = new Dictionary<int, ItemModel>();//获取翅膀属性

@@ -603,18 +602,16 @@
        {

            _wingRawImage2.gameObject.SetActive(true);

            _wingRawImage.gameObject.SetActive(false);

            UI3DModelExhibition.Instance.ShowWing(_modelID, Vec, _wingRawImage2);

            UI3DModelExhibition.Instance.ShowWing(_modelID, _wingRawImage2);

        }

        else

        {

            _wingRawImage.gameObject.SetActive(true);

            _wingRawImage2.gameObject.SetActive(false);

            UI3DModelExhibition.Instance.ShowWing(_modelID, Vec, _wingRawImage);

            UI3DModelExhibition.Instance.ShowWing(_modelID, _wingRawImage);

        }



    }







    void DegreeOfRefining()//精炼度初始没翅膀时

    {


 UI/Common/UI3DModelExhibition.cs

@@ -21,13 +21,9 @@
        [SerializeField] Transform m_DialogPoint;

        [SerializeField] Transform m_EquipmentPoint;

        [SerializeField] Camera m_ShowCamera;

        [SerializeField] bool m_Interactable = false;

        [SerializeField] ColorCorrectionCurves m_CameraColor;



        public bool interactable {

            get { return m_Interactable; }

            set { m_Interactable = value; }

        }

        public bool interactable { get; set; }



        UI3DShowHero playerModel = new UI3DShowHero();



@@ -304,7 +300,7 @@
            BindGestureCatcher(rawImage, interactable);

        }



        public void ShowWing(int _modelId, Vector3 _localEulerAngles, RawImage _rawImage)

        public void ShowWing(int _modelId, RawImage _rawImage)

        {

            StopShow();



@@ -581,7 +577,7 @@


        private void OnDrag3DModel(Vector2 deltaPosition)

        {

            if (!m_Interactable)

            if (!interactable)

            {

                return;

            }