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

Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
wangzhenxing 2021-04-26 15:45:43 +08:00
parent ebde6e43b0 cccc067c41
commit 62112ecff0
8 changed files with 301 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab
View File

@ -4653,7 +4653,7 @@ ParticleSystem:
--- !u!199 &7161790114800665152
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -5009,7 +5009,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -204.73}
m_AnchoredPosition: {x: 0, y: -204.72998}
m_SizeDelta: {x: -2, y: -743.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4865550599523463719
@ -5032,7 +5032,7 @@ MonoBehaviour:
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2}
m_Material: {fileID: 2100000, guid: 42263669b8cc5c04a96720be44775913, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
@ -9719,7 +9719,7 @@ ParticleSystem:
--- !u!199 &5590763315395979240
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -15214,7 +15214,7 @@ ParticleSystem:
--- !u!199 &5835294107039667155
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -20311,7 +20311,7 @@ ParticleSystem:
--- !u!199 &5835345885398115607
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -21233,7 +21233,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8157925676028595395}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:

369
Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
View File

File diff suppressed because one or more lines are too long

20
Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
View File

@ -502,6 +502,8 @@ EQUIPUPLEVELREQUEST_ITEMNUM_FIELD = protobuf.FieldDescriptor();
EQUIPUPLEVELRESPONSE = protobuf.Descriptor();
EQUIPUPLEVELRESPONSE_RESULT_FIELD = protobuf.FieldDescriptor();
EQUIPUPLEVELRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
PUSHWELFARERESPONSE = protobuf.Descriptor();
PUSHWELFARERESPONSE_ID_FIELD = protobuf.FieldDescriptor();
ERRORMSGRESPONSE_MSG_FIELD.name = "msg"
ERRORMSGRESPONSE_MSG_FIELD.full_name = ".rpc.protocols.ErrorMsgResponse.msg"
@ -5084,6 +5086,23 @@ EQUIPUPLEVELRESPONSE.enum_types = {}
EQUIPUPLEVELRESPONSE.fields = {EQUIPUPLEVELRESPONSE_RESULT_FIELD, EQUIPUPLEVELRESPONSE_DROP_FIELD}
EQUIPUPLEVELRESPONSE.is_extendable = false
EQUIPUPLEVELRESPONSE.extensions = {}
PUSHWELFARERESPONSE_ID_FIELD.name = "id"
PUSHWELFARERESPONSE_ID_FIELD.full_name = ".rpc.protocols.PushWelfareResponse.id"
PUSHWELFARERESPONSE_ID_FIELD.number = 1
PUSHWELFARERESPONSE_ID_FIELD.index = 0
PUSHWELFARERESPONSE_ID_FIELD.label = 3
PUSHWELFARERESPONSE_ID_FIELD.has_default_value = false
PUSHWELFARERESPONSE_ID_FIELD.default_value = {}
PUSHWELFARERESPONSE_ID_FIELD.type = 5
PUSHWELFARERESPONSE_ID_FIELD.cpp_type = 1
PUSHWELFARERESPONSE.name = "PushWelfareResponse"
PUSHWELFARERESPONSE.full_name = ".rpc.protocols.PushWelfareResponse"
PUSHWELFARERESPONSE.nested_types = {}
PUSHWELFARERESPONSE.enum_types = {}
PUSHWELFARERESPONSE.fields = {PUSHWELFARERESPONSE_ID_FIELD}
PUSHWELFARERESPONSE.is_extendable = false
PUSHWELFARERESPONSE.extensions = {}
ActiveUserMountRequest = protobuf.Message(ACTIVEUSERMOUNTREQUEST)
ActiveUserMountResponse = protobuf.Message(ACTIVEUSERMOUNTRESPONSE)
@ -5171,6 +5190,7 @@ NextActivityResponse = protobuf.Message(NEXTACTIVITYRESPONSE)
NotifyPaySuccessfulIndicaiton = protobuf.Message(NOTIFYPAYSUCCESSFULINDICAITON)
PlayerBackCInfoIndication = protobuf.Message(PLAYERBACKCINFOINDICATION)
PrivilegeIndication = protobuf.Message(PRIVILEGEINDICATION)
PushWelfareResponse = protobuf.Message(PUSHWELFARERESPONSE)
QuestionIndication = protobuf.Message(QUESTIONINDICATION)
QuickBuyTreasureLevelRequest = protobuf.Message(QUICKBUYTREASURELEVELREQUEST)
RandomNameResponse = protobuf.Message(RANDOMNAMERESPONSE)

