From e7803d68c80e59d9d51e2b4b541196e709b50755 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 18 Mar 2021 12:01:35 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=80=8D=E9=81=A5boss=20=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua index d4a12b2086..fa9fbbd6ed 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua @@ -195,6 +195,8 @@ function XiaoYaoLuckyBossPopup:SetSelectHero(monsterData) Util.GetGameObject(this.e_fightBtn,"layout/num"):GetComponent("Text").text = "" .. costNum .. "" end else + costId = 16 + costNum = 0 Util.GetGameObject(this.e_fightBtn,"Text").gameObject:SetActive(true) Util.GetGameObject(this.e_fightBtn,"layout").gameObject:SetActive(false) end From 811594ef576646cc5262ef1c8f857e5d6a92151f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 18 Mar 2021 12:03:51 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E3=80=90bug=E3=80=91=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E5=88=97=E8=A1=A8=E4=B8=8D=E8=83=BD=E6=BB=91?= =?UTF-8?q?=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GoodFriend/GoodFriendMainPanel.lua | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua index 688c0e8011..0bebe5e8da 100644 --- a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendMainPanel.lua @@ -227,10 +227,10 @@ function GoodFriendMainPanel:OnShow() this.roleImage2:SetActive(false) this.roleImage3:SetActive(false) this.roleImage4:SetActive(false) - this:FriendListDataShow(true,true) - this:FriendApplicationDataShow(true,true) - this:FriendSearchDataShow(true,true) - this:BlackListDataShow(true,true) + -- this:FriendListDataShow(true,true) + -- this:FriendApplicationDataShow(true,true) + -- this:FriendSearchDataShow(true,true) + -- this:BlackListDataShow(true,true) this.isInRecommendPage = true this:OnRefreshData() this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.GoodFriend }) @@ -336,7 +336,8 @@ function GoodFriendMainPanel:OnDestroy() end --好友列表循环滚动数据 -function GoodFriendMainPanel:FriendListDataShow(isTop,isAni) +function GoodFriendMainPanel:FriendListDataShow() + LogYellow("GoodFriendMainPanel:FriendListDataShow") CheckRedPointStatus(RedPointType.Friend_GetAllReward) this:OnRefreshData() local list = {} @@ -369,7 +370,7 @@ function GoodFriendMainPanel:FriendListDataShow(isTop,isAni) -- else -- item.gameObject:SetActive(true) -- end - end,not isTop,not isAni) + end) if isPlayAnim then SecTorPlayAnimByScroll(this.ScrollView1) isPlayAnim = false @@ -378,7 +379,7 @@ function GoodFriendMainPanel:FriendListDataShow(isTop,isAni) this.haveGetRewardNumText.text=Language[10810]..(GoodFriendManager.MaxEnergy-GoodFriendManager.MaxEnergyGet).."/"..GoodFriendManager.MaxEnergy end --好友申请循环滚动数据 -function GoodFriendMainPanel:FriendApplicationDataShow(isTop,isAni) +function GoodFriendMainPanel:FriendApplicationDataShow() -- 检测红点 CheckRedPointStatus(RedPointType.Friend_Application) this:OnRefreshData() @@ -416,7 +417,7 @@ function GoodFriendMainPanel:FriendApplicationDataShow(isTop,isAni) -- else -- item.gameObject:SetActive(true) -- end - end,not isTop,not isAni) + end) if isPlayAnim then SecTorPlayAnimByScroll(this.ScrollView2) isPlayAnim = false @@ -424,8 +425,7 @@ function GoodFriendMainPanel:FriendApplicationDataShow(isTop,isAni) end --好友搜索循环滚动数据 -function GoodFriendMainPanel:FriendSearchDataShow(isTop,isAni) -LogRed("isTop "..tostring(isTop).." isAni "..tostring(isAni)) +function GoodFriendMainPanel:FriendSearchDataShow() this:OnRefreshData() local list = {} local j = 1 @@ -457,7 +457,7 @@ LogRed("isTop "..tostring(isTop).." isAni "..tostring(isAni) -- else -- item.gameObject:SetActive(true) -- end - end,not isTop,not isAni) + end) if isPlayAnim then SecTorPlayAnimByScroll(this.ScrollView3) isPlayAnim = false @@ -465,7 +465,7 @@ LogRed("isTop "..tostring(isTop).." isAni "..tostring(isAni) end --黑名单滚动数据 -function GoodFriendMainPanel:BlackListDataShow(isTop,isAni) +function GoodFriendMainPanel:BlackListDataShow() this:OnRefreshData() local list = {} local j = 1 @@ -497,7 +497,7 @@ function GoodFriendMainPanel:BlackListDataShow(isTop,isAni) -- else -- item.gameObject:SetActive(true) -- end - end,not isTop,not isAni) + end) if isPlayAnim then SecTorPlayAnimByScroll(this.ScrollView4) isPlayAnim = false From 69be522af0180400c91232f834d6b579eb59370b Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 18 Mar 2021 12:04:21 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91serverc?= =?UTF-8?q?onfig=E6=89=93=E5=8D=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Framework/Manager/ServerConfigManager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua index 702ad1bb4d..1f102697f1 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua @@ -55,7 +55,7 @@ function ServerConfigManager.GetConfigInfo(key) ConfigMgr=App.ConfigMgr end local s = ConfigMgr:GetConfigInfo(key) - LogError(key.."|"..tostring(s)) + LogYellow(key.."|"..tostring(s)) return s end end From 5e423f2ebe81fd6abc3ef750a5b3fef6e565c8a2 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 18 Mar 2021 13:36:01 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E3=80=91?= =?UTF-8?q?=E7=81=B5=E5=85=BD=E5=85=A5=E5=8F=A3=E9=9A=8F=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=BE=E9=9A=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index bb5ca2aaaa..d4623a7aa0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -221,6 +221,7 @@ function this:InitComponent() this.btnFunHide[FUNCTION_OPEN_TYPE.GOODFRIEND] = this.btnFriend this.btnFunHide[FUNCTION_OPEN_TYPE.ALLRANKING] = this.btnRank this.btnFunHide[FUNCTION_OPEN_TYPE.HongMengZhen] = this.btnHongMeng + this.btnFunHide[FUNCTION_OPEN_TYPE.POKEMON] = this.btnPokemon this.animRoot = Util.GetGameObject(self.gameObject, "scene") --挑战关卡快速升级提示 From a01f1024ec84d2a1023767584c0fee701b63a420 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 18 Mar 2021 13:47:03 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E6=8C=82=E6=9C=BA=E5=A5=96=E5=8A=B1=E6=8F=90=E5=8D=87=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index aeaaa8e6b2..f73b19b985 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -2807,7 +2807,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: -0.8, y: -16} + m_AnchoredPosition: {x: 0, y: 27.050003} m_SizeDelta: {x: 892.3, y: 366} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6391502736252782631 From 0f8f51ededb8528804f357ef34b08c3f0388bec8 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 18 Mar 2021 14:02:16 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E3=80=90bug=E3=80=91=E6=AD=A6=E5=B0=86?= =?UTF-8?q?=E2=80=94>=E7=A5=9E=E5=B0=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab index fa2e18c6f0..beec3443c2 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab @@ -8306,7 +8306,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u91D1\u5E01 \u6B66\u5C06\u7ECF\u9A8C \u5524\u5143\u795E\u7B26 \u795E\u79D8\u795E\u5C06 + m_Text: "\u91D1\u5E01 \u795E\u5C06\u7ECF\u9A8C \u5524\u5143\u795E\u7B26 \u795E\u79D8\u795E\u5C06 \u795E\u79D8\u9B42\u5370" LanguageIndex: 0 --- !u!1 &3624098227883809207