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

client_Wu Xijin

2018-11-15 60f2d64d4c6cb2626e2660d52a952f2aa6b7e122

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

 Core/GameEngine/Model/Config/IceLodeStarAwardConfig.cs

New file
@@ -0,0 +1,53 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Thursday, November 15, 2018
//--------------------------------------------------------

using UnityEngine;
using System;

namespace TableConfig {

    
    public partial class IceLodeStarAwardConfig : ConfigBase {

        public int id { get ; private set ; }

        public int index { get ; private set ; }

        public int Star { get ; private set ; }

        public string LV { get ; private set; } 
        public string ItemList { get ; private set; } 
        public int Type { get ; private set ; }

        public override string getKey()
        {
            return id.ToString();
        }

        public override void Parse() {
            try
            {
                id=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
			
                index=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0; 
			
                Star=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
			
                LV = rawContents[3].Trim();

			
                ItemList = rawContents[4].Trim();

			
                Type=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0; 
            }
            catch (Exception ex)
            {
                DebugEx.Log(ex);
            }
        }
	
    }

}





 Core/GameEngine/Model/Config/IceLodeStarAwardConfig.cs.meta

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

 Core/GameEngine/Model/ConfigManager.cs

@@ -206,6 +206,7 @@
        AddAsyncTask<MarketQueryConfig>();

        AddAsyncTask<TreasureDungeonConfig>();

        AddAsyncTask<LoadingBackGroundConfig>();

        AddAsyncTask<IceLodeStarAwardConfig>();



        while (!AllCompleted())

        {


 System/Dungeon/IceCrystalVeinModel.cs

New file
@@ -0,0 +1,84 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Thursday, November 15, 2018
//--------------------------------------------------------
//冰晶矿脉新
using System;

using System.Collections.Generic;

using TableConfig;

using Snxxz.UI;


[XLua.LuaCallCSharp]

public class IceLodeStarAwardClass

{

    public int Index;

    public int Star;

    public int MinLv;

    public int MaxLv;

    public int ItemID;

    public int ItemCount;

    public int IsBind;

    public int Type;



}

public class IceCrystalVeinModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

{

    public Dictionary<int, IceLodeStarAwardClass> DicIceLodeStarAward = new Dictionary<int, IceLodeStarAwardClass>();



    public override void Init()

    {

        Assignment();

    }

    public void OnBeforePlayerDataInitialize()

    {

       
    }

    public override void UnInit()

    {

      
    }

    public void OnPlayerLoginOk()

    {

      
    }



    private void Assignment()

    {

        if (DicIceLodeStarAward.Count <= 0)

        {

            var config = Config.Instance.GetAllValues<IceLodeStarAwardConfig>();

            foreach (var Value in config)

            {

                if (!DicIceLodeStarAward.ContainsKey(Value.id))

                {

                    IceLodeStarAwardClass iceLodeStar = new IceLodeStarAwardClass();

                    iceLodeStar.Index = Value.index;

                    iceLodeStar.Star = Value.Star;

                    var _jsonData = LitJson.JsonMapper.ToObject(Value.LV);

                    if (_jsonData.Count > 0)

                    {

                        iceLodeStar.MinLv = int.Parse(_jsonData[0].ToString());

                        iceLodeStar.MaxLv = int.Parse(_jsonData[1].ToString());

                    }

                    var jsonData = LitJson.JsonMapper.ToObject(Value.ItemList);

                    if (jsonData.Count > 0)

                    {

                        iceLodeStar.ItemID = int.Parse((jsonData[0][0]).ToString());

                        iceLodeStar.ItemCount = int.Parse((jsonData[0][1]).ToString());

                        iceLodeStar.IsBind = int.Parse((jsonData[0][2]).ToString());

                    }

                    iceLodeStar.Type = Value.Type;

                    DicIceLodeStarAward.Add(Value.id, iceLodeStar);

                }

            }

        }

       
        
    }

}






 System/Dungeon/IceCrystalVeinModel.cs.meta

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

 System/Dungeon/IceCrystalVeinWin.cs

@@ -22,11 +22,12 @@
        [SerializeField] Transform m_GridMiddle;//中间组
        [SerializeField] Transform m_GridBottom;//底层组
        ItemTipsModel _itemTipsModel;

        ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } }
        ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } }

        IceCrystalVeinModel m_IceCrystalVeinModel;
        IceCrystalVeinModel iceCrystalVeinModel { get { return m_IceCrystalVeinModel ?? (m_IceCrystalVeinModel = ModelCenter.Instance.GetModel<IceCrystalVeinModel>()); } }

        private int IndexSelect = 1;
        private List<int> IceCrystalVeinMiddle = new List<int>();
        private List<int> IceCrystalVeinStarBottom = new List<int>();

        private List<int> IceCrystalVeinBottom = new List<int>();
        private List<IceLodeStarAwardClass> IceLodeStarAwardList = new List<IceLodeStarAwardClass>();
        #region Built-in
        protected override void BindController()
        {

@@ -36,17 +37,6 @@
            for (int i = 0; i < IceCrystalVeinReward.Length; i++)

            {

                IceCrystalVeinMiddle.Add(IceCrystalVeinReward[i]);

            }
            var _IceCrystalVeinStarReward = Config.Instance.Get<FuncConfigConfig>("IceCrystalVeinStarReward");
            int[] _IceCrystalVeinStarBottom = ConfigParse.GetMultipleStr<int>(_IceCrystalVeinStarReward.Numerical1);
            for (int i = 0; i < _IceCrystalVeinStarBottom.Length; i++)

            {

                IceCrystalVeinStarBottom.Add(_IceCrystalVeinStarBottom[i]);

            }

            int[] _IceCrystalVeinBottom = ConfigParse.GetMultipleStr<int>(_IceCrystalVeinStarReward.Numerical2);
            for (int i = 0; i < _IceCrystalVeinBottom.Length; i++)

            {

                IceCrystalVeinBottom.Add(_IceCrystalVeinBottom[i]);

            }
        }

