🔖 1.2.1

Assets/Prefabs/rect_0.prefab

@@ -116,6 +116,36 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1880410591663840
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4033385371732954}
+  - component: {fileID: 23664793560740010}
+  - component: {fileID: 102027583103660844}
+  m_Layer: 8
+  m_Name: Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4033385371732954
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1880410591663840}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 3, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4253419588031480}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4091854170695470
 Transform:
   m_ObjectHideFlags: 1
@@ -157,6 +187,7 @@ Transform:
   - {fileID: 4677790764650124}
   - {fileID: 4091854170695470}
   - {fileID: 4099097694700640}
+  - {fileID: 4033385371732954}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -199,6 +230,38 @@ Transform:
   m_Father: {fileID: 4253419588031480}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &23664793560740010
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1880410591663840}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 2100000, guid: 0ea2568fca127a340b194c12431072c0, type: 3}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
 --- !u!50 &50583647464623290
 Rigidbody2D:
   serializedVersion: 4
@@ -395,6 +458,27 @@ TrailRenderer:
     textureMode: 0
   m_MinVertexDistance: 0.1
   m_Autodestruct: 0
+--- !u!102 &102027583103660844
+TextMesh:
+  serializedVersion: 3
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1880410591663840}
+  m_Text: 
+  m_OffsetZ: 0
+  m_CharacterSize: 1
+  m_LineSpacing: 1
+  m_Anchor: 1
+  m_Alignment: 1
+  m_TabSize: 4
+  m_FontSize: 15
+  m_FontStyle: 0
+  m_RichText: 1
+  m_Font: {fileID: 12800000, guid: 0ea2568fca127a340b194c12431072c0, type: 3}
+  m_Color:
+    serializedVersion: 2
+    rgba: 4294967295
 --- !u!114 &114023888109773932
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -473,6 +557,7 @@ MonoBehaviour:
   WatchScrp: {fileID: 0}
   sprite: {fileID: 212258681561516700}
   anim: {fileID: 95759027857224022}
+  txtMesh: {fileID: 102027583103660844}
 --- !u!212 &212071261601086176
 SpriteRenderer:
   m_ObjectHideFlags: 1

Assets/Scenes/InGame.unity

@@ -636,6 +636,11 @@ CanvasRenderer:
     type: 2}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 96413304}
+--- !u!4 &100044844 stripped
+Transform:
+  m_PrefabParentObject: {fileID: 4405625671551832, guid: 49835dcf0d248c94da5d90ab317a12d5,
+    type: 2}
+  m_PrefabInternal: {fileID: 986812425}
 --- !u!1 &116273219
 GameObject:
   m_ObjectHideFlags: 0
@@ -1280,6 +1285,10 @@ Prefab:
       propertyPath: m_RootOrder
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 1927543910558176, guid: 56179a6337bf0714dac534ac579e01f4, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 56179a6337bf0714dac534ac579e01f4, type: 2}
   m_IsPrefabParent: 0
@@ -2325,17 +2334,16 @@ Prefab:
       propertyPath: m_RootOrder
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1173533648723634, guid: f4e2899bb0345ea459d60bcfa9b7292d, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: f4e2899bb0345ea459d60bcfa9b7292d, type: 2}
   m_IsPrefabParent: 0
---- !u!4 &583358834 stripped
-Transform:
-  m_PrefabParentObject: {fileID: 4690241845679208, guid: f4e2899bb0345ea459d60bcfa9b7292d,
-    type: 2}
-  m_PrefabInternal: {fileID: 583358833}
---- !u!1 &583358835 stripped
+--- !u!1 &583358834 stripped
 GameObject:
