[灵兽] 灵兽策划反馈bug修改
parent
8b22166237
commit
132c49a807
|
|
@ -35,7 +35,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 11, y: -7.1}
|
m_AnchoredPosition: {x: -0.00000047684, y: -7.1}
|
||||||
m_SizeDelta: {x: 90, y: 90}
|
m_SizeDelta: {x: 90, y: 90}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &6859188144548960538
|
--- !u!222 &6859188144548960538
|
||||||
|
|
@ -624,7 +624,7 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 50
|
m_FontSize: 46
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 3
|
m_MinSize: 3
|
||||||
|
|
@ -671,7 +671,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 214.2, y: -39.2}
|
m_AnchoredPosition: {x: 214.8, y: -37.5}
|
||||||
m_SizeDelta: {x: 63, y: 49}
|
m_SizeDelta: {x: 63, y: 49}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4865054168163544683
|
--- !u!222 &4865054168163544683
|
||||||
|
|
@ -704,7 +704,7 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 50
|
m_FontSize: 46
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 3
|
m_MinSize: 3
|
||||||
|
|
@ -715,7 +715,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 1
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: 2000
|
m_Text: x2000
|
||||||
--- !u!1 &3236638211364549165
|
--- !u!1 &3236638211364549165
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -903,7 +903,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 61.8, y: -7.100024}
|
m_AnchoredPosition: {x: 58.1, y: -7.1000023}
|
||||||
m_SizeDelta: {x: 37.8, y: 49}
|
m_SizeDelta: {x: 37.8, y: 49}
|
||||||
m_Pivot: {x: 0.49999988, y: 0.50000006}
|
m_Pivot: {x: 0.49999988, y: 0.50000006}
|
||||||
--- !u!222 &2580814809143257335
|
--- !u!222 &2580814809143257335
|
||||||
|
|
@ -936,7 +936,7 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 50
|
m_FontSize: 46
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 3
|
m_MinSize: 3
|
||||||
|
|
@ -947,7 +947,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 1
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: 200
|
m_Text: x200
|
||||||
--- !u!1 &3621012228071053461
|
--- !u!1 &3621012228071053461
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -2017,7 +2017,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 137.9, y: -40}
|
m_AnchoredPosition: {x: 133.5, y: -39.2}
|
||||||
m_SizeDelta: {x: 80, y: 80}
|
m_SizeDelta: {x: 80, y: 80}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3804104693786616055
|
--- !u!222 &3804104693786616055
|
||||||
|
|
@ -2534,7 +2534,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: -72, y: -4.1}
|
m_AnchoredPosition: {x: -69, y: -7.1000023}
|
||||||
m_SizeDelta: {x: 70, y: 55}
|
m_SizeDelta: {x: 70, y: 55}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5833839496219192996
|
--- !u!222 &5833839496219192996
|
||||||
|
|
@ -2567,7 +2567,7 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 50
|
m_FontSize: 46
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 3
|
m_MinSize: 3
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -66,7 +66,7 @@ function this.GetShowPanelData()
|
||||||
--星级
|
--星级
|
||||||
SetHeroStars(this.starGrid, pokemonBackData.star,2,Vector2.New(60,60),-11.92,Vector2.New(0.5,0.5))
|
SetHeroStars(this.starGrid, pokemonBackData.star,2,Vector2.New(60,60),-11.92,Vector2.New(0.5,0.5))
|
||||||
--属性
|
--属性
|
||||||
local allAddProVal=PokemonManager.GetSinglePokemonAddProDataByLvAndStar(pokemonBackData.id,pokemonBackData.level,pokemonBackData.star)
|
local allAddProVal=PokemonManager.GetSinglePokemonAddProDataByLvAndStar(pokemonBackData.tempId,pokemonBackData.level,pokemonBackData.star)
|
||||||
proList[0]:SetActive(true)
|
proList[0]:SetActive(true)
|
||||||
Util.GetGameObject(proList[0].transform,"proName"):GetComponent("Text").text ="等级"
|
Util.GetGameObject(proList[0].transform,"proName"):GetComponent("Text").text ="等级"
|
||||||
Util.GetGameObject(proList[0].transform,"proValue"):GetComponent("Text").text = pokemonBackData.level
|
Util.GetGameObject(proList[0].transform,"proValue"):GetComponent("Text").text = pokemonBackData.level
|
||||||
|
|
|
||||||
|
|
@ -127,7 +127,7 @@ function PokemonSummonOneResultPanel:OnOpen(...)
|
||||||
itemNum = itemNum * (1+currPrivilege.Condition[1][2]/10000)
|
itemNum = itemNum * (1+currPrivilege.Condition[1][2]/10000)
|
||||||
end
|
end
|
||||||
this.itemIcon3.sprite=Util.LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name)
|
this.itemIcon3.sprite=Util.LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name)
|
||||||
this.itemNum3.text= tostring(itemNum)
|
this.itemNum3.text= "x"..itemNum
|
||||||
end
|
end
|
||||||
this.itemDataList = {}
|
this.itemDataList = {}
|
||||||
this.itemDataList = BagManager.GetTableByBackDropData(this.drop)
|
this.itemDataList = BagManager.GetTableByBackDropData(this.drop)
|
||||||
|
|
|
||||||
|
|
@ -138,7 +138,7 @@ function PokemonSummonPanel:refreshBtnShow()
|
||||||
end
|
end
|
||||||
icon.sprite = Util.LoadSprite(artResourcesConfig[itemConfig[itemId].ResourceID].Name)
|
icon.sprite = Util.LoadSprite(artResourcesConfig[itemConfig[itemId].ResourceID].Name)
|
||||||
info.text = m.isInfo
|
info.text = m.isInfo
|
||||||
num.text = tostring(itemNum)
|
num.text = "x"..itemNum
|
||||||
end
|
end
|
||||||
|
|
||||||
Util.AddOnceClick(btn,function()
|
Util.AddOnceClick(btn,function()
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,7 @@ function PokemonSummonTenResultPanel:InitComponent()
|
||||||
local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox)
|
local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox)
|
||||||
drawtType.FindFairySingle=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",1,"ActivityId",curActivityId).Id
|
drawtType.FindFairySingle=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",1,"ActivityId",curActivityId).Id
|
||||||
drawtType.FindFairyTen=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",10,"ActivityId",curActivityId).Id
|
drawtType.FindFairyTen=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",10,"ActivityId",curActivityId).Id
|
||||||
|
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft, panelType = PanelType.ElementDrawCard })
|
||||||
end
|
end
|
||||||
|
|
||||||
--绑定事件(用于子类重写)
|
--绑定事件(用于子类重写)
|
||||||
|
|
@ -114,6 +115,7 @@ function PokemonSummonTenResultPanel:OnSortingOrderChange()
|
||||||
end
|
end
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function PokemonSummonTenResultPanel:OnOpen(...)
|
function PokemonSummonTenResultPanel:OnOpen(...)
|
||||||
|
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.LingShou})
|
||||||
-- this.itemIcon1.sprite=Util.LoadSprite(GetResourcePath(ItemConfig[SecretBoxManager.MainCost[2][1][1]].ResourceID))
|
-- this.itemIcon1.sprite=Util.LoadSprite(GetResourcePath(ItemConfig[SecretBoxManager.MainCost[2][1][1]].ResourceID))
|
||||||
local args = { ... }
|
local args = { ... }
|
||||||
this.drop=args[1]
|
this.drop=args[1]
|
||||||
|
|
@ -133,7 +135,7 @@ function PokemonSummonTenResultPanel:OnOpen(...)
|
||||||
local currPrivilege = privilegeConfig[3004]
|
local currPrivilege = privilegeConfig[3004]
|
||||||
itemNum = itemNum*(1+currPrivilege.Condition[1][2]/10000)
|
itemNum = itemNum*(1+currPrivilege.Condition[1][2]/10000)
|
||||||
end
|
end
|
||||||
this.itemNum3.text= tostring(itemNum)
|
this.itemNum3.text= "x"..itemNum
|
||||||
|
|
||||||
local itemDataList={}
|
local itemDataList={}
|
||||||
itemDataList=BagManager.GetTableByBackDropData(this.drop)
|
itemDataList=BagManager.GetTableByBackDropData(this.drop)
|
||||||
|
|
|
||||||
|
|
@ -263,7 +263,7 @@ function this.FormationAdapter(teamInfo)
|
||||||
local heroData = {}
|
local heroData = {}
|
||||||
Util.AddOnceClick(frameBtn, function()
|
Util.AddOnceClick(frameBtn, function()
|
||||||
local pokemonData={tempId=demonId,id=demonId,star=hero.star,level=hero.level}
|
local pokemonData={tempId=demonId,id=demonId,star=hero.star,level=hero.level}
|
||||||
UIManager.OpenPanel(UIName.PokemonGetInfoPopup, true,pokemonData)
|
UIManager.OpenPanel(UIName.PokemonGetInfoPopup, false,pokemonData)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -151,7 +151,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
||||||
self.PreciousShow:SetActive(true)
|
self.PreciousShow:SetActive(true)
|
||||||
self.PreciousShowText.text=Language[12078]
|
self.PreciousShowText.text=Language[12078]
|
||||||
end
|
end
|
||||||
|
LogError("掉落物品".._itemData.itemType)
|
||||||
if _itemData.itemType == 1 or _itemData.itemType == 0 then--物品
|
if _itemData.itemType == 1 or _itemData.itemType == 0 then--物品
|
||||||
--item
|
--item
|
||||||
if effectLayer > 0 then
|
if effectLayer > 0 then
|
||||||
|
|
@ -186,7 +186,11 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
||||||
--self.pokemonFrame:GetComponent("Image").sprite = Util.LoadSprite(YaoHunFrame[_itemData.configData.Quantity])--_itemData.quality
|
--self.pokemonFrame:GetComponent("Image").sprite = Util.LoadSprite(YaoHunFrame[_itemData.configData.Quantity])--_itemData.quality
|
||||||
--self.pokemonImage.sprite = Util.LoadSprite(_itemData.icon)
|
--self.pokemonImage.sprite = Util.LoadSprite(_itemData.icon)
|
||||||
Util.AddOnceClick(self.frameBtn, function()
|
Util.AddOnceClick(self.frameBtn, function()
|
||||||
|
LogError("lignhsou111111111111111111111")
|
||||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop)
|
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop)
|
||||||
|
|
||||||
|
-- local pokemonData={tempId=_itemData.configData.Id,id=_itemData.configData.Id,star=0,level=1}
|
||||||
|
-- UIManager.OpenPanel(UIName.PokemonGetInfoPopup, true,pokemonData)
|
||||||
end)
|
end)
|
||||||
if effectLayer > 0 then
|
if effectLayer > 0 then
|
||||||
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity == 5)
|
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity == 5)
|
||||||
|
|
@ -246,7 +250,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
||||||
Util.AddOnceClick(self.frameBtn, function()
|
Util.AddOnceClick(self.frameBtn, function()
|
||||||
--所有的魂印打开都用这个界面
|
--所有的魂印打开都用这个界面
|
||||||
UIManager.OpenPanel(UIName.SoulPrintPopUp, ShowType.showTip3, nil,_itemData.backData.itemId)
|
UIManager.OpenPanel(UIName.SoulPrintPopUp, ShowType.showTip3, nil,_itemData.backData.itemId)
|
||||||
end)
|
end)
|
||||||
else
|
else
|
||||||
Util.AddOnceClick(self.frameBtn, function()
|
Util.AddOnceClick(self.frameBtn, function()
|
||||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop)
|
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop)
|
||||||
|
|
@ -335,6 +339,11 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
||||||
Util.AddOnceClick(self.frameBtn, function()
|
Util.AddOnceClick(self.frameBtn, function()
|
||||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop)
|
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop)
|
||||||
end)
|
end)
|
||||||
|
elseif _itemData.itemType == ItemType.LingShou then
|
||||||
|
Util.AddOnceClick(self.frameBtn, function()
|
||||||
|
local pokemonData={tempId=_itemData.configData.Id,id=_itemData.configData.Id,star=0,level=1}
|
||||||
|
UIManager.OpenPanel(UIName.PokemonGetInfoPopup, true,pokemonData)
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
self.gameObject:GetComponent("RectTransform").localScale = Vector2.New(self.scale, self.scale)
|
self.gameObject:GetComponent("RectTransform").localScale = Vector2.New(self.scale, self.scale)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue