Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
6d4e5dd390
|
@ -93,7 +93,7 @@ AudioMixerSnapshotController:
|
||||||
cd318a70a881cfa4786d89d22553b9bc: -20
|
cd318a70a881cfa4786d89d22553b9bc: -20
|
||||||
6023bf70993f48344b6ce9a8ab6e9c7c: 0
|
6023bf70993f48344b6ce9a8ab6e9c7c: 0
|
||||||
530c728060ac72748914c35aa7061ff3: 0
|
530c728060ac72748914c35aa7061ff3: 0
|
||||||
ab009a90b34c0ff4a8b59c4672f44d3a: 0.67
|
ab009a90b34c0ff4a8b59c4672f44d3a: 0.48
|
||||||
b7969f9025520864fa43ec375c45fdfa: 0.135
|
b7969f9025520864fa43ec375c45fdfa: 0.135
|
||||||
c46735a0a081d594a8ad0e915faa1e21: -20
|
c46735a0a081d594a8ad0e915faa1e21: -20
|
||||||
455637a07e9fb194e8e2d4ba3960f047: 0
|
455637a07e9fb194e8e2d4ba3960f047: 0
|
||||||
|
@ -109,7 +109,7 @@ AudioMixerSnapshotController:
|
||||||
463d7fe003ff11f41bdbf2c7ab486744: -955
|
463d7fe003ff11f41bdbf2c7ab486744: -955
|
||||||
c868f1f06623b934daa3ad6bbc4487db: -5856
|
c868f1f06623b934daa3ad6bbc4487db: -5856
|
||||||
0fd27df00cebb464faa9230e0d83f30d: 6000
|
0fd27df00cebb464faa9230e0d83f30d: 6000
|
||||||
29810201664bd51459a350ca1b28c4a4: 11242.799
|
29810201664bd51459a350ca1b28c4a4: 17891
|
||||||
2e0a5b01e25e97e40adda17dcdc70623: 3.07
|
2e0a5b01e25e97e40adda17dcdc70623: 3.07
|
||||||
d651f521d1601984b9682a4b91165bc6: 0
|
d651f521d1601984b9682a4b91165bc6: 0
|
||||||
e05ad82142928624882b52abbc613253: -40.900005
|
e05ad82142928624882b52abbc613253: -40.900005
|
||||||
|
@ -210,7 +210,7 @@ AudioMixerSnapshotController:
|
||||||
7781546611684eb469f6deba6c726e83: 1124
|
7781546611684eb469f6deba6c726e83: 1124
|
||||||
6a218d6613daca74fba793d8d055e415: -4.560346
|
6a218d6613daca74fba793d8d055e415: -4.560346
|
||||||
d6350f7613ed9d74ebaee028d6bed8ea: 0.3
|
d6350f7613ed9d74ebaee028d6bed8ea: 0.3
|
||||||
da0314860ba7115489fffa194b4e89a3: 15359
|
da0314860ba7115489fffa194b4e89a3: 17950
|
||||||
f53e59866f866244193117b49e1449d7: 0.672
|
f53e59866f866244193117b49e1449d7: 0.672
|
||||||
8450eb86b7cad57438bfe7ac94268360: 0.1
|
8450eb86b7cad57438bfe7ac94268360: 0.1
|
||||||
28f46c86c25fae44f830812ff89014f0: 20
|
28f46c86c25fae44f830812ff89014f0: 20
|
||||||
|
@ -289,7 +289,7 @@ AudioMixerSnapshotController:
|
||||||
b15b8dea0da50604f96b80fbfd2d2899: 0.3
|
b15b8dea0da50604f96b80fbfd2d2899: 0.3
|
||||||
020d8deae576cb44eba1bde7e2884b6c: 0.1
|
020d8deae576cb44eba1bde7e2884b6c: 0.1
|
||||||
2a9faefa7b8ffb8459869dd398a2d7f9: 10
|
2a9faefa7b8ffb8459869dd398a2d7f9: 10
|
||||||
a946e30b20c0fe54687e20e3289bb7f9: 0.6300003
|
a946e30b20c0fe54687e20e3289bb7f9: 0.44
|
||||||
e3d64b0b3b69c4644ba00d681034d4d0: 0
|
e3d64b0b3b69c4644ba00d681034d4d0: 0
|
||||||
e0484b0b2b4dc2146afd120b85edf385: -20
|
e0484b0b2b4dc2146afd120b85edf385: -20
|
||||||
8be2762be3f0f8541a054efea48e3514: 0
|
8be2762be3f0f8541a054efea48e3514: 0
|
||||||
|
@ -325,7 +325,7 @@ AudioMixerSnapshotController:
|
||||||
839424ec0aa4d1c499a7aae1bc653606: 1
|
839424ec0aa4d1c499a7aae1bc653606: 1
|
||||||
1bdfa7ec923e7cb4083d4e0b82576888: 0.027
|
1bdfa7ec923e7cb4083d4e0b82576888: 0.027
|
||||||
2bb5aafcb083c3944bf690c65d84e70d: 7
|
2bb5aafcb083c3944bf690c65d84e70d: 7
|
||||||
4f7da50dac20b7c4fa85088f16add9dc: 5
|
4f7da50dac20b7c4fa85088f16add9dc: 2
|
||||||
abd9211d35d3af54da7f92ec6bcec406: -60
|
abd9211d35d3af54da7f92ec6bcec406: -60
|
||||||
c07aa51deaf06104d87ce4e8c14a903b: 0.8
|
c07aa51deaf06104d87ce4e8c14a903b: 0.8
|
||||||
2250a33dd8757ba408443e8bca3e7780: 2
|
2250a33dd8757ba408443e8bca3e7780: 2
|
||||||
|
@ -361,7 +361,7 @@ AudioMixerSnapshotController:
|
||||||
73ffc90f389903b4baa63469b529465e: 0.942
|
73ffc90f389903b4baa63469b529465e: 0.942
|
||||||
3ab1be1f86666554ba507f6d6bb81409: 11.5
|
3ab1be1f86666554ba507f6d6bb81409: 11.5
|
||||||
6846a02ff7862cd4d88bf0a222b0298f: 0
|
6846a02ff7862cd4d88bf0a222b0298f: 0
|
||||||
85a7f35fa38ca2b459a9dd053396ce75: 2.2
|
85a7f35fa38ca2b459a9dd053396ce75: 1.7
|
||||||
5492f77f044cdad48b9ffc32c7041212: 3.43
|
5492f77f044cdad48b9ffc32c7041212: 3.43
|
||||||
308c2d7fffca55948a61c7445c76e65a: 13088
|
308c2d7fffca55948a61c7445c76e65a: 13088
|
||||||
d19c008fb1687854a89dab7b48da037e: -10
|
d19c008fb1687854a89dab7b48da037e: -10
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -219,7 +219,14 @@ function Expert:ActivityRewardSingleShow(index,rewardData)
|
||||||
qianwangButton:SetActive(state == 10)
|
qianwangButton:SetActive(state == 10)
|
||||||
getFinishText:SetActive(state == 20)
|
getFinishText:SetActive(state == 20)
|
||||||
getRewardProgress:SetActive(state == 10)
|
getRewardProgress:SetActive(state == 10)
|
||||||
Util.GetGameObject(lingquButton.gameObject, "redPoint"):SetActive(state == 0)
|
|
||||||
|
--活动特殊处理
|
||||||
|
if numExChange[activeIndext] == ActivityTypeDef.UpLvAct then
|
||||||
|
Util.GetGameObject(lingquButton.gameObject, "redPoint"):SetActive((state == 0) and rewardData.progress>0)
|
||||||
|
else
|
||||||
|
Util.GetGameObject(lingquButton.gameObject, "redPoint"):SetActive(state == 0)
|
||||||
|
end
|
||||||
|
|
||||||
if numExChange[activeIndext] == ActivityTypeDef.UpStarExper or numExChange[activeIndext] == ActivityTypeDef.Talisman
|
if numExChange[activeIndext] == ActivityTypeDef.UpStarExper or numExChange[activeIndext] == ActivityTypeDef.Talisman
|
||||||
or numExChange[activeIndext] == ActivityTypeDef.SoulPrint or numExChange[activeIndext] == ActivityTypeDef.EquipExper
|
or numExChange[activeIndext] == ActivityTypeDef.SoulPrint or numExChange[activeIndext] == ActivityTypeDef.EquipExper
|
||||||
or numExChange[activeIndext] == ActivityTypeDef.FindTreasureExper then --进阶因为每个都不一样 特殊判断
|
or numExChange[activeIndext] == ActivityTypeDef.FindTreasureExper then --进阶因为每个都不一样 特殊判断
|
||||||
|
|
|
@ -112,7 +112,8 @@ function SupremeHeroPopup:BindEvent()
|
||||||
--完成按钮
|
--完成按钮
|
||||||
Util.AddClick(this.doneBtn,function()
|
Util.AddClick(this.doneBtn,function()
|
||||||
if actIsOpen then
|
if actIsOpen then
|
||||||
if this.GetRewardState() == 2 then
|
local data = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SupremeHero)
|
||||||
|
if this.GetRewardState() == 2 and data.mission[3].state == 1 then
|
||||||
NetManager.GetActivityRewardRequest(0, ActivityTypeDef.SupremeHero, function (drop)
|
NetManager.GetActivityRewardRequest(0, ActivityTypeDef.SupremeHero, function (drop)
|
||||||
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1)
|
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1)
|
||||||
for i = 1, #missionData do
|
for i = 1, #missionData do
|
||||||
|
@ -190,14 +191,19 @@ function this.InitShow()
|
||||||
local color = finishedNum < total and "#FF0000FF" or "#F4D98AFF"
|
local color = finishedNum < total and "#FF0000FF" or "#F4D98AFF"
|
||||||
this.taskProgress.text = string.format(" <color=%s>%s</color>/3", color, finishedNum)
|
this.taskProgress.text = string.format(" <color=%s>%s</color>/3", color, finishedNum)
|
||||||
|
|
||||||
Util.SetGray(this.doneBtn, this.GetRewardState() ~= 2)
|
local data = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SupremeHero)
|
||||||
this.doneBtn:GetComponent("Button").enabled = this.IsMissionDone()
|
Util.SetGray(this.doneBtn, (this.GetRewardState() ~= 2) or data.mission[3].state ~= 1)
|
||||||
|
this.doneBtn:GetComponent("Button").enabled = (this.IsMissionDone() and data.mission[3].state == 1)
|
||||||
local textList = {
|
local textList = {
|
||||||
[1] = Language[10366],
|
[1] = Language[10366],
|
||||||
[2] = Language[10022],
|
[2] = Language[10022],
|
||||||
[3] = Language[10350],
|
[3] = Language[10350],
|
||||||
}
|
}
|
||||||
this.btnText.text = textList[this.GetRewardState()]
|
if (this.IsMissionDone() and data.mission[3].state ~= 1) then
|
||||||
|
this.btnText.text = textList[1]
|
||||||
|
else
|
||||||
|
this.btnText.text = textList[this.GetRewardState()]
|
||||||
|
end
|
||||||
-- 设置图标显示
|
-- 设置图标显示
|
||||||
this.SetIconAndTitle()
|
this.SetIconAndTitle()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue