diff --git a/Assets/ManagedResources/Prefabs/UI/HeroView/Hero.prefab b/Assets/ManagedResources/Prefabs/UI/HeroView/Hero.prefab index 05a31e2bf3..941b9a36bf 100644 --- a/Assets/ManagedResources/Prefabs/UI/HeroView/Hero.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HeroView/Hero.prefab @@ -3671,17 +3671,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2321463155908299441} - 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: - {fileID: 3931285137136619946} m_Father: {fileID: 2535060995107670383} m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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: -110.7, y: 101} + m_AnchoredPosition: {x: 0, y: -77.3} m_SizeDelta: {x: 34, y: 144} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2533087744653275639 @@ -3901,17 +3901,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3861246476698237326} - 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: [] m_Father: {fileID: 2534974135485703921} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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: -0.0000038146973, y: -8.6} - m_SizeDelta: {x: 34, y: 119.76} + m_AnchoredPosition: {x: 0, y: -3.7} + m_SizeDelta: {x: 121.5, y: 37.98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3928616530255460510 CanvasRenderer: @@ -3945,7 +3945,7 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 26 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 2 m_MaxSize: 40 m_Alignment: 4 @@ -5473,61 +5473,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 5604575237176871980} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 2781956092999469958} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 4323910751547465844} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 4188154102939628659} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 5751542467658570096} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 1635261678954337433} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 282867109870513768} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 3754770888401953591} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 7731683927786752333} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 8527740019373324453} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 5604575237176871980} - target: {fileID: 7403699146335805459, guid: b3059016602827b498a9d22dcc4876c0, type: 3} propertyPath: m_Bones.Array.data[0] @@ -5583,6 +5528,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 2966252891034735873} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 5604575237176871980} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 2781956092999469958} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 4323910751547465844} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 4188154102939628659} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 5751542467658570096} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 1635261678954337433} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 282867109870513768} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 3754770888401953591} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 7731683927786752333} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 8527740019373324453} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 5604575237176871980} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3059016602827b498a9d22dcc4876c0, type: 3} --- !u!4 &2781956092999469958 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab index 42600b4311..f3b29fcaba 100644 --- a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab @@ -35,7 +35,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: -250, y: -250} + m_AnchoredPosition: {x: -250, y: -208.1} m_SizeDelta: {x: 400, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6327614226166072538 @@ -236,7 +236,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 250, y: 0} - m_SizeDelta: {x: 400, y: 50} + m_SizeDelta: {x: 400, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &418745388265052990 CanvasRenderer: @@ -276,7 +276,7 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u4E0A\u9635\u4F5B\u7CFB\u795E\u5C06\u22641" @@ -316,7 +316,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: 250, y: -250} + m_AnchoredPosition: {x: 250, y: -208.1} m_SizeDelta: {x: 400, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5635808597088384843 @@ -3494,7 +3494,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 250, y: 0} - m_SizeDelta: {x: 400, y: 50} + m_SizeDelta: {x: 400, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7506456495510981732 CanvasRenderer: @@ -3534,7 +3534,7 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u4E0A\u9635\u4F5B\u7CFB\u795E\u5C06\u22641" @@ -3897,7 +3897,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -32.5} - m_SizeDelta: {x: 400, y: 235} + m_SizeDelta: {x: 450, y: 235} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4422357040054325170 MonoBehaviour: @@ -3919,7 +3919,7 @@ MonoBehaviour: m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 400, y: 50} + m_CellSize: {x: 422.9, y: 72} m_Spacing: {x: 0, y: 0} m_Constraint: 0 m_ConstraintCount: 2 @@ -4514,7 +4514,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 250, y: 0} - m_SizeDelta: {x: 400, y: 50} + m_SizeDelta: {x: 400, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5474060771858087290 CanvasRenderer: @@ -4554,7 +4554,7 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u4E0A\u9635\u4F5B\u7CFB\u795E\u5C06\u22641" diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 105f26cbbb..6eecac5a6c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -634,7 +634,7 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData) SetHeroFormationFlyEffect(o, this.spLoader, kaPaiEffect, star, orginLayer) name.text = GetLanguageStrById(heroData.heroConfig.ReadingName) - SetTextVerTial(name.gameObject, Vector3.New(29.24, -7.45, 0), nil, nil, 8) + --SetTextVerTial(name.gameObject, Vector3.New(29.24, -7.45, 0), nil, nil, 8) local curHeroHpVal = FormationManager.GetFormationHeroHp(this.curFormationIndex, _heroData.dynamicId) hp.fillAmount = curHeroHpVal or 1 @@ -650,7 +650,7 @@ function this.CalculateAllHeroPower(curHeroData, allHeroTeamAddProVal) -- LogPink("OLD TEAM POWER:"..this.formationPowerOld) local allEquipAddProVal = HeroPowerManager.GetHeroPower(curHeroData.dynamicId, FormationTypeDef.FORMATION_TEMPORARY) --HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false,nil,nil,true,allHeroTeamAddProVal) this.formationPower = this.formationPower + - allEquipAddProVal --[HeroProType.WarPower] + allEquipAddProVal --[HeroProType.WarPower] LogPink("NEW TEAM POWER:" .. this.formationPower) end diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianMonsterInfo.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianMonsterInfo.lua index ae273bf942..0e26149a52 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianMonsterInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianMonsterInfo.lua @@ -98,7 +98,8 @@ end -- 编队数据匹配 function QiJieShiLianMonsterInfo:FormationAdapter() - self.titleText.text = string.format(Language[12491], GetLanguageStrById(self.configData.Chapter), self.configData.Stage) + self.titleText.text = string.format(Language[12491], GetLanguageStrById(self.configData.Chapter), + self.configData.Stage) self.power.text = self.configData.Puwer local bossTeaminfo = monsterGroup[self.configData.MonsterGroup].Contents[1] for i = 1, #heroListGo do @@ -147,7 +148,7 @@ function QiJieShiLianMonsterInfo:SetCardSingleData(o, monsterId, _pos) local starGrid = Util.GetGameObject(o, "StarGrid") SetCardStars(starGrid, monsterconfig.Star) local name = Util.GetGameObject(o, "Name/Text"):GetComponent("Text") - name.text = heroConfig.ReadingName + name.text = GetLanguageStrById(heroConfig.ReadingName) local live = Util.GetGameObject(o, "Mask/icon"):GetComponent("RawImage") local liveName = GetResourcePath(heroConfig.Live) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua index 840a951447..60cb2a3b48 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua @@ -88,7 +88,7 @@ function SpecailTrainingInfoPopup:SetSingleData(index, _go, _data) local tData = _data.data local curLevel = _data.curTrainingLevel local title = Util.GetGameObject(_go, "HeroInfo/title/Text"):GetComponent("Text") - title.text = Language[12242] .. Language[12782] .. Language[10065] + title.text = Language[12242] .. curLevel .. Language[10065] local heroContion = Util.GetGameObject(_go, "HeroInfo/heroContion") local condition = Util.GetGameObject(heroContion, "condition"):GetComponent("Text") local Content = Util.GetGameObject(_go, "Content")