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

client_Zxw

2018-12-27 57b82b154463ceb90400092fb9d7e140bbe56e73

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

 Core/GameEngine/Model/Config/KingTreasureItemConfig.cs

New file
@@ -0,0 +1,47 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Thursday, December 27, 2018
//--------------------------------------------------------

using UnityEngine;
using System;

namespace TableConfig {

    
    public partial class KingTreasureItemConfig : ConfigBase {

        public int itemId { get ; private set ; }

        public int rewardLevel { get ; private set ; }

        public string description { get ; private set; } 
        public string qualityName { get ; private set; } 

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

        public override void Parse() {
            try
            {
                itemId=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
			
                rewardLevel=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0; 
			
                description = rawContents[2].Trim();

			
                qualityName = rawContents[3].Trim();
            }
            catch (Exception ex)
            {
                DebugEx.Log(ex);
            }
        }
	
    }

}





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

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

 Core/GameEngine/Model/ConfigManager.cs

@@ -218,6 +218,7 @@
        AddAsyncTask<GatherSoulPropertyConfig>();

        AddAsyncTask<GatherSoulComposeConfig>();

        AddAsyncTask<KingTreasureConfig>();

        AddAsyncTask<KingTreasureItemConfig>();



        while (!AllCompleted())

        {


 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;

                        }