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

Merge branch 'tcx_xiyou_dev' into tcx_xiyou_bt_dev

tcx_xiyou_bt_ios
PC-202302260912\Administrator 2024-05-13 15:53:21 +08:00
parent ae74ab5174 7847d21038
commit 8b499c09f5
4 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab
View File

@ -35,9 +35,9 @@ RectTransform:
m_Father: {fileID: 7783183355034074848}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 417.19995}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: -542.80005}
m_SizeDelta: {x: 0, y: 412}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &938386100

8
Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
View File

@ -330,11 +330,17 @@ function CarbonsPanel:BtnClick(id)
end
UIManager.OpenPanel(UIName.DailyCarbonPanel)
elseif id == FUNCTION_OPEN_TYPE.MONSTER_COMING then
if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.FourElementTrail) then
-- if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.FourElementTrail) then
-- UIManager.OpenPanel(UIName.MonsterCampMainPanel)
-- else
-- JumpManager.GoJump(1011)
-- end
if CheckFunctionOpen(FUNCTION_OPEN_TYPE.FourElementTrail) then
UIManager.OpenPanel(UIName.MonsterCampMainPanel)
else
JumpManager.GoJump(1011)
end
elseif id == FUNCTION_OPEN_TYPE.EXPEDITION then
if ActTimeCtrlManager.SingleFuncState(id) then
if #ExpeditionManager.nodeInfo <= 0 then

7
Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureManager.lua
View File

@ -44,9 +44,9 @@ function this.RefreshFindTreasureRedPoint()
if BagManager.GetItemCountById(FindTreasureManager.materialItemId) >= mazeTreasureMax then
return true
end
if this.GetShowFindTreasureVipRedPoint() then
return true
end
-- if this.GetShowFindTreasureVipRedPoint() then
-- return true
-- end
return false
end
function this.SetShowFindTreasureVipRedPoint(isShow)
@ -55,6 +55,7 @@ function this.SetShowFindTreasureVipRedPoint(isShow)
CheckRedPointStatus(RedPointType.SecretTer_FindTreasure)
end
function this.GetShowFindTreasureVipRedPoint()
if this.isShowFindTreasureVipRedPoint then
local gaoState = PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.GoFindTreasure)
local haoState = PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.HaoFindTreasure)

26
Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
View File

@ -82,8 +82,20 @@ function RankingSingleListPanel:BindEvent()
end)
for i=1,#this.signBtnList do
Util.AddClick(this.signBtnList[i].btn,function()
this.GetRankInfo(sData.rankType,1,0)
proType=i
local formation=FormationTypeDef.LuoFuZhengFeng1
if proType==1 then
formation= FormationTypeDef.LuoFuZhengFeng1
elseif proType==2 then
formation= FormationTypeDef.LuoFuZhengFeng2
elseif proType==3 then
formation= FormationTypeDef.LuoFuZhengFeng3
elseif proType==4 then
formation= FormationTypeDef.LuoFuZhengFeng4
end
JumpServerManager.showRankType=formation
this.GetRankInfo(sData.rankType,1,0)
this.selectObj.transform:SetParent(this.signBtnList[i].btn.transform)
this.selectObj.transform.localPosition = Vector3.zero
end)
@ -119,6 +131,17 @@ function RankingSingleListPanel:OnOpen(_sData,_TabDataIndex,_tabData)
if proType==0 then
proType=1
end
local formation=FormationTypeDef.LuoFuZhengFeng1
if proType==1 then
formation= FormationTypeDef.LuoFuZhengFeng1
elseif proType==2 then
formation= FormationTypeDef.LuoFuZhengFeng2
elseif proType==3 then
formation= FormationTypeDef.LuoFuZhengFeng3
elseif proType==4 then
formation= FormationTypeDef.LuoFuZhengFeng4
end
JumpServerManager.showRankType=formation
this.selectObj.transform:SetParent(this.signBtnList[proType].btn.transform)
this.selectObj.transform.localPosition = Vector3.zero
end
@ -417,6 +440,7 @@ function this.InitRollingInfo(_root)
info0.text=""
return info0
end
--玩家信息弹窗
function this.AddPlayerInfoClick(root,uid,serverName)
local clickBtn=Util.GetGameObject(root,"ClickBtn")