Merge pull request #88 from LingFeng-bbben/pool-perf

SlideLauncher decoupling
LingFeng-bbben · Nov 27, 2024 · b2fe764 · b2fe764
2 parents c8bb2f1 + c162b27
commit b2fe764
Show file tree

Hide file tree

Showing 42 changed files with 902 additions and 1,624 deletions.
diff --git a/.gitignore b/.gitignore
@@ -88,3 +88,4 @@ Assets/Font/SourceHanSans-Medium SDF.asset
 Assets/Font/GenJyuuGothicScore.asset
 /.idea/.idea.MajdataPlay/.idea
 /Cache/*
+/.vscode
diff --git a/Assets/Plugins/MychIO b/Assets/Plugins/MychIO
diff --git a/Assets/Prefab/Game/Tap_01.prefab b/Assets/Prefab/Game/Tap_01.prefab
@@ -182,11 +182,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c57176cc05c23a743af16831f7ec76ba, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _state: 0
   _startPos: 0
   _timing: 0
   _speed: 7
   _sortOrder: 0
   _isEach: 0
   _isBreak: 0
   _isEX: 0
-  tapLine: {fileID: 8134463029818261665, guid: 50d2a71ffa59d7c468196d8fa195953c, type: 3}
+  _tapLinePrefab: {fileID: 8134463029818261665, guid: 50d2a71ffa59d7c468196d8fa195953c, type: 3}
diff --git a/Assets/Prefab/Game/TouchHold.prefab b/Assets/Prefab/Game/TouchHold.prefab
@@ -327,13 +327,13 @@ SpriteMask:
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 3b4060a5b8c39a84886b03d91d541a79, type: 3}
   m_MaskAlphaCutoff: 0
-  m_FrontSortingLayerID: 0
-  m_BackSortingLayerID: 0
-  m_FrontSortingLayer: 0
-  m_BackSortingLayer: 0
-  m_FrontSortingOrder: 0
-  m_BackSortingOrder: 0
-  m_IsCustomRangeActive: 0
+  m_FrontSortingLayerID: -1967659789
+  m_BackSortingLayerID: -1967659789
+  m_FrontSortingLayer: 8
+  m_BackSortingLayer: 8
+  m_FrontSortingOrder: 5
+  m_BackSortingOrder: 5
+  m_IsCustomRangeActive: 1
   m_SpriteSortPoint: 0
 --- !u!1 &4570065832111625927
 GameObject:
@@ -638,6 +638,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f6839bc41b7edde469c9fc7c4c009e2a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _state: 0
   _startPos: 0
   _timing: 0
   _speed: 0

diff --git a/Assets/Prefab/Notes.meta b/Assets/Prefab/Notes.meta
diff --git a/Assets/Prefab/Notes/TapLine.prefab b/Assets/Prefab/Notes/TapLine.prefab
diff --git a/Assets/Prefab/Notes/TapLine.prefab.meta b/Assets/Prefab/Notes/TapLine.prefab.meta
diff --git a/Assets/Prefab/Notes/Tap_01.prefab b/Assets/Prefab/Notes/Tap_01.prefab
diff --git a/Assets/Prefab/Notes/Tap_01.prefab.meta b/Assets/Prefab/Notes/Tap_01.prefab.meta
+6 −2		Runtime/Device/ButtonRing/AdxHIDButtonRing.cs
+6 −2		Runtime/Device/ButtonRing/AdxIO4ButtonRing.cs
+2 −3		Runtime/Device/Device.Base.cs
+6 −2		Runtime/Device/TouchPanel/AdxTouchPanel.cs