Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
bddb02cf81
|
|
@ -8975,7 +8975,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: 92.7, y: -1}
|
||||
m_AnchoredPosition: {x: 200, y: -1}
|
||||
m_SizeDelta: {x: 85, y: 85}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4295345761131377981
|
||||
|
|
|
|||
|
|
@ -252,6 +252,7 @@ CARCHALLENGEITEM_SCORE_FIELD = protobuf.FieldDescriptor();
|
|||
CARCHALLENGEITEM_HADCHALLENGE_FIELD = protobuf.FieldDescriptor();
|
||||
CARCHALLENGEITEM_RANK_FIELD = protobuf.FieldDescriptor();
|
||||
CARCHALLENGEITEM_TEAMINFO_FIELD = protobuf.FieldDescriptor();
|
||||
CARCHALLENGEITEM_PRACTICELEVEL_FIELD = protobuf.FieldDescriptor();
|
||||
GETCARCHALLENEGLISTRESPONSE = protobuf.Descriptor();
|
||||
GETCARCHALLENEGLISTRESPONSE_CARCHALLENGEITEM_FIELD = protobuf.FieldDescriptor();
|
||||
GETCARCHALLENEGLISTRESPONSE_MYRANK_FIELD = protobuf.FieldDescriptor();
|
||||
|
|
@ -2672,11 +2673,21 @@ CARCHALLENGEITEM_TEAMINFO_FIELD.message_type = CommonProto_pb.TEAMSIMPLEINFO
|
|||
CARCHALLENGEITEM_TEAMINFO_FIELD.type = 11
|
||||
CARCHALLENGEITEM_TEAMINFO_FIELD.cpp_type = 10
|
||||
|
||||
CARCHALLENGEITEM_PRACTICELEVEL_FIELD.name = "practiceLevel"
|
||||
CARCHALLENGEITEM_PRACTICELEVEL_FIELD.full_name = ".rpc.protocols.CarChallengeItem.practiceLevel"
|
||||
CARCHALLENGEITEM_PRACTICELEVEL_FIELD.number = 9
|
||||
CARCHALLENGEITEM_PRACTICELEVEL_FIELD.index = 8
|
||||
CARCHALLENGEITEM_PRACTICELEVEL_FIELD.label = 1
|
||||
CARCHALLENGEITEM_PRACTICELEVEL_FIELD.has_default_value = false
|
||||
CARCHALLENGEITEM_PRACTICELEVEL_FIELD.default_value = 0
|
||||
CARCHALLENGEITEM_PRACTICELEVEL_FIELD.type = 5
|
||||
CARCHALLENGEITEM_PRACTICELEVEL_FIELD.cpp_type = 1
|
||||
|
||||
CARCHALLENGEITEM.name = "CarChallengeItem"
|
||||
CARCHALLENGEITEM.full_name = ".rpc.protocols.CarChallengeItem"
|
||||
CARCHALLENGEITEM.nested_types = {}
|
||||
CARCHALLENGEITEM.enum_types = {}
|
||||
CARCHALLENGEITEM.fields = {CARCHALLENGEITEM_UID_FIELD, CARCHALLENGEITEM_USERNAME_FIELD, CARCHALLENGEITEM_FORCE_FIELD, CARCHALLENGEITEM_GUILDNAME_FIELD, CARCHALLENGEITEM_SCORE_FIELD, CARCHALLENGEITEM_HADCHALLENGE_FIELD, CARCHALLENGEITEM_RANK_FIELD, CARCHALLENGEITEM_TEAMINFO_FIELD}
|
||||
CARCHALLENGEITEM.fields = {CARCHALLENGEITEM_UID_FIELD, CARCHALLENGEITEM_USERNAME_FIELD, CARCHALLENGEITEM_FORCE_FIELD, CARCHALLENGEITEM_GUILDNAME_FIELD, CARCHALLENGEITEM_SCORE_FIELD, CARCHALLENGEITEM_HADCHALLENGE_FIELD, CARCHALLENGEITEM_RANK_FIELD, CARCHALLENGEITEM_TEAMINFO_FIELD, CARCHALLENGEITEM_PRACTICELEVEL_FIELD}
|
||||
CARCHALLENGEITEM.is_extendable = false
|
||||
CARCHALLENGEITEM.extensions = {}
|
||||
GETCARCHALLENEGLISTRESPONSE_CARCHALLENGEITEM_FIELD.name = "carChallengeItem"
|
||||
|
|
|
|||
|
|
@ -159,13 +159,13 @@ function this.RequestArenaChallenge(index, isSkip, func)
|
|||
arg.result = msg.fightResult
|
||||
arg.blue = {}
|
||||
arg.blue.uid = PlayerManager.uid
|
||||
arg.blue.name = JingJiShouWeiToEn(PlayerManager.nickName)
|
||||
arg.blue.name = JingJiShouWeiToEn(PracticeManager.SetNameColor(PlayerManager.nickName,PracticeManager.PracticeLevel))
|
||||
arg.blue.head = PlayerManager.head
|
||||
arg.blue.frame = HeadManager.GetCurFrameId()
|
||||
arg.blue.deltaScore = msg.myScoreChange
|
||||
arg.red= {}
|
||||
arg.red.uid = enemy.personInfo.uid
|
||||
arg.red.name = JingJiShouWeiToEn(enemy.personInfo.name)
|
||||
arg.red.name = JingJiShouWeiToEn(PracticeManager.SetNameColor(enemy.personInfo.name,enemy.personInfo.practiceLevel))--enemy.personInfo.name)
|
||||
arg.red.head = enemy.personInfo.head
|
||||
arg.red.frame = enemy.personInfo.headFrame
|
||||
arg.red.deltaScore = msg.defScoreChange
|
||||
|
|
@ -225,10 +225,11 @@ this.ArenaRecords = {}
|
|||
function this.RequestArenaRecord()
|
||||
-- 请求刷新数据,并刷新显示
|
||||
NetManager.RequestArenaRecord(function(msg)
|
||||
this.ArenaRecords = msg.arenaRecordInfo
|
||||
for k,v in ipairs(this.ArenaRecords) do
|
||||
v.attackInfo.name = JingJiShouWeiToEn(v.attackInfo.name)
|
||||
for k,v in ipairs(msg.arenaRecordInfo) do
|
||||
LogRed("v.attackInfo.practiceLevel:"..tostring(v.attackInfo.practiceLevel))
|
||||
v.attackInfo.name = JingJiShouWeiToEn(PracticeManager.SetNameColor(v.attackInfo.name,v.attackInfo.practiceLevel))
|
||||
end
|
||||
this.ArenaRecords = msg.arenaRecordInfo
|
||||
table.sort(this.ArenaRecords, function(a,b)
|
||||
return a.attackTime > b.attackTime
|
||||
end)
|
||||
|
|
|
|||
|
|
@ -430,6 +430,10 @@ function TimeLimitUpHero:OnClose()
|
|||
self.timer:Stop()
|
||||
self.timer = nil
|
||||
end
|
||||
|
||||
if UIManager.IsOpen(UIName.GeneralPopup) then
|
||||
UIManager.ClosePanel(UIName.GeneralPopup)
|
||||
end
|
||||
end
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function TimeLimitUpHero:OnDestroy()
|
||||
|
|
|
|||
|
|
@ -364,6 +364,7 @@ end
|
|||
function this:OnDestroy()
|
||||
this.ratePreList = {}
|
||||
this.listUpPre = {}
|
||||
hero=nil
|
||||
end
|
||||
|
||||
return this
|
||||
|
|
@ -53,6 +53,9 @@ function GuildCarDelayLootPopup:OnShow()
|
|||
--for i = 1, #msg.carChallengeItem do
|
||||
-- LogError("uid "..msg.carChallengeItem[i].uid)
|
||||
--end
|
||||
for i = 1, #msg.carChallengeItem do
|
||||
msg.carChallengeItem[i].userName = PracticeManager.SetNameColor(msg.carChallengeItem[i].userName,msg.carChallengeItem[i].practiceLevel)
|
||||
end
|
||||
CarChallenegList = msg
|
||||
this.titleText.text = Language[11002]..ConfigManager.GetConfigData(ConfigName.WorldBossSetting,1).GrabPercent/100 ..Language[11003]
|
||||
if CarChallenegList then
|
||||
|
|
|
|||
|
|
@ -254,7 +254,7 @@ function this.SwitchView(index)
|
|||
RankingManager.InitData(RANK_TYPE.GUILD_CAR_DELEAY_SINGLE,function()
|
||||
local ranks,myRank = RankingManager.GetRankingInfo()
|
||||
this.SetRankDataShow(ranks,myRank,true)
|
||||
this.myGuildName.text = PlayerManager.nickName
|
||||
this.myGuildName.text = PracticeManager.SetNameColor(PlayerManager.nickName,PracticeManager.PracticeLevel)
|
||||
end,nil,1)
|
||||
elseif curIndex == 1 then
|
||||
-- NetManager.RequestRankInfo(RANK_TYPE.GUILD_CAR_DELEAY_GUILD, function(msg)
|
||||
|
|
|
|||
|
|
@ -753,6 +753,19 @@ function EndLessMapView:OnClose()
|
|||
this.timer:Stop()
|
||||
this.timer = nil
|
||||
end
|
||||
|
||||
if UIManager.IsOpen(UIName.GeneralBigPopup) then
|
||||
UIManager.ClosePanel(UIName.GeneralBigPopup)
|
||||
end
|
||||
if UIManager.IsOpen(UIName.GeneralPopup) then
|
||||
UIManager.ClosePanel(UIName.GeneralPopup)
|
||||
end
|
||||
if UIManager.IsOpen(UIName.TrialRewardPopup) then
|
||||
UIManager.ClosePanel(UIName.TrialRewardPopup)
|
||||
end
|
||||
if UIManager.IsOpen(UIName.EndLessTreasurePanel) then
|
||||
UIManager.ClosePanel(UIName.EndLessTreasurePanel)
|
||||
end
|
||||
end
|
||||
|
||||
function EndLessMapView:OnDestroy()
|
||||
|
|
|
|||
|
|
@ -5244,7 +5244,6 @@ function NetManager.ChoiceDrawCardRequest(actID,_type,func)
|
|||
local data=ActivityProto_pb.choiceDrawCardRequest()
|
||||
data.activityId=actID
|
||||
data.type=_type
|
||||
LogError("actid=="..actID.." type==".._type)
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.choiceDrawCardRequest, MessageTypeProto_pb.choiceDrawCardResponse, msg, function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
|
|
|
|||
|
|
@ -152,6 +152,9 @@ function NiuQiChongTianPanel:SetTime()
|
|||
end
|
||||
local updateTime = function()
|
||||
self.time.text = "剩余时间:"..TimeToFelaxible(tempTime)
|
||||
if tempTime <= 0 then
|
||||
self.parent:ClosePanel()
|
||||
end
|
||||
end
|
||||
updateTime()
|
||||
self.timer = Timer.New(function()
|
||||
|
|
|
|||
|
|
@ -538,14 +538,14 @@ end
|
|||
|
||||
|
||||
-- 向红点绑定物体
|
||||
function this.BindObject(rpType, rpObj)
|
||||
function this.BindObject(rpType, rpObj)
|
||||
if not rpObj then
|
||||
return
|
||||
end
|
||||
BindObjs[rpType] = BindObjs[rpType] or {}
|
||||
table.insert(BindObjs[rpType], rpObj)
|
||||
--Log("红点类型 = "..rpType..", 绑定了新物体,当前绑定的物体数量为 = "..#BindObjs[rpType])
|
||||
-- 根据状态设置红点现隐
|
||||
if not rpObj then
|
||||
return
|
||||
end
|
||||
rpObj:SetActive(this.GetRedPointStatus(rpType) == RedPointStatus.Show)
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -355,7 +355,7 @@ function this.CalculateHeroAllProValList(heroConFigData,_starNum,isCalculateStar
|
|||
-- end
|
||||
-- end
|
||||
-- end
|
||||
local heroRankupConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroRankupConfig, "Star", heroConFigData.Star, "LimitStar", _starNum)
|
||||
local heroRankupConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroRankupConfig, "Star", heroConFigData.Star, "OpenStar", _starNum)
|
||||
local curLvNum=1
|
||||
breakId = 0
|
||||
upStarId = 0
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
|
|||
function this:InitComponent(gameObject)
|
||||
this.spLoader = SpriteLoader.New()
|
||||
this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
|
||||
this.titleText.text="许愿神将"
|
||||
this.cancelBtn=Util.GetGameObject(gameObject,"CancelBtn")
|
||||
this.confirmBtn=Util.GetGameObject(gameObject,"ConfirmBtn")
|
||||
this.FourStarUpTip=Util.GetGameObject(gameObject,"tip"):GetComponent("Text")
|
||||
|
|
|
|||
Loading…
Reference in New Issue