Merge remote-tracking branch 'origin/LuaOrgan' into LuaOrgan

client_Lhy

2019-07-04 ab0a8ece9ef235f543a02da11b64ea4be4c2946b

Merge remote-tracking branch 'origin/LuaOrgan' into LuaOrgan

 Lua/Gen/SnxxzUIUI3DModelExhibitionWrap.cs

@@ -287,9 +287,10 @@
                {
                    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));
                    float _scale = (float)LuaAPI.lua_tonumber(L, 4);
                    UnityEngine.UI.RawImage _rawImage = (UnityEngine.UI.RawImage)translator.GetObject(L, 5, typeof(UnityEngine.UI.RawImage));
                    
                    gen_to_be_invoked.ShowEquipment( _modelId, _localEulerAngles, _rawImage );
                    gen_to_be_invoked.ShowEquipment( _modelId, _localEulerAngles, _scale, _rawImage );
                    
                    
                    

 Lua/Gen/SnxxzUIUI3DModelExhibitionWrap.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 65ff240874f2aad409aec50afb831205
timeCreated: 1557818437
timeCreated: 1562245288
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/FairyAu/FairyLeagueNoticeWin.cs

@@ -10,7 +10,8 @@
using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI {

namespace Snxxz.UI

{



    public class FairyLeagueNoticeWin : Window

    {

@@ -100,7 +101,7 @@
                }

            }

            var config = ItemConfig.Get(_weaponId);

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

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

        }

    }




 System/ItemTip/ItemTipUtility.cs

@@ -1643,10 +1643,15 @@
                    return operates;
                }

                if (WindowCenter.Instance.IsOpen("RoleEquipWin"))
                if ( ItemLogicUtility.Instance.IsRealmEquip(item.itemId) && WindowCenter.Instance.IsOpen("RoleEquipWin"))
                {
                    operates.Add(ItemOperateType.putOff);

                    return operates;
                }



                if (ItemLogicUtility.Instance.IsSpiritWeapon(item.itemId) && WindowCenter.Instance.IsOpen("SpiritEquipBagWin"))
                {
                    operates.Add(ItemOperateType.putOff);
                    return operates;
                }
            }
@@ -1680,15 +1685,30 @@

                if (!isOverdue && ItemLogicUtility.Instance.IsJobCompatibleItem(item.itemId))
                {
                    if (isEquip && WindowCenter.Instance.IsOpen<RoleEquipWin>())

                    if (isEquip)

                    {

                        operates.Add(ItemOperateType.gotoPuton);

                    }

                    else if (WindowCenter.Instance.IsOpen<MainInterfaceWin>()

                        || WindowCenter.Instance.IsOpen<BagWin>() || WindowCenter.Instance.IsOpen<RealmEquipWin>())

                        if (WindowCenter.Instance.IsOpen<RoleEquipWin>())

                        {

                            operates.Add(ItemOperateType.gotoPuton);

                        }

                        else if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() || WindowCenter.Instance.IsOpen<RealmEquipWin>())

                        {

                            operates.Add(ItemOperateType.putOn);

                        }

                    }

                    if (isSpiritWeapon)

                    {

                        operates.Add(ItemOperateType.putOn);

                    }

                        if (WindowCenter.Instance.IsOpen<RoleEquipWin>())

                        {

                            operates.Add(ItemOperateType.gotoPuton);

                        }

                        else if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() || WindowCenter.Instance.IsOpen("SpiritEquipBagWin"))

                        {

                            operates.Add(ItemOperateType.putOn);

                        }

                    }


                }

                return operates;

 System/KnapSack/Logic/ItemOperateUtility.cs

@@ -334,11 +334,29 @@

        public void GotoPutOnEquip(string guid)

        {

            WindowCenter.Instance.Close<KnapSackWin>();

            WindowCenter.Instance.Close<EquipTipWin>();

            WindowCenter.Instance.Open<RealmEquipWin>();

            var item = packModel.GetItemByGuid(guid);

            if (item == null)

            {

                return;

            }



            Clock.AlarmAfter(0.5f, () => { ItemTipUtility.Show(guid); });

            if (ItemLogicUtility.Instance.IsRealmEquip(item.itemId))

            {

                WindowCenter.Instance.Close<KnapSackWin>();

                WindowCenter.Instance.Close<EquipTipWin>();

                WindowCenter.Instance.Open<RealmEquipWin>();



                Clock.AlarmAfter(0.5f, () => { ItemTipUtility.Show(guid); });

            }



            if (ItemLogicUtility.Instance.IsSpiritWeapon(item.itemId))

            {

                WindowCenter.Instance.Close<KnapSackWin>();

                WindowCenter.Instance.Close<EquipTipWin>();

                WindowCenter.Instance.Open("SpiritEquipWin");



                Clock.AlarmAfter(0.5f, () => { ItemTipUtility.Show(guid); });

            }

        }

        public void PutOffEquip(string guid)

 System/Vip/FirstChargeTrialWin.cs

