[灵兽]灵兽放生修改,灵兽抽卡结果界面再来一次添加妖晶抽卡次数

wangzhenxing 2020-11-02 14:13:39 +09:00
parent aaadcba680
commit 27bbe94ad9
5 changed files with 229 additions and 23 deletions

View File

@ -5094,6 +5094,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3569102849833951929}
- {fileID: 3977989870992202207}
m_Father: {fileID: 224361279008326358}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -34657,6 +34658,102 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: New Text
--- !u!1 &801322049959554458
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3977989870992202207}
- component: {fileID: 7027282258947088492}
- component: {fileID: 1992244774151148903}
- component: {fileID: 2852671195478684251}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3977989870992202207
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 801322049959554458}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224969362660561018}
m_RootOrder: 1
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: 4, y: 65}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7027282258947088492
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 801322049959554458}
m_CullTransparentMesh: 0
--- !u!114 &1992244774151148903
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 801322049959554458}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9811321, g: 0.97976804, b: 0.9765041, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "17:20:01\u540E\u5237\u65B0"
LanguageIndex: 11485
--- !u!114 &2852671195478684251
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 801322049959554458}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &1208514559779824828
GameObject:
m_ObjectHideFlags: 0
@ -34689,9 +34786,9 @@ RectTransform:
m_Father: {fileID: 3569102849833951929}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 211.66666, y: -38.15}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 75, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1680150351488365573
@ -34770,9 +34867,9 @@ RectTransform:
m_Father: {fileID: 3569102849833951929}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 124.6, y: -38.15}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 75, y: 75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2369707987322037555
@ -34940,9 +35037,9 @@ RectTransform:
m_Father: {fileID: 3569102849833951929}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 40.533333, y: -38.15}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 69, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3178489416745694411
@ -35079,7 +35176,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3569102849833951929
RectTransform:
m_ObjectHideFlags: 0

View File

@ -5343,6 +5343,7 @@ RectTransform:
- {fileID: 6156873677863081714}
- {fileID: 6515698538503102765}
- {fileID: 4985255296929210884}
- {fileID: 6718948033658500775}
m_Father: {fileID: 224779384557668594}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -128550,7 +128551,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.36}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -9.299999, y: 4.2}
m_AnchoredPosition: {x: -9.300003, y: 4.200001}
m_SizeDelta: {x: 1.4, y: 1.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222431668941950158
@ -128939,7 +128940,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.36}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.000015258789, y: -0}
m_AnchoredPosition: {x: 0.000015258789, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222690519356434136
@ -135112,7 +135113,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.36}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 3, y: 5.3}
m_AnchoredPosition: {x: 3, y: 5.299999}
m_SizeDelta: {x: -67.64, y: -25.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1989292816312034440
@ -135123,6 +135124,102 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7257005729978659308}
m_CullTransparentMesh: 0
--- !u!1 &7431293060587237766
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6718948033658500775}
- component: {fileID: 3983152725215165347}
- component: {fileID: 7420109698367600387}
- component: {fileID: 174395308460730710}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6718948033658500775
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7431293060587237766}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224231502868826472}
m_RootOrder: 3
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: 3, y: 65}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3983152725215165347
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7431293060587237766}
m_CullTransparentMesh: 0
--- !u!114 &7420109698367600387
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7431293060587237766}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9811321, g: 0.97976804, b: 0.9765041, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "17:20:01\u540E\u5237\u65B0"
LanguageIndex: 11485
--- !u!114 &174395308460730710
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7431293060587237766}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &8347306111350801234
GameObject:
m_ObjectHideFlags: 0

View File

