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

client_Hale

2019-04-20 668673905ac9e0048ee36312dea697d14b9797f4

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

 Fight/Stage/StageLoadProcessor.cs

@@ -253,7 +253,10 @@

            unloadUnUsedOperation = Resources.UnloadUnusedAssets();

            if (command.isClientLoadMap && command.serverType == ServerType.CrossSever)
            if (command.isClientLoadMap &&

                (command.fromMapId == HazyDemonKingModel.Client_MapID ||
                command.fromMapId == HazyGrassModel.Client_ReikiGrassMapID ||
               command.serverType == ServerType.CrossSever))
            {
                var sendInfo = new CA108_tagCMRefreshMainServerRole();
                GameNetSystem.Instance.SendInfo(sendInfo);

 System/Activity/ActivityNotifyBehaviour.cs

@@ -152,6 +152,9 @@
                    case DailyQuestType.AllianceBoss:

                        WindowCenter.Instance.Open<LootPreciousFrameWin>(false, 3);

                        break;

                    case DailyQuestType.HazyRegion:

                        WindowCenter.Instance.Open<CrossServerWin>(false, 0);

                        break;

                }

            }

            else


 System/EquipGem/EquipStrengthWin.cs

@@ -422,7 +422,8 @@
            }

            else

            {

                ServerTipDetails.DisplayNormalTip(Language.Get("Z1011"));

                ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(22);

                //ServerTipDetails.DisplayNormalTip(Language.Get("Z1011"));

                isbool = false;

            }




 System/HazyRegion/HazyDemonKingModel.cs

@@ -287,6 +287,12 @@
        {

            var config = HazyRegionConfig.Get(hazyRegionModel.processingIncidentId);



            var hero = PlayerDatas.Instance.hero;

            if (hero != null)

            {

                hero.StopAll();

            }



            MapTransferUtility.Instance.Clear();

            ClientDungeonStageUtility.SetClientDungeon(true, Client_MapID);

            ClientDungeonStageUtility.RequestStartClientDungeon(config.dungeonId, config.lineId);


 System/HazyRegion/HazyGrassModel.cs

@@ -300,6 +300,12 @@


            var mapId = GetClientMapId(hazyRegionModel.processingIncidentId);



            var hero = PlayerDatas.Instance.hero;

            if (hero != null)

            {

                hero.StopAll();

            }



            MapTransferUtility.Instance.Clear();

            ClientDungeonStageUtility.SetClientDungeon(true, (ushort)mapId);

            ClientDungeonStageUtility.RequestStartClientDungeon(config.dungeonId, config.lineId);


 System/HazyRegion/HazyRegionModel.cs

@@ -366,6 +366,12 @@


                    WindowCenter.Instance.CloseAll(WindowCenter.CloseAllIgnoreType.BaseAndCustom);



                    var hero = PlayerDatas.Instance.hero;

                    if (hero != null)

                    {

                        hero.StopAll();

                    }



                    AdventureStage.Instance.Enter();



                    Incident incident;


 System/ItemTip/EquipTipUtility.cs

@@ -49,6 +49,7 @@
            public int strengthenLevel;
            public int score;
            public int auctionSurplusTime;
            public int overdueSurplusTime;
            public int levelLimit;
            public int realmLimit;
        }
@@ -155,6 +156,9 @@
                            case 42:
                                WindowCenter.Instance.Open<PetMountTipWin>();
                                break;
                            case 114:
                                WindowCenter.Instance.Open<GuardTipWin>();
                                break;
                            default:
                                WindowCenter.Instance.Open<ItemTipWin>();
                                break;
@@ -225,6 +229,9 @@
                            case 41:
                            case 42:
                                WindowCenter.Instance.Open<PetMountTipWin>();
                                break;
                            case 114:
                                WindowCenter.Instance.Open<GuardTipWin>();
                                break;
                            default:
                                WindowCenter.Instance.Open<ItemTipWin>();
@@ -318,6 +325,7 @@
                guid = guid,

                baseInfo = GetBaseInfo(guid),
                baseProperty=GetBaseProperty(item.itemId),
                petMountBaseProperty = GetPetMountBaseProperty(item.itemId),
                operates = GetOperates(guid),
            };
