Merge branch 'china/dev' into 0优化/副本界面

dev_chengFeng
ZhangBiao 2021-07-22 17:01:32 +08:00
commit 056d3dc094
26 changed files with 857 additions and 635 deletions

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 96cbaa34b43b8c44a94f88c6c8e6cbcb
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: b9c394978054ada4d971dd81be6b3ea6
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: f0643f46d6da56946b7c25798f5360a5
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 168e90f69841cec468fb6bfb5ed8d7c7
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 81e603102a2ede0479a94c0991c3d892
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 2f98f0a579f2f864ea250b417997efb8
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 60761db76ce74124082da0a03d0eafa9
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 8504c2478462ba34ca1f1e142f53bb01
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 8120dc177b22b60489ec9a8b35810a2f
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -934,7 +934,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1189879797113255339}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -11256,7 +11256,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2671413894708845251}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -21578,7 +21578,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3915160258044306129}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:

File diff suppressed because one or more lines are too long

View File

@ -133,7 +133,7 @@ function QianKunBoxBuyOnePanel:OnOpen(...)
local itemId=0
local itemNum=0
local d
local upConfig=ConfigManager.TryGetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",this.recruitType)
local upConfig = this.recruitType == RecruitType.PrayerSingle or this.recruitType == RecruitType.PrayerTen
if upConfig then
local wish=ConfigManager.GetConfigData(ConfigName.WishActivitySetting,1)
if wish then
@ -143,6 +143,7 @@ function QianKunBoxBuyOnePanel:OnOpen(...)
isLimitUpHero=true
end
else
isLimitUpHero = false
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.QianKunBox })
d = RecruitManager.GetExpendData(this.recruitType)
end
@ -178,7 +179,6 @@ function QianKunBoxBuyOnePanel:OnOpen(...)
end
--界面关闭时调用(用于子类重写)
function QianKunBoxBuyOnePanel:OnClose()
end
--界面销毁时调用(用于子类重写)

View File

@ -143,7 +143,7 @@ function QianKunBoxBuyTenPanel:OnOpen(...)
local itemId=0
local itemNum=0
local d
local upConfig=ConfigManager.TryGetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",this.recruitType)
local upConfig = this.recruitType == RecruitType.PrayerSingle or this.recruitType == RecruitType.PrayerTen
if upConfig then
local wish=ConfigManager.GetConfigData(ConfigName.WishActivitySetting,1)
if wish then
@ -157,6 +157,7 @@ function QianKunBoxBuyTenPanel:OnOpen(...)
d = RecruitManager.GetExpendDataByCostItem(wish.CostItemMul,2,num)
end
else
isLimitUpHero = false
d = RecruitManager.GetExpendData(this.recruitType)
if this.UpView then
SubUIManager.Close(this.UpView)

View File

@ -287,10 +287,10 @@ function TimeLimitUpHero:Recruit(actId,type,itemId)
PrivilegeManager.RefreshPrivilegeUsedTimes(self.yaojingMaxTimeId,recrutType)--记录妖晶抽卡次数
end
if type == 1 then
UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel, msg.drop,actId,{RecruitType.PrayerSingle,RecruitType.PrayerTen},oneFunc)
UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel, msg.drop,RecruitType.PrayerSingle,{RecruitType.PrayerSingle,RecruitType.PrayerTen},oneFunc)
else
--UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero,actId,type,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen})
UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel, msg.drop,actId,{RecruitType.PrayerSingle,RecruitType.PrayerTen},tenFunc)
UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel, msg.drop,RecruitType.PrayerTen,{RecruitType.PrayerSingle,RecruitType.PrayerTen},tenFunc)
end
-- if msg.drop.Hero[1] then
-- UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],actId,1,{RecruitType.PrayerSingle,RecruitType.PrayerTen},oneFunc2)

View File

@ -839,9 +839,9 @@ function this.InitTreasureData(msg)
this.treasureData.tip = "完成无尽副本的任务提升秘宝等级,激活秘宝后还可领取额外奖励"
this.treasureData.resetTime = msg.resetTime
--购买状态
-- --LogGreen("msg.isBuy:"..msg.isBuy)
--LogGreen("msg.isBuy:"..msg.isBuy)
this.SetTreasureGiftState(msg.isBuy)
-- --LogGreen("msg.score:"..msg.score)
--LogGreen("msg.score:"..msg.score)
this.treasureData.curScore = BagManager.GetItemCountById(EndLessMapManager.scoreValueId) or 0
this.GetTreasureData()
this.treasureData.rewardData = this.treasureDataReward

