Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
commit
115b2ee04d
|
|
@ -5107,7 +5107,7 @@ ParticleSystem:
|
|||
--- !u!199 &4686382907089013049
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -10501,7 +10501,7 @@ ParticleSystem:
|
|||
--- !u!199 &9024823682437842000
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -15497,7 +15497,7 @@ ParticleSystem:
|
|||
--- !u!199 &3349493174350808778
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -15774,6 +15774,7 @@ GameObject:
|
|||
- component: {fileID: 8831489817173743925}
|
||||
- component: {fileID: 2823244858404267734}
|
||||
- component: {fileID: 1666511982042220401}
|
||||
- component: {fileID: 423540173281187702}
|
||||
m_Layer: 5
|
||||
m_Name: btnBack
|
||||
m_TagString: Untagged
|
||||
|
|
@ -15879,6 +15880,25 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &423540173281187702
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4755461667711632052}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &4858409445642786380
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -20671,7 +20691,7 @@ ParticleSystem:
|
|||
--- !u!199 &2398997576238749712
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -25815,7 +25835,7 @@ ParticleSystem:
|
|||
--- !u!199 &2656224703081973911
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -4644,7 +4644,7 @@ ParticleSystem:
|
|||
--- !u!199 &1481527221194107646
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -10638,7 +10638,7 @@ ParticleSystem:
|
|||
--- !u!199 &1481527221797319403
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -15867,7 +15867,7 @@ ParticleSystem:
|
|||
--- !u!199 &1481527222190047225
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -20644,7 +20644,7 @@ ParticleSystem:
|
|||
--- !u!199 &1481527222294757571
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -25630,7 +25630,7 @@ ParticleSystem:
|
|||
--- !u!199 &1481527222605618109
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -30319,7 +30319,7 @@ ParticleSystem:
|
|||
--- !u!199 &1481527222633079609
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -35352,7 +35352,7 @@ ParticleSystem:
|
|||
--- !u!199 &1481527223089183893
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -35869,7 +35869,7 @@ MonoBehaviour:
|
|||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 38
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_BestFit: 1
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 44
|
||||
m_Alignment: 4
|
||||
|
|
@ -38334,7 +38334,7 @@ MonoBehaviour:
|
|||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 38
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_BestFit: 1
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 44
|
||||
m_Alignment: 4
|
||||
|
|
|
|||
|
|
@ -298,7 +298,7 @@ function this.OnShowLayout3Data()
|
|||
this.btnCompoundText.text=Language[10193]
|
||||
local maxCompoundValue = math.floor(itemData.num/itemData.itemConfig.UsePerCount)
|
||||
compoundMaxNum=maxCompoundValue > gameSetting.HeroCompoundLimit and gameSetting.HeroCompoundLimit or maxCompoundValue
|
||||
endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.heroDataLists)
|
||||
endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas())
|
||||
compoundMaxNum=compoundMaxNum >endHeroNum and endHeroNum or compoundMaxNum
|
||||
elseif itemData.itemConfig.ItemType==ItemType.Box then--宝箱
|
||||
this.nameText.text=Language[10194]
|
||||
|
|
|
|||
|
|
@ -4513,7 +4513,7 @@ local passivityList = {
|
|||
local list = RoleManager.Query(function(r) return r.camp == defRole.camp and r ~= defRole end)
|
||||
for _, r in ipairs(list) do
|
||||
local dd = floor(BattleUtil.ErrorCorrection(damage* f1))
|
||||
BattleUtil.ApplyDamage(nil, role, r, dd)
|
||||
BattleUtil.ApplyDamage(nil, atkRole, r, dd)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -5047,8 +5047,29 @@ local passivityList = {
|
|||
local ct2 = args[7]
|
||||
|
||||
if OutDataManager.GetOutData(role.camp,id) == flr then
|
||||
local hp=0
|
||||
local hp2=0
|
||||
--如果提升的是血量上限
|
||||
if pro1==12 or pro2==12 then
|
||||
hp = role:GetRoleData(RoleDataName.Hp) / role:GetRoleData(RoleDataName.MaxHp)
|
||||
end
|
||||
BattleUtil.AddProp(role, pro1, f1, ct1)
|
||||
BattleUtil.AddProp(role, pro2, f2, ct2)
|
||||
--如果提升的是血量上限
|
||||
if pro1==12 or pro2==12 then
|
||||
hp2 = role:GetRoleData(RoleDataName.Hp) / role:GetRoleData(RoleDataName.MaxHp)
|
||||
local pro=hp-hp2
|
||||
local treat= floor(BattleUtil.ErrorCorrection(role:GetRoleData(RoleDataName.MaxHp)*pro))
|
||||
role.data:AddValue(RoleDataName.Hp, treat)
|
||||
BattleLogManager.Log(
|
||||
"Final Treat",
|
||||
"acamp", role.camp,
|
||||
"apos", role.position,
|
||||
"tcamp", role.camp,
|
||||
"tpos", role.position,
|
||||
"value", treat
|
||||
)
|
||||
end
|
||||
end
|
||||
end,
|
||||
-- 猎妖之路专属
|
||||
|
|
|
|||
|
|
@ -58,9 +58,8 @@ function RewardItemSingleShowPopup:BindEvent()
|
|||
local item={}
|
||||
item.itemId= _itemData.id
|
||||
item.itemNum=compoundNum*_itemData.itemConfig.UsePerCount
|
||||
Log("sssssssssssssss "..item.itemId.." "..item.itemNum)
|
||||
local gameSetting = ConfigManager.GetConfigData(ConfigName.GameSetting, 1)
|
||||
local endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.heroDataLists)
|
||||
local endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas())
|
||||
if endHeroNum > 0 then
|
||||
NetManager.HeroComposeRequest(item,function (drop)
|
||||
this.SendBackCompoundReCallBack(drop)
|
||||
|
|
|
|||
|
|
@ -82,9 +82,6 @@ function RankingSingleListPanel:OnClose()
|
|||
SoundManager.PlayOldMusic()
|
||||
RankingManager.isRequest=0
|
||||
this.noneImage:SetActive(false)
|
||||
if npc then
|
||||
npc:OnClose()
|
||||
end
|
||||
-- if this.liveNode then
|
||||
-- --Log("==YSP== 删除立绘")
|
||||
-- poolManager:UnLoadLive(npc, this.liveNode)
|
||||
|
|
|
|||
Loading…
Reference in New Issue