Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
liujiaqi 2020-07-17 14:46:17 +08:00
commit 70c580bb57
8 changed files with 54 additions and 13 deletions

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

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

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)

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

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)

View File

@ -68,6 +68,7 @@ function this:OnShow(_parent,...)
end
end
this.bodyText.text=string.format(Language[12234],num)
this.BodyText2:GetComponent("Text").text="(注意:本次出售包含<color=#FFD700>金色</color>或<color=#FF0000>红色</color>装备!)"
this.BodyText2.gameObject:SetActive(isShow)
local data={}
local index = 1

View File

@ -84,16 +84,19 @@ function this:OnShow(_parent,...)
end
end
this.bodyText.text="宝物将分解为宝魂若宝物已强化或精炼分解后将清空强化和精炼等级并100%返还养成材料。"
this.bodyText2:GetComponent("Text").text="(注意:本次出售包含<color=#FFD700>金色</color>或<color=#FF0000>红色</color>宝器!)"
this.bodyText2.gameObject:SetActive(isEquipShowSure)
this.tipText.text = "分解后获得:"
local data={}
local index = 1
for i, v in pairs(dropList) do
LogBlue(v.id.." "..v.num)
data[index]={v.id,v.num}
index = index + 1
end
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,#data,1,sortingOrder,false,data)
LogBlue(#data)
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,60,1,sortingOrder,false,data)
end
function this:OnClose()

View File

@ -556,13 +556,14 @@ function this.GetEquipTreasureResolveItems(selectEquipTreasureData)
local allRewardData = {}
local specificValue = 1--tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig,34).Value)/10000
ShowItemlist = {}
LogBlue(LengthOfTable(selectEquipTreasureData))
for i, v in pairs(selectEquipTreasureData) do
local curEquipTreasureData = allTreasures[i]
if not curEquipTreasureData then return end
--先把精炼的材料放进去 因为有宝器 放前边
if curEquipTreasureData.refineLv > 0 then
for i=0,curEquipTreasureData.refineLv-1 do
local refineJewelRankupConfig =ConfigManager.TryGetConfigDataByThreeKey(ConfigName.JewelRankupConfig,"Type",2,"Level",i,"PoolID",curEquipTreasureData.quantity)
local refineJewelRankupConfig =ConfigManager.TryGetConfigDataByThreeKey(ConfigName.JewelRankupConfig,"Type",2,"Level",i,"PoolID",curEquipTreasureData.refinePool)
if refineJewelRankupConfig then
--精炼消耗的法宝
if refineJewelRankupConfig.JewelExpend then
@ -585,7 +586,7 @@ function this.GetEquipTreasureResolveItems(selectEquipTreasureData)
end
if curEquipTreasureData.lv > 0 then
for i=0,curEquipTreasureData.lv - 1 do
local lvJewelRankupConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.JewelRankupConfig,"Type",1,"Level",i,"PoolID",curEquipTreasureData.quantity)
local lvJewelRankupConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.JewelRankupConfig,"Type",1,"Level",i,"PoolID",curEquipTreasureData.LevelupPool)
if lvJewelRankupConfig then
--强化消耗的材料
if lvJewelRankupConfig.UpExpend then