View File

@ -136,7 +136,16 @@ function this.RegisterMessage(network)
socket:RegistNetMessage(MessageTypeProto_pb.VIP_LEVEL_STATE_RESPONSE, this.RefreshLevleRewardDatas)
-- --心愿抽卡信息推送
socket:RegistNetMessage(MessageTypeProto_pb.wishDrawCardIndication, this.WishDrawCardInfoIndication)
-- --心愿抽卡信息推送
socket:RegistNetMessage(MessageTypeProto_pb.ENDLESS_TREASURE_REFRESH_INDICATION, this.EenlessTreasureRefreshIndication)
end
--后端推送福利红包数据
function this.EenlessTreasureRefreshIndication(buffer)
local data = buffer:DataByte()
local msg = MapInfoProto_pb.EndlessTreasureInfoResponse()
msg:ParseFromString(data)
EndLessMapManager.InitTreasureData(msg)
end
--后端推送福利红包数据
@ -144,7 +153,6 @@ function this.WelfareRedPacketPush(buffer)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.WelfareRedPacketPush()
msg:ParseFromString(data)
LogError("推送过来红包数据")
if msg.redpacket then
MyGuildManager.SetMyGuidRedPackage(msg.redpacket)
--CheckRedPointStatus(RedPointType.Guid_SendPackage)
@ -783,8 +791,6 @@ end
-- 更新关卡ID
function this.FreshFightId(buffer)
Log("后端推送关卡状态!")
LogError("==============")
local data=buffer:DataByte()
local msg=FightInfoProto_pb.MainLevelFightUpdateIndication()
msg:ParseFromString(data)
@ -914,7 +920,6 @@ function this.WorldLevelIndication(buffer)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.WorldLevelIndication()
msg:ParseFromString(data)
-- LogError("%%%%%%%%%%世界等级推送 "..msg.worldLeve)
PlayerManager.RefreshWorldLeveData(msg.worldLeve)
end

View File

@ -120,6 +120,7 @@ function LingLongBaoJingPanel:BindEvent()
end)
Util.AddClick(self.propBtn, function()
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_kaiqi_002)
if not self.enough then
PopupTipPanel.ShowTip("道具不足")
return
@ -168,12 +169,16 @@ function LingLongBaoJingPanel:BindEvent()
self:SetTableTurnEffect(TableTurnType.Expedite,2,data[idList[1]].address,function()
if idList[2] and idList[2] > 0 then
--PopupTipPanel.ShowTip("播放一些开门的特效")
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_longmengezi_004)
self.Btncoroutine = coroutine.start(function()
self.itemList[2][1].effect.gameObject:SetActive(true)
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_longsaoguang_006)
coroutine.wait(0.4)
self.fx_linglongbaojing_longchuxian.gameObject:SetActive(true)
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_longpanxuan_005)
coroutine.wait(1)
self:RefreshTreasureMaskByType(1,false)
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_waiquandianliang_008)
for i = 1,#self.itemList[1] do
self.itemList[1][i].effect.gameObject:SetActive(true)
end
@ -245,7 +250,11 @@ function LingLongBaoJingPanel:OnShow(_sortingOrder)
Timer.New(function()
self.fx_linglongbaojing_long.gameObject:SetActive(true)
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_gaoguang_huaban_001)
end,0.5):Start()
Timer.New(function()
SoundManager.PlaySound(SoundConfig.STORY_VOICE_1_5)
end,1):Start()
end
function LingLongBaoJingPanel:SetLayer()
@ -415,7 +424,11 @@ function LingLongBaoJingPanel:TurnEffectReset(turnSpeed,treasureType,isStop,pos,
self.itemList[treasureType][curTurnPos - 1].selectKuang.gameObject:SetActive(false)
end
self.itemList[treasureType][curTurnPos].selectKuang.gameObject:SetActive(true)
if treasureType == 2 then
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_neiquanlunge_007)
else
SoundManager.PlaySound(SoundConfig.Audio_linglongbaojing_waiquanlunge_009)
end
if isStop then
if pos == curTurnPos then--如果停到对应位置
self.turnEffect:Stop()--暂停跑马灯