Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev

dev_chengFeng
ZhangBiao 2021-03-04 10:16:42 +08:00
commit 7805c09f4d
7 changed files with 96 additions and 33 deletions

View File

@ -32,10 +32,10 @@ RectTransform:
m_Father: {fileID: 673231808}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 2.7000008}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.40000153, y: 3.9099998}
m_SizeDelta: {x: 148.61, y: 56.620003}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &357364970
CanvasRenderer:
@ -69,9 +69,9 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_BestFit: 1
m_MinSize: 20
m_MaxSize: 30
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@ -5698,7 +5698,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: 302, y: 338}
m_AnchoredPosition: {x: 302, y: 443.2}
m_SizeDelta: {x: 54, y: 230}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5383625964262963663
@ -15797,7 +15797,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: 373, y: 521}
m_AnchoredPosition: {x: 373, y: 619.8}
m_SizeDelta: {x: 154, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8831489817173743925

View File

@ -18564,7 +18564,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: 55.4, y: -132.7}
m_AnchoredPosition: {x: 40.999977, y: -132.7}
m_SizeDelta: {x: 108, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7852804637416352310
@ -19238,7 +19238,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, y: -125}
m_AnchoredPosition: {x: 41, y: -125}
m_SizeDelta: {x: 108, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6808756861253334261
@ -19543,9 +19543,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: 54.99994, y: -129.5}
m_AnchoredPosition: {x: 40, y: -129.5}
m_SizeDelta: {x: 108, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0.49999997, y: 0.5}
--- !u!222 &7710478518184107883
CanvasRenderer:
m_ObjectHideFlags: 0
@ -25774,7 +25774,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: 60, y: -131.9}
m_AnchoredPosition: {x: 45, y: -131.9}
m_SizeDelta: {x: 108, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6500234810225040313

View File

@ -4504,7 +4504,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@ -7846,6 +7846,8 @@ GameObject:
- component: {fileID: 759929628668345706}
- component: {fileID: 1072802345564235561}
- component: {fileID: 3901432807734907261}
- component: {fileID: 2174355897684819944}
- component: {fileID: 2344451288456687699}
m_Layer: 5
m_Name: UseProps
m_TagString: Untagged
@ -7871,8 +7873,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: 303, y: 499}
m_SizeDelta: {x: 244.15002, y: 38}
m_AnchoredPosition: {x: 308, y: 490.8}
m_SizeDelta: {x: 279.99, y: 54.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1072802345564235561
CanvasRenderer:
@ -7911,6 +7913,43 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &2174355897684819944
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5398608478886939953}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 0
--- !u!114 &2344451288456687699
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5398608478886939953}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!1 &5403932855544809767
GameObject:
m_ObjectHideFlags: 0
@ -9853,7 +9892,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &5709844313583256937
RectTransform:
m_ObjectHideFlags: 0
@ -11405,10 +11444,10 @@ RectTransform:
m_Father: {fileID: 759929628668345706}
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: -4, y: -0.0000048876}
m_SizeDelta: {x: 450, y: 38}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 50.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1331333474934079865
CanvasRenderer:
@ -11448,10 +11487,10 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: ' 0/100'
m_Text: 0/100
--- !u!1 &7085036036722072500
GameObject:
m_ObjectHideFlags: 0
@ -15222,6 +15261,7 @@ GameObject:
- component: {fileID: 2786222380532031671}
- component: {fileID: 5827202992606600775}
- component: {fileID: 829258691482130685}
- component: {fileID: 8761648382849886253}
m_Layer: 5
m_Name: Icon
m_TagString: Untagged
@ -15243,10 +15283,10 @@ RectTransform:
m_Father: {fileID: 759929628668345706}
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: -43.2, y: -0.0000085831}
m_SizeDelta: {x: 92.89, y: 92.89}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 92}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5827202992606600775
CanvasRenderer:
@ -15285,6 +15325,26 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &8761648382849886253
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8440794611812163803}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: 92
m_PreferredHeight: 92
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &8485111311815755030
GameObject:
m_ObjectHideFlags: 0

View File

@ -2226,4 +2226,7 @@
[12225] = GetLanguageStrById("点击交换else语句"),
[12226] = GetLanguageStrById("升级成功!"),
[12227] = GetLanguageStrById("装备个数"),
[12228] = GetLanguageStrById("最高纪录:"),
[12229] = GetLanguageStrById("已达到最大时长"),
[12230] = GetLanguageStrById("竞技守卫"),
}

View File

@ -204,7 +204,7 @@ function this.SetPlayerInfo(ranks,myRankInfo)
this.monsterWave.text = Language[11685]..Language[10036]
elseif myRank > 0 then
this.monsterRank.text = Language[10103]..tostring(myRank)
this.monsterWave.text = GetLanguageStrById("最高纪录:")..Language[10262] .. myWave .. Language[10266]
this.monsterWave.text = GetLanguageStrById(Language[12228])..Language[10262] .. myWave .. Language[10266]
end
end
-- 其他玩家的排行

View File

@ -193,7 +193,7 @@ end
function OnlineRewardPanel:RemainTimeDown()
self:RemainTimeDownUpdata()
if ActivityGiftManager.currentTimeIndex == #ActivityGiftManager.onlineData then
this.time2.text = "已达到最大时长"
this.time2.text = Language[12229]
end
if self.timer then
self.timer:Stop()
@ -206,7 +206,7 @@ function OnlineRewardPanel:RemainTimeDown()
if ActivityGiftManager.currentTimeIndex == #ActivityGiftManager.onlineData then
self.timer:Stop()
self.timer = nil
this.time2.text = "已达到最大时长"
this.time2.text = Language[12229]
end
end, 1, -1, true)
self.timer:Start()

View File

@ -82,7 +82,7 @@ function this.SortTypeClick(_sortType,isTop,isAni)
this.empty:SetActive(#tarHero==0)
--设置回溯按钮置灰
--Util.SetGray(this.confirmBtn,tonumber(LengthOfTable(selectHeroData))==0)
this.usePropIcon.enabled=tonumber(LengthOfTable(selectHeroData))~=0
this.usePropIcon.gameObject:SetActive(tonumber(LengthOfTable(selectHeroData))~=0)
this.usePropInfo.enabled=tonumber(LengthOfTable(selectHeroData))==0
this.usePropInfo.alignment= GetCurLanguage() ~= 2 and "MiddleCenter" or "MiddleRight"
this.usePropInfo.text=Language[11750]
@ -231,7 +231,7 @@ function this.SingleHeroDataShow(go,_heroData)
end
--Util.SetGray(this.confirmBtn,LengthOfTable(selectHeroData)==0)
this.usePropIcon.enabled=LengthOfTable(selectHeroData)~=0
this.usePropIcon.gameObject:SetActive(LengthOfTable(selectHeroData)~=0)
end)
Util.AddOnceClick(formationMask, function()