神兵回炉代码提交
parent
d8a97002d5
commit
fc218b4002
|
@ -38,7 +38,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 25, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &784533625
|
||||
|
@ -5838,85 +5838,6 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &4814957677651590046
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9092050771792794218}
|
||||
- component: {fileID: 564299429797788344}
|
||||
- component: {fileID: 6995644125464776398}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &9092050771792794218
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4814957677651590046}
|
||||
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: 8718620898924009856}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &564299429797788344
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4814957677651590046}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6995644125464776398
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4814957677651590046}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.5176471, g: 0.31764707, b: 0.22352943, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
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: 35
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u6D85\u69C3"
|
||||
--- !u!1 &4822971150472908267
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -6912,7 +6833,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -0.000030517578}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &3992972364876945023
|
||||
|
@ -8409,15 +8330,14 @@ RectTransform:
|
|||
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:
|
||||
- {fileID: 9092050771792794218}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2696076605879052416}
|
||||
m_RootOrder: 5
|
||||
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: -423, y: 372}
|
||||
m_SizeDelta: {x: 220, y: 90}
|
||||
m_AnchoredPosition: {x: 452, y: 399}
|
||||
m_SizeDelta: {x: 123, y: 123}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8202051655201889112
|
||||
CanvasRenderer:
|
||||
|
@ -8447,7 +8367,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: a379642716d30e746a7730ece97c7704, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 5d5b170ddf0c8474ba8f28857d07ebc0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
|
@ -210,15 +210,11 @@ function this.ResetBtnOnClick()
|
|||
end
|
||||
end
|
||||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.PokemonResolve,lingshouConfig,allMaterials,2,function ()
|
||||
NetManager.PokemonBackRequest(curPokemonData.dynamicId,function(msg)
|
||||
-- this.OnClickTabBtn(curIndex)
|
||||
LogError("物品"..#msg.drop.itemlist)
|
||||
LogError("灵兽"..#msg.drop.pokemon)
|
||||
PopupTipPanel.ShowTip(Language[11419])
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()
|
||||
PokemonManager.UpdateSinglePokemonData(curPokemonData.dynamicId,1,0)
|
||||
curPokemonData = PokemonManager.GetSinglePokemonData(curPokemonData.dynamicId)
|
||||
this.contents[curIndex].view:OnShow(this,curPokemonData)
|
||||
NetManager.MagicSoldierReturnRequest(godwData.Did,function(msg)
|
||||
PopupTipPanel.ShowTip("回炉成功")
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()
|
||||
GodWeaponManager.ResetGodWeapon(godwData.Did,1,0)
|
||||
this.UpdateWin(GodWeaponManager.GetSingleWeaponData(godwData.Did))
|
||||
end)
|
||||
end)
|
||||
end)
|
||||
|
|
|
@ -150,6 +150,13 @@ function this.SetGodWeaponLv(_Did,_upLv)
|
|||
end
|
||||
end
|
||||
|
||||
function this.ResetGodWeapon(_Did,_lv,_star)
|
||||
if allGodWeapons[_Did] then
|
||||
allGodWeapons[_Did].lv=_lv
|
||||
allGodWeapons[_Did].star=_star
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
--获取当前可上阵的所有灵兽数据 curUpZhenPokemonData 如果不为空就时替换上阵操作
|
||||
function this.GetCanUpZhenWeapons(_curUpZhenGodWeapon)
|
||||
|
|
|
@ -7208,6 +7208,21 @@ function NetManager.RequestMagicSoldierStrong(_id,_type,_num,_costIds,_func)
|
|||
end)
|
||||
end
|
||||
|
||||
--请求神兵回炉
|
||||
function this.MagicSoldierReturnRequest(Did, func)
|
||||
local data = PlayerInfoProto_pb.MagicSoldierReturnRequest()
|
||||
data.id = Did
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.MAGIC_SOLDIER_RETURN_REQUEST, MessageTypeProto_pb.MAGIC_SOLDIER_RETURN_RESPONSE, msg, function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = HeroInfoProto_pb.MagicSoldierReturnResponse()
|
||||
msg:ParseFromString(data)
|
||||
if func then
|
||||
func(msg)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
--上阵交换位置
|
||||
function NetManager.RequestMagicSoldierExchange(_id1,id2,_func)
|
||||
local data = PlayerInfoProto_pb.magicSoldierExchangeRequest()
|
||||
|
|
Loading…
Reference in New Issue