From 90fbe78773e1a9d3c7c4d336ae4e120e8018a2fb Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 26 Apr 2021 18:46:19 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E3=80=90=E7=A7=AF=E5=A4=A9=E8=B1=AA?= =?UTF-8?q?=E7=A4=BC=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/NewActivity/ConRechargePage.prefab | 4 ++-- .../~Lua/Modules/NewActivity/CommonActPageManager.lua | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/ConRechargePage.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/ConRechargePage.prefab index f81d2cebb1..6cac8b7e84 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/ConRechargePage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/ConRechargePage.prefab @@ -34,8 +34,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: -398.7} - m_SizeDelta: {x: 1040, y: 842.2} + m_AnchoredPosition: {x: 0, y: -375.7} + m_SizeDelta: {x: 1040, y: 796.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2720652094624033988 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index e8d2a0a146..9fd73cc795 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -108,14 +108,13 @@ function this.GetExpertData(indexType,actType) if curData.rewards[i].missionId == actRewardConfigs[j].Id then if indexType == 3 then -- 3 积天豪礼 curData.rewards[i].otherData.Values = actRewardConfigs[j].Values[1][2] - curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].otherData.Values,curData.rewards[i].otherData.Values) + curData.rewards[i].otherData.info = "" if curData.rewards[i].state == 1 then curData.rewards[i].otherData.state = 2 elseif curData.rewards[i].progress == 1 then curData.rewards[i].otherData.state = 0 else curData.rewards[i].otherData.state = 1 - curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].progress,curData.rewards[i].otherData.Values) end else --日累计充值 达人 if actType == ActivityTypeDef.AccumulativeRechargeExper then From ca9594fefcfa25f5acadcaab53b8c363fb53dbcf Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 26 Apr 2021 20:08:32 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E3=80=90=E8=B6=85=E5=80=BC=E5=9F=BA?= =?UTF-8?q?=E9=87=91=E3=80=91=E6=98=AF=E5=90=A6=E5=8F=AF=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Operating/UppperMonthCard.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index 930a2a583b..1125c1d405 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -170,7 +170,9 @@ end --- 根据是否购买了显示信息 function UpperMonthCard:SetBuyState() local isActive = VipManager.GetMonthCardOpenState() - local isBought = OperatingManager.IsBaseBuy(self.chargerBaseType) + -- local isBought = OperatingManager.IsBaseBuy(self.chargerBaseType) + local canBuyNum = OperatingManager.GetLeftBuyTime(self.chargerBaseType, self.baseType) + local isBought = canBuyNum and canBuyNum <= 0 self.boughtPanel:SetActive(isBought) self.buyPanel:SetActive(not isBought) Util.SetGray(self.btnBuy, not isActive) From 460ec366cbd9702765f3f16bb68bc34f6279e6da Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 26 Apr 2021 20:27:29 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E3=80=90=E7=A4=BC=E5=8C=85=E3=80=91?= =?UTF-8?q?=E5=8E=BB=E6=8E=89LevelLinit=20=E5=AD=97=E6=AE=B5=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/DynamicActivityManager.lua | 4 ++-- .../~Lua/Modules/Operating/OperatingManager.lua | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 63bda210c7..98e12ef19e 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -489,9 +489,9 @@ function this.GetGiftDataByType(ShopData) if ShopData[i][1] == DataType.Direct and RECHARGEABLE then local topspeedData = this.ResetShopData(OperatingManager.GetGiftGoodsInfoList(ShopData[i][2]), ShopData[i][3], ShopData[i][1]) for i = 1, #topspeedData do - if lv >= topspeedData[i].data.shopItemData.LevelLinit[1] and lv <= topspeedData[i].data.shopItemData.LevelLinit[2] then + -- if lv >= topspeedData[i].data.shopItemData.LevelLinit[1] and lv <= topspeedData[i].data.shopItemData.LevelLinit[2] then table.insert(shopData,topspeedData[i]) - end + -- end end elseif ShopData[i][1] == DataType.Shop then local topspeedData = this.ResetShopData(ShopManager.GetShopDataByType(ShopData[i][2]).storeItem, ShopData[i][2], ShopData[i][1]) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 39499a2b7e..7e3ce002f0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -141,7 +141,8 @@ function this.GetGiftGoodsInfoList(type) end local newGiftGoodsInfoList = {} for k,v in pairs(giftGoodsInfoList[type]) do - if rechargeConfig[v.goodsId] and PlayerManager.level >= rechargeConfig[v.goodsId].LevelLinit[1] and PlayerManager.level <= rechargeConfig[v.goodsId].LevelLinit[2] then + --and PlayerManager.level >= rechargeConfig[v.goodsId].LevelLinit[1] and PlayerManager.level <= rechargeConfig[v.goodsId].LevelLinit[2] + if rechargeConfig[v.goodsId] then table.insert(newGiftGoodsInfoList,v) end end From 3d1857dfcdab153ad2830f1a25fa969d61dff8b8 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 26 Apr 2021 20:35:54 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E3=80=90=E5=89=8D=E7=AB=AF=E6=8B=8D?= =?UTF-8?q?=E8=84=B8=E4=BF=AE=E6=94=B9=E3=80=91=E6=8F=90=E4=BA=A4=E2=80=94?= =?UTF-8?q?=E2=80=942?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Expert/PatFaceManager.lua | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index b2d4e1ee19..7a44e9bd24 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -67,14 +67,23 @@ function this.GetFrontPatFaceAllDataTabs() end --检测所有拍脸 function this.GetPatFaceAllDataTabs() + local curAllDatas = {} local backData = this.GetBackPatFaceDaqta() + -- LogGreen("backData "..#backData) local FrontData = this.GetFrontPatFaceAllDataTabs() - if FrontData and #FrontData > 0 then - for i = 1, #FrontData do - table.insert(backData,FrontData[i]) + -- LogGreen("FrontData "..#FrontData) + if backData and #backData > 0 then + for i = 1, #backData do + table.insert(curAllDatas,backData[i]) end end - return backData + if FrontData and #FrontData > 0 then + for i = 1, #FrontData do + table.insert(curAllDatas,FrontData[i]) + end + end + -- LogGreen("curAllDatas "..#curAllDatas) + return curAllDatas end function this.PatFaceSpecialMonitorOpenRules(v,patFaceAllData,type,starUpGiftNum) --1等级 2关卡 3特劝等级 4功能开启时 5活动开启时 6公会战状态 7条件触发(事件) From 46d492529fe45553ce836d10410fe8661a36c0b8 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 26 Apr 2021 20:42:49 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E3=80=91=E4=B8=8A=E6=96=B9=E8=A1=80=E6=9D=A1=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab | 2 +- .../ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index e2c52f2b8f..60547c4d25 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -142612,7 +142612,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5251286333026968868 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index 17126c1c5a..214167754e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -286,6 +286,8 @@ end -- 初始化 function this.InitPanelData() + this.dmg2:SetActive(fightType == BATTLE_TYPE.XINJIANG) + this.dmg3:SetActive(fightType == BATTLE_TYPE.TASUILINGXIAO) if fightType == BATTLE_TYPE.GUILD_BOSS and fightType == BATTLE_TYPE.GUILD_CAR_DELAY then this.myDamage = 0 this.myDamageLevel = 0 @@ -299,7 +301,6 @@ function this.InitPanelData() end) end elseif fightType == BATTLE_TYPE.XINJIANG then - this.dmg2:SetActive(fightType == BATTLE_TYPE.XINJIANG) boxList[1]:SetActive(true) this.myDamage = 0 this.myDamageLevel = 0 @@ -319,7 +320,6 @@ function this.InitPanelData() local actData = CommonActPageManager.GetData(ActivityTypeDef.TaSuiLingXiao) local boxs = ConfigManager.GetConfigDataByKey(ConfigName.NewHeroConfig,"Id",actData.activityId).BoxList local maxDmg = actData.value - this.dmg3:SetActive(fightType == BATTLE_TYPE.TASUILINGXIAO) this.myDamage = 0 this.myDamageLevel = 0 this.dmg3Text.text = string.format("0/%s",boxs[1][1]) From 171da338dfd96524015291c083b1d208ee70c478 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 26 Apr 2021 20:44:08 +0800 Subject: [PATCH 6/7] =?UTF-8?q?Revert=20"=E3=80=90=E6=88=98=E6=96=97?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E3=80=91=E4=B8=8A=E6=96=B9=E8=A1=80=E6=9D=A1?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 46d492529fe45553ce836d10410fe8661a36c0b8. --- Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab | 2 +- .../ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index 60547c4d25..e2c52f2b8f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -142612,7 +142612,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5251286333026968868 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index 214167754e..17126c1c5a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -286,8 +286,6 @@ end -- 初始化 function this.InitPanelData() - this.dmg2:SetActive(fightType == BATTLE_TYPE.XINJIANG) - this.dmg3:SetActive(fightType == BATTLE_TYPE.TASUILINGXIAO) if fightType == BATTLE_TYPE.GUILD_BOSS and fightType == BATTLE_TYPE.GUILD_CAR_DELAY then this.myDamage = 0 this.myDamageLevel = 0 @@ -301,6 +299,7 @@ function this.InitPanelData() end) end elseif fightType == BATTLE_TYPE.XINJIANG then + this.dmg2:SetActive(fightType == BATTLE_TYPE.XINJIANG) boxList[1]:SetActive(true) this.myDamage = 0 this.myDamageLevel = 0 @@ -320,6 +319,7 @@ function this.InitPanelData() local actData = CommonActPageManager.GetData(ActivityTypeDef.TaSuiLingXiao) local boxs = ConfigManager.GetConfigDataByKey(ConfigName.NewHeroConfig,"Id",actData.activityId).BoxList local maxDmg = actData.value + this.dmg3:SetActive(fightType == BATTLE_TYPE.TASUILINGXIAO) this.myDamage = 0 this.myDamageLevel = 0 this.dmg3Text.text = string.format("0/%s",boxs[1][1]) From cf1cf818e2503cc3925f708bc97a6bcb93819d2e Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 26 Apr 2021 20:45:42 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E3=80=91=E4=B8=8A=E6=96=B9=E8=A1=80=E6=9D=A1=E7=A7=BB?= =?UTF-8?q?=E4=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index 17126c1c5a..214167754e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -286,6 +286,8 @@ end -- 初始化 function this.InitPanelData() + this.dmg2:SetActive(fightType == BATTLE_TYPE.XINJIANG) + this.dmg3:SetActive(fightType == BATTLE_TYPE.TASUILINGXIAO) if fightType == BATTLE_TYPE.GUILD_BOSS and fightType == BATTLE_TYPE.GUILD_CAR_DELAY then this.myDamage = 0 this.myDamageLevel = 0 @@ -299,7 +301,6 @@ function this.InitPanelData() end) end elseif fightType == BATTLE_TYPE.XINJIANG then - this.dmg2:SetActive(fightType == BATTLE_TYPE.XINJIANG) boxList[1]:SetActive(true) this.myDamage = 0 this.myDamageLevel = 0 @@ -319,7 +320,6 @@ function this.InitPanelData() local actData = CommonActPageManager.GetData(ActivityTypeDef.TaSuiLingXiao) local boxs = ConfigManager.GetConfigDataByKey(ConfigName.NewHeroConfig,"Id",actData.activityId).BoxList local maxDmg = actData.value - this.dmg3:SetActive(fightType == BATTLE_TYPE.TASUILINGXIAO) this.myDamage = 0 this.myDamageLevel = 0 this.dmg3Text.text = string.format("0/%s",boxs[1][1])