diff --git a/Assets/Editor/MyEditorUtil.cs b/Assets/Editor/MyEditorUtil.cs index ba2c2bfbc..4f105cdd8 100644 --- a/Assets/Editor/MyEditorUtil.cs +++ b/Assets/Editor/MyEditorUtil.cs @@ -290,6 +290,18 @@ public static class MyEditorUtil list_tr.Add(bd_r); } + if (wristL != null) + { + var strName = "w_archer_l"; + var bow_l = FindDeepChild(prefabAsset.transform, strName); + if (bow_l == null) bow_l = new GameObject(strName).transform; + bow_l.parent = wristL; + bow_l.localPosition = new Vector3(0.069f, -0.01f, 0.034f); + bow_l.localEulerAngles = new Vector3(-2.139496f, 176.8664f, -3.480011f); + bow_l.localScale = Vector3.one * 1.3f; + list_tr.Add(bow_l); + } + pcactor.tfs_weapon = list_tr.ToArray(); // 수정한 프리팹 저장 diff --git a/Assets/ResWork/Table/Export/ClassConfig.json b/Assets/ResWork/Table/Export/ClassConfig.json index feb5b07dd..41f3f6453 100644 --- a/Assets/ResWork/Table/Export/ClassConfig.json +++ b/Assets/ResWork/Table/Export/ClassConfig.json @@ -1 +1 @@ -[{"n_ClassID": "직업 ID", "n_Tier": "직업 티어", "s_AnimationController": "캐릭터 프리펩 정보", "s_JobIcon": "직업 아이콘 정보", "s_WeaponLHPrefab": "왼손 무기 프리펩", "s_WeaponRHPrefab": "오른손 무기 프리펩", "e_BattleType": "전투 스타일", "f_Scale": "크기 보정 값", "f_AttackRange": "공격 범위", "e_MainStatType": "주 스텟 타입", "n_DefaultStr": "기본 힘 스텟", "n_DefaultDex": "기본 민첩 스텟", "n_DefaultInt": "기본 지능 스텟", "n_DefaultLuk": "기본 행운 스텟", "n_DefaultHP": "기본 생명력", "n_DefaultMP": "기본 마나", "n_ExtraSkill": "직업 고유 스킬", "n_AcquiredSkill1": "직업 추가 스킬1", "n_AcquiredSkill2": "직업 추가 스킬2", "n_AcquiredSkill3": "직업 추가 스킬3"}, {"n_ClassID": "10101", "n_Tier": "2", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_onehand.controller", "s_JobIcon": "ClassSkill_002", "s_WeaponLHPrefab": "", "s_WeaponRHPrefab": "Elven_Sword_01", "e_BattleType": "OneHand", "f_Scale": "0.7", "f_AttackRange": "1.5", "e_MainStatType": "LUCK", "n_DefaultStr": "3", "n_DefaultDex": "3", "n_DefaultInt": "3", "n_DefaultLuk": "10", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700001", "n_AcquiredSkill1": "703101", "n_AcquiredSkill2": "703102", "n_AcquiredSkill3": "703103"}, {"n_ClassID": "10102", "n_Tier": "3", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_spellblade.controller", "s_JobIcon": "ClassSkill_010", "s_WeaponLHPrefab": "", "s_WeaponRHPrefab": "Elven_Sword_01", "e_BattleType": "OneHand", "f_Scale": "0.7", "f_AttackRange": "1.5", "e_MainStatType": "STR", "n_DefaultStr": "10", "n_DefaultDex": "5", "n_DefaultInt": "5", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700002", "n_AcquiredSkill1": "703104", "n_AcquiredSkill2": "703105", "n_AcquiredSkill3": "703106"}, {"n_ClassID": "10201", "n_Tier": "3", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_bladedancer.controller", "s_JobIcon": "ClassSkill_007", "s_WeaponLHPrefab": "Dagger1", "s_WeaponRHPrefab": "Dagger2", "e_BattleType": "DualWeapon", "f_Scale": "0.7", "f_AttackRange": "5", "e_MainStatType": "DEX", "n_DefaultStr": "5", "n_DefaultDex": "10", "n_DefaultInt": "5", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700003", "n_AcquiredSkill1": "703201", "n_AcquiredSkill2": "703202", "n_AcquiredSkill3": "703203"}, {"n_ClassID": "10202", "n_Tier": "2", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_assassin.controller", "s_JobIcon": "ClassSkill_009", "s_WeaponLHPrefab": "", "s_WeaponRHPrefab": "", "e_BattleType": "DualWeapon", "f_Scale": "0.7", "f_AttackRange": "5", "e_MainStatType": "INT", "n_DefaultStr": "5", "n_DefaultDex": "5", "n_DefaultInt": "10", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700004", "n_AcquiredSkill1": "703204", "n_AcquiredSkill2": "703205", "n_AcquiredSkill3": "703206"}, {"n_ClassID": "10301", "n_Tier": "2", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_mage.controller", "s_JobIcon": "ClassSkill_004", "s_WeaponLHPrefab": "", "s_WeaponRHPrefab": "", "e_BattleType": "Staff", "f_Scale": "0.7", "f_AttackRange": "1.5", "e_MainStatType": "STR", "n_DefaultStr": "10", "n_DefaultDex": "5", "n_DefaultInt": "5", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700005", "n_AcquiredSkill1": "703301", "n_AcquiredSkill2": "703302", "n_AcquiredSkill3": "703303"}, {"n_ClassID": "10302", "n_Tier": "3", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_sorceress.controller", "s_JobIcon": "ClassSkill_011", "s_WeaponLHPrefab": "", "s_WeaponRHPrefab": "", "e_BattleType": "Staff", "f_Scale": "0.7", "f_AttackRange": "2", "e_MainStatType": "STR", "n_DefaultStr": "10", "n_DefaultDex": "5", "n_DefaultInt": "5", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700006", "n_AcquiredSkill1": "703304", "n_AcquiredSkill2": "703305", "n_AcquiredSkill3": "703306"}, {"n_ClassID": "10303", "n_Tier": "3", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_summoner.controller", "s_JobIcon": "ClassSkill_012", "s_WeaponLHPrefab": "", "s_WeaponRHPrefab": "", "e_BattleType": "Staff", "f_Scale": "0.7", "f_AttackRange": "1.5", "e_MainStatType": "STR_DEX", "n_DefaultStr": "10", "n_DefaultDex": "5", "n_DefaultInt": "5", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700007", "n_AcquiredSkill1": "703307", "n_AcquiredSkill2": "703308", "n_AcquiredSkill3": "703309"}, {"n_ClassID": "10401", "n_Tier": "2", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_rookiearcher.controller", "s_JobIcon": "ClassSkill_003", "s_WeaponLHPrefab": "", "s_WeaponRHPrefab": "", "e_BattleType": "Bow", "f_Scale": "0.7", "f_AttackRange": "1.5", "e_MainStatType": "DEX", "n_DefaultStr": "5", "n_DefaultDex": "10", "n_DefaultInt": "5", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700008", "n_AcquiredSkill1": "703401", "n_AcquiredSkill2": "703402", "n_AcquiredSkill3": "703403"}, {"n_ClassID": "10402", "n_Tier": "3", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_archer.controller", "s_JobIcon": "ClassSkill_008", "s_WeaponLHPrefab": "", "s_WeaponRHPrefab": "", "e_BattleType": "Bow", "f_Scale": "0.7", "f_AttackRange": "5", "e_MainStatType": "DEX", "n_DefaultStr": "5", "n_DefaultDex": "10", "n_DefaultInt": "5", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700009", "n_AcquiredSkill1": "703404", "n_AcquiredSkill2": "703405", "n_AcquiredSkill3": "703406"}, {"n_ClassID": "10501", "n_Tier": "1", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_bluntshield.controller", "s_JobIcon": "ClassSkill_001", "s_WeaponLHPrefab": "Shield", "s_WeaponRHPrefab": "Mace", "e_BattleType": "Shield", "f_Scale": "0.7", "f_AttackRange": "1.5", "e_MainStatType": "DEX_INT", "n_DefaultStr": "5", "n_DefaultDex": "10", "n_DefaultInt": "5", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700010", "n_AcquiredSkill1": "703501", "n_AcquiredSkill2": "703502", "n_AcquiredSkill3": "703503"}, {"n_ClassID": "10502", "n_Tier": "3", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_bluntshield.controller", "s_JobIcon": "ClassSkill_005", "s_WeaponLHPrefab": "", "s_WeaponRHPrefab": "", "e_BattleType": "Shield", "f_Scale": "0.7", "f_AttackRange": "5", "e_MainStatType": "INT", "n_DefaultStr": "5", "n_DefaultDex": "5", "n_DefaultInt": "10", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700011", "n_AcquiredSkill1": "703504", "n_AcquiredSkill2": "703505", "n_AcquiredSkill3": "703506"}, {"n_ClassID": "10601", "n_Tier": "3", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_twohand.controller", "s_JobIcon": "ClassSkill_006", "s_WeaponLHPrefab": "", "s_WeaponRHPrefab": "", "e_BattleType": "TwoHand", "f_Scale": "0.7", "f_AttackRange": "5", "e_MainStatType": "INT", "n_DefaultStr": "5", "n_DefaultDex": "5", "n_DefaultInt": "10", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700012", "n_AcquiredSkill1": "703601", "n_AcquiredSkill2": "703602", "n_AcquiredSkill3": "703603"}] \ No newline at end of file +[{"n_ClassID": "직업 ID", "n_Tier": "직업 티어", "s_AnimationController": "캐릭터 프리펩 정보", "s_JobIcon": "직업 아이콘 정보", "s_WeaponLHPrefab": "왼손 무기 프리펩", "s_WeaponRHPrefab": "오른손 무기 프리펩", "e_BattleType": "전투 스타일", "f_Scale": "크기 보정 값", "f_AttackRange": "공격 범위", "e_MainStatType": "주 스텟 타입", "n_DefaultStr": "기본 힘 스텟", "n_DefaultDex": "기본 민첩 스텟", "n_DefaultInt": "기본 지능 스텟", "n_DefaultLuk": "기본 행운 스텟", "n_DefaultHP": "기본 생명력", "n_DefaultMP": "기본 마나", "n_ExtraSkill": "직업 고유 스킬", "n_AcquiredSkill1": "직업 추가 스킬1", "n_AcquiredSkill2": "직업 추가 스킬2", "n_AcquiredSkill3": "직업 추가 스킬3"}, {"n_ClassID": "10101", "n_Tier": "2", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_onehand.controller", "s_JobIcon": "ClassSkill_002", "s_WeaponLHPrefab": "", "s_WeaponRHPrefab": "Elven_Sword_01", "e_BattleType": "OneHand", "f_Scale": "0.7", "f_AttackRange": "1.5", "e_MainStatType": "LUCK", "n_DefaultStr": "3", "n_DefaultDex": "3", "n_DefaultInt": "3", "n_DefaultLuk": "10", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700001", "n_AcquiredSkill1": "703101", "n_AcquiredSkill2": "703102", "n_AcquiredSkill3": "703103"}, {"n_ClassID": "10102", "n_Tier": "3", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_spellblade.controller", "s_JobIcon": "ClassSkill_010", "s_WeaponLHPrefab": "", "s_WeaponRHPrefab": "Elven_Sword_01", "e_BattleType": "OneHand", "f_Scale": "0.7", "f_AttackRange": "1.5", "e_MainStatType": "STR", "n_DefaultStr": "10", "n_DefaultDex": "5", "n_DefaultInt": "5", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700002", "n_AcquiredSkill1": "703104", "n_AcquiredSkill2": "703105", "n_AcquiredSkill3": "703106"}, {"n_ClassID": "10201", "n_Tier": "3", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_bladedancer.controller", "s_JobIcon": "ClassSkill_007", "s_WeaponLHPrefab": "Dagger1", "s_WeaponRHPrefab": "Dagger2", "e_BattleType": "DualWeapon", "f_Scale": "0.7", "f_AttackRange": "5", "e_MainStatType": "DEX", "n_DefaultStr": "5", "n_DefaultDex": "10", "n_DefaultInt": "5", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700003", "n_AcquiredSkill1": "703201", "n_AcquiredSkill2": "703202", "n_AcquiredSkill3": "703203"}, {"n_ClassID": "10202", "n_Tier": "2", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_assassin.controller", "s_JobIcon": "ClassSkill_009", "s_WeaponLHPrefab": "", "s_WeaponRHPrefab": "", "e_BattleType": "DualWeapon", "f_Scale": "0.7", "f_AttackRange": "5", "e_MainStatType": "INT", "n_DefaultStr": "5", "n_DefaultDex": "5", "n_DefaultInt": "10", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700004", "n_AcquiredSkill1": "703204", "n_AcquiredSkill2": "703205", "n_AcquiredSkill3": "703206"}, {"n_ClassID": "10301", "n_Tier": "2", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_mage.controller", "s_JobIcon": "ClassSkill_004", "s_WeaponLHPrefab": "", "s_WeaponRHPrefab": "", "e_BattleType": "Staff", "f_Scale": "0.7", "f_AttackRange": "1.5", "e_MainStatType": "STR", "n_DefaultStr": "10", "n_DefaultDex": "5", "n_DefaultInt": "5", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700005", "n_AcquiredSkill1": "703301", "n_AcquiredSkill2": "703302", "n_AcquiredSkill3": "703303"}, {"n_ClassID": "10302", "n_Tier": "3", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_sorceress.controller", "s_JobIcon": "ClassSkill_011", "s_WeaponLHPrefab": "", "s_WeaponRHPrefab": "", "e_BattleType": "Staff", "f_Scale": "0.7", "f_AttackRange": "2", "e_MainStatType": "STR", "n_DefaultStr": "10", "n_DefaultDex": "5", "n_DefaultInt": "5", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700006", "n_AcquiredSkill1": "703304", "n_AcquiredSkill2": "703305", "n_AcquiredSkill3": "703306"}, {"n_ClassID": "10303", "n_Tier": "3", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_summoner.controller", "s_JobIcon": "ClassSkill_012", "s_WeaponLHPrefab": "", "s_WeaponRHPrefab": "", "e_BattleType": "Staff", "f_Scale": "0.7", "f_AttackRange": "1.5", "e_MainStatType": "STR_DEX", "n_DefaultStr": "10", "n_DefaultDex": "5", "n_DefaultInt": "5", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700007", "n_AcquiredSkill1": "703307", "n_AcquiredSkill2": "703308", "n_AcquiredSkill3": "703309"}, {"n_ClassID": "10401", "n_Tier": "2", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_rookiearcher.controller", "s_JobIcon": "ClassSkill_003", "s_WeaponLHPrefab": "Bow", "s_WeaponRHPrefab": "", "e_BattleType": "Bow", "f_Scale": "0.7", "f_AttackRange": "1.5", "e_MainStatType": "DEX", "n_DefaultStr": "5", "n_DefaultDex": "10", "n_DefaultInt": "5", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700008", "n_AcquiredSkill1": "703401", "n_AcquiredSkill2": "703402", "n_AcquiredSkill3": "703403"}, {"n_ClassID": "10402", "n_Tier": "3", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_archer.controller", "s_JobIcon": "ClassSkill_008", "s_WeaponLHPrefab": "Bow", "s_WeaponRHPrefab": "", "e_BattleType": "Bow", "f_Scale": "0.7", "f_AttackRange": "5", "e_MainStatType": "DEX", "n_DefaultStr": "5", "n_DefaultDex": "10", "n_DefaultInt": "5", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700009", "n_AcquiredSkill1": "703404", "n_AcquiredSkill2": "703405", "n_AcquiredSkill3": "703406"}, {"n_ClassID": "10501", "n_Tier": "1", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_bluntshield.controller", "s_JobIcon": "ClassSkill_001", "s_WeaponLHPrefab": "Shield", "s_WeaponRHPrefab": "Mace", "e_BattleType": "Shield", "f_Scale": "0.7", "f_AttackRange": "1.5", "e_MainStatType": "DEX_INT", "n_DefaultStr": "5", "n_DefaultDex": "10", "n_DefaultInt": "5", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700010", "n_AcquiredSkill1": "703501", "n_AcquiredSkill2": "703502", "n_AcquiredSkill3": "703503"}, {"n_ClassID": "10502", "n_Tier": "3", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_bluntshield.controller", "s_JobIcon": "ClassSkill_005", "s_WeaponLHPrefab": "", "s_WeaponRHPrefab": "", "e_BattleType": "Shield", "f_Scale": "0.7", "f_AttackRange": "5", "e_MainStatType": "INT", "n_DefaultStr": "5", "n_DefaultDex": "5", "n_DefaultInt": "10", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700011", "n_AcquiredSkill1": "703504", "n_AcquiredSkill2": "703505", "n_AcquiredSkill3": "703506"}, {"n_ClassID": "10601", "n_Tier": "3", "s_AnimationController": "Assets/Res_Addr/Animations/pcanim_twohand.controller", "s_JobIcon": "ClassSkill_006", "s_WeaponLHPrefab": "", "s_WeaponRHPrefab": "", "e_BattleType": "TwoHand", "f_Scale": "0.7", "f_AttackRange": "5", "e_MainStatType": "INT", "n_DefaultStr": "5", "n_DefaultDex": "5", "n_DefaultInt": "10", "n_DefaultLuk": "0", "n_DefaultHP": "100", "n_DefaultMP": "30", "n_ExtraSkill": "700012", "n_AcquiredSkill1": "703601", "n_AcquiredSkill2": "703602", "n_AcquiredSkill3": "703603"}] \ No newline at end of file diff --git a/Assets/Res_Addr/Animations/pcanim_rookiearcher.controller b/Assets/Res_Addr/Animations/pcanim_rookiearcher.controller index a61193c88..a265bc3e3 100644 --- a/Assets/Res_Addr/Animations/pcanim_rookiearcher.controller +++ b/Assets/Res_Addr/Animations/pcanim_rookiearcher.controller @@ -43,7 +43,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400008, guid: 8088ec2e5927f9047bc385831171e5d2, type: 3} + m_Motion: {fileID: 7400006, guid: 8088ec2e5927f9047bc385831171e5d2, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -1752,7 +1752,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 110282530} - m_Position: {x: -50, y: -290, z: 0} + m_Position: {x: -40, y: -290, z: 0} - serializedVersion: 1 m_State: {fileID: 110260934} m_Position: {x: 210, y: -370, z: 0} @@ -1764,7 +1764,7 @@ AnimatorStateMachine: m_Position: {x: 210, y: -290, z: 0} - serializedVersion: 1 m_State: {fileID: -4177302407337328582} - m_Position: {x: -60, y: -220, z: 0} + m_Position: {x: -50, y: -220, z: 0} - serializedVersion: 1 m_State: {fileID: 4804184176358769930} m_Position: {x: -30, y: -460, z: 0} diff --git a/Assets/Res_Addr/PC/Ai01.prefab b/Assets/Res_Addr/PC/Ai01.prefab index c24ece02d..e14a5faaf 100644 --- a/Assets/Res_Addr/PC/Ai01.prefab +++ b/Assets/Res_Addr/PC/Ai01.prefab @@ -7704,6 +7704,7 @@ Transform: - {fileID: 4876773258368998} - {fileID: 4739352771244427894} - {fileID: 5905035768892449892} + - {fileID: 2969148290722291490} m_Father: {fileID: 4717269508476504} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1920300449537474 @@ -7945,7 +7946,7 @@ Animator: m_GameObject: {fileID: 1996061924472238} m_Enabled: 1 m_Avatar: {fileID: 9000000, guid: e5326b54f49cc50479cbf8508dc0e805, type: 3} - m_Controller: {fileID: 9100000, guid: 0ca4348990d16c64c9b7bd55b6e28b56, type: 2} + m_Controller: {fileID: 9100000, guid: 97b462930f9fa3d4bb4811cd31f37540, type: 2} m_CullingMode: 1 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -7979,6 +7980,9 @@ MonoBehaviour: - {fileID: 4739352771244427894} - {fileID: 3617103529663220177} - {fileID: 4469351636303141722} + - {fileID: 5905035768892449892} + - {fileID: 6209729319823266063} + - {fileID: 2969148290722291490} JoystickStatus: 0 --- !u!195 &-9095893261625373431 NavMeshAgent: @@ -8115,6 +8119,37 @@ Transform: - {fileID: 4824162336955892} m_Father: {fileID: 4832368217136650} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &471134595484215698 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2969148290722291490} + m_Layer: 0 + m_Name: w_archer_l + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2969148290722291490 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 471134595484215698} + serializedVersion: 2 + m_LocalRotation: {x: -0.030857753, y: 0.9989756, z: 0.017823871, w: 0.02789175} + m_LocalPosition: {x: 0.069, y: -0.01, z: 0.034} + m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4236912519050090} + m_LocalEulerAnglesHint: {x: 13.957, y: -131.122, z: -10.95} --- !u!1 &4432997729025433687 GameObject: m_ObjectHideFlags: 0 @@ -8141,7 +8176,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.80814415, z: 0, w: 0.58898485} m_LocalPosition: {x: -0.0546, y: -0.001, z: -0.0271} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4676774946024624} @@ -8170,7 +8205,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4666975727458246685} serializedVersion: 2 - m_LocalRotation: {x: -0.9721201, y: -0.20177841, z: 0.11362349, w: -0.036846265} + m_LocalRotation: {x: -0.9721202, y: -0.20177811, z: 0.113623105, w: -0.036846384} m_LocalPosition: {x: 0.0413, y: 0.015, z: 0.0255} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 diff --git a/Assets/Res_Addr/PC/Ai02.prefab b/Assets/Res_Addr/PC/Ai02.prefab index 3b7d795c6..872d78893 100644 --- a/Assets/Res_Addr/PC/Ai02.prefab +++ b/Assets/Res_Addr/PC/Ai02.prefab @@ -277,6 +277,7 @@ MonoBehaviour: - {fileID: 160286280557860904} - {fileID: 1801015302897292839} - {fileID: 4308295107491252130} + - {fileID: 171542925732934059} JoystickStatus: 0 --- !u!195 &5118635080670610493 NavMeshAgent: @@ -7113,6 +7114,7 @@ Transform: - {fileID: 4546370938912610} - {fileID: 6040063026630133166} - {fileID: 1801015302897292839} + - {fileID: 171542925732934059} m_Father: {fileID: 4543544541328506} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1854709960845370 @@ -7973,6 +7975,37 @@ Transform: m_Children: [] m_Father: {fileID: 4431527025099852} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4307477410150329098 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 171542925732934059} + m_Layer: 0 + m_Name: w_archer_l + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &171542925732934059 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4307477410150329098} + serializedVersion: 2 + m_LocalRotation: {x: -0.030857753, y: 0.9989756, z: 0.017823871, w: 0.02789175} + m_LocalPosition: {x: 0.069, y: -0.01, z: 0.034} + m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4431527025099852} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5099916124208612830 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/PC/Ai03.prefab b/Assets/Res_Addr/PC/Ai03.prefab index 124a0daa3..367ca3af6 100644 --- a/Assets/Res_Addr/PC/Ai03.prefab +++ b/Assets/Res_Addr/PC/Ai03.prefab @@ -2108,6 +2108,7 @@ Transform: - {fileID: 4415183680751344} - {fileID: 2883016039405465527} - {fileID: 6228264651444648246} + - {fileID: 8368038987544436725} m_Father: {fileID: 4137892916943090} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1291639602157698 @@ -4435,6 +4436,7 @@ MonoBehaviour: - {fileID: 4418709133114473459} - {fileID: 6228264651444648246} - {fileID: 8190732306888763369} + - {fileID: 8368038987544436725} JoystickStatus: 0 --- !u!195 &8824619834545090257 NavMeshAgent: @@ -7828,6 +7830,37 @@ Transform: m_Children: [] m_Father: {fileID: 4760443070232564} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6669064534065778988 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8368038987544436725} + m_Layer: 0 + m_Name: w_archer_l + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8368038987544436725 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6669064534065778988} + serializedVersion: 2 + m_LocalRotation: {x: -0.030857753, y: 0.9989756, z: 0.017823871, w: 0.02789175} + m_LocalPosition: {x: 0.069, y: -0.01, z: 0.034} + m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4594316561073512} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7858395080338895305 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/Weapon/Bow.prefab b/Assets/Res_Addr/Weapon/Bow.prefab new file mode 100644 index 000000000..421def16e --- /dev/null +++ b/Assets/Res_Addr/Weapon/Bow.prefab @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6734618749025289370 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6734618749025073194} + - component: {fileID: 6734618749026413064} + - component: {fileID: 6734618749027013218} + m_Layer: 0 + m_Name: Bow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6734618749025073194 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6734618749025289370} + serializedVersion: 2 + 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 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6734618749026413064 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6734618749025289370} + m_Mesh: {fileID: 4300000, guid: e1fec637523b9214484a4a619df4e07c, type: 3} +--- !u!23 &6734618749027013218 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6734618749025289370} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 7878d691a75f3824ea21373040595c51, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Res_Addr/Weapon/Bow.prefab.meta b/Assets/Res_Addr/Weapon/Bow.prefab.meta new file mode 100644 index 000000000..851557dc5 --- /dev/null +++ b/Assets/Res_Addr/Weapon/Bow.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 875446e069660f445a06e71d80eacb54 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/Character/PCActor.cs b/Assets/Script/Character/PCActor.cs index 79158e180..9a9e5072d 100644 --- a/Assets/Script/Character/PCActor.cs +++ b/Assets/Script/Character/PCActor.cs @@ -308,6 +308,9 @@ public class PCActor : MyActor case "Dagger2": Make_Weapon(fullpath, tfs_weapon[4], Vector3.zero, Vector3.one); break; + case "Bow": + Make_Weapon(fullpath, tfs_weapon[5], Vector3.zero, Vector3.one); + break; } } }