root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
luyao 2021-12-06 15:46:42 +08:00
parent 83044f0586 a0440fa3ae
commit 1199b225cd
6 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
View File

@ -556,6 +556,7 @@ UpViewRechargeType = {
godEquipStone= 1258,--神装觉醒石
LingMaiCoin = 1273,--灵脉币
yonghengzhiyao = 1287,
qianmianhuan = 1288,
}
SHOP_PAGE = {

15
Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationLottery.lua
View File

@ -251,23 +251,26 @@ function IncarnationLottery:Recruit(recrutType,recrutId,uiName)
local rotate = self.center.transform.localRotation
local bestIndex = 0
if recrutId == self.singleRecruit.Id then
if recrutId == self.tenRecruit.Id then
local weight = nil
for i = 1,#msg.drop.itemlist do
local str = msg.drop.itemlist[i].itemId.."#"..msg.drop.itemlist[i].itemNum
if not weight then
weight = self.rewardWeight[str]
bestIndex = self.reward[str]
elseif self.rewardWeight[str] then
if weight < self.rewardWeight[str] then
if self.rewardWeight[str] then
if not weight then
weight = self.rewardWeight[str]
bestIndex = self.reward[str]
else
if weight < self.rewardWeight[str] then
weight = self.rewardWeight[str]
bestIndex = self.reward[str]
end
end
end
end
else
local drop = {}
drop = msg.drop.itemlist[1]
local str2 = drop.itemId.."#"..drop.itemNum
bestIndex = self.reward[drop.itemId.."#"..drop.itemNum]
end
self:TurnTable(2,bestIndex,function()

9
Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua
View File

@ -106,7 +106,6 @@ function this.SetItemDataList(dataList,isBack)
end
function this.GetbagIncarnationData()
LogGreen("刷新背包数据刷新变身卡：")
local data = BagManager.GetDataByItemType(ItemType.Incarnation)
for i = 1,#data do
this.SetItemDataByCardId(data[i].id)
@ -135,6 +134,14 @@ function this.SetItemDataByid(id,state,pos)
CheckRedPointStatus(this.itemDataList[id].property + 43801)
end
function this.GetStatusByItemId(id)
local config = ConfigManager.TryGetConfigDataByKey(ConfigName.ChangingCard,"CardId",id)
if config then
return this.itemDataList[config.ID].state
end
return -1
end
local sortData = {
[-1] = 0,
[0] = 2,

2
Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
View File

@ -188,7 +188,7 @@ function RewardBoxPanel:SetSingleGiftData(index,item,boxId,tagNum)
yihuode:SetActive(false)
if itemConfig[rewardGroup[boxId].ShowItem[index][1]].ItemType == ItemType.Incarnation and BagManager.isBagPanel then
local num = BagManager.GetItemCountById(rewardGroup[boxId].ShowItem[index][1])
if num > 0 then
if num > 0 or IncarnationManager.GetStatusByItemId(rewardGroup[boxId].ShowItem[index][1]) >= 0 then
select:SetActive(false)
yihuode:SetActive(true)
else

4
Assets/ManagedResources/~Lua/View/ShopView.lua
View File

@ -596,8 +596,8 @@ function this:ShopItemAdapter(shopItem, itemData)
end)
Util.AddOnceClick(bg, function()
if con.ItemType == ItemType.Incarnation then
local num = BagManager.GetItemCountById(con.Id)
if num > 0 then
local num = BagManager.GetItemCountById(con.Id)
if num > 0 or IncarnationManager.GetStatusByItemId(con.Id) >= 0 then
PopupTipPanel.ShowTip("无法选择已获取过的变身卡！")
return
end

2
Assets/ManagedResources/~Lua/View/ShopViewNew.lua
View File

@ -581,7 +581,7 @@ function ShopViewNew:ShopItemAdapter(shopItem, itemData)
Util.AddOnceClick(bg, function()
if con.ItemType == ItemType.Incarnation then
local num = BagManager.GetItemCountById(con.Id)
if num > 0 then
if num > 0 or IncarnationManager.GetStatusByItemId(con.Id) >= 0 then
PopupTipPanel.ShowTip("无法选择已获取过的变身卡！")
return
end