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

client_linchunjie

2019-04-17 6d101512ba4cb8e37a98ace6320a0b70c96efa2b

 System/KnapSack/Logic/ModelShowPerfab.cs

@@ -20,12 +20,12 @@
        {

            switch (showType)

            {

                case ModelShowType.treasure:

                    UI3DTreasureExhibition.Instance.StopShow();

                case ModelShowType.Treasure:

                    UI3DTreasureExhibition.Instance.Stop();

                    break;

                case ModelShowType.mount:

                case ModelShowType.Mount:

                    break;

                case ModelShowType.pet:

                case ModelShowType.Pet:

                    break;

            }

        }

@@ -37,15 +37,15 @@
           

            switch (showType)

            {

                case ModelShowType.treasure:

                case ModelShowType.Treasure:

                    fightImg.SetSprite("FightingLv_Normal");

                    UI3DTreasureExhibition.Instance.BeginShowTreasure(id, modelImg);

                    UI3DTreasureExhibition.Instance.ShowTreasure(id, modelImg);

                    break;

                case ModelShowType.mount:

                case ModelShowType.Mount:

                    fightImg.SetSprite("FightingLv_Max");

                    UI3DModelExhibition.Instance.ShowHourse(id, modelImg);

                    break;

                case ModelShowType.pet:

                case ModelShowType.Pet:

                    fightImg.SetSprite("FightingLv_Max");

                    var npcConfig = NPCConfig.Get(id);

                    UI3DModelExhibition.Instance.ShowNPC(id, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, modelImg);

@@ -131,9 +131,9 @@


    public enum ModelShowType

    {

        treasure, //法宝

        mount, //坐骑

        pet, //灵宠

        Treasure, //法宝

        Mount, //坐骑

        Pet, //灵宠

        FashionDress, //时装

    }