Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev/v3.1.1 #18

Merged
merged 12 commits into from
Mar 7, 2018
Merged

Dev/v3.1.1 #18

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
28fdb61
修改版本号
Jan 11, 2018
c02a554
修正一处 NetworkChannel 可能被多个线程同时关闭的问题
Jan 17, 2018
e726be8
调整判断 Object 引用相等的方式
Jan 24, 2018
199405e
Revert "调整判断 Object 引用相等的方式"
Jan 29, 2018
f995e7d
调整 ReferencePool 以便于调试
Feb 3, 2018
e869226
调整 ReferencePool 以便于调试
Feb 3, 2018
1cef957
调整 ReferencePool 以便于调试
Feb 5, 2018
73da3be
调整 ReferencePool 以便于调试
Feb 5, 2018
a847d43
修正一处事件不正确释放的问题
Feb 5, 2018
1ca283e
修正一处频繁异步加载同一个编号的 entity 可能出错的问题
Mar 5, 2018
e0ce6e0
调整配置接口
Mar 7, 2018
0872cd6
增加配置组件
Mar 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "调整判断 Object 引用相等的方式" 
This reverts commit e726be8.
  • Loading branch information
Jiang Yin committed Jan 29, 2018
commit 199405e5951cfc4a4422a2e6b839369a4fe91e41
6 changes: 3 additions & 3 deletions GameFramework/ObjectPool/ObjectPoolManager.ObjectPool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ public void Unspawn(object target)

foreach (Object<T> obj in m_Objects)
{
if (ReferenceEquals(obj.Peek().Target, target))
if (obj.Peek().Target == target)
{
Log.Debug("Object pool '{0}' unspawn '{1}'.", Utility.Text.GetFullName<T>(Name), obj.Peek().Name);
obj.Unspawn();
Expand Down Expand Up @@ -326,7 +326,7 @@ public void SetLocked(object target, bool locked)

foreach (Object<T> obj in m_Objects)
{
if (ReferenceEquals(obj.Peek().Target, target))
if (obj.Peek().Target == target)
{
Log.Debug("Object pool '{0}' set locked '{1}' to '{2}.", Utility.Text.GetFullName<T>(Name), obj.Peek().Name, locked.ToString());
obj.Locked = locked;
Expand Down Expand Up @@ -366,7 +366,7 @@ public void SetPriority(object target, int priority)

foreach (Object<T> obj in m_Objects)
{
if (ReferenceEquals(obj.Peek().Target, target))
if (obj.Peek().Target == target)
{
Log.Debug("Object pool '{0}' set priority '{1}' to '{2}.", Utility.Text.GetFullName<T>(Name), obj.Peek().Name, priority.ToString());
obj.Priority = priority;
Expand Down