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

dev_chengFeng
ZhangBiao 2021-05-26 17:04:03 +08:00
commit c9748421e9
24 changed files with 10968 additions and 1399 deletions

View File

@ -31625,7 +31625,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 50, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 217.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1473222624206509369
@ -97400,7 +97400,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: 52.9, y: 71.45998}
m_AnchoredPosition: {x: 113, y: 71.45998}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5967992022900652329
@ -97478,7 +97478,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 50, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &109213283015355470
@ -130246,6 +130246,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 5391497229806396012}
m_Modifications:
- target: {fileID: 4537954547819557299, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_Name
value: UI_Effect_MuBiaoJiangLi
objectReference: {fileID: 0}
- target: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_LocalPosition.x
@ -130351,11 +130356,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4537954547819557299, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_Name
value: UI_Effect_MuBiaoJiangLi
objectReference: {fileID: 0}
- target: {fileID: 7667894851207529766, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_IsActive

View File

@ -76,6 +76,7 @@ function this.Close(sub)
sub.lspLoader = nil
end
resMgr:UnLoadAsset(sub.assetName)
GameObject.Destroy(sub.gameObject)
-- LogError("sub UI close: "..sub.assetName)
end

View File

@ -209,6 +209,8 @@ GameEvent = {
OnLuckyTableZeroRefresh="Activity.OnLuckyTableZeroRefresh",
-- 积天豪礼刷新
ContinueRechargeRefresh ="Activity.ContinueRechargeRefresh",
--限时up的英雄改变
TimeLimitUpHeroChange = "Activity.TimeLimitUpHeroChange",
},
Carbon = {
CarbonCountChange = "Carbon.CarbonCountChange",

View File

@ -817,7 +817,7 @@ function this. CarbonRedCheck(redType)
end
return false
--心魔
elseif redType == RedPointType.EpicExplore then
elseif redType == RedPointType.EpicExplore_LevleReward then
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.MONSTER_COMING) then
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.FloodConfig)) do
if v.SpecialReward and #v.SpecialReward > 0 then
@ -828,7 +828,7 @@ function this. CarbonRedCheck(redType)
end
end
end
return MonsterCampManager.GetCanBattleCount() > 0
return false
--大闹天宫
elseif redType == RedPointType.OrdinaryExplore then
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.EXPEDITION) then

View File

@ -263,8 +263,9 @@ function this.ChatDataAdapter(channel, data)
GuildRedPacketManager.isCheck = true
MyGuildManager.PackageNum=MyGuildManager.PackageNum+1
CheckRedPointStatus(RedPointType.Guild_RedPacket)
CheckRedPointStatus(RedPointType.Guid_GetPackage)
--CheckRedPointStatus(RedPointType.Guild_RedPacket)
--CheckRedPointStatus(RedPointType.Guid_GetPackage)
--CheckRedPointStatus(RedPointType.Guild_RedPacket)
end
end
end

View File

@ -719,6 +719,7 @@ function FightPointPassMainPanel:OnDestroy()
SubUIManager.Close(this.playerInfoView)
this.playerInfoView = nil
end
points = {}
end
--跳转显示新手提示圈
function FightPointPassMainPanel.ShowGuideGo(btnIndex)

View File

@ -57,7 +57,7 @@ function this.OnShowPanel()
local allData = FightLevelManager.GetChapterData()
this.ScrollView:SetData(allData, function (index, go)
this.SingleChapterDataShow(go, allData[index])
end)
end,true,true)
local curIndex = FightLevelManager.GetCurChapterId()
this.ScrollView:SetShow(curIndex)
end
@ -74,7 +74,13 @@ function this.SingleChapterDataShow(go, data)
npc:OnClose()
npc = nil
end
npc = PlayerLiveView:New(playerParent.transform,1, nil,this.sortingOrder)
local PlayerLiveViewData = {
-- ride = PlayerManager.GetPlayerRide(),
skin = PlayerManager.GetPlayerSkin(),
sex = NameManager.roleSex,
-- designation = PlayerManager.GetPlayerDesignation()
}
npc = PlayerLiveView:New(playerParent.transform,2, PlayerLiveViewData,this.sortingOrder)
npc:OnOpen(GetPlayerRoleSingleConFig().Scale6,Vector3.New(0,0,0),WALK_DIR.IDLE_LEFT)
end
cur:SetActive(curChapterId == data.chapterId)

