diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index dbf82f5169..f777fb0027 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -235,7 +235,7 @@ QualityNameDef = { [2] = Language[10197], [3] = Language[10196], [4] = Language[10195], - [5] = Language[10194], + [5] = Language[10192], --原橙色改为金色 [6] = Language[10193], [7] = Language[10192] } diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 336bf688bc..55582f461f 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -799,8 +799,8 @@ function GetQuantityStrByquality(quality) return Language[10196] elseif quality == 4 then return Language[10195] - elseif quality == 5 then - return Language[10194] + elseif quality == 5 then --原橙色改为金色 + return Language[10192] elseif quality == 6 then return Language[10193] elseif quality == 7 then diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua index c6e158885e..ea8fab7c36 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua @@ -5,7 +5,7 @@ local this=BagResolveAnCompoundPanel local openLayoutType=1--1 layout1 2 layout3 分解 还是 合成 local itemResolveType=1--分解物品类型 1 道具 2 装备 local itemList={} -local resolveStrList={Language[10191],Language[10192],Language[10193],Language[10194],Language[10195],Language[10196],Language[10197],Language[10198]} +local resolveStrList={Language[10191],Language[10192],Language[10193],Language[10192],Language[10195],Language[10196],Language[10197],Language[10198]} local resolveBtnList={}--0 是全部 local resolveBooleList={false,false,false,false,false,false,false,false} local curSelectQuantityList={}--当前选择后的稀有度 选项 {0=true,1=false ...} 稀有度是依次减小的 diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index f8b49eb7d9..08dceeac3b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -3,6 +3,7 @@ local this = GuideManager local GuideConfig = ConfigManager.GetConfig(ConfigName.GuideConfig) local GlobalSystemConfig = ConfigManager.GetConfig(ConfigName.GlobalSystemConfig) local openDic = {} +local funcDic = {} local json = require 'cjson' @@ -14,7 +15,7 @@ local _FuncGuideList = {} function this.Initialize() Game.GlobalEvent:AddEvent(GameEvent.FunctionCtrl.OnFunctionOpen, this.OnFunctionOpen) Game.GlobalEvent:AddEvent(GameEvent.Player.OnLevelChange, this.OnLevelChange) - + end function this.OnLevelChange() @@ -33,7 +34,7 @@ function this.OnFunctionOpen(funcId) end LogGreen(tostring(AppConst.isGuide)) local guideId = GlobalSystemConfig[funcId].GuideId - if guideId and guideId ~= 0 then + if guideId and guideId ~= 0 and not funcDic[guideId] then table.insert(_FuncGuideList, guideId) end -- @@ -42,6 +43,8 @@ end -- 初始化引导数据 function this.InitData(guideData) + openDic = {} + funcDic = {} --this.RefreshTriggerListen(1701, 35, { 17,}) --只有勾了新手引导,才会读取引导数据,否则置为-1 if not AppConst.isGuide then @@ -51,11 +54,18 @@ function this.InitData(guideData) end for i = 1, #guideData do local guide = guideData[i] - openDic[guide.type] = guide.id - if guide.id ~= -1 and guide.type ~= GuideType.Check then - local openType = GuideConfig[guide.id].OpenType - local openArgs = GuideConfig[guide.id].OpenArgs - this.RefreshTriggerListen(guide.id, openType, openArgs) + -- 强制引导只保存一条当前引导数据 + if guide.type == GuideType.Force then + openDic[guide.type] = guide.id + if guide.id ~= -1 then + local openType = GuideConfig[guide.id].OpenType + local openArgs = GuideConfig[guide.id].OpenArgs + this.RefreshTriggerListen(guide.id, openType, openArgs) + end + elseif guide.type == GuideType.Check then -- 用于检测引导的网络延时不需要检测 + elseif guide.type == GuideType.Function then -- 功能引导类型 不是按类型对应id的方式不需要检测 + else -- 功能引导会将所有功能引导的id通过type字段保存到后端 + funcDic[guide.type] = guide.id end end @@ -70,7 +80,10 @@ end function GuideManager.CheckFuncGuide() if not GuideManager.IsInMainGuide() and not _IsFuncGuild and #_FuncGuideList > 0 then local guideId = _FuncGuideList[1] - GuideManager.ShowGuide(guideId) + if not funcDic[guideId] then + this.SyncFuncGuideServer(guideId) + GuideManager.ShowGuide(guideId) + end table.remove(_FuncGuideList, 1) end end @@ -177,6 +190,14 @@ function this.CheckServer(func) NetManager.SaveGuideDataRequest(GuideType.Check, 0, func) end +-- 将功能引导同步到服务器 +function this.SyncFuncGuideServer(id) + if GuideConfig[id].Type == GuideType.Function then + funcDic[id] = 1 + NetManager.SaveGuideDataRequest(id, 1) + end +end + --更新触发监听 function this.RefreshTriggerListen(id, openType, openArgs) if openType == 1 then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua index 6d78a1636d..3504c9972e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua @@ -92,7 +92,7 @@ function this.OnPanelShow() _heroStar= heroData.Star if heroData.Natural==13 or heroData.Natural==14 then - this.liveNameText.text = Language[11578]..heroData.ReadingName.."" + this.liveNameText.text = "【金色】"..heroData.ReadingName.."" elseif heroData.Natural==11 or heroData.Natural==12 then this.liveNameText.text = Language[11579]..heroData.ReadingName.."" end