@@ -426,6 +434,7 @@
                isEquiped = isEquiped,
                score = item.score,
                auctionSurplusTime = item.isAuction ? item.auctionSurplusTime : 0,
                overdueSurplusTime = item.overdueSurplusTime,
                levelLimit = item.isAuction ? 0 : item.config.UseLV,
                realmLimit = item.isAuction ? 0 : item.config.RealmLimit,
                star = isEquiped ? star : -1,
@@ -923,8 +932,8 @@
            }

            var operates = new List<ItemOperateType>();
            var packType = item.packType;

            var packType = item.packType;
            if (WindowCenter.Instance.IsOpen("DepotWin"))
            {
                switch (packType)
@@ -940,53 +949,70 @@
                return operates;
            }

            switch (packType)
            if (packType == PackType.Equip)
            {
                case PackType.Equip:
                    if (WindowCenter.Instance.IsOpen("RealmEquipWin"))
                    {
                        operates.Add(ItemOperateType.putOff);
                if (WindowCenter.Instance.IsOpen("RealmEquipWin"))
                {
                    operates.Add(ItemOperateType.putOff);

                        if (FuncOpen.Instance.IsFuncOpen(1))
                        {
                            operates.Add(ItemOperateType.strength);
                        }

                        operates.Add(ItemOperateType.star);
                        if (FuncOpen.Instance.IsFuncOpen(1))
                        {
                            operates.Add(ItemOperateType.inlay);
                        }

                        operates.Add(ItemOperateType.train);
                    }
                    break;
                case PackType.Warehouse:
                    operates.Add(ItemOperateType.putOut);
                    break;
                default:
                    if (item.isAuction)
                    if (FuncOpen.Instance.IsFuncOpen(1))
                    {
                        operates.Add(ItemOperateType.putAway);
                        operates.Add(ItemOperateType.strength);
                    }
                    else

                    operates.Add(ItemOperateType.star);
                    if (FuncOpen.Instance.IsFuncOpen(1))
                    {
                        var isEquip = ItemLogicUtility.Instance.IsEquip(item.itemId);
                        if (isEquip)
                        {
                            operates.Add(ItemOperateType.sell);
                            operates.Add(ItemOperateType.putOn);
                        }
                        else
                        {
                            operates.AddRange(GetOperates(item.itemId));
                            if (item.count > 1)
                            {
                                operates.Add(ItemOperateType.split);
                            }
                        }
                        operates.Add(ItemOperateType.inlay);
                    }
                    break;

                    operates.Add(ItemOperateType.train);

                    return operates;
                }

                if (WindowCenter.Instance.IsOpen("RoleEquipWin"))
                {
                    operates.Add(ItemOperateType.putOff);

                    return operates;
                }
            }

            if (packType == PackType.Warehouse)
            {
                operates.Add(ItemOperateType.putOut);
                return operates;
            }

            if (item.isAuction)
            {
                operates.Add(ItemOperateType.putAway);
                return operates;
            }

            var isEquip = ItemLogicUtility.Instance.IsEquip(item.itemId);
            var isSpiritWeapon = ItemLogicUtility.Instance.IsSpiritWeapon(item.itemId);
            if (isEquip || isSpiritWeapon)
            {
                if (item.config.CanSell == 1)
                {
                    operates.Add(ItemOperateType.sell);
                }

                if (item.config.ExpireTime > 0 && ItemLogicUtility.Instance.IsOverdue(guid))
                {
                    operates.Add(ItemOperateType.renewal);
                }

                operates.Add(ItemOperateType.putOn);
                return operates;
            }

            operates.AddRange(GetOperates(item.itemId));
            if (item.count > 1)
            {
                operates.Add(ItemOperateType.split);
            }

            return operates;

 System/ItemTip/GuardTipWin.cs

New file
@@ -0,0 +1,183 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Saturday, April 20, 2019
//--------------------------------------------------------

using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;

namespace Snxxz.UI
{

    public class GuardTipWin : Window
    {
        [SerializeField] TipItemBaseInfoWidget m_BaseInfoWidget;
        [SerializeField] TipBasePropertyWidget m_BasePropertyWidget;
        [SerializeField] TipItemDescriptionWidget m_DescriptionWidget;
        [SerializeField] Text m_Job;
        [SerializeField] Text m_Place;
        [SerializeField] OperateButton[] m_OperateButtons;
        [SerializeField] Button m_Close;

        #region Built-in
        protected override void BindController()
        {
        }

        protected override void AddListeners()
        {
            m_Close.SetListener(() => { WindowCenter.Instance.Close<GuardTipWin>(); });
        }

        protected override void OnPreOpen()
        {
        }

        protected override void OnAfterOpen()
        {
        }

        protected override void OnPreClose()
        {
        }

        protected override void OnAfterClose()
        {
        }

        protected override void OnActived()
        {
            base.OnActived();

            DisplayBaseInfo();
            DisplayBaseProperty();
            DisplayItemDescription();
            DisplayJobAndPlace();
            DisplayOperateButton();
        }

        #endregion

        private void DisplayBaseInfo()
        {
            var baseInfo = EquipTipUtility.mainTipData.baseInfo;
            m_BaseInfoWidget.Display(baseInfo);
        }

        private void DisplayBaseProperty()
        {
            var baseProperty = EquipTipUtility.mainTipData.baseProperty;
            m_BasePropertyWidget.Display(baseProperty);
        }

        private void DisplayItemDescription()
        {
            var itemId = EquipTipUtility.mainTipData.baseInfo.itemId;
            m_DescriptionWidget.Display(itemId);
        }

        private void DisplayJobAndPlace()
        {
            var itemId = EquipTipUtility.mainTipData.baseInfo.itemId;
            var itemConfig = ItemConfig.Get(itemId);
            if (JobNameConfig.Has(itemConfig.JobLimit))
            {
                m_Job.text = Language.Get("EquipWin_JobTitleText_1") + JobNameConfig.Get(itemConfig.JobLimit).name;
            }
            else
            {
                m_Job.text = Language.Get("StoreWin110");
            }

            m_Place.text = Language.Get("EquipWin_PartTitleText_1") + UIHelper.GetEquipPlaceName(itemConfig.EquipPlace);
        }

        private void DisplayOperateButton()
        {
            var operates = EquipTipUtility.mainTipData.operates;
            var guid = EquipTipUtility.mainTipData.guid;
            if (operates.IsNullOrEmpty())
            {
                for (int i = 0; i < m_OperateButtons.Length; i++)
                {
                    var button = m_OperateButtons[i];
                    button.SetActive(false);
                }
            }
            else
            {
                for (int i = 0; i < m_OperateButtons.Length; i++)
                {
                    var button = m_OperateButtons[i];
                    if (i < operates.Count)
                    {
                        button.SetActive(true);
                        button.Bind(operates[i], guid);
                    }
                    else
                    {
                        button.SetActive(false);
                    }
                }
            }
        }

        [Serializable]
        public class OperateButton
        {
            [SerializeField] RectTransform m_Container;
            [SerializeField] Button m_Button;
            [SerializeField] Text m_Title;

            ItemOperateType operateType;
            string guid;

            public void SetActive(bool active)
            {
                this.m_Container.gameObject.SetActive(active);
            }

            public void Bind(ItemOperateType type, string guid)
            {
                operateType = type;
                this.guid = guid;
                switch (type)
                {
                    case ItemOperateType.putOn:
                        this.m_Title.text = "穿上";
                        break;
                    case ItemOperateType.putOff:
                        this.m_Title.text = "脱下";
                        break;
                    case ItemOperateType.sell:
                        this.m_Title.text = "出售";
                        break;
                    case ItemOperateType.putOut:
                        this.m_Title.text = "取出";
                        break;
                    case ItemOperateType.putIn:
                        this.m_Title.text = "放入";
                        break;
                    default:
                        this.m_Title.text = "";
                        break;
                }

                m_Button.SetListener(() =>
                {
                    WindowCenter.Instance.Close<GuardTipWin>();
                    EquipTipUtility.Operate(operateType, this.guid);
                });
            }

        }
    }

}





 System/ItemTip/GuardTipWin.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: defef2681f086a149888a7abfadbaac4
