From 06bac38d743f3f99a294f20e5b02af6d53676b0b Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 21 九月 2018 14:38:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Pet/RidingAndPetActivationWin.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/System/Pet/RidingAndPetActivationWin.cs b/System/Pet/RidingAndPetActivationWin.cs
index 0512ff7..39a2e8c 100644
--- a/System/Pet/RidingAndPetActivationWin.cs
+++ b/System/Pet/RidingAndPetActivationWin.cs
@@ -155,7 +155,7 @@
HorseConfig Horseconfig = Config.Instance.Get<HorseConfig>(ActivateID);
int InitFightPower = 0;
InitFightPower += Horseconfig.InitFightPower;
- UI3DModelExhibition.Instance.BeginShowHourse(Horseconfig.Model, m_RawImageMount);
+ UI3DModelExhibition.Instance.ShowHourse(Horseconfig.Model, m_RawImageMount);
MountSkills.Clear();
foreach (var key in mountModel.GetMountSkillAndItem.Keys)
{
@@ -228,7 +228,7 @@
HorseConfig Horseconfig = Config.Instance.Get<HorseConfig>(ActivateID);
int InitFightPower = 0;
InitFightPower += Horseconfig.InitFightPower;
- UI3DModelExhibition.Instance.BeginShowHourse(Horseconfig.Model, m_RawImageMount);
+ UI3DModelExhibition.Instance.ShowHourse(Horseconfig.Model, m_RawImageMount);
MountSkills.Clear();
foreach (var key in mountModel.GetMountSkillAndItem.Keys)
{
@@ -267,7 +267,7 @@
m_RawImagePet.gameObject.SetActive(true);
m_RawImageMount.gameObject.SetActive(false);
var npcConfig = Config.Instance.Get<NPCConfig>(ActivateID);
- UI3DModelExhibition.Instance.BeginShowNPC(ActivateID, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImagePet);
+ UI3DModelExhibition.Instance.ShowNPC(ActivateID, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImagePet);
PetInfoConfig petInfoConfig = Config.Instance.Get<PetInfoConfig>(ActivateID);
int InitFightPower = int.Parse(petInfoConfig.InitFightPower);
string StrPetSkill = petInfoConfig.SkillID;
@@ -317,7 +317,7 @@
m_RawImageMount.gameObject.SetActive(false);
var npcConfig = Config.Instance.Get<NPCConfig>(ActivateID);
- UI3DModelExhibition.Instance.BeginShowNPC(ActivateID, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImagePet);
+ UI3DModelExhibition.Instance.ShowNPC(ActivateID, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImagePet);
// StartCoroutine("FrameDelay");
PetInfoConfig petInfoConfig = Config.Instance.Get<PetInfoConfig>(ActivateID);
int InitFightPower = int.Parse(petInfoConfig.InitFightPower);
--
Gitblit v1.8.0