diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 9c3ca2e58b..3d3e9ad849 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -589,7 +589,7 @@ function this.GetContinuityRechargeRedPoint() redPoint = redPoint or (rechargeInfo.progress == 1 and rechargeInfo.state == 0) end end - LogGreen("积天豪礼红点:"..tostring(redPoint)) + -- LogGreen("积天豪礼红点:"..tostring(redPoint)) return redPoint end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua index 384bf5d596..e6232543d3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua @@ -76,7 +76,7 @@ function EnemyView:onCreate(go, role, position, root, isBoss) self.RoleLiveGO:GetComponent("RectTransform").anchoredPosition = Vector2.New(self.outOffset[1], self.outOffset[2])-- * 0.5 self.RoleLiveGO.transform.localScale = Vector3.one * self.enemy_liveScale --* 0.75 self.RoleLiveGO:SetActive(true) - Log("IsBoss: "..tostring(self.isBoss)) + -- Log("IsBoss: "..tostring(self.isBoss)) if self.isBoss then self.RoleLiveGO.transform.localScale = self.RoleLiveGO.transform.localScale * 1.5 -- boss 放大1.5倍 end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 55107e1a9d..c7b2fa8c22 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -33,14 +33,14 @@ function ActivityMainPanel:BindEvent() Util.AddClick(this.btnBack, function() DynamicActivityManager.RemoveUIList() if #DynamicActivityManager.OpenUIList > 0 then - LogRed("jump ") + -- LogRed("jump ") JumpManager.GoJump(DynamicActivityManager.OpenUIList[#DynamicActivityManager.OpenUIList],function() DynamicActivityManager.RemoveUIList() end) else - LogRed("close ") + -- LogRed("close ") this:ClosePanel() - end + end end) end @@ -77,7 +77,7 @@ function ActivityMainPanel:CheckActOpen(_index) else _CurPageIndex = _index end - LogGreen(tabs[_index].ActiveType.." _CurPageIndex:".._CurPageIndex) + Log("当前界面:"..tabs[_index].ActiveType.." _CurPageIndex:".._CurPageIndex) end elseif tabs[_index].FunType > 0 then if ActTimeCtrlManager.SingleFuncState(tabs[_index].FunType) then diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua index 737ec27047..3ca76505d0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua @@ -247,7 +247,7 @@ function this:SetInitList() end this.ChooseDataList = tempTable - LogBlue("#this.ChooseDataList长度:"..#this.ChooseDataList) + -- LogBlue("#this.ChooseDataList长度:"..#this.ChooseDataList) end --初始化 鸿蒙塔的数据 function this:SetTowerInit() diff --git a/Assets/ManagedResources/~Lua/Modules/Mail/MailMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Mail/MailMainPanel.lua index 3b9bf43fd5..0078f41025 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mail/MailMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mail/MailMainPanel.lua @@ -124,7 +124,6 @@ function MailMainPanel:OnOpen(...) openPanel=data[1] end function MailMainPanel:OnShow() - Log("MailMainPanel:OnShow") isPlayAnim = true allMail={} NetManager.GetAllMailData(function () @@ -140,7 +139,7 @@ end local maildataCount=0--数据数量 --设置英雄列表数据 function this.OnShowMailListData(_allMail, isTop,isAni) - LogRed("isTop "..tostring(isTop).." isAni "..tostring(isAni)) + -- LogRed("isTop "..tostring(isTop).." isAni "..tostring(isAni)) allMail= _allMail this:SortAllMail(allMail) maildataCount=#allMail diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Achievement.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Achievement.lua index 4a87fd651a..0f7747d793 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Achievement.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Achievement.lua @@ -55,7 +55,7 @@ function this.OnShowPanelData(isTop,isAni) table.insert(AllData,v) end this.RewardTabsSort(AllData) - LogRed("isTop "..tostring(not isTop).." isAni "..tostring(not isAni)) + -- LogRed("isTop "..tostring(not isTop).." isAni "..tostring(not isAni)) this.ScrollView:SetData(AllData, function (index, go) this.SingleDataShow(go, AllData[index]) end, not isTop,not isAni) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index d42365afe2..762222d5b6 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -152,9 +152,8 @@ function this.InitTaskData(curData,taskType,configName) allListData[i].Integral[1][1], allListData[i].Integral[1][2] }, - } - - data.type = allListData[i].Type + } + data.type = allListData[i].Type data.jump = allListData[i].Jump[1] table.insert(curData.rewards,data) end @@ -310,7 +309,7 @@ function this.InitSingleTypeData(actType) local data = ActivityGiftManager.GetActivityTypeInfo(actType) if data then singleTypeData = {} - LogYellow("InitData activityId:"..tostring(data.activityId).." value:"..tostring(data.value).." startTime:"..tostring(data.startTime).." endTime:"..tostring(data.endTime).." mission:"..tostring(#data.mission)) + Log("InitData activityId:"..tostring(data.activityId).." value:"..tostring(data.value).." startTime:"..tostring(data.startTime).." endTime:"..tostring(data.endTime).." mission:"..tostring(#data.mission)) singleTypeData.activityId = data.activityId singleTypeData.value = data.value singleTypeData.startTime = data.startTime diff --git a/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua b/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua index a820ab3a87..02e4e51c99 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerInfoView.lua @@ -105,7 +105,11 @@ function PlayerInfoView:OnShow() self.playerHead:SetPosition(Vector3.New(-5, 8, 0)) -- self.playerHead:SetLayer(self.sortingOrder) self.playerHead:SetEffectScale(0.85) - + CheckRedPointStatus(RedPointType.VipPrivilege) + CheckRedPointStatus(RedPointType.Setting_Ride) + CheckRedPointStatus(RedPointType.Setting_Title) + CheckRedPointStatus(RedPointType.HeadChange_Frame) + CheckRedPointStatus(RedPointType.HeadChange_Head) end function PlayerInfoView:RefreshPower(force) diff --git a/Assets/ManagedResources/~Lua/View/UpView.lua b/Assets/ManagedResources/~Lua/View/UpView.lua index 3882e9312d..d15f9341a1 100644 --- a/Assets/ManagedResources/~Lua/View/UpView.lua +++ b/Assets/ManagedResources/~Lua/View/UpView.lua @@ -204,31 +204,31 @@ function UpView:UpdateGoldVal() for i = 1, _ItemMaxNum do if panelShowItemList[i] then if self.cnyList[i].gameObject then - self.cnyList[i]:SetActive(true) - Util.GetGameObject(self.cnyList[i], "icon"):GetComponent("Image").sprite = SetIcon(self.spLoader, panelShowItemList[i]) - Util.GetGameObject(self.cnyList[i], "addFlag"):SetActive(_IsShowPlus(panelShowItemList[i])) + self.cnyList[i].gameObject:SetActive(true) + Util.GetGameObject(self.cnyList[i].gameObject, "icon"):GetComponent("Image").sprite = SetIcon(self.spLoader, panelShowItemList[i]) + Util.GetGameObject(self.cnyList[i].gameObject, "addFlag"):SetActive(_IsShowPlus(panelShowItemList[i])) if panelShowItemList[i] == 20 then - Util.GetGameObject(self.cnyList[i], "addFlag"):SetActive(true) + Util.GetGameObject(self.cnyList[i].gameObject, "addFlag"):SetActive(true) end if panelShowItemList[i] == 2 then - Util.GetGameObject(self.cnyList[i], "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i])) .. "/" .. PlayerManager.maxEnergy + Util.GetGameObject(self.cnyList[i].gameObject, "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i])) .. "/" .. PlayerManager.maxEnergy elseif panelShowItemList[i] == 44 then - Util.GetGameObject(self.cnyList[i], "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i])).."/"..PrivilegeManager.GetPrivilegeNumber(9) + Util.GetGameObject(self.cnyList[i].gameObject, "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i])).."/"..PrivilegeManager.GetPrivilegeNumber(9) elseif panelShowItemList[i] == 53 then - Util.GetGameObject(self.cnyList[i], "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i])).."/"..MonsterCampManager.GetMaxCostItem() + Util.GetGameObject(self.cnyList[i].gameObject, "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i])).."/"..MonsterCampManager.GetMaxCostItem() elseif panelShowItemList[i] == 87 then - Util.GetGameObject(self.cnyList[i], "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i])) + Util.GetGameObject(self.cnyList[i].gameObject, "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i])) else - Util.GetGameObject(self.cnyList[i], "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i])) + Util.GetGameObject(self.cnyList[i].gameObject, "value"):GetComponent("Text").text = PrintWanNum(BagManager.GetTotalItemNum(panelShowItemList[i])) end -- 绑定红点 - local redpot = Util.GetGameObject(self.cnyList[i], "redpot") + local redpot = Util.GetGameObject(self.cnyList[i].gameObject, "redpot") redpot:SetActive(false) self:_BindRP(panelShowItemList[i], redpot) end else - self.cnyList[i]:SetActive(false) + self.cnyList[i].gameObject:SetActive(false) end end end