timeCreated: 1555750193
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/ItemTip/ItemTipWin.cs

@@ -154,7 +154,6 @@
                        button.SetActive(false);
                    }
                }

            }
        }

@@ -215,8 +214,8 @@
                });
            }


        }

    }
}


 System/ItemTip/TipItemBaseInfoWidget.cs

@@ -45,21 +45,9 @@
            m_Item.SetItem(baseInfo.itemId, 1);
            m_Type.text = itemConfig.ItemTypeName;

            if (baseInfo.levelLimit > 1)
            {
                m_LevelConditionContainer.gameObject.SetActive(true);
                m_LevelCondition.text = StringUtility.Contact(Language.Get("KnapS110"), " ", baseInfo.levelLimit);

                var playerLevel = PlayerDatas.Instance.baseData.LV;
                m_LevelCondition.color = UIHelper.GetUIColor(playerLevel < itemConfig.UseLV ? TextColType.Red : TextColType.Green);
            }
            else
            {
                m_LevelConditionContainer.gameObject.SetActive(false);
            }

            if (baseInfo.realmLimit > 0)
            {
                m_LevelConditionContainer.gameObject.SetActive(false);
                m_RealmConditionContainer.gameObject.SetActive(true);
                var realmConfig = RealmConfig.Get(baseInfo.realmLimit);
                m_RealmCondition.text = StringUtility.Contact(Language.Get("RealmLimit1"), " ", realmConfig.Name);
@@ -70,6 +58,19 @@
            else
            {
                m_RealmConditionContainer.gameObject.SetActive(false);

                if (baseInfo.levelLimit > 0)
                {
                    m_LevelConditionContainer.gameObject.SetActive(true);
                    m_LevelCondition.text = StringUtility.Contact(Language.Get("KnapS110"), " ", baseInfo.levelLimit);

                    var playerLevel = PlayerDatas.Instance.baseData.LV;
                    m_LevelCondition.color = UIHelper.GetUIColor(playerLevel < itemConfig.UseLV ? TextColType.Red : TextColType.Green);
                }
                else
                {
                    m_LevelConditionContainer.gameObject.SetActive(false);
                }
            }

            if (baseInfo.isAuction)
@@ -84,6 +85,18 @@
                    m_SurplusTime.text = "已过期";
                }
            }
            else if (itemConfig.ExpireTime > 0)
            {
                m_SurplusTimeContainer.gameObject.SetActive(true);
                if (baseInfo.overdueSurplusTime > 0)
                {
                    m_SurplusTime.text = TimeUtility.SecondsToConsumeRebate(baseInfo.overdueSurplusTime);
                }
                else
                {
                    m_SurplusTime.text = "已过期";
                }
            }
            else
            {
                m_SurplusTimeContainer.gameObject.SetActive(false);

 System/KnapSack/Logic/ItemLogicUtility.cs

@@ -1407,5 +1407,17 @@
            return config.Type >= 119 && config.Type <= 123;
        }

        public bool IsSpiritWeapon(int itemId)
        {
            if (!ItemConfig.Has(itemId))
            {
                return false;
            }

            var config = ItemConfig.Get(itemId);
            return config.Type >= 113 && config.Type <= 117;
        }


    }
}

 System/KnapSack/Logic/ItemTipsModel.cs

@@ -345,6 +345,7 @@
#endif

            switch (curAttrData.winType)

            {

                case ItemWinType.guardWin:

                case ItemWinType.itemWin:

                    if (curAttrData.isPreview)

                    {

@@ -373,9 +374,6 @@
                    break;

                case ItemWinType.wingsWin:

                    WindowCenter.Instance.Open<WingsWin>();

                    break;

                case ItemWinType.guardWin:

                    WindowCenter.Instance.Open<GuardianWin>();

                    break;

                case ItemWinType.buyItemWin:

                    WindowCenter.Instance.Open<BuyItemInfoWin>();


 System/KnapSack/New/KnapSackEventMgr.cs

@@ -68,7 +68,7 @@
        {

            HideItemWin();

        }

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

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

        {

            HideGuardWin();

        }