From 893e33d92051556f92b5eeb8bf5991c3e5fa5e2d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 6 Jan 2022 10:33:08 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=B6=E5=9B=AD=E3=80=91=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/GeneralPanel/GeneralInfoPopup.prefab | 36 +++++++++---------- .../Prefabs/UI/HomeLand/HomeLandPanel.prefab | 4 +-- .../~Lua/Common/GlobalDefine.lua | 1 + .../GeneralInfoPopup_HomeLandPrivilege.lua | 13 ++++--- .../~Lua/Modules/HomeLand/HomeLandManager.lua | 2 +- .../~Lua/Modules/HomeLand/HomeLandPanel.lua | 3 +- 6 files changed, 33 insertions(+), 26 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab index 4a6d4c9c6a..01b6bf54df 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab @@ -739,7 +739,7 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 4 m_MaxSize: 45 @@ -1226,7 +1226,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -365.49994, y: 100} - m_SizeDelta: {x: 66, y: 66} + m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4226441777941572043 CanvasRenderer: @@ -4644,8 +4644,8 @@ 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: 0, y: 338} - m_SizeDelta: {x: 426, y: 156} + m_AnchoredPosition: {x: 0, y: 329} + m_SizeDelta: {x: 300, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4819382220317122805 CanvasRenderer: @@ -9559,7 +9559,7 @@ GameObject: - component: {fileID: 4149514768841771133} - component: {fileID: 524946974942621810} m_Layer: 0 - m_Name: Text (1) + m_Name: Text2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -9581,8 +9581,8 @@ 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: 28.000046, y: -58.00006} - m_SizeDelta: {x: 544, y: 100} + m_AnchoredPosition: {x: 30, y: -55} + m_SizeDelta: {x: 580, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4149514768841771133 CanvasRenderer: @@ -9614,7 +9614,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 45 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -9625,7 +9625,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u540C\u65F6\u6BCF\u65E5\u53EF\u4F7F\u75285\u6B21\u5EFA\u7B51\u5347\u7EA7\u65F6\u95F4\u51CF\u5C114\u5C0F\u65F6" + m_Text: "\u6BCF\u65E5\u53EF\u4F7F\u7528\u4E94\u6B21\u7279\u6743\u52A0\u901F\u529F\u80FD\uFF0C\u6BCF\u6B21\u53EF\u51CF\u5C118\u5C0F\u65F6\u5EFA\u7B51\u5347\u7EA7\u65F6\u95F4" LanguageIndex: 0 --- !u!1 &6801012276133451019 GameObject: @@ -10685,7 +10685,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: -2, y: -186} + m_AnchoredPosition: {x: 0, y: -210} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8020962734115850758 @@ -10729,7 +10729,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\uFF08\u6709\u6548\u671F30\u5929\uFF09" + m_Text: "\u8D2D\u4E70\u540E\u6301\u7EED30\u5929" LanguageIndex: 0 --- !u!1 &7942875573937137814 GameObject: @@ -11655,8 +11655,8 @@ 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: -365.49994, y: -49.99991} - m_SizeDelta: {x: 66, y: 66} + m_AnchoredPosition: {x: -365.49994, y: -55} + m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2303498788986278824 CanvasRenderer: @@ -11867,7 +11867,7 @@ GameObject: - component: {fileID: 2451691092330900829} - component: {fileID: 9185745036492419438} m_Layer: 0 - m_Name: Text + m_Name: Text1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -11889,8 +11889,8 @@ 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: 28, y: 99} - m_SizeDelta: {x: 544, y: 100} + m_AnchoredPosition: {x: 30, y: 100} + m_SizeDelta: {x: 580, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2451691092330900829 CanvasRenderer: @@ -11922,7 +11922,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 45 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -11933,7 +11933,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u6D6E\u751F\u95E8\u5404\u4EA7\u51FA\u5EFA\u7B51\u4EA7\u91CF\u589E\u52A020%" + m_Text: "\u6D6E\u751F\u95E8\u5404\u8D44\u6E90\u5EFA\u7B51\uFF08\u7389\u6E05\u5C45\u3001\u7948\u798F\u658B\u3001\u671B\u6708\u5C45\uFF09\u4EA7\u91CF\u589E\u52A020%" LanguageIndex: 0 --- !u!1 &9055556018580535638 GameObject: diff --git a/Assets/ManagedResources/Prefabs/UI/HomeLand/HomeLandPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HomeLand/HomeLandPanel.prefab index e9dd797925..b446563d94 100644 --- a/Assets/ManagedResources/Prefabs/UI/HomeLand/HomeLandPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HomeLand/HomeLandPanel.prefab @@ -10859,7 +10859,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: -17.330011, y: 3.7} + m_AnchoredPosition: {x: 64.4, y: 3.7} m_SizeDelta: {x: 100, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6283366137360073919 @@ -10897,7 +10897,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 50 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 5a43058e89..4544b09f6e 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1869,6 +1869,7 @@ HELP_TYPE = { LingMaiMiJing = 116,--灵脉秘境 Gem = 121,--命格 jingjishilian = 122, + HomeLand = 126, } NumToComplexFont = { diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandPrivilege.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandPrivilege.lua index f8a25a9cb3..b79b26816d 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandPrivilege.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_HomeLandPrivilege.lua @@ -16,6 +16,8 @@ function this:InitComponent(gameObject) this.leftTime = Util.GetGameObject(gameObject,"leftTime"):GetComponent("Text") this.btn = Util.GetGameObject(gameObject,"Content/BtnDo") this.btnText = Util.GetGameObject(gameObject,"Content/BtnDo/Text"):GetComponent("Text") + this.text1 = Util.GetGameObject(gameObject,"Content/Text1"):GetComponent("Text") + this.text2 = Util.GetGameObject(gameObject,"Content/Text2"):GetComponent("Text") end function this:BindEvent() @@ -48,8 +50,11 @@ end function this:Refresh() - this.leftTime.text = "(有效时间30天)" - this.btnText.text = string.format("%s元激活特权",price) + this.text1.text = "浮生门各资源建筑(玉清居、祈福斋、望月居)产量增加20%" + this.text2.text = "每日可使用五次特权加速功能,每次可减少8小时建筑升级时间" + + this.leftTime.text = "购买后持续30天" + this.btnText.text = string.format("%s元",price) Util.SetGray(this.btn,false) this.btn:GetComponent("Button").enabled = true local data = PrivilegeManager.GetSerData(4022) @@ -64,10 +69,10 @@ function this:Refresh() this.timer = nil end local leftTime = data.endTime - GetTimeStamp() - this.leftTime.text = string.format("(剩余时间%s)",TimeToD(leftTime)) + this.leftTime.text = string.format("剩余%s天",TimeToD(leftTime)) this.timer = Timer.New(function () leftTime = leftTime - 1 - this.leftTime.text = string.format("(剩余时间%s)",TimeToD(leftTime)) + this.leftTime.text = string.format("剩余%s天",TimeToD(leftTime)) end,1,-1) this.timer:Start() end diff --git a/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandManager.lua b/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandManager.lua index ca561025ed..88fd37ea2d 100644 --- a/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandManager.lua @@ -244,7 +244,7 @@ function this.singleUpgrade(id) elseif HomeLand[id].UnlockLevel[1] == 2 and HomeLandManager.BuildData[5].level < HomeLand[id].UnlockLevel[2] then elseif HomeLand[id].UnlockLevel[1] == 3 and PlayerManager.level < GlobalSystemConfig[HomeLand[id].UnlockLevel[2]].OpenRules[2] then else - if BagManager.GetTotalItemNum(data.Cost[1][1]) >= data.Cost[1][2] then--所需材料够 + if data.Cost and BagManager.GetTotalItemNum(data.Cost[1][1]) >= data.Cost[1][2] then--所需材料够 if not data.Rule or (this.BuildData[data.Rule[1]].level >= data.Rule[2]) then--到达升级条件 if this.BuildData[id].endTime <= GetTimeStamp() then return true diff --git a/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandPanel.lua b/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandPanel.lua index ea09277914..9512525446 100644 --- a/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandPanel.lua @@ -93,7 +93,7 @@ function HomeLand:BindEvent() end) --帮助按钮 Util.AddClick(self.helpBtn, function() - UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.Practice, self.helpPosition.x,self.helpPosition.y) + UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.HomeLand, self.helpPosition.x,self.helpPosition.y) end) Util.AddClick(self.Bg, function() self.curSelect = 0 @@ -407,6 +407,7 @@ function HomeLand:SetBuildsState() -- PlayUIAnim(curObj.upgradeImg) else--如果没有就是可以点击升级 if data.dataSingle.Cost then + LogGreen("Name:"..tostring(data.dataSingle.Name).." cost:"..tostring(data.dataSingle.Cost[1][1]).."#"..data.dataSingle.Cost[1][2]) curObj.btnUpgrade:SetActive(true) end end