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

dev_chengFeng
jiaoyangna 2021-11-23 14:01:00 +08:00
commit 86bf793ba7
17 changed files with 133 additions and 55 deletions

View File

@ -25129,8 +25129,8 @@ MonoBehaviour:
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
--- !u!114 &467253722821923192

View File

@ -142,9 +142,9 @@ RectTransform:
m_Father: {fileID: 3847735914630897183}
m_RootOrder: 8
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: 0, y: -20.625}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -980.625}
m_SizeDelta: {x: 1080, y: 287.09998}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &618128080
@ -5805,9 +5805,9 @@ RectTransform:
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 450.90002}
m_SizeDelta: {x: -88.599976, y: 689.9}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -509.09998}
m_SizeDelta: {x: -88.599976, y: -1230.1001}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6712636463915347790
CanvasRenderer:
@ -16435,9 +16435,9 @@ RectTransform:
m_Father: {fileID: 1005476532}
m_RootOrder: 2
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: 0, y: -25.700012}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -985.7}
m_SizeDelta: {x: 1020, y: 292}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7904907148318517785
@ -22859,9 +22859,9 @@ RectTransform:
m_Father: {fileID: 6806311222125822462}
m_RootOrder: 0
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: -0.000022888, y: 275.1}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -0.000022888, y: -69.899994}
m_SizeDelta: {x: 377, y: 63}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1552852807439129411
@ -28889,9 +28889,9 @@ RectTransform:
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 556.8}
m_SizeDelta: {x: 0, y: 1113.51}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -403.2}
m_SizeDelta: {x: 0, y: -806.49}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9104638170338534805
CanvasRenderer:
@ -29016,7 +29016,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 40
m_Left: 102
m_Right: 0
m_Top: 0
m_Bottom: 0

View File

@ -663,7 +663,7 @@ function this.GMCallBackData(drop)
-- TalismanManager.InitUpdateSingleTalismanData(drop.especialEquipId[i])
-- end
-- end
LogBlue("drop.soulEquip:"..#drop.soulEquip)
-- LogBlue("drop.soulEquip:"..#drop.soulEquip)
if (#drop.soulEquip > 0) then
--SoulPrintManager.InitServerData(drop.soulEquip)
EquipTreasureManager.InitAllEquipTreasure(drop.soulEquip)

View File

@ -9677,7 +9677,7 @@ local passivityList = {
role.Event:AddEvent(BattleEventName.SkillCastEnd, OnSkillCastEnd,nil,nil,role)
end,
--释放技能时[a]%概率 清除目标一个减异效果
--治疗神将释放技能时[a]%概率 清除目标一个减异效果
--a[float]
[391]=function(role,args,id,judge)
local pro=args[1]
@ -9707,9 +9707,13 @@ local passivityList = {
-- end
-- end
local OnSkillCastEnd = function(skill)
if skill and not skill.isTriggerJudge and judge==1 then
return
end
if role.job~=1 then
return
end
-- if skill.type == BattleSkillType.Special or skill.type==BattleSkillType.Extra or skill.type==BattleSkillType.DeadSkill then
-- role.Event:RemoveEvent(BattleEventName.RoleTreat,onRoleTreat,nil,nil,role)
-- end

View File

@ -488,7 +488,11 @@ function BattleLogic.Update()
end
if CurRound > MaxRound then
if BattleLogic.Type == BATTLE_SERVER_TYPE.TOPFight -- 巅峰赛
or BattleLogic.Type == BATTLE_SERVER_TYPE.Firend then -- 好友切磋
or BattleLogic.Type == BATTLE_SERVER_TYPE.Firend
or BattleLogic.Type == BATTLE_SERVER_TYPE.CrossYuxuLunDaoFight
or BattleLogic.Type == BATTLE_SERVER_TYPE.LINGMAIMIJING
or BattleLogic.Type == BATTLE_SERVER_TYPE.CarPersonFight
or BattleLogic.Type == BATTLE_SERVER_TYPE.NewArenaFight then -- 好友切磋
if allHeroDamage>allEnemyDamage then
BattleLogic.BattleEnd(1)
else

View File

@ -6,7 +6,7 @@ end
BATTLE_SERVER_TYPE = {
NewArenaFight = 0, --本地测试竞技场值
NewArenaFight = 0, --本地测试竞技场值/罗浮争锋
StoryFight = 1, --故事副本
MapExploreFight = 2, -- 地图探索
ArenaFight = 3, --竞技场

View File

@ -398,6 +398,7 @@ function this.InitBattleData()
--BattleLogic.IsOpenBattleRecord = true
BattleLogic.Init(this.fightData, {uid = PlayerManager.uid, fightId = this.fightId}, this.maxRound)
BattleLogic.Type = this.battleType
LogError("battle type=="..BattleLogic.Type)
this.InitBattleEvent()
-- this.EnemyPanel:GetComponent("RectTransform").anchoredPosition = Vector2.New(0, posY)

View File

@ -40,29 +40,25 @@ function BattleUnit:DelayFunc(time, func)
end
local timer
timer = Timer.New(function ()
if func then func() func = nil end
if self._DelayFuncList[timer] then
self._DelayFuncList[timer]()
end
self:ClearDelayFunc(timer)
end, time)
timer:Start()
table.insert(self._DelayFuncList, timer)
--
self._DelayFuncList[timer] = func
end
function BattleUnit:ClearDelayFunc(t)
if not self._DelayFuncList then return end
if t then
local rIndex
for index, timer in ipairs(self._DelayFuncList) do
if timer == t then
rIndex = index
break
end
end
if rIndex then
self._DelayFuncList[rIndex]:Stop()
table.remove(self._DelayFuncList, rIndex)
if self._DelayFuncList[t] then
t:Stop()
self._DelayFuncList[t] = nil
end
else
for _, timer in ipairs(self._DelayFuncList) do
for timer, func in pairs(self._DelayFuncList) do
timer:Stop()
end
self._DelayFuncList = {}

View File

@ -548,8 +548,9 @@ function PlayerView:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotTy
self.Floater:ArtFloating(ArtFloatingType.PoisonDamage, ArtFloatingColor.Poison, dmg,TextFloatingColor.DarkGreen)
elseif dotType == DotType.Burn then
self.Floater:ArtFloating(ArtFloatingType.FireDamage, ArtFloatingColor.Fire, dmg)
elseif dotType == DotType.Blooding then
self.Floater:ArtFloating(ArtFloatingType.BleedDamage, ArtFloatingColor.Fire, dmg)
else
self.Floater:TextBuffFloating(2, DotTypeTip[dotType]..dmg)
end
@ -693,9 +694,9 @@ function PlayerView:OnRealDead()
end
function PlayerView:onRoleRelive()
self.GameObject:SetActive(true)
Util.SetGray(self.RoleIconGO, false)
self.deadIconGO:SetActive(false)
local color = Color.New(1, 1, 1, 1)
Util.SetColor(self.GameObject, color)
Util.SetColor(self.RoleLiveGOGraphic, color)

View File

@ -32,9 +32,9 @@ function this:OnShow(_parent)
self.data = LingMaiMiJingManager.recordData
if #self.data > 0 then
self.empty:SetActive(false)
for i = 1, #this.recordData do
if this.recordData[i].time == 1 then
PlayerPrefs.SetString(PlayerManager.uid.."LingMai",self.data[1].time)
for i = 1, #self.data do
if self.data[i].type == 1 then
PlayerPrefs.SetString(PlayerManager.uid.."LingMai",self.data[i].time)
break
end
end
@ -59,9 +59,9 @@ function this:SetSingleData(_go,_data,_index)
time.text = string.format( "[%s]",TimeStampToDateStr5(_data.time))
if _data.type == 0 then
desc.text = string.format("经过一番激烈的战斗,最终击败%s %s占领%s开始收集灵脉资源",tostring(_data.defServerName),PracticeManager.SetNameColor(_data.defName,_data.practiceLevel),lodeConfig[_data.lingMaiId].Name)
desc.text = string.format("经过一番激烈的战斗,最终击败(%s)%s占领%s开始收集灵脉资源",tostring(_data.defServerName),PracticeManager.SetNameColor(_data.defName,_data.practiceLevel),lodeConfig[_data.lingMaiId].Name)
elseif _data.type == 1 then
desc.text = string.format("大战过后,我方神将不敌%s %s丢失%s",tostring(_data.defServerName),PracticeManager.SetNameColor(_data.defName,_data.practiceLevel),lodeConfig[_data.lingMaiId].Name)
desc.text = string.format("大战过后,我方神将不敌(%s)%s丢失%s",tostring(_data.defServerName),PracticeManager.SetNameColor(_data.defName,_data.practiceLevel),lodeConfig[_data.lingMaiId].Name)
end
end

View File

@ -3818,6 +3818,20 @@ function this.GetHeroIdByEquipId(_id)
end
end
--通过装备id找英雄idList
function this.GetHeroIdListByEquipId(_id)
local heroList = {}
for _, heroData in ipairs(this.heroDataLists) do
for i = 1, #heroData.equipIdList do
if _id == tonumber(heroData.equipIdList[i]) then
-- return heroData.name
table.insert(heroList,heroData.name)
end
end
end
return heroList
end
function this.CheckIsUpTreasure(Did,index)
if not Did then
return false

View File

@ -128,10 +128,25 @@ function this.CheckPrivilage(func)
end
function this.CheckRedPoint()
--判断功能是否开启
if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.LINGMAIMIJING) then
return false
end
--判断世界等级是否够
local conFigWorldLevel = ConfigManager.GetConfigData(ConfigName.MServerLodeSetting,1).WorldLevel
if PlayerManager.worldLeve < conFigWorldLevel then --如果世界等级不足
return false
end
-- 跨服相关判断
if not JumpServerManager.GetLingMaiIsStart() then
return false
elseif not JumpServerManager.GetHightLadderDataIsGroup() then
return false
end
if this.state ~= 1 then
return false
end
if PrivilegeManager.GetPrivilegeRemainValue(2030) > 0 then
if this.myPlaceId <= 0 then
return true
end
if #this.recordData > 0 then
@ -139,8 +154,8 @@ function this.CheckRedPoint()
PlayerPrefs.SetString(PlayerManager.uid.."LingMai", "")
end
for i = 1, #this.recordData do
if PlayerPrefs.GetString(PlayerManager.uid.."LingMai") ~= tostring(this.recordData[i].time) and this.recordData[i].time == 1 then
return true
if this.recordData[i].type == 1 then
return PlayerPrefs.GetString(PlayerManager.uid.."LingMai") ~= tostring(this.recordData[i].time)
end
end
end
@ -149,11 +164,39 @@ end
function this.CheckRecord()
for i = 1, #this.recordData do
if this.recordData[i].time == 1 then
if this.recordData[i].type == 1 then
return PlayerPrefs.GetString(PlayerManager.uid.."LingMai") ~= tostring(this.recordData[i].time)
end
end
return false
end
function this.CheckQiJieJump(funcType,SettingNum,func)
--判断功能是否开启
if not ActTimeCtrlManager.IsQualifiled(funcType) then
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(funcType))
return
end
--判断世界等级是否够
local conFigWorldLevel = ConfigManager.GetConfigData(ConfigName.MServerLodeSetting,SettingNum).WorldLevel
if PlayerManager.worldLeve < conFigWorldLevel then --如果世界等级不足
PopupTipPanel.ShowTip(string.format("世界等级到达%s后开启",conFigWorldLevel))
return
end
-- 跨服相关判断
JumpServerManager.GetWorldArenaInfoRequest(function()
if not JumpServerManager.GetQiJieIsStart() then
PopupTipPanel.ShowTip(string.format("开服第%s周开放",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,SettingNum).OpenWeek))
return
elseif not JumpServerManager.GetHightLadderDataIsGroup() then
PopupTipPanel.ShowTip("未划分跨服分组,无法参与!")
return
end
if func then
func()
end
end)
end
return LingMaiMiJingManager

View File

@ -75,10 +75,10 @@ function LingMaiMiJingPanel:BindEvent()
LingMaiMiJingManager.OpenRecord()
end)
Util.AddOnceClick(self.rewardBtn, function()
NetManager.RequestRankInfo(RANK_TYPE.LINGMAIMIJING_RANK, function (msg)--请求数据
LogYellow("我的排名:"..tostring(msg.myRankInfo.rank))
UIManager.OpenPanel(UIName.GeneralRankRewardPanel,5,msg.myRankInfo.rank)--需要活动id和我的排名
end,0,1,0)
RankingManager.InitData(RANK_TYPE.LINGMAIMIJING_RANK, function(msg)
local data,myData=RankingManager.GetRankingInfo()
UIManager.OpenPanel(UIName.GeneralRankRewardPanel,5,myData.rank)--需要活动id和我的排名
end)
end)
Util.AddOnceClick(self.sortBtn, function()
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[33])

View File

@ -238,8 +238,10 @@ function PlayerInfoPopup:OnShow()
if this.serverName and this.serverName ~= "" then--and this.serverName ~= PlayerManager.serverInfo.name
netserverName = 1
end
this.curPlayerData = {}
NetManager.RequestPlayerInfo(this._PlayerId, this._Config.formationType,netserverName,0, function(msg)
-- 如果是好友更新好友数据
this.curPlayerData = msg.teamInfo
curPlayerName = msg.teamInfo.name
GoodFriendManager.UpdateFriendData(this._PlayerId, msg.teamInfo.level, JingJiShouWeiToEn(msg.teamInfo.name) , msg.teamInfo.head, msg.teamInfo.headFrame)
this._PlayerData = msg.teamInfo
@ -494,7 +496,6 @@ function this.SpecialBtnShow()
this.btnList[2]:SetActive(false)
end
end
end
end
@ -571,7 +572,12 @@ end
--灵脉秘境
function this.LingMaiQieCuo()
this:ClosePanel()
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.LINGMAIMIJING, this.data,true)
local sdata = {}
sdata.uid = this._PlayerId
sdata.name = this.curPlayerData.name
sdata.head = this.curPlayerData.head
sdata.headFrame = this.curPlayerData.headFrame
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.LINGMAIMIJING, sdata,true)
end
--界面关闭时调用(用于子类重写)
@ -582,6 +588,7 @@ function PlayerInfoPopup:OnClose()
SubUIManager.Close(titleLive)
titleLive = nil
end
curPlayerData = {}
end
--界面销毁时调用(用于子类重写)

View File

@ -128,6 +128,10 @@ function SoulPrintPopUp:BindEvent()
HeroManager.AddSoulPrintUpHeroDynamicId(curHeroData.dynamicId,localData.id,pos)
PopupTipPanel.ShowTip(Language[11526])
self:RefreshShow()
--
if callback then
callback()
end
self:ClosePanel()
end)
end)

