Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua
dev_chengFeng
jiaoyangna 2020-07-08 16:20:26 +08:00
commit 070fb43964
13 changed files with 14 additions and 3 deletions

View File

@ -31,10 +31,15 @@ end
function LogBlue( str )
Log("<color=#00f>"..str.."</color>")
end
function LogPink(str)
Log("<color=#FF7AD7>"..str.."</color>")
end
function LogYellow(str)
Log("<color=yellow>"..str.."</color>")
end
function LogPurple(str)
Log("<color=purple>"..str.."</color>")
end
--带有颜色的打印 只支持2 4参数个数("red","") ("red","","#FFFFFF","")
function LogColor(...)

View File

@ -417,7 +417,8 @@ PanelType = {
FindFairy = { 87, 16, 15}, -- 东海寻仙
Talisman = {14}, -- 新法宝
Guild = {14, 16, 65}, -- 新法宝
TimelimitCall={87,16} --限时召唤
TimelimitCall={87,16}, --限时召唤
QianKunBox={16,87},--乾坤包囊
}
@ -1319,6 +1320,7 @@ HELP_TYPE = {
TreasureCompose=56,-- 宝物合成
TimeLimitedCall=57,-- 限时召唤
TreasureOfHeaven=58,--天宫秘宝
QianKunBox=59,--乾坤宝囊
}
NumToComplexFont = {

View File

@ -113,7 +113,7 @@ function OperatingPanel:OnShow()
end
function OperatingPanel:OnSortingOrderChange()
--特效穿透签到 和 礼包特殊处理
self.operatingContents[1]:OnSortingOrderChange( self.sortingOrder)
self.operatingContents[1]:OnSortingOrderChange( self.sortingOrder)
self.operatingContents[3]:OnSortingOrderChange( self.sortingOrder)
self.operatingContents[4]:OnSortingOrderChange( self.sortingOrder)
self.operatingContents[5]:OnSortingOrderChange( self.sortingOrder)
@ -200,6 +200,10 @@ function OperatingPanel:ShowTabContent(index)
self.operatingContents[curContent]:OnShow(self.sortingOrder)
self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.TimelimitCall })
return
elseif index == 11 then
self.operatingContents[curContent]:OnShow(self.sortingOrder)
self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.QianKunBox })--货币待修改
return
end
if self.extraParam then

Binary file not shown.

Binary file not shown.

Binary file not shown.