Merge pull request #4 from gawric/dev

Skillbar window
shnok · Jun 5, 2024 · 719becd · 719becd
2 parents 860c09d + 3d2d6a1
commit 719becd
Show file tree

Hide file tree

Showing 851 changed files with 52,032 additions and 330 deletions.
diff --git a/l2-unity/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset b/l2-unity/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset
@@ -906,7 +906,7 @@ MonoBehaviour:
   Path: ../l2-unity-fmod/Build/Desktop/AmbSound.bank
   Name: AmbSound
   StudioPath: bank:/AmbSound
-  lastModified: 638431175119939273
+  lastModified: 638532099130826349
   FileSizes:
   - Name: Desktop
     Value: 5783520
@@ -980,7 +980,7 @@ MonoBehaviour:
   Path: ../l2-unity-fmod/Build/Desktop/MonSound.bank
   Name: MonSound
   StudioPath: bank:/MonSound
-  lastModified: 638426794847201085
+  lastModified: 638532099131021255
   FileSizes:
   - Name: Desktop
     Value: 1346080
@@ -2080,7 +2080,7 @@ MonoBehaviour:
   Path: ../l2-unity-fmod/Build/Desktop/StepSound.bank
   Name: StepSound
   StudioPath: bank:/StepSound
-  lastModified: 638373087296479983
+  lastModified: 638532099131223358
   FileSizes:
   - Name: Desktop
     Value: 60416
@@ -3801,7 +3801,7 @@ MonoBehaviour:
   Path: ../l2-unity-fmod/Build/Desktop/ItemSound.bank
   Name: ItemSound
   StudioPath: bank:/ItemSound
-  lastModified: 638441418256860494
+  lastModified: 638532099130896378
   FileSizes:
   - Name: Desktop
     Value: 58976
@@ -4550,7 +4550,7 @@ MonoBehaviour:
   Path: ../l2-unity-fmod/Build/Desktop/ChrSound.bank
   Name: ChrSound
   StudioPath: bank:/ChrSound
-  lastModified: 638441418256212226
+  lastModified: 638532099130886367
   FileSizes:
   - Name: Desktop
     Value: 686624
@@ -6569,7 +6569,7 @@ MonoBehaviour:
   - {fileID: 2229391322859867197}
   StringsBanks:
   - {fileID: 1305589092353993695}
-  cacheTime: 638441418257020062
+  cacheTime: 638532099131223358
   cacheVersion: 131609
 --- !u!114 &73035236526180599
 MonoBehaviour:
@@ -6667,7 +6667,7 @@ MonoBehaviour:
   Path: ../l2-unity-fmod/Build/Desktop/InterfaceSound.bank
   Name: InterfaceSound
   StudioPath: bank:/InterfaceSound
-  lastModified: 638373027357740898
+  lastModified: 638532099130886367
   FileSizes:
   - Name: Desktop
     Value: 9056
@@ -7173,7 +7173,7 @@ MonoBehaviour:
   Path: ../l2-unity-fmod/Build/Desktop/Master.strings.bank
   Name: Master.strings
   StudioPath: bank:/Master.strings
-  lastModified: 638441418257020062
+  lastModified: 638532099130896378
   FileSizes:
   - Name: Desktop
     Value: 18554
@@ -7733,7 +7733,7 @@ MonoBehaviour:
   Path: ../l2-unity-fmod/Build/Desktop/Master.bank
   Name: Master
   StudioPath: bank:/Master
-  lastModified: 638441418256970207
+  lastModified: 638532099130896378
   FileSizes:
   - Name: Desktop
     Value: 1632
@@ -9049,7 +9049,7 @@ MonoBehaviour:
   Path: ../l2-unity-fmod/Build/Desktop/Music.bank
   Name: Music
   StudioPath: bank:/Music
-  lastModified: 638431175121465219
+  lastModified: 638532099131214040
   FileSizes:
   - Name: Desktop
     Value: 5165408
@@ -10905,7 +10905,7 @@ MonoBehaviour:
   Path: ../l2-unity-fmod/Build/Desktop/SkillSound.bank
   Name: SkillSound
   StudioPath: bank:/SkillSound
-  lastModified: 638433502148041600
+  lastModified: 638532099131223358
   FileSizes:
   - Name: Desktop
     Value: 18688

diff --git a/l2-unity/Assets/Resources/Data/UI/Scrollbar/test_item.png b/l2-unity/Assets/Resources/Data/UI/Scrollbar/test_item.png
diff --git a/l2-unity/Assets/Resources/Data/UI/Scrollbar/test_item.png.meta b/l2-unity/Assets/Resources/Data/UI/Scrollbar/test_item.png.meta
diff --git a/...Unity/Presets/FBXImporter.preset.bak.meta → ...ty/Assets/Resources/Data/UI/ShortCut.meta b/...Unity/Presets/FBXImporter.preset.bak.meta → ...ty/Assets/Resources/Data/UI/ShortCut.meta
diff --git a/l2-unity/Assets/Scenes/16_24.unity.bak.meta → ...ts/Resources/Data/UI/ShortCut/button.meta b/l2-unity/Assets/Scenes/16_24.unity.bak.meta → ...ts/Resources/Data/UI/ShortCut/button.meta
diff --git a/l2-unity/Assets/Resources/Data/UI/ShortCut/button/ScrollBarLeftBtn.png b/l2-unity/Assets/Resources/Data/UI/ShortCut/button/ScrollBarLeftBtn.png
diff --git a/l2-unity/Assets/Resources/Data/UI/ShortCut/button/ScrollBarLeftBtn.png.meta b/l2-unity/Assets/Resources/Data/UI/ShortCut/button/ScrollBarLeftBtn.png.meta
diff --git a/l2-unity/Assets/Resources/Data/UI/ShortCut/button/ScrollBarLeftBtn_Over.png b/l2-unity/Assets/Resources/Data/UI/ShortCut/button/ScrollBarLeftBtn_Over.png