Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
b463deccca
|
@ -2170,7 +2170,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 4864250674772076596}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_LocalScale: {x: 0.7, y: 0.7, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 8623671869353108748}
|
||||
m_Father: {fileID: 8772249491636870108}
|
||||
|
@ -4991,7 +4991,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -111.79996, y: -2.2999725}
|
||||
m_AnchoredPosition: {x: -186.1, y: -2.2999725}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8772249490571615140
|
||||
|
@ -5029,7 +5029,7 @@ MonoBehaviour:
|
|||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
|
@ -5740,7 +5740,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 156.9, y: -2.2999725}
|
||||
m_AnchoredPosition: {x: 146.2, y: -4.6}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8772249491387197022
|
||||
|
@ -5778,7 +5778,7 @@ MonoBehaviour:
|
|||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
|
|
|
@ -443,7 +443,7 @@ function this.RequestSendGuildTranscript(func)
|
|||
-- 构建字符串
|
||||
local channel = CHAT_CHANNEL.FAMILY
|
||||
local guildData = MyGuildManager.GetMyGuildInfo()
|
||||
local content = string.format("【%s】发起了集结号角,请全体公会成员前往挑战副本首领!",PlayerManager.nickName)
|
||||
local content = string.format("%s发起了集结号角,请全体公会成员前往挑战副本首领!",PlayerManager.nickName)
|
||||
this.RequestSendChatMsg(channel, content, function()
|
||||
end)
|
||||
end
|
||||
|
|
|
@ -85,7 +85,7 @@ function ZhenQiYiBaoPage:SortData()
|
|||
local aboughtNum = a.Limit - OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, a.Id) > 0 and 2 or 1
|
||||
local bboughtNum = b.Limit - OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, b.Id) > 0 and 2 or 1
|
||||
if aboughtNum == bboughtNum then
|
||||
return a.Id < b.Id
|
||||
return a.Price < b.Price
|
||||
else
|
||||
return aboughtNum > bboughtNum
|
||||
end
|
||||
|
|
|
@ -103,7 +103,8 @@ function GuildTranscriptMainPopup:BindEvent()
|
|||
PopupTipPanel.ShowTip(string.format("%s数量不足!",itemName) )
|
||||
return
|
||||
end
|
||||
MsgPanel.ShowTwo(string.format( "是否花费%s%s购买1次挑战次数并发起扫荡?",finalNum,itemName), nil, function()
|
||||
--是否花费XX妖晶购买1次扫荡次数,本次扫荡伤害为XXXXXX
|
||||
MsgPanel.ShowTwo(string.format( "是否花费%s%s购买1次扫荡次数,本次扫荡伤害为%s?",finalNum,itemName,GuildTranscriptManager.damage), nil, function()
|
||||
--买东西
|
||||
ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,GuildTranscriptManager.shopGoodId,1,function()
|
||||
PopupTipPanel.ShowTip("成功购买1次扫荡次数!")
|
||||
|
@ -114,7 +115,7 @@ function GuildTranscriptMainPopup:BindEvent()
|
|||
end)
|
||||
end
|
||||
else
|
||||
MsgPanel.ShowTwo(string.format( "确定以上次挑战的%s伤害进行挑战吗?",GuildTranscriptManager.damage), nil, function()
|
||||
MsgPanel.ShowTwo(string.format( "确定以上次挑战的%s伤害进行扫荡吗?",GuildTranscriptManager.damage), nil, function()
|
||||
this.QuickWar()
|
||||
end)
|
||||
end
|
||||
|
@ -126,10 +127,14 @@ function GuildTranscriptMainPopup:BindEvent()
|
|||
PopupTipPanel.ShowTip(string.format("%s数量不足!",itemName) )
|
||||
return
|
||||
end
|
||||
if GuildTranscriptManager.GetCanBuyBattleCount() <= 0 then
|
||||
PopupTipPanel.ShowTip(Language[11705])
|
||||
return
|
||||
end
|
||||
MsgPanel.ShowTwo(string.format( "是否花费%s%s购买1次挑战次数?",finalNum,itemName), nil, function()
|
||||
--买东西
|
||||
ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,GuildTranscriptManager.shopGoodId,1,function()
|
||||
PopupTipPanel.ShowTip("成功购买1次扫荡次数!")
|
||||
PopupTipPanel.ShowTip("成功购买1次挑战次数!")
|
||||
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM, 1)--更新特权
|
||||
this.ShowEndNumInfo()
|
||||
end)
|
||||
|
@ -173,6 +178,10 @@ function GuildTranscriptMainPopup:BindEvent()
|
|||
local itemId = curguildCheckpointConfig.AttributePromotePrice[1][1]
|
||||
local buyNum = curguildCheckpointConfig.AttributePromotePrice[2][nextBuyIndex]
|
||||
local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,itemId).Name
|
||||
if not buyNum then
|
||||
PopupTipPanel.ShowTip("强攻效果已到达最高!")
|
||||
return
|
||||
end
|
||||
if buyNum > BagManager.GetItemCountById(itemId) then
|
||||
PopupTipPanel.ShowTip(string.format("%s数量不足!",itemName) )
|
||||
return
|
||||
|
@ -267,6 +276,7 @@ function this.SingleChapterDataShow(go,data)
|
|||
lock:SetActive(true)
|
||||
mask:SetActive(true)
|
||||
end
|
||||
this.SelectImage:SetActive(false)
|
||||
if cutOpenIndex == data.Id then
|
||||
this.SetSelectImagePos(go)
|
||||
end
|
||||
|
@ -347,6 +357,9 @@ function this.ShowBossInfo()
|
|||
this.bossHerobg.sprite = Util.LoadSprite(GetHeroCardStarBg[curheroConfig.Star])
|
||||
this.bossHerohpPass.fillAmount = GuildTranscriptManager.GetBlood()/10000
|
||||
this.bossHerohpPassText.text = GuildTranscriptManager.GetBlood()/100 .."%"
|
||||
if cutOpenIndex < GuildTranscriptManager.GetCurBoss() then
|
||||
this.bossHerohpPassText.text = "已通关"
|
||||
end
|
||||
local liveName = GetResourcePath(curheroConfig.Live)
|
||||
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, curheroConfig.Id)
|
||||
local scale = roleConfig.play_liveScale
|
||||
|
@ -378,19 +391,19 @@ function this.ShowRewardInfo()
|
|||
reward2Data[2] = {96,cutOpenIndexConFig.LegionExp}
|
||||
for i = 1, #reward1Data do
|
||||
if itemList[this.reward1.name][i] then
|
||||
itemList[this.reward1.name][i]:OnOpen(false, reward1Data[i], 0.6,false,false,false,sorting)
|
||||
itemList[this.reward1.name][i]:OnOpen(false, reward1Data[i], 0.7,false,false,false,sorting)
|
||||
else
|
||||
itemList[this.reward1.name][i] = SubUIManager.Open(SubUIConfig.ItemView, this.reward1.transform)
|
||||
itemList[this.reward1.name][i]:OnOpen(false, reward1Data[i], 0.6,false,false,false,sorting)
|
||||
itemList[this.reward1.name][i]:OnOpen(false, reward1Data[i], 0.7,false,false,false,sorting)
|
||||
end
|
||||
itemList[this.reward1.name][i].gameObject:SetActive(true)
|
||||
end
|
||||
for i = 1, #reward2Data do
|
||||
if itemList[this.reward2.name][i] then
|
||||
itemList[this.reward2.name][i]:OnOpen(false, reward2Data[i], 0.6,false,false,false,sorting)
|
||||
itemList[this.reward2.name][i]:OnOpen(false, reward2Data[i], 0.7,false,false,false,sorting)
|
||||
else
|
||||
itemList[this.reward2.name][i] = SubUIManager.Open(SubUIConfig.ItemView, this.reward2.transform)
|
||||
itemList[this.reward2.name][i]:OnOpen(false, reward2Data[i], 0.6,false,false,false,sorting)
|
||||
itemList[this.reward2.name][i]:OnOpen(false, reward2Data[i], 0.7,false,false,false,sorting)
|
||||
end
|
||||
itemList[this.reward2.name][i].gameObject:SetActive(true)
|
||||
end
|
||||
|
@ -437,9 +450,12 @@ function this.ShowBuffData()
|
|||
attackBuffNum = math.floor(addNum[1][2]/100)
|
||||
end
|
||||
local GetbuffTime = GuildTranscriptManager.GetbuffTime() > 0 and GuildTranscriptManager.GetbuffTime() - PlayerManager.serverTime or 0
|
||||
Util.SetGray(this.attackInfoTextGo,attackBuffNum == 0)
|
||||
LogGreen("attackBuffNum "..GetbuffTime)
|
||||
this.attackInfoText.text = string.format("全军团成员攻击力+ %s ",attackBuffNum).."%"
|
||||
if attackBuffNum == 0 then
|
||||
--<color=#FCF5D3FF>%s</color>
|
||||
this.attackInfoText.text = "<color=#ADADAD>全公会成员攻击力+0%</color><color=#FF0000>(未激活)</color> "
|
||||
else
|
||||
this.attackInfoText.text = string.format("<color=#FFDAB6>全公会成员攻击力+ %s ",attackBuffNum).."%</color>"
|
||||
end
|
||||
this.RemainTimeDown(this.attackInfoTime, GetbuffTime)
|
||||
end
|
||||
this.timer = Timer.New()
|
||||
|
@ -486,11 +502,12 @@ function this.TimeStampToDateString(second)
|
|||
local minute = math.floor(second / 60) % 60
|
||||
local sec = math.floor( second % 60)
|
||||
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
|
||||
return string.format("(%s:%s:%s:后失效)", hour, minute, sec)
|
||||
return string.format("(%s:%s:后失效)", minute, sec)
|
||||
end
|
||||
|
||||
function this.SetSelectImagePos(parent)
|
||||
Util.SetGray(this.SelectImage,false)
|
||||
this.SelectImage:SetActive(true)
|
||||
this.SelectImage.transform:SetParent(Util.GetGameObject(parent, "GameObject").transform)
|
||||
this.SelectImage:GetComponent("RectTransform").localPosition = Vector3.zero
|
||||
this.SelectImage:GetComponent("RectTransform").localScale = Vector3.New(1,1,1)
|
||||
|
|
|
@ -2212,7 +2212,7 @@
|
|||
12212,宝物分解
|
||||
12213,无可分解宝物!
|
||||
12214,最多选择%s个宝物!
|
||||
12215,请选择需要分解的宝器!
|
||||
12215,请选择需要分解的宝物!
|
||||
12216,这里?
|
||||
12217,无法用于无限循环的方法
|
||||
12218,未命中
|
||||
|
@ -2270,8 +2270,8 @@
|
|||
12270,材料
|
||||
12271,(注意:本次出售包含<color=#FFD700>金色</color>或<color=#FF0000>红色</color>装备!)
|
||||
12272,出售数量不可为0个
|
||||
12273,宝物将分解为宝魂,若宝物已强化或精炼,分解后将清空强化和精炼等级,并100%返还养成材料。
|
||||
12274,(注意:本次出售包含<color=#FFD700>金色</color>或<color=#FF0000>红色</color>宝器!)
|
||||
12273,宝物将分解为
|
||||
12274,(注意:本次出售包含<color=#FFD700>金色</color>或<color=#FF0000>红色</color>宝物!)
|
||||
12275,分解后获得:
|
||||
12276,神将归元成功\,等级重置为1级
|
||||
12277,未查询到符合条件的装备!
|
||||
|
@ -2291,3 +2291,4 @@
|
|||
12291,请选择需要合成的神将
|
||||
12292,%s星同阵营神将
|
||||
12293,完成上方任务即可免费领取神将
|
||||
12294,,若宝物已强化或精炼,分解后将清空强化和精炼等级,并100%返还养成材料。
|
||||
|
|
|
Loading…
Reference in New Issue