From c79139943128dee53d792747b3692333e04d21ca Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Sat, 24 Oct 2020 16:44:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=81=B5=E5=85=BD=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Pokemon/PokemonListPanel.prefab | 74 +++++++++---------- .../~Lua/Modules/Net/NetManager.lua | 3 + .../Pokemon/PokemonSingleResultPanel.lua | 2 +- .../Pokemon/view/PokemonInfoPanel_UpLv.lua | 2 + .../Pokemon/view/PokemonInfoPanel_UpStar.lua | 1 + .../Pokemon/view/PokemonListPanel_Fetter.lua | 1 + .../Pokemon/view/PokemonListPanel_List.lua | 2 +- .../Pokemon/view/PokemonListPanel_UpWar.lua | 2 + 8 files changed, 48 insertions(+), 39 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab index 05d1602127..d9cf540f5f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab @@ -1171,10 +1171,10 @@ RectTransform: m_Father: {fileID: 1434578511743206201} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 131.95, y: -15} + m_SizeDelta: {x: 263.9, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1377273630430877543 GameObject: @@ -1441,10 +1441,10 @@ RectTransform: m_Father: {fileID: 5263201763110471827} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 855.2, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 428.25, y: -273.5} + m_SizeDelta: {x: 855.2, y: 547} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4518461394217738839 MonoBehaviour: @@ -3064,10 +3064,10 @@ RectTransform: m_Father: {fileID: 5263201763110471827} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 856.72, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 428.25, y: -648.99} + m_SizeDelta: {x: 856.72, y: 4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3320342659163927940 CanvasRenderer: @@ -3721,10 +3721,10 @@ RectTransform: m_Father: {fileID: 1434578511743206201} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 131.95, y: -63.239998} + m_SizeDelta: {x: 263.9, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4084094997388228532 GameObject: @@ -4252,10 +4252,10 @@ RectTransform: m_Father: {fileID: 1434578511743206201} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 584.15, y: -15} + m_SizeDelta: {x: 263.9, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4496057043065429082 GameObject: @@ -4643,7 +4643,7 @@ RectTransform: 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: -273, y: -56} + m_AnchoredPosition: {x: -255, y: -58} m_SizeDelta: {x: 254.65, y: 254.65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6778870542754512569 @@ -4681,14 +4681,14 @@ RectTransform: m_GameObject: {fileID: 5342577287841063188} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.59999996, y: 0.59999996, z: 0.7} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} m_Children: [] m_Father: {fileID: 7902341944916259896} m_RootOrder: 2 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: -308.9, y: 1.97} + m_AnchoredPosition: {x: -318, y: 1.97} m_SizeDelta: {x: 254.65, y: 254.65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4509431250941121754 @@ -5067,10 +5067,10 @@ RectTransform: m_Father: {fileID: 6971957839476499601} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 260, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 433.4, y: -49.995} + m_SizeDelta: {x: 260, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &486701352179962419 CanvasRenderer: @@ -6209,7 +6209,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 428.25, y: -596.995} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 866.8, y: 99.99} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5152306157904648720 MonoBehaviour: @@ -6519,7 +6519,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5742798183766346997 RectTransform: m_ObjectHideFlags: 0 @@ -6810,10 +6810,10 @@ RectTransform: m_Father: {fileID: 1434578511743206201} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 584.15, y: -63.239998} + m_SizeDelta: {x: 263.9, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7924725162967152386 GameObject: @@ -7385,8 +7385,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -2083.2502, y: 13.6} - m_SizeDelta: {x: 856.5, y: 0} + m_AnchoredPosition: {x: -2083.2502, y: 13.600006} + m_SizeDelta: {x: 856.5, y: 650.99} m_Pivot: {x: 0, y: 1} --- !u!114 &5109811759825171654 MonoBehaviour: @@ -7802,14 +7802,14 @@ RectTransform: m_GameObject: {fileID: 8898783162232612379} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.59999996, y: 0.59999996, z: 0.7} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} m_Children: [] m_Father: {fileID: 7902341944916259896} 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: -308.33, y: 1.59} + m_AnchoredPosition: {x: -317.4299, y: 1.59} m_SizeDelta: {x: 236.61, y: 236.61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6848838078056612284 diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 2bde5ad40e..f357e507a7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -4585,6 +4585,9 @@ function this.PokemonFreeRequest(pokemonIds,chipId,chipNum, func) Network:SendMessageWithCallBack(MessageTypeProto_pb.POKEMON_FREE_REQUEST, MessageTypeProto_pb.POKEMON_FREE_RESPONSE, msg, function(buffer) local data = buffer:DataByte() local msg = HeroInfoProto_pb.PokemonFreeResponse() + if func then + func(msg) + end end) end --摇骰子请求 diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua index a4bcea1897..14d1729c41 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua @@ -131,6 +131,7 @@ end function PokemonSingleResultPanel:UpdataPanelData(_heroData) --赋值展示界面数据 -- local time2 = Timer.New(function () + heroStaticData = heroConfigData[_heroData.tempId] this.UI_Effect_appear:SetActive(false) SoundManager.PlaySound(SoundConfig.Sound_Recruit3) @@ -139,7 +140,6 @@ function PokemonSingleResultPanel:UpdataPanelData(_heroData) heroStaticData, testLiveGO = nil, nil end - heroStaticData = heroConfigData[_heroData.tempId] --不同星级开启不同特效 this.UI_Effect_choukaSSR:SetActive(true) --TODO:动态加载立绘 diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua index 5ab5d57180..9ca69d9574 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua @@ -191,6 +191,7 @@ function this.LongLvUpClick(oldLv) _isReqLvUp = false local newWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower) + FormationManager.CheckHeroIdExist() end) end --升级按钮点击事件处理 @@ -217,6 +218,7 @@ function this.LvUpClick(isSingleLvUp) this.ShowPokemonInfo() local newWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower) + FormationManager.CheckHeroIdExist() end) else --前端先扣除材料 diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua index 684ee62788..a2309e5a5f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpStar.lua @@ -189,6 +189,7 @@ function this.StarUpClick() this.OnShowData() local newWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower) + FormationManager.CheckHeroIdExist() end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_Fetter.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_Fetter.lua index f2b5549c4e..7f7f5534b7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_Fetter.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_Fetter.lua @@ -135,6 +135,7 @@ function this.SingleItemDataShow(_go,_fetterData) PopupTipPanel.ShowTip(string.format("成功激活羁绊【%s】!",config.Name)) PokemonManager.UpdatePokemonFetterDatas(_fetterData.id) this.ShowPokemonFetterData() + FormationManager.CheckHeroIdExist() end) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua index b271d33490..15428c6bec 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua @@ -124,7 +124,7 @@ function this.SingPokemonChipDataShow(_go,_itemData) if not this.ChipItemList[_go] then this.ChipItemList[_go] = SubUIManager.Open(SubUIConfig.ItemView, Util.GetTransform(_go, "itemParent").transform) end - this.ChipItemList[_go]:OnOpen(false, { _itemData.id, 0 }, 0.97) + this.ChipItemList[_go]:OnOpen(false, { _itemData.id, 0 }, 0.9) this.ChipItemList[_go].gameObject:SetActive(true) Util.GetGameObject(_go.transform,"name"):GetComponent("Text").text=_itemData.itemConfig.Name diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua index 62c147b2d9..8a57612fc9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua @@ -94,6 +94,7 @@ function this.SingleItemDataShow(_go,_itemData) PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower) parent:ClosePanel() Game.GlobalEvent:DispatchEvent(GameEvent.Pokemon.PokemonUpZhenRefresh) + FormationManager.CheckHeroIdExist() end) end else @@ -118,6 +119,7 @@ function this.SingleItemDataShow(_go,_itemData) PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower) parent:ClosePanel() Game.GlobalEvent:DispatchEvent(GameEvent.Pokemon.PokemonUpZhenRefresh) + FormationManager.CheckHeroIdExist() end) -- local pokemonMainPanel = UIManager.GetOpenPanel(UIName.PokemonMainPanel) -- if pokemonMainPanel then