删除不用的代码

lua/app/common/bi_report.lua

@@ -442,7 +442,7 @@ function BIReport:postItemGet(num, itemId, getType)
 	-- ItemNum	获取道具数量
 	-- ItemAll	获取后道具数量
 	-- IsNew	是否是新用户
-	local allNum = DataManager.BagData.ItemData:getItemBigNumById(itemId)
+	local allNum = DataManager.BagData.ItemData:getItemNumById(itemId)
 	local args = {
 		item_value = num,
 		item_id = itemId,
@@ -460,7 +460,7 @@ function BIReport:postItemUse(num, itemId, getType)
 	-- ItemNum	消耗道具数量
 	-- ItemAll	消耗后道具数量
 	-- IsNew	是否是新用户
-	local allNum = DataManager.BagData.ItemData:getItemBigNumById(itemId)
+	local allNum = DataManager.BagData.ItemData:getItemNumById(itemId)
 	local args = {
 		item_value = num,
 		item_id = itemId,

lua/app/global/global_func.lua

@@ -1461,19 +1461,6 @@ function GFunc.gemEnough(needNum,showToast) -- 钻石是否足够
 	return GFunc.checkCost(GConst.ItemConst.ITEM_ID_GEM, needNum, showToast) --判断不提示，点击才提示
 end
 
-function GFunc.getCostContentWithColor(key)
-	local cost = GFunc.getConstIntValue(key)
-	local content = "<color=#ed2929>"..cost.."</color>"
-	local bigNum = {
-		unit = 0,
-		value = cost
-	}
-	if GFunc.gemEnough(bigNum, false) then
-		content = tostring(cost)
-	end
-	return content
-end
-
 ---设置图片和文本居中, 文本需要左右居中对齐
 function GFunc.setMiddlePosX(txtObj, icon, bgImg)
 	local txtRectWidth = txtObj:getTransform().rect.width

lua/app/module/tips/tips_manager.lua

@@ -25,8 +25,6 @@ end
 function TipsManager:showRewardTips(id, type, tarPrefabObj, alignType, params)
 	if type == GConst.REWARD_TYPE.ITEM then
 		self:showItemTips(id, tarPrefabObj, alignType)
-	elseif type == GConst.REWARD_TYPE.EQUIP then
-		self:showEquipTips(nil, id, params)
 	elseif type == GConst.REWARD_TYPE.LEGACY then
 		self:showLegacyTips(id)
 	end
@@ -65,17 +63,6 @@ function TipsManager:showRewardsTips(rewards, customTitleStr, tarPrefabObj, alig
 	UIManager:showUI("app/ui/tips/rewards_tips", params)
 end
 
----- entity id 传入一个即可
-function TipsManager:showEquipTips(entity, id, params)
-	local params = {
-		entity = entity,
-		id = id,
-		aniType = UIManager.ANI_TYPE.NONE,
-		purifyLv = params and params.purifyLv
-	}
-	UIManager:showUI("app/ui/tips/equip_tips", params)
-end
-
 function TipsManager:showDescTips(desc, tarPrefabObj, alignType)
 	local params = {
 		desc = desc,

lua/app/ui/currency_bar/currency_bar.lua

@@ -142,12 +142,12 @@ function CurrencyBar:refreshTextRightNow()
 	end
 end
 
-function CurrencyBar:refreshCurrencyAddTx(itemId, bigNum)
+function CurrencyBar:refreshCurrencyAddTx(itemId, num)
 	if self.currencyList == nil then
 		return
 	end
 	for i, cell in ipairs(self.currencyList) do
-		cell:refreshCurrencyAddTx(itemId, bigNum)
+		cell:refreshCurrencyAddTx(itemId, num)
 	end
 end
 

lua/app/ui/tips/cell/equip_group_cell.lua

@@ -1,140 +0,0 @@
-local EquipGroupCell = class("EquipGroupCell", BaseCell)
-
-local H = {
-    NORMAL = 112,
-    HAS_TITLE = 190,
-    FIRST = 180,
-}
-
-local PROBABILITY_HEIGHT = 58
-
-function EquipGroupCell:refresh(equipInfoList, type)
-    local uiMap = self:getUIMap()
-    if not self.equipCells then
-        self.equipCells = {}
-        for i = 1, 6 do
-            self.equipCells[i] = CellManager:addCellComp(uiMap["equil_group_cell.line.equip_cell_" .. i], GConst.TYPEOF_LUA_CLASS.EQUIP_CELL)
-        end
-    end
-
-    local isProbability = equipInfoList.isProbability
-
-    for i, cell in ipairs(self.equipCells) do
-        local equipId = nil
-        if not isProbability then
-            equipId = equipInfoList.equipList[i]
-        end
-        cell:getBaseObject():setActive(equipId ~= nil)
-        if equipId then
-            cell:refreshByCfg(equipId)
-            cell:addClickListener(function()
-                ModuleManager.TipsManager:showEquipTips(nil, equipId)
-            end)
-        else
-            cell:addClickListener(nil)
-        end
-    end
-
-    local probabilityCount = 0
-    if GFunc.showProbability() then
-        uiMap["equil_group_cell.probability"]:setVisible(isProbability)
-        if isProbability then
-            local y = -2
-
-            local img = uiMap["equil_group_cell.probability.line_img_desc"]
-            local tx = uiMap["equil_group_cell.probability.line_img_desc.tx"]
-            probabilityCount = probabilityCount + 1
-            img:setAnchoredPositionY(y)
-            tx:setText(I18N:getGlobalText(I18N.GlobalConst.PROBABILITY_TIPS_DESC))
-            y = y + PROBABILITY_HEIGHT
-
-            local img = uiMap["equil_group_cell.probability.line_img_1"]
-            local tx = uiMap["equil_group_cell.probability.line_img_1.tx"]
-            local tx1 = uiMap["equil_group_cell.probability.line_img_1.tx_1"]
-            local probability = equipInfoList.normal.probability
-            img:setVisible(probability > 0)
-            if probability > 0 then
-                probabilityCount = probabilityCount + 1
-                img:setAnchoredPositionY(y)
-                tx:setText(I18N:getGlobalText(I18N.GlobalConst.NORMAL_EQUIP_DESC))
-                tx1:setText(probability .. "%")
-                y = y + PROBABILITY_HEIGHT
-            end
-
-            img = uiMap["equil_group_cell.probability.line_img_2"]
-            tx = uiMap["equil_group_cell.probability.line_img_2.tx"]
-            tx1 = uiMap["equil_group_cell.probability.line_img_2.tx_1"]
-            probability = equipInfoList.excellent.probability
-            img:setVisible(probability > 0)
-            if probability > 0 then
-                probabilityCount = probabilityCount + 1
-                img:setAnchoredPositionY(y)
-                tx:setText(I18N:getGlobalText(I18N.GlobalConst.RARE_EQUIP_DESC))
-                tx1:setText(probability .. "%")
-                y = y + PROBABILITY_HEIGHT
-            end
-
-            img = uiMap["equil_group_cell.probability.line_img_3"]
-            tx = uiMap["equil_group_cell.probability.line_img_3.tx"]
-            tx1 = uiMap["equil_group_cell.probability.line_img_3.tx_1"]
-            probability = equipInfoList.rare.probability
-            img:setVisible(probability > 0)
-            if probability > 0 then
-                probabilityCount = probabilityCount + 1
-                img:setAnchoredPositionY(y)
-                tx:setText(I18N:getGlobalText(I18N.GlobalConst.EXCELLENT_EQUIP_DESC))
-                tx1:setText(probability .. "%")
-                y = y + PROBABILITY_HEIGHT
-            end
-
-            img = uiMap["equil_group_cell.probability.line_img_4"]
-            tx = uiMap["equil_group_cell.probability.line_img_4.tx"]
-            tx1 = uiMap["equil_group_cell.probability.line_img_4.tx_1"]
-            probability = equipInfoList.epic.probability
-            img:setVisible(probability > 0)
-            if probability > 0 then
-                probabilityCount = probabilityCount + 1
-                img:setAnchoredPositionY(y)
-                tx:setText(I18N:getGlobalText(I18N.GlobalConst.EPIC_EQUIP_DESC))
-                tx1:setText(probability .. "%")
-                y = y + PROBABILITY_HEIGHT
-            end
-
-            img = uiMap["equil_group_cell.probability.line_img_ssr"]
-            tx = uiMap["equil_group_cell.probability.line_img_ssr.tx"]
-            tx1 = uiMap["equil_group_cell.probability.line_img_ssr.tx_1"]
-            probability = equipInfoList.ssr.probability
-            img:setVisible(probability > 0)
-            if probability > 0 then
-                probabilityCount = probabilityCount + 1
-                img:setAnchoredPositionY(y)
-                tx:setText(I18N:getGlobalText(I18N.GlobalConst.SSR_EQUIP_DESC))
-                tx1:setText(probability .. "%")
-                y = y + PROBABILITY_HEIGHT
-            end
-        end
-    else
-        uiMap["equil_group_cell.probability"]:setVisible(false)
-    end
-
-    local h = H.NORMAL
-    if isProbability then
-        if probabilityCount <= 0 then
-            h = 0
-        else
-            h = PROBABILITY_HEIGHT * probabilityCount + PROBABILITY_HEIGHT
-        end
-    else
-        if equipInfoList.isFirstLine then
-            h = H.HAS_TITLE
-        end
-
-        if equipInfoList.isTop then
-            h = H.FIRST
-        end
-    end
-
-    self.baseObject:setSizeDeltaY(h)
-end
-
-return EquipGroupCell

lua/app/ui/tips/cell/equip_group_cell.lua.meta

@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: a6f4d7eb75fa1414f98cc7ff019959a8
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/ui/tips/equip_tips.lua

@@ -1,153 +0,0 @@
-local EquipEntity = require "app/userdata/bag/equip_entity"
-local BaseTips = require "app/ui/tips/base_tips"
-local EquipTips = class("EquipTips", BaseTips)
-
-local QLT_SKILL_DESC_CELL = "app/ui/equip/cell/qlt_skill_desc_cell"
-local QLT_REFINE_DESC_CELL = "app/ui/equip/cell/qlt_refine_desc_cell"
-
-function EquipTips:getPrefabPath()
-	return "assets/prefabs/ui/tips/equip_tips.prefab"
-end
-
-function EquipTips:ctor(params)
-	self.equipEntity = params and params.entity
-	if not self.equipEntity then
-		local id = params and params.id
-		-- self.equipEntity = EquipEntity:create({id = id, lv = 1})
-		self.equipEntity = DataManager.BagData.EquipData:getEquipByCfgId(id)
-	end
-end
-
-function EquipTips:onLoadRootComplete()
-	self:_initObj()
-end
-
-function EquipTips:_initObj()
-	local uiMap = self.root:genAllChildren()
-
-	uiMap["equip_tips.bg.close_btn"]:addClickListener(function()
-		self:closeUI()
-	end)
-
-	local uiMap = self.root:genAllChildren()
-	self.nameTx = uiMap["equip_tips.bg.name_tx"]
-	self.qltTx = uiMap["equip_tips.bg.qlt_tx"]
-	self.slider = uiMap["equip_tips.bg.slider_bg.slider"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER)
-	self.sliderTx = uiMap["equip_tips.bg.slider_bg.slider_tx"]
-	self.attrTx = uiMap["equip_tips.bg.attr_tx"]
-	self.arrowImg = uiMap["equip_tips.bg.arrow_img"]
-	self.diffTx = uiMap["equip_tips.bg.diff_tx"]
-	self.lvTx = uiMap["equip_tips.bg.lv_tx"]
-	self.equipCell = CellManager:addCellComp(uiMap["equip_tips.bg.equip_cell"], GConst.TYPEOF_LUA_CLASS.EQUIP_CELL)
-	self.descTx1 = uiMap["equip_tips.bg.desc_tx_1"]
-	self.attrTx1 = uiMap["equip_tips.bg.attr_tx_1"]
-	self.bg2 = uiMap["equip_tips.bg.bg2"]
-	self.bg = uiMap["equip_tips.bg"]
-
-	self.skillCells = {}
-	self.skillTxs = {}
-	for i = 1, 3 do
-		self.skillCells[i] = CellManager:addCellComp(uiMap["equip_tips.bg.bg2.skill_cell_" .. i], GConst.TYPEOF_LUA_CLASS.SKILL_CELL)
-		self.skillTxs[i] = uiMap["equip_tips.bg.bg2.skill_desc_tx_" .. i]
-	end
-end
-
-function EquipTips:onRefresh()
-	local attrs = self.equipEntity:getAllOwnAttr()
-	local attrStr
-	local valueStr
-	for k,v in pairs(attrs) do
-		if not attrStr then
-			attrStr = GFunc.getAttrName(k)
-		else
-			attrStr = attrStr .. "&" .. GFunc.getAttrName(k)
-		end
-		if not valueStr then
-			valueStr = string.format("<color=%s>%s</color>", GConst.COLOR_CODE.GREEN, " +" .. GFunc.getFinalPerStr(k, v))
-		end
-	end
-	attrStr = attrStr .. valueStr
-	self.descTx1:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_1))
-	self.attrTx1:setText(attrStr)
-
-	local selWearAttrBigNum
-	local attrs = self.equipEntity:getAllWearAttr()
-	local attrStr
-	local valueStr
-	for k,v in pairs(attrs) do
-		if not attrStr then
-			attrStr = GFunc.getAttrName(k)
-		else
-			attrStr = attrStr .. "&" .. GFunc.getAttrName(k)
-		end
-		if not valueStr then
-			selWearAttrBigNum = v
-			valueStr = string.format("<color=%s>%s</color>", GConst.COLOR_CODE.GREEN, " +" .. GFunc.getFinalPerStr(k, v))
-		end
-	end
-	attrStr = attrStr .. valueStr
-	self.attrTx:setText(attrStr)
-
-	local wearEquip = DataManager.FightInfoData:getWearEquipByPart(self.equipEntity:getPart())
-	if wearEquip then
-		local wearAttr = wearEquip:getAllWearAttr()
-		local wearWearAttrBigNum, wearWearAttrType
-		for k,v in pairs(wearAttr) do
-			wearWearAttrBigNum = v
-			wearWearAttrType = k
-			break
-		end
-		if BigNumOpt.bigNumCompare(selWearAttrBigNum, wearWearAttrBigNum) == 0 then
-			self.arrowImg:setVisible(false)
-			self.diffTx:setVisible(false)
-		else
-			local bigNum = BigNumOpt.bigNumSub(selWearAttrBigNum, wearWearAttrBigNum)
-			local attrStr = GFunc.getFinalPerStr(wearWearAttrType, bigNum)
-			if BigNumOpt.bigNumCompare(selWearAttrBigNum, wearWearAttrBigNum) > 0 then
-				self.arrowImg:setVisible(true)
-				self.diffTx:setVisible(true)
-				self.arrowImg:setSprite(GConst.ATLAS_PATH.COMMON, "common_arrow_1")
-				self.diffTx:setText(string.format("<color=%s>%s</color>", GConst.COLOR_CODE.GREEN, attrStr))
-			else
-				self.arrowImg:setVisible(true)
-				self.diffTx:setVisible(true)
-				self.arrowImg:setSprite(GConst.ATLAS_PATH.COMMON, "common_arrow_2")
-				self.diffTx:setText(string.format("<color=%s>%s</color>", GConst.COLOR_CODE.RED, attrStr))
-			end
-			local meshProComp = self.attrTx:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_TEXT_MESH_PRO)
-			self.arrowImg:setAnchoredPositionX(120 + meshProComp.preferredWidth)
-			self.diffTx:setAnchoredPositionX(135 + meshProComp.preferredWidth)
-		end
-	else
-		self.arrowImg:setVisible(false)
-		self.diffTx:setVisible(false)
-	end
-
-	local num = self.equipEntity:getCount()
-	local needNum = self.equipEntity:getNeedNum()
-	self.sliderTx:setText(num .. "/" .. needNum)
-	self.slider.value = num / needNum
-
-	local qlt = self.equipEntity:getQuality()
-	local str = string.format("<color=%s>%s</color>", GConst.QUALITY_TYPE[qlt], I18N:getGlobalText("QLT_DESC_" .. qlt))
-	self.qltTx:setText(str)
-	self.nameTx:setText(self.equipEntity:getName())
-	self.lvTx:setText(I18N:getGlobalText(I18N.GlobalConst.LV_POINT, self.equipEntity:getLv()))
-
-	if self.equipEntity:getPart() == 1 then
-		self.bg2:setVisible(true)
-		self.bg:setSizeDeltaY(720)
-		local skillIds, lvs = self.equipEntity:getSkillIds()
-		for i = 1, 3 do
-			self.skillTxs[i]:setText(GFunc.getSkillEffectStr(skillIds[i], lvs[i]))
-			self.skillCells[i]:refresh(skillIds[i], lvs[i])
-		end
-	else
-		self.bg2:setVisible(false)
-		self.bg:setSizeDeltaY(388)
-	end
-
-	self.equipCell:refresh(self.equipEntity)
-end
-
-return EquipTips

lua/app/ui/tips/equip_tips.lua.meta

@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 95e87f3e1e1ea664fae2e0d995b7979b
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

lua/app/ui/ui_manager.lua

@@ -1082,10 +1082,10 @@ function UIManager:refreshCurrencyBar()
 	end
 end
 
-function UIManager:refreshCurrencyAddTx(itemId, bigNum)
+function UIManager:refreshCurrencyAddTx(itemId, num)
 	local topUI = self.uiList[#self.uiList]
 	if self.currencyBar and self.currencyBarBindUI == topUI then
-		self.currencyBar:refreshCurrencyAddTx(itemId, bigNum)
+		self.currencyBar:refreshCurrencyAddTx(itemId, num)
 	end
 end
 

lua/app/userdata/bag/item_data.lua

@@ -81,16 +81,6 @@ function ItemData:getAllItems()
 	return self.items
 end
 
-function ItemData:getItemBigNumById(id)
-	local num
-	if self.items[id] then
-		num = self.items[id]:getNum()
-	else
-		num = 0
-	end
-	return num
-end
-
 function ItemData:getItemNumById(id)
 	local num
 	if self.items[id] then