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

client_linchunjie

2018-11-23 32808ea56adfe0bc7c218fd7d914d796e1d58b40

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

 Core/GameEngine/Login/Launch.cs

@@ -40,20 +40,7 @@
        Application.backgroundLoadingPriority = ThreadPriority.BelowNormal;

        Screen.sleepTimeout = SleepTimeout.NeverSleep;



        ShaderUtility.InitGlobalParams();

        SoundPlayer.CreateSoundPlayer();



        SystemSetting.Instance.SetSoundVolume(SystemSetting.Instance.GetSoundVolume());

        SystemSetting.Instance.SetSoundEffect(SystemSetting.Instance.GetSoundEffect());

        SystemSetting.Instance.SetGameFps(SystemSetting.Instance.GetGameFps());



        SDKUtility.Instance.Init();

        GameObjectPoolManager.Instance.gameObject.name = "GameObjectPool";

        GameObjectPoolManager.Instance.Initialize();

        ExceptionCatcher.Init();

        ExceptionCatcher.Catch();

        DebugUtility.Instance.Init();

        GlobalTimeEvent.Instance.Begin();



#if UNITY_ANDROID && !UNITY_EDITOR

        if (!SDKUtility.builtinAssetCopyFinished)

@@ -138,6 +125,20 @@
        {

            AssetBundleUtility.Instance.InitBuiltInAsset();

        }



        ShaderUtility.InitGlobalParams();

        SoundPlayer.CreateSoundPlayer();



        SystemSetting.Instance.SetSoundVolume(SystemSetting.Instance.GetSoundVolume());

        SystemSetting.Instance.SetSoundEffect(SystemSetting.Instance.GetSoundEffect());

        SystemSetting.Instance.SetGameFps(SystemSetting.Instance.GetGameFps());



        GameObjectPoolManager.Instance.gameObject.name = "GameObjectPool";

        GameObjectPoolManager.Instance.Initialize();

        ExceptionCatcher.Init();

        ExceptionCatcher.Catch();

        DebugUtility.Instance.Init();

        GlobalTimeEvent.Instance.Begin();

    }



    private byte m_Step = 0;


 Core/GameEngine/Model/Config/ModelResConfig.cs

@@ -6,60 +6,57 @@
using UnityEngine;

using System;



namespace TableConfig

{

namespace TableConfig {



    
    public partial class ModelResConfig : ConfigBase {



    public partial class ModelResConfig : ConfigBase

    {

        public int ID { get ; private set ; }

        public string Name { get ; private set; } 
        public int Type { get ; private set ; }

        public string ResourcesName { get ; private set; } 
        public string BindPoint { get ; private set; } 
        public string EffFileName { get ; private set; } 
        public Vector3 UIOffset { get ; private set; } 
        public Vector3 UIRotation { get ; private set; } 
        public Vector3 UIScale { get ; private set; } 
        public Vector3 Scale { get ; private set; } 


        public int ID { get; private set; }

        public string Name { get; private set; }

        public int Type { get; private set; }

        public string ResourcesName { get; private set; }

        public string BindPoint { get; private set; }

        public string EffFileName { get; private set; }

        public Vector3 UIOffset { get; private set; }

        public Vector3 UIRotation { get; private set; }

        public float UIScale { get; private set; }

        public Vector3 Scale { get; private set; }



        public override string getKey()

        public override string getKey()

        {

            return ID.ToString();

        }



        public override void Parse()

        {

            try

        public override void Parse() {

            try

            {

                ID = IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]) : 0;



                Name = rawContents[1].Trim();



                Type = IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]) : 0;



                ResourcesName = rawContents[3].Trim();



                BindPoint = rawContents[4].Trim();



                EffFileName = rawContents[5].Trim();



                UIOffset = rawContents[6].Vector3Parse();



                UIRotation = rawContents[7].Vector3Parse();



                UIScale = IsNumeric(rawContents[8]) ? float.Parse(rawContents[8]) : 0;