62
Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
View File

@ -52,8 +52,9 @@ function this.SetisFirstLogVal(isDayFirst,setPatFaceFinishTabs)
end
--3 类型就拍一次
end
--前端检测拍脸
local patFaceAllData = {}
function this.GetPatFaceAllDataTabs()
function this.GetFrontPatFaceAllDataTabs()
if this.isLogin then return end
patFaceAllData = {}
for i, v in ConfigPairs(ConfigManager.GetConfig(ConfigName.LoginPosterConfig)) do
@ -64,6 +65,17 @@ function this.GetPatFaceAllDataTabs()
end
return patFaceAllData
end
--检测所有拍脸
function this.GetPatFaceAllDataTabs()
local backData = this.GetBackPatFaceDaqta()
local FrontData = this.GetFrontPatFaceAllDataTabs()
if FrontData and #FrontData > 0 then
for i = 1, #FrontData do
table.insert(backData,FrontData[i])
end
end
return backData
end
function this.PatFaceSpecialMonitorOpenRules(v,patFaceAllData,type,starUpGiftNum)
--1等级 2关卡 3特劝等级 4功能开启时 5活动开启时 6公会战状态 7条件触发(事件)
if v.OpenRules[1] == 1 then
@ -317,6 +329,11 @@ function this.GetGuildFightTime()
end
--事件触发拍脸 (如五星成长礼)
function this.OnAddPatFaceData(faceConFigType, starUpGiftNum)
if faceConFigType == FacePanelType.GrowGift or faceConFigType == FacePanelType.UpgradePac or faceConFigType == FacePanelType.MonsterWave or faceConFigType == FacePanelType.MainLevel
or faceConFigType == FacePanelType.TimeLimitSkin then
LogError("此种拍脸已删除 faceConFigType： "..faceConFigType)
return
end
if this.isLogin then return end--上来就弹新关卡界面 所以不弹
if MapManager.Mapping or UIManager.IsOpen(UIName.BattlePanel) then return end--在关卡里 副本里不弹
@ -326,22 +343,23 @@ function this.OnAddPatFaceData(faceConFigType, starUpGiftNum)
this.PatFaceSpecialMonitorOpenRules(allTypeFaceConFig[i],patFaceAllData,2, starUpGiftNum)
end
if patFaceAllData and not GuideManager.IsFunctionGuideExist() then
this.OpenPatFacePanel()
this.OpenPatFacePanel(patFaceAllData)
end
end
this.patFaceCallList = Stack.New()
function this.OpenPatFacePanel()
function this.OpenPatFacePanel(_patFaceAllData)
--LogGreen("#patFaceAllData 事件 " .. #patFaceAllData)
if #patFaceAllData > 0 then
if #_patFaceAllData > 0 then
this.patFaceCallList:Clear()
this.patFaceCallList:Push(function()
--Log("结束了！！！")
this.DeleBackPatFaceDaqta()
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSendFinish)
end)
for i = #patFaceAllData, 1, -1 do
for i = #_patFaceAllData, 1, -1 do
this.patFaceCallList:Push(function()
PatFaceManager.SetisFirstLogVal(1, { patFaceAllData[i] })
UIManager.OpenPanel(UIName.PatFacePanel, patFaceAllData[i], function()
PatFaceManager.SetisFirstLogVal(1, { _patFaceAllData[i] })
UIManager.OpenPanel(UIName.PatFacePanel, _patFaceAllData[i], function()
local time2 = Timer.New(function()
this.patFaceCallList:Pop()()
end, 0.5)
@ -354,4 +372,34 @@ function this.OpenPatFacePanel()
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSendFinish)
end
end
--后端礼包拍脸逻辑
this.backPatFaceAllData = {}
function this.SetPatFaceDaqta(PatFaceDatas)
if PatFaceDatas and PatFaceDatas.id and #PatFaceDatas.id > 0 then
for i = 1, #PatFaceDatas.id do
LogYellow("后端推送礼包拍脸 礼包id "..PatFaceDatas.id[i])
local curRechargeCommodityConfig = ConfigManager.TryGetConfigData(ConfigName.RechargeCommodityConfig,PatFaceDatas.id[i])
if curRechargeCommodityConfig and curRechargeCommodityConfig.PosterUiId then
LogYellow("后端推送礼包拍脸 拍脸ID "..curRechargeCommodityConfig.PosterUiId)
table.insert(this.backPatFaceAllData, ConfigManager.GetConfigData(ConfigName.LoginPosterConfig,curRechargeCommodityConfig.PosterUiId))
end
end
end
if this.isLogin then return end--登录界面不拍
if MapManager.Mapping or UIManager.IsOpen(UIName.BattlePanel) then return end--在关卡里 副本里不拍
if GuideManager.IsFunctionGuideExist() then return end--功能引导不拍
if UIManager.IsOpen(UIName.SingleRecruitPanel) or UIManager.IsOpen(UIName.TenRecruitPanel) or UIManager.IsOpen(UIName.RecruitPanel) then return end--抽卡界面不拍
if this.backPatFaceAllData then
this.OpenPatFacePanel(this.backPatFaceAllData)
end
end
function this.GetBackPatFaceDaqta()
return this.backPatFaceAllData
end
function this.DeleBackPatFaceDaqta()
LogYellow("后端推送礼包拍脸 清空 ")
this.backPatFaceAllData = {}
end
return this

12
Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftManager.lua
View File

@ -61,5 +61,17 @@ function this.CheckRedPoint()
end
return false
end
--是否全部领取完奖励
function this.IsGetAllReward()
local getFinish = true
if Data then
for i = 1, #Data.rewards do
if Data.rewards[i].State == 0 then
getFinish = false
end
end
end
return getFinish
end
return FifteenDayGiftManager

4
Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
View File

@ -1342,6 +1342,7 @@ function this.RefreshShowPatPaceActivity()
this.patFaceCallList:Clear()
this.patFaceCallList:Push(function()
Log("结束了！！！")
PatFaceManager.DeleBackPatFaceDaqta()
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceSendFinish)
AdventureManager.GetIsMaxTime()
end)
@ -1389,7 +1390,8 @@ function this.RefreshEightGiftPreview()
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FifteenDayGift) then
FifteenDayGiftManager.InitRewardData()
local bool = FifteenDayGiftManager.CheckRedPoint()
if bool then
local IsGetAllReward = FifteenDayGiftManager.IsGetAllReward()
if bool or not IsGetAllReward then
this.fgBtn:SetActive(true)
this.rpFifteenDayEffect:SetActive(true)
CheckRedPointStatus(RedPointType.FifteenDayGift_1)

