灵兽界面修改

wangzhenxing 2023-11-11 15:42:30 +08:00
parent c52bf49652
commit 9ee7c9793f
7 changed files with 733 additions and 727 deletions

View File

@ -4950,7 +4950,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: 0b995aca1fd38a84cb89d90c5620561c, type: 3}
m_Sprite: {fileID: 21300000, guid: 70880bb948d704640910d7f25d8c5294, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -8843,7 +8843,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: 0b995aca1fd38a84cb89d90c5620561c, type: 3}
m_Sprite: {fileID: 21300000, guid: 70880bb948d704640910d7f25d8c5294, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -9435,7 +9435,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: 0b995aca1fd38a84cb89d90c5620561c, type: 3}
m_Sprite: {fileID: 21300000, guid: 70880bb948d704640910d7f25d8c5294, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -18699,7 +18699,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: 0b995aca1fd38a84cb89d90c5620561c, type: 3}
m_Sprite: {fileID: 21300000, guid: 70880bb948d704640910d7f25d8c5294, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -1126,7 +1126,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u7075\u517D\u5546\u5E97"
m_Text: "\u7075\u517D\u5BC6\u5377"
--- !u!114 &223535537
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1284,8 +1284,8 @@ 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: -1.9999824, y: -4.0000267}
m_SizeDelta: {x: 130, y: 150}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 183, y: 164}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &244524079
CanvasRenderer:
@ -1315,7 +1315,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: 4caaec6896cece243b12ecf9cf6d1404, type: 3}
m_Sprite: {fileID: 21300000, guid: 71dbe391285f107449dbd36733c5a946, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -1664,7 +1664,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u653E\u751F\u7075\u517D"
m_Text: "\u51FA\u6218\u52A0\u6210"
--- !u!114 &326138655
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1932,8 +1932,8 @@ 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: -1.9999824, y: -4.0000267}
m_SizeDelta: {x: 130, y: 150}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 159, y: 164}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &381124679
CanvasRenderer:
@ -1963,7 +1963,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: 4caaec6896cece243b12ecf9cf6d1404, type: 3}
m_Sprite: {fileID: 21300000, guid: 1d0319f07020b7446a88cc1fea1a69fc, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -2256,7 +2256,7 @@ MonoBehaviour:
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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
@ -2728,7 +2728,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u51FA\u6218\u52A0\u6210"
m_Text: "\u7075\u517D\u653E\u7F6E"
--- !u!114 &586208661
MonoBehaviour:
m_ObjectHideFlags: 0
@ -2823,7 +2823,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u7075\u517D\u5546\u5E97"
m_Text: "\u7075\u517D\u5217\u8868"
--- !u!114 &601135007
MonoBehaviour:
m_ObjectHideFlags: 0
@ -5003,8 +5003,8 @@ 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: -1.9999824, y: -4.0000267}
m_SizeDelta: {x: 130, y: 150}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 175, y: 164}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1018141518
CanvasRenderer:
@ -5034,7 +5034,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: 4caaec6896cece243b12ecf9cf6d1404, type: 3}
m_Sprite: {fileID: 21300000, guid: 47476438ae3b74d48be4f6d4fb0c3cd5, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -5187,7 +5187,7 @@ MonoBehaviour:
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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
@ -6507,7 +6507,7 @@ MonoBehaviour:
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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
@ -6587,7 +6587,7 @@ MonoBehaviour:
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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
@ -7261,7 +7261,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1.9999824, y: -4.0000267}
m_SizeDelta: {x: 130, y: 150}
m_SizeDelta: {x: 179, y: 164}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1357612512
CanvasRenderer:
@ -7291,7 +7291,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: 4caaec6896cece243b12ecf9cf6d1404, type: 3}
m_Sprite: {fileID: 21300000, guid: a6e5c1ff36c0f484bac142a8a5122395, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -8063,8 +8063,8 @@ 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: -2, y: -4}
m_SizeDelta: {x: 130, y: 150}
m_AnchoredPosition: {x: -0.84, y: 4.48}
m_SizeDelta: {x: 120, y: 164.03}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1476631785
CanvasRenderer:
@ -8182,7 +8182,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u7075\u517D\u5217\u8868"
m_Text: "\u7075\u517D\u5546\u5E97"
--- !u!114 &1479778418
MonoBehaviour:
m_ObjectHideFlags: 0
@ -9921,7 +9921,7 @@ MonoBehaviour:
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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
@ -10090,7 +10090,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u7075\u517D\u79D8\u5377"
m_Text: "\u7075\u517D\u53EC\u5524"
--- !u!114 &1819971115
MonoBehaviour:
m_ObjectHideFlags: 0
@ -11950,7 +11950,7 @@ MonoBehaviour:
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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
@ -13161,7 +13161,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: 54.7, y: 50}
m_AnchoredPosition: {x: 72.7, y: 67}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5243434169361388209
@ -13235,7 +13235,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: 54.7, y: 50}
m_AnchoredPosition: {x: 70.7, y: 70.1}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6574617383526430801
@ -13718,7 +13718,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: 54.7, y: 50}
m_AnchoredPosition: {x: 78.000015, y: 67.00001}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2001209647647210950
@ -13935,7 +13935,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: 54.7, y: 50}
m_AnchoredPosition: {x: 72.4, y: 68.9}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3068984907773215728
@ -14118,7 +14118,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: 54.7, y: 50}
m_AnchoredPosition: {x: 78.000015, y: 71.495026}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6072358441722415109
@ -14344,7 +14344,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: 54.7, y: 50.5}
m_AnchoredPosition: {x: 74.1, y: 69.9}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3948743986452837990

