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

tcx_xiyou_yueNan
PC-202302260912\Administrator 2025-01-03 13:19:32 +08:00
commit cf5140e678
3 changed files with 15 additions and 15 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

View File

@ -301,7 +301,7 @@ RectTransform:
- {fileID: 6162447165142731692}
- {fileID: 1868646575390949040}
m_Father: {fileID: 224894693585688482}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -496,8 +496,8 @@ RectTransform:
- {fileID: 224468442047132512}
- {fileID: 224690885248152168}
- {fileID: 224672060862089170}
- {fileID: 5728652553189984871}
- {fileID: 224117904252964514}
- {fileID: 5728652553189984871}
m_Father: {fileID: 224348053454453456}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4162,7 +4162,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4313925563179242129}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
@ -4171,7 +4171,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: 0, y: 214.5}
m_AnchoredPosition: {x: -1, y: 192.6}
m_SizeDelta: {x: 62, y: 62}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3729686816201694357
@ -5489,18 +5489,18 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5556733359249093187}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9999202, y: 0.9999202, z: 0.9999202}
m_Children:
- {fileID: 5844702033721285765}
- {fileID: 6224517589887850187}
m_Father: {fileID: 224894693585688482}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -393, y: 248.1}
m_AnchoredPosition: {x: 0, y: -212}
m_SizeDelta: {x: 76, y: 488.81}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2045152789844932229
@ -5565,7 +5565,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5682976378230427090}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
@ -5574,8 +5574,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: 0, y: 67.64}
m_SizeDelta: {x: 46.01, y: 228.86}
m_AnchoredPosition: {x: -0, y: -14.07}
m_SizeDelta: {x: 391.96, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4824495337079565219
CanvasRenderer:
@ -5802,9 +5802,9 @@ RectTransform:
m_Father: {fileID: 4624725292118211212}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 141.3, y: -50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 141.3, y: 0}
m_SizeDelta: {x: 0, y: 100.75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2932693287766199764

View File

@ -306,7 +306,7 @@ function this.ShowHeroLive(_heroSConfigData)
this.posBgImage.sprite = this.spLoader:LoadSprite(GetHeroPosBgStr(_heroSConfigData.Profession))
this.posImage.sprite = this.spLoader:LoadSprite(GetHeroPosStr(_heroSConfigData.Profession))
this.posText.text = GetLanguageStrById(_heroSConfigData.HeroLocation)
SetTextVerTial(this.posText.gameObject, Vector3.New(67.5, 0, 0), "MiddleLeft")
--SetTextVerTial(this.posText.gameObject, Vector3.New(67.5, 0, 0), "MiddleLeft")
this.heroName.text = GetLanguageStrById(_heroSConfigData.ReadingName)
-- this.posText.text = HeroOccupationDef[_heroSConfigData.Profession]
-- this.posImage.sprite = this.spLoader:LoadSprite(GetJobSpriteStrByJobNum(_heroSConfigData.Profession))