From b08af858a959456dd7b60c82ce8999e74cd150b9 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 14 Oct 2021 16:16:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E7=89=9B=E6=B0=94=E5=86=B2?= =?UTF-8?q?=E5=A4=A9=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua index 5b08059b78..2419fcbd58 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua @@ -24,9 +24,9 @@ end function this.GetScore() local ActData = {} if this.isOldNiuQiActivity then - return ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.NiuQi) + ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.NiuQi) else - return ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.NiuQi) + ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.NiuQi) end if not (ActData and ActData.activityId) then return end if #this.configData == 0 then From 072c44d495479b7d71c689541fd5bbb2bbe05813 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 14 Oct 2021 16:35:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[bug]=3D=3D=3D=3D=3D=3D=E3=80=90ID1018713?= =?UTF-8?q?=E3=80=91=20=E3=80=90=E6=88=90=E5=B0=B1=E3=80=91=E6=88=98?= =?UTF-8?q?=E5=8A=9B=E7=9B=AE=E6=A0=87=E6=88=90=E5=B0=B1=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E8=B6=85=E6=A1=86=EF=BC=8C=E9=9C=80=E8=A6=81=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E7=BC=A9=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Mission/MissionDailyPanel.prefab | 30 +++++++++---------- .../Mission/MissionDailyPanel_Achievement.lua | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab index f2a7b384e6..9d16c17b37 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab @@ -3090,7 +3090,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -135.70001, y: -0.29989624} + m_AnchoredPosition: {x: -153.30008, y: -0.29989624} m_SizeDelta: {x: 210.65002, y: 77.61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6356434684782085281 @@ -4156,7 +4156,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1918779212793027703 RectTransform: m_ObjectHideFlags: 0 @@ -4700,10 +4700,10 @@ RectTransform: m_Father: {fileID: 7559358737188565728} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120.88501, y: -44.525} + m_SizeDelta: {x: 168, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1918779213686181055 CanvasRenderer: @@ -5147,7 +5147,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -202, y: 41.399933} - m_SizeDelta: {x: 0, y: 100} + m_SizeDelta: {x: 135, y: 100} m_Pivot: {x: 0, y: 1} --- !u!114 &462056855713613971 MonoBehaviour: @@ -6472,7 +6472,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 282, y: -66} + m_AnchoredPosition: {x: 264.39987, y: -66} m_SizeDelta: {x: 73.9, y: 42.04} m_Pivot: {x: 0.36038244, y: 0.5} --- !u!222 &5532919626185401892 @@ -6839,10 +6839,10 @@ RectTransform: m_Father: {fileID: 7559358737188565728} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 358.285, y: -44.525} + m_SizeDelta: {x: 168, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4580382491728856826 CanvasRenderer: @@ -7310,7 +7310,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -135.70001, y: -1.7999873} + m_AnchoredPosition: {x: -153.30014, y: -1.7999873} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4265660881893781513 @@ -9798,7 +9798,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 10, y: 41.399933} - m_SizeDelta: {x: 0, y: 100} + m_SizeDelta: {x: 135, y: 100} m_Pivot: {x: 0, y: 1} --- !u!114 &327137578093138444 MonoBehaviour: @@ -11563,7 +11563,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -135.70001, y: -1.0999985} + m_AnchoredPosition: {x: -155, y: -1.0999985} m_SizeDelta: {x: 210.65002, y: 77.61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2225116492002713069 diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Achievement.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Achievement.lua index 0f7747d793..a714d2900a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Achievement.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Achievement.lua @@ -110,7 +110,7 @@ function this.SingleDataShow(go,rewardData) qianwangButton:SetActive(state == 0) getFinishText:SetActive(state == 2) getRewardProgress:SetActive(state == 0) - getRewardProgress:GetComponent("Text").text = math.abs(rewardData.progress) .."/"..math.abs(value) + getRewardProgress:GetComponent("Text").text =PrintWanNum(math.abs(rewardData.progress)) .."/"..PrintWanNum(math.abs(value)) Util.AddOnceClick(qianwangButton, function() if sConFigData.Jump then JumpManager.GoJump(sConFigData.Jump[1]) From bbd9c9e1c2aec93459d5d8c3f8679009aab7e989 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 14 Oct 2021 16:37:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9D=90=E9=AA=91=E6=96=B9=E5=90=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 7 ++ .../~Lua/View/PlayerLiveView.lua | 78 +++++++++++++++---- 2 files changed, 71 insertions(+), 14 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 9dc26a4f1d..ae158a4935 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2744,6 +2744,8 @@ MONSTER_WALK_DIR = { PLAYER_WALK_DIR = { --没有坐骑的时候 IDLE = {animation = "idle", y = 0}, + IDLE_LSTOP = {animation = "idle2", y = 0}, + IDLE_RSTOP = {animation = "idle2", y = 180}, IDLEBACK = {animation = "idle3", y = 0}, JINGYA = {animation = "jingya", y = 0}, LAUCH = {animation = "lauch", y = 0}, @@ -2773,6 +2775,11 @@ RIDE_WALK_DIR = { RUN_UP = {animation = "run3", y = 0}, RUN_DOWN = {animation = "run2", y = 0}, } + +PlayerRide = { + YUJIAN = 80019, +} + PlayerHeadIconType = { Head = 1, HeadFrame = 2, diff --git a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua index 78fc21bc60..795da852d9 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua @@ -147,7 +147,11 @@ function PlayerLiveView:OnShowLive() self.playerLiveSkeletonGraphic = self.playerLive:GetComponent("SkeletonGraphic") if self.playerLiveSkeletonGraphic then if self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0 then - self.playerLiveSkeletonGraphic.AnimationState:SetAnimation(0, PLAYER_WALK_DIR.IDLE_FRONT.animation, true) + if self.PlayerLiveViewData.ride == PlayerRide.YUJIAN then + self.playerLiveSkeletonGraphic.AnimationState:SetAnimation(0, PLAYER_WALK_DIR.IDLE.animation, true) + else + self.playerLiveSkeletonGraphic.AnimationState:SetAnimation(0, PLAYER_WALK_DIR.IDLE_FRONT.animation, true) + end else self.playerLiveSkeletonGraphic.AnimationState:SetAnimation(0, PLAYER_WALK_DIR.IDLE.animation, true) end @@ -168,6 +172,11 @@ function PlayerLiveView:OnShowLive() if self.rideLivSkeletonGraphic then self.rideLivSkeletonGraphic.AnimationState:SetAnimation(0, RIDE_WALK_DIR.IDLE_FRONT.animation, true) end + if self.PlayerLiveViewData.ride == PlayerRide.YUJIAN then + self:SetSiblingIndexPlayerOrRide(2) + else + self:SetSiblingIndexPlayerOrRide(1) + end end --称号 @@ -207,21 +216,33 @@ function PlayerLiveView:SetTitleHide() self.titleLiveGo:SetActive(false) end - function PlayerLiveView:SetWalkDir(dir) -- LogBlue("PlayerLiveView dir : "..dir) if dir == WALK_DIR.IDLE_FRONT then-- 站立_向前 if (self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0) and (self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0) then - self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE_FRONT,RIDE_WALK_DIR.IDLE_FRONT) + if self.PlayerLiveViewData.ride == PlayerRide.YUJIAN then + self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE,RIDE_WALK_DIR.IDLE_FRONT) + else + self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE_FRONT,RIDE_WALK_DIR.IDLE_FRONT) + end elseif self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0 and (not self.PlayerLiveViewData.ride or self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride <= 0) then self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE,nil) elseif self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0 and (not self.PlayerLiveViewData.skin or self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin <= 0) then self:SetWalkDirInfo(nil,RIDE_WALK_DIR.IDLE_FRONT) end - self:SetSiblingIndexPlayerOrRide(1) + if (self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0) and self.PlayerLiveViewData.ride == PlayerRide.YUJIAN then + self:SetSiblingIndexPlayerOrRide(2) + else + self:SetSiblingIndexPlayerOrRide(1) + end + elseif dir == WALK_DIR.IDLE_BACK then-- 站立_向后 if (self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0) and (self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0) then - self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE_BACK,RIDE_WALK_DIR.IDLE_BACK) + if self.PlayerLiveViewData.ride == PlayerRide.YUJIAN then + self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLEBACK,RIDE_WALK_DIR.IDLE_BACK) + else + self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE_BACK,RIDE_WALK_DIR.IDLE_BACK) + end elseif self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0 and (not self.PlayerLiveViewData.ride or self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride <= 0) then self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLEBACK,nil) elseif self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0 and (not self.PlayerLiveViewData.skin or self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin <= 0) then @@ -230,25 +251,37 @@ function PlayerLiveView:SetWalkDir(dir) self:SetSiblingIndexPlayerOrRide(2) elseif dir == WALK_DIR.IDLE_LEFT then-- 站立_向左 if (self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0) and (self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0) then - self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE_LEFT,RIDE_WALK_DIR.IDLE_LEFT) + if self.PlayerLiveViewData.ride == PlayerRide.YUJIAN then + self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE_LSTOP,RIDE_WALK_DIR.IDLE_LEFT) + else + self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE_LEFT,RIDE_WALK_DIR.IDLE_LEFT) + end elseif self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0 and (not self.PlayerLiveViewData.ride or self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride <= 0) then - self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE,nil) + self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE_LSTOP,nil) elseif self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0 and (not self.PlayerLiveViewData.skin or self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin <= 0) then self:SetWalkDirInfo(nil,RIDE_WALK_DIR.IDLE_LEFT) end self:SetSiblingIndexPlayerOrRide(2) elseif dir == WALK_DIR.IDLE_RIGHT then-- 站立_向右 if (self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0) and (self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0) then - self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE_RIGHT,RIDE_WALK_DIR.IDLE_RIGHT) + if self.PlayerLiveViewData.ride == PlayerRide.YUJIAN then + self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE_RSTOP,RIDE_WALK_DIR.IDLE_RIGHT) + else + self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE_RIGHT,RIDE_WALK_DIR.IDLE_RIGHT) + end elseif self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0 and (not self.PlayerLiveViewData.ride or self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride <= 0) then - self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE,nil) + self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE_RSTOP,nil) elseif self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0 and (not self.PlayerLiveViewData.skin or self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin <= 0) then self:SetWalkDirInfo(nil,RIDE_WALK_DIR.IDLE_RIGHT) end self:SetSiblingIndexPlayerOrRide(2) elseif dir == WALK_DIR.RUN_RIGHT then-- 跑_向右 if (self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0) and (self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0) then - self:SetWalkDirInfo(PLAYER_WALK_DIR.RUN_RIGHT,RIDE_WALK_DIR.RUN_RIGHT) + if self.PlayerLiveViewData.ride == PlayerRide.YUJIAN then + self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE_RSTOP,RIDE_WALK_DIR.RUN_RIGHT) + else + self:SetWalkDirInfo(PLAYER_WALK_DIR.RUN_RIGHT,RIDE_WALK_DIR.RUN_RIGHT) + end elseif self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0 and (not self.PlayerLiveViewData.ride or self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride <= 0) then self:SetWalkDirInfo(PLAYER_WALK_DIR.RIGHT,nil) elseif self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0 and (not self.PlayerLiveViewData.skin or self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin <= 0) then @@ -257,7 +290,11 @@ function PlayerLiveView:SetWalkDir(dir) self:SetSiblingIndexPlayerOrRide(2) elseif dir == WALK_DIR.RUN_LEFT then-- 跑_向左 if (self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0) and (self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0) then - self:SetWalkDirInfo(PLAYER_WALK_DIR.RUN_LEFT,RIDE_WALK_DIR.RUN_LEFT) + if self.PlayerLiveViewData.ride == PlayerRide.YUJIAN then + self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE_LSTOP,RIDE_WALK_DIR.RUN_LEFT) + else + self:SetWalkDirInfo(PLAYER_WALK_DIR.RUN_LEFT,RIDE_WALK_DIR.RUN_LEFT) + end elseif self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0 and (not self.PlayerLiveViewData.ride or self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride <= 0) then self:SetWalkDirInfo(PLAYER_WALK_DIR.LEFT,nil) elseif self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0 and (not self.PlayerLiveViewData.skin or self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin <= 0) then @@ -266,7 +303,12 @@ function PlayerLiveView:SetWalkDir(dir) self:SetSiblingIndexPlayerOrRide(2) elseif dir == WALK_DIR.RUN_UP then-- 跑_向上 if (self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0) and (self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0) then - self:SetWalkDirInfo(PLAYER_WALK_DIR.RUN_UP,RIDE_WALK_DIR.RUN_UP) + if self.PlayerLiveViewData.ride == PlayerRide.YUJIAN then + self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLEBACK,RIDE_WALK_DIR.RUN_UP) + else + self:SetWalkDirInfo(PLAYER_WALK_DIR.RUN_UP,RIDE_WALK_DIR.RUN_UP) + + end elseif self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0 and (not self.PlayerLiveViewData.ride or self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride <= 0) then self:SetWalkDirInfo(PLAYER_WALK_DIR.UP,nil) elseif self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0 and (not self.PlayerLiveViewData.skin or self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin <= 0) then @@ -275,13 +317,21 @@ function PlayerLiveView:SetWalkDir(dir) self:SetSiblingIndexPlayerOrRide(2) elseif dir == WALK_DIR.RUN_DOWN then-- 跑_向下 if (self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0) and (self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0) then - self:SetWalkDirInfo(PLAYER_WALK_DIR.RUN_DOWN,RIDE_WALK_DIR.RUN_DOWN) + if self.PlayerLiveViewData.ride == PlayerRide.YUJIAN then + self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE,RIDE_WALK_DIR.RUN_DOWN) + else + self:SetWalkDirInfo(PLAYER_WALK_DIR.RUN_DOWN,RIDE_WALK_DIR.RUN_DOWN) + end elseif self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin > 0 and (not self.PlayerLiveViewData.ride or self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride <= 0) then self:SetWalkDirInfo(PLAYER_WALK_DIR.DOWN,nil) elseif self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0 and (not self.PlayerLiveViewData.skin or self.PlayerLiveViewData.skin and self.PlayerLiveViewData.skin <= 0) then self:SetWalkDirInfo(nil,RIDE_WALK_DIR.DOWN) end - self:SetSiblingIndexPlayerOrRide(1) + if (self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0) and self.PlayerLiveViewData.ride == PlayerRide.YUJIAN then + self:SetSiblingIndexPlayerOrRide(2) + else + self:SetSiblingIndexPlayerOrRide(1) + end elseif dir == WALK_DIR.JINGYA then-- 惊讶 if self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0 then -- self:SetWalkDirInfo(PLAYER_WALK_DIR.IDLE_FRONT,RIDE_WALK_DIR.IDLE_FRONT)