feat: 커서 변경 & 메뉴 UI에 버전 적용 & Volume 값 수정 (#175)

* feat: 커서 변경 & 메뉴 UI에 버전 적용 & Volume 값 수정 * Feat: Default 아이콘 추가
kookmin-sw · Jul 1, 2024 · 833fd60 · 833fd60
1 parent e9e9a83
commit 833fd60
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 100 deletions.
diff --git a/Client/Assets/Resources/Prefabs/Creatures/CrewA.prefab b/Client/Assets/Resources/Prefabs/Creatures/CrewA.prefab
@@ -5146,8 +5146,8 @@ Rigidbody:
     m_Bits: 0
   m_ImplicitCom: 1
   m_ImplicitTensor: 1
-  m_UseGravity: 0
-  m_IsKinematic: 1
+  m_UseGravity: 1
+  m_IsKinematic: 0
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0

diff --git a/Client/Assets/Resources/Prefabs/UI/SubItem/UI_CrewMessage.prefab b/Client/Assets/Resources/Prefabs/UI/SubItem/UI_CrewMessage.prefab
@@ -245,7 +245,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: One of the crew escaped
+  m_text: One of the Crew has Escaped
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 9d24e6b3ecd1d2b479a31d3d0e7b1f9e, type: 2}
   m_sharedMaterial: {fileID: 21148088844906328, guid: 9d24e6b3ecd1d2b479a31d3d0e7b1f9e, type: 2}

diff --git a/Client/Assets/Resources/Prefabs/UI/SubItem/UI_RemainPerson.prefab b/Client/Assets/Resources/Prefabs/UI/SubItem/UI_RemainPerson.prefab
@@ -155,7 +155,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Remain Person
+  m_text: Remain Crew
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 9d24e6b3ecd1d2b479a31d3d0e7b1f9e, type: 2}
   m_sharedMaterial: {fileID: 21148088844906328, guid: 9d24e6b3ecd1d2b479a31d3d0e7b1f9e, type: 2}
@@ -182,7 +182,7 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 41.3
+  m_fontSize: 46.95
   m_fontSizeBase: 35
   m_fontWeight: 400
   m_enableAutoSizing: 1

diff --git a/Client/Assets/Resources/Rendering/GameVolumeProfile.asset b/Client/Assets/Resources/Rendering/GameVolumeProfile.asset
@@ -248,7 +248,7 @@ MonoBehaviour:
     m_Value: 1
   fixedExposure:
     m_OverrideState: 1
-    m_Value: -2.5
+    m_Value: -3
   compensation:
     m_OverrideState: 1
     m_Value: 0
@@ -878,7 +878,7 @@ MonoBehaviour:
     m_Value: 10
   meanFreePath:
     m_OverrideState: 1
-    m_Value: 6
+    m_Value: 5
   enableVolumetricFog:
     m_OverrideState: 1
     m_Value: 1

diff --git a/Client/Assets/Scenes/GameScene.unity b/Client/Assets/Scenes/GameScene.unity
@@ -10048,7 +10048,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7248788017678217095, guid: 6fdb3aaf5497e1547918aafa36904b69, type: 3}
       propertyPath: m_Name
-      value: '@RenderingSystem'
+      value: '@GameRenderingSystem'
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -10426,88 +10426,7 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 5955896855027097458, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 2253429276605018372, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 8684321500767768862, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 6739720754679384429, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 7272252034742736293, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 3542771924527158045, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 8645601133712808338, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 3787781066050346564, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 3061899348964554589, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 2436702492064702954, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 4451224770283346429, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 2413211719056246732, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 4708926499789174212, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 3771057198379348305, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 3434653192902335283, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 1917312710184972003, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 7239412031024525952, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 1444822523375712960, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 6757139866008291637, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 1977451498747284697, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 3296610757908375513, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 7931216704781862225, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 3073605597131660822, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 428568270634593454, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 1318737164855576831, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 8654240019660736247, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 7897542289947867005, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 53e9afb455db1484c8d228b7e1ee573d, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:

diff --git a/Client/Assets/Scenes/LobbyScene.unity b/Client/Assets/Scenes/LobbyScene.unity
@@ -619,6 +619,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4803244549370939316, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3}
+      propertyPath: m_text
+      value: v0.0.0
+      objectReference: {fileID: 0}
     - target: {fileID: 5424237462197944828, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0

diff --git a/Client/Assets/Scenes/TestScene/TestScene_SJ.unity b/Client/Assets/Scenes/TestScene/TestScene_SJ.unity
@@ -4073,7 +4073,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7248788017678217095, guid: 6fdb3aaf5497e1547918aafa36904b69, type: 3}
       propertyPath: m_Name
-      value: '@RenderingSystem'
+      value: '@GameRenderingSystem'
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

diff --git a/Client/Assets/Scripts/Contents/Interactables/ItemObject/FlashBangObject.cs b/Client/Assets/Scripts/Contents/Interactables/ItemObject/FlashBangObject.cs
@@ -1,4 +1,5 @@
 using Fusion;
+using UnityEditor;
 using UnityEngine;
 
 public class FlashBangObject : BaseItemObject

diff --git a/Client/Assets/Scripts/UI/SubItem/UI_CrewMessaage.cs b/Client/Assets/Scripts/UI/SubItem/UI_CrewMessaage.cs
@@ -103,17 +103,17 @@ private IEnumerator FadeOut()
 
     public void EscapeMessage()
     {
-        GetText(Texts.Message).text = "One of the crew escaped!";
+        GetText(Texts.Message).text = "One of the Crew has Escaped";
         StartFadeIn();
     }
     public void DeadMessage()
     {
-        GetText(Texts.Message).text = "One of the crew died!";
+        GetText(Texts.Message).text = "One of the Crew has Died";
         StartFadeIn();
     }
     public void DropMessage()
     {
-        GetText(Texts.Message).text = "One of the crew dropped!";
+        GetText(Texts.Message).text = "One of the Crew has Left the Game. ";
         StartFadeIn();
     }
 

diff --git a/Client/Assets/Scripts/UI/WorldScene/UI_LobbyController.cs b/Client/Assets/Scripts/UI/WorldScene/UI_LobbyController.cs
@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
 using TMPro;
+using UnityEditor;
 using UnityEngine;
-using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 
 public class UI_LobbyController : UI_Base
 {
     #region Enums
+
     enum GameObjects
     {
         MAIN,
@@ -27,6 +27,12 @@ enum Buttons
         Btn_Yes,
         Btn_Return,
     }
+
+    public enum Texts
+    {
+        Version,
+    }
+
     #endregion
 
     #region Fields
@@ -42,11 +48,12 @@ public override bool Init()
 
         Bind<GameObject>(typeof(GameObjects));
         Bind<Button>(typeof(Buttons));
+        Bind<TMP_Text>(typeof(Texts));
         DontDestroyOnLoad(gameObject);
 
         #region Base
         _cameraAnimator = Camera.main.GetComponent<Animator>();
-        
+
         GetButton(Buttons.Btn_PlayCampaign).onClick.AddListener(PlayCampaign);
         GetButton(Buttons.Btn_Settings).onClick.AddListener(Position2);
         GetButton(Buttons.Btn_Settings).onClick.AddListener(ReturnMenu);
@@ -76,6 +83,8 @@ public override bool Init()
         GetObject(GameObjects.MAIN).SetActive(true);
         GetObject(GameObjects.TITLE).SetActive(true);
 
+        GetText(Texts.Version).text = "v" + PlayerSettings.bundleVersion;
+
         return true;
     }
     #endregion
@@ -141,7 +150,7 @@ public void Position1()
         GetObject(GameObjects.EXIT).SetActive(false);
         _cameraAnimator.SetFloat("Animate", 0);
     }
-    
+
     public void PlaySwoosh()
     {
         Managers.SoundMng.Play($"{Define.EFFECT_PATH}/UI/Click2");

diff --git a/Client/ProjectSettings/ProjectSettings.asset b/Client/ProjectSettings/ProjectSettings.asset
@@ -14,7 +14,7 @@ PlayerSettings:
   accelerometerFrequency: 60
   companyName: DefaultCompany
   productName: FaceTheAbyss
-  defaultCursor: {fileID: 0}
+  defaultCursor: {fileID: 2800000, guid: c1812a1c719d6f54bb297561a4d9f853, type: 3}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
   m_ShowUnitySplashScreen: 1
@@ -135,7 +135,7 @@ PlayerSettings:
   vulkanEnableLateAcquireNextImage: 0
   vulkanEnableCommandBufferRecycling: 1
   loadStoreDebugModeEnabled: 0
-  bundleVersion: 1.0
+  bundleVersion: 1.1.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -320,6 +320,13 @@ PlayerSettings:
       m_Width: 16
       m_Height: 16
       m_Kind: 0
+  - m_BuildTarget: 
+    m_Icons:
+    - serializedVersion: 2
+      m_Icon: {fileID: 2800000, guid: acb490645ac052a4bbe4be8ccef11fbb, type: 3}
+      m_Width: 128
+      m_Height: 128
+      m_Kind: 0
   m_BuildTargetPlatformIcons:
   - m_BuildTarget: Android
     m_Icons: