Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
0e15c3d812
|
@ -754,6 +754,7 @@ function this.GetFakeBattleData(fakeId)
|
||||||
battleData.enemyData[1].firstCamp = 1
|
battleData.enemyData[1].firstCamp = 1
|
||||||
battleData.playerData.firstCamp = 0
|
battleData.playerData.firstCamp = 0
|
||||||
end
|
end
|
||||||
|
battleData.enemyId=fakeId
|
||||||
return battleData, fakeConfig.TimeSeed
|
return battleData, fakeConfig.TimeSeed
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -27,9 +27,9 @@ local SKIP_STATE = {
|
||||||
}
|
}
|
||||||
local UpdateBtnGMFunc = {
|
local UpdateBtnGMFunc = {
|
||||||
[-1] = function()
|
[-1] = function()
|
||||||
if not BattleManager.IsUnlockBattlePass() then
|
-- if not BattleManager.IsUnlockBattlePass() then
|
||||||
return SKIP_STATE.LOCK, "25级或充值任意金额后解锁"
|
-- return SKIP_STATE.LOCK, "25级或充值任意金额后解锁"
|
||||||
end
|
-- end
|
||||||
return SKIP_STATE.UNLOCK
|
return SKIP_STATE.UNLOCK
|
||||||
end,
|
end,
|
||||||
[BATTLE_TYPE.BACK]= function()
|
[BATTLE_TYPE.BACK]= function()
|
||||||
|
@ -48,11 +48,26 @@ local UpdateBtnGMFunc = {
|
||||||
-- return SKIP_STATE.NOUSE, "日常副本战斗无法跳过!"
|
-- return SKIP_STATE.NOUSE, "日常副本战斗无法跳过!"
|
||||||
-- end,
|
-- end,
|
||||||
[BATTLE_TYPE.STORY_FIGHT] = function()
|
[BATTLE_TYPE.STORY_FIGHT] = function()
|
||||||
if not BattleManager.IsUnlockBattlePass() then
|
-- if not BattleManager.IsUnlockBattlePass() then
|
||||||
return SKIP_STATE.LOCK, "25级或充值任意金额后解锁"
|
-- return SKIP_STATE.LOCK, "25级或充值任意金额后解锁"
|
||||||
|
-- end
|
||||||
|
-- if FightPointPassManager.GetCurOpenFightIdIsBoss() then
|
||||||
|
-- return SKIP_STATE.NOUSE, "首领关卡无法跳过!"
|
||||||
|
-- end
|
||||||
|
if this.curRound <= 3 then
|
||||||
|
return SKIP_STATE.NOUSE, "跳过功能将在第三回合后解锁"
|
||||||
end
|
end
|
||||||
if FightPointPassManager.GetCurOpenFightIdIsBoss() then
|
return SKIP_STATE.UNLOCK
|
||||||
return SKIP_STATE.NOUSE, "首领关卡无法跳过!"
|
end,
|
||||||
|
[BATTLE_TYPE.DAILY_CHALLENGE] = function()
|
||||||
|
-- if not BattleManager.IsUnlockBattlePass() then
|
||||||
|
-- return SKIP_STATE.LOCK, "25级或充值任意金额后解锁"
|
||||||
|
-- end
|
||||||
|
-- if FightPointPassManager.GetCurOpenFightIdIsBoss() then
|
||||||
|
-- return SKIP_STATE.NOUSE, "首领关卡无法跳过!"
|
||||||
|
-- end
|
||||||
|
if this.curRound <= 3 then
|
||||||
|
return SKIP_STATE.NOUSE, "跳过功能将在第三回合后解锁"
|
||||||
end
|
end
|
||||||
return SKIP_STATE.UNLOCK
|
return SKIP_STATE.UNLOCK
|
||||||
end,
|
end,
|
||||||
|
@ -364,15 +379,21 @@ function this:InitOption()
|
||||||
this.Option:SetActive(true)
|
this.Option:SetActive(true)
|
||||||
Util.GetGameObject(this.BtnTimeScale, "lock"):SetActive(not BattleManager.IsUnlockBattleSpeed())
|
Util.GetGameObject(this.BtnTimeScale, "lock"):SetActive(not BattleManager.IsUnlockBattleSpeed())
|
||||||
|
|
||||||
local state, tip = self:GetSkipState()
|
-- 设置跳过按钮的状态
|
||||||
this.jumpLock:SetActive(state == SKIP_STATE.LOCK)
|
this.SetJumpBtnState()
|
||||||
Util.SetColor(this.BtnJumpFight, state == SKIP_STATE.NOUSE and UIColor.DEEPGRAY or UIColor.WRITE)
|
|
||||||
|
|
||||||
-- 初始化战斗时间,刷新前端显示
|
-- 初始化战斗时间,刷新前端显示
|
||||||
BattleManager.InitTimeScale()
|
BattleManager.InitTimeScale()
|
||||||
this.SwitchTimeScale()
|
this.SwitchTimeScale()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- 设置跳过按钮的状态
|
||||||
|
function this.SetJumpBtnState()
|
||||||
|
local state, tip = this:GetSkipState()
|
||||||
|
this.jumpLock:SetActive(state == SKIP_STATE.LOCK)
|
||||||
|
Util.SetColor(this.BtnJumpFight, state == SKIP_STATE.NOUSE and UIColor.DEEPGRAY or UIColor.WRITE)
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
function this.SwitchTimeScale()
|
function this.SwitchTimeScale()
|
||||||
local _scale = BattleManager.GetTimeScale()
|
local _scale = BattleManager.GetTimeScale()
|
||||||
local child = this.BtnTimeScale.transform.childCount - 3 -- 3倍速时-2
|
local child = this.BtnTimeScale.transform.childCount - 3 -- 3倍速时-2
|
||||||
|
@ -717,6 +738,8 @@ function this.OnRoundChanged(round)
|
||||||
end
|
end
|
||||||
this.roundText.text = string.format(Language[10211], curRound, maxRound)
|
this.roundText.text = string.format(Language[10211], curRound, maxRound)
|
||||||
|
|
||||||
|
-- 设置跳过按钮的状态
|
||||||
|
this.SetJumpBtnState()
|
||||||
end
|
end
|
||||||
-- 角色轮转回调
|
-- 角色轮转回调
|
||||||
function this.RoleTurnChange(role)
|
function this.RoleTurnChange(role)
|
||||||
|
|
|
@ -666,7 +666,7 @@ function this.OnAddRole(data)
|
||||||
if this.isBoss and data.position == 2 then
|
if this.isBoss and data.position == 2 then
|
||||||
isBoss = true
|
isBoss = true
|
||||||
end
|
end
|
||||||
tbRole[data] = EnemyView.New(go, data, data.position, this, isBoss)
|
tbRole[data] = EnemyView.New(go, data, data.position, this, isBoss,this.fightData.enemyId)
|
||||||
end
|
end
|
||||||
go.transform.localScale = Vector3.one
|
go.transform.localScale = Vector3.one
|
||||||
go.transform.localPosition = Vector3.zero
|
go.transform.localPosition = Vector3.zero
|
||||||
|
|
|
@ -6,11 +6,11 @@ function BattleUnit.New(go, role, position, root, isBoss)
|
||||||
return o
|
return o
|
||||||
end
|
end
|
||||||
|
|
||||||
function BattleUnit:ctor(go, role, position, root, isBoss)
|
function BattleUnit:ctor(go, role, position, root, isBoss,enemyId)
|
||||||
self._DelayFuncList = {}
|
self._DelayFuncList = {}
|
||||||
self._LoopFuncList = {}
|
self._LoopFuncList = {}
|
||||||
if self.onCreate then
|
if self.onCreate then
|
||||||
self:onCreate(go, role, position, root, isBoss)
|
self:onCreate(go, role, position, root, isBoss,enemyId)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -8,23 +8,23 @@ local reliveEffect1 = "fx_chongsheng_lianhua"
|
||||||
local reliveEffect2 = "fx_chongsheng_lizhi"
|
local reliveEffect2 = "fx_chongsheng_lizhi"
|
||||||
EnemyView = BattleUnit.New()
|
EnemyView = BattleUnit.New()
|
||||||
|
|
||||||
function EnemyView.New(go, role, position, root, isBoss)
|
function EnemyView.New(go, role, position, root, isBoss,enemysId)
|
||||||
local o = BattleUnit.New(go, role, position, root)
|
local o = BattleUnit.New(go, role, position, root)
|
||||||
setmetatable(o, EnemyView)
|
setmetatable(o, EnemyView)
|
||||||
EnemyView.__index = EnemyView
|
EnemyView.__index = EnemyView
|
||||||
o:ctor(go, role, position, root, isBoss)
|
o:ctor(go, role, position, root, isBoss,enemysId)
|
||||||
return o
|
return o
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
function EnemyView:onCreate(go, role, position, root, isBoss)
|
function EnemyView:onCreate(go, role, position, root, isBoss,enemyId)
|
||||||
self.spLoader = SpriteLoader.New()
|
self.spLoader = SpriteLoader.New()
|
||||||
self.RootPanel = root
|
self.RootPanel = root
|
||||||
self.GameObject = go
|
self.GameObject = go
|
||||||
self.role = role
|
self.role = role
|
||||||
self.camp = role.camp
|
self.camp = role.camp
|
||||||
self.isBoss = isBoss
|
self.isBoss = isBoss
|
||||||
|
self.enemysId=enemyId --剧情id,用于处理剧情特殊显示
|
||||||
-- 创建技能播放器
|
-- 创建技能播放器
|
||||||
self.castingEfectNode = self.RootPanel.enemySkillCast
|
self.castingEfectNode = self.RootPanel.enemySkillCast
|
||||||
self.castingNameNode = Util.GetGameObject(self.castingEfectNode, "TongYong_Casting_Shang/DongHua/MingZi")
|
self.castingNameNode = Util.GetGameObject(self.castingEfectNode, "TongYong_Casting_Shang/DongHua/MingZi")
|
||||||
|
@ -69,7 +69,10 @@ function EnemyView:onCreate(go, role, position, root, isBoss)
|
||||||
self.nameText.text = SubString2(self.readingName,9)
|
self.nameText.text = SubString2(self.readingName,9)
|
||||||
self.level.text = role:GetRoleData(RoleDataName.Level)
|
self.level.text = role:GetRoleData(RoleDataName.Level)
|
||||||
self.elementImg.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(role.roleData.element))
|
self.elementImg.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(role.roleData.element))
|
||||||
|
if self.enemysId and self.enemysId==1017 then
|
||||||
|
Util.GetGameObject(go, "Name"):GetComponent("RectTransform").anchoredPosition=Vector3.New(20,-180,0)
|
||||||
|
Util.GetGameObject(go, "Pro"):GetComponent("RectTransform").anchoredPosition=Vector3.New(-77,-180,0)
|
||||||
|
end
|
||||||
--
|
--
|
||||||
self.RoleLiveGO = poolManager:LoadLive(self.livePath, go.transform.parent, Vector3.one, Vector3.zero)
|
self.RoleLiveGO = poolManager:LoadLive(self.livePath, go.transform.parent, Vector3.one, Vector3.zero)
|
||||||
self.RoleLiveGOGraphic = self.RoleLiveGO:GetComponent("SkeletonGraphic")
|
self.RoleLiveGOGraphic = self.RoleLiveGO:GetComponent("SkeletonGraphic")
|
||||||
|
|
|
@ -576,6 +576,7 @@ function SkillCaster:RoleViewBullet(combat, target)
|
||||||
if not bulletEffect or bulletEffect == "" or duration == 0 then return end
|
if not bulletEffect or bulletEffect == "" or duration == 0 then return end
|
||||||
|
|
||||||
local go = BattleManager.LoadAsset(bulletEffect, self.effectRoot:GetComponent("Canvas").sortingOrder)
|
local go = BattleManager.LoadAsset(bulletEffect, self.effectRoot:GetComponent("Canvas").sortingOrder)
|
||||||
|
self:CheckRotate(go, combat.Orientation)
|
||||||
go.transform:SetParent(self.effectRoot.transform)
|
go.transform:SetParent(self.effectRoot.transform)
|
||||||
go.transform.localScale = Vector3.one
|
go.transform.localScale = Vector3.one
|
||||||
go.transform.position = self.owner.GameObject.transform.position
|
go.transform.position = self.owner.GameObject.transform.position
|
||||||
|
|
|
@ -223,6 +223,12 @@ function this.RefreshMyInfo()
|
||||||
sortNumTabs[i] = Util.GetGameObject(this.myInfo, "sortNum/sortNum ("..i..")")
|
sortNumTabs[i] = Util.GetGameObject(this.myInfo, "sortNum/sortNum ("..i..")")
|
||||||
sortNumTabs[i]:SetActive(false)
|
sortNumTabs[i]:SetActive(false)
|
||||||
end
|
end
|
||||||
|
if not itemList2 then
|
||||||
|
itemList2 = {}
|
||||||
|
end
|
||||||
|
for i = 1, #itemList2 do
|
||||||
|
itemList2[i].gameObject:SetActive(false)
|
||||||
|
end
|
||||||
if myrank and myrank > 0 then
|
if myrank and myrank > 0 then
|
||||||
if myrank < 4 then
|
if myrank < 4 then
|
||||||
sortNumTabs[myrank]:SetActive(true)
|
sortNumTabs[myrank]:SetActive(true)
|
||||||
|
@ -231,13 +237,6 @@ function this.RefreshMyInfo()
|
||||||
Util.GetGameObject(sortNumTabs[4], "rankNumberText"):GetComponent("Text").text = myrank
|
Util.GetGameObject(sortNumTabs[4], "rankNumberText"):GetComponent("Text").text = myrank
|
||||||
end
|
end
|
||||||
|
|
||||||
if not itemList2 then
|
|
||||||
itemList2 = {}
|
|
||||||
end
|
|
||||||
for i = 1, #itemList2 do
|
|
||||||
itemList2[i].gameObject:SetActive(false)
|
|
||||||
end
|
|
||||||
|
|
||||||
--获取奖励
|
--获取奖励
|
||||||
if curRankType == 3 then--竞技场
|
if curRankType == 3 then--竞技场
|
||||||
for k,value in ConfigPairs(ConfigList[curRankType]) do
|
for k,value in ConfigPairs(ConfigList[curRankType]) do
|
||||||
|
|
|
@ -246,6 +246,17 @@ function this.GetManyItems(text)
|
||||||
end)
|
end)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
if text == "一键法宝之灵" then
|
||||||
|
local config = (ConfigManager.TryGetAllConfigsDataByKey(ConfigName.ItemConfig,"ItemType",ItemType.talismanSoulChip))
|
||||||
|
local cor = coroutine.start(function()
|
||||||
|
for k,v in ipairs(config) do
|
||||||
|
local str = "1#" .. v.Id .."#" .. 500
|
||||||
|
NetManager.GMEvent(str)
|
||||||
|
coroutine.wait(0.1)
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
return
|
||||||
|
end
|
||||||
if text and text ~= "" then
|
if text and text ~= "" then
|
||||||
local list = string.split(text, "|")
|
local list = string.split(text, "|")
|
||||||
local cor = coroutine.start(function()
|
local cor = coroutine.start(function()
|
||||||
|
|
|
@ -58,9 +58,16 @@ function TailsManSouPanel:BindEvent()
|
||||||
local s = function(data)
|
local s = function(data)
|
||||||
local lis1 = {}
|
local lis1 = {}
|
||||||
for k,v in pairs(data) do
|
for k,v in pairs(data) do
|
||||||
table.insert(lis1,string.format("<color=#00FF00>%s+%s</color>",propertyConfig[k].Info,GetPropertyFormatStr(propertyConfig[k].Style,v)))
|
table.insert(lis1,{str = string.format("<color=#00FF00>%s+%s</color>",propertyConfig[k].Info,GetPropertyFormatStr(propertyConfig[k].Style,v)),sort = propertyConfig[k].SortId})
|
||||||
end
|
end
|
||||||
return lis1
|
table.sort(lis1,function(a,b)
|
||||||
|
return a.sort < b.sort
|
||||||
|
end)
|
||||||
|
local list2 = {}
|
||||||
|
for i = 1,#lis1 do
|
||||||
|
table.insert(list2,lis1[i].str)
|
||||||
|
end
|
||||||
|
return list2
|
||||||
end
|
end
|
||||||
local data = {}
|
local data = {}
|
||||||
local singData = {}
|
local singData = {}
|
||||||
|
|
|
@ -178,9 +178,9 @@ function TailsmanSoulMainPanel:GetProData()
|
||||||
end
|
end
|
||||||
local str = ""
|
local str = ""
|
||||||
for i = 1,#curData do
|
for i = 1,#curData do
|
||||||
str = string.format("<color=#ecdfc8>%s:%s</color>",propertyConfig[curData[i][1]].Info,GetEquipPropertyFormatStr(propertyConfig[curData[i][1]].Style,curData[i][2]) )
|
str = string.format("<color=#ecdfc8>%s:%s</color>",propertyConfig[curData[i][1]].Info,GetPropertyFormatStr(propertyConfig[curData[i][1]].Style,curData[i][2]) )
|
||||||
if nextProData[curData[i][1]] then
|
if nextProData[curData[i][1]] then
|
||||||
str = str..string.format("<color=#00FF00>(+%s)</color>",GetEquipPropertyFormatStr(propertyConfig[curData[i][1]].Style,nextProData[curData[i][1]] - curData[i][2]))
|
str = str..string.format("<color=#00FF00>(+%s)</color>",GetPropertyFormatStr(propertyConfig[curData[i][1]].Style,nextProData[curData[i][1]] - curData[i][2]))
|
||||||
end
|
end
|
||||||
table.insert(proData,str)
|
table.insert(proData,str)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue