root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

十绝阵伤害显示调整

dev_chengFeng
ZhangBiao 2020-07-17 14:40:33 +08:00
parent cb745e26c9
commit b20e5e2f54
5 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosRankPopup.prefab
View File

@ -494,7 +494,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 475.025, y: -47.1}
m_AnchoredPosition: {x: 470.025, y: -47.1}
m_SizeDelta: {x: 112.7, y: 94.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1803534990402327839
@ -967,7 +967,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: -385}
m_AnchoredPosition: {x: 0, y: 401}
m_SizeDelta: {x: 912.33, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6916295169242205314
@ -1385,7 +1385,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: 342, y: 0}
m_AnchoredPosition: {x: 373.4, y: 0}
m_SizeDelta: {x: 160, y: 94.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &699583724842077893
@ -1514,7 +1514,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: 0}
m_AnchoredPosition: {x: -20, y: 0}
m_SizeDelta: {x: 534.47, y: 94.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4813092285352941563
@ -1543,7 +1543,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 50
m_Spacing: 40
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -1730,7 +1730,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 185.885, y: -47.1}
m_AnchoredPosition: {x: 190.885, y: -47.1}
m_SizeDelta: {x: 365.58, y: 94.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5718212465335177630

24
Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
View File

@ -13044,6 +13044,10 @@ MonoBehaviour:
extension: .mp3
resPathIndex: 85
resAbNameIndex: 159
- resName: Audio_c_fm_0027_skeff_slidesk_screeneff
extension: .mp3
resPathIndex: 85
resAbNameIndex: 159
- resName: Audio_c_ft_00026_attack_01
extension: .mp3
resPathIndex: 85
@ -13324,6 +13328,10 @@ MonoBehaviour:
extension: .mp3
resPathIndex: 85
resAbNameIndex: 229
- resName: Audio_c_skr_0028_skeff_slidesk_attacked
extension: .mp3
resPathIndex: 85
resAbNameIndex: 229
- resName: Audio_c_sq_0019_attack_01
extension: .mp3
resPathIndex: 85
@ -13340,6 +13348,10 @@ MonoBehaviour:
extension: .mp3
resPathIndex: 85
resAbNameIndex: 233
- resName: Audio_c_syf_0016_skeff_slidesk_attacked
extension: .mp3
resPathIndex: 85
resAbNameIndex: 233
- resName: Audio_c_ttjz_00048_attack_01
extension: .mp3
resPathIndex: 85
@ -13372,6 +13384,10 @@ MonoBehaviour:
extension: .mp3
resPathIndex: 85
resAbNameIndex: 241
- resName: Audio_c_xhht_0017_skeff_slidesk_attacked
extension: .mp3
resPathIndex: 85
resAbNameIndex: 241
- resName: Audio_c_xjr_0003_attack_01
extension: .mp3
resPathIndex: 85
@ -13388,6 +13404,10 @@ MonoBehaviour:
extension: .mp3
resPathIndex: 85
resAbNameIndex: 245
- resName: Audio_c_xy_0012_skeff_slidesk_attacked
extension: .mp3
resPathIndex: 85
resAbNameIndex: 245
- resName: Audio_c_xy_0026_attack_01
extension: .mp3
resPathIndex: 85
@ -13440,6 +13460,10 @@ MonoBehaviour:
extension: .mp3
resPathIndex: 85
resAbNameIndex: 258
- resName: Audio_c_yl_0014_skeff_slidesk_ballistic
extension: .mp3
resPathIndex: 85
resAbNameIndex: 258
- resName: Audio_c_yl_0035_attack_01
extension: .mp3
resPathIndex: 85

4
Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
View File

@ -266,7 +266,7 @@ function this.SetScrollPre(root,data,curRankType)
elseif curRankType==RANK_TYPE.GUILD_DEATHPOS_PERSON then
name.text=string.format("%s",data.userName)
end
hurt.text= data.rankInfo.param1
hurt.text= DeathPosManager.ChangeDamageForm(data.rankInfo.param1)
end
--设置我的名次
function this.SetMyRank(data,curRankType)
@ -277,7 +277,7 @@ function this.SetMyRank(data,curRankType)
elseif curRankType==RANK_TYPE.GUILD_DEATHPOS_PERSON then
this.mRName.text=PlayerManager.nickName
end
this.mRHurt.text=data.param1 --param1 伤害
this.mRHurt.text= DeathPosManager.ChangeDamageForm(data.param1) --param1 伤害
end
--设置名次 isMy 是否是设置我的名次
function this.SetRankingNum(root,rank,isMy)

12
Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosManager.lua
View File

@ -133,6 +133,18 @@ function this.GetIsGeted(d)
return isGet
end
--伤害位数转换
function this.ChangeDamageForm(_damage)
local damage = _damage
if damage/100000000 >= 1 then
return tostring(math.floor(damage/1000000)/100).."亿"
end
if damage/100000 >= 1 then
return tostring(math.floor(damage/10000)).."万"
end
return damage
end
--红点检测
function this.CheckDeathPosRedPoint()
local b=false

4
Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRankPopup.lua
View File

@ -142,7 +142,7 @@ function this.SetScrollPre(root,data,curRankType)
elseif curRankType==RANK_TYPE.GUILD_DEATHPOS_ALLPERSON then
name.text=data.userName
end
hurt.text= data.rankInfo.param1
hurt.text= DeathPosManager.ChangeDamageForm(data.rankInfo.param1)
end
--设置我的名次
function this.SetMyRank(data,curRankType)
@ -155,7 +155,7 @@ function this.SetMyRank(data,curRankType)
elseif curRankType==RANK_TYPE.GUILD_DEATHPOS_ALLPERSON then
this.mRName.text=PlayerManager.nickName
end
this.mRHurt.text=data.param1 --param1 伤害
this.mRHurt.text= DeathPosManager.ChangeDamageForm(data.param1) --param1 伤害
end
--设置名次 isMy 是否是设置我的名次
function this.SetRankingNum(root,rank,isMy)