Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
commit
392bd11ded
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -4706,7 +4706,7 @@ ParticleSystem:
|
||||||
--- !u!199 &6485876364152991737
|
--- !u!199 &6485876364152991737
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -9462,7 +9462,7 @@ ParticleSystem:
|
||||||
--- !u!199 &6485876364345332607
|
--- !u!199 &6485876364345332607
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -14218,7 +14218,7 @@ ParticleSystem:
|
||||||
--- !u!199 &6485876364362531028
|
--- !u!199 &6485876364362531028
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -18974,7 +18974,7 @@ ParticleSystem:
|
||||||
--- !u!199 &6485876364491695193
|
--- !u!199 &6485876364491695193
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -23775,7 +23775,7 @@ ParticleSystem:
|
||||||
--- !u!199 &6485876364731833552
|
--- !u!199 &6485876364731833552
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -23861,7 +23861,7 @@ Transform:
|
||||||
m_GameObject: {fileID: 6485876364873154296}
|
m_GameObject: {fileID: 6485876364873154296}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_LocalPosition: {x: -0, y: -1.57, z: 0}
|
m_LocalPosition: {x: -0, y: -1.57, z: 0}
|
||||||
m_LocalScale: {x: 1.2476789, y: 2.7367935, z: 1.2162287}
|
m_LocalScale: {x: 5, y: 3, z: 1.2162287}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 6485876365899228939}
|
m_Father: {fileID: 6485876365899228939}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
|
@ -28608,7 +28608,7 @@ ParticleSystem:
|
||||||
--- !u!199 &6485876365284364762
|
--- !u!199 &6485876365284364762
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -33373,7 +33373,7 @@ ParticleSystem:
|
||||||
--- !u!199 &6485876365291298603
|
--- !u!199 &6485876365291298603
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -38138,7 +38138,7 @@ ParticleSystem:
|
||||||
--- !u!199 &6485876365508839681
|
--- !u!199 &6485876365508839681
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -42894,7 +42894,7 @@ ParticleSystem:
|
||||||
--- !u!199 &6485876365511542397
|
--- !u!199 &6485876365511542397
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -47912,7 +47912,7 @@ ParticleSystem:
|
||||||
--- !u!199 &6485876366076466630
|
--- !u!199 &6485876366076466630
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
|
|
@ -468,19 +468,25 @@ function this.GetMainPlayerNPCData(fun)
|
||||||
rankNPCList = {}
|
rankNPCList = {}
|
||||||
friendNPCList = {}
|
friendNPCList = {}
|
||||||
local friendRandomNum = math.random(1, 2)
|
local friendRandomNum = math.random(1, 2)
|
||||||
-- LogGreen("friendRandomNum "..friendRandomNum)
|
|
||||||
if friendRandomNum == 2 and PlayerManager.familyId == 0 then
|
if friendRandomNum == 2 and PlayerManager.familyId == 0 then
|
||||||
friendRandomNum = 1
|
friendRandomNum = 1
|
||||||
end
|
end
|
||||||
|
-- LogGreen("friendRandomNum "..friendRandomNum)
|
||||||
|
local curfriendAllList = {}
|
||||||
if friendRandomNum == 1 then
|
if friendRandomNum == 1 then
|
||||||
NetManager.RequestGetFriendInfo(1,function(msg)
|
NetManager.RequestGetFriendInfo(1,function(msg)
|
||||||
if #msg.Friends > needNum then
|
for i = 1, #msg.Friends do
|
||||||
|
if msg.Friends[i].id ~= PlayerManager.uid then
|
||||||
|
table.insert(curfriendAllList,msg.Friends[i])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if #curfriendAllList > needNum then
|
||||||
for i = 1, needNum do
|
for i = 1, needNum do
|
||||||
this.RandomFirendNPC(msg.Friends)
|
this.RandomFirendNPC(curfriendAllList)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
for i = 1, #msg.Friends do
|
for i = 1, #curfriendAllList do
|
||||||
friendNPCList[i] = msg.Friends[i]
|
friendNPCList[i] = curfriendAllList[i]
|
||||||
-- LogGreen("friend "..msg.Friends[i].name)
|
-- LogGreen("friend "..msg.Friends[i].name)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -490,13 +496,18 @@ function this.GetMainPlayerNPCData(fun)
|
||||||
else
|
else
|
||||||
MyGuildManager.RequestMyGuildMembers(function()
|
MyGuildManager.RequestMyGuildMembers(function()
|
||||||
local MyGuildMemList = MyGuildManager.GetMyGuildMemList()
|
local MyGuildMemList = MyGuildManager.GetMyGuildMemList()
|
||||||
if #MyGuildMemList > needNum then
|
for i = 1, #MyGuildMemList do
|
||||||
|
if MyGuildMemList[i].roleUid ~= PlayerManager.uid then
|
||||||
|
table.insert(curfriendAllList,MyGuildMemList[i])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if #curfriendAllList > needNum then
|
||||||
for i = 1, needNum do
|
for i = 1, needNum do
|
||||||
this.RandomFirendNPC(MyGuildMemList)
|
this.RandomFirendNPC(curfriendAllList)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
for i = 1, #MyGuildMemList do
|
for i = 1, #curfriendAllList do
|
||||||
friendNPCList[i] = MyGuildMemList[i]
|
friendNPCList[i] = curfriendAllList[i]
|
||||||
-- LogGreen("MyGuildMemList "..MyGuildMemList[i].userName)
|
-- LogGreen("MyGuildMemList "..MyGuildMemList[i].userName)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue