v88

osamadeep · Feb 16, 2023 · 37cd4e6 · 37cd4e6
1 parent 398b932
commit 37cd4e6
Show file tree

Hide file tree

Showing 47 changed files with 5,812 additions and 1,666 deletions.
diff --git a/.../Assets/AddressableAssets/UI/Module/Arena/Join/ArenaJoinSeasonInfoSessionProgressFill.mat b/.../Assets/AddressableAssets/UI/Module/Arena/Join/ArenaJoinSeasonInfoSessionProgressFill.mat
@@ -128,7 +128,7 @@ Material:
     - OffsetUV_ZoomY_1: 1
     - PinchUV_Size_1: 0.25
     - PixelSnap: 0
-    - PositionUV_X_1: -1.1450042
+    - PositionUV_X_1: -0.7791866
     - PositionUV_Y_1: 0
     - ResizeUV_X_1: -1
     - ResizeUV_X_2: 0

diff --git a/nekoyume/Assets/AddressableAssetsData/link.xml b/nekoyume/Assets/AddressableAssetsData/link.xml
diff --git a/nekoyume/Assets/AddressableAssetsData/link.xml.meta b/nekoyume/Assets/AddressableAssetsData/link.xml.meta
diff --git a/nekoyume/Assets/Packages/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll.meta b/nekoyume/Assets/Packages/Grpc.Core.Api/lib/net45/Grpc.Core.Api.dll.meta
diff --git a/nekoyume/Assets/Packages/Grpc.Core/lib/net45/Grpc.Core.dll.meta b/nekoyume/Assets/Packages/Grpc.Core/lib/net45/Grpc.Core.dll.meta
diff --git a/nekoyume/Assets/Packages/Grpc.Core/runtimes/grpc_csharp_ext_dummy_stubs.c.meta b/nekoyume/Assets/Packages/Grpc.Core/runtimes/grpc_csharp_ext_dummy_stubs.c.meta
diff --git a/nekoyume/Assets/Packages/Grpc.Core/runtimes/osx/x64/grpc_csharp_ext.bundle.meta b/nekoyume/Assets/Packages/Grpc.Core/runtimes/osx/x64/grpc_csharp_ext.bundle.meta
diff --git a/nekoyume/Assets/Packages/Grpc.Core/runtimes/win/x64/grpc_csharp_ext.dll.meta b/nekoyume/Assets/Packages/Grpc.Core/runtimes/win/x64/grpc_csharp_ext.dll.meta
diff --git a/nekoyume/Assets/Packages/Grpc.Core/runtimes/win/x86/grpc_csharp_ext.dll.meta b/nekoyume/Assets/Packages/Grpc.Core/runtimes/win/x86/grpc_csharp_ext.dll.meta
diff --git a/nekoyume/Assets/Resources/Audio/Music/Prefabs/bgm_title.prefab b/nekoyume/Assets/Resources/Audio/Music/Prefabs/bgm_title.prefab
@@ -43,7 +43,7 @@ AudioSource:
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 243079531108902290, guid: f84234ca553c443c69f5457997eda065,
     type: 2}
-  m_audioClip: {fileID: 8300000, guid: 15670463bd54891458228b2043ee4bcf, type: 3}
+  m_audioClip: {fileID: 8300000, guid: f6ffeb42802e4154fba8520d905b2764, type: 3}
   m_PlayOnAwake: 0
   m_Volume: 1
   m_Pitch: 1

diff --git a/nekoyume/Assets/Resources/UI/Animations/[email protected] b/nekoyume/Assets/Resources/UI/Animations/[email protected]
@@ -100,6 +100,34 @@ AnimationClip:
     path: PageView
     classID: 225
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1.3166667
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Interactable
+    path: CloseButton
+    classID: 114
+    script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_PPtrCurves: []
   m_SampleRate: 60
   m_WrapMode: 0
@@ -122,6 +150,13 @@ AnimationClip:
       typeID: 225
       customType: 0
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 454400272
+      attribute: 4287062452
+      script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
     serializedVersion: 2
@@ -227,6 +262,34 @@ AnimationClip:
     path: PageView
     classID: 225
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1.3166667
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Interactable
+    path: CloseButton
+    classID: 114
+    script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0

diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_EventBanner.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_EventBanner.prefab
@@ -268,7 +268,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8975910368018911408}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0