effect pooling

shnok · Oct 11, 2024 · bcb6a93 · bcb6a93
1 parent 67df468
commit bcb6a93
Show file tree

Hide file tree

Showing 15 changed files with 13,249 additions and 5,303 deletions.
diff --git a/l2-unity/Assets/Resources/Data/Effects/shot_N_cr_.meta b/l2-unity/Assets/Resources/Data/Effects/shot_N_cr_.meta
diff --git a/l2-unity/Assets/Resources/Data/Effects/skybox/L2Sky.mat b/l2-unity/Assets/Resources/Data/Effects/skybox/L2Sky.mat
@@ -70,13 +70,13 @@ Material:
     - _Cloud_Cutoff: 4.01
     - _Cloud_Distance: 0.8
     - _Clouds_Far_Tiling: 0.352
-    - _Clouds_Opacity: 2.54
+    - _Clouds_Opacity: 2.039637
     - _Clouds_Tiling: 0.12
     - _GradientColor1Influence: 0.6
     - _GradientColor2Influence: 0.5
     - _HorizonCloudsRotationSpeed: -0.1
     - _Horizon_Clouds_Height: 1.44
-    - _Horizon_Clouds_Opacity: 1
+    - _Horizon_Clouds_Opacity: 0.8035765
     - _Horizon_Clouds_X_Tile: 1
     - _Horizon_Clouds_Y_Tile: 3.17
     - _QueueControl: 0
@@ -92,12 +92,12 @@ Material:
     - _Stars_Y_Tile: 1
     - _SunMoonSize: 0.13
     m_Colors:
-    - _GradientColor1: {r: 0, g: 0.3529412, b: 0.54901963, a: 1}
+    - _GradientColor1: {r: 0.058293216, g: 0.10806505, b: 0.16946898, a: 0.5864769}
     - _GradientColor2: {r: 0, g: 0, b: 0, a: 1}
     - _GradientColor3: {r: 7.488819, g: 7.981503, b: 8.47419, a: 1}
-    - _MainLightForward: {r: -0.23021153, g: -0.9455186, b: -0.23021153, a: 0}
-    - _MainLightRight: {r: 0.7071067, g: 0, b: -0.7071068, a: 0}
-    - _MainLightUp: {r: 0.6685827, g: -0.32556826, b: 0.66858256, a: 0}
+    - _MainLightForward: {r: 0.6739804, g: -0.30249128, b: 0.6739803, a: 0}
+    - _MainLightRight: {r: 0.7071067, g: 0, b: -0.7071069, a: 0}
+    - _MainLightUp: {r: 0.21389364, g: 0.9531522, b: 0.21389362, a: 0}
     - _SunMoonColor: {r: 1, g: 1, b: 1, a: 0}
   m_BuildTextureStacks: []
   m_AllowLocking: 1
diff --git a/l2-unity/Assets/Resources/Data/Effects/soul_N_stick/MeshEmitter287.mat b/l2-unity/Assets/Resources/Data/Effects/soul_N_stick/MeshEmitter287.mat
@@ -55,7 +55,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.8
+    - _Alpha: 1.2
     - _AlphaSmooth: 0
     - _Billboard: 0
     - _Brighten: 0

diff --git a/l2-unity/Assets/Resources/Data/Effects/soul_N_stick/MeshEmitter288.mat b/l2-unity/Assets/Resources/Data/Effects/soul_N_stick/MeshEmitter288.mat
@@ -42,7 +42,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 1
+    - _Alpha: 1.31
     - _AlphaSmooth: 0
     - _Billboard: 0
     - _Brighten: 0
@@ -81,9 +81,9 @@ Material:
     - _UseSizeScale: 1
     m_Colors:
     - _Acceleration: {r: 0, g: 0, b: 0, a: 0}
-    - _ColorMultiplierRangeB: {r: 0.8, g: 0.8, b: 0, a: 0}
-    - _ColorMultiplierRangeG: {r: 0.8, g: 0.8, b: 0, a: 0}
-    - _ColorMultiplierRangeR: {r: 0.8, g: 0.8, b: 0, a: 0}
+    - _ColorMultiplierRangeB: {r: 1, g: 1, b: 0, a: 0}
+    - _ColorMultiplierRangeG: {r: 1, g: 1, b: 0, a: 0}
+    - _ColorMultiplierRangeR: {r: 1, g: 1, b: 0, a: 0}
     - _ColorScale0Color: {r: 1, g: 1, b: 1, a: 1}
     - _ColorScale1Color: {r: 1, g: 1, b: 1, a: 1}
     - _ColorScale2Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}