@@ -60,6 +50,7 @@
        protected override void OnPreOpen()
        {

            OnCreateGridLineCell(m_ScrollerController);
            AddIceLodeStarAwardList();
            SetGridMiddle();
            SetGridBotton();
        }
@@ -158,18 +149,19 @@
            {



                GameObject ObjChild = m_GridBottom.GetChild(i).gameObject;

                if (i < IceCrystalVeinBottom.Count)

                if (i < IceLodeStarAwardList.Count)

                {

                    IceLodeStarAwardClass IceLode = IceLodeStarAwardList[i];

                    ObjChild.SetActive(true);

                    ItemCell _ItemCell = ObjChild.transform.Find("ItemCell_1").GetComponent<ItemCell>();

                    Text TextStar= ObjChild.transform.Find("Text_Star").GetComponent<Text>();

                    TextStar.text = "0/"+IceCrystalVeinStarBottom[i];

                    ItemCellModel cellModel = new ItemCellModel(IceCrystalVeinBottom[i], true, (ulong)1);

                    TextStar.text = "0/"+ IceLode.Star;

                    ItemCellModel cellModel = new ItemCellModel(IceLode.ItemID, true, (ulong)1);

                    _ItemCell.Init(cellModel);

                    int type = i;

                    _ItemCell.cellBtn.SetListener(() =>

                    {

                        ItemAttrData attrData = new ItemAttrData(IceCrystalVeinBottom[type], false, (ulong)1);

                        ItemAttrData attrData = new ItemAttrData(IceLode.ItemID, false, (ulong)1);

                        itemTipsModel.SetItemTipsModel(attrData);

                    });

                }

@@ -179,6 +171,19 @@
                }

            }

        }
        private void AddIceLodeStarAwardList()

        {

            IceLodeStarAwardList.Clear();

            foreach (var key in iceCrystalVeinModel.DicIceLodeStarAward.Keys)

            {

                var Dic = iceCrystalVeinModel.DicIceLodeStarAward[key];

                int Lv = PlayerDatas.Instance.baseData.LV;

                if (Lv >= Dic.MinLv && Lv <= Dic.MaxLv)

                {

                    IceLodeStarAwardList.Add(Dic);

                }

            }

        }
    }

}

 System/WindowBase/ModelCenter.cs

@@ -207,6 +207,7 @@
            RegisterModel<ChatBubbleModel>();

            RegisterModel<AccumulateRechargeModel>();

            RegisterModel<FBHelpPointExchageModel>();

            RegisterModel<IceCrystalVeinModel>();

            inited = true;

        }




 Utility/RuntimeLogUtility.cs

@@ -99,6 +99,11 @@


    public static void AddLog(string info, uint objId = 0)

    {

        if (!s_BattleLog && !s_MoveLog)

        {

            return;

        }



        string _strTime = System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");

        string _content = string.Format("[{0}] {1}<br />", _strTime, info);



@@ -120,12 +125,6 @@


            s_LogDict[objId].Append(_content);

        }



        //if (s_LogList.Count >= 10000)

        //{

        //    SaveNpcLog();

        //}



    }



    public static void SaveNpcLog()

@@ -205,7 +204,7 @@
        RuntimeLogUtility.s_SkillEffectLog = EditorGUILayout.Toggle("技能效果log输出", RuntimeLogUtility.s_SkillEffectLog);

        RuntimeLogUtility.s_LogMoveDistance = EditorGUILayout.Toggle("位移距离Log输出", RuntimeLogUtility.s_LogMoveDistance);

        RuntimeLogUtility.s_ShowMapLine = EditorGUILayout.Toggle("显示地图网格", RuntimeLogUtility.s_ShowMapLine);

        


        _navChkPos = EditorGUILayout.Vector3Field("检测点", _navChkPos);



        if (GUILayout.Button("检测"))