diff --git a/Assets/ManagedResources/~Lua/Common/Debug.lua b/Assets/ManagedResources/~Lua/Common/Debug.lua index bc3184b9b1..00dbc2e36a 100644 --- a/Assets/ManagedResources/~Lua/Common/Debug.lua +++ b/Assets/ManagedResources/~Lua/Common/Debug.lua @@ -31,10 +31,15 @@ end function LogBlue( str ) Log(""..str.."") end - function LogPink(str) Log(""..str.."") end +function LogYellow(str) + Log(""..str.."") +end +function LogPurple(str) + Log(""..str.."") +end --带有颜色的打印 只支持2 4参数个数("red","") ("red","","#FFFFFF","") function LogColor(...) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 04f77f3f8b..78525967a7 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -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 = { diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua index 6c29b9d70a..ccd4055ec6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua @@ -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 diff --git a/data_execl/base_data/ActivityRewardConfig.xlsx b/data_execl/base_data/ActivityRewardConfig.xlsx index 4c05b7e476..a85120a9b0 100644 Binary files a/data_execl/base_data/ActivityRewardConfig.xlsx and b/data_execl/base_data/ActivityRewardConfig.xlsx differ diff --git a/data_execl/base_data/HeroLevelConfig.xlsx b/data_execl/base_data/HeroLevelConfig.xlsx index 759ac8e29a..d86c3af520 100644 Binary files a/data_execl/base_data/HeroLevelConfig.xlsx and b/data_execl/base_data/HeroLevelConfig.xlsx differ diff --git a/data_execl/base_data/ItemConfig.xlsx b/data_execl/base_data/ItemConfig.xlsx index aafc3b6f0f..83d2cc5bba 100644 Binary files a/data_execl/base_data/ItemConfig.xlsx and b/data_execl/base_data/ItemConfig.xlsx differ diff --git a/data_execl/base_data/LotterySpecialConfig.xlsx b/data_execl/base_data/LotterySpecialConfig.xlsx index 79177ca628..28548975ed 100644 Binary files a/data_execl/base_data/LotterySpecialConfig.xlsx and b/data_execl/base_data/LotterySpecialConfig.xlsx differ diff --git a/data_execl/base_data/LuxuryFund.xlsx b/data_execl/base_data/LuxuryFund.xlsx index acf72f34f6..16a2926bec 100644 Binary files a/data_execl/base_data/LuxuryFund.xlsx and b/data_execl/base_data/LuxuryFund.xlsx differ diff --git a/data_execl/base_data/MazeTreasure.xlsx b/data_execl/base_data/MazeTreasure.xlsx index dd747fc77e..a4490a68c2 100644 Binary files a/data_execl/base_data/MazeTreasure.xlsx and b/data_execl/base_data/MazeTreasure.xlsx differ diff --git a/data_execl/base_data/MazeTreasureSetting.xlsx b/data_execl/base_data/MazeTreasureSetting.xlsx index 62532d3407..db3facbd76 100644 Binary files a/data_execl/base_data/MazeTreasureSetting.xlsx and b/data_execl/base_data/MazeTreasureSetting.xlsx differ diff --git a/data_execl/base_data/QAConfig.xlsx b/data_execl/base_data/QAConfig.xlsx index 36cfc4e7c0..febe79b51c 100644 Binary files a/data_execl/base_data/QAConfig.xlsx and b/data_execl/base_data/QAConfig.xlsx differ diff --git a/data_execl/base_data/RewardGroup.xlsx b/data_execl/base_data/RewardGroup.xlsx index c7b34bca98..b7a407d7a8 100644 Binary files a/data_execl/base_data/RewardGroup.xlsx and b/data_execl/base_data/RewardGroup.xlsx differ diff --git a/data_execl/base_data/RewardItemConfig.xlsx b/data_execl/base_data/RewardItemConfig.xlsx index afe94e538f..42ea1a1434 100644 Binary files a/data_execl/base_data/RewardItemConfig.xlsx and b/data_execl/base_data/RewardItemConfig.xlsx differ