View File

@ -4,6 +4,7 @@ local this = FightLevelSingleChapterPanel
local sortingOrder = 0
local boxList = {}
local levelList = {}
local levelListEffect = {}
local chapterId = 0
local chapterData = {}
local allMissionDailyBoxItemPres = {}
@ -25,6 +26,7 @@ function FightLevelSingleChapterPanel:InitComponent()
this.prb = Util.GetGameObject(self.gameObject, "middle/prb")
this.rect = Util.GetGameObject(self.gameObject, "middle/rect")
levelList = {}
levelListEffect = {}
this.rewardBoxParent = Util.GetGameObject(self.gameObject, "middle/rewardBg/btnList")
this.progressBottom = Util.GetGameObject(self.gameObject, "middle/rewardBg/progressBottom/Image"):GetComponent("Image")
for i = 1, 3 do
@ -66,11 +68,13 @@ function FightLevelSingleChapterPanel:BindEvent()
end
function FightLevelSingleChapterPanel:OnSortingOrderChange()
--特效层级重设
-- for i=1,#boxList do
-- Util.AddParticleSortLayer(boxList[i], sortingOrder)
-- end
if levelListEffect and #levelListEffect > 0 then
for i=1,#levelListEffect do
Util.AddParticleSortLayer(levelListEffect[i], self.sortingOrder - sortingOrder)
end
sortingOrder = self.sortingOrder
end
end
--界面打开时调用(用于子类重写)
function FightLevelSingleChapterPanel:OnOpen(_chapterId)
chapterId = _chapterId
@ -84,6 +88,7 @@ function FightLevelSingleChapterPanel:OnShow()
this.OnShowPanel()
this.LeftOrRightBtnClickEvent()
this.rewardMaskBtn:SetActive(false)
end
function this.OnShowPanel()
chapterData = FightLevelManager.GetChapterData(chapterId)
@ -96,6 +101,7 @@ function this.OnShowPanel()
end
table.sort(curchapterData, function(a,b) return a.nodeId < b.nodeId end)
this.SetSingleLevel(curchapterData)
sortingOrder = this.sortingOrder
end
if chapterData.reward and LengthOfTable(chapterData.reward) > 0 then
this.SetlevelBox(chapterData.reward)
@ -154,6 +160,7 @@ function this.SetSingleLevel(levelDatas)
go.transform.localScale = Vector3.one
go.transform.localPosition = Vector3.zero
levelList[i] = go
levelListEffect[i] = Util.GetGameObject(go, "UI_Effect_Kuang_JinSe")
end
go.gameObject:SetActive(false)
end
@ -164,10 +171,13 @@ function this.SetSingleLevel(levelDatas)
local prb1 = Util.GetGameObject(levelList[i], "prb1")--主
local prb2 = Util.GetGameObject(levelList[i], "prb2")--副奖励
local prb3 = Util.GetGameObject(levelList[i], "prb3")--副战斗
local UI_Effect_Kuang_JinSe = Util.GetGameObject(levelList[i], "UI_Effect_Kuang_JinSe")
local isOpen = this.GetCurLevelIsOpen(levelDatas[i])-- -1 未开启 0 开启 1 需解锁上一关 2 等级不足
prb1:SetActive(false)
prb2:SetActive(false)
prb3:SetActive(false)
UI_Effect_Kuang_JinSe:SetActive(isOpen == 0 and levelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel)
Util.AddParticleSortLayer(UI_Effect_Kuang_JinSe,this.sortingOrder - sortingOrder)
if levelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel then --主关卡
prb1:SetActive(true)
Util.GetGameObject(prb1, "nameBg"):GetComponent("Image").sprite = this.spLoader:LoadSprite(isOpen == 0 and LevleTitleBg[1] or LevleTitleBg[2])

View File

