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

Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
gaoxin 2021-11-02 10:55:58 +08:00
parent 2b9457139b 9fd4d332bd
commit 5c8186b8cd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab
View File

@ -975,9 +975,9 @@ MonoBehaviour:
m_Padding:
m_Left: -45
m_Right: 0
m_Top: 80
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 1
m_ChildAlignment: 0
m_Spacing: 130
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0

2
Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua
View File

@ -158,7 +158,7 @@ end
-- 刷新挑战列表
function WorldArenaMainPanel:RefreshChallengeList()
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ARENA) then
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_YuXu) then
PopupTipPanel.ShowTip(Language[10075])
return
end