Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
6f30179f57
|
@ -3478,7 +3478,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue1:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 0, y: -182, z: 0}
|
||||
initFloat: 0
|
||||
|
@ -4434,7 +4433,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u5996\u517D"
|
||||
m_Text: "\u5FC3\u9B54"
|
||||
LanguageIndex: 11169
|
||||
--- !u!1 &7806638949837101823
|
||||
GameObject:
|
||||
|
|
|
@ -232,7 +232,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u5730\u7CFB\u5956\u6C60"
|
||||
m_Text: "\u9053\u7384\u5956\u6C60"
|
||||
LanguageIndex: 11483
|
||||
--- !u!1 &750510187454179525
|
||||
GameObject:
|
||||
|
@ -1131,7 +1131,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u6C34\u7CFB\u5956\u6C60"
|
||||
m_Text: "\u5996\u7075\u5956\u6C60"
|
||||
LanguageIndex: 11481
|
||||
--- !u!1 &1699741493723657035
|
||||
GameObject:
|
||||
|
@ -2876,7 +2876,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u706B\u7CFB\u5956\u6C60"
|
||||
m_Text: "\u4EBA\u6770\u5956\u6C60"
|
||||
LanguageIndex: 11480
|
||||
--- !u!1 &4293146315607802960
|
||||
GameObject:
|
||||
|
@ -4824,7 +4824,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u98CE\u7CFB\u5956\u6C60"
|
||||
m_Text: "\u4F5B\u7985\u5956\u6C60"
|
||||
LanguageIndex: 11482
|
||||
--- !u!1 &8094324454178563400
|
||||
GameObject:
|
||||
|
|
|
@ -61434,7 +61434,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u4F20\u8BB0"
|
||||
m_Text: "\u4F20\u8BF4"
|
||||
LanguageIndex: 10914
|
||||
--- !u!1 &552369935333176587
|
||||
GameObject:
|
||||
|
@ -75386,7 +75386,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u795E\u5C06\u6545\u4E8B"
|
||||
m_Text: "\u795E\u5C06\u4F20\u8BF4"
|
||||
LanguageIndex: 10910
|
||||
--- !u!1 &5526793249900633333
|
||||
GameObject:
|
||||
|
@ -77888,7 +77888,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: -2, y: 0}
|
||||
m_AnchoredPosition: {x: -2, y: -0.000061035156}
|
||||
m_SizeDelta: {x: 911.7, y: 165}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2281102156788700535
|
||||
|
|
|
@ -1794,7 +1794,7 @@
|
|||
[11793] = "请选择一个需要归元的神将",
|
||||
[11794] = "点的我自己",
|
||||
[11795] = "别人",
|
||||
[11796] = "请选择一种宝物",
|
||||
[11796] = "请至少选择一项",
|
||||
[11797] = "宝物强化",
|
||||
[11798] = "宝物精炼",
|
||||
[11799] = "宝物强化大师等级",
|
||||
|
|
|
@ -115,7 +115,7 @@ function HandBookHeroInfoPanel:BindEvent()
|
|||
end
|
||||
end)
|
||||
Util.AddClick(self.btnStory, function()
|
||||
self:SetSelectBtn(self.btnStory, Language[11099])
|
||||
self:SetSelectBtn(self.btnStory, Language[12158])
|
||||
self:OnShowHeroData(2,1,heroConFigData.Star)
|
||||
end)
|
||||
Util.AddClick(self.btnSkin, function()
|
||||
|
|
|
@ -541,14 +541,24 @@ function this.GetAllRewardTrigger()
|
|||
end
|
||||
end
|
||||
|
||||
LogBlue("掉落物品的数量:"..#msg.boxDrop)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.boxDrop,1,function()
|
||||
for i = 1, #msg.buffIds do--buff加成Tips
|
||||
PopupTipPanel.ShowTip(FoodsConfig[msg.buffIds[i]].Desc)
|
||||
end
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
|
||||
end)
|
||||
-- local data = TrialMiniGameManager.IdToNameIconNum(msg.boxDrop.itemlist[1].itemId,msg.boxDrop.itemlist[1].itemNum)
|
||||
-- PopupTipPanel.ShowColorTip(data[1],data[2],data[3])
|
||||
-- UIManager.OpenPanel(UIName.RewardItemPopup,msg.boxDrop,1)
|
||||
|
||||
local thread=coroutine.start(function()
|
||||
--宝箱奖励掉落
|
||||
for i = 1, #msg.boxDrop.itemlist do
|
||||
local data = TrialMiniGameManager.IdToNameIconNum(msg.boxDrop.itemlist[i].itemId,msg.boxDrop.itemlist[i].itemNum)
|
||||
PopupTipPanel.ShowColorTip(data[1],data[2],data[3])
|
||||
coroutine.wait(0.1)
|
||||
end
|
||||
--buff奖励掉落
|
||||
for i = 1, #msg.buffIds do
|
||||
PopupTipPanel.ShowTip(FoodsConfig[msg.buffIds[i]].Desc)
|
||||
coroutine.wait(0.1)
|
||||
end
|
||||
end)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
|
||||
end , 3):Start()
|
||||
end)
|
||||
end
|
||||
|
|
|
@ -215,12 +215,14 @@ function OperatingPanel:RefreshTabStatus()
|
|||
for i = 1, #ShowType.Welfare.body do
|
||||
self.operateTabs[ShowType.Welfare.body[i]]:SetActive(true)
|
||||
end
|
||||
--判断成长基金活动是否结束(16是最后一档活动ActivityId)
|
||||
--判断成长基金活动是否开启或结束(16是最后一档活动ActivityId)
|
||||
local t2 = false
|
||||
local GrowthRewardId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.GrowthReward)
|
||||
local singleRewardData
|
||||
local t2 = true
|
||||
|
||||
if GrowthRewardId == 16 then
|
||||
if GrowthRewardId then--是否开启
|
||||
t2 = true
|
||||
end
|
||||
if GrowthRewardId == 16 then--是否结束
|
||||
singleRewardData = ActivityGiftManager.GetActivityInfo(GrowthRewardId, 5324)
|
||||
if not singleRewardData then
|
||||
t2 = false
|
||||
|
|
|
@ -14,8 +14,8 @@ end
|
|||
|
||||
function this:BindEvent()
|
||||
Util.AddClick(this.btnCancel,function()
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Event.PointTriggerEnd)
|
||||
UIManager.ClosePanel(UIName.GeneralPopup)
|
||||
local optionId = eventConfig[eventId].Option[2]
|
||||
OptionBehaviourManager.JumpEventPoint(eventId, optionId, UIManager.GetOpenPanel(UIName.GeneralPopup))
|
||||
end)
|
||||
|
||||
Util.AddClick(this.btnSure,function()
|
||||
|
|
|
@ -1089,7 +1089,7 @@ end
|
|||
function RoleInfoPanel:OnClickBtnStory()
|
||||
RoleInfoPanel.HideAllLayout()
|
||||
this.roleStoryLayout:SetActive(true)
|
||||
RoleInfoPanel:SetSelectBtn(self.btnStory, Language[11099])
|
||||
RoleInfoPanel:SetSelectBtn(self.btnStory, Language[12158])
|
||||
--PopupTipPanel.ShowTip("内容未开放")
|
||||
end
|
||||
|
||||
|
|
|
@ -1793,7 +1793,7 @@
|
|||
11793,请选择一个需要归元的神将
|
||||
11794,点的我自己
|
||||
11795,别人
|
||||
11796,请选择一种宝物
|
||||
11796,请至少选择一项
|
||||
11797,宝物强化
|
||||
11798,宝物精炼
|
||||
11799,宝物强化大师等级
|
||||
|
|
|
Loading…
Reference in New Issue