@@ -10,7 +10,8 @@
using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI {

namespace Snxxz.UI

{



    public class FirstChargeTrialWin : Window//充值試用

    {

@@ -21,14 +22,14 @@
        public Vector3 RotateVector = new Vector3(0f, 1f, 0f);

        #region Built-in

        FirstTimeRechargeModel firstTimeRechargeModel { get { return ModelCenter.Instance.GetModel<FirstTimeRechargeModel>(); } }

        


        protected override void BindController()

        {

        }



        protected override void AddListeners()

        {

            m_TryOnButton.AddListener(()=> { firstTimeRechargeModel.TryOutSend(); });

            m_TryOnButton.AddListener(() => { firstTimeRechargeModel.TryOutSend(); });

        }



        protected override void OnPreOpen()

@@ -49,7 +50,7 @@
            TipPanel.Instance.IsOPenTip();

        }

        #endregion

        private void  DisplayWeapon()

        private void DisplayWeapon()

        {

            var job = PlayerDatas.Instance.baseData.Job;

            var _rawImage = m_RawWeapons[0];

@@ -67,16 +68,16 @@
            {

                int _weaponId = firstTimeRechargeModel.TryOutDic[job];

                var config = ItemConfig.Get(_weaponId);

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

                ItemCellModel ItemModel = new ItemCellModel(_weaponId,true,0);

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

                ItemCellModel ItemModel = new ItemCellModel(_weaponId, true, 0);

                m_ItemCell.Init(ItemModel);

                m_ItemCell.button.RemoveAllListeners();

                m_ItemCell.button.AddListener(()=> 
                m_ItemCell.button.AddListener(() =>

                {

                    ItemTipUtility.Show(_weaponId);

                });

            }

           


        }

    }




 System/Vip/FirstRechargeWin.cs

@@ -10,7 +10,8 @@
using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI {

namespace Snxxz.UI

{



    public class FirstRechargeWin : Window

    {

@@ -25,10 +26,8 @@
        [SerializeField] ItemCell[] m_Items;



        VipModel m_Model;

        VipModel model

        {

            get

            {

        VipModel model {

            get {

                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<VipModel>());

            }

        }

@@ -52,12 +51,12 @@
            for (int i = 0; i < m_GotoChargeDetailBtns.Length; i++)

            {

                var index = i;

                m_GotoChargeDetailBtns[i].onClick.AddListener(()=> 
                m_GotoChargeDetailBtns[i].onClick.AddListener(() =>

                {

                    GotoChargeDetail(index);

                });

            }

            m_CloseBtn.onClick.AddListener(()=> 
            m_CloseBtn.onClick.AddListener(() =>

            {

                CloseImmediately();

                WindowCenter.Instance.Open<MainInterfaceWin>();

@@ -130,7 +129,7 @@


        private void OnGetReward()

        {

            if(PlayerDatas.Instance.baseData.coinPointTotal > 0

            if (PlayerDatas.Instance.baseData.coinPointTotal > 0

                && !model.firstChargeRewardGet)

            {

                CA504_tagCMPlayerGetReward pak = new CA504_tagCMPlayerGetReward();

@@ -205,7 +204,7 @@
                }

            }

            var config = ItemConfig.Get(_weaponId);

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

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

        }

    }




 System/Vip/FirstTimeRechargeWin.cs

@@ -136,13 +136,13 @@
                    {

                        m_RawImageBoy.gameObject.SetActive(true);

                        m_RawImageGirl.gameObject.SetActive(false);

                        UI3DModelExhibition.Instance.ShowEquipment(itemConfig.ChangeOrd, Vec3, m_RawImageBoy);

                        UI3DModelExhibition.Instance.ShowEquipment(itemConfig.ChangeOrd, Vec3, 1f, m_RawImageBoy);

                    }

                    else

                    {

                        m_RawImageBoy.gameObject.SetActive(false);

                        m_RawImageGirl.gameObject.SetActive(true);

                        UI3DModelExhibition.Instance.ShowEquipment(itemConfig.ChangeOrd, Vec3, m_RawImageGirl);

                        UI3DModelExhibition.Instance.ShowEquipment(itemConfig.ChangeOrd, Vec3, 1f, m_RawImageGirl);

                    }

                }

                else


 UI/Common/UI3DModelExhibition.cs

@@ -293,7 +293,7 @@
        }



        private GameObject ObjEquipment;

        public void ShowEquipment(int modelId, Vector3 localEulerAngles, RawImage rawImage)

        public void ShowEquipment(int modelId, Vector3 localEulerAngles, float scale, RawImage rawImage)

        {

            var instance = UI3DModelFactory.LoadUIWing(modelId);

            ObjEquipment = instance;

@@ -309,7 +309,7 @@
            m_ShowCamera.enabled = true;

            m_EquipmentModelId = modelId;

            equipmentModel = instance;

            instance.transform.SetParentEx(m_EquipmentPoint, Vector3.zero, localEulerAngles, Vector3.one);

            instance.transform.SetParentEx(m_EquipmentPoint, Vector3.zero, localEulerAngles, Vector3.one * scale);

            instance.SetActive(true);

            ResetCameraColor();

            BindGestureCatcher(rawImage, interactable);