diff --git a/l2-unity/Assets/Resources/Data/Effects/soul_N_stick/SpriteEmitter443.mat b/l2-unity/Assets/Resources/Data/Effects/soul_N_stick/SpriteEmitter443.mat
@@ -114,15 +114,15 @@ Material:
     - _SizeRangeY: {r: 10, g: 10, b: 0, a: 0}
     - _SizeRangeZ: {r: 10, g: 10, b: 0, a: 0}
     - _SizeScale0: {r: 0.04, g: 3.5, b: 0, a: 0}
-    - _SizeScale1: {r: 0.05, g: 1, b: 0, a: 0}
-    - _SizeScale2: {r: 0.05, g: 1, b: 0, a: 0}
-    - _SizeScale3: {r: 0.05, g: 1, b: 0, a: 0}
-    - _SizeScale4: {r: 0.05, g: 1, b: 0, a: 0}
-    - _SizeScale5: {r: 0.05, g: 1, b: 0, a: 0}
-    - _SizeScale6: {r: 0.05, g: 1, b: 0, a: 0}
-    - _SizeScale7: {r: 0.05, g: 1, b: 0, a: 0}
-    - _SizeScale8: {r: 0.05, g: 1, b: 0, a: 0}
-    - _SizeScale9: {r: 0.05, g: 1, b: 0, a: 0}
+    - _SizeScale1: {r: 0.15, g: 1, b: 0, a: 0}
+    - _SizeScale2: {r: 0.15, g: 1, b: 0, a: 0}
+    - _SizeScale3: {r: 0.15, g: 1, b: 0, a: 0}
+    - _SizeScale4: {r: 0.15, g: 1, b: 0, a: 0}
+    - _SizeScale5: {r: 0.15, g: 1, b: 0, a: 0}
+    - _SizeScale6: {r: 0.15, g: 1, b: 0, a: 0}
+    - _SizeScale7: {r: 0.15, g: 1, b: 0, a: 0}
+    - _SizeScale8: {r: 0.15, g: 1, b: 0, a: 0}
+    - _SizeScale9: {r: 0.15, g: 1, b: 0, a: 0}
     - _SphereRadiusRange: {r: 0, g: 0, b: 0, a: 0}
     - _SpinsPerSecondRangeX: {r: 0, g: 0, b: 0, a: 0}
     - _SpinsPerSecondRangeY: {r: 0, g: 0, b: 0, a: 0}

diff --git a/l2-unity/Assets/Resources/Data/Effects/soul_N_stick/SpriteEmitter444.mat b/l2-unity/Assets/Resources/Data/Effects/soul_N_stick/SpriteEmitter444.mat
@@ -42,7 +42,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 1
+    - _Alpha: 0.3
     - _AlphaSmooth: 0
     - _Billboard: 1
     - _Brighten: 1

diff --git a/l2-unity/Assets/Resources/Data/Effects/soul_N_stick/soul_N_stick.prefab b/l2-unity/Assets/Resources/Data/Effects/soul_N_stick/soul_N_stick.prefab
@@ -589,9 +589,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 242fa2b9291ecca4c9f8f123c8a3d4e5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 0}
-  surfaceNormal: {x: 0, y: 0, z: 0}
+  _owner: {fileID: 0}
+  _surfaceNormal: {x: 0, y: 0, z: 0}
+  _pooledEffect:
+    _startTime: 0
+    _effectDurationSec: 2
+    _maximumInactiveTimeSec: 10
+    _gameObject: {fileID: 0}
   _particles: []
+  playOnEnable: 0
 --- !u!1 &2129839719418454733
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/l2-unity/Assets/Resources/Data/Effects/spirit_N_stick/spirit_N_stick.prefab b/l2-unity/Assets/Resources/Data/Effects/spirit_N_stick/spirit_N_stick.prefab
@@ -1319,14 +1319,20 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6033790313294197086}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 242fa2b9291ecca4c9f8f123c8a3d4e5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 0}
-  surfaceNormal: {x: 0, y: 0, z: 0}
+  _owner: {fileID: 0}
+  _surfaceNormal: {x: 0, y: 0, z: 0}
+  _pooledEffect:
+    _startTime: 0
+    _effectDurationSec: 2
+    _maximumInactiveTimeSec: 10
+    _gameObject: {fileID: 0}
   _particles: []
+  playOnEnable: 0
 --- !u!1 &6129860499696293947
 GameObject:
   m_ObjectHideFlags: 0