From e30c71794fcab58930dd77a754691c641c0cdba4 Mon Sep 17 00:00:00 2001 From: vurtne14 Date: Fri, 16 May 2025 17:06:47 +0800 Subject: [PATCH] 2 --- .../~Lua/Modules/FightLevel/FightLevelManager.lua | 3 ++- .../ManagedResources/~Lua/Modules/Login/LoginPanel.lua | 1 + .../~Lua/Modules/Operating/GMShuaChongTeQuan.lua | 3 ++- .../~Lua/Modules/Operating/GrowthGiftPage.lua | 1 + .../~Lua/Modules/Popup/SkillInfoPopup.lua | 9 +++++---- .../ManagedResources/~Lua/Modules/Shop/ShopManager.lua | 1 + 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua index ec2df51348..576a75a29c 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua @@ -170,8 +170,9 @@ function this.FightLevelFightBattle(_fightLevelData, callBack) else curFormationTypeDef = FormationTypeDef.FIGHT_ASSISTANTLEVEL end + LogError("山河社稷图请求战斗".._fightLevelData.nodeId.."/"..curFormationTypeDef) NetManager.HardStageFightRequest(_fightLevelData.nodeId, curFormationTypeDef,function (msg)--FIGHT_LEVEL - -- ----Log("山河社稷图回复战斗 星级 "..msg.stars.." drop "..#msg.drop.itemlist) + LogError("山河社稷图回复战斗 星级 "..msg.stars.." drop "..#msg.drop.itemlist) HardStageFightResponseMsg = msg curBattlefightLevelData = _fightLevelData -- local result = msg.stars > 0 and 1 or 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index f93dd1a1f8..8da80c5c7b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -754,6 +754,7 @@ function this.ExecuteLoading() "|server_id|" .. tostring(PlayerManager.serverInfo .server_id) }) + LogError("**************************server_name|" ..tostring(PlayerManager.serverInfo.name) .."|server_id|" .. tostring(PlayerManager.serverInfo.server_id)) end, --太初密卷 --[[[49] =]] function() NetManager.CrossYuXuLunDaoGetInfoRequest(2, LoadingPanel.OnStep) end, --玉虚论道红点 --[[[50] =]] function() NetManager.GetLikeableDataRequest(LoadingPanel.OnStep) end, --好感度 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua index a3387ae3ef..2ce9aba132 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua @@ -64,8 +64,9 @@ function GMShuaChongTeQuan:InitComponent() self.titleImg.sprite = self.spLoader:LoadSprite(_TabData[_index].img) local activityId = _TabData[_index].id local recharge = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, activityId) + LogError("sssssssssssssssssssssssssssss"..activityId) local len = #recharge.OpenPrivilege - local lv = _index --recharge.BTVIPlevel[1][2] + local lv = _index + 1 --recharge.BTVIPlevel[1][2] local len = #recharge.OpenPrivilege local mission = ActivityGiftManager.GetActivityInfo(ActivityTypeDef.shuaChongTeQuan, activityId) local state = mission.state diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua index d7d577dfd5..8ffbdd215b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua @@ -95,6 +95,7 @@ function GrowthGiftPage:OnShow(_sortingOrder) self.curActiId = self.actConfig.ActId self.btn_qmfl:SetActive(ActivityGiftManager.GetActivityInfoByType(10502)~=nil and ActivityGiftManager.CheckIsHaveHaveQMFL(ActivityTypeDef.GrowthReward,self.curActiId) ) + --self.btn_qmfl:SetActive(false) self.actType = self.actConfig.ActiveType if self.actConfig.IfBack == 1 then if self.actConfig.ActiveType > 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua index 49d8bcb216..1be6662e54 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua @@ -105,12 +105,13 @@ function this:OnOpen(...) LogError("urSkillData.needStar==" .. curSkillData.needStar) if curSkillData.needStar == 15 then --this.hintTxt.text=" ".."飞升3解锁" - des1 = "" .. Language[12243] .. "" .." " .. des1 + des1 = "" .. Language[12243] .. "" .. " " .. des1 elseif curSkillData.needStar == 13 then - des1 = "" .. Language[12244] .. "".." " .. des1 + des1 = "" .. Language[12244] .. "" .. " " .. des1 else --this.hintTxt.text=" ".. - des1 = "" .. NumToSimplenessFont[curSkillData.needStar] .." ".. Language[12245] .. "".." " .. des1 + des1 = "" .. + NumToSimplenessFont[curSkillData.needStar] .. " " .. Language[12245] .. "" .. " " .. des1 end --des1="" end @@ -141,7 +142,7 @@ function this:OnOpen(...) if curSkillData.needStar == 13 then this.hintTxt.text = Language[12244] else - this.hintTxt.text = NumToSimplenessFont[curSkillData.needStar] .. Language[10648] + this.hintTxt.text = NumToSimplenessFont[curSkillData.needStar] .. Language[10648] end else this.hintTxt.gameObject:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua index 5ef80b8cf2..1683db9aa2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua @@ -155,6 +155,7 @@ function this.RequestBuyShopItem(shopType, shopItemId, num, func,isShowReward) if countLimitNum >= 0 then local shopItemData = this.GetShopItemData(shopType, shopItemId) local countLeftNum = countLimitNum - shopItemData.buyNum + --LogError("=======工会挑战次数:"..countLimitNum.."/"..shopItemData.buyNum) if countLeftNum <= 0 or countLeftNum < num then PopupTipPanel.ShowTip(Language[11515]) return