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

client_Hale

2019-07-05 aa079cba36a7297e6a62a297302d71db680d9f4e

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

 System/FairyAu/FairyLeagueNoticeWin.cs

@@ -21,6 +21,7 @@
        [SerializeField] Button m_Goto;

        [SerializeField] RawImage[] m_RawWeapons;

        [SerializeField, Header("武器角度，职业1，2，3")] Vector3[] m_WeaponAngles;

        [SerializeField] float[] m_WeaponScales;



        FairyLeagueModel model { get { return ModelCenter.Instance.GetModel<FairyLeagueModel>(); } }

        #region Built-in

@@ -86,6 +87,7 @@
            var job = PlayerDatas.Instance.baseData.Job;

            var _rawImage = m_RawWeapons[0];

            var _angle = m_WeaponAngles[0];

            var _scale = m_WeaponScales[0];

            var _weaponId = model.leagueNoticeWeapons.ContainsKey(job) ? model.leagueNoticeWeapons[job] : 0;

            if (_weaponId == 0)

            {

@@ -98,10 +100,15 @@
                {

                    _rawImage = m_RawWeapons[i];

                    _angle = m_WeaponAngles[i];

                    _scale = m_WeaponScales[i];

                }

            }



            var config = ItemConfig.Get(_weaponId);

            UI3DModelExhibition.Instance.ShowEquipment(config.ChangeOrd, _angle, 1f, _rawImage);

            var spiritConfig = SpiritWeaponConfig.Get(_weaponId);



            UI3DModelExhibition.Instance.ShowEquipment(config.ChangeOrd, spiritConfig != null ? spiritConfig.Rotation : _angle,

               _scale, _rawImage);

        }

    }