From 81fa7d3d7152c4fcf8032e67eb12f651740cd85a Mon Sep 17 00:00:00 2001 From: vurtne14 Date: Sun, 13 Apr 2025 22:56:22 +0800 Subject: [PATCH] 1 --- .../~Lua/Modules/ActivityGift/FestevalPanel.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua | 5 +++++ .../~Lua/Modules/Popup/View/GeneralPopup_ResolveReStar.lua | 4 ++-- .../ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 3 +-- .../ManagedResources/~Lua/Modules/Setting/SettingPanel.lua | 4 ++-- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/FestevalPanel.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/FestevalPanel.lua index b10d404c72..ad266c37f5 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/FestevalPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/FestevalPanel.lua @@ -190,7 +190,7 @@ function FestevalPanel:RefreshSingleData(obj, data) obj.redpoint.gameObject:SetActive(false) obj.itemview.frameBtn:GetComponent("Button").enabled = true if obj.data.state == 0 then - if self.curDay > config.Values[1][1] then + if self.curDay >= config.Values[1][1] then obj.redpoint.gameObject:SetActive(true) obj.select.gameObject:SetActive(true) obj.itemview.frameBtn:GetComponent("Button").enabled = false diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 13e735a617..a5e74aa506 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -538,7 +538,7 @@ function this:BindEvent() end) --调研 Util.AddClick(this.btnDiaoyan, function() - OpenWeb("https://docs.google.com/forms/d/e/1FAIpQLScVbmO2_ib_qTan5L81l3ICEW-RHcqQiLHh8fsXs8l-KYsL3Q/viewform") + OpenWeb("https://monkeyking.gamota.com/") end) --十五日登录奖励 Util.AddClick(this.fgBtn, function() diff --git a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua index 67d6566550..2ad7582d45 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua @@ -106,6 +106,11 @@ function this.Pay(id, func) args[4] = sureFunc args[5] = nil UIManager.OpenPanel(UIName.GMCommonConfirmPanel, args) + SubmitExtraData({ + type = SDKSubMitType.TYPE_CLICKRECHARGEPACKAGE, + roleCreateTime = "" .. id, + roleLevelUpTime = rechargeConfig.RechargeId + }) return end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveReStar.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveReStar.lua index af5d6a269f..ac8272266d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveReStar.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveReStar.lua @@ -53,8 +53,8 @@ function this:BindEvent() local oldPowerNum = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) HeroManager.ResetHeroStar(data) HeroManager.SetTalismanLv(data, 1) - HeroManager.SetSoulPrintNil(data) - HeroManager.SetGodPrintNil(data) + --HeroManager.SetSoulPrintNil(data) + --HeroManager.SetGodPrintNil(data) PopupTipPanel.ShowTip(Language[12386]) HeroPropManager.SetDirtyByType(data, Hero_Prop_Type.Base) HeroPropManager.SetDirtyByType(data, Hero_Prop_Type.Talisman) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 42b645de1e..5ffe169002 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -758,7 +758,7 @@ function this:SetSelectBtn(index) tabs[index].title or "" .. tabs[index].title .. - "" --tabs[index].title-- + "" --tabs[index].title-- end -- tab改变事件 @@ -889,7 +889,6 @@ function this:UpdateHeroInfoData() --魂印按钮逻辑 this.soulPrintBtn:SetActive(ActTimeCtrlManager.IsQualifiled(87) and curHeroData.heroConfig.MaxRank >= EquipSignUnlock[2][2]) - --神印按钮逻辑 local config = ConfigManager.GetConfigData(ConfigName.SpecialConfig, 149) if config then local limits = string.split(config.Value, "#") diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua index 3406373f57..2197ca1c4f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua @@ -6,7 +6,7 @@ local funIndex = 1 local TabBox = require("Modules/Common/TabBox") local _TabData = { [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12822], rpType = RedPointType.Setting_Head }, - --[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "坐骑" , rpType = RedPointType.Setting_Ride}, + -- [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "坐骑" , rpType = RedPointType.Setting_Ride}, [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12823], rpType = RedPointType.Setting_Title }, -- [4] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "时装",rpType = RedPointType.Setting_Skin }, } @@ -21,7 +21,7 @@ this.contents = { --称号 -- [2] = {view = require("Modules/Setting/SettingPlayerTitle"), panelName = "settingPlayerTitle"}, -- 时装 - --[2] = {view = require("Modules/Setting/SettingPlayerRide"), panelName = "settingPlayerRide"}, + -- [2] = {view = require("Modules/Setting/SettingPlayerRide"), panelName = "settingPlayerRide"}, -- 称号 [2] = { view = require("Modules/Setting/SettingPlayerTitle"), panelName = "settingPlayerTitle" }, --[4] = {view = require("Modules/Setting/SettingPlayerSkin"), panelName = "settingPlayerSkin"},