Skip to content

Commit

Permalink
🔖 v1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kyechan99 committed Aug 20, 2017
1 parent 962af1d commit cf62d17
Show file tree
Hide file tree
Showing 3,025 changed files with 50 additions and 42 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
14 changes: 12 additions & 2 deletions Assets/Scene/InGame/Scripts/Bullet/BulletPool/BulletPool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,16 @@ public class BulletPool : ALComponentSingleton<BulletPool> {
private string _relfectionPath = string.Empty;

private Transform _bulletParent;
private List<BulletBehaviour> _bulletList = new List<BulletBehaviour>();
private static List<BulletBehaviour> _bulletList = new List<BulletBehaviour>();

private void Awake()
{
_bulletList.Clear();
_bulletParent = GameObject.Find("MainCanvas").transform;
}

void Start()
{
InitPool();
}

Expand Down Expand Up @@ -53,8 +58,13 @@ public BulletBehaviour GetBullet()
{
for (int i = 0; i < _bulletList.Count; ++i)
{
if (!_bulletList[i].gameObject.activeSelf && _bulletList[i].GetType().Name.Equals("Bullet"))
if (_bulletList[i].GetType().Name.Equals("Bullet"))
{
if (_bulletList[i].gameObject == null)
Debug.Log("FFFFFFFFF");
if (!_bulletList[i].gameObject.activeSelf)
return _bulletList[i];
}
}

BulletBehaviour temp = CreateBullet(_path);
Expand Down
3 changes: 2 additions & 1 deletion Assets/Scene/InGame/Scripts/Effect/EffectPool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ public class EffectPool : ALComponentSingleton<EffectPool> {

[SerializeField]
private int _poolCount;
private List<ParticleSystem> _pool = new List<ParticleSystem>();
private static List<ParticleSystem> _pool = new List<ParticleSystem>();

private void Awake()
{
_pool.Clear();
CreatePool();
}

Expand Down
2 changes: 1 addition & 1 deletion Library/AssetImportState
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5;0;6;0;0
13;537460736;2099456;0;0
Binary file not shown.
Binary file not shown.
66 changes: 33 additions & 33 deletions Library/CurrentLayout.dwlt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ MonoBehaviour:
m_ShowMode: 4
m_Title:
m_RootView: {fileID: 2}
m_MinSize: {x: 950, y: 542}
m_MinSize: {x: 950, y: 300}
m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &2
MonoBehaviour:
Expand Down Expand Up @@ -107,9 +107,9 @@ MonoBehaviour:
width: 1920
height: 957
m_MinSize: {x: 887, y: 492}
m_MaxSize: {x: 18006, y: 14042}
m_MaxSize: {x: 18008, y: 14042}
vertical: 0
controlID: 164
controlID: 175
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
Expand All @@ -131,9 +131,9 @@ MonoBehaviour:
width: 1596
height: 957
m_MinSize: {x: 610, y: 492}
m_MaxSize: {x: 14004, y: 14042}
m_MaxSize: {x: 14006, y: 14042}
vertical: 1
controlID: 165
controlID: 127
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
Expand All @@ -158,7 +158,7 @@ MonoBehaviour:
m_MinSize: {x: 610, y: 221}
m_MaxSize: {x: 12010, y: 4021}
vertical: 0
controlID: 166
controlID: 72
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
Expand All @@ -177,8 +177,8 @@ MonoBehaviour:
y: 0
width: 462
height: 686
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 16}
m_Panes:
- {fileID: 16}
Expand Down Expand Up @@ -229,8 +229,8 @@ MonoBehaviour:
y: 0
width: 264
height: 686
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_MinSize: {x: 204, y: 221}
m_MaxSize: {x: 4004, y: 4021}
m_ActualView: {fileID: 19}
m_Panes:
- {fileID: 19}
Expand All @@ -256,10 +256,10 @@ MonoBehaviour:
y: 686
width: 1596
height: 271
m_MinSize: {x: 334, y: 271}
m_MaxSize: {x: 14004, y: 10021}
m_MinSize: {x: 336, y: 271}
m_MaxSize: {x: 14006, y: 10021}
vertical: 0
controlID: 131
controlID: 128
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
Expand All @@ -278,8 +278,8 @@ MonoBehaviour:
y: 0
width: 666
height: 271
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_MinSize: {x: 102, y: 121}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 20}
m_Panes:
- {fileID: 20}
Expand Down Expand Up @@ -351,7 +351,7 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Game
m_Image: {fileID: -2087823869225018852, guid: 0000000000000000d000000000000000,
m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000,
type: 0}
m_Tooltip:
m_DepthBufferBits: 32
Expand Down Expand Up @@ -427,7 +427,7 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Scene
m_Image: {fileID: 2318424515335265636, guid: 0000000000000000d000000000000000,
m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000,
type: 0}
m_Tooltip:
m_DepthBufferBits: 32
Expand Down Expand Up @@ -549,7 +549,7 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Animation
m_Image: {fileID: 1561878555887300916, guid: 0000000000000000d000000000000000,
m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000,
type: 0}
m_Tooltip:
m_DepthBufferBits: 0
Expand Down Expand Up @@ -577,7 +577,7 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Hierarchy
m_Image: {fileID: -590624980919486359, guid: 0000000000000000d000000000000000,
m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000,
type: 0}
m_Tooltip:
m_DepthBufferBits: 0
Expand All @@ -589,23 +589,23 @@ MonoBehaviour:
height: 665
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 58280000
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 92c5faff76c6faff04c8faff10c8faff14c8faff80fafaffde15fcff082dfcfffa2dfcff443afcfff647fcffb665fcff3c74fcffbcaaffffbeb5ffffc4c1ffff1afcfffff4ffffff00000000f4290000b82a00007a2b00007c340000403500005a36000076360000b836000004370000083700003637000054370000a837000012380000163800001e3800001876000070760000347700007a7b0000a67b00003e7c0000007d00002a7e0000407e0000ee7e0000b07f0000ee7f00008280000046810000088200008a850000a08500004e86000010870000928c0000ea8c0000ae8d0000
m_ExpandedIDs: 243cffff083dffff963effffa23effffa63effff5444ffff3445ffffc646ffffd646ffffde46ffff666dffff4085ffffa49cffff28b3ffffa0caffffe2d7ffffb4ddffffe6eaffffe6f7ffff00000000b43100000c320000d032000098370000f0370000b4380000a03c0000f83c0000bc3d0000a841000000420000c4420000b046000008470000cc470000104c0000d44c0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name: MPenta(Clone)
m_OriginalName: MPenta(Clone)
m_Name:
m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: -258086
m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 10}
m_SearchString:
Expand All @@ -630,7 +630,7 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Console
m_Image: {fileID: 111653112392082826, guid: 0000000000000000d000000000000000,
m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000,
type: 0}
m_Tooltip:
m_DepthBufferBits: 0
Expand All @@ -656,7 +656,7 @@ MonoBehaviour:
m_MaxSize: {x: 10000, y: 10000}
m_TitleContent:
m_Text: Project
m_Image: {fileID: -7501376956915960154, guid: 0000000000000000d000000000000000,
m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000,
type: 0}
m_Tooltip:
m_DepthBufferBits: 0
Expand Down Expand Up @@ -687,10 +687,10 @@ MonoBehaviour:
m_LastProjectPath: D:\Unity project\Hyper-Bullet
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 215}
m_SelectedIDs: 58280000
m_LastClickedID: 10328
m_ExpandedIDs: 0000000078270000842700008627000094270000a2270000b6270000ba270000bc270000d2270000fc2700000428000026280000282800002a280000302800004e28000058280000662800007a2800008028000088280000c4280000d4280000ea2b0000ec2b0000ee2b0000f02b000000ca9a3bffffff7f
scrollPos: {x: 0, y: 223}
m_SelectedIDs: fe2d0000
m_LastClickedID: 11774
m_ExpandedIDs: 000000005a2d0000622d0000642d00006a2d0000782d0000842d0000882d00008a2d00009e2d0000bc2d0000c22d0000d62d0000d82d0000da2d0000de2d0000f82d0000fe2d00000a2e00001a2e0000202e0000222e0000562e0000662e0000dc2e0000de2e0000e02e0000e22e000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand Down Expand Up @@ -718,7 +718,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 0000000078270000842700008627000094270000a2270000b6270000ba270000bc270000d2270000fc2700000428000026280000282800002a280000302800004e28000058280000662800007a2800008028000088280000c4280000d4280000ea2b0000ec2b0000ee2b0000f02b0000
m_ExpandedIDs: 000000005a2d0000622d0000642d00006a2d0000782d0000842d0000882d00008a2d00009e2d0000bc2d0000c22d0000d62d0000d82d0000da2d0000de2d0000f82d0000fe2d00000a2e00001a2e0000202e0000222e0000562e0000662e0000dc2e0000de2e0000e02e0000e22e0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand Down Expand Up @@ -789,7 +789,7 @@ MonoBehaviour:
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Inspector
m_Image: {fileID: -6905738622615590433, guid: 0000000000000000d000000000000000,
m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000,
type: 0}
m_Tooltip:
m_DepthBufferBits: 0
Expand Down
4 changes: 0 additions & 4 deletions Library/EditorInstance.json

