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

client_linchunjie

2018-12-27 7a89335ed6dc9393c250f2b1dc851d1bb481d8dd

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

 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -34,8 +34,7 @@
    public PlayerRankData rank { get { return m_Rank; } }



    StoreModel m_StoreModel;

    StoreModel StoreModel

    {

    StoreModel StoreModel {

        get { return m_StoreModel ?? (m_StoreModel = ModelCenter.Instance.GetModel<StoreModel>()); }

    }



@@ -542,6 +541,7 @@
                        if (hero != null && !hero.ActorInfo.serverDie)

                        {

                            hero.RequestName();

                            hero.SwitchRedName(StatusMgr.Instance.IsExist(PlayerId, StatusMgr.Instance.redNameBuffID));

                            hero.IdleImmediate();

                            hero.State = E_ActorState.Idle;

                        }


 System/CrossServerOneVsOne/FightingPKWin.cs

@@ -63,7 +63,7 @@

        protected override void OnPreOpen()
        {
            positionType = (int)PlayerDatas.Instance.baseData.faction;
            positionType = CrossServerLogin.Instance.oneVsOnePlayerData.myBornPoint;
            DebugEx.LogError(positionType+"服务端的给我的位置");
            CrossServerRewardModel.PkDanLvNow = CrossServerOneVsOnePlayerInfo.Instance.DanLV;

            PlaceOfBirth(positionType);//从出生位置设置信息

 System/CrossServerOneVsOne/SegmentRewardCell.cs

@@ -49,8 +49,10 @@
            }

            if (crossServerRewardModel.SegmentRewardDic.ContainsKey(id))

            {

                var dic = crossServerRewardModel.SegmentRewardDic[id];        
                m_Text_Segment.text = dic.Name;

                var dic = crossServerRewardModel.SegmentRewardDic[id];



                m_Text_Segment.text = config.Name;

                m_Text_Segment.color= UIHelper.GetDanLVColor(config.DanLV, true);

                ReceiveItem(id);

            }

            if ( CrossServerOneVsOnePlayerInfo.Instance.DanLV>=id)


 System/KnapSack/Logic/ItemTipsModel.cs

@@ -668,6 +668,10 @@
                case ItemWinType.GatherSoul:

                    WindowCenter.Instance.Open<GatherSoulTipWin>();

                    break;

                case ItemWinType.KingTreasure:

                    var kingTreasureShow = ModelCenter.Instance.GetModel<KingTreasureShowModel>();

                    kingTreasureShow.SetInitData(curAttrData.itemConfig.EffectValueA1,0);

                    break;

            }

        }



@@ -2964,6 +2968,9 @@
                case "GatherSoul":

                    winType = ItemWinType.GatherSoul;

                    break;

                case "KingTreasureShow":

                    winType = ItemWinType.KingTreasure;

                    break;

                default:

                    DebugEx.Log("没有此物品的弹框类型" + this.itemConfig.Template.Trim());

                    break;


 System/KnapSack/New/KingTreasureShowModel.cs

New file
@@ -0,0 +1,105 @@
using UnityEngine;

using System;

using TableConfig;

using System.Collections.Generic;



namespace Snxxz.UI

{

    [XLua.LuaCallCSharp]

    [XLua.Hotfix]

    public class KingTreasureShowModel : Model,IBeforePlayerDataInitialize,IPlayerLoginOk

    {

        KingTreasureModel kingTreasureModel { get { return ModelCenter.Instance.GetModel<KingTreasureModel>(); } }

        public string effectDes { get; private set;}

        public int treasureId { get; private set; }

        public string treasureSource { get; private set;}

        public override void Init()

        {

           
        }



        public void OnBeforePlayerDataInitialize()

        {

           
        }



        public void OnPlayerLoginOk()

        {

            
        }



        public override void UnInit()

        {

           
        }



        public void SetTreasureSource(string treasureSource)

        {

            this.treasureSource = treasureSource;

        }



        public void SetInitData(int treasureId, int rewardLv)

        {

            this.treasureId = treasureId;

            effectDes = string.Empty;

            KingTreasureModel.Division division;

            bool isDivision = kingTreasureModel.TryGetDivision(treasureId,rewardLv, out division);

            if(isDivision)

            {

                SetEffectDes(division.basePropertys);

                SetEffectDes(division.specialPropertys);

                WindowCenter.Instance.Open<KingTreasureShowWin>();

            }

        }



