Merge branch 'tcx_xiyou_dev' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_dev

DESKTOP-C3M45P4\dengdan 2024-04-16 19:13:28 +08:00
commit cd6a7265ca
2 changed files with 15 additions and 15 deletions

View File

@ -514,7 +514,7 @@ PanelType = {
fagncunxunbao = {16,1288,1290},
HomeLand = {14,12061,12062,1297},
ExploreFun = { 14, 16, 12061 }, -- 体力 2
GodPrint = { 14, 16, 1294 }, -- 神印
GodPrint = { 14, 16, 1294 }, -- 天书
GodWeapon={14, 16,22301}, --神兵
Gem = {16,122,123},--修行
}
@ -593,7 +593,7 @@ UpViewRechargeType = {
qianmianhuan = 1288,
exploreCost = 12061,--家园食物
HomeLand_BeiChenZhiJing = 12062,--家园北辰之晶
GodPrintStone= 1294, --神印
GodPrintStone= 1294, --天书
HomeLand_BeiChenZhiSui =1297,--北辰之髓
xianChongQuan = 1350, --仙充券
SilverBar = 124, --银条
@ -647,7 +647,7 @@ SHOP_TYPE = {
QIJIE_SHOP = 81,--七界商店
honglushangdian = 87,
fangcunxunbao = 89,
GodPrint = 90, --神印/探索商店
GodPrint = 90, --天书/探索商店
}
PropertyTypeIconDef = {
@ -819,7 +819,7 @@ RedPointType = {
Shop_Tab_General = 25310,
Shop_Tab_Soul = 25320,--魂印小页签
Shop_Tab_Secret = 25321,
Shop_Tab_God = 25322,--神印小页签
Shop_Tab_God = 25322,--天书小页签
Shop_Tab_Arena = 25330,
Shop_Tab_Guild = 25331,
Shop_Tab_Roam = 25350,
@ -827,7 +827,7 @@ RedPointType = {
Shop_General_Check = 253100,
Shop_General_Refresh = 253101,
Shop_Soul_Refresh = 253102,
Shop_God_Refresh = 253103,--神印红点
Shop_God_Refresh = 253103,--天书红点
Shop_Secret_Check = 253200,
Shop_Arena_Check = 253300,
Shop_Guild_Check = 253310,
@ -1033,7 +1033,7 @@ RedPointType = {
Gem_1 =601,
Gem_2 = 602,
Practice_upgrade = 5001,--突破按钮
Practice_imprint = 5002,--神印按钮
Practice_imprint = 5002,--天书按钮
Practice_fourQua = 5003,--四象心法
Practice_Cultivation = 5004,--主角修为
playerSkill1 = 5100,--主角1技能
@ -1156,7 +1156,7 @@ ItemType = {
talismanSoulChip = 30,
Gem = 31,--命石
TimeIsGold = 32, -- 挂机时长
GodPrint = 34, --神印
GodPrint = 34, --天书
likeabilityItemChip = 35, --好感度物品碎片
EquipChip = 36, --装备碎片
GMzck =42, --gm直冲卡
@ -1790,7 +1790,7 @@ FUNCTION_OPEN_TYPE = {
Gem = 122,--命格
HOMELAND = 124,--家园 浮生们
FlyUp = 125,--飞升
GodPrint=126,--神印
GodPrint=126,--天书
CROSS_CART=127,--跨服聊天
CROSS_RANK=128,--跨服排行榜
Hot_Hero_Rank=132,--神将热榜
@ -2041,7 +2041,7 @@ HELP_TYPE = {
jingjishilian = 122,
HomeLand = 126,
PowerRice = 127,--战力冲刺
GodPrint=129,--神印
GodPrint=129,--天书
GodWeapon=139,--神兵玩法
GodsWayTreasure=140, --多队塔秘宝
GiftShop = 141, --礼物商店
@ -2594,7 +2594,7 @@ GENERAL_POPUP_TYPE={
GemCompound = 59, --命石合成
ResolveReStar = 58,--英雄回退
BuyShanHeSheJiTuGetRewardTimes = 70,
GodPrintUp = 71, --神印升品阶
GodPrintUp = 71, --天书升品阶
GiveLikeHotHero = 72,--英雄热度排行
WishEquipDraw = 73, --心愿法宝抽卡
IncarnationDes2 = 74,
@ -2602,7 +2602,7 @@ GENERAL_POPUP_TYPE={
--通用信息弹窗类型
GENERALINFO_TYPE = {
Imprint = 1,--紫府神印信息
Imprint = 1,--紫府天书信息
PracticeLevel = 2,--修行界面小点的信息
QiJieGoalAttri = 3,--七界试炼目标属性
QiJieAllTreasure = 4,--七界遗物全部属性
@ -2695,7 +2695,7 @@ ItemBaseType = {
Materials = 7, --材料
JuLing = 8, --聚灵
Gem = 9, --命石
GodPrint = 10, --神印
GodPrint = 10, --天书
TurnsCard=11,--变身卡
Talisman = 12, --法宝
FaXiang = 13, --法相
@ -2852,7 +2852,7 @@ ExpeditionNodeType = {
[31] = "命石",
[32] = "挂机时长资源包",
[33] = "法相",
[34] = "神印",
[34] = "天书",
[35] = "好感度碎片",
[36] = "装备碎片",
[37] = "潜能石",
@ -2887,7 +2887,7 @@ ItemBaseTypeName = {
[7] = "材料",
[8] = "生命卡碎片",
[9] = "命石",
[10] = "神印",
[10] = "天书",
[11] = "奥义卡",
[12] = "生命卡",
[13] = "神石",

View File

@ -287,7 +287,7 @@ function RoleInfoPanel:BindEvent()
end)
Util.AddClick(this.godPrintBtn,function ()
if not isOpenGod then
PopupTipPanel.ShowTip("神将六星解锁神印")
PopupTipPanel.ShowTip("神将六星解锁天书")
return
end
UIManager.OpenPanel(UIName.GodPrintPanel,curHeroData,heroDatas)