坐骑方向调整
parent
072c44d495
commit
bbd9c9e1c2
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in New Issue