View File

@ -141,7 +141,7 @@ function this:ShowSingleData(item,sdata,index)
end
end)
Util.AddOnceClick(equiped,function ()
MsgPanel.ShowTwo(string.format("<size=45><color=#00FF66>%s</color>穿戴该装备,是否前往卸下?</size>",HeroManager.GetHeroIdByEquipId(sdata.Id)),function() end,function()
MsgPanel.ShowTwo(string.format("<size=45><color=#00FF66>%s</color>穿戴该装备,是否前往卸下?</size>",HeroManager.GetHeroIdListByEquipId(sdata.Id)[index]),function() end,function()
JumpManager.GoJump(22001)
end,"取消","确定")
end)

View File

@ -50,6 +50,11 @@ function TailsManSouPanel:BindEvent()
self:ClosePanel()
end)
Util.AddClick(self.addBtn, function()
local li = TailsManSoulManager.GetTailsmanTotalPro()
if not li or #li < 1 then
PopupTipPanel.ShowTip("当前无属性加成")
return
end
local s = function(data)
local lis1 = {}
for k,v in pairs(data) do
@ -66,8 +71,7 @@ function TailsManSouPanel:BindEvent()
end
local data = {}
local singData = {}
singData.title = "加成属性"
local li = TailsManSoulManager.GetTailsmanTotalPro()
singData.title = "加成属性"
singData.pro = s(li)
singData.tip = ""
table.insert(data,singData)