diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 40cb6fe33f..156fcbc7ba 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1698,8 +1698,9 @@ FUNCTION_OPEN_TYPE = { ChouJiangRukou = 121,--限时招募,乾坤宝盒、灵兽宝阁入口 Explore = 123, Gem = 122,--命格 - FlyUp = 125,--飞升 HOMELAND = 124,--家园 浮生们 + FlyUp = 125,--飞升 + GodPrint=126,--神印 CROSS_CART=127,--跨服聊天 CROSS_RANK=128,--跨服排行榜 } diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua index 5e71131841..777f0453bc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua @@ -712,6 +712,10 @@ function this.SetBottomBarIsActive() tabs1[i]:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TailsmanSoul)) elseif i == 9 then--命格 tabs1[i]:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.Gem)) + elseif i == 10 then --神印 + tabs1[i]:SetActive(CheckFunctionOpen(FUNCTION_OPEN_TYPE.GodPrint)) + elseif i == 11 then --变身 + tabs1[i]:SetActive(CheckFunctionOpen(FUNCTION_OPEN_TYPE.PRACTICE)) end if tabs1[i].activeInHierarchy then num = num + 1 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 5498a2d52e..0a28810740 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -433,7 +433,7 @@ function this.GetSkillsData() OpenPassiveSkillRules=GetPassiveByMaxStar(curHeroData.heroConfig,OpenPassiveSkillRules) if OpenPassiveSkillRules then local openlists,compoundOpenNum,compoundNum,allUpStarOpenData = HeroManager.GetAllPassiveSkillIds(curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId) - LogError("#OpenPassiveSkillRules=="..#OpenPassiveSkillRules.." compoundNum=="..compoundNum) + -- LogError("#OpenPassiveSkillRules=="..#OpenPassiveSkillRules.." compoundNum=="..compoundNum) heroSkill.Name = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum heroSkill.state = 1 if curHeroData.star == 12 then diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 9c8f07c033..0600d1b7bf 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -672,7 +672,7 @@ function this:UpdateHeroInfoData() for k,v in pairs(this.PageList) do v:OnHide() end - LogError("_CurPageIndex==".._CurPageIndex) + -- LogError("_CurPageIndex==".._CurPageIndex) if _CurPageIndex == RoleInfoPanelIndex.pifu then local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",curHeroData.id) local HeoSkin = {} diff --git a/Assets/ManagedResources/~Lua/misc/functions.lua b/Assets/ManagedResources/~Lua/misc/functions_lua.lua similarity index 100% rename from Assets/ManagedResources/~Lua/misc/functions.lua rename to Assets/ManagedResources/~Lua/misc/functions_lua.lua diff --git a/Assets/ManagedResources/~Lua/misc/functions.lua.meta b/Assets/ManagedResources/~Lua/misc/functions_lua.lua.meta similarity index 59% rename from Assets/ManagedResources/~Lua/misc/functions.lua.meta rename to Assets/ManagedResources/~Lua/misc/functions_lua.lua.meta index 99a4c81937..900d911cd1 100644 --- a/Assets/ManagedResources/~Lua/misc/functions.lua.meta +++ b/Assets/ManagedResources/~Lua/misc/functions_lua.lua.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 7ad071edc48d0d8469028957a2df9c67 -timeCreated: 1525414862 -licenseType: Pro +guid: 0d4e522e6543f8646b28a4410bb9a3ce DefaultImporter: externalObjects: {} userData: diff --git a/Assets/ManagedResources/~Lua/tolua.lua b/Assets/ManagedResources/~Lua/tolua.lua index e75120cd88..c623d3af40 100644 --- a/Assets/ManagedResources/~Lua/tolua.lua +++ b/Assets/ManagedResources/~Lua/tolua.lua @@ -16,7 +16,7 @@ if DebugServerIp then require("mobdebug").start(DebugServerIp) end -require "misc.functions" +require "misc.functions_lua" Mathf = require "UnityEngine.Mathf" Vector3 = require "UnityEngine.Vector3" Quaternion = require "UnityEngine.Quaternion"