灵兽界面修改提交

dev_chengFeng
jiaoyangna 2021-03-02 21:06:42 +08:00
parent b4da5effa6
commit ea6e1f242c
5 changed files with 74 additions and 38 deletions

View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 16, y: 65, z: 13, w: 92}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1

View File

@ -841,6 +841,7 @@ GameObject:
- component: {fileID: 4707173299278221511}
- component: {fileID: 309248663674038662}
- component: {fileID: 6298785809566221234}
- component: {fileID: 7805423499986424984}
m_Layer: 5
m_Name: nameText
m_TagString: Untagged
@ -864,9 +865,9 @@ 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.1, y: -7}
m_SizeDelta: {x: 46.01, y: 217.55}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -50.000008, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &309248663674038662
CanvasRenderer:
m_ObjectHideFlags: 0
@ -910,6 +911,20 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u51B0\u51E4"
LanguageIndex: 0
--- !u!114 &7805423499986424984
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 198526555081314674}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &259358215116488240
GameObject:
m_ObjectHideFlags: 0
@ -1139,10 +1154,10 @@ RectTransform:
m_Father: {fileID: 1615042537090143318}
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: 2.2, y: 116}
m_SizeDelta: {x: 52.12, y: 58.43}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 2.2, y: -43}
m_SizeDelta: {x: 52.12, y: 58.429993}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4560229119903574052
CanvasRenderer:
@ -10510,9 +10525,9 @@ RectTransform:
m_Father: {fileID: 1615042537090143318}
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: 0.8, y: -124.4}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0.8, y: 34.6}
m_SizeDelta: {x: 73, y: 73}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &90935998765789724
@ -13209,9 +13224,9 @@ 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: -383.5, y: 657.1997}
m_AnchoredPosition: {x: -383.5, y: 817.3998}
m_SizeDelta: {x: 90, y: 318}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1024848874663825784
CanvasRenderer:
m_ObjectHideFlags: 0
@ -13241,7 +13256,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 02d017b768196614cba74209330fa078, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4

View File

@ -135254,8 +135254,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: 3.3, y: -0.15000153}
m_SizeDelta: {x: 69, y: 100}
m_AnchoredPosition: {x: 0.0010071, y: -0.15000153}
m_SizeDelta: {x: 301.63, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1617197464721193097
CanvasRenderer:
@ -135391,7 +135391,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4985255296929210884
RectTransform:
m_ObjectHideFlags: 0

View File

@ -5308,7 +5308,7 @@ ParticleSystem:
--- !u!199 &199793888397422328
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -10774,7 +10774,7 @@ ParticleSystem:
--- !u!199 &199786334729933541
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -15693,7 +15693,7 @@ ParticleSystem:
--- !u!199 &199812891778826125
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -20542,7 +20542,7 @@ ParticleSystem:
--- !u!199 &199314592830468766
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -25352,7 +25352,7 @@ ParticleSystem:
--- !u!199 &199738970247411175
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -30962,7 +30962,7 @@ ParticleSystem:
--- !u!199 &199312732024159113
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -37181,7 +37181,7 @@ ParticleSystem:
--- !u!199 &199309040906483979
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -41937,7 +41937,7 @@ ParticleSystem:
--- !u!199 &199592651100025897
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -46974,7 +46974,7 @@ ParticleSystem:
--- !u!199 &199310039250832541
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -51730,7 +51730,7 @@ ParticleSystem:
--- !u!199 &199031629276305175
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -56773,7 +56773,7 @@ ParticleSystem:
--- !u!199 &199224694020007487
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -68487,6 +68487,7 @@ GameObject:
- component: {fileID: 7239026099364975293}
- component: {fileID: 2409354101571644412}
- component: {fileID: 2938755637160466636}
- component: {fileID: 7718409313940202046}
m_Layer: 5
m_Name: PosText
m_TagString: Untagged
@ -68510,9 +68511,9 @@ 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: 0, y: -12.275}
m_SizeDelta: {x: 46.01, y: 217.55}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 96.50002}
m_SizeDelta: {x: 46.01, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &2409354101571644412
CanvasRenderer:
m_ObjectHideFlags: 0
@ -68556,6 +68557,20 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u707C\u70E7\u961F\u8F85\u52A9"
LanguageIndex: 10916
--- !u!114 &7718409313940202046
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2874523714712130312}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &2890169538000430161
GameObject:
m_ObjectHideFlags: 0
@ -77498,9 +77513,9 @@ 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: -103.600006, y: -245.90002}
m_AnchoredPosition: {x: -103.600006, y: -87.400024}
m_SizeDelta: {x: 76, y: 317}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &3106899146448769794
CanvasRenderer:
m_ObjectHideFlags: 0
@ -96925,9 +96940,9 @@ RectTransform:
m_Father: {fileID: 3696569561683301932}
m_RootOrder: 0
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: 0, y: 127.5}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -30.5}
m_SizeDelta: {x: 62, y: 62}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7451180900373670721

View File

@ -38,7 +38,7 @@ function PokemonInfoPanel:InitComponent()
this.live2dRoot = Util.GetGameObject(self.gameObject, "live2dRoot")
this.bg = Util.GetGameObject(self.gameObject, "bg")
this.starGrid = Util.GetGameObject(self.transform, "starGrid/starGrid(Clone)")
this.nameInfo = Util.GetGameObject(self.transform, "nameInfo")
this.namne = Util.GetGameObject(self.transform, "nameInfo/nameText"):GetComponent("Text")
this.sortText = Util.GetGameObject(self.transform, "nameInfo/sortText")
this.upZhenImage = Util.GetGameObject(self.transform, "nameInfo/upZhenImage"):GetComponent("Image")
@ -363,7 +363,13 @@ function this.UpdateHeroInfoData()
upZhenDidis = PokemonManager.GetAllPokemonFormationDids()
sortIndex = upZhenDidis[curPokemonData.dynamicId] and upZhenDidis[curPokemonData.dynamicId].position or 0
this.namne.text = GetStringByEquipQua(curPokemonConFigData.Quality, GetLanguageStrById(curPokemonConFigData.Name))
SetTextVerTial(this.namne,Vector3.New(98,1.64,0))
SetTextVerTial(this.namne,Vector3.New(70,-1,0))
LogGreen("rect.x:"..GetPreferredWidth( this.namne.transform))
local width = GetPreferredWidth(this.namne.transform)
local vec = this.nameInfo:GetComponent("RectTransform").sizeDelta
vec.y = (width + 180)
this.nameInfo:GetComponent("RectTransform").sizeDelta = vec
this.sortText:SetActive(sortIndex > 0)
this.sortText:GetComponent("Text").text = sortIndex
this.upZhenImage.gameObject:SetActive(sortIndex > 0)