                Scale = rawContents[9].Vector3Parse();

                ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
			
                Name = rawContents[1].Trim();

			
                Type=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
			
                ResourcesName = rawContents[3].Trim();

			
                BindPoint = rawContents[4].Trim();

			
                EffFileName = rawContents[5].Trim();

			
                UIOffset=rawContents[6].Vector3Parse();

			
                UIRotation=rawContents[7].Vector3Parse();

			
                UIScale=rawContents[8].Vector3Parse();

			
                Scale=rawContents[9].Vector3Parse();

            }

            catch (Exception ex)

            {

                DebugEx.Log(ex);

            }

        }



    }

        }

	
    }



}




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

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 290b3d02a826d6b4daabb2e80dfaa3ab
timeCreated: 1542940485
timeCreated: 1542956459
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/KnapSack/Logic/ItemTipsModel.cs

@@ -1772,6 +1772,13 @@
            {

                maxReExp = maxLvConfig.ReExp;

            }

            else

            {

                if(maxExpLv <= 0)

                {

                    maxReExp = playerReExp;

                }

            }

            Equation.Instance.Clear();

            Equation.Instance.AddKeyValue("PlayerReExp",playerReExp);

            Equation.Instance.AddKeyValue("MaxReExp", maxReExp);


 System/MainInterfacePanel/PlayerTaskDatas.cs

@@ -1575,7 +1575,7 @@
    }

    public void TaskMove(int _taskID)

    {

        if (MainTaskDic.ContainsKey(_taskID) && !NewBieCenter.Instance.inGuiding)

        if (allMissionDict.ContainsKey(_taskID) && !NewBieCenter.Instance.inGuiding)

        {

            string _strTest = allMissionDict[_taskID].InforList;

            string strTask = TaskAllocation.Instance.GetTaskInfo(Config.Instance.Get<TASKINFOConfig>(_strTest).show_writing, _taskID);


 UI/Common/UI3DModelExhibition.cs

@@ -377,8 +377,7 @@
            var modelConfig = Config.Instance.Get<ModelResConfig>(_modelId);

            var position = modelConfig.UIOffset;

            var rotation = modelConfig.UIRotation;

            var scale = Vector3.one * modelConfig.UIScale;

            instance.transform.SetParentEx(m_HorseShowPoint, position, rotation, scale);

            instance.transform.SetParentEx(m_HorseShowPoint, position, rotation, modelConfig.UIScale);

            instance.SetActive(true);

            ResetCameraColor();

        }

@@ -445,8 +444,7 @@
            var modelConfig = Config.Instance.Get<ModelResConfig>(_modelId);

            var position = modelConfig.UIOffset;

            var rotation = modelConfig.UIRotation;

            var scale = Vector3.one * modelConfig.UIScale;

            instance.transform.SetParentEx(m_WingShowPoint, position, rotation, scale);

            instance.transform.SetParentEx(m_WingShowPoint, position, rotation, modelConfig.UIScale);



            instance.SetActive(true);

            ResetCameraColor();


 UI/Common/UI3DShowHero.cs

@@ -145,6 +145,7 @@
                prefab = InstanceResourcesLoader.LoadModelRes(wingsId);

                if (prefab)

                {

                    wingsModel.transform.localScale = Vector3.one;

                    pool = GameObjectPoolManager.Instance.RequestPool(prefab);

                    pool.Release(wingsModel);

                }

@@ -452,7 +453,8 @@
                    }



                    var parent = clothesModel.transform.GetChildTransformDeeply(GAStaticDefine.WingBindBoneName);

                    wingsModel.transform.SetParentEx(parent, Vector3.zero, Quaternion.identity, Vector3.one);

                    var modelResConfig = Config.Instance.Get<ModelResConfig>(resourceId);

                    wingsModel.transform.SetParentEx(parent, Vector3.zero, Quaternion.identity, modelResConfig.UIScale);



                    wingsAnimator = wingsModel.GetComponent<Animator>();

                    if (wingsAnimator == null)