Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
# Conflicts: # Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.luaTCX_LongZhu
commit
7ef847cd87
|
|
@ -481,7 +481,7 @@ PanelTypeView2 = {
|
|||
|
||||
|
||||
PanelType = {
|
||||
Main = { 14, 16 }, -- 体力 2
|
||||
Main = { 14, 16 ,108}, -- 体力 2
|
||||
RoleInfo = { 14, 3, 4 }, -- 成长护符
|
||||
FightPointPass = { 14, 3, 16 }, -- 新关卡
|
||||
SoulCrystal = { 14, 16 }, -- 魂晶
|
||||
|
|
@ -1046,7 +1046,9 @@ RedPointType = {
|
|||
TianShuPokemon_Fetter = 800, --灵兽羁绊
|
||||
Equip_Fetter = 805, --装备羁绊
|
||||
Weapon_Fetter = 806, --神兵羁绊
|
||||
|
||||
Treasure_Fetter = 807, --法宝羁绊
|
||||
FaXiang_Fetter = 808, --法相羁绊
|
||||
HuaShen_Fetter = 809, --身外化身羁绊
|
||||
--跨服天梯
|
||||
JumpServer_MainCity = 820, --主界面跨服天梯
|
||||
JumpServer_HightLadder = 821, --跨服玩法界面
|
||||
|
|
|
|||
|
|
@ -390,6 +390,7 @@ function this.GetHeroPotencyLvById(did)
|
|||
end
|
||||
end
|
||||
--LogError("礼物增加 潜能 lv====================================="..lv)
|
||||
lv = lv + TianShuMiJuanManger.GetAddPotentialLV()
|
||||
return lv
|
||||
end
|
||||
--获取主角礼物添加的潜能等级
|
||||
|
|
|
|||
|
|
@ -395,7 +395,7 @@ function this.ResetHeroPotentialData(_did)
|
|||
heroDatas[_did].potential = {}
|
||||
heroDatas[_did].potential[1] = {}
|
||||
heroDatas[_did].potential[1].lv = 1
|
||||
heroDatas[_did].potential[1].giftLv = 1 -- TianShuMiJuanManger.GetAddPotentialLV()
|
||||
heroDatas[_did].potential[1].giftLv = TianShuMiJuanManger.GetAddPotentialLV()
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -4270,8 +4270,8 @@ end
|
|||
function this.GetHeroPotencyAddByType(_dyn, _type)
|
||||
if heroDatas[_dyn] and heroDatas[_dyn].potential and heroDatas[_dyn].potential[_type] then
|
||||
local poten = heroDatas[_dyn].potential[_type]
|
||||
local allLv = poten.lv + poten.giftLv -- +TianShuMiJuanManger.GetAddPotentialLV()
|
||||
-- LogError("poten.lv====="..poten.lv.." poten.giftLv=="..poten.giftLv.." TianShuMiJuanManger.GetAddPotentialLV()=="..TianShuMiJuanManger.GetAddPotentialLV())
|
||||
local allLv = poten.lv + poten.giftLv +TianShuMiJuanManger.GetAddPotentialLV()
|
||||
--LogError("poten.lv====="..poten.lv.." poten.giftLv=="..poten.giftLv.." TianShuMiJuanManger.GetAddPotentialLV()=="..TianShuMiJuanManger.GetAddPotentialLV())
|
||||
local config = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PotentialNew, "Type", _type, "Level", allLv)
|
||||
if config then
|
||||
local pro = config.Attribute / 10000
|
||||
|
|
@ -4284,7 +4284,7 @@ end
|
|||
function this.GetHeroPotencyAddByTypeAndPotencyData(_data, _type)
|
||||
if _data and _type and _data[_type] then
|
||||
local aaa = _data[_type]
|
||||
local allLv = aaa.lv + aaa.giftLv -- +TianShuMiJuanManger.GetAddPotentialLV()
|
||||
local allLv = aaa.lv + aaa.giftLv +TianShuMiJuanManger.GetAddPotentialLV()
|
||||
local config = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PotentialNew, "Type", _type, "Level", allLv)
|
||||
if config then
|
||||
local pro = config.Attribute / 10000
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ local redPointList = {}
|
|||
-- Tab管理器
|
||||
local TabBox = require("Modules/Common/TabBox")
|
||||
local tabs = {
|
||||
-- [1] = { --神将
|
||||
-- default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12274],
|
||||
-- rpType = RedPointType.Hero_Fetter,funcType = -1,bg = "t_tianshumijuan_shengjiangditu",zi = "t_tianshumijuan_shenjiangpian_zi_zh",
|
||||
-- },
|
||||
-- [2] = { --魂印
|
||||
-- default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12275],
|
||||
-- rpType = RedPointType.SoulPrint_Fetter,funcType = FUNCTION_OPEN_TYPE.hunyin,bg = "t_tianshumijuan_hunyinditu",zi = "t_tianshumijuan_hunyingpian_zi_zh", --gamesetting.EquipSignUnlock
|
||||
-- },
|
||||
[1] = { --神将
|
||||
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12274],
|
||||
rpType = RedPointType.Hero_Fetter,funcType = -1,bg = "t_tianshumijuan_shengjiangditu",zi = "t_tianshumijuan_shenjiangpian_zi_zh",
|
||||
},
|
||||
[2] = { --魂印
|
||||
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12275],
|
||||
rpType = RedPointType.SoulPrint_Fetter,funcType = FUNCTION_OPEN_TYPE.hunyin,bg = "t_tianshumijuan_hunyinditu",zi = "t_tianshumijuan_hunyingpian_zi_zh", --gamesetting.EquipSignUnlock
|
||||
},
|
||||
[3] = { --灵兽
|
||||
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = Language[12276],
|
||||
rpType = RedPointType.TianShuPokemon_Fetter,funcType = FUNCTION_OPEN_TYPE.POKEMON,bg = "GSX116",zi = "t_tianshumijuan_lingshoupian_zi_zh",
|
||||
|
|
@ -27,6 +27,39 @@ local tabs = {
|
|||
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "超级武器篇",
|
||||
rpType = RedPointType.Weapon_Fetter,funcType = FUNCTION_OPEN_TYPE.POKEMON,bg = "GSX116",zi = "GodWeaponAtlas_handbook_title_zh",
|
||||
},
|
||||
[6] = { --法宝
|
||||
default = "r_hero_xuanze_002",
|
||||
lock = "r_hero_xuanze_002",
|
||||
select = "r_hero_xuanze_001",
|
||||
tabName = "法宝",
|
||||
rpType = RedPointType.Treasure_Fetter,
|
||||
funcType = -1,
|
||||
bg = "t_tianshumijuan_lingshouditu"
|
||||
,
|
||||
zi = "GodWeaponAtlas_handbook_title_zh",
|
||||
},
|
||||
[7] = { --法相
|
||||
default = "r_hero_xuanze_002",
|
||||
lock = "r_hero_xuanze_002",
|
||||
select = "r_hero_xuanze_001",
|
||||
tabName = "法相",
|
||||
rpType = RedPointType.FaXiang_Fetter,
|
||||
funcType = FUNCTION_OPEN_TYPE.FaXiang,
|
||||
bg = "t_tianshumijuan_lingshouditu"
|
||||
,
|
||||
zi = "GodWeaponAtlas_handbook_title_zh",
|
||||
},
|
||||
[8] = { --身外化身
|
||||
default = "r_hero_xuanze_002",
|
||||
lock = "r_hero_xuanze_002",
|
||||
select = "r_hero_xuanze_001",
|
||||
tabName = "身外化身",
|
||||
rpType = RedPointType.HuaShen_Fetter,
|
||||
funcType = FUNCTION_OPEN_TYPE.Incarnation,
|
||||
bg = "t_tianshumijuan_lingshouditu"
|
||||
,
|
||||
zi = "GodWeaponAtlas_handbook_title_zh",
|
||||
},
|
||||
}
|
||||
local status = {
|
||||
[0] = Language[10175],
|
||||
|
|
|
|||
|
|
@ -109,7 +109,17 @@ function this.CheckFetterStatus(fetterType)
|
|||
end
|
||||
end
|
||||
|
||||
--获取加成的羁绊等级
|
||||
function this.GetAddPotentialLV()
|
||||
local lv=0
|
||||
for k,v in pairs(this.fetterData) do
|
||||
|
||||
if v.enabled==1 then
|
||||
lv=lv+v.Potential
|
||||
end
|
||||
end
|
||||
return lv
|
||||
end
|
||||
--刷新羁绊状态
|
||||
function this.GetAllPokemonFetterDatas(fetterType,curPokemonSidList)
|
||||
local SpiritAnimalBookList = {}
|
||||
|
|
|
|||
Loading…
Reference in New Issue