Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan

PC-202302260912\Administrator 2024-11-19 15:56:40 +08:00
commit cb3cba0ee4
3 changed files with 10 additions and 10 deletions

View File

@ -267,7 +267,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 441, y: 0.000015258789}
m_AnchoredPosition: {x: 441, y: -0.0000006816624}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &764029605
@ -851,7 +851,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &224266054869816714
RectTransform:
m_ObjectHideFlags: 0
@ -966,7 +966,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 0.7330102, b: 0, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -975,18 +975,18 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
m_FontSize: 0
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 24
m_Text: "\u7B49\u7EA7\u63D0\u5347\u81F32\u7EA7!"
--- !u!1 &1362948324388616
GameObject:
m_ObjectHideFlags: 0
@ -1436,7 +1436,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: 137, y: 21.195}
m_AnchoredPosition: {x: 0, y: 21.195}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &294606208569919517

View File

@ -81,7 +81,7 @@ function PlayerView:onCreate(go, role, position, root)
self.attackSound = RoleConfig[roleId].sond
self.readingName = GetLanguageStrById(HeroConfig[role.roleData.roleId].ReadingName)
self.nameText.text = self.readingName
SetTextVerTial(self.nameText, Vector3.New(33.6, -7.4, 0), "MiddleLeft", nil, 6)
--SetTextVerTial(self.nameText, Vector3.New(33.6, -7.4, 0), "MiddleLeft", nil, 6)
self.level.text = role:GetRoleData(RoleDataName.Level)
self.elementImg.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(role.roleData.element))
Util.GetGameObject(go, "GameObject/name"):GetComponent("Text").text = self.readingName

View File

@ -97,7 +97,7 @@ end
function this.ShowPanelData()
this.nameText.text = PlayerManager.nickName
this.lvNum.text = curLevel
this.lvNum.text = GetLanguageStrById("等级提升至%s级!"):format(curLevel)
this.ShowPlayerAndLevelPassOpenFun()
end