View File

@ -262,7 +262,7 @@ function IncarnationPanel:RefreshSingleCardPre(cardPre,data,isJump,index)
self.cardList[cardPre].cardBg.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[data.quality])
if isJump then
Util.AddOnceClick(self.cardList[cardPre].getBtn,function()
UIManager.OpenPanel(UIName.RewardTailsmanChipShowPopup, data.itemId)
--UIManager.OpenPanel(UIName.RewardTailsmanChipShowPopup, data.itemId)
end)
end
SetCardStars(self.cardList[cardPre].StarGrid,data.star,1)

View File

@ -4,8 +4,8 @@ local sortingOrder=0
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
local spiritAnimal = ConfigManager.GetConfig(ConfigName.SpiritAnimal)
local TabBox = require("Modules/Common/TabBox")
local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[10214] },
[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[10201] },
local _TabData={ [1] = { default = "UI_hz_gonghui_19", select = "UI_hz_gonghui_18", name = Language[10214] },
[2] = { default = "UI_hz_gonghui_19", select = "UI_hz_gonghui_18", name = Language[10201] },
}
local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)}
@ -222,7 +222,11 @@ function this.TabAdapter(tab, index, status)
local tabLab = Util.GetGameObject(tab, "Text")
local tabImage = Util.GetGameObject(tab,"Image")
tabImage:GetComponent("Image").sprite = this.spLoader:LoadSprite(_TabData[index][status])
-- tabImage:GetComponent("Image"):SetNativeSize()
if status=="default" then
tabImage:GetComponent("RectTransform").sizeDelta = Vector2.New(105,58)
elseif status=="select" then
tabImage:GetComponent("RectTransform").sizeDelta = Vector2.New(105,70)
end
tabLab:GetComponent("Text").text = GetCurLanguage() ~= 2 and _TabData[index].name or "<size=40>".._TabData[index].name.."</size>"
tabLab:GetComponent("Text").color = _TabFontColor[status]
-- tabImage.transform.localPosition = Vector3.New( tabImage.transform.localPosition.x, _TabImagePos[status], 0);

View File

@ -14,7 +14,7 @@ function this:InitComponent(gameObject)
this.ItemPre = Util.GetGameObject(gameObject, "PokemonListPanel_UpWar/ItemPre")
local v2 = Util.GetGameObject(gameObject, "PokemonListPanel_UpWar/ScrollParentView"):GetComponent("RectTransform").rect
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(gameObject, "PokemonListPanel_UpWar/ScrollParentView").transform,
this.ItemPre, nil, Vector2.New(-v2.x*2, -v2.y*2), 1, 1, Vector2.New(0,-12))
this.ItemPre, nil, Vector2.New(-v2.x*2, -v2.y*2), 1, 1, Vector2.New(0,0))
this.ScrollView.moveTween.MomentumAmount = 1
this.ScrollView.moveTween.Strength = 1
this.NoneImage = Util.GetGameObject(gameObject, "PokemonListPanel_UpWar/NoneImage")

View File

@ -109,7 +109,7 @@ function FourTrailSingleHelpHero:SetIcon1(heroData,player)
self.selectText.text = ""
self.btn:GetComponent("Button").enabled = false
else
self.select.sprite = self.spLoader:LoadSprite("r_hero_button_001")
self.select.sprite = self.spLoader:LoadSprite("Btn_hz_cheng_01")
self.select:SetNativeSize()
self.selectText.text = "取消选择"
Util.AddOnceClick(self.btn, function()
@ -141,7 +141,7 @@ function FourTrailSingleHelpHero:SetIcon1(heroData,player)
self.selectText.text = ""
self.btn:GetComponent("Button").enabled = false
else
self.select.sprite = self.spLoader:LoadSprite("r_hero_button_001")
self.select.sprite = self.spLoader:LoadSprite("Btn_hz_cheng_01")
self.select:SetNativeSize()
self.selectText.text = "选择神将"
Util.AddOnceClick(self.btn, function()
@ -173,7 +173,7 @@ function FourTrailSingleHelpHero:SetIcon2(heroData)
Util.AddOnceClick(self.btn, function()
end)
else
self.select.sprite = self.spLoader:LoadSprite("r_hero_button_001")
self.select.sprite = self.spLoader:LoadSprite("Btn_hz_cheng_01")
self.select:SetNativeSize()
self.selectText.text = "选择神将"
Util.AddOnceClick(self.btn, function()