From abfbfc423b2e72bfff8e20d1594f706b4944404e Mon Sep 17 00:00:00 2001 From: 2han9B1a0 Date: Fri, 3 Jul 2020 11:27:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=83=E9=AD=94=E6=96=87=E5=AD=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=81=E6=88=90=E9=95=BF=E5=9F=BA=E9=87=91=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9=E3=80=81=E6=96=87?= =?UTF-8?q?=E5=AD=97=EF=BC=9A=E4=BC=A0=E8=AF=B4=E4=BF=AE=E6=94=B9=E3=80=81?= =?UTF-8?q?=E5=9B=9B=E5=85=83=E9=98=B5=E5=8D=A1=E6=B1=A0=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=81=E8=87=AA=E9=80=89=E5=AE=9D=E7=AE=B1?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MonsterCamp/NextMonsterInfoPopup.prefab | 3 +-- .../UI/Recruit/HeroPreviewPanel.prefab | 8 +++---- .../Prefabs/UI/RoleInfo/RoleInfoPanel.prefab | 6 ++--- .../ManagedResources/~Lua/Common/Language.lua | 2 +- .../HandBook/HandBookHeroInfoPanel.lua | 2 +- .../~Lua/Modules/Mission/MissionManager.lua | 24 +++++++++++++------ .../~Lua/Modules/Operating/OperatingPanel.lua | 10 ++++---- .../View/GeneralPopup_TrialToNextFloor.lua | 4 ++-- .../~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 2 +- data_execl/excelTool/Export/LanguageLua.csv | 2 +- 10 files changed, 37 insertions(+), 26 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/NextMonsterInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/NextMonsterInfoPopup.prefab index afabbe5360..244dbdefbc 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/NextMonsterInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/NextMonsterInfoPopup.prefab @@ -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: diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab index 960ca25c24..63d5acacfb 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab @@ -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: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index c3d65caa43..b7add4628e 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -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 diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 95a16ce0d8..128bfbe764 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -1794,7 +1794,7 @@ [11793] = "请选择一个需要归元的神将", [11794] = "点的我自己", [11795] = "别人", - [11796] = "请选择一种宝物", + [11796] = "请至少选择一项", [11797] = "宝物强化", [11798] = "宝物精炼", [11799] = "宝物强化大师等级", diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua index 48633468ef..02e6f65cfe 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua @@ -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() diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionManager.lua index c1aeeb5b7e..4f58d6f24f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionManager.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua index 3dd79586c2..a98dd36578 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialToNextFloor.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialToNextFloor.lua index c4ec8b1192..740e2f7c9b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialToNextFloor.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialToNextFloor.lua @@ -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() diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 49ef333cca..7338250749 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -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 diff --git a/data_execl/excelTool/Export/LanguageLua.csv b/data_execl/excelTool/Export/LanguageLua.csv index 40b3926305..d94063cbd8 100644 --- a/data_execl/excelTool/Export/LanguageLua.csv +++ b/data_execl/excelTool/Export/LanguageLua.csv @@ -1793,7 +1793,7 @@ 11793,ѡһҪԪ 11794,Լ 11795, -11796,ѡһֱ +11796,ѡһ 11797,ǿ 11798,ᆱ 11799,ǿʦȼ