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

client_Hale

2019-04-11 a3bc6bda0eae82c2461dc6ac3e4b0b762508f317

 System/RidingPet/ContainerRidingPet.cs

@@ -20,6 +20,7 @@
        [SerializeField] RawImage m_BossRawImage;

        DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }

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

        RidingPetBossModel ridingPetMdoel { get { return ModelCenter.Instance.GetModel<RidingPetBossModel>(); } }

        public int RawImagetestBossID = 50103006;

        public RewardPositionType rewardPositonType;

        [SerializeField] ItemCell[] m_RewardArray;

@@ -33,8 +34,8 @@


        public void DisplayBossRawImage()

        {

            var config = NPCConfig.Get(RawImagetestBossID);

            UI3DModelExhibition.Instance.ShowNPC(RawImagetestBossID, config.UIModeLOffset, config.UIModelRotation, m_BossRawImage);

            var config = NPCConfig.Get(ridingPetMdoel.BossIDArray[0]);

            UI3DModelExhibition.Instance.ShowNPC(ridingPetMdoel.BossIDArray[0], config.UIModeLOffset, config.UIModelRotation, m_BossRawImage);

        }



        public void StopShowBossRawImage()

@@ -49,8 +50,8 @@


        public void DisplayAnotherBossRawImage()

        {

            var config = NPCConfig.Get(RawImagetestBossID);

            UI3DModelExhibition.InstanceClone1.ShowNPC(RawImagetestBossID, config.UIModeLOffset, config.UIModelRotation, m_BossRawImage);

            var config = NPCConfig.Get(ridingPetMdoel.BossIDArray[1]);

            UI3DModelExhibition.InstanceClone1.ShowNPC(ridingPetMdoel.BossIDArray[1], config.UIModeLOffset, config.UIModelRotation, m_BossRawImage);

        }



        public void DisplaySpiritPetHP()

@@ -64,7 +65,7 @@
            dailyQuestModel.TryGetOpenTime((int)DailyQuestType.RidingPetActivity, out dailyQuestOpentime);

            HourMinute hourMin;

            dailyQuestOpentime.TryGetNextOpenTime(out hourMin);

            m_ActivityInfo.text = Language.Get("RidingPetBossQuestTime", hourMin.hourBegin, hourMin.minuteBegin);

            m_ActivityInfo.text = Language.Get("RidingPetBossQuestTime", "<color=red>"+hourMin.hourBegin+":"+hourMin.minuteBegin+"</color>");

        }



        public void DisplayRewardItem()