From 4b1f021ac05512a9cb797505c769657aa5acd0d5 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 8 Apr 2021 10:18:24 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E3=80=90=E7=B4=AF=E8=AE=A1=E5=85=85?= =?UTF-8?q?=E5=80=BC=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/DynamicActicity/page6.prefab | 138 +++++++++++------- .../DynamicActivity/LeiJiChongZhiPage.lua | 31 +++- 2 files changed, 109 insertions(+), 60 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page6.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page6.prefab index 4379f1194e..f45d08e160 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page6.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page6.prefab @@ -32,10 +32,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 97, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3941559009706528494 CanvasRenderer: @@ -166,6 +166,7 @@ GameObject: - component: {fileID: 7274797596699487935} - component: {fileID: 2978873796253663799} - component: {fileID: 6627844666565400459} + - component: {fileID: 4109646213380972614} m_Layer: 5 m_Name: title m_TagString: Untagged @@ -190,7 +191,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 38} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2978873796253663799 CanvasRenderer: @@ -235,6 +236,20 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u7D2F\u8BA1\u5145\u503C" LanguageIndex: 0 +--- !u!114 &4109646213380972614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 967231457933728231} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 --- !u!1 &1298752840175255388 GameObject: m_ObjectHideFlags: 0 @@ -420,10 +435,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 118, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4755428599246343356 CanvasRenderer: @@ -500,10 +515,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 55, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6275955706316199721 CanvasRenderer: @@ -1133,10 +1148,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 160, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5818617628848707151 CanvasRenderer: @@ -1515,10 +1530,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 181, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6372460139430684745 CanvasRenderer: @@ -1580,7 +1595,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3426774782456427134 RectTransform: m_ObjectHideFlags: 0 @@ -1605,10 +1620,10 @@ RectTransform: m_Father: {fileID: 3129617478986272255} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 140, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140, y: -23} + m_SizeDelta: {x: 215, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!114 &4351184615061623245 MonoBehaviour: @@ -1789,7 +1804,7 @@ MonoBehaviour: m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 + m_ChildControlWidth: 0 m_ChildControlHeight: 0 --- !u!114 &748923441709940500 MonoBehaviour: @@ -1949,10 +1964,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 34, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6326068208291493611 CanvasRenderer: @@ -2029,10 +2044,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 139, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6782556990393610046 CanvasRenderer: @@ -2110,10 +2125,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 13, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 13, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1815451018577670510 CanvasRenderer: @@ -2264,7 +2279,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2703654448420865930 RectTransform: m_ObjectHideFlags: 0 @@ -2279,10 +2294,10 @@ RectTransform: m_Father: {fileID: 3129617478986272255} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 355, y: 0} - m_SizeDelta: {x: 0, y: 46} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140, y: -23} + m_SizeDelta: {x: 46, y: 46} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1556712413964630940 CanvasRenderer: @@ -2367,10 +2382,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 202, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6134787424522773605 CanvasRenderer: @@ -2426,6 +2441,7 @@ GameObject: - component: {fileID: 3642677507929918682} - component: {fileID: 6775805915567472362} - component: {fileID: 4118452696578278927} + - component: {fileID: 7499745113206552175} m_Layer: 5 m_Name: progress m_TagString: Untagged @@ -2449,8 +2465,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 38} + m_AnchoredPosition: {x: 140, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6775805915567472362 CanvasRenderer: @@ -2495,6 +2511,20 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u53EF\u9886\u53D6(1920/2000)" LanguageIndex: 0 +--- !u!114 &7499745113206552175 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8631154221814438210} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 --- !u!1 &8649703854654293368 GameObject: m_ObjectHideFlags: 0 @@ -2527,10 +2557,10 @@ RectTransform: m_Father: {fileID: 3426774782456427134} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 76, y: -20} + m_SizeDelta: {x: 46, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2726567246643373228 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua index 42c33e7540..3c632c2d8c 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua @@ -1,6 +1,7 @@ local LeiJiChongZhiPage = quick_class("LeiJiChongZhiPage") local allData={} local itemsGrid = {}--item重复利用 +local moneyGrid = {}--moneyview重复利用 local this=LeiJiChongZhiPage local parent local endtime = 0 @@ -135,12 +136,22 @@ function this.SingleDataShow(pre,value) local activityRewardGo = pre activityRewardGo:SetActive(true) local sConFigData = value - local numTextPre = Util.GetGameObject(pre, "context/NumTextPre") - local numList = {} - for i = 1, numTextPre.transform.childCount do - table.insert(numList,numTextPre.transform:GetChild(i-1):GetComponent("Text")) - end - CreatNumberPrefab(tostring(sConFigData.value),numList) + Util.GetGameObject(pre, "context/NumTextPre").gameObject:SetActive(false) + Util.GetGameObject(pre, "context/price").gameObject:SetActive(false) + -- local numTextPre = Util.GetGameObject(pre, "context/NumTextPre") + -- local numList = {} + -- for i = 1, numTextPre.transform.childCount do + -- table.insert(numList,numTextPre.transform:GetChild(i-1):GetComponent("Text")) + -- end + -- CreatNumberPrefab(tostring(sConFigData.value),numList) + pre.gameObject:SetActive(true) + if not moneyGrid[pre] then + moneyGrid[pre] = SubUIManager.Open(SubUIConfig.MoneyNumView, Util.GetGameObject(pre, "context").transform, + sConFigData.value, MoneyNumViewType.Image_Horizontal, "ArtFont_1_cfont", 42, 1, Vector2.New(46, 46), Vector2.New(0, -25), MoneyNumViewImageType.Small_1) + end + moneyGrid[pre]:SetNum(sConFigData.value) + moneyGrid[pre]:SetOffsetPosition(Vector2.New(0, 0)) + moneyGrid[pre].transform:SetSiblingIndex(2) -- num.text = sConFigData.value -- this:NumToNum(num, sConFigData.value) -- num.text = sConFigData.value @@ -232,6 +243,14 @@ function LeiJiChongZhiPage:OnDestroy() sortingOrder = 0 allData={} itemsGrid = {} + if moneyGrid and LengthOfTable(moneyGrid) > 0 then + for key, value in pairs(moneyGrid) do + if value then + SubUIManager.Close(value) + value = nil + end + end + end end function LeiJiChongZhiPage:OnHide() From 972e585d8a0ab0670440b824e41c607c88b9deb9 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 8 Apr 2021 11:08:54 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E3=80=90300=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Operating/ContinuityRechargePage.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargePage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargePage.lua index 03d4ebd609..d4b7e48c8a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargePage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargePage.lua @@ -33,7 +33,7 @@ function ContinuityRechargePage:ctor(mainPanel, gameObject) if not self.moneyNum then self.moneyNum = SubUIManager.Open(SubUIConfig.MoneyNumView, self.image.transform, - MoneyUtil.GetMoney(2000), MoneyNumViewType.Image_Horizontal, "ArtFont_2_cfont", 42, 0.7, Vector2.New(118, 161), Vector2.New(-30, -50), MoneyNumViewImageType.Big_1) + math.round(MoneyUtil.GetMoney(2000)) , MoneyNumViewType.Image_Horizontal, "ArtFont_2_cfont", 42, 0.7, Vector2.New(118, 161), Vector2.New(-30, -50), MoneyNumViewImageType.Big_1) self.moneyNum:SetOffsetPosition(Vector2.New(0, -450)) end From 8e7537a761b8d4797d807ab2347bd21fc73c89e6 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 8 Apr 2021 11:47:22 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E3=80=90=E9=A6=96=E5=86=B2=E3=80=91?= =?UTF-8?q?=E9=92=B1=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/FirstRecharge/FirstRechargePanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua index 30fe81265e..34f6e11173 100644 --- a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua @@ -181,7 +181,7 @@ function FirstRechargePanel:OnTabChanged(index) end for i, title in ipairs(self.tabTitles) do title.color = i == index and TextColorDef[2] or TextColorDef[1] - title.text = string.format(Language[12281], MoneyUtil.GetMoneyUnitNameWithMoney(IndexValueDef[MoneyUtil.MT][i])) + title.text = string.format(Language[12281], string.format(MoneyUtil.GetMoneyUnitName(),IndexValueDef[MoneyUtil.MT][i])) end self.stageImage6.gameObject:SetActive(index == 1) self.stageImage100.gameObject:SetActive(index == 2) From 45bb99f9c71b29b1d24581fa8f770c2f9dc33c29 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 8 Apr 2021 12:00:50 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E3=80=90=E5=85=AC=E4=BC=9A=E3=80=91?= =?UTF-8?q?=E5=85=AC=E4=BC=9A=E7=BA=A2=E5=8C=85=E5=85=AC=E5=91=8A=E4=B8=8D?= =?UTF-8?q?=E4=BC=9A=E9=9A=8F=E8=AF=AD=E8=A8=80=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua index dd47490893..f54b12ea2e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua @@ -470,7 +470,7 @@ function this.RequestSendRedPacket(curIndex,func) "%d#%s#%s",--"%d#%d#%d#%s#%d#%d|", GLOBAL_CHAT_TYPE.GUILD_REDPACKET, PlayerManager.nickName, - GetLanguageStrById(redpack.Name) + redpack.Name ) -- 发送消息 From b206d79a68f4e70b682c47374d72dc8492f68d81 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 8 Apr 2021 14:15:04 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E3=80=90=E7=AB=9E=E6=8A=80=E5=AE=88?= =?UTF-8?q?=E5=8D=AB=E3=80=91=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/functions.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 9d668120a0..f4bbc0f517 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1882,12 +1882,12 @@ function JingJiShouWeiToEn(_str) if not _str or _str == "" then return "" end - LogGreen("input _str:".._str) - if _str == Language[12230] then - return GetLanguageStrById(_str) - end - LogGreen("return str:".._str) - return _str + -- LogGreen("input _str:".._str) + -- if _str == Language[12230] then + return GetLanguageStrById(_str) + -- end + -- LogGreen("return str:".._str) + -- return _str end -- 忽略字符串头部的空白字符 From adc2d56559504ffc5608a9b2cb1d3b2e940fe462 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 8 Apr 2021 14:44:08 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E3=80=90=E8=87=AA=E9=80=89=E7=AE=B1?= =?UTF-8?q?=E3=80=91=E9=81=AE=E7=9B=96=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/RewardBox/RewardBoxPanel.prefab | 126 ++++++++++-------- .../~Lua/Modules/RewardBox/RewardBoxPanel.lua | 28 ++-- 2 files changed, 81 insertions(+), 73 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab index 48178fb2a0..f5e26c413f 100644 --- a/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab @@ -416,17 +416,18 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 637834703727152052} - {fileID: 7517760599986904646} - {fileID: 5270166641082040520} - {fileID: 5905118992494067694} - {fileID: 6226173992747795047} m_Father: {fileID: 1759585470645775885} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1000, y: 106.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6247518587750639663 MonoBehaviour: @@ -595,10 +596,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 5015516532085505041} - {fileID: 5829916578949271985} - {fileID: 5507831709790327530} m_Father: {fileID: 3370490708620513293} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -636,7 +638,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8126913021008556213} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -792,16 +794,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2054878914328124516} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_Children: [] - m_Father: {fileID: 6511887680599684502} - m_RootOrder: 2 + m_Father: {fileID: 1759585470645775885} + m_RootOrder: 0 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: 468} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 873, y: 9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4519970242043103155 @@ -1148,9 +1150,9 @@ RectTransform: m_Father: {fileID: 637834703727152052} m_RootOrder: 0 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: -311.6, y: 1} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 135, y: -50} m_SizeDelta: {x: 130, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4469237718377244165 @@ -1350,7 +1352,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1759585470645775885} - - component: {fileID: 8667020804098659826} + - component: {fileID: 5295426865880325664} m_Layer: 5 m_Name: topBar m_TagString: Untagged @@ -1369,17 +1371,19 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 309584511185322528} - {fileID: 4747820371664025850} - {fileID: 8126913021008556213} + - {fileID: 152542477848530146} m_Father: {fileID: 3370490708620513293} - m_RootOrder: 2 + m_RootOrder: 1 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: 3.125, y: 510} + m_AnchoredPosition: {x: 3.125, y: 498} m_SizeDelta: {x: 1000, y: 150} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8667020804098659826 +--- !u!114 &5295426865880325664 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1388,7 +1392,7 @@ MonoBehaviour: m_GameObject: {fileID: 3210126133790844263} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Padding: @@ -1396,13 +1400,12 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 4 - m_StartCorner: 0 - m_StartAxis: 1 - m_CellSize: {x: 1000, y: 70} - m_Spacing: {x: 0, y: 0} - m_Constraint: 0 - m_ConstraintCount: 2 + m_ChildAlignment: 1 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &3618873862045003760 GameObject: m_ObjectHideFlags: 0 @@ -1434,7 +1437,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8126913021008556213} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1550,12 +1553,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1759585470645775885} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1000, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4460466962581947724 CanvasRenderer: @@ -1633,7 +1636,7 @@ RectTransform: m_Children: - {fileID: 3822487912886530788} m_Father: {fileID: 4236749662161848168} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1763,16 +1766,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4001342544747786228} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_Children: [] - m_Father: {fileID: 6511887680599684502} - m_RootOrder: 4 + m_Father: {fileID: 1759585470645775885} + m_RootOrder: 3 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: 619} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 873, y: 9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5090162482616603168 @@ -1845,7 +1848,7 @@ RectTransform: - {fileID: 4573148065754767848} - {fileID: 8488049129122355319} m_Father: {fileID: 4236749662161848168} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2006,7 +2009,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8126913021008556213} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2492,7 +2495,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8126913021008556213} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2610,12 +2613,12 @@ RectTransform: m_Children: - {fileID: 773274248527752682} m_Father: {fileID: 3370490708620513293} - m_RootOrder: 3 + m_RootOrder: 2 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: 415.5} - m_SizeDelta: {x: 934, y: 879.9} + m_AnchoredPosition: {x: 0, y: 376.9} + m_SizeDelta: {x: 934, y: 841.3} m_Pivot: {x: 0.5, y: 1} --- !u!222 &949843400318720597 CanvasRenderer: @@ -2765,16 +2768,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6081017597432231517} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_Children: [] - m_Father: {fileID: 6511887680599684502} - m_RootOrder: 3 + m_Father: {fileID: 4236749662161848168} + m_RootOrder: 0 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: -418.7} + m_AnchoredPosition: {x: 0, y: 141.40002} m_SizeDelta: {x: 873, y: 9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1762291241638071745 @@ -2924,9 +2927,6 @@ RectTransform: m_Children: - {fileID: 7958799936517173215} - {fileID: 6759450002509949190} - - {fileID: 309584511185322528} - - {fileID: 5015516532085505041} - - {fileID: 152542477848530146} m_Father: {fileID: 3370490708620513293} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3003,7 +3003,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6511887680599684502} - - {fileID: 637834703727152052} - {fileID: 1759585470645775885} - {fileID: 4197229008271411681} - {fileID: 4236749662161848168} @@ -3316,6 +3315,7 @@ GameObject: - component: {fileID: 637834703727152052} - component: {fileID: 2328468656031041480} - component: {fileID: 3532038031257137951} + - component: {fileID: 2586843587707289929} m_Layer: 5 m_Name: di m_TagString: Untagged @@ -3330,17 +3330,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7641199780265015042} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_Children: - {fileID: 5247935428401062656} - m_Father: {fileID: 3370490708620513293} - m_RootOrder: 1 + m_Father: {fileID: 8126913021008556213} + m_RootOrder: 0 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: 473} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 900, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2328468656031041480 @@ -3380,6 +3380,26 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &2586843587707289929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7641199780265015042} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &9122350590757992458 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua index 8e826e5a67..1f6d3d0091 100644 --- a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua @@ -29,8 +29,8 @@ function RewardBoxPanel:InitComponent() this.name = Util.GetGameObject(this.gameObject,"bg/bg/name"):GetComponent("Text") this.tip = Util.GetGameObject(this.gameObject,"bg/topBar/tip") this.selectBar = Util.GetGameObject(this.gameObject,"bg/topBar/selectBar") - this.selectBtn = Util.GetGameObject(this.gameObject,"bg/di/selectBtn") - this.di = Util.GetGameObject(this.gameObject,"bg/di") + this.selectBtn = Util.GetGameObject(this.gameObject,"bg/topBar/selectBar/di/selectBtn") + this.di = Util.GetGameObject(this.gameObject,"bg/topBar/selectBar/di") this.slider = Util.GetGameObject(this.gameObject,"bg/bottomBar/slider") this.Slider = Util.GetGameObject(this.gameObject,"bg/bottomBar/slider/Slider") this.btnReduce = Util.GetGameObject(this.gameObject,"bg/bottomBar/slider/btnReduce") @@ -49,7 +49,7 @@ function RewardBoxPanel:InitComponent() this.ScrollView.moveTween.Strength = 2 this.selectList ={} - for n = 0, this.selectBar.transform.childCount-1 do--设置当前页签 + for n = 1, this.selectBar.transform.childCount-1 do--设置当前页签 table.insert(this.selectList,this.selectBar.transform:GetChild(n).gameObject) end end @@ -114,11 +114,9 @@ function RewardBoxPanel:OnOpen(...) this.rewardGroup = itemConfig[data[2]].RewardGroup this.itemId = itemConfig[data[2]].Id end - - this.scroll.gameObject:GetComponent("RectTransform").sizeDelta = #this.rewardGroup ~= 1 and Vector2.New(940, 880) or Vector2.New(940, 1000) - this.scroll.gameObject:GetComponent("RectTransform").anchoredPosition = #this.rewardGroup ~= 1 and Vector2.New(0, 415) or Vector2.New(0, 542.6) - this.ScrollView.gameObject:GetComponent("RectTransform").sizeDelta = #this.rewardGroup ~= 1 and Vector2.New(940, 900) or Vector2.New(940, 1000) - Util.GetGameObject(this.gameObject,"bg/bg/huangtiao"):SetActive(#this.rewardGroup ~= 1) + this.scroll.gameObject:GetComponent("RectTransform").sizeDelta = #this.rewardGroup ~= 1 and Vector2.New(940, 836.8) or Vector2.New(940, 900) + this.scroll.gameObject:GetComponent("RectTransform").anchoredPosition = #this.rewardGroup ~= 1 and Vector2.New(0, 376) or Vector2.New(0, 444) + this.ScrollView.gameObject:GetComponent("RectTransform").sizeDelta = #this.rewardGroup ~= 1 and Vector2.New(940, 830) or Vector2.New(940, 900) end -- 打开,重新打开时回调 @@ -131,7 +129,8 @@ function RewardBoxPanel:OnShow() end function RewardBoxPanel:RefreshData() - RewardBoxPanel:SetTopBar() + this.selectBar:SetActive(#this.rewardGroup ~= 1)--设置顶部属性条 + this.tip:SetActive(BagManager.isBagPanel) RewardBoxPanel:SetGiftData() RewardBoxPanel:SetBottom() end @@ -194,17 +193,6 @@ function RewardBoxPanel:SetSingleGiftData(index,item,boxId,tagNum) end) end ---设置头部属性标签显示 -function RewardBoxPanel:SetTopBar() - this.selectBar:SetActive(#this.rewardGroup ~= 1)--设置顶部属性条 - this.di:SetActive(#this.rewardGroup ~= 1) - this.tip:SetActive(BagManager.isBagPanel) - this.di.transform.localPosition = Vector3.New(0, 473, 0) - if #this.rewardGroup ~= 1 and not BagManager.isBagPanel then - this.di.transform.localPosition = Vector3.New(0, 510, 0) - end -end - --设置底部滑动条 function RewardBoxPanel:SetBottom()--设置底部滑动条 this.num.text = 1 From cb5c940e251972835ed3b5d53b6c904dd6902d31 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 8 Apr 2021 14:53:36 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E3=80=90=E8=87=AA=E9=80=89=E5=AE=9D?= =?UTF-8?q?=E7=AE=B1=E3=80=91=E6=96=87=E5=AD=97=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/RewardBox/RewardBoxPanel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua index 1f6d3d0091..f2d345ac8e 100644 --- a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua @@ -27,7 +27,7 @@ function RewardBoxPanel:InitComponent() this.scroll = Util.GetGameObject(this.gameObject,"bg/scroll") this.itemPre = Util.GetGameObject(this.gameObject,"bg/scroll/itemPre2") this.name = Util.GetGameObject(this.gameObject,"bg/bg/name"):GetComponent("Text") - this.tip = Util.GetGameObject(this.gameObject,"bg/topBar/tip") + this.tip = Util.GetGameObject(this.gameObject,"bg/topBar/tip"):GetComponent("Text") this.selectBar = Util.GetGameObject(this.gameObject,"bg/topBar/selectBar") this.selectBtn = Util.GetGameObject(this.gameObject,"bg/topBar/selectBar/di/selectBtn") this.di = Util.GetGameObject(this.gameObject,"bg/topBar/selectBar/di") @@ -130,7 +130,7 @@ end function RewardBoxPanel:RefreshData() this.selectBar:SetActive(#this.rewardGroup ~= 1)--设置顶部属性条 - this.tip:SetActive(BagManager.isBagPanel) + this.tip.text = BagManager.isBagPanel and "请在以下道具中选择一种" or "以下道具中可选择一种" RewardBoxPanel:SetGiftData() RewardBoxPanel:SetBottom() end From da4270b99b1933489a06542ddb365ac99ada2e3b Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 8 Apr 2021 14:59:19 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E3=80=90=E5=85=AC=E4=BC=9A=E5=85=AC?= =?UTF-8?q?=E5=91=8A=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua index 9222935bf9..5c8815e74f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua @@ -196,7 +196,7 @@ function this.GuildItemAdapter(item, data) -- gName = SubString(gName, 5).."..." --end nameText.text = gName - announceText.text = guildData.annouce + announceText.text = GetLanguageStrById(guildData.annouce) head.sprite = Util.LoadSprite(GuildManager.GetLogoResName(guildData.icon)) local curGuildLevelInfo = ConfigManager.GetConfigData(ConfigName.GuildLevelConfig, guildData.levle) local maxMemNum = curGuildLevelInfo.Num diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua index e640f7f851..844ad486d3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua @@ -349,7 +349,7 @@ function this.RefreshBaseInfoShow() local masterInfo = MyGuildManager.GetMyGuildMasterInfo() this.guildName.text = guildData.name - this.guildAnnounce.text = guildData.annouce + this.guildAnnounce.text = GetLanguageStrById(guildData.annouce) this.guildLevel.text = curGuildlv..Language[10065] this.guildMaster.text = masterInfo.userName this.guildMember.text = string.format("(%s/%s)", guildData.totalNum, curGuildLevelInfo.Num) From 16db37cf29cb1f46fcc3c10d833acf74726a8398 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 8 Apr 2021 15:02:01 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E3=80=90=E8=87=AA=E9=80=89=E5=AE=9D?= =?UTF-8?q?=E7=AE=B1=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua index f2d345ac8e..020bbd680a 100644 --- a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua @@ -130,7 +130,7 @@ end function RewardBoxPanel:RefreshData() this.selectBar:SetActive(#this.rewardGroup ~= 1)--设置顶部属性条 - this.tip.text = BagManager.isBagPanel and "请在以下道具中选择一种" or "以下道具中可选择一种" + this.tip.text = BagManager.isBagPanel and GetLanguageStrById("请在以下道具中选择一种") or GetLanguageStrById("以下道具中可选择一种") RewardBoxPanel:SetGiftData() RewardBoxPanel:SetBottom() end From 89c81798400e614bebfd5d89948ac3fb2ed9b736 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 8 Apr 2021 15:36:27 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E3=80=90=E8=87=AA=E9=80=89=E5=AE=9D?= =?UTF-8?q?=E7=AE=B1=E3=80=91=E8=BF=98=E6=98=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/RewardBox/RewardBoxPanel.prefab | 27 ++++++++++++-- .../~Lua/Modules/RewardBox/RewardBoxPanel.lua | 36 +++++++++++-------- 2 files changed, 45 insertions(+), 18 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab index f5e26c413f..3646502d12 100644 --- a/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab @@ -1129,6 +1129,7 @@ GameObject: - component: {fileID: 5247935428401062656} - component: {fileID: 4469237718377244165} - component: {fileID: 8598351590046701246} + - component: {fileID: 5041373642146469403} m_Layer: 5 m_Name: selectBtn m_TagString: Untagged @@ -1150,9 +1151,9 @@ RectTransform: m_Father: {fileID: 637834703727152052} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 135, y: -50} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -315, y: 0} m_SizeDelta: {x: 130, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4469237718377244165 @@ -1192,6 +1193,26 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &5041373642146469403 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2749384115574582686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &2790987625313459491 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua index 020bbd680a..94eefb007c 100644 --- a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua @@ -47,11 +47,6 @@ function RewardBoxPanel:InitComponent() this.ScrollView.gameObject:GetComponent("RectTransform").pivot = Vector2.New(0.5, 0.5) this.ScrollView.moveTween.MomentumAmount = 1 this.ScrollView.moveTween.Strength = 2 - - this.selectList ={} - for n = 1, this.selectBar.transform.childCount-1 do--设置当前页签 - table.insert(this.selectList,this.selectBar.transform:GetChild(n).gameObject) - end end --绑定事件(用于子类重写) function RewardBoxPanel:BindEvent() @@ -83,16 +78,6 @@ function RewardBoxPanel:BindEvent() Util.AddClick(this.btnOk, function() this:ClosePanel() end) - for i = 1, #this.selectList do - Util.AddClick(this.selectList[i],function() - curId = 0 - tagNum = i - RewardBoxPanel:SetGiftData() - this.selectBtn.transform:SetParent(this.selectList[i].transform) - this.selectBtn.transform.localPosition = Vector3.zero - this.selectBtn.transform.localScale = Vector3.one - end) - end end --添加事件监听(用于子类重写) @@ -117,6 +102,25 @@ function RewardBoxPanel:OnOpen(...) this.scroll.gameObject:GetComponent("RectTransform").sizeDelta = #this.rewardGroup ~= 1 and Vector2.New(940, 836.8) or Vector2.New(940, 900) this.scroll.gameObject:GetComponent("RectTransform").anchoredPosition = #this.rewardGroup ~= 1 and Vector2.New(0, 376) or Vector2.New(0, 444) this.ScrollView.gameObject:GetComponent("RectTransform").sizeDelta = #this.rewardGroup ~= 1 and Vector2.New(940, 830) or Vector2.New(940, 900) + + this.selectList ={} + for n = 1, this.selectBar.transform.childCount-1 do--设置当前页签 + table.insert(this.selectList,this.selectBar.transform:GetChild(n).gameObject) + end + this.selectBtn.transform:SetParent(this.selectList[1].transform) + this.selectBtn.transform.localPosition = Vector3.zero + this.selectBtn.transform.localScale = Vector3.one + for i = 1, #this.selectList do + Util.AddOnceClick(this.selectList[i],function() + curId = 0 + tagNum = i + RewardBoxPanel:SetGiftData() + this.selectBtn.transform:SetParent(this.selectList[i].transform) + this.selectBtn.transform.localPosition = Vector3.zero + this.selectBtn.transform.localScale = Vector3.one + end) + end + end -- 打开,重新打开时回调 @@ -238,6 +242,7 @@ end --界面关闭时调用(用于子类重写) function RewardBoxPanel:OnClose() + this.selectList ={} curNum = 1 this.selectBtn.transform.parent = this.selectBar.transform:GetChild(0).transform this.selectBtn.transform.localPosition = Vector3.zero @@ -246,6 +251,7 @@ end --界面销毁时调用(用于子类重写) function RewardBoxPanel:OnDestroy() + this.selectList ={} itemIconList={} goList = {} end From fa8e10ed9c6fed1a4af27657801cb11ff4f634b5 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 8 Apr 2021 16:58:39 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E3=80=90=E5=A4=A7=E9=97=B9=E5=A4=A9?= =?UTF-8?q?=E5=AE=AB=E3=80=91=E8=B5=9B=E5=AD=A3=E9=87=8D=E7=BD=AE=E6=98=AF?= =?UTF-8?q?=E5=9C=A3=E7=89=A9=E6=96=B0=E5=AD=97=E6=98=BE=E7=A4=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index 3fea243946..9838068ad9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -843,6 +843,7 @@ function this.ExpeditionResetIndication(buffer) PlayerPrefs.SetInt(PlayerManager.uid.."Expedition", 0) ExpeditionManager.SetExpeditionState(3) ExpeditionManager.expeditionLeve = 1 + ExpeditionManager.allSHoly = {} ExpeditionManager.InitExpeditionData(msg) ExpeditionManager.RefreshPanelShowByState() end