root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'china/dev' into 0活动开发聚集地/御剑行

dev_chengFeng
ZhangBiao 2021-10-14 17:11:12 +08:00
parent 4b6079d4e8 bbd9c9e1c2
commit cd04fc3d37
5 changed files with 85 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab
View File

@ -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

5
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
View File

@ -2788,6 +2788,11 @@ RIDE_WALK_DIR = {
RUN_UP = {animation = "run3", y = 0},
RUN_DOWN = {animation = "run2", y = 0},
}
PlayerRide = {
YUJIAN = 80019,
}
PlayerHeadIconType = {
Head = 1,
HeadFrame = 2,

2
Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Achievement.lua
View File

@ -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])

4
Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua
View File

@ -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

74
Assets/ManagedResources/~Lua/View/PlayerLiveView.lua
View File

@ -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,7 +251,11 @@ 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_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
@ -239,7 +264,11 @@ function PlayerLiveView:SetWalkDir(dir)
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_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
@ -248,7 +277,11 @@ function PlayerLiveView:SetWalkDir(dir)
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)