로비 애니메이션 추가

Assets/Ino_nerdnavis.txt

@@ -39,8 +39,5 @@ classconfig 에 의해 정해짐
 인게임 - 터레인 제외, 메시 베이커로 통째로 묶기 or 퍼펙트 컬링
 //로비 - 퍼펙트 컬링
 
-로비 애니메이션 대충 구현
+다른 직업 스킬 구현
-전직 후 애니메이션 변경
-
-어드레서블 다운로드 % 정상적으로 나오게 수정
 

Assets/Res_Addr/Animations/pcanim_archer.controller

@@ -43,7 +43,8 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: -1115183702260151492, guid: 121f4a50c0d4d9a459c763efe51f4f11, type: 3}
+  m_Motion: {fileID: -1115183702260151492, guid: 121f4a50c0d4d9a459c763efe51f4f11,
+    type: 3}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
@@ -157,7 +158,7 @@ AnimatorController:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: pcanim_bluntshield
+  m_Name: pcanim_archer
   serializedVersion: 5
   m_AnimatorParameters:
   - m_Name: emo1
@@ -2099,7 +2100,8 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: -1115183702260151492, guid: 121f4a50c0d4d9a459c763efe51f4f11, type: 3}
+  m_Motion: {fileID: -1115183702260151492, guid: 121f4a50c0d4d9a459c763efe51f4f11,
+    type: 3}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
@@ -2125,7 +2127,8 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 1827226128182048838, guid: 5123181b6d8234f40a5538aeec3597dd, type: 3}
+  m_Motion: {fileID: 1827226128182048838, guid: 5123181b6d8234f40a5538aeec3597dd,
+    type: 3}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 

Assets/Res_Addr/Animations/pcanim_lobby.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 06fa895f777df864abd092f4e8c3faeb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res_Addr/MainUI/NewGameUI.prefab

@@ -58408,8 +58408,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 410, y: 0}
+  m_AnchoredPosition: {x: 615.00006, y: 0}
-  m_SizeDelta: {x: -820, y: 0}
+  m_SizeDelta: {x: -1230, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4935388766595018381
 MonoBehaviour:
@@ -126081,7 +126081,7 @@ PrefabInstance:
     - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: -460
+      value: -690
       objectReference: {fileID: 0}
     - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18,
         type: 3}

Assets/Script/Character/PCActor.cs

@@ -1,4 +1,5 @@
 using System.Collections;
+using System.Security.Cryptography;
 using CodeStage.AntiCheat.ObscuredTypes;
 using UnityEngine;
 using UnityEngine.AI;
@@ -108,20 +109,11 @@ public class PCActor : MyActor
                 dic_MagicData.Add(i, new UseMagicInfo { m_uiIndex = i, m_SkillTableData = skillData, });
             }
         }
+
         m_ClassData = table_classconfig.Ins.Get_Data_orNull(_id);
-        AddrResourceMgr.Ins.LoadObject<RuntimeAnimatorController>(m_ClassData.s_AnimationController, handle =>
-        {
-            m_animation.runtimeAnimatorController = handle.Result;
-        });
-
-        if (InGameInfo.Ins.IsGameMode(eGameMode.Lobby))
-            transform.localScale = Vector3.one;
-        else
-            transform.localScale = m_ClassData.f_Scale * Vector3.one;
-
         m_NavStopDistance = m_ClassData.f_AttackRange;
         base.Set(isEnemy, owner, sdata, _id, _isstop, _ui);
-        Change_Weapon(_ui);
+        Set_Obj();
 
         isSurviveTime = false;
         if (!_ui)
@@ -258,7 +250,29 @@ public class PCActor : MyActor
     {
     }
 
-    public void Change_Weapon(bool _ui)
+    public void Set_Obj()
+    {
+        string animControllerPath;
+        if (InGameInfo.Ins.IsGameMode(eGameMode.Lobby))
+        {
+            transform.localScale = Vector3.one;
+            animControllerPath = "Assets/Res_Addr/Animations/pcanim_lobby.controller";
+        }
+        else
+        {
+            transform.localScale = m_ClassData.f_Scale * Vector3.one;
+            animControllerPath = m_ClassData.s_AnimationController;
+        }
+
+        AddrResourceMgr.Ins.LoadObject<RuntimeAnimatorController>(animControllerPath, handle =>
+        {
+            m_animation.runtimeAnimatorController = handle.Result;
+        });
+
+        if (!InGameInfo.Ins.IsGameMode(eGameMode.Lobby))
+            Change_Weapon();
+    }
+    public void Change_Weapon()
     {
         for (int i = 0; i < tfs_weapon.Length; i++)
         {
@@ -269,8 +283,6 @@ public class PCActor : MyActor
             }
         }
 
-        if (!_ui)
-        {
         var wData = table_equipitemlist.Ins.Get_Data_orNull(m_ServerData.Get_EqiupmentEquip(eItem.WeaponCostume) > 0 ?
             m_ServerData.Get_EqiupmentEquip(eItem.WeaponCostume) : m_ServerData.Get_EqiupmentEquip(eItem.Weapon));
         m_AttackType = DSUtil.CheckNull(wData) ? eAttackType.Physics : wData.e_EquipAttribute;
@@ -288,12 +300,6 @@ public class PCActor : MyActor
             }
         }
     }
-        else
-        {
-            var id = m_ServerData.Get_EqiupmentEquip(eItem.WeaponCostume) > 0 ? m_ServerData.Get_EqiupmentEquip(eItem.WeaponCostume) : m_ServerData.Get_EqiupmentEquip(eItem.Weapon);
-            Make_Weapon(table_equipitemlist.Ins.Get_Data_orNull(id).s_ItemPrefab_RH, tfs_weapon[1], 0, Vector3.zero, Vector3.one, true);
-        }
-    }
 
     void Make_Weapon(string fullpath, Transform tfparent, int tfsprojectilestartindex,
                      Vector3 localpos = default, Vector3 scale = default, bool ui = false)

Assets/Script/UI/Eqiupment/EquipmentPopup_Obtain.cs

@@ -80,7 +80,7 @@ public class EquipmentPopup_Obtain : EquipmentPopupBase
                 NewGameUI.Ins.m_EquipmentUI.m_equipItems.Set();
                 NewGameUI.Ins.m_EquipmentUI.m_EquipmentUI_Items.Set_UI();
                 if (m_Data.e_EquipParts == eItem.Weapon)
-                    MyValue.MyPC.Change_Weapon(false);
+                    MyValue.MyPC.Change_Weapon();
                 MyValue.Get_ActorStatInfoorNull(eRole.PC);
             }
         }

Assets/Script/UI/PC/Info/PCInfoUI_Center.cs

@@ -43,7 +43,10 @@ public class PCInfoUI_Center : UI3DModel
                 RawImage_costume.texture = handle.Result;
             });
 
-            Set_3DModel($"Assets/Res_Addr/PC/{costumeData.s_Prefab}.prefab");
+            Set_3DModel($"Assets/Res_Addr/PC/{costumeData.s_Prefab}.prefab", tr =>
+            {
+                tr.GetComponent<PCActor>().Set_Obj();
+            });
         }
 
         gos[0].SetActive(CanEquip());