diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSkillInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSkillInfoPopup.prefab index cf54c619ea..5cea436a2d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSkillInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSkillInfoPopup.prefab @@ -35,8 +35,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 470.84998, y: -89} - m_SizeDelta: {x: 555.1, y: 165} + m_AnchoredPosition: {x: 470.84998, y: -80} + m_SizeDelta: {x: 555.1, y: 154} m_Pivot: {x: 1, y: 1} --- !u!222 &6516281780208366694 CanvasRenderer: @@ -68,7 +68,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 30 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -158,7 +158,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 426.60004, y: -12} - m_SizeDelta: {x: 466.6, y: 44} + m_SizeDelta: {x: 466.6, y: 38} m_Pivot: {x: 1, y: 1} --- !u!222 &7897598215815499727 CanvasRenderer: @@ -181,7 +181,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.7607844, b: 0.5019608, a: 1} + m_Color: {r: 0.7058824, g: 0.6117647, b: 0.45882353, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -190,7 +190,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -237,8 +237,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 466.6, y: -38} - m_SizeDelta: {x: 466.6, y: 114} + m_AnchoredPosition: {x: 466.6, y: -30} + m_SizeDelta: {x: 466.6, y: 92} m_Pivot: {x: 1, y: 1} --- !u!222 &403728868817563630 CanvasRenderer: @@ -261,7 +261,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.8784314, g: 0.8392157, b: 0.78039217, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -270,7 +270,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 35 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -322,8 +322,8 @@ 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: -173} - m_SizeDelta: {x: 466.6, y: 156} + m_AnchoredPosition: {x: 350, y: -158} + m_SizeDelta: {x: 466.6, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4223889078831659468 CanvasRenderer: @@ -347,7 +347,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: -1 - m_MinHeight: 120 + m_MinHeight: 105 m_PreferredWidth: -1 m_PreferredHeight: -1 m_FlexibleWidth: -1 @@ -424,8 +424,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 470.8, y: -56} - m_SizeDelta: {x: 555, y: 33} + m_AnchoredPosition: {x: 470.8, y: -50} + m_SizeDelta: {x: 555, y: 30} m_Pivot: {x: 1, y: 1} --- !u!222 &3686764731293620100 CanvasRenderer: @@ -457,7 +457,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 30 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -583,8 +583,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 470.84998, y: -56} - m_SizeDelta: {x: 555.1, y: 33} + m_AnchoredPosition: {x: 470.84998, y: -50} + m_SizeDelta: {x: 555.1, y: 30} m_Pivot: {x: 1, y: 1} --- !u!222 &1496520769140915758 CanvasRenderer: @@ -616,7 +616,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 30 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -664,8 +664,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 470.8, y: -89} - m_SizeDelta: {x: 555, y: 165} + m_AnchoredPosition: {x: 470.8, y: -80} + m_SizeDelta: {x: 555, y: 154} m_Pivot: {x: 1, y: 1} --- !u!222 &734276332181323415 CanvasRenderer: @@ -697,7 +697,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 30 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -786,7 +786,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: 193.3, y: -256} + m_AnchoredPosition: {x: 193.3, y: -236} m_SizeDelta: {x: 725, y: 4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &922872341014384246 @@ -861,7 +861,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 466.6, y: 0} - m_SizeDelta: {x: 466.6, y: 38} + m_SizeDelta: {x: 466.6, y: 30} m_Pivot: {x: 1, y: 1} --- !u!222 &909516327724283881 CanvasRenderer: @@ -884,7 +884,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.8784314, g: 0.8392157, b: 0.78039217, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -893,7 +893,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 35 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -945,8 +945,8 @@ 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: -636} - m_SizeDelta: {x: 466.6, y: 254} + m_AnchoredPosition: {x: 350, y: -576} + m_SizeDelta: {x: 466.6, y: 234} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2152063546545743412 CanvasRenderer: @@ -1055,7 +1055,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 29, y: 0} - m_SizeDelta: {x: 600, y: 783} + m_SizeDelta: {x: 600, y: 713} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4199312890852100444 CanvasRenderer: @@ -1149,7 +1149,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4991768350018886024 RectTransform: m_ObjectHideFlags: 0 @@ -1507,8 +1507,8 @@ 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: -380} - m_SizeDelta: {x: 466.6, y: 258} + m_AnchoredPosition: {x: 350, y: -340} + m_SizeDelta: {x: 466.6, y: 238} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4993566593057991600 CanvasRenderer: @@ -1781,7 +1781,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: 233.3, y: -154} + m_AnchoredPosition: {x: 233.3, y: -124} m_SizeDelta: {x: 725, y: 4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7114343251047875740 @@ -1973,7 +1973,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 426.60004, y: -12} - m_SizeDelta: {x: 466.6, y: 44} + m_SizeDelta: {x: 466.6, y: 38} m_Pivot: {x: 1, y: 1} --- !u!222 &8922295556461203564 CanvasRenderer: @@ -1996,7 +1996,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.7607844, b: 0.5019608, a: 1} + m_Color: {r: 0.7058824, g: 0.6117647, b: 0.45882353, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -2005,7 +2005,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua index cda1b6b0fb..cc09c33874 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua @@ -61,7 +61,7 @@ function PokemonGetInfoPopup:OnShow() end function this.GetShowPanelData() local pokemonSData=ConfigManager.GetConfigData(ConfigName.SpiritAnimal, pokemonBackData.tempId) - this.heroName.text = pokemonSData.Name + this.heroName.text = GetStringByEquipQua(pokemonSData.Quality, pokemonSData.Name) this.ShowPokemonLive(pokemonSData) --星级 PokemonManager.SetHeroStars(this.starGrid, pokemonBackData.star,2,Vector2.New(60,60)) @@ -102,7 +102,7 @@ function this.GetShowPanelData() end function this.NoGetShowPanelData() local pokemonSData=ConfigManager.GetConfigData(ConfigName.SpiritAnimal, pokemonSid) - this.heroName.text = pokemonSData.Name + this.heroName.text = GetStringByEquipQua(pokemonSData.Quality, pokemonSData.Name) this.ShowPokemonLive(pokemonSData) --星级 PokemonManager.SetHeroStars(this.starGrid, 0,2,Vector2.New(60,60)) diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua index 480d4629aa..d540ad47cd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua @@ -362,7 +362,7 @@ function this.UpdateHeroInfoData() --常规属性赋值 upZhenDidis = PokemonManager.GetAllPokemonFormationDids() sortIndex = upZhenDidis[curPokemonData.dynamicId] and upZhenDidis[curPokemonData.dynamicId].position or 0 - this.namne.text = curPokemonConFigData.Name + this.namne.text = GetStringByEquipQua(curPokemonConFigData.Quality, curPokemonConFigData.Name) this.sortText:SetActive(sortIndex > 0) this.sortText:GetComponent("Text").text = sortIndex this.upZhenImage:SetActive(sortIndex > 0)