-  m_PrefabParentObject: {fileID: 1914398304958144, guid: f4e2899bb0345ea459d60bcfa9b7292d,
+  m_PrefabParentObject: {fileID: 1173533648723634, guid: f4e2899bb0345ea459d60bcfa9b7292d,
     type: 2}
   m_PrefabInternal: {fileID: 583358833}
 --- !u!1 &583461773
@@ -2702,10 +2710,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _chat: {fileID: 832577835}
   MapGame:
-  - {fileID: 583358835}
+  - {fileID: 583358834}
   - {fileID: 1120263821}
   - {fileID: 1323234756}
-  - {fileID: 986812427}
+  - {fileID: 986812426}
   - {fileID: 933003880}
   - {fileID: 2028114604}
   GameCanvas: {fileID: 1523339223}
@@ -2780,6 +2788,11 @@ Animator:
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
+--- !u!4 &666021762 stripped
+Transform:
+  m_PrefabParentObject: {fileID: 4238328859073050, guid: f4e2899bb0345ea459d60bcfa9b7292d,
+    type: 2}
+  m_PrefabInternal: {fileID: 583358833}
 --- !u!1 &667918869
 GameObject:
   m_ObjectHideFlags: 0
@@ -3909,6 +3922,10 @@ Prefab:
       propertyPath: m_RootOrder
       value: 4
       objectReference: {fileID: 0}
+    - target: {fileID: 1089229613860014, guid: c3a04e2804ecd424ca87bedc92b90eb7, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: c3a04e2804ecd424ca87bedc92b90eb7, type: 2}
   m_IsPrefabParent: 0
@@ -3949,8 +3966,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -11.48999, y: -156.29}
-  m_SizeDelta: {x: 296.67, y: 10}
+  m_AnchoredPosition: {x: -15, y: -170}
+  m_SizeDelta: {x: 296.67, y: 40}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &972474213
 MonoBehaviour:
@@ -3984,7 +4001,8 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 'Sound By - Bensound  '
+  m_Text: "Sound By - Bensound  \n\n\uB9F5 \uC81C\uC791 \uB3C4\uC6C0 - \uC2EC\uBBFC\uC11D
+    \ "
 --- !u!222 &972474214
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -4104,17 +4122,24 @@ Prefab:
       propertyPath: m_RootOrder
       value: 3
       objectReference: {fileID: 0}
+    - target: {fileID: 1162798747086154, guid: 49835dcf0d248c94da5d90ab317a12d5, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4405625671551832, guid: 49835dcf0d248c94da5d90ab317a12d5, type: 2}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 1043748105157584, guid: 49835dcf0d248c94da5d90ab317a12d5, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 49835dcf0d248c94da5d90ab317a12d5, type: 2}
   m_IsPrefabParent: 0
---- !u!4 &986812426 stripped
-Transform:
-  m_PrefabParentObject: {fileID: 4571790397939116, guid: 49835dcf0d248c94da5d90ab317a12d5,
-    type: 2}
-  m_PrefabInternal: {fileID: 986812425}
---- !u!1 &986812427 stripped
+--- !u!1 &986812426 stripped
 GameObject:
-  m_PrefabParentObject: {fileID: 1162798747086154, guid: 49835dcf0d248c94da5d90ab317a12d5,
+  m_PrefabParentObject: {fileID: 1043748105157584, guid: 49835dcf0d248c94da5d90ab317a12d5,
     type: 2}
   m_PrefabInternal: {fileID: 986812425}
 --- !u!1 &987519628
@@ -6082,6 +6107,10 @@ Prefab:
       propertyPath: m_RootOrder
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 1389565366774930, guid: 75b39c7f4b4d2ac44a49663f1d011a09, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 75b39c7f4b4d2ac44a49663f1d011a09, type: 2}
   m_IsPrefabParent: 0
@@ -7163,10 +7192,10 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 583358834}
+  - {fileID: 666021762}
   - {fileID: 1120263822}
   - {fileID: 1323234755}
-  - {fileID: 986812426}
+  - {fileID: 100044844}
   - {fileID: 1664426095}
   - {fileID: 2028114603}
   m_Father: {fileID: 0}
@@ -8947,6 +8976,10 @@ Prefab:
       propertyPath: m_RootOrder
       value: 5
       objectReference: {fileID: 0}
+    - target: {fileID: 1358468449343484, guid: 807f706398722614bbe4399e35a6c0d2, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 807f706398722614bbe4399e35a6c0d2, type: 2}
   m_IsPrefabParent: 0

