From 7faa067c5242c7f6c4877d784a99af00e80c4bdc Mon Sep 17 00:00:00 2001 From: jiaoyangna <17610272109@lianjingshidai.com> Date: Fri, 17 Jul 2020 14:15:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=9D=E7=89=A9=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua | 4 +++- .../~Lua/Modules/RoleInfo/EquipTreasureManager.lua | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua index 4ad59c0605..51f13792c3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua @@ -90,10 +90,12 @@ function this:OnShow(_parent,...) 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() diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua index 4797d0b98d..24e3ab269b 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua @@ -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 From e63fb9e0cfa7485f4ac8f25c10cfc85212fd6bd3 Mon Sep 17 00:00:00 2001 From: jiaoyangna <17610272109@lianjingshidai.com> Date: Fri, 17 Jul 2020 14:35:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/View/GeneralPopup_EquipBatchSell.lua | 1 + .../Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua | 1 + 2 files changed, 2 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipBatchSell.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipBatchSell.lua index c96afb70bf..601b790532 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipBatchSell.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipBatchSell.lua @@ -68,6 +68,7 @@ function this:OnShow(_parent,...) end end this.bodyText.text=string.format(Language[12234],num) + this.BodyText2:GetComponent("Text").text="(注意:本次出售包含金色或红色装备!)" this.BodyText2.gameObject:SetActive(isShow) local data={} local index = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua index 51f13792c3..37a95a5dc8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua @@ -84,6 +84,7 @@ function this:OnShow(_parent,...) end end this.bodyText.text="宝物将分解为宝魂,若宝物已强化或精炼,分解后将清空强化和精炼等级,并100%返还养成材料。" + this.bodyText2:GetComponent("Text").text="(注意:本次出售包含金色或红色宝器!)" this.bodyText2.gameObject:SetActive(isEquipShowSure) this.tipText.text = "分解后获得:" From b20e5e2f540b65f18c5319a78c6bb69d49e8b3cf Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 17 Jul 2020 14:40:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=81=E7=BB=9D=E9=98=B5=E4=BC=A4?= =?UTF-8?q?=E5=AE=B3=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Guild/DeathPos/DeathPosRankPopup.prefab | 12 +++++----- .../ResConfigs/ResourcePathConfig.asset | 24 +++++++++++++++++++ .../Guild/DeathPos/DeathPosInfoPanel.lua | 4 ++-- .../Guild/DeathPos/DeathPosManager.lua | 12 ++++++++++ .../Guild/DeathPos/DeathPosRankPopup.lua | 4 ++-- 5 files changed, 46 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosRankPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosRankPopup.prefab index bd4b815f7e..28d6eba1f9 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosRankPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosRankPopup.prefab @@ -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 diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 2d616d2cf9..7a6b803509 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua index ed5a9ff0a6..e8175553e0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua @@ -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) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosManager.lua index 4eab3d1bc4..0f85e9a0b7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosManager.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRankPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRankPopup.lua index 6de5c0f413..7b39f0b65e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRankPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRankPopup.lua @@ -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)