This file was deleted.

Binary file modified Library/EditorUserBuildSettings.asset
Binary file not shown.
Binary file modified Library/LastBuild.buildreport
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Library/PlayerDataCache/Data/data.unity3d
Binary file not shown.
Binary file removed Library/PlayerDataCache/Data/globalgamemanagers
Binary file not shown.
Binary file not shown.
Binary file removed Library/PlayerDataCache/Data/level0
Binary file not shown.
Binary file removed Library/PlayerDataCache/Data/level1
Binary file not shown.
Binary file removed Library/PlayerDataCache/Data/level2
Binary file not shown.
Binary file removed Library/PlayerDataCache/Data/resources.assets
Binary file not shown.
Binary file removed Library/PlayerDataCache/Data/resources.assets.resS
Binary file not shown.
Binary file removed Library/PlayerDataCache/Data/sharedassets0.assets
Binary file not shown.
Binary file removed Library/PlayerDataCache/Data/sharedassets1.assets
Binary file not shown.
Binary file not shown.
Binary file removed Library/PlayerDataCache/Data/sharedassets2.assets
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion Library/PlayerDataCache/ScriptLayoutHashes.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
WindowsStandalone
Android
5de288265e5e04c0561eb7033b6ae4fd Assembly-CSharp.dll:AL.FPSDisplayer
f62d1e12c4ea2e5d19ca5a2c81b0bf32 Assembly-CSharp-firstpass.dll:UnityStandardAssets.ImageEffects.TiltShift
dc07d7ad69b399a46e92c483bf1c04ca UnityEngine.Analytics.dll:UnityEngine.Analytics.AnalyticsTracker
Expand Down
Binary file modified Library/ScriptAssemblies/Assembly-CSharp.dll
Binary file not shown.
Binary file modified Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
Binary file not shown.
Binary file modified Library/ShaderCache.db
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit cf62d17

Please sign in to comment.