Assets/Scenes/Login.unity

@@ -1866,7 +1866,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.644788, g: 0.9852941, b: 0.74576575, a: 1}
+  m_Color: {r: 0.66317195, g: 0.37959558, b: 0.875, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -2530,7 +2530,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.644788, g: 0.9852941, b: 0.74576575, a: 1}
+  m_Color: {r: 0.66317195, g: 0.37959558, b: 0.875, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:

Assets/Scripts/GM/LoadingManager.cs

@@ -66,7 +66,7 @@ IEnumerator LoadScene()
 
             if (op.progress >= 0.9f)
             {
-                progressBar.fillAmount = Mathf.Lerp(progressBar.fillAmount, 1.1f, 0.002f);
+                progressBar.fillAmount = Mathf.Lerp(progressBar.fillAmount, 1.1f, 0.003f);
 
                 if (progressBar.fillAmount == 1.0f)
                 {

Assets/Scripts/GM/NetworkManager.cs

@@ -22,7 +22,7 @@ public class NetworkManager : MonoBehaviour
     {
         static Socket socket = null;
         public string address = "127.0.0.1";   // 주소, 서버 주소와 같게 할 것
-        string version = "1.2.0";
+        string version = "1.2.1";
         int port = 10000;               // 포트 번호, 서버포트와 같게 할 것
         byte[] buf = new byte[4096];
         int recvLen = 0;
@@ -40,7 +40,7 @@ public class NetworkManager : MonoBehaviour
 
         [SerializeField]
         UnityEngine.UI.Text versionTxt;
-        
+
         public static NetworkManager getInstance
         {
             get
@@ -399,6 +399,10 @@ public void ParsePacket(int len)
             }
             else if (txt[0].Equals("DONE"))
             {
+                for (int i = 0; i < v_user.Count; i++)
+                    v_user[i].txtMesh.text = v_user[i].nickName;
+
+                _sound.readyBGM();
                 SGameMng.I.OpenResult((PROPER)int.Parse(txt[1]), int.Parse(txt[2]));
                 SGameMng.I.sTimer = "READY";
                 SGameMng.I.bStartCheck = false;
@@ -424,6 +428,7 @@ public void ParsePacket(int len)
                     v_user[i].transform.localPosition = Vector3.zero;
                     v_user[i].myMove = MOVE_CONTROL.STOP;
                 }
+                StartCoroutine("waitForNameShow");
             }
             else if (txt[0].Equals("USER"))
             {
@@ -478,6 +483,29 @@ public void ParsePacket(int len)
                 //v_user[v_user.Count - 1].isLive = false;
             }
         }
+
+        IEnumerator waitForNameShow()
+        {
+            yield return new WaitForSeconds(1);
+
+            PROPER myProper = PROPER.GENERAL;
+
+            for (int i = 0; i < v_user.Count; i++)
+                if (v_user[i].isPlayer)
+                {
+                    myProper = v_user[i].proper;
+                    break;
+                }
+
+            for (int i = 0; i < v_user.Count; i++)
+            {
+                if (myProper.Equals(v_user[i].proper))
+                    v_user[i].txtMesh.text = v_user[i].nickName;
+                else
+                    v_user[i].txtMesh.text = "";
+            }
+        }
+
         /**
          * @brief 기기에서 접속을 끊었을때 
          */

Assets/Scripts/Reset.cs

@@ -17,7 +17,7 @@ public void ResetFn()
                 GM.NetworkManager.getInstance.v_user[i].gameObject.SetActive(true);
                 GM.NetworkManager.getInstance.v_user[i].gameObject.tag = "General";
                 GM.NetworkManager.getInstance.v_user[i].isLive = true;
-                GM.NetworkManager.getInstance.v_user[i].nhp = 4;
+                GM.NetworkManager.getInstance.v_user[i].nhp = 2;
                 GM.NetworkManager.getInstance.v_user[i].pos = new Vector2(0f, 0f);
                 GM.NetworkManager.getInstance.v_user[i].bBlind = false;
                 GM.NetworkManager.getInstance.v_user[i].bhold = false;