@ -61,7 +61,7 @@ function FightLevelSingleLevelInfoPopup:RemoveListener()
contentScripts[i].view:RemoveListener()
end
end
local args
--界面打开时调用(用于子类重写)
function FightLevelSingleLevelInfoPopup:OnOpen(popupType,...)
-- local args={...}
@ -76,6 +76,7 @@ function FightLevelSingleLevelInfoPopup:OnOpen(popupType,...)
for i=1,#contentPrefabs do
contentPrefabs[i].gameObject:SetActive(false)
end
args = ...
this.BGImage1:SetActive(index == 1 )
this.BGImage2:SetActive(index == 2 or index == 3 or index == 4)
contentPrefabs[index].gameObject:SetActive(true)
@ -86,7 +87,9 @@ end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function FightLevelSingleLevelInfoPopup:OnShow()
for i = 1, #contentScripts do
contentScripts[i].view:OnShow(this,args)
end
end

View File

@ -218,9 +218,11 @@ function this.LeftOrRightBtnClickEvent()
if curShowIndex then
this.conditionInfoText:SetActive(false)
this.rewardRoot:SetActive(true)
this.tip.text="首通奖励"
else
this.conditionInfoText:SetActive(true)
this.rewardRoot:SetActive(false)
this.tip.text="特殊规则"
end
end
function this:OnClose()

View File

@ -536,6 +536,7 @@ end
--界面销毁时调用(用于子类重写)
function GuildMainCityPanel:OnDestroy()
this.spLoader:Destroy()
LogError("11111111111111111")
SubUIManager.Close(this.ChatTipView)
SubUIManager.Close(this.UpView)
SubUIManager.Close(this.BtView)
@ -552,7 +553,7 @@ function GuildMainCityPanel:OnDestroy()
-- 清除红点
ClearRedPointObject(RedPointType.Guild_RedPacket, this.btnRedPacketRedPoint)
LogError("22222222222222222222")
-- this.playerHead = nil
if this.LiveGO then

View File

@ -176,16 +176,16 @@ function MyGuildManager.ReuqsetRedPackage(func)
local SpecialConfig=ConfigManager.GetConfigData(ConfigName.SpecialConfig,115)
for i = 1, #msg.info do
local config=ConfigManager.GetConfigData(ConfigName.GuildRedPackConfig,msg.info[i].redType)
if msg.info[i].isGet==0 and (config.Num-msg.info[i].getCount)>0 then
if config and msg.info[i].isGet==0 and (config.Num-msg.info[i].getCount)>0 then
if config.BaseType~=2 or PlayerManager.dailyRedPack< tonumber(SpecialConfig.Value) then
LogError("红包id:"..config.Id)
num=num+1
end
end
end
this.PackageNum=num
CheckRedPointStatus(RedPointType.Guid_GetPackage)
CheckRedPointStatus(RedPointType.Guid_GetPackage)
CheckRedPointStatus(RedPointType.Guild_RedPacket)
if func then
func(msg)
end

View File

@ -21,10 +21,12 @@ function this.CheckGuildRedPacketRedPoint()
LogRed("检测发红包红点")
for key, value in pairs(list) do
if value and value.num and value.num>0 then
LogError("444444444444")
return true
end
end
end
LogError("5555555555")
return false
end
function this.CheckIsCanGetPackage()
@ -44,7 +46,6 @@ function this.CheckIsCanGetPackage()
-- return false
-- end)
LogError("can send package num:"..MyGuildManager.PackageNum)
if MyGuildManager.PackageNum>0 then
Game.GlobalEvent:DispatchEvent(GameEvent.Chat.OnRedPackageNumChanged)
return true

View File

