Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
wangzhenxing 2022-04-26 11:52:46 +08:00
commit 364cc676c1
7 changed files with 10 additions and 7 deletions

View File

@ -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,--跨服排行榜
}

View File

@ -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

View File

@ -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

View File

@ -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 = {}

View File

@ -1,7 +1,5 @@
fileFormatVersion: 2
guid: 7ad071edc48d0d8469028957a2df9c67
timeCreated: 1525414862
licenseType: Pro
guid: 0d4e522e6543f8646b28a4410bb9a3ce
DefaultImporter:
externalObjects: {}
userData:

View File

@ -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"