        private void SetEffectDes(Dictionary<int, int> attrDict)

        {

            if (attrDict == null) return;



            foreach (var key in attrDict.Keys)

            {

                var attrValue = attrDict[key];

                var propertyConfig = Config.Instance.Get<PlayerPropertyConfig>(key);

                if (propertyConfig != null)

                {

                    string attrDes = StringUtility.Contact(propertyConfig.Name, "+", GetProValueTypeStr(propertyConfig, attrValue));

                    switch(propertyConfig.type)

                    {

                        case 2:

                            attrDes = StringUtility.Contact("<color=#ec4bf6>", attrDes, "</color>");

                            break;

                        default:

                            attrDes = StringUtility.Contact("<color=#fff4cd>", attrDes, "</color>");

                            break;

                    }

                    if (string.IsNullOrEmpty(effectDes))

                    {

                        effectDes = attrDes;

                    }

                    else

                    {

                        effectDes = StringUtility.Contact(effectDes, "\n", attrDes);

                    }

                }

            }

        }



        private string GetProValueTypeStr(PlayerPropertyConfig playerproModel, int value)

        {

            string s = "";

            if (playerproModel.ISPercentage == 0)

            {

                s = value.ToString();

            }

            else if (playerproModel.ISPercentage == 1)

            {

                s = (float)Math.Round(value / 100f, 1) + "%";

            }

            else if (playerproModel.ISPercentage == 2)

            {

                s = ((float)Math.Round(value / 100f, 1)).ToString();

            }

            return s;

        }

    }

}


 System/KnapSack/New/KingTreasureShowModel.cs.meta

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

 System/KnapSack/New/KingTreasureShowWin.cs

New file
@@ -0,0 +1,81 @@
using TableConfig;

using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI

{

    [XLua.Hotfix]

    public class KingTreasureShowWin : Window

    {

        [SerializeField] Text nameText;

        [SerializeField] Image treasureIcon;

        [SerializeField] Button closeBtn;

        [SerializeField] Text fightNumText;

        [SerializeField] Text treasureEffectText;

        [SerializeField] Text sourceText;

        [SerializeField] GameObject fightBg;

        [SerializeField] ModelShowPerfab modelShow;



        TreasureModel model

        {

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

        }

        KingTreasureShowModel kingShowModel { get { return ModelCenter.Instance.GetModel<KingTreasureShowModel>(); } }

        KingTreasureModel kingModel { get { return ModelCenter.Instance.GetModel<KingTreasureModel>(); } }

        #region Built-in

        protected override void BindController()

        {



        }



        protected override void AddListeners()

        {

            closeBtn.AddListener(CloseClick);



        }



        protected override void OnPreOpen()

        {

            SetDisplay();

        }

        protected override void OnAfterOpen()

        {

            
        }



        protected override void OnAfterClose()

        {



        }



        protected override void OnPreClose()

        {



        }

        #endregion



        public void SetDisplay()

        {

            TreasureConfig treasureConfig = Config.Instance.Get<TreasureConfig>(kingShowModel.treasureId);

            if (treasureConfig == null) return;



            nameText.text = treasureConfig.Name;

            treasureIcon.SetSprite(treasureConfig.Icon);

            treasureEffectText.text = kingShowModel.effectDes.ToString();

            sourceText.text = kingShowModel.treasureSource;

            int fightNum = kingModel.GetSeasonScore(kingShowModel.treasureId);

            if (fightNum > 0)

            {

                fightBg.SetActive(true);

                fightNumText.gameObject.SetActive(true);

                fightNumText.text = Language.Get("KingTreasureScore",fightNum);

            }

            else

            {

                fightBg.SetActive(false);

                fightNumText.gameObject.SetActive(false);

            }

            modelShow.SetModelShow(kingShowModel.treasureId, ModelShowType.treasure, Language.Get("TreasureEffect103"));

        }

    }

}


 System/KnapSack/New/KingTreasureShowWin.cs.meta

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

 Utility/EnumHelper.cs

@@ -1572,6 +1572,7 @@
    petMatWin,  //解锁宠物和坐骑道具弹框

    buyPetMatWin,  //购买解锁宠物和坐骑道具弹框

    GatherSoul,//聚魂

    KingTreasure, //王者法宝

}



public enum ItemTipChildType