10
Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
View File

@ -124,6 +124,8 @@ function this.RegisterMessage(network)
socket:RegistNetMessage(MessageTypeProto_pb.WorldLevelIndication, this.WorldLevelIndication)
-- 充值成功订单推送
socket:RegistNetMessage(MessageTypeProto_pb.RECHARGE_SUCCESS_INDICATION, this.RechargeSuccessOrder)
-- 礼包拍脸推送
socket:RegistNetMessage(MessageTypeProto_pb.PUSH_WELFARE_RESPONSE, this.BackPatFaceData)
end
function this.OpenHongMengTowerGuideIndication(buffer)
local data = buffer:DataByte()
@ -884,4 +886,12 @@ function this.RechargeSuccessOrder(buffer)
msg:ParseFromString(data)
PayManager.RechargeSuccessOrder(msg)
end
--后端拍脸推送
function this.BackPatFaceData(buffer)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.PushWelfareResponse()
msg:ParseFromString(data)
LogError("后端拍脸推送")
PatFaceManager.SetPatFaceDaqta(msg)
end
return this

10
Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
View File

@ -633,13 +633,17 @@ function this.UpdateMonthCardData(msg)
end
end
function this.RefreshMonthCardChargeMoney(msg)
--LogError("月卡金额信息推送 "..msg.monthSaveAmt.." "..msg.smonthSaveAmt)
-- LogError("月卡金额信息推送 "..msg.monthSaveAmt.." "..msg.smonthSaveAmt)
monthSaveAmt = msg.monthSaveAmt--月卡累计总额
smonthSaveAmt = msg.smonthSaveAmt--豪华月卡累计总额
end
-- 月卡累计总额
function this.GetmonthSaveAmt()
return monthSaveAmt
function this.GetmonthSaveAmt(index)
if index == MONTH_CARD_TYPE.MONTHCARD then
return monthSaveAmt
else
return smonthSaveAmt
end
end
-- 豪华月卡累计总额
function this.GetsmonthSaveAmt()