@ -31,7 +31,7 @@ function PokemonSummonOneResultPanel:InitComponent()
this.itemIcon3=Util.GetGameObject(this.content3, "icon"):GetComponent("Image")
this.itemNum3=Util.GetGameObject(this.content3, "num"):GetComponent("Text")
this.itemInfo3=Util.GetGameObject(this.content3, "info"):GetComponent("Text")
this.tipText=Util.GetGameObject(this.openOneAgainButton, "Text"):GetComponent("Text")
this.content=Util.GetGameObject(self.gameObject, "content")
this.detailImage=Util.GetGameObject(self.gameObject, "Tip")
this.detailText = Util.GetGameObject(this.detailImage, "Text"):GetComponent("Text")
@ -112,6 +112,7 @@ function PokemonSummonOneResultPanel:OnOpen(...)
this.itemNum3.gameObject:SetActive(false)
this.itemIcon3.gameObject:SetActive(false)
this.itemInfo3.text=Language[12399]
this.tipText.gameObject:SetActive(false)
else
this.itemNum3.gameObject:SetActive(true)
this.itemIcon3.gameObject:SetActive(true)
@ -126,6 +127,12 @@ function PokemonSummonOneResultPanel:OnOpen(...)
local currPrivilege = privilegeConfig[3004]
itemNum = itemNum * (1+currPrivilege.Condition[1][2]/10000)
end
if itemId ==16 then
this.tipText.gameObject:SetActive(true)
this.tipText.text=string.format("妖晶召唤次数:%s/%s",PrivilegeManager.GetPrivilegeRemainValue(YaojingCallPrivilegeId), PrivilegeManager.GetPrivilegeNumber(YaojingCallPrivilegeId))
else
this.tipText.gameObject:SetActive(false)
end
this.itemIcon3.sprite=Util.LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name)
this.itemNum3.text= "x"..itemNum
end

View File

@ -39,6 +39,7 @@ function PokemonSummonTenResultPanel:InitComponent()
this.itemNum3=Util.GetGameObject(this.content3, "num"):GetComponent("Text")
this.content2=Util.GetGameObject(self.gameObject,"bottom/openTenAgainButton/Content2")
this.itemIcon2=Util.GetGameObject(this.content2,"Icon"):GetComponent("Image")
this.tipText=Util.GetGameObject(this.openTenAgainButton, "Text"):GetComponent("Text")
this.itemNum2=Util.GetGameObject(this.content2,"Num"):GetComponent("Text")
for i = 1, 10 do
this.contentList[i]=Util.GetGameObject(self.gameObject, "content/itemAnimEffect"..i.."/image/Kuang/itemName/itemContent")
@ -147,7 +148,12 @@ function PokemonSummonTenResultPanel:OnOpen(...)
id=tenConfig.TenTimesMustGetItem[1][1]
num=tenConfig.TenTimesMustGetItem[1][2]
end
if itemId ==16 then
this.tipText.gameObject:SetActive(true)
this.tipText.text=string.format("妖晶召唤次数:%s/%s",PrivilegeManager.GetPrivilegeRemainValue(YaojingCallPrivilegeId), PrivilegeManager.GetPrivilegeNumber(YaojingCallPrivilegeId))
else
this.tipText.gameObject:SetActive(false)
end
for key, value in pairs(itemDataList) do
if ishave==false and value.sId==id and value.num==num then
table.removebyvalue(itemDataList,value)

View File

@ -288,15 +288,15 @@ function this.SingleHeroDataShow(go,_heroData,isGray)
end
local starGrid = Util.GetGameObject(_go.transform, "star")
SetHeroStars(starGrid, heroData.star,1,Vector2.New(32.5,32.5),-15)
local choosed =Util.GetGameObject(_go.transform, "choosed")
if heroData.ischip then
local choosed =Util.GetGameObject(_go.transform, "choosed")
if heroData.ischip==1 then
choosed:SetActive(selectChipId==heroData.dynamicId)
else
choosed:SetActive(selectHeroData[heroData.dynamicId] ~= nil)
end
local cardclickBtn = Util.GetGameObject(_go.transform, "icon")
this.selectText.text = Language[11775]..LengthOfTable(selectHeroData).."/"..maxSelectNum
Util.AddOnceClick(cardclickBtn, function()
Util.AddOnceClick(cardclickBtn,function()
--如果点击的是碎片
if heroData.ischip==1 then
--第一个选中的碎片
@ -350,7 +350,9 @@ function this.SingleHeroDataShow(go,_heroData,isGray)
end
return
end
selectHeroData[heroData.dynamicId]=heroData
choosed:SetActive(true)
this.selectText.text = Language[11775]..LengthOfTable(selectHeroData).."/"..maxSelectNum
--如果选中灵兽的数量为最大
if LengthOfTable(selectHeroData)==maxSelectNum then
PopupTipPanel.ShowTip(string.format(Language[12396],maxSelectNum))
@ -364,11 +366,8 @@ function this.SingleHeroDataShow(go,_heroData,isGray)
this.selectText.gameObject:SetActive(true)
this.chipObj:SetActive(false)
isPokemon = true
end
choosed:SetActive(true)
selectHeroData[heroData.dynamicId]=heroData
end
this.selectText.text = Language[11775]..LengthOfTable(selectHeroData).."/"..maxSelectNum
end
end)