@ -97,7 +97,7 @@ function this.InitView(redId,id)
this.sendPlayerHead[this.panel]:SetHead(msg.head)
this.sendPlayerHead[this.panel]:SetFrame(msg.headFrame)
this.sendPlayerHead[this.panel]:SetLayer(this.sortingOrder)
this.playerInfo.text="<color=yellow>"..msg.sendName..Language[11040]
this.playerInfo.text=PracticeManager.SetNameColor(msg.sendName,PracticeManager.PracticeLevel)..Language[11040]
local data=msg.info
this.image.enabled=(config.Num-#data)==0
@ -160,8 +160,7 @@ function this.SetShow(root,data,index)
break
end
end
playerName.text=data.name.." ("..grant..")"
playerName.text=PracticeManager.SetNameColor(data.name,data.practiceLevel).." ("..grant..")"
time.text=FindFairyManager.TimeStampToDateStr(data.time)
rewardIcon.sprite=SetIcon(this.spLoader, data.itemId)
rewardNum.text=data.count

View File

@ -262,8 +262,8 @@ function this.RechargeSuccessFunc(id)
this.SetInfo(curIndex)
--PopupTipPanel.ShowTip(string.format( Language[11051],GetLanguageStrById(redpack.Name)))
ChatManager.RequestSendRedPacket(curIndex)
--MyGuildManager.ReuqsetRedPackage()
CheckRedPointStatus(RedPointType.Guid_GetPackage)
MyGuildManager.ReuqsetRedPackage()
-- CheckRedPointStatus(RedPointType.Guid_GetPackage)
end
return this

View File

@ -467,6 +467,7 @@ function this.ExecuteLoading()
function() MyGuildManager.ReuqsetRedPackage(LoadingPanel.OnStep) end,
function() NetManager.HardStageRequest(LoadingPanel.OnStep) end,
function() NetManager.VipLevelStateRequset(LoadingPanel.OnStep) end,
function() NetManager.RequestWelfareRedPacket(LoadingPanel.OnStep) end,
--[[[35] =]] function() -- 登录请求最终接口,所有请求放在此接口之前
-- 登录成功确认
NetManager.LoginConfimRequest()

View File

@ -178,7 +178,7 @@ function this.SetRewardData()
if v.SpecialReward and #v.SpecialReward > 0 then
local data = {}
data.Id = v.Id
data.info = string.format(Language[12166],v.Id)
data.info = string.format("通过心魔试炼第%s层",v.Id)
data.BoxReward = v.SpecialReward
data.state = this.GetTrialRewardState(v.Id)
table.insert(dataList,data)

View File

@ -102,7 +102,7 @@ function MonsterCampNewPanel:BindEvent()
return
end
local _storeDataId,_itemId,_costNum,moppingUpNum = MonsterCampManager.MonsterCampGetYJGMCost()
MsgPanel.ShowTwo(string.format("是否花费%s进行一键扫荡?",_costNum,itemConfig[itemId].Name),function() end,function()
MsgPanel.ShowTwo(string.format("是否花费%s%s进行一键扫荡?",_costNum,itemConfig[itemId].Name),function() end,function()
if BagManager.GetItemCountById(_itemId) < _costNum then
PopupTipPanel.ShowTip(string.format(Language[10298], itemConfig[itemId].Name))
else
@ -150,6 +150,8 @@ end
--界面打开时调用(用于子类重写)
function MonsterCampNewPanel:OnShow()
CheckRedPointStatus(RedPointType.EpicExplore_LevleReward)
CheckRedPointStatus(RedPointType.EpicExplore_MoppingUp)
storeDataId,itemId,costNum = MonsterCampManager.MonsterCampGetCost()
this.titleText.text = Language[12099]
freeTimes = MonsterCampManager.GetCanBattleCount()

View File

@ -17,7 +17,7 @@ function this.RegisterMessage(network)
--监听红点推送
socket:RegistNetMessage(MessageTypeProto_pb.SEND_RED_POINT_INDICATION, this.ReceiveRedPoint)
--福利红包推送
socket:RegistNetMessage(MessageTypeProto_pb.WELFARE_RED_PACKET_INFO, this.WelfareRedPacketPush)
--socket:RegistNetMessage(MessageTypeProto_pb.WELFARE_RED_PACKET_INFO, this.WelfareRedPacketPush)
socket:RegistNetMessage(MessageTypeProto_pb.UPDATE_BAG_INDICATION, this.BackUpDataBagItemIdNumber)
socket:RegistNetMessage(MessageTypeProto_pb.SEND_CHAT_INFO_INDICATION, this.ReceiveFriendChat)

View File

@ -1932,7 +1932,6 @@ end
-- 请求发送聊天数据
function this.RequestSendChatMsg(type, msg, friend, func)
LogError(tostring(msg))
if string.utf8len(msg) > 140 then
PopupTipPanel.ShowTip(Language[11345])
return
@ -2533,6 +2532,27 @@ function this.RequestWelfareRedPacket(_id,func)
end)
end
-- 登陆请求福利红包数据
function this.RequestWelfareRedPacket(func)
local data = PlayerInfoProto_pb.WelfareRedPacketRequest()
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.WELFARE_RED_PACKET_REQUEST, MessageTypeProto_pb.WELFARE_RED_PACKET_INFO, msg, function(buffer)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.WelfareRedPacketPush()
LogError("********************")
msg:ParseFromString(data)
if msg.redpacket then
MyGuildManager.SetMyGuidRedPackage(msg.redpacket)
CheckRedPointStatus(RedPointType.Guid_SendPackage)
end
if func then
func()
end
end)
end
--请求公会行走
function this.GuildWalkRequest(pathList, func)
Log("FAMILY_WALK_REQUEST")
@ -5155,4 +5175,37 @@ function NetManager.SweepDemonRequest(id,onKeySweep,func)
end
end)
end
-- 限时祈愿选择抽卡保底的英雄
function NetManager.ChoiceHeroRewardRequest(actId,heroId,func)
local data=ActivityProto_pb.choiceHeroRewardRequest()
data.activityId=actId
data.rewardId =heroId
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.choiceHeroRewardRequest, MessageTypeProto_pb.choiceHeroRewardResponse, msg, function(buffer)
local data = buffer:DataByte()
local msg = ActivityProto_pb.choiceHeroRewardResponse()
msg:ParseFromString(data)
if func then
func(msg)
end
end)
end
--限时祈愿活动抽卡
function NetManager.ChoiceDrawCardRequest(actID,_type,func)
local data=ActivityProto_pb.ChoiceDrawCardRequest()
data.activityId=actID
data.type=_type
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.ChoiceDrawCardRequest, MessageTypeProto_pb.choiceDrawCardResponse, msg, function(buffer)
local data = buffer:DataByte()
local msg = ActivityProto_pb.choiceDrawCardResponse()
msg:ParseFromString(data)
if func then
func(msg)
end
end)
end
return this

View File

@ -540,6 +540,9 @@ function this.BindObject(rpType, rpObj)
table.insert(BindObjs[rpType], rpObj)
--Log("红点类型 = "..rpType..", 绑定了新物体,当前绑定的物体数量为 = "..#BindObjs[rpType])
-- 根据状态设置红点现隐
if not rpObj then
return
end
rpObj:SetActive(this.GetRedPointStatus(rpType) == RedPointStatus.Show)
end

View File

@ -58,9 +58,10 @@ function ChatTipView:RemoveListener()
end
function ChatTipView:CheckRedPackageShow()
if MyGuildManager.PackageNum>0 then
if MyGuildManager.PackageNum>0 and self.redPackage.gameObject then
self.redPackage.gameObject:SetActive(true)
self.freeBtnAnim.enabled=true
LogError("///////////")
--self.freeBtnAnim.enabled=true
else
self.redPackage.gameObject:SetActive(false)
end

View File

@ -188,7 +188,6 @@ function MonsterCampSingleWave:SingleHeroDataShow(monConfig,heroData)
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroData.Id)
local scale = roleConfig.play_liveScale
local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2], 0)
LogYellow("(self.data.Id%6 == 0 and 12 or (self.data.Id%6 + 6)) "..(self.data.Id%6 == 0 and 12 or (self.data.Id%6 + 6)))
self.icon.texture = CardRendererManager.GetSpineTexture((self.data.Id%6 == 0 and 6 or (self.data.Id%6)), liveName, Vector3.one * scale, livePos, true)
self.icon.transform.localScale = Vector3.one
self.icon.transform.localPosition = Vector3.zero