Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
364cc676c1
|
@ -1698,8 +1698,9 @@ FUNCTION_OPEN_TYPE = {
|
||||||
ChouJiangRukou = 121,--限时招募,乾坤宝盒、灵兽宝阁入口
|
ChouJiangRukou = 121,--限时招募,乾坤宝盒、灵兽宝阁入口
|
||||||
Explore = 123,
|
Explore = 123,
|
||||||
Gem = 122,--命格
|
Gem = 122,--命格
|
||||||
FlyUp = 125,--飞升
|
|
||||||
HOMELAND = 124,--家园 浮生们
|
HOMELAND = 124,--家园 浮生们
|
||||||
|
FlyUp = 125,--飞升
|
||||||
|
GodPrint=126,--神印
|
||||||
CROSS_CART=127,--跨服聊天
|
CROSS_CART=127,--跨服聊天
|
||||||
CROSS_RANK=128,--跨服排行榜
|
CROSS_RANK=128,--跨服排行榜
|
||||||
}
|
}
|
||||||
|
|
|
@ -712,6 +712,10 @@ function this.SetBottomBarIsActive()
|
||||||
tabs1[i]:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TailsmanSoul))
|
tabs1[i]:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TailsmanSoul))
|
||||||
elseif i == 9 then--命格
|
elseif i == 9 then--命格
|
||||||
tabs1[i]:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.Gem))
|
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
|
end
|
||||||
if tabs1[i].activeInHierarchy then
|
if tabs1[i].activeInHierarchy then
|
||||||
num = num + 1
|
num = num + 1
|
||||||
|
|
|
@ -433,7 +433,7 @@ function this.GetSkillsData()
|
||||||
OpenPassiveSkillRules=GetPassiveByMaxStar(curHeroData.heroConfig,OpenPassiveSkillRules)
|
OpenPassiveSkillRules=GetPassiveByMaxStar(curHeroData.heroConfig,OpenPassiveSkillRules)
|
||||||
if OpenPassiveSkillRules then
|
if OpenPassiveSkillRules then
|
||||||
local openlists,compoundOpenNum,compoundNum,allUpStarOpenData = HeroManager.GetAllPassiveSkillIds(curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId)
|
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.Name = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
|
||||||
heroSkill.state = 1
|
heroSkill.state = 1
|
||||||
if curHeroData.star == 12 then
|
if curHeroData.star == 12 then
|
||||||
|
|
|
@ -672,7 +672,7 @@ function this:UpdateHeroInfoData()
|
||||||
for k,v in pairs(this.PageList) do
|
for k,v in pairs(this.PageList) do
|
||||||
v:OnHide()
|
v:OnHide()
|
||||||
end
|
end
|
||||||
LogError("_CurPageIndex==".._CurPageIndex)
|
-- LogError("_CurPageIndex==".._CurPageIndex)
|
||||||
if _CurPageIndex == RoleInfoPanelIndex.pifu then
|
if _CurPageIndex == RoleInfoPanelIndex.pifu then
|
||||||
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",curHeroData.id)
|
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",curHeroData.id)
|
||||||
local HeoSkin = {}
|
local HeoSkin = {}
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 7ad071edc48d0d8469028957a2df9c67
|
guid: 0d4e522e6543f8646b28a4410bb9a3ce
|
||||||
timeCreated: 1525414862
|
|
||||||
licenseType: Pro
|
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
|
@ -16,7 +16,7 @@ if DebugServerIp then
|
||||||
require("mobdebug").start(DebugServerIp)
|
require("mobdebug").start(DebugServerIp)
|
||||||
end
|
end
|
||||||
|
|
||||||
require "misc.functions"
|
require "misc.functions_lua"
|
||||||
Mathf = require "UnityEngine.Mathf"
|
Mathf = require "UnityEngine.Mathf"
|
||||||
Vector3 = require "UnityEngine.Vector3"
|
Vector3 = require "UnityEngine.Vector3"
|
||||||
Quaternion = require "UnityEngine.Quaternion"
|
Quaternion = require "UnityEngine.Quaternion"
|
||||||
|
|
Loading…
Reference in New Issue