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

client_linchunjie

2018-11-26 b3d6d715cd4d058d6be747082a8d8b5a162658d5

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

 System/Dungeon/IceCrystalVeinModel.cs

@@ -10,8 +10,9 @@


[XLua.LuaCallCSharp]

[XLua.Hotfix]

public class IceLodeStarAwardClass

{

{ 
    public int Index;

    public int Star;

    public int MinLv;


 System/Dungeon/IceCrystalVeinWin.cs

@@ -13,7 +13,7 @@

namespace Snxxz.UI

{

    [XLua.Hotfix]
    public class IceCrystalVeinWin : Window
    {
        [SerializeField] ScrollerController m_ScrollerController;

 System/MainInterfacePanel/TaskListTip.cs

@@ -16,7 +16,7 @@


namespace Snxxz.UI

{



    [XLua.Hotfix]

    public class TaskListTip : MonoBehaviour

    {

        public float ParentPosition = 74;


 System/Mount/PlayerMountDatas.cs

@@ -6,6 +6,7 @@
using TableConfig;

using UnityEngine;

//用于坐骑

[XLua.LuaCallCSharp]

public class HorseClass

{

    public int Lv;//坐骑等级


 System/Pet/PlayerPetDatas.cs

@@ -5,7 +5,7 @@
using System.Text.RegularExpressions;

using TableConfig;

using UnityEngine;



[XLua.LuaCallCSharp]

public class PetBackpack//宠物背包

{

    public int PetClass;//宠物阶级


 UI/Common/UI3DShowHero.cs

@@ -486,21 +486,15 @@
                switch (key)

                {

                    case 1:

                        if (clothesModel != null)

                        if (secondaryModel != null)

                        {

                            bone = clothesModel.transform.GetChildTransformDeeply("Bip001 Spine");

                            bone = secondaryModel.transform;

                        }

                        break;

                    case 2:

                        if (weaponModel != null)

                        {

                            bone = weaponModel.transform;

                        }

                        break;

                    case 3:

                        if (secondaryModel != null)

                        {

                            bone = secondaryModel.transform;

                        }

                        break;

                    case 4: